Add multi wallet multi threaded staking

Author: ComputerCraftr

src/init.cpp

@@ -2031,8 +2031,10 @@ bool AppInitMain(const util::Ref& context, NodeContext& node, interfaces::BlockA
     }, DUMP_BANS_INTERVAL);
 
     std::vector<std::shared_ptr<CWallet>> wallets = GetWallets();
-    if (wallets.size() && wallets[0])
-        MintStake(threadGroup, wallets[0], node.chainman, node.connman.get(), node.mempool.get());
+    for (unsigned int i = 0; i < wallets.size(); i++) {
+        if (wallets[i])
+            MintStake(threadGroup, wallets[i], i+1, node.chainman, node.connman.get(), node.mempool.get());
+    }
 
 #if HAVE_SYSTEM
     StartupNotify(args);

src/miner.cpp

@@ -717,11 +717,8 @@ static inline bool ProcessBlockFound(const CBlock* pblock, const CChainParams& c
     //LogPrintf("generated %s\n", FormatMoney(pblock->IsProofOfStake() ? pblock->vtx[1]->GetValueOut() : pblock->vtx[0]->GetValueOut()));
 
     // Found a solution
-    {
-        LOCK(cs_main);
-        if (pblock->hashPrevBlock != ::ChainActive().Tip()->GetBlockHash())
-            return error("XEPMiner: generated block is stale");
-    }
+    if (pblock->hashPrevBlock != ::ChainActive().Tip()->GetBlockHash())
+        return error("XEPMiner: generated block is stale");
 
     // Process this block the same as if we had received it from another node
     std::shared_ptr<const CBlock> shared_pblock = std::make_shared<const CBlock>(*pblock);
@@ -734,7 +731,6 @@ static inline bool ProcessBlockFound(const CBlock* pblock, const CChainParams& c
 static inline void PoSMiner(std::shared_ptr<CWallet> pwallet, ChainstateManager* chainman, CConnman* connman, CTxMemPool* mempool)
 {
     LogPrintf("CPUMiner started for proof-of-stake\n");
-    util::ThreadRename("xep-stake-minter");
 
     unsigned int nExtraNonce = 0;
 
@@ -750,13 +746,13 @@ static inline void PoSMiner(std::shared_ptr<CWallet> pwallet, ChainstateManager*
         LogPrintf("Set proof-of-stake timeout: %ums for %u UTXOs\n", pos_timio, vCoins.size());
     }
 
-    std::string strMintMessage = _("Info: Minting suspended due to locked wallet.").translated;
-    std::string strMintSyncMessage = _("Info: Minting suspended while synchronizing wallet.").translated;
-    std::string strMintDisabledMessage = _("Info: Minting disabled by 'nostaking' option.").translated;
-    std::string strMintBlockMessage = _("Info: Minting suspended due to block creation failure.").translated;
-    std::string strMintEmpty = "";
+    const std::string strMintMessage = _("Info: Minting suspended due to locked wallet.").translated;
+    const std::string strMintSyncMessage = _("Info: Minting suspended while synchronizing wallet.").translated;
+    const std::string strMintDisabledMessage = _("Info: Minting disabled by 'nostaking' option.").translated;
+    const std::string strMintBlockMessage = _("Info: Minting suspended due to block creation failure.").translated;
+    const std::string strMintEmpty = "";
     if (!gArgs.GetBoolArg("-staking", true)) {
-        strMintWarning = strMintDisabledMessage;
+        SetMintWarning(strMintDisabledMessage);
         LogPrintf("proof-of-stake minter disabled\n");
         return;
     }
@@ -765,8 +761,8 @@ static inline void PoSMiner(std::shared_ptr<CWallet> pwallet, ChainstateManager*
         bool fNeedToClear = false;
         while (true) {
             while (pwallet->IsLocked()) {
-                if (strMintWarning != strMintMessage) {
-                    strMintWarning = strMintMessage;
+                if (GetMintWarning() != strMintMessage) {
+                    SetMintWarning(strMintMessage);
                     uiInterface.NotifyAlertChanged();
                 }
                 fNeedToClear = true;
@@ -778,8 +774,8 @@ static inline void PoSMiner(std::shared_ptr<CWallet> pwallet, ChainstateManager*
                 // Busy-wait for the network to come online so we don't waste time mining
                 // on an obsolete chain. In regtest mode we expect to fly solo.
                 while (connman == nullptr || connman->GetNodeCount(CConnman::CONNECTIONS_ALL) == 0 || ::ChainstateActive().IsInitialBlockDownload()) {
-                    if (strMintWarning != strMintSyncMessage) {
-                        strMintWarning = strMintSyncMessage;
+                    if (GetMintWarning() != strMintSyncMessage) {
+                        SetMintWarning(strMintSyncMessage);
                         uiInterface.NotifyAlertChanged();
                     }
                     fNeedToClear = true;
@@ -790,16 +786,16 @@ static inline void PoSMiner(std::shared_ptr<CWallet> pwallet, ChainstateManager*
 
             while (GuessVerificationProgress(Params().TxData(), ::ChainActive().Tip()) < 0.996) {
                 LogPrintf("Minter thread sleeps while sync at %f\n", GuessVerificationProgress(Params().TxData(), ::ChainActive().Tip()));
-                if (strMintWarning != strMintSyncMessage) {
-                    strMintWarning = strMintSyncMessage;
+                if (GetMintWarning() != strMintSyncMessage) {
+                    SetMintWarning(strMintSyncMessage);
                     uiInterface.NotifyAlertChanged();
                 }
                 fNeedToClear = true;
                 if (!connman->interruptNet.sleep_for(std::chrono::seconds(10)))
                     return;
             }
             if (fNeedToClear) {
-                strMintWarning = strMintEmpty;
+                SetMintWarning(strMintEmpty);
                 uiInterface.NotifyAlertChanged();
                 fNeedToClear = false;
             }
@@ -824,7 +820,7 @@ static inline void PoSMiner(std::shared_ptr<CWallet> pwallet, ChainstateManager*
                         return;
                     continue;
                 }
-                strMintWarning = strMintBlockMessage;
+                SetMintWarning(strMintBlockMessage);
                 uiInterface.NotifyAlertChanged();
                 LogPrintf("Error in XEPMiner: Keypool ran out, please call keypoolrefill before restarting the staking thread\n");
                 if (!connman->interruptNet.sleep_for(std::chrono::seconds(10)))
@@ -837,6 +833,7 @@ static inline void PoSMiner(std::shared_ptr<CWallet> pwallet, ChainstateManager*
             bool pubkeyInSig = true;
             {
                 LOCK(pwallet->cs_wallet);
+
                 if (!pwallet->GetBlockSigningPubKey(*pblock, signingPubKey, pubkeyInSig)) {
                     LogPrintf("PoSMiner(): failed to get signing pubkey for PoS block\n");
                     continue;
@@ -847,6 +844,7 @@ static inline void PoSMiner(std::shared_ptr<CWallet> pwallet, ChainstateManager*
             // peercoin: if proof-of-stake block found then process block
             {
                 LOCK(pwallet->cs_wallet);
+
                 if (!pwallet->SignBlock(*pblock, signingPubKey)) {
                     LogPrintf("PoSMiner(): failed to sign PoS block\n");
                     continue;
@@ -873,22 +871,23 @@ static inline void PoSMiner(std::shared_ptr<CWallet> pwallet, ChainstateManager*
 }
 
 // peercoin: stake minter thread
-static void ThreadStakeMinter(std::shared_ptr<CWallet> pwallet, ChainstateManager* chainman, CConnman* connman, CTxMemPool* mempool)
+static void ThreadStakeMinter(std::shared_ptr<CWallet> pwallet, const unsigned int walletNum, ChainstateManager* chainman, CConnman* connman, CTxMemPool* mempool)
 {
-    LogPrintf("ThreadStakeMinter started\n");
+    util::ThreadRename("xep-stake-minter-" + std::to_string(walletNum));
+    LogPrintf("ThreadStakeMinter #%u started\n", walletNum);
     try {
         PoSMiner(pwallet, chainman, connman, mempool);
     } catch (std::exception& e) {
         PrintExceptionContinue(&e, "ThreadStakeMinter()");
     } catch (...) {
         PrintExceptionContinue(NULL, "ThreadStakeMinter()");
     }
-    LogPrintf("ThreadStakeMinter exiting\n");
+    LogPrintf("ThreadStakeMinter #%u exiting\n", walletNum);
 }
 
 // peercoin: stake minter
-void MintStake(boost::thread_group& threadGroup, std::shared_ptr<CWallet> pwallet, ChainstateManager* chainman, CConnman* connman, CTxMemPool* mempool)
+void MintStake(boost::thread_group& threadGroup, std::shared_ptr<CWallet> pwallet, const unsigned int walletNum, ChainstateManager* chainman, CConnman* connman, CTxMemPool* mempool)
 {
     // peercoin: mint proof-of-stake blocks in the background
-    threadGroup.create_thread(boost::bind(&ThreadStakeMinter, pwallet, chainman, connman, mempool));
+    threadGroup.create_thread(boost::bind(&ThreadStakeMinter, pwallet, walletNum, chainman, connman, mempool));
 }

src/miner.h

@@ -222,6 +222,6 @@ namespace boost {
 } // namespace boost
 
 bool CreateCoinStake(CMutableTransaction& coinstakeTx, CBlock* pblock, std::shared_ptr<CWallet> pwallet, const int& nHeight, const CBlockIndex* pindexPrev, const Consensus::Params& consensusParams);
-void MintStake(boost::thread_group& threadGroup, std::shared_ptr<CWallet> pwallet, ChainstateManager* chainman, CConnman* connman, CTxMemPool* mempool);
+void MintStake(boost::thread_group& threadGroup, std::shared_ptr<CWallet> pwallet, const unsigned int walletNum, ChainstateManager* chainman, CConnman* connman, CTxMemPool* mempool);
 
 #endif // BITCOIN_MINER_H

src/warnings.cpp

@@ -16,7 +16,7 @@ static Mutex g_warnings_mutex;
 static bilingual_str g_misc_warnings GUARDED_BY(g_warnings_mutex);
 static bool fLargeWorkForkFound GUARDED_BY(g_warnings_mutex) = false;
 static bool fLargeWorkInvalidChainFound GUARDED_BY(g_warnings_mutex) = false;
-std::string strMintWarning;
+static std::string strMintWarning GUARDED_BY(g_warnings_mutex);
 
 void SetMiscWarning(const bilingual_str& warning)
 {
@@ -42,6 +42,18 @@ void SetfLargeWorkInvalidChainFound(bool flag)
     fLargeWorkInvalidChainFound = flag;
 }
 
+void SetMintWarning(const std::string& warning)
+{
+    LOCK(g_warnings_mutex);
+    strMintWarning = warning;
+}
+
+std::string GetMintWarning()
+{
+    LOCK(g_warnings_mutex);
+    return strMintWarning;
+}
+
 bilingual_str GetWarnings(bool verbose)
 {
     bilingual_str warnings_concise;

src/warnings.h

@@ -14,6 +14,8 @@ void SetMiscWarning(const bilingual_str& warning);
 void SetfLargeWorkForkFound(bool flag);
 bool GetfLargeWorkForkFound();
 void SetfLargeWorkInvalidChainFound(bool flag);
+void SetMintWarning(const std::string& warning);
+std::string GetMintWarning();
 /** Format a string that describes several potential problems detected by the core.
  * @param[in] verbose bool
  * - if true, get all warnings separated by <hr />
@@ -22,5 +24,4 @@ void SetfLargeWorkInvalidChainFound(bool flag);
  */
 bilingual_str GetWarnings(bool verbose);
 
-extern std::string strMintWarning;
 #endif //  BITCOIN_WARNINGS_H