Browse Source

chore(common/defs): replace consensus_branch_id with overwintered bool flag

[no changelog]
pull/2327/merge
Pavol Rusnak 2 months ago committed by matejcik
parent
commit
95daa2fda3
  1. 2
      common/defs/bitcoin/actinium.json
  2. 2
      common/defs/bitcoin/axe.json
  3. 2
      common/defs/bitcoin/bcash.json
  4. 2
      common/defs/bitcoin/bcash_testnet.json
  5. 2
      common/defs/bitcoin/bgold.json
  6. 2
      common/defs/bitcoin/bgold_testnet.json
  7. 2
      common/defs/bitcoin/bitcoin.json
  8. 2
      common/defs/bitcoin/bitcoin_regtest.json
  9. 2
      common/defs/bitcoin/bitcoin_testnet.json
  10. 2
      common/defs/bitcoin/bitcore.json
  11. 2
      common/defs/bitcoin/bprivate.json
  12. 2
      common/defs/bitcoin/cpuchain.json
  13. 2
      common/defs/bitcoin/crown.json
  14. 2
      common/defs/bitcoin/dash.json
  15. 2
      common/defs/bitcoin/dash_testnet.json
  16. 2
      common/defs/bitcoin/decred.json
  17. 2
      common/defs/bitcoin/decred_testnet.json
  18. 2
      common/defs/bitcoin/digibyte.json
  19. 2
      common/defs/bitcoin/dogecoin.json
  20. 2
      common/defs/bitcoin/elements.json
  21. 2
      common/defs/bitcoin/feathercoin.json
  22. 2
      common/defs/bitcoin/firo.json
  23. 2
      common/defs/bitcoin/firo_testnet.json
  24. 2
      common/defs/bitcoin/florincoin.json
  25. 2
      common/defs/bitcoin/fujicoin.json
  26. 2
      common/defs/bitcoin/groestlcoin.json
  27. 2
      common/defs/bitcoin/groestlcoin_testnet.json
  28. 7
      common/defs/bitcoin/komodo.json
  29. 7
      common/defs/bitcoin/koto.json
  30. 2
      common/defs/bitcoin/litecoin.json
  31. 2
      common/defs/bitcoin/litecoin_testnet.json
  32. 2
      common/defs/bitcoin/monacoin.json
  33. 2
      common/defs/bitcoin/monetaryunit.json
  34. 2
      common/defs/bitcoin/namecoin.json
  35. 2
      common/defs/bitcoin/particl.json
  36. 2
      common/defs/bitcoin/particl_testnet.json
  37. 2
      common/defs/bitcoin/peercoin.json
  38. 2
      common/defs/bitcoin/peercoin_testnet.json
  39. 2
      common/defs/bitcoin/primecoin.json
  40. 2
      common/defs/bitcoin/qtum.json
  41. 2
      common/defs/bitcoin/qtum_testnet.json
  42. 2
      common/defs/bitcoin/ravencoin.json
  43. 2
      common/defs/bitcoin/ravencoin_testnet.json
  44. 2
      common/defs/bitcoin/ritocoin.json
  45. 2
      common/defs/bitcoin/smartcash.json
  46. 2
      common/defs/bitcoin/smartcash_testnet.json
  47. 2
      common/defs/bitcoin/stakenet.json
  48. 2
      common/defs/bitcoin/syscoin.json
  49. 2
      common/defs/bitcoin/terracoin.json
  50. 2
      common/defs/bitcoin/unobtanium.json
  51. 2
      common/defs/bitcoin/verge.json
  52. 2
      common/defs/bitcoin/vertcoin.json
  53. 2
      common/defs/bitcoin/viacoin.json
  54. 2
      common/defs/bitcoin/vipstarcoin.json
  55. 2
      common/defs/bitcoin/xrhodium.json
  56. 8
      common/defs/bitcoin/zcash.json
  57. 8
      common/defs/bitcoin/zcash_testnet.json
  58. 2
      common/defs/bitcoin/zcore.json
  59. 3
      core/src/apps/common/coininfo.py.mako
  60. 2
      legacy/firmware/coin_info.c.mako

2
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

2
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

2
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

2
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

2
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

2
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

2
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

2
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

2
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

2
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

2
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

2
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

2
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

2
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

2
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

2
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

2
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

2
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

2
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

2
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": {

2
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

2
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

2
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

2
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

2
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

2
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

2
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

7
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

7
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

2
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

2
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

2
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

2
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

2
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

2
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

2
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

2
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

2
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

2
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

2
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

2
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

2
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

2
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

2
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

2
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

2
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

2
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

2
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

2
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

2
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

2
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

2
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

2
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

2
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

2
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

8
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

8
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

2
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

3
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:

2
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
};

Loading…
Cancel
Save