Merge branch 'master' into pvl/fix-get-burninfo

src/masternodes/accounts.cpp

@@ -67,6 +67,11 @@ Res CAccountsView::SubBalances(const CScript &owner, const CBalances &balances)
     return Res::Ok();
 }
 
+void CAccountsView::ForEachAccount(std::function<bool(const CScript &)> callback, const CScript &start) {
+    ForEach<ByHeightKey, CScript, uint32_t>(
+        [&callback](const CScript &owner, CLazySerialize<uint32_t>) { return callback(owner); }, start);
+}
+
 Res CAccountsView::UpdateBalancesHeight(const CScript &owner, uint32_t height) {
     WriteBy<ByHeightKey>(owner, height);
     return Res::Ok();

src/masternodes/accounts.h

@@ -55,6 +55,7 @@ struct CFuturesUserValue {
 
 class CAccountsView : public virtual CStorageView {
 public:
+    void ForEachAccount(std::function<bool(const CScript &)> callback, const CScript &start = {});
     void ForEachBalance(std::function<bool(const CScript &, const CTokenAmount &)> callback,
                         const BalanceKey &start = {});
     CTokenAmount GetBalance(const CScript &owner, DCT_ID tokenID) const;

src/masternodes/masternodes.cpp

@@ -1324,3 +1324,25 @@ CAmount CCustomCSView::GetFeeBurnPctFromAttributes() const {
 
     return attributes->GetValue(feeBurnPctKey, Params().GetConsensus().props.feeBurnPct);
 }
+
+void CalcMissingRewardTempFix(CCustomCSView &mnview, const uint32_t targetHeight, const CWallet &wallet) {
+    mnview.ForEachMasternode([&](const uint256 &id, const CMasternode &node) {
+        if (node.rewardAddressType) {
+            const CScript rewardAddress = GetScriptForDestination(node.rewardAddressType == PKHashType ?
+                                                                  CTxDestination(PKHash(node.rewardAddress)) :
+                                                                  CTxDestination(WitnessV0KeyHash(node.rewardAddress)));
+            if (IsMineCached(wallet, rewardAddress) == ISMINE_SPENDABLE) {
+                mnview.CalculateOwnerRewards(rewardAddress, targetHeight);
+            }
+        }
+
+        const CScript rewardAddress = GetScriptForDestination(node.ownerType == PKHashType ?
+                                                              CTxDestination(PKHash(node.ownerAuthAddress)) :
+                                                              CTxDestination(WitnessV0KeyHash(node.ownerAuthAddress)));
+        if (IsMineCached(wallet, rewardAddress) == ISMINE_SPENDABLE) {
+            mnview.CalculateOwnerRewards(rewardAddress, targetHeight);
+        }
+
+        return true;
+    });
+}

src/masternodes/masternodes.h

@@ -46,6 +46,10 @@ CAmount GetTokenCreationFee(int height);
 CAmount GetMnCollateralAmount(int height);
 CAmount GetProposalCreationFee(int height, const CCustomCSView &view, const CCreateProposalMessage &msg);
 
+// Update owner rewards for MNs missing call to CalculateOwnerRewards after voter fee distributions.
+// Missing call fixed in: https://github.com/DeFiCh/ain/pull/1766
+void CalcMissingRewardTempFix(CCustomCSView &mnview, const uint32_t targetHeight, const CWallet &wallet);
+
 enum class UpdateMasternodeType : uint8_t {
     None             = 0x00,
     OwnerAddress     = 0x01,

src/masternodes/mn_checks.cpp

@@ -1570,6 +1570,10 @@ class CCustomTxApplyVisitor : public CCustomTxVisitor {
         Require(token->symbol == "BTC" && token->name == "Bitcoin" && token->IsDAT(),
                 "Only Bitcoin can be swapped in " + obj.name);
 
+        if (height >= static_cast<uint32_t>(consensus.NextNetworkUpgradeHeight)) {
+            mnview.CalculateOwnerRewards(script, height);
+        }
+
         Require(mnview.SubBalance(script, {id, amount}));
 
         const CTokenCurrencyPair btcUsd{"BTC", "USD"};
@@ -3130,6 +3134,10 @@ class CCustomTxApplyVisitor : public CCustomTxVisitor {
             }
         }
 
+        if (height >= static_cast<uint32_t>(consensus.NextNetworkUpgradeHeight)) {
+            mnview.CalculateOwnerRewards(obj.to, height);
+        }
+
         return mnview.AddBalance(obj.to, obj.amount);
     }
 

src/masternodes/mn_rpc.cpp

@@ -19,20 +19,15 @@ CAccounts GetAllMineAccounts(CWallet * const pwallet) {
     CCustomCSView mnview(*pcustomcsview);
     auto targetHeight = ::ChainActive().Height() + 1;
 
-    // ForEachBalance is in account order, so we only need to check if the
-    // last record is the same as the current one to know whether we can skip
-    // CalculateOwnerRewards or if it needs to be called.
-    CScript lastCalculatedOwner;
-
-    mnview.ForEachBalance([&](const CScript &owner, const CTokenAmount &balance) {
-        if (IsMineCached(*pwallet, owner) == ISMINE_SPENDABLE) {
-            if (lastCalculatedOwner != owner) {
-                mnview.CalculateOwnerRewards(owner, targetHeight);
-                lastCalculatedOwner = owner;
-            }
-            walletAccounts[owner].Add(balance);
+    CalcMissingRewardTempFix(mnview, targetHeight, *pwallet);
+
+    mnview.ForEachAccount([&](CScript const & account) {
+        if (IsMineCached(*pwallet, account) == ISMINE_SPENDABLE) {
+            mnview.CalculateOwnerRewards(account, targetHeight);
+            mnview.ForEachBalance([&](CScript const & owner, CTokenAmount balance) {
+                return account == owner && walletAccounts[owner].Add(balance);
+            }, {account, DCT_ID{}});
         }
-
         return true;
     });
 

src/masternodes/rpc_accounts.cpp

@@ -365,27 +365,28 @@ UniValue listaccounts(const JSONRPCRequest& request) {
     CCustomCSView mnview(*pcustomcsview);
     auto targetHeight = ::ChainActive().Height() + 1;
 
-    // ForEachBalance is in account order, so we only need to check if the
-    // last record is the same as the current one to know whether we can skip
-    // CalculateOwnerRewards or if it needs to be called.
-    CScript lastCalculatedOwner;
+    CalcMissingRewardTempFix(mnview, targetHeight, *pwallet);
 
-    mnview.ForEachBalance([&](const CScript &owner, const CTokenAmount &balance) {
-        if (isMineOnly && IsMineCached(*pwallet, owner) != ISMINE_SPENDABLE) {
+    mnview.ForEachAccount([&](CScript const & account) {
+
+        if (isMineOnly && IsMineCached(*pwallet, account) != ISMINE_SPENDABLE) {
             return true;
         }
 
-        if (lastCalculatedOwner != owner) {
-            mnview.CalculateOwnerRewards(owner, targetHeight);
-            lastCalculatedOwner = owner;
-        }
+        mnview.CalculateOwnerRewards(account, targetHeight);
 
-        ret.push_back(accountToJSON(owner, balance, verbose, indexed_amounts));
+        // output the relavant balances only for account
+        mnview.ForEachBalance([&](CScript const & owner, CTokenAmount balance) {
+            if (account != owner) {
+                return false;
+            }
+            ret.push_back(accountToJSON(owner, balance, verbose, indexed_amounts));
+            return --limit != 0;
+        }, {account, start.tokenID});
 
         start.tokenID = DCT_ID{}; // reset to start id
-
-        return --limit != 0;
-    }, {start.owner, start.tokenID});
+        return limit != 0;
+    }, start.owner);
 
     return GetRPCResultCache().Set(request, ret);
 }
@@ -559,23 +560,17 @@ UniValue gettokenbalances(const JSONRPCRequest& request) {
     CCustomCSView mnview(*pcustomcsview);
     auto targetHeight = ::ChainActive().Height() + 1;
 
-    // ForEachBalance is in account order, so we only need to check if the
-    // last record is the same as the current one to know whether we can skip
-    // CalculateOwnerRewards or if it needs to be called.
-    CScript lastCalculatedOwner;
+    CalcMissingRewardTempFix(mnview, targetHeight, *pwallet);
 
-    mnview.ForEachBalance([&](const CScript &owner, CTokenAmount balance) {
-        if (IsMineCached(*pwallet, owner) == ISMINE_SPENDABLE) {
-            if (lastCalculatedOwner != owner) {
-                mnview.CalculateOwnerRewards(owner, targetHeight);
-                lastCalculatedOwner = owner;
-            }
-            totalBalances.Add(balance);
+    mnview.ForEachAccount([&](CScript const & account) {
+        if (IsMineCached(*pwallet, account) == ISMINE_SPENDABLE) {
+            mnview.CalculateOwnerRewards(account, targetHeight);
+            mnview.ForEachBalance([&](CScript const & owner, CTokenAmount balance) {
+                return account == owner && totalBalances.Add(balance);
+            }, {account, DCT_ID{}});
         }
-
         return true;
     });
-
     auto it = totalBalances.balances.lower_bound(start);
     for (size_t i = 0; it != totalBalances.balances.end() && i < limit; it++, i++) {
         auto bal = CTokenAmount{(*it).first, (*it).second};

src/masternodes/validation.cpp

@@ -2186,6 +2186,11 @@ static void ProcessProposalEvents(const CBlockIndex* pindex, CCustomCSView& cach
                 if (!res) {
                     LogPrintf("Proposal fee redistribution failed: %s Address: %s Amount: %d\n", res.msg, scriptPubKey.GetHex(), amountPerVoter);
                 }
+
+                if (pindex->nHeight >= chainparams.GetConsensus().NextNetworkUpgradeHeight) {
+                    subView.CalculateOwnerRewards(scriptPubKey, pindex->nHeight);
+                }
+
                 subView.Flush();
             }