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

fix: only check timestamped forks after the merge (#2503)

Browse Source 
Co-authored-by: Dan Cline <6798349+Rjected@users.noreply.github.com>
This commit is contained in:
Cody Lamson
2023-06-30 09:01:17 +02:00
committed by GitHub
parent 3dcc76e2b0
commit 3d91383dfe
1 changed files with 37 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

54
crates/primitives/src/chain/spec.rs
View File

@ -285,29 +285,49 @@ impl ChainSpec {
ForkFilter::new(head, self.genesis_hash(), forks)
}
/// Compute the [`ForkId`] for the given [`Head`]
/// Compute the [`ForkId`] for the given [`Head`] folowing eip-6122 spec
pub fn fork_id(&self, head: &Head) -> ForkId {
let mut curr_forkhash = ForkHash::from(self.genesis_hash());
let mut current_applied_value = 0;
let mut forkhash = ForkHash::from(self.genesis_hash());
let mut current_applied = 0;
// handle all block forks before handling timestamp based forks. see: https://eips.ethereum.org/EIPS/eip-6122
for (_, cond) in self.forks_iter() {
let value = match cond {
ForkCondition::Block(block) => block,
ForkCondition::Timestamp(time) => time,
ForkCondition::TTD { fork_block: Some(block), .. } => block,
_ => continue,
};
if cond.active_at_head(head) {
if value != current_applied_value {
curr_forkhash += value;
current_applied_value = value;
// handle block based forks and the sepolia merge netsplit block edge case (TTD
// ForkCondition with Some(block))
if let ForkCondition::Block(block) |
ForkCondition::TTD { fork_block: Some(block), .. } = cond
{
if cond.active_at_head(head) {
if block != current_applied {
forkhash += block;
current_applied = block;
}
} else {
// we can return here because this block fork is not active, so we set the
// `next` value
return ForkId { hash: forkhash, next: block }
}
} else {
return ForkId { hash: curr_forkhash, next: value }
}
}
ForkId { hash: curr_forkhash, next: 0 }
// timestamp are ALWAYS applied after the merge.
for (_, cond) in self.forks_iter() {
if let ForkCondition::Timestamp(timestamp) = cond {
if cond.active_at_head(head) {
if timestamp != current_applied {
forkhash += timestamp;
current_applied = timestamp;
}
} else {
// can safely return here because we have already handled all block forks and
// have handled all active timestamp forks, and set the next value to the
// timestamp that is known but not active yet
return ForkId { hash: forkhash, next: timestamp }
}
}
}
ForkId { hash: forkhash, next: 0 }
}
/// Build a chainspec using [`ChainSpecBuilder`]