Skip to content

Commit

Permalink
Revert "Revert "Fix dex loan token burns (#1100)" (#1193)"
Browse files Browse the repository at this point in the history
This reverts commit 3772421.
Revert the revert to maintain consistency with v2.7.0
  • Loading branch information
prasannavl committed Apr 28, 2022
1 parent 12d4481 commit fa54c98
Showing 1 changed file with 7 additions and 3 deletions.
10 changes: 7 additions & 3 deletions src/masternodes/rpc_accounts.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -1779,6 +1779,8 @@ UniValue getburninfo(const JSONRPCRequest& request) {

UniValue dfipaybacktokens{UniValue::VARR};

LOCK(cs_main);

auto calcBurn = [&](AccountHistoryKey const & key, CLazySerialize<AccountHistoryValue> valueLazy) -> bool
{
const auto & value = valueLazy.get();
Expand Down Expand Up @@ -1822,7 +1824,11 @@ UniValue getburninfo(const JSONRPCRequest& request) {
if (value.category == uint8_t(CustomTxType::PoolSwap)
|| value.category == uint8_t(CustomTxType::PoolSwapV2)) {
for (auto const & diff : value.diff) {
dexfeeburn.Add({diff.first, diff.second});
if (pcustomcsview->GetLoanTokenByID(diff.first)) {
dexfeeburn.Add({diff.first, diff.second});
} else {
burntTokens.Add({diff.first, diff.second});
}
}
return true;
}
Expand All @@ -1848,8 +1854,6 @@ UniValue getburninfo(const JSONRPCRequest& request) {
result.pushKV("paybackburn", ValueFromAmount(paybackFee));
result.pushKV("dexfeetokens", AmountsToJSON(dexfeeburn.balances));

LOCK(cs_main);

if (auto attributes = pcustomcsview->GetAttributes()) {
CDataStructureV0 liveKey{AttributeTypes::Live, ParamIDs::Economy, EconomyKeys::PaybackDFITokens};
auto tokenBalances = attributes->GetValue(liveKey, CBalances{});
Expand Down

0 comments on commit fa54c98

Please sign in to comment.