Skip to content

fix(debank): Ignore duplicate symbols in asset import list #222

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

Merged
hanjano merged 1 commit into from
Feb 4, 2025
Merged

fix(debank): Ignore duplicate symbols in asset import list #222

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
203 changes: 203 additions & 0 deletions blockapi/test/v2/api/debank/data/duplicates.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,203 @@
[
{
"id": "avax_traderjoexyz_lending",
"chain": "avax",
"name": "Trader Joe Lending",
"site_url": "https://www.traderjoexyz.com",
"logo_url": "https://static.debank.com/image/project/logo_url/avax_traderjoexyz_lending/eab9fd6fb47852d3b7766515bfefe366.png",
"has_supported_portfolio": true,
"tvl": 162476998.75607753,
"portfolio_item_list": [
{
"stats": {
"asset_usd_value": 547045.4515305705,
"debt_usd_value": 0,
"net_usd_value": 547045.4515305705
},
"update_at": 1650963061.376993,
"name": "Lending",
"pool_id": "0xdc13687554205e5b89ac783db14bb5bba4a1edac",
"detail_types": [
"lending"
],
"asset_token_list": [
{
"id": "0xb31f66aa3c1e785363f0875a1b74e27b85fd66c7",
"chain": "avax",
"name": "Wrapped AVAX",
"symbol": "WAVAX",
"display_symbol": "WAVAX",
"optimized_symbol": "WAVAX",
"decimals": 18,
"logo_url": "https://static.debank.com/image/avax_token/logo_url/0xb31f66aa3c1e785363f0875a1b74e27b85fd66c7/753d82f0137617110f8dec56309b4065.png",
"protocol_id": "avax_gmx",
"price": 72.17,
"is_verified": true,
"is_core": true,
"is_wallet": true,
"time_at": 1607728259,
"amount": 7579.956374263135,
"is_collateral": false
}
],
"detail": {
"supply_token_list": [
{
"id": "0xb31f66aa3c1e785363f0875a1b74e27b85fd66c7",
"chain": "avax",
"name": "Wrapped AVAX",
"symbol": "WAVAX",
"display_symbol": "WAVAX",
"optimized_symbol": "WAVAX",
"decimals": 18,
"logo_url": "https://static.debank.com/image/avax_token/logo_url/0xb31f66aa3c1e785363f0875a1b74e27b85fd66c7/753d82f0137617110f8dec56309b4065.png",
"protocol_id": "avax_gmx",
"price": 72.17,
"is_verified": true,
"is_core": true,
"is_wallet": true,
"time_at": 1607728259,
"amount": 7579.956374263135,
"is_collateral": false
}
],
"borrow_token_list": [],
"health_rate": null
},
"proxy_detail": {}
}
]
},
{
"id": "badger",
"chain": "eth",
"name": "Badger DAO",
"site_url": "https://app.badger.com",
"logo_url": "https://static.debank.com/image/project/logo_url/badger/5c003a64968875b5a0fc9ad1d66f443e.png",
"has_supported_portfolio": true,
"tvl": 477772217.08888835,
"portfolio_item_list": [
{
"asset_token_list": [
{
"id": "0x3472a5a71965499acd81997a54bba8d852c6e53d",
"chain": "eth",
"name": "Badger",
"symbol": "BADGER",
"display_symbol": null,
"optimized_symbol": "BADGER",
"decimals": 18,
"logo_url": "https://static.debank.com/image/eth_token/logo_url/0x3472a5a71965499acd81997a54bba8d852c6e53d/0e7643dba053739569d5b9f82225f4e5.png",
"protocol_id": "badger",
"price": 9.293940818278347,
"is_verified": true,
"is_core": true,
"is_wallet": true,
"time_at": 1606584722,
"amount": 0.10983732849125298
}
],
"stats": {
"asset_usd_value": 1.0208216306355034,
"debt_usd_value": 0,
"net_usd_value": 1.0208216306355034
},
"update_at": 1650963062.2987647,
"name": "Rewards",
"pool_id": null,
"detail_types": [
"reward"
],
"detail": {
"borrow_token_list": [
{
"id": "0x3472a5a71965499acd81997a54bba8d852c6e53d",
"chain": "eth",
"name": "Badger",
"symbol": "BADGER",
"display_symbol": null,
"optimized_symbol": "BADGER",
"decimals": 18,
"logo_url": "https://static.debank.com/image/eth_token/logo_url/0x3472a5a71965499acd81997a54bba8d852c6e53d/0e7643dba053739569d5b9f82225f4e5.png",
"protocol_id": "badger",
"price": 9.293940818278347,
"is_verified": true,
"is_core": true,
"is_wallet": true,
"time_at": 1606584722,
"amount": 0.10983732849125298
}
]
},
"proxy_detail": {}
}
]
},
{
"id": "bao",
"chain": "eth",
"name": "Bao.Finance",
"site_url": "https://www.bao.finance",
"logo_url": "https://static.debank.com/image/project/logo_url/bao/d59cfe86c635a69450f6c589374d13bb.png",
"has_supported_portfolio": true,
"tvl": 109387995.87917314,
"portfolio_item_list": [
{
"asset_token_list": [
{
"id": "0x374cb8c27130e2c9e04f44303f3c8351b9de61c1",
"chain": "eth",
"name": "BaoToken",
"symbol": "BAO",
"display_symbol": null,
"optimized_symbol": "BAO",
"decimals": 18,
"logo_url": "https://static.debank.com/image/eth_token/logo_url/0x374cb8c27130e2c9e04f44303f3c8351b9de61c1/31e006c2a222e974dcef3636beb8e662.png",
"protocol_id": "bao",
"price": 0.00013897526158318586,
"is_verified": true,
"is_core": true,
"is_wallet": true,
"time_at": 1606850780,
"amount": 211938652.94628933
}
],
"stats": {
"asset_usd_value": 29454.229732798605,
"debt_usd_value": 0,
"net_usd_value": 29454.229732798605
},
"update_at": 1650963063.251515,
"name": "Locked",
"pool_id": "0x374cb8c27130e2c9e04f44303f3c8351b9de61c1",
"detail_types": [
"common",
"locked"
],
"detail": {
"reward_token_list": [
{
"id": "0x374cb8c27130e2c9e04f44303f3c8351b9de61c1",
"chain": "eth",
"name": "BaoToken",
"symbol": "BAO",
"display_symbol": null,
"optimized_symbol": "BAO",
"decimals": 18,
"logo_url": "https://static.debank.com/image/eth_token/logo_url/0x374cb8c27130e2c9e04f44303f3c8351b9de61c1/31e006c2a222e974dcef3636beb8e662.png",
"protocol_id": "bao",
"price": 0.00013897526158318586,
"is_verified": true,
"is_core": true,
"is_wallet": true,
"time_at": 1606850780,
"amount": 211938652.94628933
}
],
"unlock_at": 2715656008.36
},
"proxy_detail": {}
}
]
}
]
12 changes: 12 additions & 0 deletions blockapi/test/v2/api/debank/test_debank_portfolio_parser.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -167,3 +167,15 @@ def test_parse_pools(debank_api, bio_polls):
for data_item in parsed.data:
for item in data_item.items:
assert item.balance > Decimal('0')


def test_skip_duplicate_assets(portfolio_parser, duplicates):
parsed_items = portfolio_parser.parse(duplicates)
assert len(parsed_items) == 3
for item in parsed_items:
assert len(item.items) == 1


@pytest.fixture
def duplicates():
return read_json_file("debank/data/duplicates.json")
54 changes: 39 additions & 15 deletions blockapi/v2/api/debank.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -484,33 +484,57 @@ def _parse_balances(self, detail, item, pool_info) -> Iterable[BalanceItem]:
asset_type = self._parse_asset_type(item.name)
borrow_type = self._get_borrow_asset_type(asset_type)
reward_type = self._get_reward_asset_type(asset_type)
exclude = set()

yield from self._parse_token_list(
detail.supply_token_list,
asset_type,
pool_info=pool_info,
supply = list(
self._parse_token_list(
detail.supply_token_list,
asset_type,
pool_info=pool_info,
)
)
self._update_exclude(exclude, supply)
yield from supply

yield from self._parse_token_list(
detail.borrow_token_list,
borrow_type,
pool_info=pool_info,
borrow = list(
self._parse_token_list(
detail.borrow_token_list,
borrow_type,
pool_info=pool_info,
)
)
self._update_exclude(exclude, borrow)
yield from borrow

yield from self._parse_token_list(
detail.reward_token_list,
reward_type,
pool_info=pool_info,
reward = list(
self._parse_token_list(
detail.reward_token_list,
reward_type,
pool_info=pool_info,
)
)
self._update_exclude(exclude, reward)
yield from reward

yield from self._parse_token_list(
detail.token_list, asset_type, pool_info=pool_info
tokens = list(
self._parse_token_list(detail.token_list, asset_type, pool_info=pool_info)
)
# self._update_exclude(exclude, tokens)
yield from tokens

yield from self._parse_token_list(
assets = self._parse_token_list(
item.asset_token_list, asset_type, pool_info=pool_info
)

for asset in assets:
if (asset.coin.blockchain, asset.coin.symbol) not in exclude:
yield asset

@staticmethod
def _update_exclude(exclude: set, items: list[BalanceItem]):
for it in items:
exclude.add((it.coin.blockchain, it.coin.symbol))

def _get_tokens(self, raw_balances: list[dict]):
symbols = [
self._balance_parser.get_symbol(DebankModelBalanceItem(**b))
Expand Down