Send and require SENDADDRV2 before VERACK

See the corresponding BIP change: bitcoin/bips#1043
PIVX-Project · Aug 10, 2021 · ba954ca · ba954ca
1 parent 61c2ed4
commit ba954ca
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/src/net_processing.cpp b/src/net_processing.cpp
@@ -1148,7 +1148,6 @@ bool static ProcessMessage(CNode* pfrom, std::string strCommand, CDataStream& vR
             PushNodeVersion(pfrom, connman, GetAdjustedTime());
 
         CNetMsgMaker msg_maker(INIT_PROTO_VERSION);
-        connman->PushMessage(pfrom, msg_maker.Make(NetMsgType::VERACK));
 
         if (nVersion >= 70923) {
             // BIP155 defines addrv2 and sendaddrv2 for all protocol versions, but some
@@ -1159,6 +1158,8 @@ bool static ProcessMessage(CNode* pfrom, std::string strCommand, CDataStream& vR
             connman->PushMessage(pfrom, msg_maker.Make(NetMsgType::SENDADDRV2));
         }
 
+        connman->PushMessage(pfrom, msg_maker.Make(NetMsgType::VERACK));
+
         pfrom->nServices = nServices;
         pfrom->SetAddrLocal(addrMe);
         {