Restore some assert semantics in sigop cost calculations

TheBlueMatt · TheBlueMatt · commit f58349ca856f · 2017-06-09T13:10:08.000-04:00
There are some similar asserts which are left removed in policy
and ATMP (policy code being broken isn't a huge deal, but if we
fail to verify some consensus rules, we should most definitely
crash).
diff --git a/src/consensus/tx_verify.cpp b/src/consensus/tx_verify.cpp
@@ -126,7 +126,9 @@ unsigned int GetP2SHSigOpCount(const CTransaction& tx, const CCoinsViewCache& in
     unsigned int nSigOps = 0;
     for (unsigned int i = 0; i < tx.vin.size(); i++)
     {
-        const CTxOut &prevout = inputs.AccessCoin(tx.vin[i].prevout).out;
+        const Coin& coin = inputs.AccessCoin(tx.vin[i].prevout);
+        assert(!coin.IsSpent());
+        const CTxOut &prevout = coin.out;
         if (prevout.scriptPubKey.IsPayToScriptHash())
             nSigOps += prevout.scriptPubKey.GetSigOpCount(tx.vin[i].scriptSig);
     }
@@ -146,7 +148,9 @@ int64_t GetTransactionSigOpCost(const CTransaction& tx, const CCoinsViewCache& i
 
     for (unsigned int i = 0; i < tx.vin.size(); i++)
     {
-        const CTxOut &prevout = inputs.AccessCoin(tx.vin[i].prevout).out;
+        const Coin& coin = inputs.AccessCoin(tx.vin[i].prevout);
+        assert(!coin.IsSpent());
+        const CTxOut &prevout = coin.out;
         nSigOps += CountWitnessSigOps(tx.vin[i].scriptSig, prevout.scriptPubKey, &tx.vin[i].scriptWitness, flags);
     }
     return nSigOps;

Original file line number	Diff line number	Diff line change
`@@ -126,7 +126,9 @@ unsigned int GetP2SHSigOpCount(const CTransaction& tx, const CCoinsViewCache& in`
`126`	`126`	`unsigned int nSigOps = 0;`
`127`	`127`	`for (unsigned int i = 0; i < tx.vin.size(); i++)`
`128`	`128`	`{`
`129`		`- const CTxOut &prevout = inputs.AccessCoin(tx.vin[i].prevout).out;`
	`129`	`+ const Coin& coin = inputs.AccessCoin(tx.vin[i].prevout);`
	`130`	`+ assert(!coin.IsSpent());`
	`131`	`+ const CTxOut &prevout = coin.out;`
`130`	`132`	`if (prevout.scriptPubKey.IsPayToScriptHash())`
`131`	`133`	`nSigOps += prevout.scriptPubKey.GetSigOpCount(tx.vin[i].scriptSig);`
`132`	`134`	`}`
`@@ -146,7 +148,9 @@ int64_t GetTransactionSigOpCost(const CTransaction& tx, const CCoinsViewCache& i`
`146`	`148`
`147`	`149`	`for (unsigned int i = 0; i < tx.vin.size(); i++)`
`148`	`150`	`{`
`149`		`- const CTxOut &prevout = inputs.AccessCoin(tx.vin[i].prevout).out;`
	`151`	`+ const Coin& coin = inputs.AccessCoin(tx.vin[i].prevout);`
	`152`	`+ assert(!coin.IsSpent());`
	`153`	`+ const CTxOut &prevout = coin.out;`
`150`	`154`	`nSigOps += CountWitnessSigOps(tx.vin[i].scriptSig, prevout.scriptPubKey, &tx.vin[i].scriptWitness, flags);`
`151`	`155`	`}`
`152`	`156`	`return nSigOps;`