ci/4

src/CMakeLists.txt

@@ -270,6 +270,7 @@ add_library(bitcoin_node STATIC EXCLUDE_FROM_ALL
   rpc/txoutproof.cpp
   script/sigcache.cpp
   signet.cpp
+  sockman.cpp
   torcontrol.cpp
   txdb.cpp
   txmempool.cpp

src/net_processing.cpp

@@ -5523,10 +5523,15 @@ void PeerManagerImpl::EvictExtraOutboundPeers(std::chrono::seconds now)
 
         m_connman.ForEachNode([&](CNode* pnode) {
             if (!pnode->IsBlockOnlyConn() || pnode->fDisconnect) return;
-            if (pnode->GetId() > youngest_peer.first) {
-                next_youngest_peer = youngest_peer;
-                youngest_peer.first = pnode->GetId();
-                youngest_peer.second = pnode->m_last_block_time;
+            if (pnode->GetId() > next_youngest_peer.first) {
+                if (pnode->GetId() > youngest_peer.first) {
+                    next_youngest_peer = youngest_peer;
+                    youngest_peer.first = pnode->GetId();
+                    youngest_peer.second = pnode->m_last_block_time;
+                } else {
+                    next_youngest_peer.first = pnode->GetId();
+                    next_youngest_peer.second = pnode->m_last_block_time;
+                }
             }
         });
         NodeId to_disconnect = youngest_peer.first;

src/rpc/net.cpp

@@ -203,6 +203,15 @@ static RPCHelpMan getpeerinfo()
     std::vector<CNodeStats> vstats;
     connman.GetNodeStats(vstats);
 
+    // An undocumented side effect of how CConnman previously stored nodes was
+    // that they were returned ordered by id. At least some functional tests
+    // rely on that, so keep it that way. An alternative is to remove this sort
+    // and fix the tests and take the risk of breaking other users of the
+    // "getpeerinfo" RPC.
+    std::sort(vstats.begin(), vstats.end(), [](const CNodeStats& a, const CNodeStats& b) {
+        return a.nodeid < b.nodeid;
+    });
+
     UniValue ret(UniValue::VARR);
 
     for (const CNodeStats& stats : vstats) {