Merge pull request CoinBlack#26 from BlackcoinDev/orphanedstakes

staking: move `AbandonOrphanedCoinstakes` to BlockDisconnect
BlackcoinDev · Sep 30, 2024 · cb4e454 · cb4e454
2 parents a58ce9e + f0fea10
commit cb4e454
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 6 deletions.
diff --git a/src/node/miner.cpp b/src/node/miner.cpp
@@ -213,9 +213,6 @@ std::unique_ptr<CBlockTemplate> BlockAssembler::CreateNewBlock(const CScript& sc
     static int64_t nLastCoinStakeSearchTime = GetAdjustedTimeSeconds();  // only initialized at startup
 
     if (pwallet) {
-        // flush orphaned coinstakes
-        pwallet->AbandonOrphanedCoinstakes();
-
         // attempt to find a coinstake
         *pfPoSCancel = true;
         pblock->nBits = GetNextTargetRequired(pindexPrev, chainparams.GetConsensus(), true);

diff --git a/src/wallet/wallet.cpp b/src/wallet/wallet.cpp
@@ -1507,6 +1507,9 @@ void CWallet::blockDisconnected(const interfaces::BlockInfo& block)
             }
         }
     }
+
+    // Blackcoin - Call to abandon orphaned coinstakes after handling disconnections
+    AbandonOrphanedCoinstakes();
 }
 
 void CWallet::updatedBlockTip()
@@ -3131,9 +3134,6 @@ std::shared_ptr<CWallet> CWallet::Create(WalletContext& context, const std::stri
         walletInstance->WalletLogPrintf("m_address_book.size() = %u\n",  walletInstance->m_address_book.size());
     }
 
-    // Flush orphaned coinstakes
-    walletInstance->AbandonOrphanedCoinstakes();
-
     return walletInstance;
 }