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

Jump to bottom

Add limit and remaining to listloantokenliquidity #2897

Merged
merged 2 commits into from
Apr 24, 2024
Merged

Add limit and remaining to listloantokenliquidity #2897

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
1b649a4
Add limit and remaining to listloantokenliquidity
Bushstar Apr 18, 2024
b21fc51
Merge branch 'master' into bush/rpc-add-vars
Bushstar Apr 19, 2024
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
40 changes: 38 additions & 2 deletions src/dfi/rpc_poolpair.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
#include <dfi/mn_rpc.h>

#include <dfi/govvariables/attributes.h>
#include <dfi/validation.h>

UniValue poolToJSON(const CCustomCSView &view,
DCT_ID const &id,
Expand Down Expand Up @@ -1430,13 +1431,48 @@ UniValue listloantokenliquidity(const JSONRPCRequest &request) {

LOCK(cs_main);

UniValue ret(UniValue::VOBJ);
UniValue ret(UniValue::VARR);
const auto height = ::ChainActive().Height();

const auto attributes = pcustomcsview->GetAttributes();

CDataStructureV0 averageKey{AttributeTypes::Param, ParamIDs::DFIP2211F, DFIPKeys::AverageLiquidityPercentage};
const auto averageLiquidityPercentage = attributes->GetValue(averageKey, DEFAULT_AVERAGE_LIQUIDITY_PERCENTAGE);

const auto dusdToken = pcustomcsview->GetToken("DUSD");
if (!dusdToken) {
return ret;
}

const auto dusdId = dusdToken->first.v;

pcustomcsview->ForEachTokenAverageLiquidity([&](const LoanTokenAverageLiquidityKey &key, const uint64_t liquidity) {
const auto sourceToken = pcustomcsview->GetToken(DCT_ID{key.sourceID});
const auto destToken = pcustomcsview->GetToken(DCT_ID{key.destID});

if (sourceToken && destToken) {
ret.pushKV(sourceToken->symbol + '-' + destToken->symbol, GetDecimalString(liquidity));
arith_uint256 totalSwapAmount{};
pcustomcsview->ForEachFuturesUserValues(
[&](const CFuturesUserKey &, const CFuturesUserValue &futuresValues) {
const auto destination = futuresValues.destination ? futuresValues.destination : dusdId;
if (futuresValues.source.nTokenId.v == key.sourceID && destination == key.destID) {
totalSwapAmount += futuresValues.source.nValue;
}
return true;
},
{static_cast<uint32_t>(height), {}, std::numeric_limits<uint32_t>::max()});

const auto liquidityLimit = MultiplyAmounts(liquidity, averageLiquidityPercentage);

UniValue poolRes(UniValue::VOBJ);
UniValue limitRes(UniValue::VOBJ);
limitRes.pushKV("liquidity", GetDecimalString(liquidity));
limitRes.pushKV("limit", GetDecimalString(liquidityLimit));
limitRes.pushKV("remaining", GetDecimalString(liquidityLimit - totalSwapAmount.GetLow64()));
poolRes.pushKV(sourceToken->symbol + '-' + destToken->symbol, limitRes);
ret.push_back(poolRes);
}

return true;
});

Expand Down
125 changes: 120 additions & 5 deletions test/functional/feature_future_swap_limitation.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -312,7 +312,22 @@ def test_future_swap_limitation(self):
# Check liquidity data
assert_equal(
self.nodes[0].listloantokenliquidity(),
{"META-DUSD": "100.00000000", "DUSD-META": "100.00000000"},
[
{
"META-DUSD": {
"liquidity": "100.00000000",
"limit": "10.00000000",
"remaining": "10.00000000",
}
},
{
"DUSD-META": {
"liquidity": "100.00000000",
"limit": "10.00000000",
"remaining": "10.00000000",
}
},
],
)

# Try and swap above limit
Expand Down Expand Up @@ -347,11 +362,81 @@ def test_future_swap_limitation(self):
)
self.nodes[0].generate(1)

# Swap the max limit
# Swap half the limit
self.nodes[0].futureswap(self.address, "5.00000000@META")
self.nodes[0].generate(1)

# Check liquidity data
assert_equal(
self.nodes[0].listloantokenliquidity(),
[
{
"META-DUSD": {
"liquidity": "100.00000000",
"limit": "10.00000000",
"remaining": "5.00000000",
}
},
{
"DUSD-META": {
"liquidity": "100.00000000",
"limit": "10.00000000",
"remaining": "10.00000000",
}
},
],
)

# Swap the max limit
self.nodes[0].futureswap(self.address, "5.00000000@META")
self.nodes[0].generate(1)

# Check liquidity data
assert_equal(
self.nodes[0].listloantokenliquidity(),
[
{
"META-DUSD": {
"liquidity": "100.00000000",
"limit": "10.00000000",
"remaining": "0.00000000",
}
},
{
"DUSD-META": {
"liquidity": "100.00000000",
"limit": "10.00000000",
"remaining": "10.00000000",
}
},
],
)

# Swap the max limit in the other direction
self.nodes[0].futureswap(self.address, "10.00000000@DUSD", "META")
self.nodes[0].generate(1)

# Check liquidity data
assert_equal(
self.nodes[0].listloantokenliquidity(),
[
{
"META-DUSD": {
"liquidity": "100.00000000",
"limit": "10.00000000",
"remaining": "0.00000000",
}
},
{
"DUSD-META": {
"liquidity": "100.00000000",
"limit": "10.00000000",
"remaining": "0.00000000",
}
},
],
)

# Try and swap above limit
assert_raises_rpc_error(
-32600,
Expand All @@ -367,7 +452,22 @@ def test_future_swap_limitation(self):
# Check liquidity data changed
assert_equal(
self.nodes[0].listloantokenliquidity(),
{"META-DUSD": "69.98499472", "DUSD-META": "160.00000000"},
[
{
"META-DUSD": {
"liquidity": "69.98499472",
"limit": "6.99849947",
"remaining": "6.99849947",
}
},
{
"DUSD-META": {
"liquidity": "160.00000000",
"limit": "16.00000000",
"remaining": "16.00000000",
}
},
],
)

# Try and swap above new limit
Expand Down Expand Up @@ -415,7 +515,7 @@ def test_future_swap_limitation(self):
self.nodes[0].generate(1)

# Check liquidity data empty
assert_equal(self.nodes[0].listloantokenliquidity(), {})
assert_equal(self.nodes[0].listloantokenliquidity(), [])

def test_longer_fs_limit_period(self):

Expand Down Expand Up @@ -464,7 +564,22 @@ def test_longer_fs_limit_period(self):
# Check minimum liquidity
assert_equal(
self.nodes[0].listloantokenliquidity(),
{"META-DUSD": "100.00000000", "DUSD-META": "100.00000000"},
[
{
"META-DUSD": {
"liquidity": "100.00000000",
"limit": "10.00000000",
"remaining": "10.00000000",
}
},
{
"DUSD-META": {
"liquidity": "100.00000000",
"limit": "10.00000000",
"remaining": "10.00000000",
}
},
],
)


Expand Down
Loading