Store the total sig op count of a tx

furszy · furszy · commit e5a72fe29f9c · 2020-08-05T11:09:59.000-03:00
coming from btc@c49d5bc9e6c97c47c0bd78604b2c393a7e4af097
diff --git a/src/main.cpp b/src/main.cpp
@@ -961,8 +961,9 @@ bool AcceptToMemoryPool(CTxMemPool& pool, CValidationState& state, const CTransa
         // itself can contain sigops MAX_TX_SIGOPS is less than
         // MAX_BLOCK_SIGOPS; we still consider this an invalid rather than
         // merely non-standard transaction.
+        unsigned int nSigOps = 0;
         if (!hasZcSpendInputs) {
-            unsigned int nSigOps = GetLegacySigOpCount(tx);
+            nSigOps = GetLegacySigOpCount(tx);
             unsigned int nMaxSigOps = MAX_TX_SIGOPS_CURRENT;
             nSigOps += GetP2SHSigOpCount(tx, view);
             if(nSigOps > nMaxSigOps)
@@ -989,7 +990,7 @@ bool AcceptToMemoryPool(CTxMemPool& pool, CValidationState& state, const CTransa
             }
         }
 
-        CTxMemPoolEntry entry(tx, nFees, GetTime(), dPriority, chainHeight, pool.HasNoInputsOf(tx), inChainInputValue, fSpendsCoinbaseOrCoinstake);
+        CTxMemPoolEntry entry(tx, nFees, GetTime(), dPriority, chainHeight, pool.HasNoInputsOf(tx), inChainInputValue, fSpendsCoinbaseOrCoinstake, nSigOps);
         unsigned int nSize = entry.GetTxSize();
 
         // Don't accept it if it can't get into a block
@@ -1226,7 +1227,7 @@ bool AcceptableInputs(CTxMemPool& pool, CValidationState& state, const CTransact
                 break;
             }
         }
-        CTxMemPoolEntry entry(tx, nFees, GetTime(), dPriority, chainHeight, mempool.HasNoInputsOf(tx), inChainInputValue, fSpendsCoinbaseOrCoinstake);
+        CTxMemPoolEntry entry(tx, nFees, GetTime(), dPriority, chainHeight, mempool.HasNoInputsOf(tx), inChainInputValue, fSpendsCoinbaseOrCoinstake, nSigOps);
         unsigned int nSize = entry.GetTxSize();
 
         // Don't accept it if it can't get into a block
diff --git a/src/test/test_pivx.cpp b/src/test/test_pivx.cpp
@@ -77,7 +77,7 @@ CTxMemPoolEntry TestMemPoolEntryHelper::FromTx(CMutableTransaction &tx, CTxMemPo
     CAmount inChainValue = hasNoDependencies ? txn.GetValueOut() : 0;
 
     return CTxMemPoolEntry(txn, nFee, nTime, dPriority, nHeight,
-                           hasNoDependencies, inChainValue, spendsCoinbaseOrCoinstake);
+                           hasNoDependencies, inChainValue, spendsCoinbaseOrCoinstake, sigOpCount);
 }
 
 [[noreturn]] void Shutdown(void* parg)
diff --git a/src/test/test_pivx.h b/src/test/test_pivx.h
@@ -64,10 +64,11 @@ struct TestMemPoolEntryHelper
     unsigned int nHeight;
     bool hadNoDependencies;
     bool spendsCoinbaseOrCoinstake;
+    unsigned int sigOpCount;
 
     TestMemPoolEntryHelper() :
         nFee(0), nTime(0), dPriority(0.0), nHeight(1),
-        hadNoDependencies(false), spendsCoinbaseOrCoinstake(false) { }
+        hadNoDependencies(false), spendsCoinbaseOrCoinstake(false), sigOpCount(1) { }
 
     CTxMemPoolEntry FromTx(CMutableTransaction &tx, CTxMemPool *pool = NULL);
 
@@ -78,6 +79,7 @@ struct TestMemPoolEntryHelper
     TestMemPoolEntryHelper &Height(unsigned int _height) { nHeight = _height; return *this; }
     TestMemPoolEntryHelper &HadNoDependencies(bool _hnd) { hadNoDependencies = _hnd; return *this; }
     TestMemPoolEntryHelper &SpendsCoinbaseOrCoinstake(bool _flag) { spendsCoinbaseOrCoinstake = _flag; return *this; }
+    TestMemPoolEntryHelper &SigOps(unsigned int _sigops) { sigOpCount = _sigops; return *this; }
 };
 
 #endif
diff --git a/src/txmempool.cpp b/src/txmempool.cpp
@@ -23,8 +23,8 @@
 CTxMemPoolEntry::CTxMemPoolEntry(const CTransaction& _tx, const CAmount& _nFee,
                                  int64_t _nTime, double _entryPriority,
                                  unsigned int _entryHeight, bool poolHasNoInputsOf, CAmount _inChainInputValue,
-                                 bool _spendsCoinbaseOrCoinstake) :
-     tx(_tx), nFee(_nFee), nTime(_nTime), entryPriority(_entryPriority), entryHeight(_entryHeight), hadNoDependencies(poolHasNoInputsOf), inChainInputValue(_inChainInputValue), spendsCoinbaseOrCoinstake(_spendsCoinbaseOrCoinstake)
+                                 bool _spendsCoinbaseOrCoinstake, unsigned int _sigOps) :
+     tx(_tx), nFee(_nFee), nTime(_nTime), entryPriority(_entryPriority), entryHeight(_entryHeight), hadNoDependencies(poolHasNoInputsOf), inChainInputValue(_inChainInputValue), spendsCoinbaseOrCoinstake(_spendsCoinbaseOrCoinstake), sigOpCount(_sigOps)
 {
     nTxSize = ::GetSerializeSize(tx, SER_NETWORK, PROTOCOL_VERSION);
     nModSize = tx.CalculateModifiedSize(nTxSize);
diff --git a/src/txmempool.h b/src/txmempool.h
@@ -72,6 +72,7 @@ class CTxMemPoolEntry
     bool hadNoDependencies; //! Not dependent on any other txs when it entered the mempool
     CAmount inChainInputValue; //! Sum of all txin values that are already in blockchain
     bool spendsCoinbaseOrCoinstake; //! keep track of transactions that spend a coinbase or a coinstake
+    unsigned int sigOpCount; //! Legacy sig ops plus P2SH sig op count
 
     // Information about descendants of this transaction that are in the
     // mempool; if we remove this transaction we must remove all of these
@@ -85,7 +86,8 @@ class CTxMemPoolEntry
 public:
     CTxMemPoolEntry(const CTransaction& _tx, const CAmount& _nFee,
             int64_t _nTime, double _entryPriority, unsigned int _entryHeight,
-            bool poolHasNoInputsOf, CAmount _inChainInputValue, bool _spendsCoinbaseOrCoinstake);
+            bool poolHasNoInputsOf, CAmount _inChainInputValue, bool _spendsCoinbaseOrCoinstake,
+            unsigned int nSigOps);
     CTxMemPoolEntry(const CTxMemPoolEntry& other);
 
     const CTransaction& GetTx() const { return this->tx; }
@@ -100,6 +102,7 @@ class CTxMemPoolEntry
     unsigned int GetHeight() const { return entryHeight; }
     bool HasZerocoins() const { return hasZerocoins; }
     bool WasClearAtEntry() const { return hadNoDependencies; }
+    unsigned int GetSigOpCount() const { return sigOpCount; }
     size_t DynamicMemoryUsage() const { return nUsageSize; }
 
     // Adjusts the descendant state, if this entry is not dirty.

Original file line number	Diff line number	Diff line change
`@@ -961,8 +961,9 @@ bool AcceptToMemoryPool(CTxMemPool& pool, CValidationState& state, const CTransa`
`961`	`961`	`// itself can contain sigops MAX_TX_SIGOPS is less than`
`962`	`962`	`// MAX_BLOCK_SIGOPS; we still consider this an invalid rather than`
`963`	`963`	`// merely non-standard transaction.`
	`964`	`+ unsigned int nSigOps = 0;`
`964`	`965`	`if (!hasZcSpendInputs) {`
`965`		`- unsigned int nSigOps = GetLegacySigOpCount(tx);`
	`966`	`+ nSigOps = GetLegacySigOpCount(tx);`
`966`	`967`	`unsigned int nMaxSigOps = MAX_TX_SIGOPS_CURRENT;`
`967`	`968`	`nSigOps += GetP2SHSigOpCount(tx, view);`
`968`	`969`	`if(nSigOps > nMaxSigOps)`
`@@ -989,7 +990,7 @@ bool AcceptToMemoryPool(CTxMemPool& pool, CValidationState& state, const CTransa`
`989`	`990`	`}`
`990`	`991`	`}`
`991`	`992`
`992`		`- CTxMemPoolEntry entry(tx, nFees, GetTime(), dPriority, chainHeight, pool.HasNoInputsOf(tx), inChainInputValue, fSpendsCoinbaseOrCoinstake);`
	`993`	`+ CTxMemPoolEntry entry(tx, nFees, GetTime(), dPriority, chainHeight, pool.HasNoInputsOf(tx), inChainInputValue, fSpendsCoinbaseOrCoinstake, nSigOps);`
`993`	`994`	`unsigned int nSize = entry.GetTxSize();`
`994`	`995`
`995`	`996`	`// Don't accept it if it can't get into a block`
`@@ -1226,7 +1227,7 @@ bool AcceptableInputs(CTxMemPool& pool, CValidationState& state, const CTransact`
`1226`	`1227`	`break;`
`1227`	`1228`	`}`
`1228`	`1229`	`}`
`1229`		`- CTxMemPoolEntry entry(tx, nFees, GetTime(), dPriority, chainHeight, mempool.HasNoInputsOf(tx), inChainInputValue, fSpendsCoinbaseOrCoinstake);`
	`1230`	`+ CTxMemPoolEntry entry(tx, nFees, GetTime(), dPriority, chainHeight, mempool.HasNoInputsOf(tx), inChainInputValue, fSpendsCoinbaseOrCoinstake, nSigOps);`
`1230`	`1231`	`unsigned int nSize = entry.GetTxSize();`
`1231`	`1232`
`1232`	`1233`	`// Don't accept it if it can't get into a block`
Original file line number	Diff line number	Diff line change
`@@ -77,7 +77,7 @@ CTxMemPoolEntry TestMemPoolEntryHelper::FromTx(CMutableTransaction &tx, CTxMemPo`
`77`	`77`	`CAmount inChainValue = hasNoDependencies ? txn.GetValueOut() : 0;`
`78`	`78`
`79`	`79`	`return CTxMemPoolEntry(txn, nFee, nTime, dPriority, nHeight,`
`80`		`- hasNoDependencies, inChainValue, spendsCoinbaseOrCoinstake);`
	`80`	`+ hasNoDependencies, inChainValue, spendsCoinbaseOrCoinstake, sigOpCount);`
`81`	`81`	`}`
`82`	`82`
`83`	`83`	`[[noreturn]] void Shutdown(void* parg)`