From 2fac964a2959141b7e64a682e61cecfb781748e2 Mon Sep 17 00:00:00 2001 From: matejcik Date: Thu, 3 Jun 2021 12:14:07 +0200 Subject: [PATCH] chore(common): disable Firo support --- common/defs/support.json | 91 ++++++++++++----------- core/.changelog.d/1647.removed | 1 + core/src/apps/common/coininfo.py | 56 -------------- legacy/firmware/.changelog.d/1647.removed | 1 + 4 files changed, 49 insertions(+), 100 deletions(-) create mode 100644 core/.changelog.d/1647.removed create mode 100644 legacy/firmware/.changelog.d/1647.removed diff --git a/common/defs/support.json b/common/defs/support.json index 7a739d37c..e79f98a04 100644 --- a/common/defs/support.json +++ b/common/defs/support.json @@ -11,7 +11,6 @@ "bitcoin:DASH": true, "bitcoin:DGB": true, "bitcoin:DOGE": true, - "bitcoin:FIRO": true, "bitcoin:FJC": true, "bitcoin:FLO": true, "bitcoin:FTC": true, @@ -42,7 +41,6 @@ "bitcoin:ZEC": true, "bitcoin:ZNY": true, "bitcoin:tDASH": true, - "bitcoin:tFIRO": true, "bitcoin:tLTC": true, "bitcoin:tPPC": true, "eth:AKA": true, @@ -79,7 +77,49 @@ "nem:PAC:HRT": true, "nem:XEM": true }, - "unsupported": {} + "unsupported": { + "bitcoin:FIRO": "See issue #1588", + "bitcoin:tFIRO": "See issue #1588" + } + }, + "suite": { + "supported": { + "bitcoin:ACM": true, + "bitcoin:BCH": true, + "bitcoin:BTC": true, + "bitcoin:BTCP": true, + "bitcoin:BTG": true, + "bitcoin:DASH": true, + "bitcoin:DCR": true, + "bitcoin:DGB": true, + "bitcoin:DOGE": true, + "bitcoin:FJC": true, + "bitcoin:GRS": true, + "bitcoin:KOTO": true, + "bitcoin:LTC": true, + "bitcoin:MONA": true, + "bitcoin:MUE": true, + "bitcoin:NMC": true, + "bitcoin:PPC": true, + "bitcoin:QTUM": true, + "bitcoin:RVN": true, + "bitcoin:TAZ": true, + "bitcoin:TDCR": true, + "bitcoin:TEST": true, + "bitcoin:VIA": true, + "bitcoin:VTC": true, + "bitcoin:ZCR": true, + "bitcoin:ZEC": true, + "bitcoin:tGRS": true, + "bitcoin:tLTC": true, + "bitcoin:tPPC": true, + "eth:ETC": true, + "eth:ETH": true + }, + "unsupported": { + "bitcoin:FIRO": "See issue #1588", + "bitcoin:tFIRO": "See issue #1588" + } }, "trezor1": { "supported": { @@ -98,7 +138,6 @@ "bitcoin:DGB": "1.6.3", "bitcoin:DOGE": "1.5.2", "bitcoin:ELEMENTS": "1.8.3", - "bitcoin:FIRO": "1.6.2", "bitcoin:FJC": "1.6.1", "bitcoin:FLO": "1.7.2", "bitcoin:FTC": "1.7.1", @@ -137,7 +176,6 @@ "bitcoin:ZEC": "1.8.1", "bitcoin:ZNY": "1.8.2", "bitcoin:tDASH": "1.6.2", - "bitcoin:tFIRO": "1.6.2", "bitcoin:tGRS": "1.6.2", "bitcoin:tLTC": "1.6.2", "bitcoin:tPART": "1.8.3", @@ -2058,7 +2096,9 @@ "nem:XEM": "1.6.2" }, "unsupported": { + "bitcoin:FIRO": "See issue #1588", "bitcoin:TRC": "address_type collides with Bitcoin", + "bitcoin:tFIRO": "See issue #1588", "erc20:etc:PLAY": "(AUTO) duplicate key", "erc20:eth:A18:ba7d": "(AUTO) duplicate key", "erc20:eth:A18:bde8": "(AUTO) duplicate key", @@ -2318,7 +2358,6 @@ "bitcoin:DGB": "2.0.7", "bitcoin:DOGE": "2.0.5", "bitcoin:ELEMENTS": "2.1.4", - "bitcoin:FIRO": "2.0.7", "bitcoin:FJC": "2.0.5", "bitcoin:FLO": "2.0.11", "bitcoin:FTC": "2.0.8", @@ -2357,7 +2396,6 @@ "bitcoin:ZEC": "2.1.1", "bitcoin:ZNY": "2.1.1", "bitcoin:tDASH": "2.0.8", - "bitcoin:tFIRO": "2.0.7", "bitcoin:tGRS": "2.0.8", "bitcoin:tLTC": "2.0.7", "bitcoin:tPART": "2.1.4", @@ -4286,7 +4324,9 @@ "nem:XEM": "2.0.7" }, "unsupported": { + "bitcoin:FIRO": "See issue #1588", "bitcoin:TRC": "address_type collides with Bitcoin", + "bitcoin:tFIRO": "See issue #1588", "erc20:etc:PLAY": "(AUTO) duplicate key", "erc20:eth:A18:ba7d": "(AUTO) duplicate key", "erc20:eth:A18:bde8": "(AUTO) duplicate key", @@ -4520,42 +4560,5 @@ "eth:ATH:1620": "duplicate key", "eth:ATH:43110": "duplicate key" } - }, - "suite": { - "supported": { - "bitcoin:ACM": true, - "bitcoin:BCH": true, - "bitcoin:BTC": true, - "bitcoin:BTCP": true, - "bitcoin:BTG": true, - "bitcoin:DASH": true, - "bitcoin:DCR": true, - "bitcoin:DGB": true, - "bitcoin:DOGE": true, - "bitcoin:FIRO": true, - "bitcoin:FJC": true, - "bitcoin:GRS": true, - "bitcoin:KOTO": true, - "bitcoin:LTC": true, - "bitcoin:MONA": true, - "bitcoin:MUE": true, - "bitcoin:NMC": true, - "bitcoin:PPC": true, - "bitcoin:QTUM": true, - "bitcoin:RVN": true, - "bitcoin:TAZ": true, - "bitcoin:TDCR": true, - "bitcoin:TEST": true, - "bitcoin:VIA": true, - "bitcoin:VTC": true, - "bitcoin:ZCR": true, - "bitcoin:ZEC": true, - "bitcoin:tGRS": true, - "bitcoin:tLTC": true, - "bitcoin:tPPC": true, - "eth:ETC": true, - "eth:ETH": true - }, - "unsupported": {} } } diff --git a/core/.changelog.d/1647.removed b/core/.changelog.d/1647.removed new file mode 100644 index 000000000..73b3b8bfd --- /dev/null +++ b/core/.changelog.d/1647.removed @@ -0,0 +1 @@ +Removed support for Firo diff --git a/core/src/apps/common/coininfo.py b/core/src/apps/common/coininfo.py index 5592a2f49..0d532028e 100644 --- a/core/src/apps/common/coininfo.py +++ b/core/src/apps/common/coininfo.py @@ -766,62 +766,6 @@ def by_name(name: str) -> CoinInfo: overwintered=False, confidential_assets=None, ) - elif name == "Firo": - return CoinInfo( - coin_name=name, - coin_shortcut="FIRO", - decimals=8, - address_type=82, - address_type_p2sh=7, - maxfee_kb=640000000, - signed_message_header="Zcoin Signed Message:\n", - xpub_magic=0x0488b21e, - xpub_magic_segwit_p2sh=None, - xpub_magic_segwit_native=None, - xpub_magic_multisig_segwit_p2sh=None, - xpub_magic_multisig_segwit_native=None, - bech32_prefix=None, - cashaddr_prefix=None, - slip44=136, - segwit=False, - fork_id=None, - force_bip143=False, - decred=False, - negative_fee=False, - curve_name='secp256k1', - extra_data=True, - timestamp=False, - overwintered=False, - confidential_assets=None, - ) - elif name == "Firo Testnet": - return CoinInfo( - coin_name=name, - coin_shortcut="tFIRO", - decimals=8, - address_type=65, - address_type_p2sh=178, - maxfee_kb=1000000, - signed_message_header="Zcoin Signed Message:\n", - xpub_magic=0x043587cf, - xpub_magic_segwit_p2sh=None, - xpub_magic_segwit_native=None, - xpub_magic_multisig_segwit_p2sh=None, - xpub_magic_multisig_segwit_native=None, - bech32_prefix=None, - cashaddr_prefix=None, - slip44=1, - segwit=False, - fork_id=None, - force_bip143=False, - decred=False, - negative_fee=False, - curve_name='secp256k1', - extra_data=True, - timestamp=False, - overwintered=False, - confidential_assets=None, - ) elif name == "Florincoin": return CoinInfo( coin_name=name, diff --git a/legacy/firmware/.changelog.d/1647.removed b/legacy/firmware/.changelog.d/1647.removed new file mode 100644 index 000000000..73b3b8bfd --- /dev/null +++ b/legacy/firmware/.changelog.d/1647.removed @@ -0,0 +1 @@ +Removed support for Firo