[Refactoring] Decouple coinstake creation/signing

random-zebra · random-zebra · commit c6f71b2aca7c · 2021-05-03T17:04:13.000+02:00
diff --git a/src/blockassembler.cpp b/src/blockassembler.cpp
@@ -76,10 +76,14 @@ bool SolveProofOfStake(CBlock* pblock, CBlockIndex* pindexPrev, CWallet* pwallet
 
     CMutableTransaction txCoinStake;
     int64_t nTxNewTime = 0;
-    if (!pwallet->CreateCoinStake(*pwallet, pindexPrev, pblock->nBits, txCoinStake, nTxNewTime, availableCoins)) {
+    if (!pwallet->CreateCoinStake(pindexPrev, pblock->nBits, txCoinStake, nTxNewTime, availableCoins)) {
         LogPrint(BCLog::STAKING, "%s : stake not found\n", __func__);
         return false;
     }
+    if (!pwallet->SignCoinStake(txCoinStake)) {
+        const COutPoint& stakeIn = txCoinStake.vin[0].prevout;
+        return error("Unable to sign coinstake with input %s-%d", stakeIn.hash.ToString(), stakeIn.n);
+    }
     // Stake found
     pblock->nTime = nTxNewTime;
 
diff --git a/src/stakeinput.cpp b/src/stakeinput.cpp
@@ -56,7 +56,7 @@ CAmount CPivStake::GetValue() const
     return outputFrom.nValue;
 }
 
-bool CPivStake::CreateTxOuts(CWallet* pwallet, std::vector<CTxOut>& vout, CAmount nTotal)
+bool CPivStake::CreateTxOuts(const CWallet* pwallet, std::vector<CTxOut>& vout, CAmount nTotal) const
 {
     std::vector<valtype> vSolutions;
     txnouttype whichType;
diff --git a/src/stakeinput.h b/src/stakeinput.h
@@ -25,7 +25,6 @@ class CStakeInput
     virtual const CBlockIndex* GetIndexFrom() const = 0;
     virtual bool GetTxOutFrom(CTxOut& out) const = 0;
     virtual CAmount GetValue() const = 0;
-    virtual bool CreateTxOuts(CWallet* pwallet, std::vector<CTxOut>& vout, CAmount nTotal) = 0;
     virtual bool IsZPIV() const = 0;
     virtual CDataStream GetUniqueness() const = 0;
     virtual bool ContextCheck(int nHeight, uint32_t nTime) = 0;
@@ -50,7 +49,7 @@ class CPivStake : public CStakeInput
     CAmount GetValue() const override;
     CDataStream GetUniqueness() const override;
     CTxIn GetTxIn() const;
-    bool CreateTxOuts(CWallet* pwallet, std::vector<CTxOut>& vout, CAmount nTotal) override;
+    bool CreateTxOuts(const CWallet* pwallet, std::vector<CTxOut>& vout, CAmount nTotal) const;
     bool IsZPIV() const override { return false; }
     bool ContextCheck(int nHeight, uint32_t nTime) override;
 };
diff --git a/src/wallet/wallet.cpp b/src/wallet/wallet.cpp
@@ -3208,16 +3208,12 @@ bool CWallet::CreateTransaction(CScript scriptPubKey, const CAmount& nValue, CTr
 }
 
 bool CWallet::CreateCoinStake(
-        const CKeyStore& keystore,
         const CBlockIndex* pindexPrev,
         unsigned int nBits,
         CMutableTransaction& txNew,
         int64_t& nTxNewTime,
-        std::vector<CStakeableOutput>* availableCoins)
+        std::vector<CStakeableOutput>* availableCoins) const
 {
-
-    const Consensus::Params& consensus = Params().GetConsensus();
-
     // Mark coin stake transaction
     txNew.vin.clear();
     txNew.vout.clear();
@@ -3311,9 +3307,11 @@ bool CWallet::CreateCoinStake(
     }
     LogPrint(BCLog::STAKING, "%s: attempted staking %d times\n", __func__, nAttempts);
 
-    if (!fKernelFound)
-        return false;
+    return fKernelFound;
+}
 
+bool CWallet::SignCoinStake(CMutableTransaction& txNew) const
+{
     // Sign it
     int nIn = 0;
     for (const CTxIn& txIn : txNew.vin) {
@@ -3322,7 +3320,7 @@ bool CWallet::CreateCoinStake(
             return error("%s : failed to sign coinstake", __func__);
     }
 
-    // Successfully generated coinstake
+    // Successfully signed coinstake
     return true;
 }
 
diff --git a/src/wallet/wallet.h b/src/wallet/wallet.h
@@ -1032,12 +1032,12 @@ class CWallet : public CCryptoKeyStore, public CValidationInterface
     };
     CWallet::CommitResult CommitTransaction(CTransactionRef tx, CReserveKey& opReservekey, CConnman* connman);
     CWallet::CommitResult CommitTransaction(CTransactionRef tx, CReserveKey* reservekey, CConnman* connman);
-    bool CreateCoinStake(const CKeyStore& keystore,
-                         const CBlockIndex* pindexPrev,
+    bool CreateCoinStake(const CBlockIndex* pindexPrev,
                          unsigned int nBits,
                          CMutableTransaction& txNew,
                          int64_t& nTxNewTime,
-                         std::vector<CStakeableOutput>* availableCoins);
+                         std::vector<CStakeableOutput>* availableCoins) const;
+    bool SignCoinStake(CMutableTransaction& txNew) const;
     void AutoCombineDust(CConnman* connman);
 
     // Shielded balances
diff --git a/src/zpiv/zpos.h b/src/zpiv/zpos.h
@@ -25,7 +25,6 @@ class CLegacyZPivStake : public CStakeInput
     const CBlockIndex* GetIndexFrom() const override;
     CAmount GetValue() const override;
     CDataStream GetUniqueness() const override;
-    bool CreateTxOuts(CWallet* pwallet, std::vector<CTxOut>& vout, CAmount nTotal) override { return false; /* creation disabled */}
     bool GetTxOutFrom(CTxOut& out) const override { return false; /* not available */ }
     virtual bool ContextCheck(int nHeight, uint32_t nTime) override;
 };

Original file line number	Diff line number	Diff line change
`@@ -56,7 +56,7 @@ CAmount CPivStake::GetValue() const`
`56`	`56`	`return outputFrom.nValue;`
`57`	`57`	`}`
`58`	`58`
`59`		`-bool CPivStake::CreateTxOuts(CWallet* pwallet, std::vector<CTxOut>& vout, CAmount nTotal)`
	`59`	`+bool CPivStake::CreateTxOuts(const CWallet* pwallet, std::vector<CTxOut>& vout, CAmount nTotal) const`
`60`	`60`	`{`
`61`	`61`	`std::vector<valtype> vSolutions;`
`62`	`62`	`txnouttype whichType;`