jleony/nanoreth
1
0
Fork 0
mirror of https://github.com/hl-archive-node/nanoreth.git synced 2025-12-06 10:59:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

feat(ethereum-forks): remove total difficulty for hardfork check (#13362)

Browse Source 
Co-authored-by: Dan Cline <6798349+Rjected@users.noreply.github.com>
This commit is contained in:
Kunal Arora
2024-12-20 20:58:05 +05:30
committed by GitHub
parent dc6394b05b
commit 82af170687
44 changed files with 382 additions and 646 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
crates/chainspec/src/spec.rs
View File

@ -240,6 +240,12 @@ impl ChainSpec {
self.chain == Chain::optimism_mainnet()
}
/// Returns the known paris block, if it exists.
#[inline]
pub fn paris_block(&self) -> Option<u64> {
self.paris_block_and_final_difficulty.map(|(block, _)| block)
}
/// Get the genesis block specification.
///
/// To get the header for the genesis block, use [`Self::genesis_header`] instead.
@ -389,7 +395,7 @@ impl ChainSpec {
/// Returns the hardfork display helper.
pub fn display_hardforks(&self) -> DisplayHardforks {
DisplayHardforks::new(&self, self.paris_block_and_final_difficulty.map(|(block, _)| block))
DisplayHardforks::new(&self)
}
/// Get the fork id for the given hardfork.
@ -603,12 +609,20 @@ impl From<Genesis> for ChainSpec {
.filter_map(|(hardfork, opt)| opt.map(|block| (hardfork, ForkCondition::Block(block))))
.collect::<Vec<_>>();
// Paris
// We expect no new networks to be configured with the merge, so we ignore the TTD field
// and merge netsplit block from external genesis files. All existing networks that have
// merged should have a static ChainSpec already (namely mainnet and sepolia).
let paris_block_and_final_difficulty =
if let Some(ttd) = genesis.config.terminal_total_difficulty {
hardforks.push((
EthereumHardfork::Paris.boxed(),
ForkCondition::TTD {
// NOTE: this will not work properly if the merge is not activated at
// genesis, and there is no merge netsplit block
activation_block_number: genesis
.config
.merge_netsplit_block
.unwrap_or_default(),
total_difficulty: ttd,
fork_block: genesis.config.merge_netsplit_block,
},
@ -765,10 +779,10 @@ impl ChainSpecBuilder {
/// Enable the Paris hardfork at the given TTD.
///
/// Does not set the merge netsplit block.
pub fn paris_at_ttd(self, ttd: U256) -> Self {
pub fn paris_at_ttd(self, ttd: U256, activation_block_number: BlockNumber) -> Self {
self.with_fork(
EthereumHardfork::Paris,
ForkCondition::TTD { total_difficulty: ttd, fork_block: None },
ForkCondition::TTD { activation_block_number, total_difficulty: ttd, fork_block: None },
)
}
@ -846,7 +860,11 @@ impl ChainSpecBuilder {
self = self.london_activated();
self.hardforks.insert(
EthereumHardfork::Paris,
ForkCondition::TTD { fork_block: Some(0), total_difficulty: U256::ZERO },
ForkCondition::TTD {
activation_block_number: 0,
total_difficulty: U256::ZERO,
fork_block: None,
},
);
self
}
@ -888,8 +906,8 @@ impl ChainSpecBuilder {
pub fn build(self) -> ChainSpec {
let paris_block_and_final_difficulty = {
self.hardforks.get(EthereumHardfork::Paris).and_then(|cond| {
if let ForkCondition::TTD { fork_block, total_difficulty } = cond {
fork_block.map(|fork_block| (fork_block, total_difficulty))
if let ForkCondition::TTD { total_difficulty, activation_block_number, .. } = cond {
Some((activation_block_number, total_difficulty))
} else {
None
}
@ -1133,6 +1151,7 @@ Post-merge hard forks (timestamp based):
.with_fork(
EthereumHardfork::Paris,
ForkCondition::TTD {
activation_block_number: 101,
fork_block: Some(101),
total_difficulty: U256::from(10_790_000),
},
@ -1166,6 +1185,7 @@ Post-merge hard forks (timestamp based):
// Fork::ConditionTTD test case without a new chain spec to demonstrate ChainSpec::satisfy
// is independent of ChainSpec for this(these - including ForkCondition::Block) match arm(s)
let fork_cond_ttd_no_new_spec = fork_cond_block_only_case.satisfy(ForkCondition::TTD {
activation_block_number: 101,
fork_block: None,
total_difficulty: U256::from(10_790_000),
});