[Core] Update money supply when disconnecting blocks too

random-zebra · random-zebra · commit c30b98dd0e09 · 2020-04-10T11:56:10.000+02:00
diff --git a/src/main.cpp b/src/main.cpp
@@ -2045,6 +2045,8 @@ bool DisconnectBlock(CBlock& block, CValidationState& state, CBlockIndex* pindex
     bool fClean = true;
 
     CBlockUndo blockUndo;
+    CAmount nValueOut = 0;
+    CAmount nValueIn = 0;
     CDiskBlockPos pos = pindex->GetUndoPos();
     if (pos.IsNull())
         return error("DisconnectBlock() : no undo data available");
@@ -2081,9 +2083,11 @@ bool DisconnectBlock(CBlock& block, CValidationState& state, CBlockIndex* pindex
                                 return error("Failed to parse public spend");
                             }
                             serial = publicSpend.getCoinSerialNumber();
+                            nValueIn += publicSpend.getDenomination() * COIN;
                         } else {
                             libzerocoin::CoinSpend spend = TxInToZerocoinSpend(txin);
                             serial = spend.getCoinSerialNumber();
+                            nValueIn += spend.getDenomination() * COIN;
                         }
 
                         if (!zerocoinDB->EraseCoinSpend(serial))
@@ -2116,9 +2120,11 @@ bool DisconnectBlock(CBlock& block, CValidationState& state, CBlockIndex* pindex
                 }
             }
         }
+        nValueOut += tx.GetValueOut();
 
         uint256 hash = tx.GetHash();
 
+
         // Check that all outputs are available and match the outputs in the block itself
         // exactly. Note that transactions with only provably unspendable outputs won't
         // have outputs available even in the block itself, so we handle that case
@@ -2169,8 +2175,14 @@ bool DisconnectBlock(CBlock& block, CValidationState& state, CBlockIndex* pindex
                 coins->vout[out.n] = undo.txout;
             }
         }
+
+        if (!tx.HasZerocoinSpendInputs() && !tx.IsCoinBase() && view.HaveInputs(tx))
+            nValueIn += view.GetValueIn(tx);
     }
 
+    // track money
+    nMoneySupply -= (nValueOut - nValueIn);
+
     // move best block pointer to prevout block
     view.SetBestBlock(pindex->pprev->GetBlockHash());
 

Original file line number	Diff line number	Diff line change
`@@ -2045,6 +2045,8 @@ bool DisconnectBlock(CBlock& block, CValidationState& state, CBlockIndex* pindex`
`2045`	`2045`	`bool fClean = true;`
`2046`	`2046`
`2047`	`2047`	`CBlockUndo blockUndo;`
	`2048`	`+ CAmount nValueOut = 0;`
	`2049`	`+ CAmount nValueIn = 0;`
`2048`	`2050`	`CDiskBlockPos pos = pindex->GetUndoPos();`
`2049`	`2051`	`if (pos.IsNull())`
`2050`	`2052`	`return error("DisconnectBlock() : no undo data available");`
`@@ -2081,9 +2083,11 @@ bool DisconnectBlock(CBlock& block, CValidationState& state, CBlockIndex* pindex`
`2081`	`2083`	`return error("Failed to parse public spend");`
`2082`	`2084`	`}`
`2083`	`2085`	`serial = publicSpend.getCoinSerialNumber();`
	`2086`	`+ nValueIn += publicSpend.getDenomination() * COIN;`
`2084`	`2087`	`} else {`
`2085`	`2088`	`libzerocoin::CoinSpend spend = TxInToZerocoinSpend(txin);`
`2086`	`2089`	`serial = spend.getCoinSerialNumber();`
	`2090`	`+ nValueIn += spend.getDenomination() * COIN;`
`2087`	`2091`	`}`
`2088`	`2092`
`2089`	`2093`	`if (!zerocoinDB->EraseCoinSpend(serial))`
`@@ -2116,9 +2120,11 @@ bool DisconnectBlock(CBlock& block, CValidationState& state, CBlockIndex* pindex`
`2116`	`2120`	`}`
`2117`	`2121`	`}`
`2118`	`2122`	`}`
	`2123`	`+ nValueOut += tx.GetValueOut();`
`2119`	`2124`
`2120`	`2125`	`uint256 hash = tx.GetHash();`
`2121`	`2126`
	`2127`	`+`
`2122`	`2128`	`// Check that all outputs are available and match the outputs in the block itself`
`2123`	`2129`	`// exactly. Note that transactions with only provably unspendable outputs won't`
`2124`	`2130`	`// have outputs available even in the block itself, so we handle that case`
`@@ -2169,8 +2175,14 @@ bool DisconnectBlock(CBlock& block, CValidationState& state, CBlockIndex* pindex`
`2169`	`2175`	`coins->vout[out.n] = undo.txout;`
`2170`	`2176`	`}`
`2171`	`2177`	`}`
	`2178`	`+`
	`2179`	`+ if (!tx.HasZerocoinSpendInputs() && !tx.IsCoinBase() && view.HaveInputs(tx))`
	`2180`	`+ nValueIn += view.GetValueIn(tx);`
`2172`	`2181`	`}`
`2173`	`2182`
	`2183`	`+ // track money`
	`2184`	`+ nMoneySupply -= (nValueOut - nValueIn);`
	`2185`	`+`
`2174`	`2186`	`// move best block pointer to prevout block`
`2175`	`2187`	`view.SetBestBlock(pindex->pprev->GetBlockHash());`
`2176`	`2188`