From ff6bf906d09c45226b678dd21b8e8f54a74c5c77 Mon Sep 17 00:00:00 2001 From: matejcik Date: Thu, 6 Apr 2023 13:44:57 +0200 Subject: [PATCH] chore(common): sync builtin definitions with the external repo --- common/defs/ethereum/networks.json | 2 +- common/defs/ethereum/tokens.json | 15 ++++----------- common/defs/support.json | 6 ++---- core/src/apps/ethereum/tokens.py | 12 +++--------- 4 files changed, 10 insertions(+), 25 deletions(-) diff --git a/common/defs/ethereum/networks.json b/common/defs/ethereum/networks.json index 43397a3cf0..884d4beeb7 100644 --- a/common/defs/ethereum/networks.json +++ b/common/defs/ethereum/networks.json @@ -51,7 +51,7 @@ "slip44": 61 }, { - "chain": "MATIC", + "chain": "matic", "chain_id": 137, "coingecko_id": "polygon-pos", "is_testnet": false, diff --git a/common/defs/ethereum/tokens.json b/common/defs/ethereum/tokens.json index feda2991d8..9f66f969fb 100644 --- a/common/defs/ethereum/tokens.json +++ b/common/defs/ethereum/tokens.json @@ -84,13 +84,6 @@ "name": "Chainlink", "shortcut": "LINK" }, - { - "address": "0x50d1c9771902476076ecfc8b2a83ad6b9355a4c9", - "coingecko_id": "ftx-token", - "decimals": 18, - "name": "FTX", - "shortcut": "FTT" - }, { "address": "0xa0b73e1ff0b80914ab6fe0444e65848c4c34450b", "coingecko_id": "crypto-com-chain", @@ -171,13 +164,13 @@ "shortcut": "ATOM" } ], - "137;MATIC": [ + "137;matic": [ { "address": "0x2c89bbc92bd86f8075d1decc58c7f4e0107f286b", - "coingecko_id": "avalanche-2", + "coingecko_id": "wrapped-avax", "decimals": 18, - "name": "Avalanche", - "shortcut": "AVAX" + "name": "Wrapped AVAX", + "shortcut": "WAVAX" } ] } diff --git a/common/defs/support.json b/common/defs/support.json index 13890670fb..e11da97eb0 100644 --- a/common/defs/support.json +++ b/common/defs/support.json @@ -140,7 +140,6 @@ "bitcoin:tQTUM": "1.8.1", "bitcoin:tRVN": "1.10.0", "bitcoin:tSMART": "1.7.1", - "erc20:MATIC:AVAX": "1.11.3", "erc20:bnb:ATOM": "1.11.3", "erc20:eth:AAVE": "1.11.3", "erc20:eth:APE": "1.11.3", @@ -150,7 +149,6 @@ "erc20:eth:CRO": "1.11.3", "erc20:eth:DAI": "1.11.3", "erc20:eth:FRAX": "1.11.3", - "erc20:eth:FTT": "1.11.3", "erc20:eth:LEO": "1.11.3", "erc20:eth:LINK": "1.11.3", "erc20:eth:MANA": "1.11.3", @@ -165,6 +163,7 @@ "erc20:eth:USDT": "1.11.3", "erc20:eth:WBTC": "1.11.3", "erc20:eth:XCN": "1.11.3", + "erc20:matic:WAVAX": "1.11.3", "eth:BNB:56": "1.11.3", "eth:ETC:61": "1.11.3", "eth:ETH:1": "1.11.3", @@ -255,7 +254,6 @@ "bitcoin:tQTUM": "2.1.1", "bitcoin:tRVN": "2.4.0", "bitcoin:tSMART": "2.0.8", - "erc20:MATIC:AVAX": "2.5.3", "erc20:bnb:ATOM": "2.5.3", "erc20:eth:AAVE": "2.5.3", "erc20:eth:APE": "2.5.3", @@ -265,7 +263,6 @@ "erc20:eth:CRO": "2.5.3", "erc20:eth:DAI": "2.5.3", "erc20:eth:FRAX": "2.5.3", - "erc20:eth:FTT": "2.5.3", "erc20:eth:LEO": "2.5.3", "erc20:eth:LINK": "2.5.3", "erc20:eth:MANA": "2.5.3", @@ -280,6 +277,7 @@ "erc20:eth:USDT": "2.5.3", "erc20:eth:WBTC": "2.5.3", "erc20:eth:XCN": "2.5.3", + "erc20:matic:WAVAX": "2.5.3", "eth:BNB:56": "2.5.3", "eth:ETC:61": "2.5.3", "eth:ETH:1": "2.5.3", diff --git a/core/src/apps/ethereum/tokens.py b/core/src/apps/ethereum/tokens.py index ddb3dde047..e010f6f9f7 100644 --- a/core/src/apps/ethereum/tokens.py +++ b/core/src/apps/ethereum/tokens.py @@ -90,12 +90,6 @@ def _token_iterator(chain_id: int) -> Iterator[tuple[bytes, str, int, str]]: 18, "Frax", ) - yield ( # address, symbol, decimals, name - b"\x50\xd1\xc9\x77\x19\x02\x47\x60\x76\xec\xfc\x8b\x2a\x83\xad\x6b\x93\x55\xa4\xc9", - "FTT", - 18, - "FTX", - ) yield ( # address, symbol, decimals, name b"\x2a\xf5\xd2\xad\x76\x74\x11\x91\xd1\x5d\xfe\x7b\xf6\xac\x92\xd4\xbd\x91\x2c\xa3", "LEO", @@ -187,10 +181,10 @@ def _token_iterator(chain_id: int) -> Iterator[tuple[bytes, str, int, str]]: 18, "Cosmos Hub", ) - if chain_id == 137: # MATIC + if chain_id == 137: # matic yield ( # address, symbol, decimals, name b"\x2c\x89\xbb\xc9\x2b\xd8\x6f\x80\x75\xd1\xde\xcc\x58\xc7\xf4\xe0\x10\x7f\x28\x6b", - "AVAX", + "WAVAX", 18, - "Avalanche", + "Wrapped AVAX", )