feat(l1): refactor chain config (#5233) #5483
Open
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Lines of code reportTotal lines added: Detailed view |
Benchmark Results ComparisonNo significant difference was registered for any benchmark run. Detailed ResultsBenchmark Results: BubbleSort
Benchmark Results: ERC20Approval
Benchmark Results: ERC20Mint
Benchmark Results: ERC20Transfer
Benchmark Results: Factorial
Benchmark Results: FactorialRecursive
Benchmark Results: Fibonacci
Benchmark Results: FibonacciRecursive
Benchmark Results: ManyHashes
Benchmark Results: MstoreBench
Benchmark Results: Push
Benchmark Results: SstoreBench_no_opt
|
fmoletta
requested review from
a team,
ManuelBilbao,
avilagaston9 and
ilitteri
as code owners
ilitteri
reviewed
Dec 4, 2025
Comment on lines
-180
to
-199
| // Check whether the tx is replay-protected | ||
| if head_tx.tx.protected() && !chain_config.is_eip155_activated(context.block_number()) { | ||
| // Ignore replay protected tx & all txs from the sender | ||
| // Pull transaction from the mempool | ||
| debug!("Ignoring replay-protected transaction: {}", tx_hash); | ||
| txs.pop(); | ||
| blockchain.remove_transaction_from_pool(&tx_hash)?; | ||
| continue; | ||
| } |
Contributor
There was a problem hiding this comment.
Why does this refactor have anything to do with removing this piece of code?
Contributor
There was a problem hiding this comment.
Taking into account the refactor, the correct thing to do here is to find another way to replace the !chain_config.is_eip155_activated(context.block_number()) part of this code.
Contributor
Author
There was a problem hiding this comment.
I think the reasoning is that we don't support running pre-merge blocks so this code should be unreachable
Contributor
There was a problem hiding this comment.
Given we already broke main by changing behavior during a chain config refactor, wouldn't it be better to leave this part out and reintroduce it later separately?
Contributor
Author
There was a problem hiding this comment.
This part didn't break main
MegaRedHand
approved these changes
Dec 4, 2025
|
|
||
| #[repr(u8)] | ||
| #[derive(Debug, PartialEq, Eq, PartialOrd, Default, Hash, Clone, Copy, Serialize, Deserialize)] | ||
| pub enum Fork { |
Collaborator
There was a problem hiding this comment.
Maybe we should move the fork type and list to another file. wdyt?
JereSalo
reviewed
Dec 4, 2025
Contributor
JereSalo
left a comment
JereSalo
left a comment
There was a problem hiding this comment.
Defaulting to Paris if none of the forks is activated may work if we suppose that there's a previous check that doesn't let anybody initialize with a pre-Merge config but I still find it kinda weird. Doesn't need any change though, just saying. It may be the best thing to do anyway
Comment on lines
+479
to
488
| pub fn get_blob_schedule_for_time(&self, block_timestamp: u64) -> Option<ForkBlobSchedule> { | ||
| if let Some(fork_with_current_blob_schedule) = FORKS.into_iter().rfind(|fork| { | ||
| self.get_blob_schedule_for_fork(*fork).is_some() | ||
| && self.is_fork_activated(*fork, block_timestamp) | ||
| }) { | ||
| self.get_blob_schedule_for_fork(fork_with_current_blob_schedule) | ||
| } else { | ||
| None | ||
| } | ||
| } |
Contributor
There was a problem hiding this comment.
Can this be simpler?
Like can we just do let fork = self.get_fork(block_timestamp) and then self.get_blob_schedule_for_for(fork) or there may be a problem with that? I'm assuming that every new fork will have a blob schedule set to it.
Contributor
Author
There was a problem hiding this comment.
Linking discussion from reverted PR as I made the same comment there: #5233 (comment)
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Motivation
Restores #5233 by reverting #5464 + changes
get_forkbehaviour to default to Paris if the network is pre-merge (This is the change that broke Hive Daily Report tests). Also changes methodfork_activation_time_or_blocktofork_activation_timeDescription
fork_activation_time_or_blocktofork_activation_timewhich returnsNonefor pre-merge forks so we default to Paris onget_forkmethod if the network is pre-mergeResolves #4720