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

Check collateral for migrating token #1299

Merged
merged 2 commits into from
May 27, 2022
Merged

Check collateral for migrating token #1299

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
46eeafc
Check collateral for migrating token
Bushstar May 27, 2022
5352f47
Merge branch 'master' into collater-test
prasannavl May 27, 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
18 changes: 10 additions & 8 deletions src/validation.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4265,23 +4265,25 @@ static Res VaultSplits(CCustomCSView& view, ATTRIBUTES& attributes, const DCT_ID

std::vector<std::pair<CVaultView::AuctionStoreKey, CAuctionBatch>> auctionBatches;
view.ForEachAuctionBatch([&](const CVaultView::AuctionStoreKey& key, const CAuctionBatch& value) {
if (value.loanAmount.nTokenId == oldTokenId) {
if (value.loanAmount.nTokenId == oldTokenId || value.collaterals.balances.count(oldTokenId)) {
auctionBatches.emplace_back(key, value);
}
return true;
});

for (auto& [key, value] : auctionBatches) {
view.EraseAuctionBatch(key);
value.loanAmount.nTokenId = newTokenId;
value.loanAmount.nValue = CalculateNewAmount(multiplier, value.loanAmount.nValue);
value.loanInterest = CalculateNewAmount(multiplier, value.loanInterest);

try {
const auto amount{value.collaterals.balances.at(oldTokenId)};
if (value.loanAmount.nTokenId == oldTokenId) {
value.loanAmount.nTokenId = newTokenId;
value.loanAmount.nValue = CalculateNewAmount(multiplier, value.loanAmount.nValue);
value.loanInterest = CalculateNewAmount(multiplier, value.loanInterest);
}

if (value.collaterals.balances.count(oldTokenId)) {
value.collaterals.balances[newTokenId] = CalculateNewAmount(multiplier, value.collaterals.balances[oldTokenId]);
value.collaterals.balances.erase(oldTokenId);
value.collaterals.balances[newTokenId] = CalculateNewAmount(multiplier, amount);
} catch (const std::out_of_range&) {}
}

view.StoreAuctionBatch(key, value);
}
Expand Down
94 changes: 73 additions & 21 deletions test/functional/feature_token_split.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,7 @@ def setup_test_tokens(self):
self.symbolGOOGL = 'GOOGL'
self.symbolNVDA = 'NVDA'
self.symbolMSFT = 'MSFT'
self.symbolTWTR = 'TWTR'
self.symbolGD = 'GOOGL-DUSD'

# Store address
Expand All @@ -57,6 +58,7 @@ def setup_test_tokens(self):
{"currency": "USD", "token": self.symbolTSLA},
{"currency": "USD", "token": self.symbolNVDA},
{"currency": "USD", "token": self.symbolMSFT},
{"currency": "USD", "token": self.symbolTWTR},
]

# Appoint oracle
Expand All @@ -72,6 +74,7 @@ def setup_test_tokens(self):
{"currency": "USD", "tokenAmount": f"1@{self.symbolTSLA}"},
{"currency": "USD", "tokenAmount": f"1@{self.symbolNVDA}"},
{"currency": "USD", "tokenAmount": f"1@{self.symbolMSFT}"},
{"currency": "USD", "tokenAmount": f"2@{self.symbolTWTR}"},
]
self.nodes[0].setoracledata(self.oracle, int(time.time()), oracle_prices)
self.nodes[0].generate(10)
Expand Down Expand Up @@ -122,6 +125,15 @@ def setup_test_tokens(self):
})
self.nodes[0].generate(1)

self.nodes[0].setloantoken({
'symbol': self.symbolTWTR,
'name': self.symbolTWTR,
'fixedIntervalPriceId': f"{self.symbolTWTR}/USD",
'mintable': True,
'interest': 0
})
self.nodes[0].generate(1)

# Set collateral tokens
self.nodes[0].setcollateraltoken({
'token': self.symbolDFI,
Expand Down Expand Up @@ -151,15 +163,23 @@ def setup_test_tokens(self):
})
self.nodes[0].generate(1)

self.nodes[0].setcollateraltoken({
'token': self.symbolTWTR,
'factor': 1,
'fixedIntervalPriceId': f"{self.symbolTWTR}/USD"
})
self.nodes[0].generate(1)

# Store token IDs
self.idDUSD = list(self.nodes[0].gettoken(self.symbolDUSD).keys())[0]
self.idGOOGL = list(self.nodes[0].gettoken(self.symbolGOOGL).keys())[0]
self.idTSLA = list(self.nodes[0].gettoken(self.symbolTSLA).keys())[0]
self.idNVDA = list(self.nodes[0].gettoken(self.symbolNVDA).keys())[0]
self.idMSFT = list(self.nodes[0].gettoken(self.symbolMSFT).keys())[0]
self.idTWTR = list(self.nodes[0].gettoken(self.symbolTWTR).keys())[0]

# Mint some loan tokens
self.nodes[0].minttokens([f'1000000@{self.symbolMSFT}', f'1000000@{self.symbolDUSD}'])
self.nodes[0].minttokens([f'1000000@{self.symbolMSFT}', f'1000000@{self.symbolDUSD}', f'1000000@{self.symbolTWTR}'])
self.nodes[0].generate(1)

# Create funded addresses
Expand Down Expand Up @@ -403,32 +423,35 @@ def token_split(self):
'name': 'AAAA',
'interest': 1
})

self.nodes[0].generate(1)

result = self.nodes[0].getgov('ATTRIBUTES')['ATTRIBUTES']
assert_equal(result, {'v0/poolpairs/6/token_a_fee_pct': '0.01',
'v0/poolpairs/6/token_b_fee_pct': '0.03',
'v0/token/1/dex_in_fee_pct': '0.02',
'v0/token/1/dex_out_fee_pct': '0.005'})

# Check name change
token = self.nodes[0].getloantoken(self.idGOOGL)
assert_equal(token['token']['1']['name'], 'AAAA')
assert_equal(token['interest'], Decimal(1))

# Gov vars should not have loan or collateral tokens in yet
result = self.nodes[0].getgov('ATTRIBUTES')['ATTRIBUTES']
assert_equal(result, {f'v0/poolpairs/{self.idGD}/token_a_fee_pct': '0.01',
f'v0/poolpairs/{self.idGD}/token_b_fee_pct': '0.03',
f'v0/token/{self.idGOOGL}/dex_in_fee_pct': '0.02',
f'v0/token/{self.idGOOGL}/dex_out_fee_pct': '0.005'})

# Mining fork height - migration of token to gov var
self.nodes[0].generate(1)

# Check Gov var present
result = self.nodes[0].getgov('ATTRIBUTES')['ATTRIBUTES']
assert_equal(result[f'v0/token/{self.idGOOGL}/loan_minting_enabled'], 'true')
assert_equal(result[f'v0/token/{self.idGOOGL}/loan_minting_interest'], '1')
assert_equal(result[f'v0/token/{self.idGOOGL}/fixed_interval_price_id'], f"{self.symbolGOOGL}/USD")

# Make sure name updated
token = self.nodes[0].getloantoken(self.idGOOGL)
assert_equal(token['token']['1']['name'], 'AAAA')
assert_equal(token['interest'], Decimal(1))

# Mined in 152 height, using new code
# Mined in past fork height, using new code
self.nodes[0].updateloantoken(self.idGOOGL, {
'name': self.symbolGOOGL,
'interest': 0
Expand All @@ -449,6 +472,7 @@ def token_split(self):
assert_equal(result[f'v0/token/{self.idGOOGL}/loan_minting_interest'], '0')
assert_equal(result[f'v0/token/{self.idGOOGL}/fixed_interval_price_id'], f"{self.symbolGOOGL}/USD")

# Check name changed back
token = self.nodes[0].getloantoken(self.idGOOGL)
assert_equal(token['token']['1']['name'], self.symbolGOOGL)
assert_equal(token['interest'], Decimal(0))
Expand Down Expand Up @@ -775,11 +799,14 @@ def migrate_auction_batches(self):
# Create vaults
vault1 = self.nodes[0].createvault(self.address, 'LOAN0001')
vault2 = self.nodes[0].createvault(self.address, 'LOAN0001')
vault3 = self.nodes[0].createvault(self.address, 'LOAN0001')
self.nodes[0].generate(1)

# Fund vaults
self.nodes[0].deposittovault(vault1, self.address, '1@DFI')
self.nodes[0].deposittovault(vault2, self.address, '2@DFI')
self.nodes[0].deposittovault(vault1, self.address, f'1@{self.symbolDFI}')
self.nodes[0].deposittovault(vault2, self.address, f'2@{self.symbolDFI}')
self.nodes[0].deposittovault(vault3, self.address, f'1@{self.symbolDUSD}')
self.nodes[0].deposittovault(vault3, self.address, f'0.5@{self.symbolTWTR}')
self.nodes[0].generate(1)

# Take loans
Expand All @@ -792,6 +819,9 @@ def migrate_auction_batches(self):
self.nodes[0].takeloan({
'vaultId': vault2,
'amounts': "1@MSFT"})
self.nodes[0].takeloan({
'vaultId': vault3,
'amounts': "2@GOOGL"})
self.nodes[0].generate(1)

# Set Oracle prices
Expand All @@ -802,6 +832,7 @@ def migrate_auction_batches(self):
{"currency": "USD", "tokenAmount": f"1@{self.symbolTSLA}"},
{"currency": "USD", "tokenAmount": f"1@{self.symbolNVDA}"},
{"currency": "USD", "tokenAmount": f"2@{self.symbolMSFT}"},
{"currency": "USD", "tokenAmount": f"1@{self.symbolTWTR}"},
]
self.nodes[0].setoracledata(self.oracle, int(time.time()), oracle_prices)
self.nodes[0].generate(10)
Expand All @@ -811,29 +842,50 @@ def migrate_auction_batches(self):
assert_equal(result['state'], 'inLiquidation')
result = self.nodes[0].getvault(vault2)
assert_equal(result['state'], 'inLiquidation')
result = self.nodes[0].getvault(vault3)
assert_equal(result['state'], 'inLiquidation')

# Create bids
self.nodes[0].placeauctionbid(vault1, 0, self.address, f"1.1@{self.symbolMSFT}")
self.nodes[0].generate(1)

# Set locks
self.nodes[0].setgov({"ATTRIBUTES":{f'v0/locks/token/{self.idMSFT}':'true'}})
self.nodes[0].setgov({"ATTRIBUTES":{f'v0/locks/token/{self.idTWTR}':'true'}})
self.nodes[0].generate(1)

# Token split
self.nodes[0].setgov({"ATTRIBUTES":{f'v0/oracles/splits/{str(self.nodes[0].getblockcount() + 2)}':f'{self.idMSFT}/2'}})
self.nodes[0].generate(2)

result = self.nodes[0].listauctions()
if result[0]['batches'][0]['loan'] == f'4.00000070@{self.symbolMSFT}':
assert_equal(result[1]['batches'][0]['loan'], f'2.00000036@{self.symbolMSFT}')
assert_equal(result[1]['batches'][0]['highestBid']['amount'], f'2.20000000@{self.symbolMSFT}')
else:
assert_equal(result[0]['batches'][0]['loan'], f'2.00000036@{self.symbolMSFT}')
assert_equal(result[0]['batches'][0]['highestBid']['amount'], f'2.20000000@{self.symbolMSFT}')
assert_equal(result[1]['batches'][0]['loan'], f'4.00000070@{self.symbolMSFT}')
self.nodes[0].setgov({"ATTRIBUTES":{f'v0/oracles/splits/{str(self.nodes[0].getblockcount() + 3)}':f'{self.idTWTR}/2'}})
self.nodes[0].generate(3)

# Swap old for new values
self.idMSFT = list(self.nodes[0].gettoken(self.symbolMSFT).keys())[0]
self.idTWTR = list(self.nodes[0].gettoken(self.symbolTWTR).keys())[0]

# Assign results to auctions
result = self.nodes[0].listauctions()
vault1_result, vault2_result, vault3_result = {}, {}, {}
for auctions in result:
if auctions['vaultId'] == vault1:
vault1_result = auctions
elif auctions['vaultId'] == vault2:
vault2_result = auctions
elif auctions['vaultId'] == vault3:
vault3_result = auctions

# Check loan, bid and collateral amounts have multiplied
assert_equal(vault1_result['batches'][0]['loan'], f'2.00000036@{self.symbolMSFT}')
assert_equal(vault1_result['batches'][0]['highestBid']['amount'], f'2.20000000@{self.symbolMSFT}')
assert_equal(vault1_result['batches'][0]['collaterals'], [f'1.00000000@{self.symbolDFI}'])
assert_equal(vault2_result['batches'][0]['loan'], f'4.00000070@{self.symbolMSFT}')
assert_equal(vault2_result['batches'][0]['collaterals'], [f'2.00000000@{self.symbolDFI}'])
assert_equal(vault3_result['batches'][0]['loan'], f'2.00000035@{self.symbolGOOGL}')
assert_equal(vault3_result['batches'][0]['collaterals'], [f'1.00000000@{self.symbolDUSD}', f'1.00000000@{self.symbolTWTR}'])

# Unlock token
self.nodes[0].setgov({"ATTRIBUTES":{f'v0/locks/token/{self.idMSFT}':'false'}})
self.nodes[0].setgov({"ATTRIBUTES":{f'v0/locks/token/{self.idTWTR}':'false'}})
self.nodes[0].generate(1)

if __name__ == '__main__':
Expand Down