Skip to content

Commit 054efaa

Browse files
committed
nit: less diff
1 parent add0234 commit 054efaa

File tree

1 file changed

+13
-3
lines changed

1 file changed

+13
-3
lines changed

src/spec/gnosis_spec.rs

Lines changed: 13 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -407,7 +407,10 @@ impl From<Genesis> for GnosisChainSpec {
407407
},
408408
));
409409

410-
Some((genesis.config.merge_netsplit_block.unwrap_or_default(), ttd))
410+
genesis
411+
.config
412+
.merge_netsplit_block
413+
.map(|block| (block, ttd))
411414
} else {
412415
None
413416
};
@@ -461,10 +464,17 @@ impl From<Genesis> for GnosisChainSpec {
461464

462465
let hardforks = ChainHardforks::new(hardforks);
463466

464-
let is_paris_active_at_genesis =
465-
genesis.config.terminal_total_difficulty == Some(U256::ZERO);
467+
// true means paris is active at genesis => genesis needs to be in post-merge format
468+
let is_paris_active_at_genesis = if let Some(ttd) = genesis.config.terminal_total_difficulty
469+
{
470+
genesis.difficulty >= ttd
471+
} else {
472+
false
473+
};
466474

467475
let mut genesis_header = GnosisHeader::from(make_genesis_header(&genesis, &hardforks));
476+
// by default genesis is post-merge, so if paris is not active at genesis, we need to
477+
// convert it to pre-merge format
468478
if !is_paris_active_at_genesis {
469479
genesis_header.mix_hash = None;
470480
genesis_header.nonce = None;

0 commit comments

Comments
 (0)