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

Updates `protocol::Version::min_specified_for_upgrade()` with likely NU6 protocol versions (#8733)

This commit is contained in:
Arya 2024-08-20 14:57:09 -04:00 committed by GitHub
parent bcd66ad71e
commit 0ecc5eb900
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
zebra-network/src/protocol/external/types.rs vendored
View File

@ -82,9 +82,9 @@ impl Version {
(_, Genesis) | (_, BeforeOverwinter) => 170_002, (_, Genesis) | (_, BeforeOverwinter) => 170_002,
(Testnet(params), Overwinter) if params.is_default_testnet() => 170_003, (Testnet(params), Overwinter) if params.is_default_testnet() => 170_003,
(Mainnet, Overwinter) => 170_005, (Mainnet, Overwinter) => 170_005,
// TODO: Use 170_006 for (Testnet(params), Sapling) if params.is_regtest() (`Regtest` in zcashd uses (Testnet(params), Sapling) if params.is_default_testnet() => 170_007,
// version 170_006 for Sapling, and the same values as Testnet for other network upgrades.) (Testnet(params), Sapling) if params.is_regtest() => 170_006,
(_, Sapling) => 170_007, (Mainnet, Sapling) => 170_007,
(Testnet(params), Blossom) if params.is_default_testnet() => 170_008, (Testnet(params), Blossom) if params.is_default_testnet() => 170_008,
(Mainnet, Blossom) => 170_009, (Mainnet, Blossom) => 170_009,
(Testnet(params), Heartwood) if params.is_default_testnet() => 170_010, (Testnet(params), Heartwood) if params.is_default_testnet() => 170_010,
@ -93,11 +93,11 @@ impl Version {
(Mainnet, Canopy) => 170_013, (Mainnet, Canopy) => 170_013,
(Testnet(params), Nu5) if params.is_default_testnet() => 170_050, (Testnet(params), Nu5) if params.is_default_testnet() => 170_050,
(Mainnet, Nu5) => 170_100, (Mainnet, Nu5) => 170_100,
(Testnet(params), Nu6) if params.is_default_testnet() => 170_050, (Testnet(params), Nu6) if params.is_default_testnet() => 170_110,
(Mainnet, Nu6) => 170_100, (Mainnet, Nu6) => 170_120,
// It should be fine to reject peers with earlier network protocol versions on custom testnets for now. // It should be fine to reject peers with earlier network protocol versions on custom testnets for now.
(Testnet(_params), _) => CURRENT_NETWORK_PROTOCOL_VERSION.0, (Testnet(_), _) => CURRENT_NETWORK_PROTOCOL_VERSION.0,
}) })
} }
} }