diff --git a/defs/bitcoin/bcash.json b/defs/bitcoin/bcash.json index e83a45d9f0..29a6171521 100644 --- a/defs/bitcoin/bcash.json +++ b/defs/bitcoin/bcash.json @@ -24,7 +24,6 @@ "fork_id": 0, "force_bip143": true, "bip115": false, - "version_group_id": null, "default_fee_b": { "Low": 10, "Economy": 70, diff --git a/defs/bitcoin/bcash_testnet.json b/defs/bitcoin/bcash_testnet.json index eb01cb9484..ce59249ee4 100644 --- a/defs/bitcoin/bcash_testnet.json +++ b/defs/bitcoin/bcash_testnet.json @@ -24,7 +24,6 @@ "fork_id": 0, "force_bip143": true, "bip115": false, - "version_group_id": null, "default_fee_b": { "Normal": 10 }, diff --git a/defs/bitcoin/bgold.json b/defs/bitcoin/bgold.json index 333427fdeb..75132f7f65 100644 --- a/defs/bitcoin/bgold.json +++ b/defs/bitcoin/bgold.json @@ -24,7 +24,6 @@ "fork_id": 79, "force_bip143": true, "bip115": false, - "version_group_id": null, "default_fee_b": { "Low": 10, "Economy": 70, diff --git a/defs/bitcoin/bgold_testnet.json b/defs/bitcoin/bgold_testnet.json index b5e81235f3..e3dae9b2c2 100644 --- a/defs/bitcoin/bgold_testnet.json +++ b/defs/bitcoin/bgold_testnet.json @@ -24,7 +24,6 @@ "fork_id": 79, "force_bip143": true, "bip115": false, - "version_group_id": null, "default_fee_b": { "Low": 10, "Economy": 70, diff --git a/defs/bitcoin/bitcoin.json b/defs/bitcoin/bitcoin.json index 88a1430291..4df6e08af1 100644 --- a/defs/bitcoin/bitcoin.json +++ b/defs/bitcoin/bitcoin.json @@ -24,7 +24,6 @@ "fork_id": null, "force_bip143": false, "bip115": false, - "version_group_id": null, "default_fee_b": { "Low": 10, "Economy": 70, diff --git a/defs/bitcoin/bitcoin_testnet.json b/defs/bitcoin/bitcoin_testnet.json index b83b38703a..1b5af1cfc1 100644 --- a/defs/bitcoin/bitcoin_testnet.json +++ b/defs/bitcoin/bitcoin_testnet.json @@ -24,7 +24,6 @@ "fork_id": null, "force_bip143": false, "bip115": false, - "version_group_id": null, "default_fee_b": { "Normal": 10 }, diff --git a/defs/bitcoin/bitcore.json b/defs/bitcoin/bitcore.json index 0b38f33908..e40aad6a3d 100644 --- a/defs/bitcoin/bitcore.json +++ b/defs/bitcoin/bitcore.json @@ -24,7 +24,6 @@ "fork_id": null, "force_bip143": false, "bip115": false, - "version_group_id": null, "default_fee_b": { "Low": 10 }, diff --git a/defs/bitcoin/bprivate.json b/defs/bitcoin/bprivate.json index 80cd951f02..83ba75bddc 100644 --- a/defs/bitcoin/bprivate.json +++ b/defs/bitcoin/bprivate.json @@ -24,7 +24,6 @@ "fork_id": 42, "force_bip143": false, "bip115": false, - "version_group_id": null, "default_fee_b": { "Normal": 10 }, diff --git a/defs/bitcoin/crown.json b/defs/bitcoin/crown.json index 8d7d7a31be..eabb1890d5 100644 --- a/defs/bitcoin/crown.json +++ b/defs/bitcoin/crown.json @@ -24,7 +24,6 @@ "fork_id": null, "force_bip143": false, "bip115": false, - "version_group_id": null, "default_fee_b": { "Normal": 10 }, diff --git a/defs/bitcoin/dash.json b/defs/bitcoin/dash.json index 0c364ea7ad..65651b006e 100644 --- a/defs/bitcoin/dash.json +++ b/defs/bitcoin/dash.json @@ -24,7 +24,6 @@ "fork_id": null, "force_bip143": false, "bip115": false, - "version_group_id": null, "default_fee_b": { "Normal": 10 }, diff --git a/defs/bitcoin/dash_testnet.json b/defs/bitcoin/dash_testnet.json index f176a1ebd5..ce6ace0f5c 100644 --- a/defs/bitcoin/dash_testnet.json +++ b/defs/bitcoin/dash_testnet.json @@ -24,7 +24,6 @@ "fork_id": null, "force_bip143": false, "bip115": false, - "version_group_id": null, "default_fee_b": { "Normal": 10 }, diff --git a/defs/bitcoin/decred.json b/defs/bitcoin/decred.json index 8089e6372b..1d44e67f45 100644 --- a/defs/bitcoin/decred.json +++ b/defs/bitcoin/decred.json @@ -24,7 +24,6 @@ "fork_id": null, "force_bip143": false, "bip115": false, - "version_group_id": null, "default_fee_b": { "Normal": 10 }, diff --git a/defs/bitcoin/decred_testnet.json b/defs/bitcoin/decred_testnet.json index 9cca77f6c5..e4b20e9bd0 100644 --- a/defs/bitcoin/decred_testnet.json +++ b/defs/bitcoin/decred_testnet.json @@ -24,7 +24,6 @@ "fork_id": null, "force_bip143": false, "bip115": false, - "version_group_id": null, "default_fee_b": { "Normal": 10 }, diff --git a/defs/bitcoin/denarius.json b/defs/bitcoin/denarius.json index a1fc8bc376..8052e4961b 100644 --- a/defs/bitcoin/denarius.json +++ b/defs/bitcoin/denarius.json @@ -24,7 +24,6 @@ "fork_id": null, "force_bip143": false, "bip115": false, - "version_group_id": null, "default_fee_b": { "Normal": 10 }, diff --git a/defs/bitcoin/digibyte.json b/defs/bitcoin/digibyte.json index 33d3166a3f..52939f6575 100644 --- a/defs/bitcoin/digibyte.json +++ b/defs/bitcoin/digibyte.json @@ -23,7 +23,6 @@ "decred": false, "fork_id": null, "force_bip143": false, - "version_group_id": null, "bip115": false, "default_fee_b": { "Low": 10, diff --git a/defs/bitcoin/dogecoin.json b/defs/bitcoin/dogecoin.json index 4a5dca6406..5ff77bcfb1 100644 --- a/defs/bitcoin/dogecoin.json +++ b/defs/bitcoin/dogecoin.json @@ -24,7 +24,6 @@ "fork_id": null, "force_bip143": false, "bip115": false, - "version_group_id": null, "default_fee_b": { "Normal": 100000 }, diff --git a/defs/bitcoin/feathercoin.json b/defs/bitcoin/feathercoin.json index bdb4019702..06eabb87d8 100644 --- a/defs/bitcoin/feathercoin.json +++ b/defs/bitcoin/feathercoin.json @@ -24,7 +24,6 @@ "fork_id": null, "force_bip143": false, "bip115": false, - "version_group_id": null, "default_fee_b": { "Normal": 1000 }, diff --git a/defs/bitcoin/flashcoin.json b/defs/bitcoin/flashcoin.json index 59b7f52c09..71159aa2ea 100644 --- a/defs/bitcoin/flashcoin.json +++ b/defs/bitcoin/flashcoin.json @@ -24,7 +24,6 @@ "fork_id": null, "force_bip143": false, "bip115": false, - "version_group_id": null, "default_fee_b": { "Normal": 0 }, diff --git a/defs/bitcoin/fujicoin.json b/defs/bitcoin/fujicoin.json index e34bfe805f..1350af5f10 100644 --- a/defs/bitcoin/fujicoin.json +++ b/defs/bitcoin/fujicoin.json @@ -24,7 +24,6 @@ "fork_id": null, "force_bip143": false, "bip115": false, - "version_group_id": null, "default_fee_b": { "Low": 100, "Economy": 200, diff --git a/defs/bitcoin/gamecredits.json b/defs/bitcoin/gamecredits.json index 498b24f710..ba188721e7 100644 --- a/defs/bitcoin/gamecredits.json +++ b/defs/bitcoin/gamecredits.json @@ -24,7 +24,6 @@ "fork_id": null, "force_bip143": false, "bip115": false, - "version_group_id": null, "default_fee_b": { "Normal": 1000 }, diff --git a/defs/bitcoin/groestlcoin.json b/defs/bitcoin/groestlcoin.json index 84edbeca07..8c8e9abe36 100644 --- a/defs/bitcoin/groestlcoin.json +++ b/defs/bitcoin/groestlcoin.json @@ -24,7 +24,6 @@ "fork_id": null, "force_bip143": false, "bip115": false, - "version_group_id": null, "default_fee_b": { "Normal": 10 }, diff --git a/defs/bitcoin/groestlcoin_testnet.json b/defs/bitcoin/groestlcoin_testnet.json index 2612a6ca0e..42b031199e 100644 --- a/defs/bitcoin/groestlcoin_testnet.json +++ b/defs/bitcoin/groestlcoin_testnet.json @@ -24,7 +24,6 @@ "fork_id": null, "force_bip143": false, "bip115": false, - "version_group_id": null, "default_fee_b": { "Normal": 10 }, diff --git a/defs/bitcoin/koto.json b/defs/bitcoin/koto.json index cc9e86b3c9..ed31ab7387 100644 --- a/defs/bitcoin/koto.json +++ b/defs/bitcoin/koto.json @@ -24,7 +24,6 @@ "fork_id": null, "force_bip143": false, "bip115": false, - "version_group_id": 48748912, "default_fee_b": { "Normal": 10 }, diff --git a/defs/bitcoin/litecoin.json b/defs/bitcoin/litecoin.json index a09adbf281..920718d950 100644 --- a/defs/bitcoin/litecoin.json +++ b/defs/bitcoin/litecoin.json @@ -24,7 +24,6 @@ "fork_id": null, "force_bip143": false, "bip115": false, - "version_group_id": null, "default_fee_b": { "Normal": 1000 }, diff --git a/defs/bitcoin/litecoin_testnet.json b/defs/bitcoin/litecoin_testnet.json index d60e569e75..d9cbf35860 100644 --- a/defs/bitcoin/litecoin_testnet.json +++ b/defs/bitcoin/litecoin_testnet.json @@ -24,7 +24,6 @@ "fork_id": null, "force_bip143": false, "bip115": false, - "version_group_id": null, "default_fee_b": { "Normal": 10 }, diff --git a/defs/bitcoin/monacoin.json b/defs/bitcoin/monacoin.json index a0de875813..2cd7d6e158 100644 --- a/defs/bitcoin/monacoin.json +++ b/defs/bitcoin/monacoin.json @@ -24,7 +24,6 @@ "fork_id": null, "force_bip143": false, "bip115": false, - "version_group_id": null, "default_fee_b": { "Normal": 1000 }, diff --git a/defs/bitcoin/monetaryunit.json b/defs/bitcoin/monetaryunit.json index 63f2b992c9..d27f77a626 100644 --- a/defs/bitcoin/monetaryunit.json +++ b/defs/bitcoin/monetaryunit.json @@ -24,7 +24,6 @@ "fork_id": null, "force_bip143": false, "bip115": false, - "version_group_id": null, "default_fee_b": { "Normal": 10 }, diff --git a/defs/bitcoin/myriad.json b/defs/bitcoin/myriad.json index 18889998a8..0ca576df92 100644 --- a/defs/bitcoin/myriad.json +++ b/defs/bitcoin/myriad.json @@ -24,7 +24,6 @@ "fork_id": null, "force_bip143": false, "bip115": false, - "version_group_id": null, "default_fee_b": { "Low": 10, "Economy": 70, diff --git a/defs/bitcoin/namecoin.json b/defs/bitcoin/namecoin.json index 96745d6cb9..a57622e45d 100644 --- a/defs/bitcoin/namecoin.json +++ b/defs/bitcoin/namecoin.json @@ -24,7 +24,6 @@ "fork_id": null, "force_bip143": false, "bip115": false, - "version_group_id": null, "default_fee_b": { "Normal": 10 }, diff --git a/defs/bitcoin/pesetacoin.json b/defs/bitcoin/pesetacoin.json index dbdb2dfc28..af59ed57cc 100644 --- a/defs/bitcoin/pesetacoin.json +++ b/defs/bitcoin/pesetacoin.json @@ -24,7 +24,6 @@ "fork_id": null, "force_bip143": false, "bip115": false, - "version_group_id": null, "default_fee_b": { "Normal": 10 }, diff --git a/defs/bitcoin/smartcash.json b/defs/bitcoin/smartcash.json index a918d901e4..88438dc8ce 100644 --- a/defs/bitcoin/smartcash.json +++ b/defs/bitcoin/smartcash.json @@ -24,7 +24,6 @@ "fork_id": null, "force_bip143": false, "bip115": false, - "version_group_id": null, "default_fee_b": { "Low": 1, "Economy": 10, diff --git a/defs/bitcoin/smartcash_testnet.json b/defs/bitcoin/smartcash_testnet.json index 132ff6848f..1be411754f 100644 --- a/defs/bitcoin/smartcash_testnet.json +++ b/defs/bitcoin/smartcash_testnet.json @@ -24,7 +24,6 @@ "fork_id": null, "force_bip143": false, "bip115": false, - "version_group_id": null, "default_fee_b": { "Low": 1, "Economy": 10, diff --git a/defs/bitcoin/terracoin.json b/defs/bitcoin/terracoin.json index bbaa6e7529..cb167ddf84 100644 --- a/defs/bitcoin/terracoin.json +++ b/defs/bitcoin/terracoin.json @@ -24,7 +24,6 @@ "fork_id": null, "force_bip143": false, "bip115": false, - "version_group_id": null, "default_fee_b": { "Normal": 10 }, diff --git a/defs/bitcoin/vertcoin.json b/defs/bitcoin/vertcoin.json index 0a5fc982f7..ac12588219 100644 --- a/defs/bitcoin/vertcoin.json +++ b/defs/bitcoin/vertcoin.json @@ -24,7 +24,6 @@ "fork_id": null, "force_bip143": false, "bip115": false, - "version_group_id": null, "default_fee_b": { "Normal": 1000 }, diff --git a/defs/bitcoin/viacoin.json b/defs/bitcoin/viacoin.json index 527b5b01d2..d34ae9a06e 100644 --- a/defs/bitcoin/viacoin.json +++ b/defs/bitcoin/viacoin.json @@ -24,7 +24,6 @@ "fork_id": null, "force_bip143": false, "bip115": false, - "version_group_id": null, "default_fee_b": { "Low": 1000, "Economy": 7000, diff --git a/defs/bitcoin/zcash.json b/defs/bitcoin/zcash.json index 807528a3f3..f88a1316a2 100644 --- a/defs/bitcoin/zcash.json +++ b/defs/bitcoin/zcash.json @@ -24,7 +24,6 @@ "fork_id": null, "force_bip143": false, "bip115": false, - "version_group_id": 63210096, "default_fee_b": { "Normal": 10 }, diff --git a/defs/bitcoin/zcash_testnet.json b/defs/bitcoin/zcash_testnet.json index 468d9ffb0a..42dc563609 100644 --- a/defs/bitcoin/zcash_testnet.json +++ b/defs/bitcoin/zcash_testnet.json @@ -24,7 +24,6 @@ "fork_id": null, "force_bip143": false, "bip115": false, - "version_group_id": 63210096, "default_fee_b": { "Normal": 10 }, diff --git a/defs/bitcoin/zcoin.json b/defs/bitcoin/zcoin.json index 796fea6a7f..b4de836388 100644 --- a/defs/bitcoin/zcoin.json +++ b/defs/bitcoin/zcoin.json @@ -24,7 +24,6 @@ "fork_id": null, "force_bip143": false, "bip115": false, - "version_group_id": null, "default_fee_b": { "Low": 1, "Economy": 10, diff --git a/defs/bitcoin/zcoin_testnet.json b/defs/bitcoin/zcoin_testnet.json index 41e4f49e02..85d66c1581 100644 --- a/defs/bitcoin/zcoin_testnet.json +++ b/defs/bitcoin/zcoin_testnet.json @@ -24,7 +24,6 @@ "fork_id": null, "force_bip143": false, "bip115": false, - "version_group_id": null, "default_fee_b": { "Low": 1, "Economy": 10, diff --git a/defs/bitcoin/zencash.json b/defs/bitcoin/zencash.json index f0b94a9f32..2f0424865c 100644 --- a/defs/bitcoin/zencash.json +++ b/defs/bitcoin/zencash.json @@ -24,7 +24,6 @@ "fork_id": null, "force_bip143": false, "bip115": true, - "version_group_id": null, "default_fee_b": { "Normal": 10 }, diff --git a/tools/coin_info.py b/tools/coin_info.py index 4d16bf5e7e..57bbf2ffb8 100755 --- a/tools/coin_info.py +++ b/tools/coin_info.py @@ -130,7 +130,6 @@ BTC_CHECKS = [ check_key("fork_id", int, nullable=True), check_key("force_bip143", bool), check_key("bip115", bool), - check_key("version_group_id", int, nullable=True), check_key("default_fee_b", dict), check_key("dust_limit", int), check_key("blocktime_seconds", int), diff --git a/tools/coindef.py b/tools/coindef.py index cc658bd2d2..e96246054e 100644 --- a/tools/coindef.py +++ b/tools/coindef.py @@ -29,7 +29,6 @@ class CoinDef(p.MessageType): 24: ('min_address_length', p.UVarintType, 0), 25: ('max_address_length', p.UVarintType, 0), 26: ('icon', p.BytesType, 0), - 27: ('version_group_id', p.UVarintType, 0), 28: ('website', p.UnicodeType, 0), 29: ('github', p.UnicodeType, 0), 30: ('maintainer', p.UnicodeType, 0), @@ -67,7 +66,6 @@ class CoinDef(p.MessageType): min_address_length: int = None, max_address_length: int = None, icon: bytes = None, - version_group_id: int = None, website: str = None, github: str = None, maintainer: str = None, @@ -104,7 +102,6 @@ class CoinDef(p.MessageType): self.min_address_length = min_address_length self.max_address_length = max_address_length self.icon = icon - self.version_group_id = version_group_id self.website = website self.github = github self.maintainer = maintainer