zecfoundation
/
zebra
mirror of https://github.com/ZcashFoundation/zebra.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

change(consensus/network): Updates `CURRENT_NETWORK_PROTOCOL_VERSION` and adds an NU6 activation height on Testnet (#8804) 

* Updates CURRENT_NETWORK_PROTOCOL_VERSION and adds an NU6 activation height on Testnet

* Updates post-NU6 funding stream start height on Testnet

* updates snapshots

* updates snapshot
This commit is contained in:
Arya 2024-08-27 19:24:33 -04:00 committed by GitHub
parent 6922e7126c
commit adde5c92f3
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
5 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
zebra-chain/src/parameters/network/subsidy.rs
View File

@ -292,7 +292,7 @@ const POST_NU6_FUNDING_STREAM_START_HEIGHT_MAINNET: u32 = 2_726_400;
/// The start height of post-NU6 funding streams on Testnet
// TODO: Add a reference to lockbox stream ZIP, this is currently based on https://zips.z.cash/draft-nuttycom-funding-allocation
const POST_NU6_FUNDING_STREAM_START_HEIGHT_TESTNET: u32 = 2_942_000;
const POST_NU6_FUNDING_STREAM_START_HEIGHT_TESTNET: u32 = 2_976_000;
/// The number of blocks contained in the post-NU6 funding streams height ranges on Mainnet or Testnet.
const POST_NU6_FUNDING_STREAM_NUM_BLOCKS: u32 = 420_000;

2
zebra-chain/src/parameters/network_upgrade.rs
View File

@ -125,7 +125,7 @@ pub(super) const TESTNET_ACTIVATION_HEIGHTS: &[(block::Height, NetworkUpgrade)]
(block::Height(903_800), Heartwood),
(block::Height(1_028_500), Canopy),
(block::Height(1_842_420), Nu5),
// TODO: Add NU6 activation height once it's been specified.
(block::Height(2_976_000), Nu6),
];
/// Fake testnet network upgrade activation heights, used in tests.

2
zebra-network/src/constants.rs
View File

@ -337,7 +337,7 @@ pub const TIMESTAMP_TRUNCATION_SECONDS: u32 = 30 * 60;
///
/// The current protocol version typically changes before Mainnet and Testnet
/// network upgrades.
pub const CURRENT_NETWORK_PROTOCOL_VERSION: Version = Version(170_100);
pub const CURRENT_NETWORK_PROTOCOL_VERSION: Version = Version(170_110);
/// The default RTT estimate for peer responses.
///

5
zebra-rpc/src/methods/tests/snapshots/get_blockchain_info@testnet_10.snap
View File

@ -64,6 +64,11 @@ expression: info
"name": "NU5",
"activationheight": 1842420,
"status": "pending"
},
"c8e71055": {
"name": "Nu6",
"activationheight": 2976000,
"status": "pending"
}
},
"consensus": {

8
zebra-rpc/src/methods/tests/snapshots/get_blockchain_info_future_nu6_height@nu6testnet_10.snap
View File

@ -52,22 +52,22 @@ expression: info
},
"f5b9230b": {
"name": "Heartwood",
"activationheight": 2942000,
"activationheight": 2976000,
"status": "pending"
},
"e9ff75a6": {
"name": "Canopy",
"activationheight": 2942000,
"activationheight": 2976000,
"status": "pending"
},
"c2d6d0b4": {
"name": "NU5",
"activationheight": 2942000,
"activationheight": 2976000,
"status": "pending"
},
"c8e71055": {
"name": "Nu6",
"activationheight": 2942000,
"activationheight": 2976000,
"status": "pending"
}
},