From 95daa2fda38ce892681121cca306f4c6545f30d7 Mon Sep 17 00:00:00 2001 From: Pavol Rusnak Date: Tue, 7 Jun 2022 17:28:00 +0200 Subject: [PATCH] chore(common/defs): replace consensus_branch_id with overwintered bool flag [no changelog] --- common/defs/bitcoin/actinium.json | 2 +- common/defs/bitcoin/axe.json | 2 +- common/defs/bitcoin/bcash.json | 2 +- common/defs/bitcoin/bcash_testnet.json | 2 +- common/defs/bitcoin/bgold.json | 2 +- common/defs/bitcoin/bgold_testnet.json | 2 +- common/defs/bitcoin/bitcoin.json | 2 +- common/defs/bitcoin/bitcoin_regtest.json | 2 +- common/defs/bitcoin/bitcoin_testnet.json | 2 +- common/defs/bitcoin/bitcore.json | 2 +- common/defs/bitcoin/bprivate.json | 2 +- common/defs/bitcoin/cpuchain.json | 2 +- common/defs/bitcoin/crown.json | 2 +- common/defs/bitcoin/dash.json | 2 +- common/defs/bitcoin/dash_testnet.json | 2 +- common/defs/bitcoin/decred.json | 2 +- common/defs/bitcoin/decred_testnet.json | 2 +- common/defs/bitcoin/digibyte.json | 2 +- common/defs/bitcoin/dogecoin.json | 2 +- common/defs/bitcoin/elements.json | 2 +- common/defs/bitcoin/feathercoin.json | 2 +- common/defs/bitcoin/firo.json | 2 +- common/defs/bitcoin/firo_testnet.json | 2 +- common/defs/bitcoin/florincoin.json | 2 +- common/defs/bitcoin/fujicoin.json | 2 +- common/defs/bitcoin/groestlcoin.json | 2 +- common/defs/bitcoin/groestlcoin_testnet.json | 2 +- common/defs/bitcoin/komodo.json | 7 +------ common/defs/bitcoin/koto.json | 7 +------ common/defs/bitcoin/litecoin.json | 2 +- common/defs/bitcoin/litecoin_testnet.json | 2 +- common/defs/bitcoin/monacoin.json | 2 +- common/defs/bitcoin/monetaryunit.json | 2 +- common/defs/bitcoin/namecoin.json | 2 +- common/defs/bitcoin/particl.json | 2 +- common/defs/bitcoin/particl_testnet.json | 2 +- common/defs/bitcoin/peercoin.json | 2 +- common/defs/bitcoin/peercoin_testnet.json | 2 +- common/defs/bitcoin/primecoin.json | 2 +- common/defs/bitcoin/qtum.json | 2 +- common/defs/bitcoin/qtum_testnet.json | 2 +- common/defs/bitcoin/ravencoin.json | 2 +- common/defs/bitcoin/ravencoin_testnet.json | 2 +- common/defs/bitcoin/ritocoin.json | 2 +- common/defs/bitcoin/smartcash.json | 2 +- common/defs/bitcoin/smartcash_testnet.json | 2 +- common/defs/bitcoin/stakenet.json | 2 +- common/defs/bitcoin/syscoin.json | 2 +- common/defs/bitcoin/terracoin.json | 2 +- common/defs/bitcoin/unobtanium.json | 2 +- common/defs/bitcoin/verge.json | 2 +- common/defs/bitcoin/vertcoin.json | 2 +- common/defs/bitcoin/viacoin.json | 2 +- common/defs/bitcoin/vipstarcoin.json | 2 +- common/defs/bitcoin/xrhodium.json | 2 +- common/defs/bitcoin/zcash.json | 8 +------- common/defs/bitcoin/zcash_testnet.json | 8 +------- common/defs/bitcoin/zcore.json | 2 +- core/src/apps/common/coininfo.py.mako | 3 --- legacy/firmware/coin_info.c.mako | 2 +- 60 files changed, 59 insertions(+), 84 deletions(-) diff --git a/common/defs/bitcoin/actinium.json b/common/defs/bitcoin/actinium.json index 99e2d7f25..205cee303 100644 --- a/common/defs/bitcoin/actinium.json +++ b/common/defs/bitcoin/actinium.json @@ -37,7 +37,7 @@ "max_address_length": 34, "negative_fee": false, "cooldown": 100, - "consensus_branch_id": null, + "overwintered": false, "extra_data": false, "timestamp": false, "confidential_assets": null diff --git a/common/defs/bitcoin/axe.json b/common/defs/bitcoin/axe.json index f44e10943..773b34d31 100644 --- a/common/defs/bitcoin/axe.json +++ b/common/defs/bitcoin/axe.json @@ -37,7 +37,7 @@ "max_address_length": 34, "negative_fee": false, "cooldown": 100, - "consensus_branch_id": null, + "overwintered": false, "extra_data": false, "timestamp": false, "confidential_assets": null diff --git a/common/defs/bitcoin/bcash.json b/common/defs/bitcoin/bcash.json index 48486aa89..1f66d2736 100644 --- a/common/defs/bitcoin/bcash.json +++ b/common/defs/bitcoin/bcash.json @@ -40,7 +40,7 @@ "max_address_length": 34, "negative_fee": false, "cooldown": 100, - "consensus_branch_id": null, + "overwintered": false, "extra_data": false, "timestamp": false, "confidential_assets": null diff --git a/common/defs/bitcoin/bcash_testnet.json b/common/defs/bitcoin/bcash_testnet.json index cbc1e5be6..afbf0bb09 100644 --- a/common/defs/bitcoin/bcash_testnet.json +++ b/common/defs/bitcoin/bcash_testnet.json @@ -37,7 +37,7 @@ "max_address_length": 34, "negative_fee": false, "cooldown": 100, - "consensus_branch_id": null, + "overwintered": false, "extra_data": false, "timestamp": false, "confidential_assets": null diff --git a/common/defs/bitcoin/bgold.json b/common/defs/bitcoin/bgold.json index b9b735568..6733c20d1 100644 --- a/common/defs/bitcoin/bgold.json +++ b/common/defs/bitcoin/bgold.json @@ -40,7 +40,7 @@ "max_address_length": 34, "negative_fee": false, "cooldown": 100, - "consensus_branch_id": null, + "overwintered": false, "extra_data": false, "timestamp": false, "confidential_assets": null diff --git a/common/defs/bitcoin/bgold_testnet.json b/common/defs/bitcoin/bgold_testnet.json index a4db524e6..8ee378a8d 100644 --- a/common/defs/bitcoin/bgold_testnet.json +++ b/common/defs/bitcoin/bgold_testnet.json @@ -40,7 +40,7 @@ "max_address_length": 34, "negative_fee": false, "cooldown": 100, - "consensus_branch_id": null, + "overwintered": false, "extra_data": false, "timestamp": false, "confidential_assets": null diff --git a/common/defs/bitcoin/bitcoin.json b/common/defs/bitcoin/bitcoin.json index 01843c0b5..1ab33f581 100644 --- a/common/defs/bitcoin/bitcoin.json +++ b/common/defs/bitcoin/bitcoin.json @@ -40,7 +40,7 @@ "max_address_length": 34, "negative_fee": false, "cooldown": 100, - "consensus_branch_id": null, + "overwintered": false, "extra_data": false, "timestamp": false, "confidential_assets": null diff --git a/common/defs/bitcoin/bitcoin_regtest.json b/common/defs/bitcoin/bitcoin_regtest.json index e55b603ec..b5f87e48e 100644 --- a/common/defs/bitcoin/bitcoin_regtest.json +++ b/common/defs/bitcoin/bitcoin_regtest.json @@ -37,7 +37,7 @@ "max_address_length": 34, "negative_fee": false, "cooldown": 100, - "consensus_branch_id": null, + "overwintered": false, "extra_data": false, "timestamp": false, "confidential_assets": null diff --git a/common/defs/bitcoin/bitcoin_testnet.json b/common/defs/bitcoin/bitcoin_testnet.json index 0a2131eb2..f51c9af1b 100644 --- a/common/defs/bitcoin/bitcoin_testnet.json +++ b/common/defs/bitcoin/bitcoin_testnet.json @@ -37,7 +37,7 @@ "max_address_length": 34, "negative_fee": false, "cooldown": 100, - "consensus_branch_id": null, + "overwintered": false, "extra_data": false, "timestamp": false, "confidential_assets": null diff --git a/common/defs/bitcoin/bitcore.json b/common/defs/bitcoin/bitcore.json index 00e6ec069..872501bab 100644 --- a/common/defs/bitcoin/bitcore.json +++ b/common/defs/bitcoin/bitcore.json @@ -37,7 +37,7 @@ "max_address_length": 34, "negative_fee": false, "cooldown": 100, - "consensus_branch_id": null, + "overwintered": false, "extra_data": false, "timestamp": false, "confidential_assets": null diff --git a/common/defs/bitcoin/bprivate.json b/common/defs/bitcoin/bprivate.json index f95bffcde..5ad963f75 100644 --- a/common/defs/bitcoin/bprivate.json +++ b/common/defs/bitcoin/bprivate.json @@ -37,7 +37,7 @@ "max_address_length": 95, "negative_fee": false, "cooldown": 100, - "consensus_branch_id": null, + "overwintered": false, "extra_data": false, "timestamp": false, "confidential_assets": null diff --git a/common/defs/bitcoin/cpuchain.json b/common/defs/bitcoin/cpuchain.json index 4a7bbc83e..a28576493 100644 --- a/common/defs/bitcoin/cpuchain.json +++ b/common/defs/bitcoin/cpuchain.json @@ -37,7 +37,7 @@ "max_address_length": 34, "negative_fee": false, "cooldown": 100, - "consensus_branch_id": null, + "overwintered": false, "extra_data": false, "timestamp": false, "confidential_assets": null diff --git a/common/defs/bitcoin/crown.json b/common/defs/bitcoin/crown.json index 083368ed1..eedb28821 100644 --- a/common/defs/bitcoin/crown.json +++ b/common/defs/bitcoin/crown.json @@ -37,7 +37,7 @@ "max_address_length": 40, "negative_fee": false, "cooldown": 100, - "consensus_branch_id": null, + "overwintered": false, "extra_data": false, "timestamp": false, "confidential_assets": null diff --git a/common/defs/bitcoin/dash.json b/common/defs/bitcoin/dash.json index 1c7e04282..757e2e955 100644 --- a/common/defs/bitcoin/dash.json +++ b/common/defs/bitcoin/dash.json @@ -37,7 +37,7 @@ "max_address_length": 34, "negative_fee": false, "cooldown": 100, - "consensus_branch_id": null, + "overwintered": false, "extra_data": true, "timestamp": false, "confidential_assets": null diff --git a/common/defs/bitcoin/dash_testnet.json b/common/defs/bitcoin/dash_testnet.json index 219a0eb77..77f8ce4d1 100644 --- a/common/defs/bitcoin/dash_testnet.json +++ b/common/defs/bitcoin/dash_testnet.json @@ -37,7 +37,7 @@ "max_address_length": 34, "negative_fee": false, "cooldown": 100, - "consensus_branch_id": null, + "overwintered": false, "extra_data": true, "timestamp": false, "confidential_assets": null diff --git a/common/defs/bitcoin/decred.json b/common/defs/bitcoin/decred.json index 0822367e1..ba11d04e6 100644 --- a/common/defs/bitcoin/decred.json +++ b/common/defs/bitcoin/decred.json @@ -37,7 +37,7 @@ "max_address_length": 35, "negative_fee": false, "cooldown": 100, - "consensus_branch_id": null, + "overwintered": false, "extra_data": false, "timestamp": false, "confidential_assets": null diff --git a/common/defs/bitcoin/decred_testnet.json b/common/defs/bitcoin/decred_testnet.json index 3d5fc3b4f..d0f827a00 100644 --- a/common/defs/bitcoin/decred_testnet.json +++ b/common/defs/bitcoin/decred_testnet.json @@ -37,7 +37,7 @@ "max_address_length": 35, "negative_fee": false, "cooldown": 100, - "consensus_branch_id": null, + "overwintered": false, "extra_data": false, "timestamp": false, "confidential_assets": null diff --git a/common/defs/bitcoin/digibyte.json b/common/defs/bitcoin/digibyte.json index dec8fae2d..72d9a9efe 100644 --- a/common/defs/bitcoin/digibyte.json +++ b/common/defs/bitcoin/digibyte.json @@ -40,7 +40,7 @@ "max_address_length": 34, "negative_fee": false, "cooldown": 100, - "consensus_branch_id": null, + "overwintered": false, "extra_data": false, "timestamp": false, "confidential_assets": null diff --git a/common/defs/bitcoin/dogecoin.json b/common/defs/bitcoin/dogecoin.json index 08284689a..3c92f5c02 100644 --- a/common/defs/bitcoin/dogecoin.json +++ b/common/defs/bitcoin/dogecoin.json @@ -37,7 +37,7 @@ "max_address_length": 34, "negative_fee": false, "cooldown": 100, - "consensus_branch_id": null, + "overwintered": false, "extra_data": false, "timestamp": false, "confidential_assets": null diff --git a/common/defs/bitcoin/elements.json b/common/defs/bitcoin/elements.json index e6a63bc96..72d5216da 100644 --- a/common/defs/bitcoin/elements.json +++ b/common/defs/bitcoin/elements.json @@ -37,7 +37,7 @@ "max_address_length": 34, "negative_fee": false, "cooldown": 100, - "consensus_branch_id": null, + "overwintered": false, "extra_data": false, "timestamp": false, "confidential_assets": { diff --git a/common/defs/bitcoin/feathercoin.json b/common/defs/bitcoin/feathercoin.json index 972d4853d..fa188cddd 100644 --- a/common/defs/bitcoin/feathercoin.json +++ b/common/defs/bitcoin/feathercoin.json @@ -37,7 +37,7 @@ "max_address_length": 34, "negative_fee": false, "cooldown": 100, - "consensus_branch_id": null, + "overwintered": false, "extra_data": false, "timestamp": false, "confidential_assets": null diff --git a/common/defs/bitcoin/firo.json b/common/defs/bitcoin/firo.json index fbbe2d331..93b4254d8 100644 --- a/common/defs/bitcoin/firo.json +++ b/common/defs/bitcoin/firo.json @@ -40,7 +40,7 @@ "max_address_length": 34, "negative_fee": false, "cooldown": 100, - "consensus_branch_id": null, + "overwintered": false, "extra_data": true, "timestamp": false, "confidential_assets": null diff --git a/common/defs/bitcoin/firo_testnet.json b/common/defs/bitcoin/firo_testnet.json index 7357d0e1c..adcccb911 100644 --- a/common/defs/bitcoin/firo_testnet.json +++ b/common/defs/bitcoin/firo_testnet.json @@ -40,7 +40,7 @@ "max_address_length": 35, "negative_fee": false, "cooldown": 100, - "consensus_branch_id": null, + "overwintered": false, "extra_data": true, "timestamp": false, "confidential_assets": null diff --git a/common/defs/bitcoin/florincoin.json b/common/defs/bitcoin/florincoin.json index 156db4998..01dfded37 100644 --- a/common/defs/bitcoin/florincoin.json +++ b/common/defs/bitcoin/florincoin.json @@ -37,7 +37,7 @@ "max_address_length": 34, "negative_fee": false, "cooldown": 100, - "consensus_branch_id": null, + "overwintered": false, "extra_data": true, "timestamp": false, "confidential_assets": null diff --git a/common/defs/bitcoin/fujicoin.json b/common/defs/bitcoin/fujicoin.json index 32e59690f..49a8cc9c9 100644 --- a/common/defs/bitcoin/fujicoin.json +++ b/common/defs/bitcoin/fujicoin.json @@ -40,7 +40,7 @@ "max_address_length": 34, "negative_fee": false, "cooldown": 100, - "consensus_branch_id": null, + "overwintered": false, "extra_data": false, "timestamp": false, "confidential_assets": null diff --git a/common/defs/bitcoin/groestlcoin.json b/common/defs/bitcoin/groestlcoin.json index 19cad0893..c3a1b0fac 100644 --- a/common/defs/bitcoin/groestlcoin.json +++ b/common/defs/bitcoin/groestlcoin.json @@ -37,7 +37,7 @@ "max_address_length": 34, "negative_fee": false, "cooldown": 100, - "consensus_branch_id": null, + "overwintered": false, "extra_data": false, "timestamp": false, "confidential_assets": null diff --git a/common/defs/bitcoin/groestlcoin_testnet.json b/common/defs/bitcoin/groestlcoin_testnet.json index ce600b3c4..08136b6b5 100644 --- a/common/defs/bitcoin/groestlcoin_testnet.json +++ b/common/defs/bitcoin/groestlcoin_testnet.json @@ -37,7 +37,7 @@ "max_address_length": 34, "negative_fee": false, "cooldown": 100, - "consensus_branch_id": null, + "overwintered": false, "extra_data": false, "timestamp": false, "confidential_assets": null diff --git a/common/defs/bitcoin/komodo.json b/common/defs/bitcoin/komodo.json index 46d47bcca..e8b940b6e 100644 --- a/common/defs/bitcoin/komodo.json +++ b/common/defs/bitcoin/komodo.json @@ -37,12 +37,7 @@ "max_address_length": 34, "negative_fee": true, "cooldown": 100, - "consensus_branch_id": { - "1": 0, - "2": 0, - "3": 1537743641, - "4": 1991772603 - }, + "overwintered": true, "extra_data": true, "timestamp": false, "confidential_assets": null diff --git a/common/defs/bitcoin/koto.json b/common/defs/bitcoin/koto.json index cdbebb7a3..569fb0288 100644 --- a/common/defs/bitcoin/koto.json +++ b/common/defs/bitcoin/koto.json @@ -37,12 +37,7 @@ "max_address_length": 95, "negative_fee": false, "cooldown": 100, - "consensus_branch_id": { - "1": 0, - "2": 0, - "3": 1537743641, - "4": 733220448 - }, + "overwintered": true, "extra_data": true, "timestamp": false, "confidential_assets": null diff --git a/common/defs/bitcoin/litecoin.json b/common/defs/bitcoin/litecoin.json index 691c3398c..cb79f2459 100644 --- a/common/defs/bitcoin/litecoin.json +++ b/common/defs/bitcoin/litecoin.json @@ -37,7 +37,7 @@ "max_address_length": 34, "negative_fee": false, "cooldown": 100, - "consensus_branch_id": null, + "overwintered": false, "extra_data": false, "timestamp": false, "confidential_assets": null diff --git a/common/defs/bitcoin/litecoin_testnet.json b/common/defs/bitcoin/litecoin_testnet.json index de0506ded..8e99c3bc6 100644 --- a/common/defs/bitcoin/litecoin_testnet.json +++ b/common/defs/bitcoin/litecoin_testnet.json @@ -37,7 +37,7 @@ "max_address_length": 34, "negative_fee": false, "cooldown": 100, - "consensus_branch_id": null, + "overwintered": false, "extra_data": false, "timestamp": false, "confidential_assets": null diff --git a/common/defs/bitcoin/monacoin.json b/common/defs/bitcoin/monacoin.json index e8a093e0d..2d28001b9 100644 --- a/common/defs/bitcoin/monacoin.json +++ b/common/defs/bitcoin/monacoin.json @@ -37,7 +37,7 @@ "max_address_length": 34, "negative_fee": false, "cooldown": 100, - "consensus_branch_id": null, + "overwintered": false, "extra_data": false, "timestamp": false, "confidential_assets": null diff --git a/common/defs/bitcoin/monetaryunit.json b/common/defs/bitcoin/monetaryunit.json index 030243a35..9e2dd1959 100644 --- a/common/defs/bitcoin/monetaryunit.json +++ b/common/defs/bitcoin/monetaryunit.json @@ -37,7 +37,7 @@ "max_address_length": 34, "negative_fee": false, "cooldown": 100, - "consensus_branch_id": null, + "overwintered": false, "extra_data": false, "timestamp": false, "confidential_assets": null diff --git a/common/defs/bitcoin/namecoin.json b/common/defs/bitcoin/namecoin.json index da876f527..f913aa55a 100644 --- a/common/defs/bitcoin/namecoin.json +++ b/common/defs/bitcoin/namecoin.json @@ -37,7 +37,7 @@ "max_address_length": 34, "negative_fee": false, "cooldown": 100, - "consensus_branch_id": null, + "overwintered": false, "extra_data": false, "timestamp": false, "confidential_assets": null diff --git a/common/defs/bitcoin/particl.json b/common/defs/bitcoin/particl.json index 9c894cb4a..3b6d71b09 100644 --- a/common/defs/bitcoin/particl.json +++ b/common/defs/bitcoin/particl.json @@ -40,7 +40,7 @@ "max_address_length": 34, "negative_fee": false, "cooldown": 100, - "consensus_branch_id": null, + "overwintered": false, "extra_data": false, "timestamp": false, "confidential_assets": null diff --git a/common/defs/bitcoin/particl_testnet.json b/common/defs/bitcoin/particl_testnet.json index 38fd25aec..84c039940 100644 --- a/common/defs/bitcoin/particl_testnet.json +++ b/common/defs/bitcoin/particl_testnet.json @@ -37,7 +37,7 @@ "max_address_length": 34, "negative_fee": false, "cooldown": 100, - "consensus_branch_id": null, + "overwintered": false, "extra_data": false, "timestamp": false, "confidential_assets": null diff --git a/common/defs/bitcoin/peercoin.json b/common/defs/bitcoin/peercoin.json index 6bb186b3e..3893a8c3d 100644 --- a/common/defs/bitcoin/peercoin.json +++ b/common/defs/bitcoin/peercoin.json @@ -37,7 +37,7 @@ "max_address_length": 34, "negative_fee": false, "cooldown": 100, - "consensus_branch_id": null, + "overwintered": false, "extra_data": false, "timestamp": true, "confidential_assets": null diff --git a/common/defs/bitcoin/peercoin_testnet.json b/common/defs/bitcoin/peercoin_testnet.json index 1d58c0ba1..954a3a9df 100644 --- a/common/defs/bitcoin/peercoin_testnet.json +++ b/common/defs/bitcoin/peercoin_testnet.json @@ -37,7 +37,7 @@ "max_address_length": 34, "negative_fee": false, "cooldown": 100, - "consensus_branch_id": null, + "overwintered": false, "extra_data": false, "timestamp": true, "confidential_assets": null diff --git a/common/defs/bitcoin/primecoin.json b/common/defs/bitcoin/primecoin.json index 22f6c79aa..12f0cff0d 100644 --- a/common/defs/bitcoin/primecoin.json +++ b/common/defs/bitcoin/primecoin.json @@ -37,7 +37,7 @@ "max_address_length": 35, "negative_fee": false, "cooldown": 100, - "consensus_branch_id": null, + "overwintered": false, "extra_data": false, "timestamp": false, "confidential_assets": null diff --git a/common/defs/bitcoin/qtum.json b/common/defs/bitcoin/qtum.json index d37d86aa2..385714bf2 100644 --- a/common/defs/bitcoin/qtum.json +++ b/common/defs/bitcoin/qtum.json @@ -40,7 +40,7 @@ "max_address_length": 34, "negative_fee": false, "cooldown": 100, - "consensus_branch_id": null, + "overwintered": false, "extra_data": false, "timestamp": false, "confidential_assets": null diff --git a/common/defs/bitcoin/qtum_testnet.json b/common/defs/bitcoin/qtum_testnet.json index ae3b588af..85321f0a7 100644 --- a/common/defs/bitcoin/qtum_testnet.json +++ b/common/defs/bitcoin/qtum_testnet.json @@ -40,7 +40,7 @@ "max_address_length": 34, "negative_fee": false, "cooldown": 100, - "consensus_branch_id": null, + "overwintered": false, "extra_data": false, "timestamp": false, "confidential_assets": null diff --git a/common/defs/bitcoin/ravencoin.json b/common/defs/bitcoin/ravencoin.json index f84bc6f66..251dbb64c 100644 --- a/common/defs/bitcoin/ravencoin.json +++ b/common/defs/bitcoin/ravencoin.json @@ -37,7 +37,7 @@ "max_address_length": 34, "negative_fee": false, "cooldown": 100, - "consensus_branch_id": null, + "overwintered": false, "extra_data": false, "timestamp": false, "confidential_assets": null diff --git a/common/defs/bitcoin/ravencoin_testnet.json b/common/defs/bitcoin/ravencoin_testnet.json index b0e43ee6c..8b6c8a2b4 100755 --- a/common/defs/bitcoin/ravencoin_testnet.json +++ b/common/defs/bitcoin/ravencoin_testnet.json @@ -37,7 +37,7 @@ "max_address_length": 34, "negative_fee": false, "cooldown": 100, - "consensus_branch_id": null, + "overwintered": false, "extra_data": false, "timestamp": false, "confidential_assets": null diff --git a/common/defs/bitcoin/ritocoin.json b/common/defs/bitcoin/ritocoin.json index bc927d166..25e0acb04 100644 --- a/common/defs/bitcoin/ritocoin.json +++ b/common/defs/bitcoin/ritocoin.json @@ -37,7 +37,7 @@ "max_address_length": 34, "negative_fee": false, "cooldown": 100, - "consensus_branch_id": null, + "overwintered": false, "extra_data": false, "timestamp": false, "confidential_assets": null diff --git a/common/defs/bitcoin/smartcash.json b/common/defs/bitcoin/smartcash.json index 4bb3754da..0fd5de121 100644 --- a/common/defs/bitcoin/smartcash.json +++ b/common/defs/bitcoin/smartcash.json @@ -40,7 +40,7 @@ "max_address_length": 34, "negative_fee": false, "cooldown": 100, - "consensus_branch_id": null, + "overwintered": false, "extra_data": false, "timestamp": false, "confidential_assets": null diff --git a/common/defs/bitcoin/smartcash_testnet.json b/common/defs/bitcoin/smartcash_testnet.json index 13a772b8b..2ebb816dc 100644 --- a/common/defs/bitcoin/smartcash_testnet.json +++ b/common/defs/bitcoin/smartcash_testnet.json @@ -40,7 +40,7 @@ "max_address_length": 35, "negative_fee": false, "cooldown": 100, - "consensus_branch_id": null, + "overwintered": false, "extra_data": false, "timestamp": false, "confidential_assets": null diff --git a/common/defs/bitcoin/stakenet.json b/common/defs/bitcoin/stakenet.json index acadd93f2..ebc506077 100644 --- a/common/defs/bitcoin/stakenet.json +++ b/common/defs/bitcoin/stakenet.json @@ -40,7 +40,7 @@ "max_address_length": 47, "negative_fee": false, "cooldown": 100, - "consensus_branch_id": null, + "overwintered": false, "extra_data": true, "timestamp": false, "confidential_assets": null diff --git a/common/defs/bitcoin/syscoin.json b/common/defs/bitcoin/syscoin.json index d318e77f3..b0ea86e71 100644 --- a/common/defs/bitcoin/syscoin.json +++ b/common/defs/bitcoin/syscoin.json @@ -40,7 +40,7 @@ "max_address_length": 34, "negative_fee": false, "cooldown": 100, - "consensus_branch_id": null, + "overwintered": false, "extra_data": false, "timestamp": false, "confidential_assets": null diff --git a/common/defs/bitcoin/terracoin.json b/common/defs/bitcoin/terracoin.json index b5311ddba..852d62d7b 100644 --- a/common/defs/bitcoin/terracoin.json +++ b/common/defs/bitcoin/terracoin.json @@ -37,7 +37,7 @@ "max_address_length": 34, "negative_fee": false, "cooldown": 100, - "consensus_branch_id": null, + "overwintered": false, "extra_data": false, "timestamp": false, "confidential_assets": null diff --git a/common/defs/bitcoin/unobtanium.json b/common/defs/bitcoin/unobtanium.json index d09e3c114..343482720 100644 --- a/common/defs/bitcoin/unobtanium.json +++ b/common/defs/bitcoin/unobtanium.json @@ -40,7 +40,7 @@ "max_address_length": 34, "negative_fee": false, "cooldown": 100, - "consensus_branch_id": null, + "overwintered": false, "extra_data": false, "timestamp": false, "confidential_assets": null diff --git a/common/defs/bitcoin/verge.json b/common/defs/bitcoin/verge.json index 9a3b6a227..898efbf8e 100644 --- a/common/defs/bitcoin/verge.json +++ b/common/defs/bitcoin/verge.json @@ -37,7 +37,7 @@ "max_address_length": 34, "negative_fee": false, "cooldown": 100, - "consensus_branch_id": null, + "overwintered": false, "confidential_assets": null, "timestamp": true, "extra_data": false diff --git a/common/defs/bitcoin/vertcoin.json b/common/defs/bitcoin/vertcoin.json index d9b128eb8..ecee318da 100644 --- a/common/defs/bitcoin/vertcoin.json +++ b/common/defs/bitcoin/vertcoin.json @@ -37,7 +37,7 @@ "max_address_length": 34, "negative_fee": false, "cooldown": 100, - "consensus_branch_id": null, + "overwintered": false, "extra_data": false, "timestamp": false, "confidential_assets": null diff --git a/common/defs/bitcoin/viacoin.json b/common/defs/bitcoin/viacoin.json index 1f1bd594d..1ca1699bb 100644 --- a/common/defs/bitcoin/viacoin.json +++ b/common/defs/bitcoin/viacoin.json @@ -40,7 +40,7 @@ "max_address_length": 34, "negative_fee": false, "cooldown": 100, - "consensus_branch_id": null, + "overwintered": false, "extra_data": false, "timestamp": false, "confidential_assets": null diff --git a/common/defs/bitcoin/vipstarcoin.json b/common/defs/bitcoin/vipstarcoin.json index 4499e7d81..1b1b6fb4c 100644 --- a/common/defs/bitcoin/vipstarcoin.json +++ b/common/defs/bitcoin/vipstarcoin.json @@ -40,7 +40,7 @@ "max_address_length": 36, "negative_fee": false, "cooldown": 100, - "consensus_branch_id": null, + "overwintered": false, "extra_data": false, "timestamp": false, "confidential_assets": null diff --git a/common/defs/bitcoin/xrhodium.json b/common/defs/bitcoin/xrhodium.json index f171e78ea..59cc7bf26 100644 --- a/common/defs/bitcoin/xrhodium.json +++ b/common/defs/bitcoin/xrhodium.json @@ -40,7 +40,7 @@ "max_address_length": 34, "negative_fee": false, "cooldown": 100, - "consensus_branch_id": null, + "overwintered": false, "extra_data": false, "timestamp": false, "confidential_assets": null diff --git a/common/defs/bitcoin/zcash.json b/common/defs/bitcoin/zcash.json index e73f3a1c5..3725c7b3e 100644 --- a/common/defs/bitcoin/zcash.json +++ b/common/defs/bitcoin/zcash.json @@ -37,13 +37,7 @@ "max_address_length": 95, "negative_fee": false, "cooldown": 100, - "consensus_branch_id": { - "1": 0, - "2": 0, - "3": 1537743641, - "4": 4122551051, - "5": 3268858036 - }, + "overwintered": true, "extra_data": true, "timestamp": false, "confidential_assets": null diff --git a/common/defs/bitcoin/zcash_testnet.json b/common/defs/bitcoin/zcash_testnet.json index 06d5e868d..162b6d0c3 100644 --- a/common/defs/bitcoin/zcash_testnet.json +++ b/common/defs/bitcoin/zcash_testnet.json @@ -37,13 +37,7 @@ "max_address_length": 95, "negative_fee": false, "cooldown": 100, - "consensus_branch_id": { - "1": 0, - "2": 0, - "3": 1537743641, - "4": 4122551051, - "5": 3268858036 - }, + "overwintered": true, "extra_data": true, "timestamp": false, "confidential_assets": null diff --git a/common/defs/bitcoin/zcore.json b/common/defs/bitcoin/zcore.json index 21ff9a50a..9423e1bf0 100644 --- a/common/defs/bitcoin/zcore.json +++ b/common/defs/bitcoin/zcore.json @@ -37,7 +37,7 @@ "max_address_length": 95, "negative_fee": false, "cooldown": 100, - "consensus_branch_id": null, + "overwintered": false, "extra_data": false, "timestamp": false, "confidential_assets": null diff --git a/core/src/apps/common/coininfo.py.mako b/core/src/apps/common/coininfo.py.mako index a58a73df4..f2716a12f 100644 --- a/core/src/apps/common/coininfo.py.mako +++ b/core/src/apps/common/coininfo.py.mako @@ -136,9 +136,6 @@ btc_names = ["Bitcoin", "Testnet", "Regtest"] coins_btc = [c for c in supported_on("trezor2", bitcoin) if c.name in btc_names] coins_alt = [c for c in supported_on("trezor2", bitcoin) if c.name not in btc_names] -for c in coins_btc + coins_alt: - c.overwintered = bool(c.consensus_branch_id) - %>\ def by_name(name: str) -> CoinInfo: % for coin in coins_btc: diff --git a/legacy/firmware/coin_info.c.mako b/legacy/firmware/coin_info.c.mako index cfd83310e..705da2161 100644 --- a/legacy/firmware/coin_info.c.mako +++ b/legacy/firmware/coin_info.c.mako @@ -51,7 +51,7 @@ const CoinInfo coins[COINS_COUNT] = { .curve = &${c.curve_name}_info, .extra_data = ${c_bool(c.extra_data)}, .timestamp = ${c_bool(c.timestamp)}, - .overwintered = ${c_bool(c.consensus_branch_id)}, + .overwintered = ${c_bool(c.overwintered)}, }, % endfor };