Remove duplicated code block and add desired UTXO size

Author: jamescowens

src/miner.cpp

@@ -1283,7 +1283,7 @@ bool GetSideStakingStatusAndAlloc(SideStakeAlloc& vSideStakeAlloc)
 
 // This function parses the config file for the directives for stake splitting. It is used
 // in StakeMiner for the miner loop and also called by rpc getmininginfo.
-bool GetStakeSplitStatusAndParams(int64_t& nMinStakeSplitValue, double& dEfficiency)
+bool GetStakeSplitStatusAndParams(int64_t& nMinStakeSplitValue, double& dEfficiency, int64_t& nDesiredStakeOutputValue)
 {
     // Parse StakeSplit and SideStaking flags.
     bool fEnableStakeSplit = GetBoolArg("-enablestakesplit");
@@ -1306,6 +1306,18 @@ bool GetStakeSplitStatusAndParams(int64_t& nMinStakeSplitValue, double& dEfficie
         nMinStakeSplitValue = max(GetArg("-minstakesplitvalue", MIN_STAKE_SPLIT_VALUE_GRC), MIN_STAKE_SPLIT_VALUE_GRC) * COIN;
 
         LogPrintf("StakeMiner: nMinStakeSplitValue = %f", CoinToDouble(nMinStakeSplitValue));
+
+        // For the definition of the constant G, please see
+        // https://docs.google.com/document/d/1OyuTwdJx1Ax2YZ42WYkGn_UieN0uY13BTlA5G5IAN00/edit?usp=sharing
+        // Refer to page 5 for G. This link is a draft of an upcoming bluepaper section.
+        const double G = 9942.2056;
+
+        // Desired UTXO size post stake based on passed in efficiency and difficulty, but do not allow to go below
+        // passed in MinStakeSplitValue. Note that we use GetAverageDifficulty over a 4 hour (160 block period) rather than
+        // StakeKernelDiff, because the block to block difficulty has too much scatter. Please refer to the above link,
+        // equation (27) on page 10 as a reference for the below formula.
+        nDesiredStakeOutputValue = G * GetAverageDifficulty(160) * (3.0 / 2.0) * (1 / dEfficiency  - 1) * COIN;
+        nDesiredStakeOutputValue = max(nMinStakeSplitValue, nDesiredStakeOutputValue);
     }
 
     return fEnableStakeSplit;
@@ -1328,25 +1340,6 @@ void StakeMiner(CWallet *pwallet)
     // vSideStakeAlloc is an out parameter.
     bool fEnableSideStaking = GetSideStakingStatusAndAlloc(vSideStakeAlloc);
 
-    // If stake output splitting is enabled, determine efficiency and minimum stake split value.
-    if (fEnableStakeSplit)
-    {
-        // Pull efficiency for UTXO staking from config, but constrain to the interval [0.75, 0.98]. Use default of 0.90.
-        dEfficiency = (double)GetArg("-stakingefficiency", 90) / 100;
-        if (dEfficiency > 0.98)
-            dEfficiency = 0.98;
-        else if (dEfficiency < 0.75)
-            dEfficiency = 0.75;
-
-        LogPrintf("StakeMiner: dEfficiency = %f", dEfficiency);
-
-        // Pull Minimum Post Stake UTXO Split Value from config or command line parameter.
-        // Default to 800 and do not allow it to be specified below 800 GRC.
-        nMinStakeSplitValue = max(GetArg("-minstakesplitvalue", MIN_STAKE_SPLIT_VALUE_GRC), MIN_STAKE_SPLIT_VALUE_GRC) * COIN;
-
-        LogPrintf("StakeMiner: nMinStakeSplitValue = %f", CoinToDouble(nMinStakeSplitValue));
-    }
-
     supercfwd::fEnable= GetBoolArg("-supercfwd",true);
     if(fDebug) LogPrintf("supercfwd::fEnable= %d",supercfwd::fEnable);
 

src/miner.h

@@ -49,6 +49,6 @@ static const int64_t MIN_STAKE_SPLIT_VALUE_GRC = 800;
 void SplitCoinStakeOutput(CBlock &blocknew, int64_t &nReward, bool &fEnableStakeSplit, bool &fEnableSideStaking, SideStakeAlloc &vSideStakeAlloc, double &dEfficiency);
 unsigned int GetNumberOfStakeOutputs(int64_t &nValue, int64_t &nMinStakeSplitValue, double &dEfficiency);
 bool GetSideStakingStatusAndAlloc(SideStakeAlloc& vSideStakeAlloc);
-bool GetStakeSplitStatusAndParams(int64_t& nMinStakeSplitValue, double& dEfficiency);
+bool GetStakeSplitStatusAndParams(int64_t& nMinStakeSplitValue, double& dEfficiency, int64_t& nDesiredStakeOutputValue);
 
 #endif // NOVACOIN_MINER_H

src/rpcmining.cpp

@@ -69,10 +69,11 @@ UniValue getmininginfo(const UniValue& params, bool fHelp)
 
     int64_t nMinStakeSplitValue = 0;
     double dEfficiency = 0;
+    int64_t nDesiredStakeSplitValue = 0;
     SideStakeAlloc vSideStakeAlloc;
 
-    // nMinStakeSplitValue and dEfficiency are out parameters.
-    bool fEnableStakeSplit = GetStakeSplitStatusAndParams(nMinStakeSplitValue, dEfficiency);
+    // nMinStakeSplitValue, dEfficiency, and nDesiredStakeSplitValue are out parameters.
+    bool fEnableStakeSplit = GetStakeSplitStatusAndParams(nMinStakeSplitValue, dEfficiency, nDesiredStakeSplitValue);
 
     // vSideStakeAlloc is an out parameter.
     bool fEnableSideStaking = GetSideStakingStatusAndAlloc(vSideStakeAlloc);
@@ -82,6 +83,7 @@ UniValue getmininginfo(const UniValue& params, bool fHelp)
     {
         stakesplittingparam.pushKV("min-stake-split-value", nMinStakeSplitValue / COIN);
         stakesplittingparam.pushKV("efficiency", dEfficiency);
+        stakesplittingparam.pushKV("stake-split-UTXO-size-for-target-efficiency", nDesiredStakeSplitValue / COIN);
         stakesplitting.pushKV("stake-splitting-params", stakesplittingparam);
     }
     obj.pushKV("stake-splitting", stakesplitting);