update

Author: georgehao

Cargo.toml

@@ -6,7 +6,7 @@ license = "MIT OR Apache-2.0"
 
 [dependencies]
 # revm
-revm = { git = "https://github.com/scroll-tech/revm", default-features = false, features = ["enable_eip7702", "enable_eip7623", "enable_eip7939"] }
+revm = { git = "https://github.com/scroll-tech/revm", default-features = false, features = ["enable_eip7702", "enable_eip7623"] }
 revm-primitives = { git = "https://github.com/scroll-tech/revm", default-features = false }
 revm-inspector = { git = "https://github.com/scroll-tech/revm", default-features = false }
 

src/builder.rs

@@ -61,7 +61,6 @@ impl DefaultScrollContext for ScrollContext<EmptyDB> {
         let mut cfg = CfgEnv::new_with_spec(spec);
         cfg.enable_eip7702 = spec >= ScrollSpecId::EUCLID;
         cfg.enable_eip7623 = spec >= ScrollSpecId::FEYNMAN;
-        cfg.enable_eip7939 = spec >= ScrollSpecId::GALILEO;
 
         Context::mainnet()
             .with_tx(ScrollTransaction::default())
@@ -82,12 +81,6 @@ pub trait FeynmanEipActivations: EuclidEipActivations {
     fn maybe_with_eip_7623(self) -> Self;
 }
 
-/// Activates specific EIP's for Galileo.
-pub trait GalileoEipActivations: FeynmanEipActivations {
-    /// Activates EIP-7939 if the spec is at least at Galileo.
-    fn maybe_with_eip_7939(self) -> Self;
-}
-
 impl<DB: Database> EuclidEipActivations for ScrollContext<DB> {
     fn maybe_with_eip_7702(mut self) -> Self {
         self.cfg.enable_eip7702 = self.cfg.spec >= ScrollSpecId::EUCLID;
@@ -102,12 +95,5 @@ impl<DB: Database> FeynmanEipActivations for ScrollContext<DB> {
     }
 }
 
-impl<DB: Database> GalileoEipActivations for ScrollContext<DB> {
-    fn maybe_with_eip_7939(mut self) -> Self {
-        self.cfg.enable_eip7939 = self.cfg.spec >= ScrollSpecId::GALILEO;
-        self
-    }
-}
-
 pub type ScrollContext<DB> =
     Context<BlockEnv, ScrollTransaction<TxEnv>, CfgEnv<ScrollSpecId>, DB, Journal<DB>, L1BlockInfo>;

src/instructions.rs

@@ -69,6 +69,7 @@ where
 /// - `SELFDESTRUCT`
 /// - `MCOPY`
 /// - `DIFFICULTY`
+/// - `CLZ`
 pub fn make_scroll_instruction_table<WIRE: InterpreterTypes, HOST: ScrollContextTr>(
 ) -> InstructionTable<WIRE, HOST> {
     let mut table = instruction_table::<WIRE, HOST>();
@@ -82,6 +83,7 @@ pub fn make_scroll_instruction_table<WIRE: InterpreterTypes, HOST: ScrollContext
     table[opcode::SELFDESTRUCT as usize] = Instruction::new(selfdestruct::<WIRE, HOST>, 0);
     table[opcode::MCOPY as usize] = Instruction::new(mcopy::<WIRE, HOST>, 0);
     table[opcode::DIFFICULTY as usize] = Instruction::new(difficulty::<WIRE, HOST>, 2);
+    table[opcode::CLZ as usize] = Instruction::new(clz::<WIRE, HOST>, 5);
 
     table
 }
@@ -245,6 +247,23 @@ pub fn difficulty<WIRE: InterpreterTypes, H: Host + ?Sized>(
     push!(context.interpreter, DIFFICULTY);
 }
 
+/// Implements the CLZ instruction
+///
+/// EIP-7939 count leading zeros.
+fn clz<WIRE: InterpreterTypes, H: ScrollContextTr>(context: InstructionContext<'_, H, WIRE>) {
+    let host = context.host;
+    let interpreter = context.interpreter;
+    if !host.cfg().spec().is_enabled_in(ScrollSpecId::GALILEO) {
+        interpreter.halt(InstructionResult::NotActivated);
+        return;
+    }
+
+    popn_top!([], op1, context.interpreter);
+
+    let leading_zeros = op1.leading_zeros();
+    *op1 = U256::from(leading_zeros);
+}
+
 // HELPER FUNCTIONS
 // ================================================================================================