Interrupt orphan processing after every transaction

This makes orphan processing work like handling getdata messages: After every actual transaction validation attempt, interrupt processing to deal with messages arriving from other peers.
bitcoin · Mar 22, 2019 · ebf3331 · ebf3331
1 parent 5314a48
commit ebf3331
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 7 deletions.
diff --git a/src/net.h b/src/net.h
@@ -16,6 +16,7 @@
 #include <limitedmap.h>
 #include <netaddress.h>
 #include <policy/feerate.h>
+#include <primitives/transaction.h>
 #include <protocol.h>
 #include <random.h>
 #include <streams.h>
@@ -739,6 +740,9 @@ class CNode
     CAmount lastSentFeeFilter{0};
     int64_t nextSendTimeFeeFilter{0};
 
+    std::deque<std::set<CTransactionRef>::iterator> orphan_work_queue;
+    std::set<CTransactionRef> orphan_work_set;
+
     CNode(NodeId id, ServiceFlags nLocalServicesIn, int nMyStartingHeightIn, SOCKET hSocketIn, const CAddress &addrIn, uint64_t nKeyedNetGroupIn, uint64_t nLocalHostNonceIn, const CAddress &addrBindIn, const std::string &addrNameIn = "", bool fInboundIn = false);
     ~CNode();
     CNode(const CNode&) = delete;

diff --git a/src/net_processing.cpp b/src/net_processing.cpp
@@ -1718,7 +1718,8 @@ void static ProcessOrphanTx(CConnman* connman, std::deque<std::set<CTransactionR
     AssertLockHeld(cs_main);
     AssertLockHeld(g_cs_orphans);
     std::set<NodeId> setMisbehaving;
-    while (!orphan_work_queue.empty()) {
+    bool done = false;
+    while (!done && !orphan_work_queue.empty()) {
         auto workset_it = orphan_work_queue.front();
         orphan_work_queue.pop_front();
         CTransactionRef porphanTx = *workset_it;
@@ -1750,6 +1751,7 @@ void static ProcessOrphanTx(CConnman* connman, std::deque<std::set<CTransactionR
                 }
             }
             EraseOrphanTx(orphanHash);
+            done = true;
         } else if (!fMissingInputs2) {
             int nDos = 0;
             if (stateDummy.IsInvalid(nDos) && nDos > 0) {
@@ -1769,6 +1771,7 @@ void static ProcessOrphanTx(CConnman* connman, std::deque<std::set<CTransactionR
                 recentRejects->insert(orphanHash);
             }
             EraseOrphanTx(orphanHash);
+            done = true;
         }
         mempool.check(pcoinsTip.get());
     }
@@ -2403,9 +2406,6 @@ bool static ProcessMessage(CNode* pfrom, const std::string& strCommand, CDataStr
             return true;
         }
 
-        std::set<CTransactionRef> orphan_work_set;
-        std::deque<std::set<CTransactionRef>::iterator> orphan_work_queue;
-
         CTransactionRef ptx;
         vRecv >> ptx;
         const CTransaction& tx = *ptx;
@@ -2433,8 +2433,8 @@ bool static ProcessMessage(CNode* pfrom, const std::string& strCommand, CDataStr
                 auto it_by_prev = mapOrphanTransactionsByPrev.find(COutPoint(inv.hash, i));
                 if (it_by_prev != mapOrphanTransactionsByPrev.end()) {
                     for (const auto& elem : it_by_prev->second) {
-                        auto ins = orphan_work_set.insert(elem->second.tx);
-                        if (ins.second) orphan_work_queue.push_back(ins.first);
+                        auto ins = pfrom->orphan_work_set.insert(elem->second.tx);
+                        if (ins.second) pfrom->orphan_work_queue.push_back(ins.first);
                     }
                 }
             }
@@ -2447,7 +2447,7 @@ bool static ProcessMessage(CNode* pfrom, const std::string& strCommand, CDataStr
                 mempool.size(), mempool.DynamicMemoryUsage() / 1000);
 
             // Recursively process any orphan transactions that depended on this one
-            ProcessOrphanTx(connman, orphan_work_queue, orphan_work_set, lRemovedTxn);
+            ProcessOrphanTx(connman, pfrom->orphan_work_queue, pfrom->orphan_work_set, lRemovedTxn);
         }
         else if (fMissingInputs)
         {
@@ -3179,11 +3179,20 @@ bool PeerLogicValidation::ProcessMessages(CNode* pfrom, std::atomic<bool>& inter
     if (!pfrom->vRecvGetData.empty())
         ProcessGetData(pfrom, chainparams, connman, interruptMsgProc);
 
+    if (!pfrom->orphan_work_queue.empty()) {
+        std::list<CTransactionRef> removed_txn;
+        ProcessOrphanTx(connman, pfrom->orphan_work_queue, pfrom->orphan_work_set, removed_txn);
+        for (const CTransactionRef& removedTx : removed_txn) {
+            AddToCompactExtraTransactions(removedTx);
+        }
+    }
+
     if (pfrom->fDisconnect)
         return false;
 
     // this maintains the order of responses
     if (!pfrom->vRecvGetData.empty()) return true;
+    if (!pfrom->orphan_work_queue.empty()) return true;
 
     // Don't bother if send buffer is too full to respond anyway
     if (pfrom->fPauseSend)