Update NU5 consensus branch ID and set testnet activation height
This commit is contained in:
parent
e1abca5032
commit
a90af6cb2d
|
@ -240,7 +240,7 @@ impl Parameters for TestNetwork {
|
||||||
NetworkUpgrade::Blossom => Some(BlockHeight(584_000)),
|
NetworkUpgrade::Blossom => Some(BlockHeight(584_000)),
|
||||||
NetworkUpgrade::Heartwood => Some(BlockHeight(903_800)),
|
NetworkUpgrade::Heartwood => Some(BlockHeight(903_800)),
|
||||||
NetworkUpgrade::Canopy => Some(BlockHeight(1_028_500)),
|
NetworkUpgrade::Canopy => Some(BlockHeight(1_028_500)),
|
||||||
NetworkUpgrade::Nu5 => None,
|
NetworkUpgrade::Nu5 => Some(BlockHeight(1_599_200)),
|
||||||
#[cfg(feature = "zfuture")]
|
#[cfg(feature = "zfuture")]
|
||||||
NetworkUpgrade::ZFuture => None,
|
NetworkUpgrade::ZFuture => None,
|
||||||
}
|
}
|
||||||
|
@ -458,7 +458,7 @@ impl TryFrom<u32> for BranchId {
|
||||||
0x2bb4_0e60 => Ok(BranchId::Blossom),
|
0x2bb4_0e60 => Ok(BranchId::Blossom),
|
||||||
0xf5b9_230b => Ok(BranchId::Heartwood),
|
0xf5b9_230b => Ok(BranchId::Heartwood),
|
||||||
0xe9ff_75a6 => Ok(BranchId::Canopy),
|
0xe9ff_75a6 => Ok(BranchId::Canopy),
|
||||||
0xf919_a198 => Ok(BranchId::Nu5),
|
0x3751_9621 => Ok(BranchId::Nu5),
|
||||||
#[cfg(feature = "zfuture")]
|
#[cfg(feature = "zfuture")]
|
||||||
0xffff_ffff => Ok(BranchId::ZFuture),
|
0xffff_ffff => Ok(BranchId::ZFuture),
|
||||||
_ => Err("Unknown consensus branch ID"),
|
_ => Err("Unknown consensus branch ID"),
|
||||||
|
@ -475,7 +475,7 @@ impl From<BranchId> for u32 {
|
||||||
BranchId::Blossom => 0x2bb4_0e60,
|
BranchId::Blossom => 0x2bb4_0e60,
|
||||||
BranchId::Heartwood => 0xf5b9_230b,
|
BranchId::Heartwood => 0xf5b9_230b,
|
||||||
BranchId::Canopy => 0xe9ff_75a6,
|
BranchId::Canopy => 0xe9ff_75a6,
|
||||||
BranchId::Nu5 => 0xf919_a198,
|
BranchId::Nu5 => 0x3751_9621,
|
||||||
#[cfg(feature = "zfuture")]
|
#[cfg(feature = "zfuture")]
|
||||||
BranchId::ZFuture => 0xffff_ffff,
|
BranchId::ZFuture => 0xffff_ffff,
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue