feat(op): Ecotone hardfork (#1009)

* Ecotone hardfork * Use bedrock cost function if Ecotone values are unset * Ecotone L1 fee tests * fmt * clippy
bluealloy · Jan 29, 2024 · 1df0ea8 · 1df0ea8
1 parent 5767e6d
commit 1df0ea8
Show file tree

Hide file tree

Showing 6 changed files with 219 additions and 34 deletions.
diff --git a/crates/interpreter/src/instructions/opcode.rs b/crates/interpreter/src/instructions/opcode.rs
@@ -872,6 +872,11 @@ pub const fn spec_opcode_gas(spec_id: SpecId) -> &'static [OpInfo; 256] {
                     const TABLE: &[OpInfo;256] = &make_gas_table(SpecId::CANYON);
                     TABLE
                 }
+                #[cfg(feature = "optimism")]
+                SpecId::ECOTONE => {
+                    const TABLE: &[OpInfo;256] = &make_gas_table(SpecId::ECOTONE);
+                    TABLE
+                }
             }
         };
     }

diff --git a/crates/precompile/src/lib.rs b/crates/precompile/src/lib.rs
@@ -258,6 +258,8 @@ impl PrecompileSpecId {
             LATEST => Self::LATEST,
             #[cfg(feature = "optimism")]
             BEDROCK | REGOLITH | CANYON => Self::BERLIN,
+            #[cfg(feature = "optimism")]
+            ECOTONE => Self::CANCUN,
         }
     }
 }

diff --git a/crates/primitives/src/specification.rs b/crates/primitives/src/specification.rs
@@ -60,6 +60,7 @@ pub enum SpecId {
     SHANGHAI = 18,
     CANYON = 19,
     CANCUN = 20,
+    ECOTONE = 21,
     LATEST = u8::MAX,
 }
 
@@ -102,6 +103,8 @@ impl From<&str> for SpecId {
             "Regolith" => SpecId::REGOLITH,
             #[cfg(feature = "optimism")]
             "Canyon" => SpecId::CANYON,
+            #[cfg(feature = "optimism")]
+            "Ecotone" => SpecId::ECOTONE,
             _ => Self::LATEST,
         }
     }
@@ -157,6 +160,8 @@ spec!(BEDROCK, BedrockSpec);
 spec!(REGOLITH, RegolithSpec);
 #[cfg(feature = "optimism")]
 spec!(CANYON, CanyonSpec);
+#[cfg(feature = "optimism")]
+spec!(ECOTONE, EcotoneSpec);
 
 #[macro_export]
 macro_rules! spec_to_generic {
@@ -232,6 +237,11 @@ macro_rules! spec_to_generic {
                 use $crate::CanyonSpec as SPEC;
                 $e
             }
+            #[cfg(feature = "optimism")]
+            $crate::SpecId::ECOTONE => {
+                use $crate::EcotoneSpec as SPEC;
+                $e
+            }
         }
     }};
 }
@@ -338,4 +348,28 @@ mod optimism_tests {
         assert!(SpecId::enabled(SpecId::CANYON, SpecId::REGOLITH));
         assert!(SpecId::enabled(SpecId::CANYON, SpecId::CANYON));
     }
+
+    #[test]
+    fn test_ecotone_post_merge_hardforks() {
+        assert!(EcotoneSpec::enabled(SpecId::MERGE));
+        assert!(EcotoneSpec::enabled(SpecId::SHANGHAI));
+        assert!(EcotoneSpec::enabled(SpecId::CANCUN));
+        assert!(!EcotoneSpec::enabled(SpecId::LATEST));
+        assert!(EcotoneSpec::enabled(SpecId::BEDROCK));
+        assert!(EcotoneSpec::enabled(SpecId::REGOLITH));
+        assert!(EcotoneSpec::enabled(SpecId::CANYON));
+        assert!(EcotoneSpec::enabled(SpecId::ECOTONE));
+    }
+
+    #[test]
+    fn test_ecotone_post_merge_hardforks_spec_id() {
+        assert!(SpecId::enabled(SpecId::ECOTONE, SpecId::MERGE));
+        assert!(SpecId::enabled(SpecId::ECOTONE, SpecId::SHANGHAI));
+        assert!(SpecId::enabled(SpecId::ECOTONE, SpecId::CANCUN));
+        assert!(!SpecId::enabled(SpecId::ECOTONE, SpecId::LATEST));
+        assert!(SpecId::enabled(SpecId::ECOTONE, SpecId::BEDROCK));
+        assert!(SpecId::enabled(SpecId::ECOTONE, SpecId::REGOLITH));
+        assert!(SpecId::enabled(SpecId::ECOTONE, SpecId::CANYON));
+        assert!(SpecId::enabled(SpecId::ECOTONE, SpecId::ECOTONE));
+    }
 }
diff --git a/crates/revm/src/handler/mainnet/pre_execution.rs b/crates/revm/src/handler/mainnet/pre_execution.rs
@@ -30,8 +30,9 @@ pub fn load<SPEC: Spec, EXT, DB: Database>(
     // the L1-cost fee is only computed for Optimism non-deposit transactions.
     #[cfg(feature = "optimism")]
     if context.evm.env.cfg.optimism && context.evm.env.tx.optimism.source_hash.is_none() {
-        let l1_block_info = crate::optimism::L1BlockInfo::try_fetch(&mut context.evm.db)
-            .map_err(EVMError::Database)?;
+        let l1_block_info =
+            crate::optimism::L1BlockInfo::try_fetch(&mut context.evm.db, SPEC::SPEC_ID)
+                .map_err(EVMError::Database)?;
 
         // storage l1 block info for later use.
         context.evm.l1_block_info = Some(l1_block_info);

diff --git a/crates/revm/src/optimism/handler_register.rs b/crates/revm/src/optimism/handler_register.rs
@@ -438,8 +438,9 @@ mod tests {
         let mut context: Context<(), InMemoryDB> = Context::new_with_db(db);
         context.evm.l1_block_info = Some(L1BlockInfo {
             l1_base_fee: U256::from(1_000),
-            l1_fee_overhead: U256::from(1_000),
-            l1_fee_scalar: U256::from(1_000),
+            l1_fee_overhead: Some(U256::from(1_000)),
+            l1_base_fee_scalar: U256::from(1_000),
+            ..Default::default()
         });
         // Enveloped needs to be some but it will deduce zero fee.
         context.evm.env.tx.optimism.enveloped_tx = Some(bytes!(""));
@@ -471,8 +472,9 @@ mod tests {
         let mut context: Context<(), InMemoryDB> = Context::new_with_db(db);
         context.evm.l1_block_info = Some(L1BlockInfo {
             l1_base_fee: U256::from(1_000),
-            l1_fee_overhead: U256::from(1_000),
-            l1_fee_scalar: U256::from(1_000),
+            l1_fee_overhead: Some(U256::from(1_000)),
+            l1_base_fee_scalar: U256::from(1_000),
+            ..Default::default()
         });
         // l1block cost is 1048 fee.
         context.evm.env.tx.optimism.enveloped_tx = Some(bytes!("FACADE"));
@@ -507,8 +509,9 @@ mod tests {
         let mut context: Context<(), InMemoryDB> = Context::new_with_db(db);
         context.evm.l1_block_info = Some(L1BlockInfo {
             l1_base_fee: U256::from(1_000),
-            l1_fee_overhead: U256::from(1_000),
-            l1_fee_scalar: U256::from(1_000),
+            l1_fee_overhead: Some(U256::from(1_000)),
+            l1_base_fee_scalar: U256::from(1_000),
+            ..Default::default()
         });
         // l1block cost is 1048 fee.
         context.evm.env.tx.optimism.enveloped_tx = Some(bytes!("FACADE"));
@@ -537,8 +540,9 @@ mod tests {
         let mut context: Context<(), InMemoryDB> = Context::new_with_db(db);
         context.evm.l1_block_info = Some(L1BlockInfo {
             l1_base_fee: U256::from(1_000),
-            l1_fee_overhead: U256::from(1_000),
-            l1_fee_scalar: U256::from(1_000),
+            l1_fee_overhead: Some(U256::from(1_000)),
+            l1_base_fee_scalar: U256::from(1_000),
+            ..Default::default()
         });
         // l1block cost is 1048 fee.
         context.evm.env.tx.optimism.enveloped_tx = Some(bytes!("FACADE"));