Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat(isthmus): hack, return holocene revm spec id #2

Merged
merged 2 commits into from
Dec 13, 2024
Merged

feat(isthmus): hack, return holocene revm spec id #2

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
97f7fac
Hack, return holocene revm spec id
emhane Dec 13, 2024
7825a27
Fix lint
emhane Dec 13, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 8 additions & 8 deletions crates/optimism/evm/src/config.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,10 @@ pub fn revm_spec_by_timestamp_after_bedrock(
chain_spec: &OpChainSpec,
timestamp: u64,
) -> revm_primitives::SpecId {
if chain_spec.fork(OpHardfork::Isthmus).active_at_timestamp(timestamp) {
todo!()
} else if chain_spec.fork(OpHardfork::Holocene).active_at_timestamp(timestamp) {
revm_primitives::HOLOCENE
if chain_spec.fork(OpHardfork::Isthmus).active_at_timestamp(timestamp) ||
chain_spec.fork(OpHardfork::Holocene).active_at_timestamp(timestamp)
{
revm_primitives::HOLOCENE // todo: replace <https://github.com/bluealloy/revm/issues/1874>
} else if chain_spec.fork(OpHardfork::Granite).active_at_timestamp(timestamp) {
revm_primitives::GRANITE
} else if chain_spec.fork(OpHardfork::Fjord).active_at_timestamp(timestamp) {
Expand All @@ -33,10 +33,10 @@ pub fn revm_spec_by_timestamp_after_bedrock(

/// Map the latest active hardfork at the given block to a revm [`SpecId`](revm_primitives::SpecId).
pub fn revm_spec(chain_spec: &OpChainSpec, block: &Head) -> revm_primitives::SpecId {
if chain_spec.fork(OpHardfork::Isthmus).active_at_head(block) {
todo!()
} else if chain_spec.fork(OpHardfork::Holocene).active_at_head(block) {
revm_primitives::HOLOCENE
if chain_spec.fork(OpHardfork::Isthmus).active_at_head(block) ||
chain_spec.fork(OpHardfork::Holocene).active_at_head(block)
{
revm_primitives::HOLOCENE // todo: replace <https://github.com/bluealloy/revm/issues/1874>
} else if chain_spec.fork(OpHardfork::Granite).active_at_head(block) {
revm_primitives::GRANITE
} else if chain_spec.fork(OpHardfork::Fjord).active_at_head(block) {
Expand Down
Loading