Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix accounting of payback burn and swap to DFI if payback token is different than native loan token or DFI. #1159

Merged
merged 2 commits into from
Mar 28, 2022
Merged

Fix accounting of payback burn and swap to DFI if payback token is different than native loan token or DFI. #1159

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ffac3a5
Fix accounting of payback burn and swap to DFI if payback token is no…
Mixa84 Mar 28, 2022
f31ae72
Fix string for PaybackLoanV2
Mixa84 Mar 28, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 10 additions & 5 deletions src/masternodes/mn_checks.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ std::string ToString(CustomTxType type) {
case CustomTxType::WithdrawFromVault: return "WithdrawFromVault";
case CustomTxType::TakeLoan: return "TakeLoan";
case CustomTxType::PaybackLoan: return "PaybackLoan";
case CustomTxType::PaybackLoanV2: return "PaybackLoanV2";
case CustomTxType::PaybackLoanV2: return "PaybackLoan";
case CustomTxType::AuctionBid: return "AuctionBid";
case CustomTxType::Reject: return "Reject";
case CustomTxType::None: return "None";
Expand Down Expand Up @@ -3023,6 +3023,8 @@ class CCustomTxApplyVisitor : public CCustomTxVisitor
subInToken = kv.second;
}

shouldSetVariable = true;

auto penalty = MultiplyAmounts(subInToken, COIN - penaltyPct);

if (paybackTokenId == DCT_ID{0})
Expand All @@ -3033,6 +3035,10 @@ class CCustomTxApplyVisitor : public CCustomTxVisitor
balances.Add(CTokenAmount{loanTokenId, subAmount});
balances.Add(CTokenAmount{paybackTokenId, penalty});
attributes->attributes[liveKey] = balances;

LogPrint(BCLog::LOAN, "CLoanPaybackLoanMessage(): Burning interest and loan in %s directly - total loan %lld (%lld %s), height - %d\n", paybackToken->symbol, subLoan + subInterest, subInToken, paybackToken->symbol, height);

res = TransferTokenBalance(paybackTokenId, subInToken, obj.from, consensus.burnAddress);
}
else
{
Expand All @@ -3042,12 +3048,11 @@ class CCustomTxApplyVisitor : public CCustomTxVisitor
balances.tokensPayback.Add(CTokenAmount{loanTokenId, subAmount});
balances.tokensFee.Add(CTokenAmount{paybackTokenId, penalty});
attributes->attributes[liveKey] = balances;
}

shouldSetVariable = true;
LogPrint(BCLog::LOAN, "CLoanPaybackLoanMessage(): Swapping %s to DFI and burning it - total loan %lld (%lld %s), height - %d\n", paybackToken->symbol, subLoan + subInterest, subInToken, paybackToken->symbol, height);

LogPrint(BCLog::LOAN, "CLoanPaybackLoanMessage(): Burning interest and loan in %s directly - %lld (%lld %s), height - %d\n", paybackToken->symbol, subLoan + subInterest, subInToken, paybackToken->symbol, height);
res = TransferTokenBalance(paybackTokenId, subInToken, obj.from, consensus.burnAddress);
res = SwapToDFIOverUSD(mnview, paybackTokenId, subInToken, obj.from, consensus.burnAddress, height);
}
}

if (!res)
Expand Down
5 changes: 3 additions & 2 deletions src/masternodes/rpc_accounts.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1802,7 +1802,8 @@ UniValue getburninfo(const JSONRPCRequest& request) {
}

// withdraw burn
if (value.category == uint8_t(CustomTxType::PaybackLoan)) {
if (value.category == uint8_t(CustomTxType::PaybackLoan)
|| value.category == uint8_t(CustomTxType::PaybackLoanV2)) {
for (auto const & diff : value.diff) {
paybackFee += diff.second;
}
Expand Down Expand Up @@ -1885,7 +1886,7 @@ UniValue getburninfo(const JSONRPCRequest& request) {
return result;
}

UniValue HandleSendDFIP2201DFIInput(const JSONRPCRequest& request, CWalletCoinsUnlocker pwallet,
UniValue HandleSendDFIP2201DFIInput(const JSONRPCRequest& request, CWalletCoinsUnlocker pwallet,
const std::pair<std::string, CScript>& contractPair, CTokenAmount amount) {
CUtxosToAccountMessage msg{};
msg.to = {{contractPair.second, {{{{0}, amount.nValue}}}}};
Expand Down
2 changes: 1 addition & 1 deletion src/masternodes/rpc_customtx.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -448,7 +448,7 @@ class CCustomTxRpcVisitor : public boost::static_visitor<void>
if (auto dtoken = mnview.GetToken(idx.first)) {
auto dtokenImpl = static_cast<CTokenImplementation const&>(*dtoken);
if (auto dtokenPair = mnview.GetTokenByCreationTx(dtokenImpl.creationTx)) {
loan.pushKV("dToken",dtokenPair->first.ToString());
loan.pushKV("dTokens",dtokenPair->first.ToString());
}
}
for (auto const & kv : idx.second.balances) {
Expand Down
26 changes: 26 additions & 0 deletions test/functional/feature_loan_payback_dfi_v2.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -311,6 +311,8 @@ def setgov_attribute_to_true_and_payback_with_dfi(self):
vaultBefore = self.nodes[0].getvault(self.vaultId1)
[amountBefore, _] = vaultBefore['loanAmounts'][0].split('@')

old_info = self.nodes[0].getburninfo()

# Partial loan payback in DFI
self.nodes[0].paybackloan({
'vaultId': self.vaultId1,
Expand All @@ -322,6 +324,7 @@ def setgov_attribute_to_true_and_payback_with_dfi(self):
info = self.nodes[0].getburninfo()
assert_equal(info['dfipaybackfee'], Decimal('0.01000000')) # paybackfee defaults to 1% of total payback -> 0.01 DFI
assert_equal(info['dfipaybacktokens'], ['3.96000000@DUSD']) # 4 - penalty (0.01DFI->0.04USD)
assert_equal(info['paybackburn'], old_info['paybackburn'] + Decimal('1'))

vaultAfter = self.nodes[0].getvault(self.vaultId1)
[amountAfter, _] = vaultAfter['loanAmounts'][0].split('@')
Expand All @@ -336,6 +339,8 @@ def test_5pct_penalty(self):
vaultBefore = self.nodes[0].getvault(self.vaultId1)
[amountBefore, _] = vaultBefore['loanAmounts'][0].split('@')

old_info = self.nodes[0].getburninfo()

# Partial loan payback in DFI
self.nodes[0].paybackloan({
'vaultId': self.vaultId1,
Expand All @@ -347,6 +352,7 @@ def test_5pct_penalty(self):
info = self.nodes[0].getburninfo()
assert_equal(info['dfipaybackfee'], Decimal('0.06000000'))
assert_equal(info['dfipaybacktokens'], ['7.76000000@DUSD'])
assert_equal(info['paybackburn'], old_info['paybackburn'] + Decimal('1'))

vaultAfter = self.nodes[0].getvault(self.vaultId1)
[amountAfter, _] = vaultAfter['loanAmounts'][0].split('@')
Expand All @@ -359,6 +365,8 @@ def overpay_loan_in_DFI(self):
[amountBefore, _] = vaultBefore['loanAmounts'][0].split('@')
[balanceDFIBefore, _] = self.nodes[0].getaccount(self.addr_DFI)[0].split('@')

old_info = self.nodes[0].getburninfo()

self.nodes[0].paybackloan({
'vaultId': self.vaultId1,
'from': self.addr_DFI,
Expand All @@ -369,6 +377,7 @@ def overpay_loan_in_DFI(self):
info = self.nodes[0].getburninfo()
assert_equal(info['dfipaybackfee'], Decimal('1.27368435'))
assert_equal(info['dfipaybacktokens'], ['100.00001113@DUSD']) # Total loan in vault1 + previous dfipaybacktokens
assert_equal(info['paybackburn'], old_info['paybackburn'] + Decimal('24.27368714'))

attribs = self.nodes[0].getgov('ATTRIBUTES')['ATTRIBUTES']
assert_equal(attribs['v0/live/economy/dfi_payback_tokens'], ['1.27368435@DFI', '100.00001113@DUSD'])
Expand All @@ -387,6 +396,8 @@ def take_new_loan_payback_exact_amount_in_DFI(self):
})
self.nodes[0].generate(10)

old_info = self.nodes[0].getburninfo()

[balanceDFIBefore, _] = self.nodes[0].getaccount(self.addr_DFI)[0].split('@')
self.nodes[0].paybackloan({
'vaultId': self.vaultId1,
Expand All @@ -398,6 +409,7 @@ def take_new_loan_payback_exact_amount_in_DFI(self):
info = self.nodes[0].getburninfo()
assert_equal(info['dfipaybackfee'], Decimal('2.58947407'))
assert_equal(info['dfipaybacktokens'], ['200.00003016@DUSD'])
assert_equal(info['paybackburn'], old_info['paybackburn'] + Decimal('26.31579449'))

vaultAfter = self.nodes[0].getvault(self.vaultId1)
[balanceDFIAfter, _] = self.nodes[0].getaccount(self.addr_DFI)[0].split('@')
Expand Down Expand Up @@ -588,6 +600,8 @@ def payback_TSLA_with_1_dBTC(self):
vaultBefore = self.nodes[0].getvault(self.vaultId3)
[amountBefore, _] = vaultBefore['loanAmounts'][0].split('@')

old_info = self.nodes[0].getburninfo()

self.nodes[0].paybackloan({
'vaultId': self.vaultId3,
'from': self.addr_BTC,
Expand All @@ -606,6 +620,11 @@ def payback_TSLA_with_1_dBTC(self):
[balanceBTCAfter, _] = self.nodes[0].getaccount(self.addr_BTC)[0].split('@')
assert_equal(Decimal(balanceBTCBefore) - Decimal(balanceBTCAfter), Decimal('0.5'))

info = self.nodes[0].getburninfo()
assert_equal(info['paybackfees'], ['0.12500000@BTC'])
assert_equal(info['paybacktokens'], ['3750000.00000000@TSLA'])
assert_equal(info['paybackburn'], old_info['paybackburn'] + Decimal('6209.54767138'))

def payback_dUSD_with_dUSD(self):
self.nodes[0].takeloan({
'vaultId': self.vaultId2,
Expand Down Expand Up @@ -651,6 +670,8 @@ def payback_TSLA_with_1sat_dBTC(self):
})
self.nodes[0].generate(1)

old_info = self.nodes[0].getburninfo()

self.nodes[0].paybackloan({
'vaultId': self.vaultId4,
'from': self.addr_BTC,
Expand All @@ -668,6 +689,11 @@ def payback_TSLA_with_1sat_dBTC(self):
[balanceBTCAfter, _] = self.nodes[0].getaccount(self.addr_BTC)[0].split('@')
assert_equal(Decimal(balanceBTCBefore) - Decimal(balanceBTCAfter), Decimal('0.00000001'))

info = self.nodes[0].getburninfo()
assert_equal(info['paybackfees'], ['0.12500000@BTC'])
assert_equal(info['paybacktokens'], ['3750000.00000002@TSLA'])
assert_equal(info['paybackburn'], old_info['paybackburn'] + Decimal('0.00012413'))

def run_test(self):
self.setup()

Expand Down