Track Add/SubVaultCollateral in vault history (#1715)

Co-authored-by: Prasanna Loganathar <pvl@prasannavl.com>
DeFiCh · Feb 6, 2023 · 50d877a · 50d877a
1 parent a8d147f
commit 50d877a
Show file tree

Hide file tree

Showing 6 changed files with 181 additions and 73 deletions.
diff --git a/src/masternodes/accountshistory.cpp b/src/masternodes/accountshistory.cpp
@@ -127,6 +127,22 @@ Res CAccountsHistoryWriter::SubBalance(const CScript &owner, CTokenAmount amount
     return res;
 }
 
+Res CAccountsHistoryWriter::AddVaultCollateral(const CVaultId &vaultId, CTokenAmount amount) {
+    auto res = CCustomCSView::AddVaultCollateral(vaultId, amount);
+    if (writers && res && amount.nValue) {
+        writers->AddVaultCollateral(amount, vaultID);
+    }
+    return res;
+}
+
+Res CAccountsHistoryWriter::SubVaultCollateral(const CVaultId &vaultId, CTokenAmount amount) {
+    auto res = CCustomCSView::SubVaultCollateral(vaultId, amount);
+    if (writers && res && amount.nValue) {
+        writers->SubVaultCollateral(amount, vaultID);
+    }
+    return res;
+}
+
 bool CAccountsHistoryWriter::Flush() {
     writers.Flush(height, txid, txn, type, vaultID);
     return CCustomCSView::Flush();

diff --git a/src/masternodes/accountshistory.h b/src/masternodes/accountshistory.h
@@ -69,6 +69,8 @@ class CAccountsHistoryWriter : public CCustomCSView {
     ~CAccountsHistoryWriter() override;
     Res AddBalance(const CScript &owner, CTokenAmount amount) override;
     Res SubBalance(const CScript &owner, CTokenAmount amount) override;
+    Res AddVaultCollateral(const CVaultId &vaultId, CTokenAmount amount) override;
+    Res SubVaultCollateral(const CVaultId &vaultId, CTokenAmount amount) override;
     bool Flush() override;
     CHistoryWriters& GetHistoryWriters() override { return writers; }
 };

diff --git a/src/masternodes/rpc_vault.cpp b/src/masternodes/rpc_vault.cpp
@@ -1318,6 +1318,11 @@ UniValue historyToJSON(VaultHistoryKey const & key, VaultHistoryValue const & va
                        key.txn, value.txid.ToString(), value.diff);
 }
 
+UniValue collateralToJSON(VaultHistoryKey const & key, VaultHistoryValue const & value) {
+    return vaultToJSON(key.vaultID, "vaultCollateral", key.blockHeight, ToString(CustomTxCodeToType(value.category)),
+                       key.txn, value.txid.ToString(), value.diff);
+}
+
 UniValue schemeToJSON(VaultSchemeKey const & key, const VaultGlobalSchemeValue& value) {
     auto obj = vaultToJSON(key.vaultID, "", key.blockHeight, ToString(CustomTxCodeToType(value.category)), 0, value.txid.ToString(), {});
 
@@ -1469,7 +1474,12 @@ UniValue listvaulthistory(const JSONRPCRequest& request) {
         }
 
         auto& array = ret.emplace(key.blockHeight, UniValue::VARR).first->second;
-        array.push_back(historyToJSON(key, value));
+
+        if (key.address.empty()) {
+            array.push_back(collateralToJSON(key, value));
+        } else {
+            array.push_back(historyToJSON(key, value));
+        }
 
         return --count != 0;
     };

diff --git a/src/masternodes/vault.h b/src/masternodes/vault.h
@@ -154,8 +154,8 @@ class CVaultView : public virtual CStorageView {
                       const CVaultId &start       = {},
                       const CScript &ownerAddress = {});
 
-    Res AddVaultCollateral(const CVaultId &vaultId, CTokenAmount amount);
-    Res SubVaultCollateral(const CVaultId &vaultId, CTokenAmount amount);
+    virtual Res AddVaultCollateral(const CVaultId &vaultId, CTokenAmount amount);
+    virtual Res SubVaultCollateral(const CVaultId &vaultId, CTokenAmount amount);
     std::optional<CBalances> GetVaultCollaterals(const CVaultId &vaultId);
     void ForEachVaultCollateral(std::function<bool(const CVaultId &, const CBalances &)> callback);
 

diff --git a/src/masternodes/vaulthistory.h b/src/masternodes/vaulthistory.h
@@ -163,11 +163,11 @@ class CVaultHistoryView : public virtual CStorageView {
     void EraseVaultHistory(const uint32_t height);
 
     void ForEachVaultHistory(std::function<bool(const VaultHistoryKey &, CLazySerialize<VaultHistoryValue>)> callback,
-                             const VaultHistoryKey &start = {});
+                             const VaultHistoryKey &start = {std::numeric_limits<uint32_t>::max(), {}, std::numeric_limits<uint32_t>::max(), {}});
     void ForEachVaultScheme(std::function<bool(const VaultSchemeKey &, CLazySerialize<VaultSchemeValue>)> callback,
-                            const VaultSchemeKey &start = {});
+                            const VaultSchemeKey &start = {{}, std::numeric_limits<uint32_t>::max()});
     void ForEachVaultState(std::function<bool(const VaultStateKey &, CLazySerialize<VaultStateValue>)> callback,
-                           const VaultStateKey &start = {});
+                           const VaultStateKey &start = {{}, std::numeric_limits<uint32_t>::max()});
 
     // Loan Scheme storage
     void WriteGlobalScheme(const VaultGlobalSchemeKey &key, const VaultGlobalSchemeValue &value);