refactor(levm): replace specId with Fork #1762
Conversation
fborello-lambda
changed the title
fborello-lambda
changed the title
| fork_summary_for_slack(reports, Fork::Byzantium), | ||
| fork_summary_for_slack(reports, Fork::Berlin), | ||
| fork_summary_for_slack(reports, Fork::Constantinople), | ||
| fork_summary_for_slack(reports, Fork::Paris), |
There was a problem hiding this comment.
Move this between Shanghai and Homestead (it is an error for Paris to be this low in the list)
| fork_summary_for_github(reports, Fork::Byzantium), | ||
| fork_summary_for_github(reports, Fork::Berlin), | ||
| fork_summary_for_github(reports, Fork::Constantinople), | ||
| fork_summary_for_github(reports, Fork::Paris), |
| writeln!(f, "{}", fork_summary_shell(&self.0, Fork::Byzantium))?; | ||
| writeln!(f, "{}", fork_summary_shell(&self.0, Fork::Berlin))?; | ||
| writeln!(f, "{}", fork_summary_shell(&self.0, Fork::Constantinople))?; | ||
| writeln!(f, "{}", fork_summary_shell(&self.0, Fork::Paris))?; |
crates/common/types/genesis.rs
Outdated
| "Shanghai" => Fork::Shanghai, | ||
| "Cancun" => Fork::Cancun, | ||
| "Prague" => Fork::Prague, | ||
| _ => Fork::Cancun, |
There was a problem hiding this comment.
This is not correct. But implementing TryFrom<&str> for Fork is not that worth. Let's roll back this change.
crates/vm/vm.rs
Outdated
| @@ -220,12 +220,12 @@ cfg_if::cfg_if! { | |||
| }); | |||
| let mut block_cache: CacheDB = HashMap::new(); | |||
| let block_header = &block.header; | |||
| let spec_id = spec_id(&state.chain_config()?, block_header.timestamp); | |||
| let fork=state.chain_config()?.fork(block_header.timestamp); | |||
There was a problem hiding this comment.
| let fork=state.chain_config()?.fork(block_header.timestamp); | |
| let fork = state.chain_config()?.fork(block_header.timestamp); |
There was a problem hiding this comment.
Looks good 👍 , just some comments, would it be possible to integrate this changes with the latest changes in main?
For example this line
Also, based on the CI, a cargo fmt is needed.
I'll get this done |
|
Hi @varun-doshi ! Just a heads up, this PR (#1782) got recently merged. It did use some the Thank you very much for your help ^_^ |
Should I switch that to Fork? |
Hi! I don't believe there's need for that. As soon as you update your branch with main, those changes will get pulled and you'll get compilation errors. Does that help? Don't doubt ask! Thanks in advance ^_^ |
Motivation
Ref #1741
Description
Replaces specId with Fork
crates/vm/levm/src/environment.rsCloses #1741