Update rewards manager

- Fix database functions for stake split threshold and auto combine dust functions
- Rename autocombinerewards to autocombinedust
- Remove change output from autocombinedust
- Cleanup scheduling and initialization

src/init.cpp

@@ -32,7 +32,6 @@
 #include <policy/fees.h>
 #include <policy/policy.h>
 #include <pos/staking-manager.h>
-#include <reward-manager.h>
 #include <rpc/server.h>
 #include <rpc/register.h>
 #include <rpc/blockchain.h>
@@ -125,6 +124,7 @@ class DummyWalletInit : public WalletInitInterface {
     // Wagerr Specific WalletInitInterface InitCoinJoinSettings
     void AutoLockMasternodeCollaterals() const override {}
     void InitStaking() const override {}
+    void InitRewardsManagement() const override {}
     void InitCoinJoinSettings() const override {}
     void InitKeePass() const override {}
     bool InitAutoBackup() const override {return true;}
@@ -342,7 +342,6 @@ void PrepareShutdown()
         evoDb.reset();
         zerocoinDB.reset();
         pTokenDB.reset();
-        rewardManager.reset();
         tokenGroupManager.reset();
     }
     g_wallet_init_interface.Stop();
@@ -1991,8 +1990,6 @@ bool AppInitMain()
                 pTokenDB.reset(new CTokenDB(0, false, fReset || fReindexChainState));
                 tokenGroupManager.reset();
                 tokenGroupManager.reset(new CTokenGroupManager());
-                rewardManager.reset();
-                rewardManager.reset(new CRewardManager());
 
                 llmq::InitLLMQSystem(*evoDb, false, fReset || fReindexChainState);
 
@@ -2282,6 +2279,7 @@ bool AppInitMain()
     // ********************************************************* Step 10b: setup Staking
 
     g_wallet_init_interface.InitStaking();
+    g_wallet_init_interface.InitRewardsManagement();
 
     // ********************************************************* Step 10b: Load cache data
 

src/reward-manager.cpp

@@ -16,7 +16,7 @@
 std::shared_ptr<CRewardManager> rewardManager;
 
 CRewardManager::CRewardManager() :
-        fEnableRewardManager(false), fEnableAutoCombineRewards(false), nAutoCombineAmountThreshold(0), nAutoCombineNThreshold(10) {
+        fEnableRewardManager(false), nAutoCombineNThreshold(10) {
 }
 
 bool CRewardManager::IsReady() {
@@ -36,15 +36,25 @@ bool CRewardManager::IsReady() {
     return true;
 }
 
-bool CRewardManager::IsCombining()
+bool CRewardManager::IsAutoCombineEnabled()
 {
-    return IsReady() && IsAutoCombineEnabled();
+    bool fEnable;
+    CAmount nAutoCombineAmountThreshold;
+    pwallet->GetAutoCombineSettings(fEnable, nAutoCombineAmountThreshold);
+    return fEnable;
 }
 
-void CRewardManager::AutoCombineSettings(bool fEnable, CAmount nAutoCombineAmountThresholdIn) {
-    LOCK(cs);
-    fEnableAutoCombineRewards = fEnable;
-    nAutoCombineAmountThreshold = nAutoCombineAmountThresholdIn;
+CAmount CRewardManager::GetAutoCombineThresholdAmount()
+{
+    bool fEnable;
+    CAmount nAutoCombineAmountThreshold;
+    pwallet->GetAutoCombineSettings(fEnable, nAutoCombineAmountThreshold);
+    return nAutoCombineAmountThreshold;
+}
+
+bool CRewardManager::IsCombining()
+{
+    return IsReady() && IsAutoCombineEnabled();
 }
 
 // TODO: replace with pwallet->FilterCoins()
@@ -67,7 +77,12 @@ std::map<CTxDestination, std::vector<COutput> > CRewardManager::AvailableCoinsBy
     return mapCoins;
 }
 
-void CRewardManager::AutoCombineRewards() {
+void CRewardManager::AutocombineDust() {
+    bool fEnable;
+    CAmount nAutoCombineAmountThreshold;
+    pwallet->GetAutoCombineSettings(fEnable, nAutoCombineAmountThreshold);
+    if (!fEnable) return;
+
     std::map<CTxDestination, std::vector<COutput> > mapCoinsByAddress = AvailableCoinsByAddress(true, nAutoCombineAmountThreshold * COIN);
 
     //coins are sectioned by address. This combination code only wants to combine inputs that belong to the same address
@@ -123,8 +138,8 @@ void CRewardManager::AutoCombineRewards() {
         std::vector<CRecipient> vecSend;
         int nChangePosRet = -1;
         CScript scriptPubKey = GetScriptForDestination(it->first);
-        // 10% safety margin to avoid "Insufficient funds" errors
-        CRecipient recipient = {scriptPubKey, nTotalRewardsValue - (nTotalRewardsValue / 10), false};
+        // Subtract fee from amount
+        CRecipient recipient = {scriptPubKey, nTotalRewardsValue, true};
         vecSend.push_back(recipient);
 
         //Send change to same address
@@ -169,7 +184,7 @@ void CRewardManager::DoMaintenance(CConnman& connman) {
     }
 
     if (IsAutoCombineEnabled()) {
-        AutoCombineRewards();
+        AutocombineDust();
         int randsleep = GetRandInt(5 * 60 * 1000);
         MilliSleep(randsleep); // Sleep between 3 and 8 minutes
     }

src/reward-manager.h

@@ -33,20 +33,16 @@ class CRewardManager
     }
 
     bool fEnableRewardManager;
-
-    bool fEnableAutoCombineRewards;
-    CAmount nAutoCombineAmountThreshold;
     uint32_t nAutoCombineNThreshold;
 
     bool IsReady();
     bool IsCombining();
 
-    bool IsAutoCombineEnabled() { return fEnableAutoCombineRewards; };
-    CAmount GetAutoCombineThresholdAmount() { return nAutoCombineAmountThreshold; };
-    void AutoCombineSettings(bool fEnable, CAmount nAutoCombineAmountThresholdIn = 0);
+    bool IsAutoCombineEnabled();
+    CAmount GetAutoCombineThresholdAmount();
 
     std::map<CTxDestination, std::vector<COutput> > AvailableCoinsByAddress(bool fConfirmed, CAmount maxCoinValue);
-    void AutoCombineRewards();
+    void AutocombineDust();
 
     void DoMaintenance(CConnman& connman);
 };

src/rpc/client.cpp

@@ -183,8 +183,8 @@ static const CRPCConvertParam vRPCConvertParams[] =
     { "getspecialtxes", 4, "verbosity" },
     { "disconnectnode", 1, "nodeid" },
     { "setstakesplitthreshold", 0, "value" },
-    { "autocombinerewards", 0, "enable" },
-    { "autocombinerewards", 1, "threshold" },
+    { "autocombinedust", 0, "enable" },
+    { "autocombinedust", 1, "threshold" },
     { "createrawtokentransaction", 0, "inputs" },
     { "createrawtokentransaction", 1, "outputs" },
     { "createrawtokentransaction", 2, "token_outputs" },

src/wallet/init.cpp

@@ -59,6 +59,7 @@ class WalletInit : public WalletInitInterface {
     void AutoLockMasternodeCollaterals() const override;
     void InitCoinJoinSettings() const override;
     void InitStaking() const override;
+    void InitRewardsManagement() const override;
     void InitKeePass() const override;
     bool InitAutoBackup() const override;
 };
@@ -436,10 +437,10 @@ void WalletInit::Start(CScheduler& scheduler) const
     }
 
     if (stakingManager->fEnableStaking) {
-        scheduler.scheduleEvery(boost::bind(&CStakingManager::DoMaintenance, boost::ref(stakingManager), boost::ref(*g_connman)), 5 * 1000);
+        scheduler.scheduleEvery(std::bind(&CStakingManager::DoMaintenance, std::ref(*stakingManager), std::ref(*g_connman)), 5 * 1000);
     }
     if (rewardManager->fEnableRewardManager) {
-        scheduler.scheduleEvery(boost::bind(&CRewardManager::DoMaintenance, boost::ref(rewardManager), boost::ref(*g_connman)), 3 * 60 * 1000);
+        scheduler.scheduleEvery(std::bind(&CRewardManager::DoMaintenance, std::ref(*rewardManager), std::ref(*g_connman)), 3 * 60 * 1000);
     }
 }
 
@@ -511,9 +512,6 @@ void WalletInit::InitStaking() const
         stakingManager = std::shared_ptr<CStakingManager>(new CStakingManager(wallets[0]));
         stakingManager->fEnableStaking = gArgs.GetBoolArg("-staking", true);
         stakingManager->fEnableWAGERRStaking = gArgs.GetBoolArg("-staking", true);
-
-        rewardManager->BindWallet(wallets[0].get());
-        rewardManager->fEnableRewardManager = true;
     }
     if (Params().NetworkIDString() == CBaseChainParams::REGTEST) {
         stakingManager->fEnableStaking = false;
@@ -527,6 +525,16 @@ void WalletInit::InitStaking() const
     stakingManager->nReserveBalance = nReserveBalance;
 }
 
+void WalletInit::InitRewardsManagement() const
+{
+    rewardManager = std::shared_ptr<CRewardManager>(new CRewardManager());
+    std::vector<std::shared_ptr<CWallet>> wallets = GetWallets();
+    if (HasWallets() && wallets.size() >= 1) {
+        rewardManager->BindWallet(wallets[0].get());
+        rewardManager->fEnableRewardManager = true;
+    }
+}
+
 void WalletInit::InitKeePass() const
 {
     keePassInt.init();

src/wallet/rpcwallet.cpp

@@ -4000,7 +4000,7 @@ UniValue setstakesplitthreshold(const JSONRPCRequest& request)
     return result;
 }
 
-UniValue autocombinerewards(const JSONRPCRequest& request)
+UniValue autocombinedust(const JSONRPCRequest& request)
 {
     std::shared_ptr<CWallet> const wallet = GetWalletForJSONRPCRequest(request);
     CWallet* const pwallet = wallet.get();
@@ -4016,16 +4016,16 @@ UniValue autocombinerewards(const JSONRPCRequest& request)
 
     if (request.fHelp || nParamsSize < 1 || (!fEnable && nParamsSize > 1) || nParamsSize > 2)
         throw std::runtime_error(
-            "autocombinerewards enable ( threshold )\n"
+            "autocombinedust enable ( threshold )\n"
             "\nWallet will automatically monitor for any coins with value below the threshold amount, and combine them if they reside with the same Wagerr address\n"
-            "When autocombinerewards runs it will create a transaction, and therefore will be subject to transaction fees.\n"
+            "When autocombinedust runs it will create a transaction, and therefore will be subject to transaction fees.\n"
 
             "\nArguments:\n"
             "1. enable                  (boolean, required) Enable auto combine (true) or disable (false)\n"
             "2. threshold amount        (numeric, optional) Coins with an aggregated value of this amount will be combined (default: 0)\n"
 
             "\nExamples:\n" +
-            HelpExampleCli("autocombinerewards", "true 500") + HelpExampleRpc("autocombinerewards", "true 500"));
+            HelpExampleCli("autocombinedust", "true 500") + HelpExampleRpc("autocombinedust", "true 500"));
 
     EnsureWalletIsUnlocked(pwallet);
 
@@ -4044,8 +4044,6 @@ UniValue autocombinerewards(const JSONRPCRequest& request)
         throw std::runtime_error("Changed settings in wallet but failed to save to database\n");
     }
 
-    rewardManager->AutoCombineSettings(fEnable, nThresholdAmount);
-
     result.push_back(Pair("threshold", int(rewardManager->GetAutoCombineThresholdAmount())));
     result.push_back(Pair("enabled", rewardManager->IsAutoCombineEnabled()));
 
@@ -4618,6 +4616,7 @@ static const CRPCCommand commands[] =
 
     { "wallet",             "getstakingstatus",         &getstakingstatus,         {} },
     { "wallet",             "setstakesplitthreshold",   &setstakesplitthreshold,   {"value"} },
+    { "wallet",             "autocombinedust",       &autocombinedust,       {"enable", "threshold"} },
 };
 
 void RegisterWalletRPCCommands(CRPCTable &t)

src/wallet/wallet.cpp

@@ -1789,7 +1789,10 @@ CAmount CWallet::GetChange(const CTxOut& txout) const
 bool CWallet::SetStakeSplitThreshold(uint64_t newThreshold)
 {
     WalletBatch batch(*database);
-    return batch.WriteStakeSplitThreshold(newThreshold);
+    if (!batch.WriteStakeSplitThreshold(newThreshold))
+        return false;
+    LoadStakeSplitThreshold(newThreshold);
+    return true;
 }
 
 void CWallet::LoadStakeSplitThreshold(uint64_t newThreshold)
@@ -1805,7 +1808,22 @@ uint64_t CWallet::GetStakeSplitThreshold()
 bool CWallet::SetAutoCombineSettings(bool fEnable, CAmount nCombineThreshold)
 {
     WalletBatch batch(*database);
-    return batch.WriteAutoCombineSettings(fEnable, nCombineThreshold);
+    if (!batch.WriteAutoCombineSettings(fEnable, nCombineThreshold))
+        return false;
+    LoadAutoCombineSettings(fEnable, nCombineThreshold);
+    return true;
+}
+
+void CWallet::LoadAutoCombineSettings(bool fEnableIn, CAmount nCombineThresholdIn)
+{
+    fCombineEnable = fEnableIn;
+    nCombineThreshold = nCombineThresholdIn;
+}
+
+void CWallet::GetAutoCombineSettings(bool& fEnableRet, CAmount& nCombineThresholdRet) const
+{
+    fEnableRet = fCombineEnable;
+    nCombineThresholdRet = nCombineThreshold;
 }
 
 void CWallet::GenerateNewHDChain(const SecureString& secureMnemonic, const SecureString& secureMnemonicPassphrase)

src/wallet/wallet.h

@@ -871,6 +871,8 @@ class CWallet final : public CCryptoKeyStore, public CValidationInterface
 
     // Staking and POS
     uint64_t nStakeSplitThreshold = 2000;
+    CAmount nCombineThreshold = 500;
+    bool fCombineEnable = false;
 
 public:
     /*
@@ -1290,6 +1292,8 @@ class CWallet final : public CCryptoKeyStore, public CValidationInterface
     void LoadStakeSplitThreshold(uint64_t newThreshold);
     uint64_t GetStakeSplitThreshold();
     bool SetAutoCombineSettings(bool fEnable, CAmount nCombineThreshold);
+    void LoadAutoCombineSettings(bool fEnableIn, CAmount nCombineThresholdIn);
+    void GetAutoCombineSettings(bool& fEnableRet, CAmount& nCombineThresholdRet) const;
 
     /**
      * HD Wallet Functions

src/wallet/walletdb.cpp

@@ -595,9 +595,6 @@ ReadKeyValue(CWallet* pwallet, CDataStream& ssKey, CDataStream& ssValue,
                 return false;
             }
         }
-        else if (strType != "bestblock" && strType != "bestblock_nomerkle"){
-            wss.m_unknown_records++;
-        }
         else if (strType == "stakeSplitThreshold")
         {
             uint64_t nStakeSplitThreshold;
@@ -608,7 +605,10 @@ ReadKeyValue(CWallet* pwallet, CDataStream& ssKey, CDataStream& ssValue,
         {
             std::pair<bool, CAmount> pSettings;
             ssValue >> pSettings;
-            rewardManager->AutoCombineSettings(pSettings.first, pSettings.second);
+            pwallet->LoadAutoCombineSettings(pSettings.first, pSettings.second);
+        }
+        else if (strType != "bestblock" && strType != "bestblock_nomerkle"){
+            wss.m_unknown_records++;
         }
     } catch (...)
     {

src/wallet/walletdb.h

@@ -158,7 +158,6 @@ class WalletBatch
     bool WriteMinVersion(int nVersion);
 
     bool WriteStakeSplitThreshold(uint64_t nStakeSplitThreshold);
-    bool LoadStakeSplitThreshold(uint64_t nStakeSplitThreshold);
     bool WriteAutoCombineSettings(bool fEnable, CAmount nCombineThreshold);
 
     /// This writes directly to the database, and will not update the CWallet's cached accounting entries!

src/walletinitinterface.h

@@ -35,6 +35,7 @@ class WalletInitInterface {
     virtual void AutoLockMasternodeCollaterals() const = 0;
     virtual void InitCoinJoinSettings() const = 0;
     virtual void InitStaking() const = 0;
+    virtual void InitRewardsManagement() const = 0;
     virtual void InitKeePass() const = 0;
     virtual bool InitAutoBackup() const = 0;