backport: merge bitcoin#19763, #20653, #20756, #19315, #20646, #21015, #19771, #21425, #21236, #21198, #21707, #21785, #21506, #22107, partial bitcoin#21186, merge gui#226, partial gui#206 (networking backports: part 2)

[kwvg]

Additional Information

• bitcoin#19763 doesn't play nice on its own, p2p_addr_relay.py fails because of assert_equal(total_ipv4_received, num_ipv4_addrs * ipv4_branching_factor) where not(0 == 20). It only works with bitcoin#21707.
• In the GUI/Qt wallet, the peer information tab in the debug window has three fields added to them, "Wants Tx Relay", "Last Block" and "Last Tx".
• The RPC help text for getpeerinfo now includes help text for the permissions return value and a debug RPC called addconnection has been introduced.

Breaking Changes

None observed.

Checklist:

• I have performed a self-review of my own code
• I have commented my code, particularly in hard-to-understand areas (note: N/A)
• I have added or updated relevant unit/integration/functional/e2e tests
• I have made corresponding changes to the documentation (note: N/A)
• I have assigned this pull request to a milestone (for repository code-owners and collaborators only)

[UdjinM6]

LGTM, see a couple of nits below + it would be nice if commit messages for gui backports would say merge bitcoin-core/gui#<number> .... (and not just merge gui#<number>). This would turn them into clickable links making PR review a bit easier ;)

[github-actions]

This pull request has conflicts, please rebase.

[PastaPastaPasta]

it would be nice if commit messages for gui backports would say merge bitcoin-core/gui# .... (and not just merge gui#).

Yes; please do not use non-standard messages. My script assumes for gui

    "bitcoin-core/gui" 

and for non-gui

            if ("bitcoin #" + number) in item or ("bitcoin#" + number) in item or ("merge #" + number) in item or \
                    ("backport " + number) in item or ("backport #" + number) in item \
                    or ("merge: #" + number) in item or ("bitcoin " + number) in item:

[UdjinM6]

utACK

[PastaPastaPasta]

utACK e89c555

range diff looks like; when we look at this range diff we see; a clean rebase on develop (a47635b) as well as only metadata and whitespace diffs

also, prior commit passed CI: 39f686c

 -:  ---------- >  1:  663774c544 feat: implement Read Write Locks in threading
 -:  ---------- >  2:  069282611c refactor: make CActiveMasternodeManager::cs SharedMutex and private
 -:  ---------- >  3:  436a5783c7 Merge bitcoin/bitcoin#22736: log, sync: change lock contention from preprocessor directive to log category
 -:  ---------- >  4:  9eec4cc2e1 Merge #20288: script, doc: contrib/seeds updates
 -:  ---------- >  5:  455bb2e117 Merge #20329: docs/descriptors.md: Remove hardened marker in the path after xpub
 -:  ---------- >  6:  d01973cc08 Merge #20491: refactor: Drop noop gcc version checks
 -:  ---------- >  7:  def356e2cb Merge #20512: doc: Add bash as an OpenBSD dependency
 -:  ---------- >  8:  d186b3714a Merge #20587: [doc] Tidy up Tor doc (more stringent)
 -:  ---------- >  9:  41505e64aa Merge #20588: Remove unused and confusing CTransaction constructor
 -:  ---------- > 10:  b193c63fed Merge #20611: Move TX_MAX_STANDARD_VERSION to policy
 -:  ---------- > 11:  eba325d7a2 Merge #16551: test: Test that low difficulty chain fork is rejected
 -:  ---------- > 12:  1995d2e7ca Merge #20451: lint: run mypy over contrib/devtools
 -:  ---------- > 13:  c8653387b1 Merge #21112: ci: use Focal for macOS cross builds
 -:  ---------- > 14:  14a67ee85e Merge #20182: ci: Build with --enable-werror by default, and document exceptions
 -:  ---------- > 15:  0c38cc325e fix: drop -static-libstc++ from depends/hosts/{linux,mingw32}.mk which is clang-only
 -:  ---------- > 16:  a47635baad feat: drop symbol check from CI to unify with bitcoin, keep it for qt5 only
 1:  e22300fd85 = 17:  017d1b40e3 merge bitcoin#19763: don't relay to the address' originator
 2:  d6be4814dd = 18:  d0c596e91d merge bitcoin#20653: Move addr relay comment in net to correct place
 3:  d5dcae3991 = 19:  b76e029e44 merge bitcoin#20756: Add missing field (permissions) to the getpeerinfo help
 4:  f389f0412b ! 20:  1d4f10a378 merge bitcoin#19315: Allow outbound & block-relay-only connections in functional tests
    @@ test/functional/test_framework/test_node.py: class TestNode():
     
      ## test/functional/test_runner.py ##
     @@ test/functional/test_runner.py: BASE_SCRIPTS = [
    -     'wallet_coinbase_category.py --descriptors',
          'feature_filelock.py',
          'feature_loadblock.py',
    +     'p2p_dos_header_tree.py',
     +    'p2p_add_connections.py',
          'p2p_blockfilters.py',
          'p2p_message_capture.py',
 5:  329b1f161d = 21:  e109c0042a merge bitcoin#20646: refer to BIPs 339/155 in feature negotiation
 6:  d09fbb855f ! 22:  3e8ba24c87 partial gui#206: Display fRelayTxes and bip152_highbandwidth_{to, from} in peer details
    @@ Metadata
     Author: Kittywhiskers Van Gogh <[email protected]>
     
      ## Commit message ##
    -    partial gui#206: Display fRelayTxes and bip152_highbandwidth_{to, from} in peer details
    +    partial bitcoin-core/gui#206: Display fRelayTxes and bip152_highbandwidth_{to, from} in peer details
     
         excludes:
         - 142807af8b82e2372a03df893c50df4f4a96aca4
 7:  344409d62f ! 23:  8b204c4c82 merge gui#226: Add "Last Block" and "Last Tx" rows to peer details area
    @@ Metadata
     Author: Kittywhiskers Van Gogh <[email protected]>
     
      ## Commit message ##
    -    merge gui#226: Add "Last Block" and "Last Tx" rows to peer details area
    +    merge bitcoin-core/gui#226: Add "Last Block" and "Last Tx" rows to peer details area
     
      ## src/qt/forms/debugwindow.ui ##
     @@
 8:  a1d27a6543 ! 24:  62a7311fe4 merge bitcoin#21015: Make all of net_processing (and some of net) use std::chrono types
    @@ src/net.cpp: void CConnman::CalculateNumConnectionsChangedStats()
                  torNodes++;
     -        if(pnode->m_last_ping_time > 0)
     -            statsClient.timing("peers.ping_us", pnode->m_last_ping_time, 1.0f);
    -+        {
    -+            const auto last_ping_time = count_microseconds(pnode->m_last_ping_time);
    -+            if (last_ping_time > 0)
    -+                statsClient.timing("peers.ping_us", last_ping_time, 1.0f);
    -+        }
    ++        const auto last_ping_time = count_microseconds(pnode->m_last_ping_time);
    ++        if (last_ping_time > 0)
    ++            statsClient.timing("peers.ping_us", last_ping_time, 1.0f);
          }
          ReleaseNodeVector(vNodesCopy);
          for (const std::string &msg : getAllNetMessageTypes()) {
    @@ src/net_processing.cpp: bool PeerManagerImpl::SendMessages(CNode* pto)
                  // Detect whether this is a stalling initial-headers-sync peer
                  if (pindexBestHeader->GetBlockTime() <= GetAdjustedTime() - nMaxTipAge) {
     -                if (count_microseconds(current_time) > state.nHeadersSyncTimeout && nSyncStarted == 1 && (nPreferredDownload - state.fPreferredDownload >= 1)) {
    -+                if (current_time > state.m_headers_sync_timeout  && nSyncStarted == 1 && (nPreferredDownload - state.fPreferredDownload >= 1)) {
    ++                if (current_time > state.m_headers_sync_timeout && nSyncStarted == 1 && (nPreferredDownload - state.fPreferredDownload >= 1)) {
                          // Disconnect a peer (without the noban permission) if it is our only sync peer,
                          // and we have others we could be using instead.
                          // Note: If all our peers are inbound, then we won't
 9:  c3bf489478 = 25:  5c4c7c55f8 merge bitcoin#19771: Replace enum CConnMan::NumConnections with enum class ConnectionDirection
10:  4d07aca113 = 26:  ba1df91d8d merge bitcoin#21425: Pass PeerManagerImpl members only once
11:  ad0e4a9e43 = 27:  d34d2c4efb merge bitcoin#21236: Extract addr send functionality into MaybeSendAddr()
12:  ed45286ffa = 28:  39384ba461 merge bitcoin#21198: Address outstanding review comments from PR20721
13:  ac9cd5e96e = 29:  6d27db58d1 merge bitcoin#21707: Extend functional tests for addr relay
14:  60f20cf82e = 30:  03ab144b8f merge bitcoin#21785: Fix intermittent issue in p2p_addr_relay.py
15:  3303178bd3 ! 31:  4844e729e2 merge bitcoin#21506: make NetPermissionFlags an enum class
    @@ src/net_processing.cpp: bool PeerManagerImpl::SendMessages(CNode* pto)
     @@ src/net_processing.cpp: bool PeerManagerImpl::SendMessages(CNode* pto)
                  // Detect whether this is a stalling initial-headers-sync peer
                  if (pindexBestHeader->GetBlockTime() <= GetAdjustedTime() - nMaxTipAge) {
    -                 if (current_time > state.m_headers_sync_timeout  && nSyncStarted == 1 && (nPreferredDownload - state.fPreferredDownload >= 1)) {
    +                 if (current_time > state.m_headers_sync_timeout && nSyncStarted == 1 && (nPreferredDownload - state.fPreferredDownload >= 1)) {
     -                    // Disconnect a peer (without the noban permission) if it is our only sync peer,
     +                    // Disconnect a peer (without NetPermissionFlags::NoBan permission) if it is our only sync peer,
                          // and we have others we could be using instead.
16:  38f57e048a = 32:  26c39f5b92 net: replace RelayAddrsWithConn check with !IsBlockOnlyConn
17:  4061f9818e = 33:  5478001a81 partial bitcoin#21186: Move addr data into net_processing
18:  34f509b9d3 = 34:  2e55327f55 net: introduce CanRelayAddrs as RelayAddrsWithConn substitute
19:  39f686c3c8 = 35:  e89c555b0f merge bitcoin#22107: rename GetSystemTimeInSeconds to GetTimeSeconds