Fix parens in assert, and make moneysupply display in COINS

qtumproject · Aug 25, 2017 · caeb532 · caeb532
1 parent 095641f
commit caeb532
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/src/rpc/misc.cpp b/src/rpc/misc.cpp
@@ -99,7 +99,7 @@ UniValue getinfo(const JSONRPCRequest& request)
     diff.push_back(Pair("proof-of-stake",       GetDifficulty(GetLastBlockIndex(pindexBestHeader, true))));
     obj.push_back(Pair("difficulty",    diff));
     obj.push_back(Pair("testnet",       Params().NetworkIDString() == CBaseChainParams::TESTNET));
-    obj.push_back(Pair("moneysupply",       pindexBestHeader->nMoneySupply));
+    obj.push_back(Pair("moneysupply",       pindexBestHeader->nMoneySupply / COIN));
 #ifdef ENABLE_WALLET
     if (pwalletMain) {
         obj.push_back(Pair("keypoololdest", pwalletMain->GetOldestKeyPoolTime()));

diff --git a/src/validation.cpp b/src/validation.cpp
@@ -2850,7 +2850,7 @@ bool ConnectBlock(const CBlock& block, CValidationState& state, CBlockIndex* pin
     //only start checking this assert after block 5000 and only on testnet and mainnet, not regtest
     if(pindex->nHeight > 5000 && !Params().GetConsensus().fPoSNoRetargeting) {
         //sanity check to shut down the network in case an exploit happens that allows new coins to be minted
-        assert(pindex->nMoneySupply < 100000000 + ((pindex->nHeight - 5000) * 4) * COIN);
+        assert(pindex->nMoneySupply <= (uint64_t)(100000000 + ((pindex->nHeight - 5000) * 4)) * COIN);
     }
     // Write undo information to disk
     if (pindex->GetUndoPos().IsNull() || !pindex->IsValid(BLOCK_VALID_SCRIPTS))