Set NU5 protocol version for regtest to 170040, bump protocol version
We need to bump the `zcashd` protocol version because the new rules are not compatible with existing rules followed by 170015 nodes, but we _also_ need to ensure we can still bump it again once we set the testnet reactivation height (changing node network behaviour again). This commit also enables RPC tests to run (because previously the nodes considered each other to be too old for NU5 to be active, and were disconnecting).
This commit is contained in:
parent
d9c1b05a83
commit
e5210d50c9
|
@ -52,7 +52,7 @@ SPROUT_PROTO_VERSION = 170002 # past bip-31 for ping/pong
|
|||
OVERWINTER_PROTO_VERSION = 170003
|
||||
SAPLING_PROTO_VERSION = 170006
|
||||
BLOSSOM_PROTO_VERSION = 170008
|
||||
NU5_PROTO_VERSION = 170050
|
||||
NU5_PROTO_VERSION = 170040
|
||||
|
||||
MY_SUBVERSION = b"/python-mininode-tester:0.0.3/"
|
||||
|
||||
|
|
|
@ -664,7 +664,7 @@ public:
|
|||
consensus.vUpgrades[Consensus::UPGRADE_CANOPY].nProtocolVersion = 170012;
|
||||
consensus.vUpgrades[Consensus::UPGRADE_CANOPY].nActivationHeight =
|
||||
Consensus::NetworkUpgrade::NO_ACTIVATION_HEIGHT;
|
||||
consensus.vUpgrades[Consensus::UPGRADE_NU5].nProtocolVersion = 170050;
|
||||
consensus.vUpgrades[Consensus::UPGRADE_NU5].nProtocolVersion = 170040;
|
||||
consensus.vUpgrades[Consensus::UPGRADE_NU5].nActivationHeight =
|
||||
Consensus::NetworkUpgrade::NO_ACTIVATION_HEIGHT;
|
||||
consensus.vUpgrades[Consensus::UPGRADE_ZFUTURE].nProtocolVersion = 0x7FFFFFFF;
|
||||
|
|
|
@ -9,7 +9,7 @@
|
|||
* network protocol versioning
|
||||
*/
|
||||
|
||||
static const int PROTOCOL_VERSION = 170015;
|
||||
static const int PROTOCOL_VERSION = 170040;
|
||||
|
||||
//! initial proto version, to be increased after version/verack negotiation
|
||||
static const int INIT_PROTO_VERSION = 209;
|
||||
|
|
Loading…
Reference in New Issue