Missing from commit ab14f19 cherrypick

Author: Liquid369

src/llmq/quorums_signing_shares.cpp

@@ -1231,25 +1231,6 @@ bool CSigSharesManager::SendMessages()
             }
         }
 
-        auto lt = sigSharesToSend.find(pnode->GetId());
-        if (lt != sigSharesToSend.end()) {
-            std::vector<CSigShare> msgs;
-            for (auto& sigShare : lt->second) {
-                LogPrint(BCLog::LLMQ_SIGS, "CSigSharesManager::SendMessages -- QSIGSHARE signHash=%s, node=%d\n",
-                         sigShare.GetSignHash().ToString(), pnode->GetId());
-                msgs.emplace_back(std::move(sigShare));
-                if (msgs.size() == MAX_MSGS_SIG_SHARES) {
-                    g_connman->PushMessage(pnode, msgMaker.Make(NetMsgType::QSIGSHARE, msgs));
-                    msgs.clear();
-                    didSend = true;
-                }
-            }
-            if (!msgs.empty()) {
-                g_connman->PushMessage(pnode, msgMaker.Make(NetMsgType::QSIGSHARE, msgs));
-                didSend = true;
-            }
-        }
-
         auto lt = sigSharesToSend.find(pnode->GetId());
         if (lt != sigSharesToSend.end()) {
             std::vector<CSigShare> msgs;
@@ -1258,13 +1239,13 @@ bool CSigSharesManager::SendMessages()
                     sigShare.GetSignHash().ToString(), pnode->GetId());
                 msgs.emplace_back(std::move(sigShare));
                 if (msgs.size() == MAX_MSGS_SIG_SHARES) {
-                    g_connman->PushMessage(pnode, msgMaker.Make(NetMsgType::QSIGSHARE, msgs), false);
+                    g_connman->PushMessage(pnode, msgMaker.Make(NetMsgType::QSIGSHARE, msgs));
                     msgs.clear();
                     didSend = true;
                 }
             }
             if (!msgs.empty()) {
-                g_connman->PushMessage(pnode, msgMaker.Make(NetMsgType::QSIGSHARE, msgs), false);
+                g_connman->PushMessage(pnode, msgMaker.Make(NetMsgType::QSIGSHARE, msgs));
                 didSend = true;
             }
         }

src/net.cpp

@@ -1193,10 +1193,10 @@ void CConnman::DisconnectNodes()
 
                 if (fLogIPs) {
                     LogPrintf("ThreadSocketHandler -- removing node: peer=%d addr=%s nRefCount=%d fInbound=%d fMasternode=%d\n",
-                          pnode->GetId(), pnode->addr.ToString(), pnode->GetRefCount(), pnode->fInbound, pnode->fMasternode);
+                          pnode->GetId(), pnode->addr.ToString(), pnode->GetRefCount(), pnode->fInbound, fMasterNode);
                 } else {
                     LogPrintf("ThreadSocketHandler -- removing node: peer=%d nRefCount=%d fInbound=%d fMasternode=%d\n",
-                          pnode->GetId(), pnode->GetRefCount(), pnode->fInbound, pnode->fMasternode);
+                          pnode->GetId(), pnode->GetRefCount(), pnode->fInbound, fMasterNode);
                 }
 
                 // remove from vNodes

src/net.h

@@ -215,7 +215,7 @@ class CConnman
     bool ForNode(NodeId id, std::function<bool(CNode* pnode)> func);
     bool ForNode(const CService& addr, const std::function<bool(const CNode* pnode)>& cond, const std::function<bool(CNode* pnode)>& func);
 
-    void PushMessage(CNode* pnode, CSerializedNetMsg&& msg, bool allowOptimisticSend = DEFAULT_ALLOW_OPTIMISTIC_SEND);
+    void PushMessage(CNode* pnode, CSerializedNetMsg&& msg);
 
     template<typename Callable>
     bool ForEachNodeContinueIf(Callable&& func)
@@ -264,6 +264,16 @@ class CConnman
         }
     };
 
+    template<typename Condition, typename Callable>
+    void ForEachNode(const Condition& cond, Callable&& func) const
+    {
+        LOCK(cs_vNodes);
+        for (auto&& node : vNodes) {
+            if (cond(node))
+                func(node);
+        }
+    };
+
     template<typename Callable, typename CallableAfter>
     void ForEachNodeThen(Callable&& pre, CallableAfter&& post)
     {

src/net_processing.cpp

@@ -191,7 +191,11 @@ class CNodeBlocks
     size_t maxAvg;
 };
 
-
+struct CBlockReject {
+    unsigned char chRejectCode;
+    std::string strRejectReason;
+    uint256 hashBlock;
+};
 
  /**
  * Maintain validation-specific state about nodes, protected by cs_main, instead
@@ -210,6 +214,8 @@ struct CNodeState {
     bool fShouldBan;
     //! String name of this peer (debugging/logging purposes).
     const std::string name;
+    //! List of asynchronously-determined block rejections to notify this peer about.
+    std::vector<CBlockReject> rejects;
     //! The best known block we know this peer has announced.
     const CBlockIndex* pindexBestKnownBlock;
     //! The hash of the last unknown block this peer has announced.

src/protocol.cpp

@@ -18,6 +18,7 @@ namespace NetMsgType
 {
 const char* VERSION = "version";
 const char* VERACK = "verack";
+const char* REJECT = "reject";
 const char* ADDR = "addr";
 const char* ADDRV2="addrv2";
 const char* SENDADDRV2="sendaddrv2";
@@ -76,6 +77,7 @@ const char* CLSIG = "clsig";
 const static std::string allNetMessageTypes[] = {
     NetMsgType::VERSION,
     NetMsgType::VERACK,
+    NetMsgType::REJECT,
     NetMsgType::ADDR,
     NetMsgType::ADDRV2,
     NetMsgType::SENDADDRV2,

src/protocol.h

@@ -75,6 +75,7 @@ extern const char* VERSION;
  * @see https://bitcoin.org/en/developer-reference#verack
  */
 extern const char* VERACK;
+extern const char* REJECT;
 /**
  * The addr (IP address) message relays connection information for peers on the
  * network.