Sapling testnet activation height
This commit is contained in:
parent
10faedf758
commit
d670db7164
|
@ -12,7 +12,7 @@ RPC is ongoing, and is expected to land in master over the next few weeks.
|
|||
|
||||
The [Sapling MPC](https://blog.z.cash/announcing-the-sapling-mpc/) is currently
|
||||
working on producing the final Sapling parameters. In the meantime, Sapling will
|
||||
activate on testnet with dummy Sapling parameters at height XXXXXX. This
|
||||
activate on testnet with dummy Sapling parameters at height 252500. This
|
||||
activation will be temporary, and the testnet will be rolled back by version
|
||||
2.0.0 so that both mainnet and testnet will be using the same parameters.
|
||||
Users who want to continue testing Overwinter should continue to run version
|
||||
|
|
|
@ -266,8 +266,7 @@ public:
|
|||
consensus.vUpgrades[Consensus::UPGRADE_OVERWINTER].nProtocolVersion = 170003;
|
||||
consensus.vUpgrades[Consensus::UPGRADE_OVERWINTER].nActivationHeight = 207500;
|
||||
consensus.vUpgrades[Consensus::UPGRADE_SAPLING].nProtocolVersion = 170006;
|
||||
consensus.vUpgrades[Consensus::UPGRADE_SAPLING].nActivationHeight =
|
||||
Consensus::NetworkUpgrade::NO_ACTIVATION_HEIGHT;
|
||||
consensus.vUpgrades[Consensus::UPGRADE_SAPLING].nActivationHeight = 252500;
|
||||
|
||||
pchMessageStart[0] = 0xfa;
|
||||
pchMessageStart[1] = 0x1a;
|
||||
|
|
|
@ -820,7 +820,7 @@ static bool AttemptToEvictConnection(bool fPreferNewConnection) {
|
|||
}
|
||||
|
||||
const Consensus::Params& params = Params().GetConsensus();
|
||||
int nActivationHeight = params.vUpgrades[Consensus::UPGRADE_OVERWINTER].nActivationHeight;
|
||||
int nActivationHeight = params.vUpgrades[Consensus::UPGRADE_SAPLING].nActivationHeight;
|
||||
|
||||
if (nActivationHeight > 0 &&
|
||||
height < nActivationHeight &&
|
||||
|
@ -828,7 +828,7 @@ static bool AttemptToEvictConnection(bool fPreferNewConnection) {
|
|||
{
|
||||
// Find any nodes which don't support Overwinter protocol version
|
||||
BOOST_FOREACH(const CNodeRef &node, vEvictionCandidates) {
|
||||
if (node->nVersion < params.vUpgrades[Consensus::UPGRADE_OVERWINTER].nProtocolVersion) {
|
||||
if (node->nVersion < params.vUpgrades[Consensus::UPGRADE_SAPLING].nProtocolVersion) {
|
||||
vTmpEvictionCandidates.push_back(node);
|
||||
}
|
||||
}
|
||||
|
|
|
@ -9,7 +9,7 @@
|
|||
* network protocol versioning
|
||||
*/
|
||||
|
||||
static const int PROTOCOL_VERSION = 170005;
|
||||
static const int PROTOCOL_VERSION = 170006;
|
||||
|
||||
//! initial proto version, to be increased after version/verack negotiation
|
||||
static const int INIT_PROTO_VERSION = 209;
|
||||
|
|
Loading…
Reference in New Issue