use SpecId::Osaka in place of PragueEOF

foundry-rs · Oct 22, 2024 · 64e72d7 · 64e72d7
1 parent 2c63361
commit 64e72d7
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 4 deletions.
diff --git a/crates/anvil/src/hardfork.rs b/crates/anvil/src/hardfork.rs
@@ -135,7 +135,8 @@ impl From<EthereumHardfork> for SpecId {
             EthereumHardfork::Cancun | EthereumHardfork::Latest => Self::CANCUN,
             EthereumHardfork::Prague => Self::PRAGUE,
             // TODO: switch to latest after activation
-            EthereumHardfork::PragueEOF => Self::PRAGUE,
+            // EOF is included in OSAKA from Revm 16.0.0
+            EthereumHardfork::PragueEOF => Self::OSAKA,
         }
     }
 }

diff --git a/crates/cheatcodes/src/inspector.rs b/crates/cheatcodes/src/inspector.rs
@@ -84,7 +84,7 @@ pub trait CheatcodesExecutor {
             evm.context.evm.inner.journaled_state.depth += 1;
 
             // Handle EOF bytecode
-            let first_frame_or_result = if evm.handler.cfg.spec_id.is_enabled_in(SpecId::PRAGUE) &&
+            let first_frame_or_result = if evm.handler.cfg.spec_id.is_enabled_in(SpecId::OSAKA) &&
                 inputs.scheme == CreateScheme::Create &&
                 inputs.init_code.starts_with(&EOF_MAGIC_BYTES)
             {

diff --git a/crates/config/src/utils.rs b/crates/config/src/utils.rs
@@ -301,7 +301,7 @@ impl FromStr for Numeric {
 #[inline]
 pub fn evm_spec_id(evm_version: &EvmVersion, alphanet: bool) -> SpecId {
     if alphanet {
-        return SpecId::PRAGUE;
+        return SpecId::OSAKA;
     }
     match evm_version {
         EvmVersion::Homestead => SpecId::HOMESTEAD,
@@ -316,7 +316,7 @@ pub fn evm_spec_id(evm_version: &EvmVersion, alphanet: bool) -> SpecId {
         EvmVersion::Paris => SpecId::MERGE,
         EvmVersion::Shanghai => SpecId::SHANGHAI,
         EvmVersion::Cancun => SpecId::CANCUN,
-        EvmVersion::Prague => SpecId::PRAGUE,
+        EvmVersion::Prague => SpecId::OSAKA, // Osaka enables EOF
     }
 }