From e9cc5632ebce02b658d2716e9ccb9d7f799de0bf Mon Sep 17 00:00:00 2001 From: Robin Salen Date: Fri, 7 Apr 2023 18:00:56 -0400 Subject: [PATCH 1/4] Impl caller/address/origin opcodes for interpreter --- evm/src/cpu/kernel/interpreter.rs | 26 +++++++++++++++++++++++--- 1 file changed, 23 insertions(+), 3 deletions(-) diff --git a/evm/src/cpu/kernel/interpreter.rs b/evm/src/cpu/kernel/interpreter.rs index fa3788cf..469c290a 100644 --- a/evm/src/cpu/kernel/interpreter.rs +++ b/evm/src/cpu/kernel/interpreter.rs @@ -332,10 +332,10 @@ impl<'a> Interpreter<'a> { 0x1d => self.run_sar(), // "SAR", 0x20 => self.run_keccak256(), // "KECCAK256", 0x21 => self.run_keccak_general(), // "KECCAK_GENERAL", - 0x30 => todo!(), // "ADDRESS", + 0x30 => self.run_address(), // "ADDRESS", 0x31 => todo!(), // "BALANCE", - 0x32 => todo!(), // "ORIGIN", - 0x33 => todo!(), // "CALLER", + 0x32 => self.run_origin(), // "ORIGIN", + 0x33 => self.run_caller(), // "CALLER", 0x34 => self.run_callvalue(), // "CALLVALUE", 0x35 => self.run_calldataload(), // "CALLDATALOAD", 0x36 => self.run_calldatasize(), // "CALLDATASIZE", @@ -734,6 +734,26 @@ impl<'a> Interpreter<'a> { self.push(U256::from_big_endian(hash.as_bytes())); } + fn run_address(&mut self) { + self.push( + self.generation_state.memory.contexts[self.context].segments + [Segment::ContextMetadata as usize] + .get(ContextMetadata::Address as usize), + ) + } + + fn run_origin(&mut self) { + self.push(self.get_txn_field(NormalizedTxnField::Origin)) + } + + fn run_caller(&mut self) { + self.push( + self.generation_state.memory.contexts[self.context].segments + [Segment::ContextMetadata as usize] + .get(ContextMetadata::Caller as usize), + ) + } + fn run_callvalue(&mut self) { self.push( self.generation_state.memory.contexts[self.context].segments From 0f3285c33bc4abc6104b47c1f727ba2e23c72b8f Mon Sep 17 00:00:00 2001 From: Robin Salen Date: Mon, 10 Apr 2023 10:46:27 -0400 Subject: [PATCH 2/4] Implement gasprice on the interpreter --- evm/src/cpu/kernel/interpreter.rs | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/evm/src/cpu/kernel/interpreter.rs b/evm/src/cpu/kernel/interpreter.rs index 469c290a..987141ef 100644 --- a/evm/src/cpu/kernel/interpreter.rs +++ b/evm/src/cpu/kernel/interpreter.rs @@ -342,7 +342,7 @@ impl<'a> Interpreter<'a> { 0x37 => self.run_calldatacopy(), // "CALLDATACOPY", 0x38 => todo!(), // "CODESIZE", 0x39 => todo!(), // "CODECOPY", - 0x3a => todo!(), // "GASPRICE", + 0x3a => self.run_gasprice(), // "GASPRICE", 0x3b => todo!(), // "EXTCODESIZE", 0x3c => todo!(), // "EXTCODECOPY", 0x3d => todo!(), // "RETURNDATASIZE", @@ -804,6 +804,10 @@ impl<'a> Interpreter<'a> { } } + fn run_gasprice(&mut self) { + self.push(self.get_txn_field(NormalizedTxnField::ComputedFeePerGas)) + } + fn run_coinbase(&mut self) { self.push(self.get_global_metadata_field(GlobalMetadata::BlockBeneficiary)) } From 6946eacaca6be62c49021edf7ccd0858aaf1f4e9 Mon Sep 17 00:00:00 2001 From: Robin Salen Date: Mon, 10 Apr 2023 12:17:26 -0400 Subject: [PATCH 3/4] Implement codesize/codecopy for interpreter --- evm/src/cpu/kernel/interpreter.rs | 30 ++++++++++++++++++++++++++++-- 1 file changed, 28 insertions(+), 2 deletions(-) diff --git a/evm/src/cpu/kernel/interpreter.rs b/evm/src/cpu/kernel/interpreter.rs index 987141ef..dfbc2534 100644 --- a/evm/src/cpu/kernel/interpreter.rs +++ b/evm/src/cpu/kernel/interpreter.rs @@ -340,8 +340,8 @@ impl<'a> Interpreter<'a> { 0x35 => self.run_calldataload(), // "CALLDATALOAD", 0x36 => self.run_calldatasize(), // "CALLDATASIZE", 0x37 => self.run_calldatacopy(), // "CALLDATACOPY", - 0x38 => todo!(), // "CODESIZE", - 0x39 => todo!(), // "CODECOPY", + 0x38 => self.run_codesize(), // "CODESIZE", + 0x39 => self.run_codecopy(), // "CODECOPY", 0x3a => self.run_gasprice(), // "GASPRICE", 0x3b => todo!(), // "EXTCODESIZE", 0x3c => todo!(), // "EXTCODECOPY", @@ -804,6 +804,32 @@ impl<'a> Interpreter<'a> { } } + fn run_codesize(&mut self) { + self.push( + self.generation_state.memory.contexts[self.context].segments + [Segment::ContextMetadata as usize] + .get(ContextMetadata::CodeSize as usize), + ) + } + + fn run_codecopy(&mut self) { + let dest_offset = self.pop().as_usize(); + let offset = self.pop().as_usize(); + let size = self.pop().as_usize(); + for i in 0..size { + let code_byte = + self.generation_state + .memory + .mload_general(self.context, Segment::Code, offset + i); + self.generation_state.memory.mstore_general( + self.context, + Segment::MainMemory, + dest_offset + i, + code_byte, + ); + } + } + fn run_gasprice(&mut self) { self.push(self.get_txn_field(NormalizedTxnField::ComputedFeePerGas)) } From 9d60191d738d47fd5ed373998866a7cf3d649816 Mon Sep 17 00:00:00 2001 From: Robin Salen Date: Mon, 10 Apr 2023 14:32:36 -0400 Subject: [PATCH 4/4] Implement returndatasize/returndatacopy for interpreter --- evm/src/cpu/kernel/interpreter.rs | 31 +++++++++++++++++++++++++++++-- 1 file changed, 29 insertions(+), 2 deletions(-) diff --git a/evm/src/cpu/kernel/interpreter.rs b/evm/src/cpu/kernel/interpreter.rs index dfbc2534..4f47c91f 100644 --- a/evm/src/cpu/kernel/interpreter.rs +++ b/evm/src/cpu/kernel/interpreter.rs @@ -345,8 +345,8 @@ impl<'a> Interpreter<'a> { 0x3a => self.run_gasprice(), // "GASPRICE", 0x3b => todo!(), // "EXTCODESIZE", 0x3c => todo!(), // "EXTCODECOPY", - 0x3d => todo!(), // "RETURNDATASIZE", - 0x3e => todo!(), // "RETURNDATACOPY", + 0x3d => self.run_returndatasize(), // "RETURNDATASIZE", + 0x3e => self.run_returndatacopy(), // "RETURNDATACOPY", 0x3f => todo!(), // "EXTCODEHASH", 0x40 => todo!(), // "BLOCKHASH", 0x41 => self.run_coinbase(), // "COINBASE", @@ -834,6 +834,33 @@ impl<'a> Interpreter<'a> { self.push(self.get_txn_field(NormalizedTxnField::ComputedFeePerGas)) } + fn run_returndatasize(&mut self) { + self.push( + self.generation_state.memory.contexts[self.context].segments + [Segment::ContextMetadata as usize] + .get(ContextMetadata::ReturndataSize as usize), + ) + } + + fn run_returndatacopy(&mut self) { + let dest_offset = self.pop().as_usize(); + let offset = self.pop().as_usize(); + let size = self.pop().as_usize(); + for i in 0..size { + let returndata_byte = self.generation_state.memory.mload_general( + self.context, + Segment::Returndata, + offset + i, + ); + self.generation_state.memory.mstore_general( + self.context, + Segment::MainMemory, + dest_offset + i, + returndata_byte, + ); + } + } + fn run_coinbase(&mut self) { self.push(self.get_global_metadata_field(GlobalMetadata::BlockBeneficiary)) }