Store future swap destination amount

DeFiCh · Mar 28, 2022 · 2e653f9 · 2e653f9
1 parent 0daecaa
commit 2e653f9
Show file tree

Hide file tree

Showing 6 changed files with 35 additions and 8 deletions.
diff --git a/src/logging.cpp b/src/logging.cpp
@@ -155,6 +155,7 @@ const CLogCategoryDesc LogCategories[] =
     {BCLog::ORACLE, "oracle"},
     {BCLog::LOAN, "loan"},
     {BCLog::ACCOUNTCHANGE, "accountchange"},
+    {BCLog::FUTURESWAP, "futureswap"},
     {BCLog::ALL, "1"},
     {BCLog::ALL, "all"},
 };

diff --git a/src/logging.h b/src/logging.h
@@ -61,6 +61,7 @@ namespace BCLog {
         ORACLE        = (1 << 24),
         LOAN          = (1 << 25),
         ACCOUNTCHANGE = (1 << 26),
+        FUTURESWAP    = (1 << 27),
         ALL           = ~(uint32_t)0,
     };
 

diff --git a/src/masternodes/accounts.cpp b/src/masternodes/accounts.cpp
@@ -101,7 +101,7 @@ uint32_t CAccountsView::GetBalancesHeight(CScript const & owner)
 
 Res CAccountsView::StoreFuturesUserValues(const CFuturesUserKey& key, const CFuturesUserValue& futures)
 {
-    if (!WriteBy<ByFuturesKey>(key, futures)) {
+    if (!WriteBy<ByFuturesSourceKey>(key, futures)) {
         return Res::Err("Failed to store futures");
     }
 
@@ -110,12 +110,12 @@ Res CAccountsView::StoreFuturesUserValues(const CFuturesUserKey& key, const CFut
 
 void CAccountsView::ForEachFuturesUserValues(std::function<bool(const CFuturesUserKey&, const CFuturesUserValue&)> callback, const CFuturesUserKey& start)
 {
-    ForEach<ByFuturesKey, CFuturesUserKey, CFuturesUserValue>(callback, start);
+    ForEach<ByFuturesSourceKey, CFuturesUserKey, CFuturesUserValue>(callback, start);
 }
 
 Res CAccountsView::EraseFuturesUserValues(const CFuturesUserKey& key)
 {
-    if (!EraseBy<ByFuturesKey>(key)) {
+    if (!EraseBy<ByFuturesSourceKey>(key)) {
         return Res::Err("Failed to erase futures");
     }
 
@@ -125,10 +125,24 @@ Res CAccountsView::EraseFuturesUserValues(const CFuturesUserKey& key)
 boost::optional<uint32_t> CAccountsView::GetMostRecentFuturesHeight()
 {
     const CFuturesUserKey key{std::numeric_limits<uint32_t>::max(), {}, std::numeric_limits<uint32_t>::max()};
-    auto it = LowerBound<ByFuturesKey>(key);
+    auto it = LowerBound<ByFuturesSourceKey>(key);
     if (it.Valid()) {
         return it.Key().height;
     }
 
     return {};
 }
+
+Res CAccountsView::StoreFuturesDestValues(const CFuturesUserKey& key, const CTokenAmount& destination)
+{
+    if (!WriteBy<ByFuturesDestKey>(key, destination)) {
+        return Res::Err("Failed to store futures destination");
+    }
+
+    return Res::Ok();
+}
+
+void CAccountsView::ForEachFuturesDestValues(std::function<bool(const CFuturesUserKey&, const CTokenAmount&)> callback, const CFuturesUserKey& start)
+{
+    ForEach<ByFuturesSourceKey, CFuturesUserKey, CTokenAmount>(callback, start);
+}
diff --git a/src/masternodes/accounts.h b/src/masternodes/accounts.h
@@ -70,14 +70,17 @@ class CAccountsView : public virtual CStorageView
     Res UpdateBalancesHeight(CScript const & owner, uint32_t height);
 
     Res StoreFuturesUserValues(const CFuturesUserKey& key, const CFuturesUserValue& futures);
+    Res StoreFuturesDestValues(const CFuturesUserKey& key, const CTokenAmount& destination);
     Res EraseFuturesUserValues(const CFuturesUserKey& key);
     boost::optional<uint32_t> GetMostRecentFuturesHeight();
     void ForEachFuturesUserValues(std::function<bool(const CFuturesUserKey&, const CFuturesUserValue&)> callback, const CFuturesUserKey& start = {});
+    void ForEachFuturesDestValues(std::function<bool(const CFuturesUserKey&, const CTokenAmount&)> callback, const CFuturesUserKey& start = {});
 
     // tags
     struct ByBalanceKey { static constexpr uint8_t prefix() { return 'a'; } };
     struct ByHeightKey  { static constexpr uint8_t prefix() { return 'b'; } };
-    struct ByFuturesKey  { static constexpr uint8_t prefix() { return 'J'; } };
+    struct ByFuturesSourceKey  { static constexpr uint8_t prefix() { return 'J'; } };
+    struct ByFuturesDestKey  { static constexpr uint8_t prefix() { return 's'; } };
 
 private:
     Res SetBalance(CScript const & owner, CTokenAmount amount);

diff --git a/src/masternodes/masternodes.h b/src/masternodes/masternodes.h
@@ -363,7 +363,7 @@ class CCustomCSView
             CFoundationsDebtView    ::  Debt,
             CAnchorRewardsView      ::  BtcTx,
             CTokensView             ::  ID, Symbol, CreationTx, LastDctId,
-            CAccountsView           ::  ByBalanceKey, ByHeightKey, ByFuturesKey,
+            CAccountsView           ::  ByBalanceKey, ByHeightKey, ByFuturesSourceKey, ByFuturesDestKey,
             CCommunityBalancesView  ::  ById,
             CUndosView              ::  ByUndoKey,
             CPoolPairView           ::  ByID, ByPair, ByShare, ByIDPair, ByPoolSwap, ByReserves, ByRewardPct, ByRewardLoanPct,

diff --git a/src/validation.cpp b/src/validation.cpp
@@ -3361,7 +3361,11 @@ void CChainState::ProcessFutures(const CBlockIndex* pindex, CCustomCSView& cache
                 const auto& premiumPrice = futuresPrices.at(destId).premium;
                 if (premiumPrice > 0) {
                     const auto total = DivideAmounts(futuresValues.source.nValue, premiumPrice);
-                    cache.AddBalance(key.owner, {destId, total});
+                    CTokenAmount destination{destId, total};
+                    cache.AddBalance(key.owner, destination);
+                    cache.StoreFuturesDestValues(key, destination);
+                    LogPrint(BCLog::FUTURESWAP, "ProcessFutures(): Owner %s source %s destination %s\n",
+                             key.owner.GetHex(), futuresValues.source.ToString(), destination.ToString());
                 }
             } catch (const std::out_of_range&) {
                 unpaidContracts.emplace(key, futuresValues);
@@ -3374,7 +3378,11 @@ void CChainState::ProcessFutures(const CBlockIndex* pindex, CCustomCSView& cache
             try {
                 const auto& discountPrice = futuresPrices.at(futuresValues.source.nTokenId).discount;
                 const auto total = MultiplyAmounts(futuresValues.source.nValue, discountPrice);
-                cache.AddBalance(key.owner, {tokenDUSD->first, total});
+                CTokenAmount destination{tokenDUSD->first, total};
+                cache.AddBalance(key.owner, destination);
+                cache.StoreFuturesDestValues(key, destination);
+                LogPrint(BCLog::FUTURESWAP, "ProcessFutures(): Owner %s source %s destination %s\n",
+                         key.owner.GetHex(), futuresValues.source.ToString(), destination.ToString());
             } catch (const std::out_of_range&) {
                 unpaidContracts.emplace(key, futuresValues);
             }