spec_to_generic for cacl_call_gas

Author: fgimenez

crates/instructions/Cargo.toml

@@ -22,5 +22,13 @@ secp256k1 = { version = "0.28.2", default-features = false, features = [
     "rand-std"
 ] }
 
+[features]
+optimism = [
+  "revm/optimism",
+  "revm-interpreter/optimism",
+  "revm-precompile/optimism",
+  "revm-primitives/optimism",
+]
+
 [lints]
 workspace = true

crates/instructions/src/eip3074.rs

@@ -1,12 +1,15 @@
 use crate::{context::InstructionsContext, BoxedInstructionWithOpCode};
 use revm::{Database, Evm};
 use revm_interpreter::{
-    gas, instructions::host::get_memory_input_and_out_ranges, pop, pop_address, resize_memory,
-    CallContext, CallInputs, CallScheme, InstructionResult, Interpreter, InterpreterAction,
-    Transfer,
+    gas,
+    instructions::host::{calc_call_gas, get_memory_input_and_out_ranges},
+    pop, pop_address, resize_memory, CallContext, CallInputs, CallScheme, InstructionResult,
+    Interpreter, InterpreterAction, Transfer,
 };
 use revm_precompile::secp256k1::ecrecover;
-use revm_primitives::{alloy_primitives::B512, keccak256, Address, B256, U256};
+use revm_primitives::{
+    alloy_primitives::B512, keccak256, spec_to_generic, Address, SpecId, B256, U256,
+};
 
 const AUTH_OPCODE: u8 = 0xF6;
 const AUTHCALL_OPCODE: u8 = 0xF7;
@@ -123,7 +126,7 @@ fn auth_instruction<EXT, DB: Database>(
 
 fn authcall_instruction<EXT, DB: Database>(
     interp: &mut Interpreter,
-    _evm: &mut Evm<'_, EXT, DB>,
+    evm: &mut Evm<'_, EXT, DB>,
     ctx: &InstructionsContext,
 ) {
     let authorized = match ctx.get(AUTHORIZED_VAR_NAME) {
@@ -137,7 +140,7 @@ fn authcall_instruction<EXT, DB: Database>(
     pop!(interp, local_gas_limit);
     pop_address!(interp, to);
     // max gas limit is not possible in real ethereum situation.
-    let _local_gas_limit = u64::try_from(local_gas_limit).unwrap_or(u64::MAX);
+    let local_gas_limit = u64::try_from(local_gas_limit).unwrap_or(u64::MAX);
 
     pop!(interp, value);
     if interp.is_static && value != U256::ZERO {
@@ -149,11 +152,18 @@ fn authcall_instruction<EXT, DB: Database>(
         return;
     };
 
-    let Some(mut gas_limit) =
-        // TODO: calc_call_gas requires SPEC.
-        //calc_call_gas(interp, evm, to, value != U256::ZERO, local_gas_limit, true, true)
-        Some(100)
-    else {
+    let Some(mut gas_limit) = spec_to_generic!(
+        evm.spec_id(),
+        calc_call_gas::<Evm<'_, EXT, DB>, SPEC>(
+            interp,
+            evm,
+            to,
+            value != U256::ZERO,
+            local_gas_limit,
+            true,
+            true
+        )
+    ) else {
         return;
     };