Merge remote-tracking branch 'origin/dev' into nd-fix-warnings-2025-05-06

src/ripple/app/rdb/backend/RWDBDatabase.h

@@ -224,7 +224,8 @@ public:
 
         if (!ledger->info().accountHash.isNonZero())
         {
-            JLOG(j.fatal()) << "AH is zero: " << getJson({*ledger, {}});
+            JLOG(j.fatal())
+                << "AH is zero: " << getJson({*ledger, {}}).asString();
             assert(false);
         }
 

src/ripple/overlay/impl/Handshake.cpp

@@ -239,19 +239,14 @@ verifyHandshake(
             throw std::runtime_error("Invalid server domain");
     }
 
-    // Check the network. Omitting Network-ID (on either side ours, or theirs)
+    if (auto const iter = headers.find("Network-ID"); iter != headers.end())
-    // means NID=0
     {
-        uint32_t peer_nid = 0;
+        std::uint32_t nid{0};
-        if (auto const iter = headers.find("Network-ID"); iter != headers.end())
-        {
-            if (!beast::lexicalCastChecked(
-                    peer_nid, std::string(iter->value())))
-                throw std::runtime_error("Invalid peer network identifier");
-        }
 
-        uint32_t our_nid = networkID ? *networkID : 0;
+        if (!beast::lexicalCastChecked(nid, std::string(iter->value())))
-        if (peer_nid != our_nid)
+            throw std::runtime_error("Invalid peer network identifier");
+
+        if (!networkID && nid != 0 || networkID && nid != *networkID)
             throw std::runtime_error("Peer is on a different network");
     }