Track reward addresses in settings (#1802)

DeFiCh · Mar 6, 2023 · 6813315 · 6813315
1 parent 61576fa
commit 6813315
Show file tree

Hide file tree

Showing 3 changed files with 33 additions and 0 deletions.
diff --git a/src/masternodes/masternodes.cpp b/src/masternodes/masternodes.cpp
@@ -755,6 +755,15 @@ void CSettingsView::SetDexStatsEnabled(const bool enabled) {
 std::optional<bool> CSettingsView::GetDexStatsEnabled() {
     return ReadBy<KVSettings, bool>(DEX_STATS_ENABLED);
 }
+
+std::optional<std::set<CScript>> CSettingsView::SettingsGetRewardAddresses() {
+    return ReadBy<KVSettings, std::set<CScript>>(MN_REWARD_ADDRESSES);
+}
+
+void CSettingsView::SettingsSetRewardAddresses(const std::set<CScript> &addresses) {
+    WriteBy<KVSettings>(MN_REWARD_ADDRESSES, addresses);
+}
+
 /*
  *  CCustomCSView
  */
@@ -1345,4 +1354,12 @@ void CalcMissingRewardTempFix(CCustomCSView &mnview, const uint32_t targetHeight
 
         return true;
     });
+
+    if (const auto addresses = mnview.SettingsGetRewardAddresses()) {
+        for (const auto &rewardAddress : *addresses) {
+            if (IsMineCached(wallet, rewardAddress) == ISMINE_SPENDABLE) {
+                mnview.CalculateOwnerRewards(rewardAddress, targetHeight);
+            }
+        }
+    }
 }
diff --git a/src/masternodes/masternodes.h b/src/masternodes/masternodes.h
@@ -378,12 +378,16 @@ class CSettingsView : public virtual CStorageView {
 public:
     const std::string DEX_STATS_LAST_HEIGHT = "DexStatsLastHeight";
     const std::string DEX_STATS_ENABLED     = "DexStatsEnabled";
+    const std::string MN_REWARD_ADDRESSES   = "MNRewardAddresses";
 
     void SetDexStatsLastHeight(int32_t height);
     std::optional<int32_t> GetDexStatsLastHeight();
     void SetDexStatsEnabled(bool enabled);
     std::optional<bool> GetDexStatsEnabled();
 
+    std::optional<std::set<CScript>> SettingsGetRewardAddresses();
+    void SettingsSetRewardAddresses(const std::set<CScript> &addresses);
+
     struct KVSettings {
         static constexpr uint8_t prefix() { return '0'; }
     };

diff --git a/src/masternodes/mn_checks.cpp b/src/masternodes/mn_checks.cpp
@@ -977,6 +977,18 @@ class CCustomTxApplyVisitor : public CCustomTxVisitor {
 
                 const auto keyID = CKeyID(uint160(rawAddress));
                 mnview.SetForcedRewardAddress(obj.mnId, *node, addressType, keyID, height);
+
+                // Store history of all reward address changes. This allows us to call CalculateOwnerReward
+                // on reward addresses owned by the local wallet. This can be removed some time after the
+                // next hard fork as this is a workaround for the issue fixed in the following PR:
+                // https://github.com/DeFiCh/ain/pull/1766
+                if (auto addresses = mnview.SettingsGetRewardAddresses()) {
+                    const CScript rewardAddress = GetScriptForDestination(addressType == PKHashType ?
+                                                                          CTxDestination(PKHash(keyID)) :
+                                                                          CTxDestination(WitnessV0KeyHash(keyID)));
+                    addresses->insert(rewardAddress);
+                    mnview.SettingsSetRewardAddresses(*addresses);
+                }
             } else if (type == static_cast<uint8_t>(UpdateMasternodeType::RemRewardAddress)) {
                 CDataStructureV0 key{AttributeTypes::Param, ParamIDs::Feature, DFIPKeys::MNSetRewardAddress};
                 if (!attributes->GetValue(key, false)) {