Add memory offset

crates/interpreter/src/inner_models.rs

@@ -1,8 +1,7 @@
+pub use crate::primitives::CreateScheme;
 use crate::primitives::{Address, Bytes, TransactTo, TxEnv, U256};
 use alloc::boxed::Box;
-
-pub use crate::primitives::CreateScheme;
-
+use core::ops::Range as Ranger;
 /// Inputs for a call.
 #[derive(Clone, Debug, PartialEq, Eq, Hash)]
 #[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))]
@@ -19,6 +18,8 @@ pub struct CallInputs {
     pub context: CallContext,
     /// Whether this is a static call.
     pub is_static: bool,
+    /// The return memory offset where the output of the call is written.
+    pub return_memory_offset: Ranger<usize>,
 }
 
 /// Inputs for a create call.
@@ -39,7 +40,11 @@ pub struct CreateInputs {
 
 impl CallInputs {
     /// Creates new call inputs.
-    pub fn new(tx_env: &TxEnv, gas_limit: u64) -> Option<Self> {
+    pub fn new(
+        tx_env: &TxEnv,
+        gas_limit: u64,
+        return_memory_offset: Ranger<usize>,
+    ) -> Option<Self> {
         let TransactTo::Call(address) = tx_env.transact_to else {
             return None;
         };
@@ -61,12 +66,17 @@ impl CallInputs {
                 scheme: CallScheme::Call,
             },
             is_static: false,
+            return_memory_offset,
         })
     }
 
     /// Returns boxed call inputs.
-    pub fn new_boxed(tx_env: &TxEnv, gas_limit: u64) -> Option<Box<Self>> {
-        Self::new(tx_env, gas_limit).map(Box::new)
+    pub fn new_boxed(
+        tx_env: &TxEnv,
+        gas_limit: u64,
+        return_memory_offset: Ranger<usize>,
+    ) -> Option<Box<Self>> {
+        Self::new(tx_env, gas_limit, return_memory_offset).map(Box::new)
     }
 }
 

crates/interpreter/src/instructions/host.rs

@@ -364,8 +364,8 @@ pub fn call<H: Host, SPEC: Spec>(interpreter: &mut Interpreter, host: &mut H) {
                 scheme: CallScheme::Call,
             },
             is_static: interpreter.is_static,
+            return_memory_offset,
         }),
-        return_memory_offset,
     };
     interpreter.instruction_result = InstructionResult::CallOrCreate;
 }
@@ -419,8 +419,8 @@ pub fn call_code<H: Host, SPEC: Spec>(interpreter: &mut Interpreter, host: &mut
                 scheme: CallScheme::CallCode,
             },
             is_static: interpreter.is_static,
+            return_memory_offset,
         }),
-        return_memory_offset,
     };
     interpreter.instruction_result = InstructionResult::CallOrCreate;
 }
@@ -465,8 +465,8 @@ pub fn delegate_call<H: Host, SPEC: Spec>(interpreter: &mut Interpreter, host: &
                 scheme: CallScheme::DelegateCall,
             },
             is_static: interpreter.is_static,
+            return_memory_offset,
         }),
-        return_memory_offset,
     };
     interpreter.instruction_result = InstructionResult::CallOrCreate;
 }
@@ -511,8 +511,8 @@ pub fn static_call<H: Host, SPEC: Spec>(interpreter: &mut Interpreter, host: &mu
                 scheme: CallScheme::StaticCall,
             },
             is_static: true,
+            return_memory_offset,
         }),
-        return_memory_offset,
     };
     interpreter.instruction_result = InstructionResult::CallOrCreate;
 }

crates/interpreter/src/interpreter.rs

@@ -15,7 +15,7 @@ use crate::{
 };
 use alloc::boxed::Box;
 use core::cmp::min;
-use core::ops::Range;
+
 use revm_primitives::U256;
 
 pub use self::shared_memory::EMPTY_SHARED_MEMORY;
@@ -70,10 +70,6 @@ pub enum InterpreterAction {
     Call {
         /// Call inputs
         inputs: Box<CallInputs>,
-        /// The offset into `self.memory` of the return data.
-        ///
-        /// This value must be ignored if `self.return_len` is 0.
-        return_memory_offset: Range<usize>,
     },
     /// CREATE or CREATE2 instruction called.
     Create { inputs: Box<CreateInputs> },

crates/revm/src/context.rs

@@ -544,6 +544,7 @@ pub(crate) mod test_utils {
                 scheme: revm_interpreter::CallScheme::Call,
             },
             is_static: false,
+            return_memory_offset: 0..0,
         }
     }
 

crates/revm/src/evm.rs

@@ -195,10 +195,7 @@ impl<EXT, DB: Database> Evm<'_, EXT, DB> {
 
             let exec = &mut self.handler.execution;
             let frame_or_result = match next_action {
-                InterpreterAction::Call {
-                    inputs,
-                    return_memory_offset,
-                } => exec.call(&mut self.context, inputs, return_memory_offset),
+                InterpreterAction::Call { inputs } => exec.call(&mut self.context, inputs, 0..0),
                 InterpreterAction::Create { inputs } => exec.create(&mut self.context, inputs),
                 InterpreterAction::Return { result } => {
                     // free memory context.
@@ -276,7 +273,7 @@ impl<EXT, DB: Database> Evm<'_, EXT, DB> {
         let first_frame_or_result = match ctx.evm.env.tx.transact_to {
             TransactTo::Call(_) => exec.call(
                 ctx,
-                CallInputs::new_boxed(&ctx.evm.env.tx, gas_limit).unwrap(),
+                CallInputs::new_boxed(&ctx.evm.env.tx, gas_limit, 0..0).unwrap(),
                 0..0,
             ),
             TransactTo::Create(_) => exec.create(