Send and require SENDADDRV2 before VERACK

sipa · furszy · commit ba954cabdc41 · 2021-08-10T09:43:25.000-03:00
See the corresponding BIP change: bitcoin/bips#1043
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);
         {

Original file line number	Diff line number	Diff line change
`@@ -1148,7 +1148,6 @@ bool static ProcessMessage(CNode* pfrom, std::string strCommand, CDataStream& vR`
`1148`	`1148`	`PushNodeVersion(pfrom, connman, GetAdjustedTime());`
`1149`	`1149`
`1150`	`1150`	`CNetMsgMaker msg_maker(INIT_PROTO_VERSION);`
`1151`		`- connman->PushMessage(pfrom, msg_maker.Make(NetMsgType::VERACK));`
`1152`	`1151`
`1153`	`1152`	`if (nVersion >= 70923) {`
`1154`	`1153`	`// 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`
`1159`	`1158`	`connman->PushMessage(pfrom, msg_maker.Make(NetMsgType::SENDADDRV2));`
`1160`	`1159`	`}`
`1161`	`1160`
	`1161`	`+ connman->PushMessage(pfrom, msg_maker.Make(NetMsgType::VERACK));`
	`1162`	`+`
`1162`	`1163`	`pfrom->nServices = nServices;`
`1163`	`1164`	`pfrom->SetAddrLocal(addrMe);`
`1164`	`1165`	`{`