[Wallet][RPC] Remove GetStakingBalance calls to get staking status

random-zebra · random-zebra · commit 016a60ecb819 · 2020-01-15T21:06:19.000+01:00
MintableCoins() already gets the staking balance and checks it against
the reserve balance. No need to do it twice.
This affects both BitcoinMiner and getstakingstatus RPC.
diff --git a/src/miner.cpp b/src/miner.cpp
@@ -662,8 +662,6 @@ void BitcoinMiner(CWallet* pwallet, bool fProofOfStake)
     // Each thread has its own key and counter
     CReserveKey reservekey(pwallet);
     unsigned int nExtraNonce = 0;
-    bool fColdStake = GetBoolArg("-coldstaking", true);
-    CAmount stakingBalance = 0;
 
     while (fGenerateBitcoins || fProofOfStake) {
         CBlockIndex* pindexPrev = GetChainTip();
@@ -683,18 +681,16 @@ void BitcoinMiner(CWallet* pwallet, bool fProofOfStake)
             {
                 nMintableLastCheck = GetTime();
                 fMintableCoins = pwallet->MintableCoins();
-                stakingBalance = pwallet->GetStakingBalance(fColdStake);
             }
 
             while (vNodes.empty() || pwallet->IsLocked() || !fMintableCoins ||
-                   (stakingBalance > 0 && nReserveBalance >= stakingBalance) || masternodeSync.NotCompleted()) {
+                    masternodeSync.NotCompleted()) {
                 MilliSleep(5000);
                 // Do a separate 1 minute check here to ensure fMintableCoins is updated
                 if (!fMintableCoins && (GetTime() - nMintableLastCheck > 1 * 60)) // 1 minute check time
                 {
                     nMintableLastCheck = GetTime();
                     fMintableCoins = pwallet->MintableCoins();
-                    stakingBalance = pwallet->GetStakingBalance(fColdStake);
                 }
             }
 
diff --git a/src/rpc/misc.cpp b/src/rpc/misc.cpp
@@ -600,8 +600,7 @@ UniValue getstakingstatus(const UniValue& params, bool fHelp)
             "  \"haveconnections\": true|false,    (boolean) if network connections are present\n"
             "  \"mnsync\": true|false,             (boolean) if masternode data is synced\n"
             "  \"walletunlocked\": true|false,     (boolean) if the wallet is unlocked\n"
-            "  \"mintablecoins\": true|false,      (boolean) if the wallet has mintable coins\n"
-            "  \"enoughcoins\": true|false,        (boolean) if available coins are greater than reserve balance\n"
+            "  \"mintablecoins\": true|false,      (boolean) if the wallet has mintable balance (greater than reserve balance)\n"
             "  \"hashLastStakeAttempt\": xxx       (hex string) hash of last block on top of which the miner attempted to stake\n"
             "  \"heightLastStakeAttempt\": n       (integer) height of last block on top of which the miner attempted to stake\n"
             "  \"timeLastStakeAttempt\": n         (integer) time of last attempted stake\n"
@@ -623,7 +622,6 @@ UniValue getstakingstatus(const UniValue& params, bool fHelp)
         obj.push_back(Pair("mnsync", masternodeSync.IsSynced()));
         obj.push_back(Pair("walletunlocked", !pwalletMain->IsLocked()));
         obj.push_back(Pair("mintablecoins", pwalletMain->MintableCoins()));
-        obj.push_back(Pair("enoughcoins", nReserveBalance <= pwalletMain->GetStakingBalance(GetBoolArg("-coldstaking", true))));
         uint256 lastHash = pwalletMain->pStakerStatus->GetLastHash();
         obj.push_back(Pair("hashLastStakeAttempt", lastHash.GetHex()));
         obj.push_back(Pair("heightLastStakeAttempt", (mapBlockIndex.count(lastHash) > 0 ?

Original file line number	Diff line number	Diff line change
`@@ -662,8 +662,6 @@ void BitcoinMiner(CWallet* pwallet, bool fProofOfStake)`
`662`	`662`	`// Each thread has its own key and counter`
`663`	`663`	`CReserveKey reservekey(pwallet);`
`664`	`664`	`unsigned int nExtraNonce = 0;`
`665`		`- bool fColdStake = GetBoolArg("-coldstaking", true);`
`666`		`- CAmount stakingBalance = 0;`
`667`	`665`
`668`	`666`	`while (fGenerateBitcoins \|\| fProofOfStake) {`
`669`	`667`	`CBlockIndex* pindexPrev = GetChainTip();`
`@@ -683,18 +681,16 @@ void BitcoinMiner(CWallet* pwallet, bool fProofOfStake)`
`683`	`681`	`{`
`684`	`682`	`nMintableLastCheck = GetTime();`
`685`	`683`	`fMintableCoins = pwallet->MintableCoins();`
`686`		`- stakingBalance = pwallet->GetStakingBalance(fColdStake);`
`687`	`684`	`}`
`688`	`685`
`689`	`686`	`while (vNodes.empty() \|\| pwallet->IsLocked() \|\| !fMintableCoins \|\|`
`690`		`- (stakingBalance > 0 && nReserveBalance >= stakingBalance) \|\| masternodeSync.NotCompleted()) {`
	`687`	`+ masternodeSync.NotCompleted()) {`
`691`	`688`	`MilliSleep(5000);`
`692`	`689`	`// Do a separate 1 minute check here to ensure fMintableCoins is updated`
`693`	`690`	`if (!fMintableCoins && (GetTime() - nMintableLastCheck > 1 * 60)) // 1 minute check time`
`694`	`691`	`{`
`695`	`692`	`nMintableLastCheck = GetTime();`
`696`	`693`	`fMintableCoins = pwallet->MintableCoins();`
`697`		`- stakingBalance = pwallet->GetStakingBalance(fColdStake);`
`698`	`694`	`}`
`699`	`695`	`}`
`700`	`696`