bump revm to 19.0 (#68)

* bump revm to 19.0 * fix tests * remove redundant import
paradigmxyz · Jan 6, 2025 · ecbc3eb · ecbc3eb
1 parent 0d138b6
commit ecbc3eb
Show file tree

Hide file tree

Showing 5 changed files with 36 additions and 32 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -44,14 +44,14 @@ revmc-cranelift = { version = "0.1.0", path = "crates/revmc-cranelift", default-
 revmc-llvm = { version = "0.1.0", path = "crates/revmc-llvm", default-features = false }
 
 alloy-primitives = { version = "0.8", default-features = false }
-revm = { version = "18.0", default-features = false }
-revm-primitives = { version = "14.0", default-features = false }
-revm-interpreter = { version = "14.0", default-features = false }
+revm = { version = "19.0", default-features = false }
+revm-primitives = { version = "15.1", default-features = false }
+revm-interpreter = { version = "15.0", default-features = false }
 ruint = { version = "1.12", default-features = false }
 
 color-eyre = "0.6"
 eyre = "0.6"
-rustc-hash = "2.0"
+rustc-hash = "2.1"
 tracing = "0.1"
 tracing-subscriber = "0.3"
 tracing-tracy = "0.11"

diff --git a/crates/revmc-builtins/src/lib.rs b/crates/revmc-builtins/src/lib.rs
@@ -13,7 +13,8 @@ extern crate tracing;
 use alloc::{boxed::Box, vec::Vec};
 use revm_interpreter::{
     as_u64_saturated, as_usize_saturated, CallInputs, CallScheme, CallValue, CreateInputs,
-    EOFCreateInputs, FunctionStack, InstructionResult, InterpreterAction, InterpreterResult,
+    EOFCreateInputs, Eip7702CodeLoad, FunctionStack, InstructionResult, InterpreterAction,
+    InterpreterResult,
 };
 use revm_primitives::{
     eof::EofHeader, Address, Bytes, CreateScheme, Eof, Log, LogData, SpecId, KECCAK_EMPTY,
@@ -205,7 +206,9 @@ pub unsafe extern "C" fn __revmc_builtin_extcodesize(
     address: &mut EvmWord,
     spec_id: SpecId,
 ) -> InstructionResult {
-    let (code, state) = try_host!(ecx.host.code(address.to_address())).into_components();
+    let (code, state) =
+        Eip7702CodeLoad::new_state_load(try_host!(ecx.host.code(address.to_address())))
+            .into_components();
     *address = code.len().into();
     let gas = if spec_id.is_enabled_in(SpecId::BERLIN) {
         gas::warm_cold_cost_with_delegation(state)
@@ -224,16 +227,16 @@ pub unsafe extern "C" fn __revmc_builtin_extcodecopy(
     rev![address, memory_offset, code_offset, len]: &mut [EvmWord; 4],
     spec_id: SpecId,
 ) -> InstructionResult {
-    let (code, state) = try_host!(ecx.host.code(address.to_address())).into_components();
+    let state_load = try_host!(ecx.host.code(address.to_address()));
 
     let len = try_into_usize!(len);
-    gas_opt!(ecx, gas::extcodecopy_cost(spec_id, len as u64, state));
+    gas_opt!(ecx, gas::extcodecopy_cost(spec_id, len as u64, state_load.is_cold));
     if len != 0 {
         let memory_offset = try_into_usize!(memory_offset);
         let code_offset = code_offset.to_u256();
-        let code_offset = as_usize_saturated!(code_offset).min(code.len());
+        let code_offset = as_usize_saturated!(code_offset).min(state_load.data.len());
         ensure_memory!(ecx, memory_offset, len);
-        ecx.memory.set_data(memory_offset, code_offset, len, &code);
+        ecx.memory.set_data(memory_offset, code_offset, len, &state_load.data);
     }
     InstructionResult::Continue
 }
@@ -265,7 +268,9 @@ pub unsafe extern "C" fn __revmc_builtin_extcodehash(
     address: &mut EvmWord,
     spec_id: SpecId,
 ) -> InstructionResult {
-    let (hash, state) = try_host!(ecx.host.code_hash(address.to_address())).into_components();
+    let (hash, state) =
+        Eip7702CodeLoad::new_state_load(try_host!(ecx.host.code_hash(address.to_address())))
+            .into_components();
     *address = EvmWord::from_be_bytes(hash.0);
     let gas = if spec_id.is_enabled_in(SpecId::BERLIN) {
         gas::warm_cold_cost_with_delegation(state)

diff --git a/crates/revmc-context/src/lib.rs b/crates/revmc-context/src/lib.rs
@@ -832,14 +832,13 @@ mod tests {
             fn code(
                 &mut self,
                 address: Address,
-            ) -> Option<revm_interpreter::Eip7702CodeLoad<Bytes>> {
+            ) -> Option<revm_interpreter::StateLoad<revm_primitives::Bytes>> {
                 unimplemented!()
             }
             fn code_hash(
                 &mut self,
                 address: Address,
-            ) -> Option<revm_interpreter::Eip7702CodeLoad<revm_primitives::FixedBytes<32>>>
-            {
+            ) -> Option<revm_interpreter::StateLoad<revm_primitives::FixedBytes<32>>> {
                 unimplemented!()
             }
             fn sload(

diff --git a/crates/revmc/src/tests/runner.rs b/crates/revmc/src/tests/runner.rs
@@ -1,5 +1,5 @@
 use super::*;
-use interpreter::{AccountLoad, Eip7702CodeLoad, SStoreResult, StateLoad};
+use interpreter::{AccountLoad, SStoreResult, StateLoad};
 use revm_interpreter::{opcode as op, Contract, DummyHost, Host, SelfDestructResult};
 use revm_primitives::{
     spec_to_generic, BlobExcessGasAndPrice, BlockEnv, CfgEnv, Env, HashMap, TxEnv, EOF_MAGIC_BYTES,
@@ -148,7 +148,7 @@ pub fn def_env() -> &'static Env {
             basefee: U256::from(0x1231),
             difficulty: U256::from(0xcdef),
             prevrandao: Some(U256::from(0x0123).into()),
-            blob_excess_gas_and_price: Some(BlobExcessGasAndPrice::new(50)),
+            blob_excess_gas_and_price: Some(BlobExcessGasAndPrice::new(50, false)),
         },
         tx: TxEnv {
             caller: Address::repeat_byte(0xcc),
@@ -262,14 +262,14 @@ impl Host for TestHost {
         Some(StateLoad::new(U256::from(*address.last().unwrap()), false))
     }
 
-    fn code(&mut self, address: Address) -> Option<Eip7702CodeLoad<Bytes>> {
+    fn code(&mut self, address: Address) -> Option<StateLoad<Bytes>> {
         let code = self.code_map.get(&address).map(|b| b.original_bytes()).unwrap_or_default();
-        Some(Eip7702CodeLoad::new_not_delegated(code, false))
+        Some(StateLoad::new(code, false))
     }
 
-    fn code_hash(&mut self, address: Address) -> Option<Eip7702CodeLoad<B256>> {
+    fn code_hash(&mut self, address: Address) -> Option<StateLoad<B256>> {
         let code_hash = self.code_map.get(&address).map(|b| b.hash_slow()).unwrap_or(KECCAK_EMPTY);
-        Some(Eip7702CodeLoad::new_not_delegated(code_hash, false))
+        Some(StateLoad::new(code_hash, false))
     }
 
     fn sload(&mut self, address: Address, index: U256) -> Option<StateLoad<U256>> {