initialize minting thread

DeFiCh · Sep 24, 2019 · e012861 · e012861
1 parent 8025e22
commit e012861
Show file tree

Hide file tree

Showing 3 changed files with 38 additions and 3 deletions.
diff --git a/src/init.cpp b/src/init.cpp
@@ -24,6 +24,7 @@
 #include <index/txindex.h>
 #include <interfaces/chain.h>
 #include <key.h>
+#include <key_io.h>
 #include <miner.h>
 #include <net.h>
 #include <net_permissions.h>
@@ -54,6 +55,7 @@
 #include <validation.h>
 #include <validationinterface.h>
 #include <walletinitinterface.h>
+#include <wallet/wallet.h>
 
 #include <stdint.h>
 #include <stdio.h>
@@ -1823,5 +1825,37 @@ bool AppInitMain(InitInterfaces& interfaces)
         g_banman->DumpBanlist();
     }, DUMP_BANS_INTERVAL * 1000);
 
+
+    // ********************************************************* Step 14: start minter thread
+    pos::ThreadStaker::Args stakerParams{};
+    {
+        CTxDestination destination = DecodeDestination(gArgs.GetArg("-minterAddress", ""));
+        if (!IsValidDestination(destination)) {
+            LogPrintf("coinstake destination is invalid");
+            return false;
+        }
+
+        CKey key;
+        std::vector<std::shared_ptr<CWallet>> wallets = GetWallets();
+        if (wallets.size() == 0 || !wallets[0]->GetKey( CKeyID(*boost::get<PKHash>(&destination)), key)) {
+            LogPrintf("priv key not found");
+            return false;
+        }
+
+        stakerParams.coinbaseScript = GetScriptForDestination(destination);
+        stakerParams.minterKey = key;
+    }
+
+    // Mint proof-of-stake blocks in background
+    threadGroup.create_thread([=]() {
+        TraceThread("CoinStaker", [=]() {
+            // Fill Staker Args
+
+            // Run ThreadStaker
+            pos::ThreadStaker threadStaker{};
+            threadStaker(stakerParams, chainparams);
+        });
+    });
+
     return true;
 }
diff --git a/src/net_processing.cpp b/src/net_processing.cpp
@@ -1913,6 +1913,7 @@ bool static ProcessMessage(CNode* pfrom, const std::string& strCommand, CDataStr
         int64_t nTime;
         CAddress addrMe;
         CAddress addrFrom;
+        uint64_t nNonce = 1;
         uint64_t nServiceInt;
         ServiceFlags nServices;
         int nVersion;
@@ -1951,7 +1952,7 @@ bool static ProcessMessage(CNode* pfrom, const std::string& strCommand, CDataStr
         }
 
         if (!vRecv.empty())
-            vRecv >> addrFrom;
+            vRecv >> addrFrom >> nNonce;
         if (!vRecv.empty()) {
             std::string strSubVer;
             vRecv >> LIMITED_STRING(strSubVer, MAX_SUBVERSION_LENGTH);
@@ -1963,7 +1964,7 @@ bool static ProcessMessage(CNode* pfrom, const std::string& strCommand, CDataStr
         if (!vRecv.empty())
             vRecv >> fRelay;
         // Disconnect if we connected to ourself
-        if (pfrom->fInbound) // TODO: (SS) && !connman->CheckIncomingNonce(nNonce)
+        if (pfrom->fInbound && !connman->CheckIncomingNonce(nNonce))
         {
             LogPrintf("connected to self at %s, disconnecting\n", pfrom->addr.ToString());
             pfrom->fDisconnect = true;

diff --git a/src/test/util.cpp b/src/test/util.cpp
@@ -56,7 +56,7 @@ CTxIn MineBlock(const CScript& coinbase_scriptPubKey)
 {
     auto block = PrepareBlock(coinbase_scriptPubKey);
 
-//    while (!CheckProofOfWork(block->GetHash(), block->nBits, Params().GetConsensus())) { // TODO: (SS)
+//    while (!CheckProofOfWork(block->GetHash(), block->nBits, Params().GetConsensus())) { // TODO: (SS) I broke this
 //        ++block->nNonce;
 //        assert(block->nNonce);
 //    }