From 87cc44e73abd7747f06297e45a0451212d72a085 Mon Sep 17 00:00:00 2001 From: Martin Milata Date: Fri, 15 Oct 2021 14:27:04 +0200 Subject: [PATCH] chore(common): update coins support status [no changelog] --- common/defs/duplicity_overrides.json | 2 + common/defs/misc/misc.json | 3 +- common/defs/support.json | 20 +++++----- core/src/apps/common/coininfo.py | 58 ---------------------------- core/src/apps/ethereum/tokens.py | 6 ++- 5 files changed, 18 insertions(+), 71 deletions(-) diff --git a/common/defs/duplicity_overrides.json b/common/defs/duplicity_overrides.json index d6c08a741..a04c350f8 100644 --- a/common/defs/duplicity_overrides.json +++ b/common/defs/duplicity_overrides.json @@ -7,6 +7,8 @@ "erc20:eth:TUSD": false, "erc20:eth:Hdp": true, "erc20:eth:Hdp.ф": true, + "erc20:eth:HEX:2b59": false, + "erc20:eth:JOB:dfbc": false, "misc:BNB": false, "eth:BNB": false, "eth:ONE:1666600000": false, diff --git a/common/defs/misc/misc.json b/common/defs/misc/misc.json index 0303aa7e7..3061bb922 100644 --- a/common/defs/misc/misc.json +++ b/common/defs/misc/misc.json @@ -83,7 +83,8 @@ }, "wallet": { "AdaLite": "https://adalite.io/app", - "Yoroi": "https://yoroi-wallet.com" + "Yoroi": "https://yoroi-wallet.com", + "Daedalus": "https://daedaluswallet.io" } }, { diff --git a/common/defs/support.json b/common/defs/support.json index eb73cd5c7..2978aa223 100644 --- a/common/defs/support.json +++ b/common/defs/support.json @@ -151,7 +151,6 @@ "bitcoin:MUE": "1.7.1", "bitcoin:NIX": "1.7.2", "bitcoin:NMC": "1.5.2", - "bitcoin:PART": "1.8.3", "bitcoin:POLIS": "1.8.2", "bitcoin:PPC": "1.8.4", "bitcoin:QTUM": "1.8.1", @@ -179,7 +178,6 @@ "bitcoin:tFIRO": "1.6.2", "bitcoin:tGRS": "1.6.2", "bitcoin:tLTC": "1.6.2", - "bitcoin:tPART": "1.8.3", "bitcoin:tPPC": "1.8.4", "bitcoin:tQTUM": "1.8.1", "bitcoin:tRVN": "1.10.0", @@ -763,6 +761,7 @@ "erc20:eth:HDLRE": "1.8.4", "erc20:eth:HEM": "1.9.0", "erc20:eth:HER": "1.8.0", + "erc20:eth:HEX:2b59": "1.10.4", "erc20:eth:HEY": "1.9.0", "erc20:eth:HGT": "1.6.2", "erc20:eth:HIBT": "1.6.3", @@ -841,6 +840,7 @@ "erc20:eth:JBX": "1.9.0", "erc20:eth:JC": "1.8.0", "erc20:eth:JNT": "1.6.2", + "erc20:eth:JOB:dfbc": "1.10.4", "erc20:eth:JOT": "1.8.0", "erc20:eth:JOY": "1.6.2", "erc20:eth:JSE": "1.9.0", @@ -1492,7 +1492,6 @@ "erc20:eth:WRC": "1.8.0", "erc20:eth:WRK": "1.6.2", "erc20:eth:WSS": "1.8.4", - "erc20:eth:WTC": "1.6.2", "erc20:eth:WTT": "1.8.0", "erc20:eth:WWX": "1.9.0", "erc20:eth:WYS": "1.6.2", @@ -2156,7 +2155,9 @@ "nem:XEM": "1.6.2" }, "unsupported": { + "bitcoin:PART": "incompatible fork", "bitcoin:TRC": "address_type collides with Bitcoin", + "bitcoin:tPART": "incompatible fork", "erc20:etc:PLAY": "(AUTO) duplicate key", "erc20:eth:A18:ba7d": "(AUTO) duplicate key", "erc20:eth:A18:bde8": "(AUTO) duplicate key", @@ -2251,7 +2252,6 @@ "erc20:eth:GANA:c0ea": "(AUTO) duplicate key", "erc20:eth:GMT:7ddc": "(AUTO) duplicate key", "erc20:eth:GMT:b3bd": "(AUTO) duplicate key", - "erc20:eth:HEX:2b59": "(AUTO) duplicate key", "erc20:eth:HEX:9600": "(AUTO) duplicate key", "erc20:eth:Hdp": "(AUTO) duplicate key", "erc20:eth:Hdp.\u0444": "(AUTO) duplicate key", @@ -2262,7 +2262,6 @@ "erc20:eth:JET:7734": "(AUTO) duplicate key", "erc20:eth:JET:8727": "(AUTO) duplicate key", "erc20:eth:JOB:1728": "(AUTO) duplicate key", - "erc20:eth:JOB:dfbc": "(AUTO) duplicate key", "erc20:eth:KEY:4cc1": "(AUTO) duplicate key", "erc20:eth:KEY:4cd9": "(AUTO) duplicate key", "erc20:eth:KICK:2769": "(AUTO) duplicate key", @@ -2363,6 +2362,7 @@ "erc20:eth:WOLK:f6b5": "(AUTO) duplicate key", "erc20:eth:WORK:a686": "(AUTO) duplicate key", "erc20:eth:WORK:d18e": "(AUTO) duplicate key", + "erc20:eth:WTC": "Migrated to mainnet", "erc20:eth:WiC": "(AUTO) duplicate key", "erc20:eth:YEED:6f7a": "(AUTO) duplicate key", "erc20:eth:YEED:ca27": "(AUTO) duplicate key", @@ -2494,7 +2494,6 @@ "bitcoin:MUE": "2.0.8", "bitcoin:NIX": "2.0.11", "bitcoin:NMC": "2.0.5", - "bitcoin:PART": "2.1.4", "bitcoin:POLIS": "2.1.1", "bitcoin:PPC": "2.1.9", "bitcoin:QTUM": "2.1.1", @@ -2522,7 +2521,6 @@ "bitcoin:tFIRO": "2.0.7", "bitcoin:tGRS": "2.0.8", "bitcoin:tLTC": "2.0.7", - "bitcoin:tPART": "2.1.4", "bitcoin:tPPC": "2.1.9", "bitcoin:tQTUM": "2.1.1", "bitcoin:tRVN": "2.4.0", @@ -3106,6 +3104,7 @@ "erc20:eth:HDLRE": "2.1.8", "erc20:eth:HEM": "2.3.0", "erc20:eth:HER": "2.0.10", + "erc20:eth:HEX:2b59": "2.4.3", "erc20:eth:HEY": "2.3.0", "erc20:eth:HGT": "2.0.7", "erc20:eth:HIBT": "2.0.8", @@ -3184,6 +3183,7 @@ "erc20:eth:JBX": "2.3.0", "erc20:eth:JC": "2.0.10", "erc20:eth:JNT": "2.0.7", + "erc20:eth:JOB:dfbc": "2.4.3", "erc20:eth:JOT": "2.0.10", "erc20:eth:JOY": "2.0.7", "erc20:eth:JSE": "2.3.0", @@ -3835,7 +3835,6 @@ "erc20:eth:WRC": "2.0.10", "erc20:eth:WRK": "2.0.7", "erc20:eth:WSS": "2.1.8", - "erc20:eth:WTC": "2.0.7", "erc20:eth:WTT": "2.0.10", "erc20:eth:WWX": "2.3.0", "erc20:eth:WYS": "2.0.7", @@ -4506,7 +4505,9 @@ "nem:XEM": "2.0.7" }, "unsupported": { + "bitcoin:PART": "incompatible fork", "bitcoin:TRC": "address_type collides with Bitcoin", + "bitcoin:tPART": "incompatible fork", "erc20:etc:PLAY": "(AUTO) duplicate key", "erc20:eth:A18:ba7d": "(AUTO) duplicate key", "erc20:eth:A18:bde8": "(AUTO) duplicate key", @@ -4601,7 +4602,6 @@ "erc20:eth:GANA:c0ea": "(AUTO) duplicate key", "erc20:eth:GMT:7ddc": "(AUTO) duplicate key", "erc20:eth:GMT:b3bd": "(AUTO) duplicate key", - "erc20:eth:HEX:2b59": "(AUTO) duplicate key", "erc20:eth:HEX:9600": "(AUTO) duplicate key", "erc20:eth:Hdp": "(AUTO) duplicate key", "erc20:eth:Hdp.\u0444": "(AUTO) duplicate key", @@ -4612,7 +4612,6 @@ "erc20:eth:JET:7734": "(AUTO) duplicate key", "erc20:eth:JET:8727": "(AUTO) duplicate key", "erc20:eth:JOB:1728": "(AUTO) duplicate key", - "erc20:eth:JOB:dfbc": "(AUTO) duplicate key", "erc20:eth:KEY:4cc1": "(AUTO) duplicate key", "erc20:eth:KEY:4cd9": "(AUTO) duplicate key", "erc20:eth:KICK:2769": "(AUTO) duplicate key", @@ -4713,6 +4712,7 @@ "erc20:eth:WOLK:f6b5": "(AUTO) duplicate key", "erc20:eth:WORK:a686": "(AUTO) duplicate key", "erc20:eth:WORK:d18e": "(AUTO) duplicate key", + "erc20:eth:WTC": "Migrated to mainnet", "erc20:eth:WiC": "(AUTO) duplicate key", "erc20:eth:YEED:6f7a": "(AUTO) duplicate key", "erc20:eth:YEED:ca27": "(AUTO) duplicate key", diff --git a/core/src/apps/common/coininfo.py b/core/src/apps/common/coininfo.py index e2fb6cef2..8457cbf4f 100644 --- a/core/src/apps/common/coininfo.py +++ b/core/src/apps/common/coininfo.py @@ -1140,64 +1140,6 @@ def by_name(name: str) -> CoinInfo: overwintered=False, confidential_assets=None, ) - elif name == "Particl": - return CoinInfo( - coin_name=name, - coin_shortcut="PART", - decimals=8, - address_type=56, - address_type_p2sh=60, - maxfee_kb=5300000000, - signed_message_header="Bitcoin Signed Message:\n", - xpub_magic=0x8f1daeb8, - xpub_magic_segwit_p2sh=0x01b26ef6, - xpub_magic_segwit_native=0x04b24746, - xpub_magic_multisig_segwit_p2sh=0x8f1daeb8, - xpub_magic_multisig_segwit_native=0x8f1daeb8, - bech32_prefix="bc", - cashaddr_prefix=None, - slip44=44, - segwit=True, - taproot=False, - fork_id=None, - force_bip143=False, - decred=False, - negative_fee=False, - curve_name='secp256k1', - extra_data=False, - timestamp=False, - overwintered=False, - confidential_assets=None, - ) - elif name == "Particl Testnet": - return CoinInfo( - coin_name=name, - coin_shortcut="tPART", - decimals=8, - address_type=118, - address_type_p2sh=122, - maxfee_kb=10000000, - signed_message_header="Bitcoin Signed Message:\n", - xpub_magic=0x04889478, - xpub_magic_segwit_p2sh=0x044a5262, - xpub_magic_segwit_native=0x045f1cf6, - xpub_magic_multisig_segwit_p2sh=0x04889478, - xpub_magic_multisig_segwit_native=0x04889478, - bech32_prefix="tb", - cashaddr_prefix=None, - slip44=1, - segwit=True, - taproot=False, - fork_id=None, - force_bip143=False, - decred=False, - negative_fee=False, - curve_name='secp256k1', - extra_data=False, - timestamp=False, - overwintered=False, - confidential_assets=None, - ) elif name == "Peercoin": return CoinInfo( coin_name=name, diff --git a/core/src/apps/ethereum/tokens.py b/core/src/apps/ethereum/tokens.py index 43a2858d7..567240659 100644 --- a/core/src/apps/ethereum/tokens.py +++ b/core/src/apps/ethereum/tokens.py @@ -1298,6 +1298,8 @@ def token_by_chain_address(chain_id: int, address: bytes) -> TokenInfo: return TokenInfo("HEM", 8) # eth / Hemelios elif address == b"\x49\x1c\x9a\x23\xdb\x85\x62\x3e\xed\x45\x5a\x8e\xfd\xd6\xab\xa9\xb9\x11\xc5\xdf": return TokenInfo("HER", 18) # eth / HeroNode + elif address == b"\x2b\x59\x1e\x99\xaf\xe9\xf3\x2e\xaa\x62\x14\xf7\xb7\x62\x97\x68\xc4\x0e\xeb\x39": + return TokenInfo("HEX", 8) # eth / HEX elif address == b"\xe9\xc9\xe7\xe1\xda\xbe\xa8\x30\xc9\x58\xc3\x9d\x6b\x25\x96\x4a\x6f\x52\x14\x3a": return TokenInfo("HEY", 18) # eth / HeyToken elif address == b"\xba\x21\x84\x52\x0a\x1c\xc4\x9a\x61\x59\xc5\x7e\x61\xe1\x84\x4e\x08\x56\x15\xb6": @@ -1488,6 +1490,8 @@ def token_by_chain_address(chain_id: int, address: bytes) -> TokenInfo: return TokenInfo("JC", 18) # eth / Jesus Coin elif address == b"\xa5\xfd\x1a\x79\x1c\x4d\xfc\xaa\xcc\x96\x3d\x4f\x73\xc6\xae\x58\x24\x14\x9e\xa7": return TokenInfo("JNT", 18) # eth / Jibrel Network + elif address == b"\xdf\xbc\x90\x50\xf5\xb0\x1d\xf5\x35\x12\xdc\xc3\x9b\x4f\x2b\x2b\xba\xcd\x51\x7a": + return TokenInfo("JOB", 8) # eth / Jobchain elif address == b"\xdb\x45\x5c\x71\xc1\xbc\x2d\xe4\xe8\x0c\xa4\x51\x18\x40\x41\xef\x32\x05\x40\x01": return TokenInfo("JOT", 18) # eth / Jury.Online Token elif address == b"\xdd\xe1\x2a\x12\xa6\xf6\x71\x56\xe0\xda\x67\x2b\xe0\x5c\x37\x4e\x1b\x0a\x3e\x57": @@ -3392,8 +3396,6 @@ def token_by_chain_address(chain_id: int, address: bytes) -> TokenInfo: return TokenInfo("WRK", 18) # eth / WorkCoin elif address == b"\x1d\x9a\x3c\xef\x66\xb0\x1d\x44\x00\x3b\x9d\xb0\xe0\x0e\xc3\xfd\x44\x74\x69\x88": return TokenInfo("WSS", 18) # eth / ETHWSS Coin - elif address == b"\xb7\xcb\x1c\x96\xdb\x6b\x22\xb0\xd3\xd9\x53\x6e\x01\x08\xd0\x62\xbd\x48\x8f\x74": - return TokenInfo("WTC", 18) # eth / Waltonchain elif address == b"\x84\x11\x9c\xb3\x3e\x8f\x59\x0d\x75\xc2\xd6\xea\x4e\x6b\x07\x41\xa7\x49\x4e\xda": return TokenInfo("WTT", 0) # eth / WTT elif address == b"\x8a\x91\xee\xcd\x3f\x6b\x6b\x78\x33\xfd\x69\x61\xe7\xf6\x54\xc3\xd0\x16\xa0\x68":