HardFork3 #3334
HardFork3 #3334
Conversation
quentinlesceller
added
consensus breaking
|
NOTE that the FLOONET_THIRD_HARD_FORK value may need revising when building a beta or RC according to whether we still want to HF on June 20 and how fast floonet progressed. |
| pub fn valid_header_version(height: u64, version: HeaderVersion) -> bool { | ||
| height < 3 * HARD_FORK_INTERVAL && version == header_version(height) | ||
| height < 4 * HARD_FORK_INTERVAL && version == header_version(height) | ||
| } |
There was a problem hiding this comment.
Just realized this logic is only correct for mainnet.
It is not valid for either floonet or usertesting which do not use HARD_FORK_INTERVAL directly.
This is not specific to this PR and I don't think it has a material impact here - but we should revisit this.
Tracking here - #3335
There was a problem hiding this comment.
Why can't floonet and usertesting be limited to 2 years worth of block just like mainnet is for version 4? Of course that will be changed downward at the next HF, but for now it looks fine to me.
There was a problem hiding this comment.
Yeah maybe that is fine actually.
I was originally thinking automatedtesting wants to be able to test an invalid block due to excessive block height. But its going to be based on header version anyway.
👍
|
@tromp can you fix the merge conflict? |
| @@ -133,12 +133,18 @@ pub const FLOONET_FIRST_HARD_FORK: u64 = 185_040; | |||
| /// Floonet second hard fork height, set to happen around 2019-12-19 | |||
| pub const FLOONET_SECOND_HARD_FORK: u64 = 298_080; | |||
|
|
|||
| /// Floonet second hard fork height, set to happen around 2020-06-20 | |||
| pub const FLOONET_THIRD_HARD_FORK: u64 = 552_960; | |||
There was a problem hiding this comment.
For reference the exact time is currently 2020-06-19 18:49:36 +0000 UTC
This comment has been minimized.
This comment has been minimized.
name: HardFork3
about: This hard-fork allows blocks with 3*HARD_FORK_INTERVAL/FLOONET_THIRD_HARD_FORK <= height < 4*HARD_FORK_INTERVAL with header version 4 and Cuckarooz29 as secondary PoW.
title: HardFork3
labels: consensus breaking
assignees: @antiochp @yeastplume @quentinlesceller
Currently, consensus::valid_header_version(height, version) returns false for all height >= 3*HARD_FORK_INTERVAL.
This PR changes that to return true for version 4 at either FLOONET_THIRD_HARD_FORK <= height < 4*HARD_FORK_INTERVAL on floonet or 3*HARD_FORK_INTERVAL <= height < 4*HARD_FORK_INTERVAL on mainnet.
This PR also changes global::create_pow_context to return new_cuckarooz_ctx(edge_bits, proof_size) when consensus::valid_header_version(height, version) holds for version 4, which means that Cuckarooz29 [1] is the only valid secondary PoW after the hard fork.
Successfully tested on a mainnet fast sync.
[1] https://forum.grin.mw/t/introducing-the-final-tweak-cuckarooz