[Staking] Fix Stake Split Threshold for PIV staking

Fuzzbawls · Fuzzbawls · commit bd7cecb325a4 · 2018-04-26T00:14:01.000-07:00
This reintroduces the calculation on wither or not the wallet should
"split" the PIV stake input.

Note: zPIV staking never splits, and it shouldn't.
diff --git a/src/stakeinput.cpp b/src/stakeinput.cpp
@@ -121,7 +121,7 @@ bool CZPivStake::CreateTxIn(CWallet* pwallet, CTxIn& txIn, uint256 hashTxOut)
     return true;
 }
 
-bool CZPivStake::CreateTxOuts(CWallet* pwallet, vector<CTxOut>& vout)
+bool CZPivStake::CreateTxOuts(CWallet* pwallet, vector<CTxOut>& vout, CAmount nTotal)
 {
     LogPrintf("%s\n", __func__);
 
@@ -193,7 +193,7 @@ CAmount CPivStake::GetValue()
     return txFrom.vout[nPosition].nValue;
 }
 
-bool CPivStake::CreateTxOuts(CWallet* pwallet, vector<CTxOut>& vout)
+bool CPivStake::CreateTxOuts(CWallet* pwallet, vector<CTxOut>& vout, CAmount nTotal)
 {
     vector<valtype> vSolutions;
     txnouttype whichType;
@@ -219,6 +219,11 @@ bool CPivStake::CreateTxOuts(CWallet* pwallet, vector<CTxOut>& vout)
         scriptPubKey = scriptPubKeyKernel;
 
     vout.emplace_back(CTxOut(0, scriptPubKey));
+
+    // Calculate if we need to split the output
+    if (nTotal / 2 > (CAmount)(pwallet->nStakeSplitThreshold * COIN))
+        vout.emplace_back(CTxOut(0, scriptPubKey));
+
     return true;
 }
 
diff --git a/src/stakeinput.h b/src/stakeinput.h
@@ -20,7 +20,7 @@ class CStakeInput
     virtual bool CreateTxIn(CWallet* pwallet, CTxIn& txIn, uint256 hashTxOut = 0) = 0;
     virtual bool GetTxFrom(CTransaction& tx) = 0;
     virtual CAmount GetValue() = 0;
-    virtual bool CreateTxOuts(CWallet* pwallet, vector<CTxOut>& vout) = 0;
+    virtual bool CreateTxOuts(CWallet* pwallet, vector<CTxOut>& vout, CAmount nTotal) = 0;
     virtual bool GetModifier(uint64_t& nStakeModifier) = 0;
     virtual bool IsZPIV() = 0;
     virtual CDataStream GetUniqueness() = 0;
@@ -55,7 +55,7 @@ class CZPivStake : public CStakeInput
     bool GetModifier(uint64_t& nStakeModifier) override;
     CDataStream GetUniqueness() override;
     bool CreateTxIn(CWallet* pwallet, CTxIn& txIn, uint256 hashTxOut = 0) override;
-    bool CreateTxOuts(CWallet* pwallet, vector<CTxOut>& vout) override;
+    bool CreateTxOuts(CWallet* pwallet, vector<CTxOut>& vout, CAmount nTotal) override;
     bool MarkSpent(CWallet* pwallet, const uint256& txid);
     bool IsZPIV() override { return true; }
     int GetChecksumHeightFromMint();
@@ -82,7 +82,7 @@ class CPivStake : public CStakeInput
     bool GetModifier(uint64_t& nStakeModifier) override;
     CDataStream GetUniqueness() override;
     bool CreateTxIn(CWallet* pwallet, CTxIn& txIn, uint256 hashTxOut = 0) override;
-    bool CreateTxOuts(CWallet* pwallet, vector<CTxOut>& vout) override;
+    bool CreateTxOuts(CWallet* pwallet, vector<CTxOut>& vout, CAmount nTotal) override;
     bool IsZPIV() override { return false; }
 };
 
diff --git a/src/wallet.cpp b/src/wallet.cpp
@@ -2936,18 +2936,20 @@ bool CWallet::CreateCoinStake(const CKeyStore& keystore, unsigned int nBits, int
             // Found a kernel
             LogPrintf("CreateCoinStake : kernel found\n");
             nCredit += stakeInput->GetValue();
-            vector<CTxOut> vout;
-            if (!stakeInput->CreateTxOuts(this, vout)) {
-                LogPrintf("%s : failed to get scriptPubKey\n", __func__);
-                continue;
-            }
-            txNew.vout.insert(txNew.vout.end(), vout.begin(), vout.end());
 
             // Calculate reward
             CAmount nReward;
             nReward = GetBlockValue(chainActive.Height() + 1);
             nCredit += nReward;
 
+            // Create the output transaction(s)
+            vector<CTxOut> vout;
+            if (!stakeInput->CreateTxOuts(this, vout, nCredit)) {
+                LogPrintf("%s : failed to get scriptPubKey\n", __func__);
+                continue;
+            }
+            txNew.vout.insert(txNew.vout.end(), vout.begin(), vout.end());
+
             CAmount nMinFee = 0;
             if (!stakeInput->IsZPIV()) {
                 // Set output amount

Original file line number	Diff line number	Diff line change
`@@ -121,7 +121,7 @@ bool CZPivStake::CreateTxIn(CWallet* pwallet, CTxIn& txIn, uint256 hashTxOut)`
`121`	`121`	`return true;`
`122`	`122`	`}`
`123`	`123`
`124`		`-bool CZPivStake::CreateTxOuts(CWallet* pwallet, vector<CTxOut>& vout)`
	`124`	`+bool CZPivStake::CreateTxOuts(CWallet* pwallet, vector<CTxOut>& vout, CAmount nTotal)`
`125`	`125`	`{`
`126`	`126`	`LogPrintf("%s\n", __func__);`
`127`	`127`
`@@ -193,7 +193,7 @@ CAmount CPivStake::GetValue()`
`193`	`193`	`return txFrom.vout[nPosition].nValue;`
`194`	`194`	`}`
`195`	`195`
`196`		`-bool CPivStake::CreateTxOuts(CWallet* pwallet, vector<CTxOut>& vout)`
	`196`	`+bool CPivStake::CreateTxOuts(CWallet* pwallet, vector<CTxOut>& vout, CAmount nTotal)`
`197`	`197`	`{`
`198`	`198`	`vector<valtype> vSolutions;`
`199`	`199`	`txnouttype whichType;`
`@@ -219,6 +219,11 @@ bool CPivStake::CreateTxOuts(CWallet* pwallet, vector<CTxOut>& vout)`
`219`	`219`	`scriptPubKey = scriptPubKeyKernel;`
`220`	`220`
`221`	`221`	`vout.emplace_back(CTxOut(0, scriptPubKey));`
	`222`	`+`
	`223`	`+ // Calculate if we need to split the output`
	`224`	`+ if (nTotal / 2 > (CAmount)(pwallet->nStakeSplitThreshold * COIN))`
	`225`	`+ vout.emplace_back(CTxOut(0, scriptPubKey));`
	`226`	`+`
`222`	`227`	`return true;`
`223`	`228`	`}`
`224`	`229`