From 33f63bcb8a8556b2ceace2a2a5d792dbf16256a7 Mon Sep 17 00:00:00 2001 From: Dustin Brickwood Date: Wed, 6 Dec 2023 15:01:17 -0600 Subject: [PATCH 1/2] chore: update to use vm_latest with era-test-node boojum integration --- Cargo.toml | 2 +- src/cheatcodes.rs | 7 ++++--- src/transactions.rs | 2 +- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index bfd75e2..de46b52 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -7,7 +7,7 @@ edition = "2021" [dependencies] revm = { version = "3.5.0" } -era_test_node = { git = "https://github.com/matter-labs/era-test-node.git", rev = "64835d25a6e4b1540a091ff0d805b01227213969" } +era_test_node = { git = "https://github.com/matter-labs/era-test-node.git", rev = "9e7c5cbbef3366b9f573d480ce3646d8fd4ce5d4" } zksync_basic_types = { git = "https://github.com/matter-labs/zksync-era.git", rev = "bd268ac02bc3530c1d3247cb9496c3e13c2e52d9" } zksync_types = { git = "https://github.com/matter-labs/zksync-era.git", rev = "bd268ac02bc3530c1d3247cb9496c3e13c2e52d9" } zksync_state = { git = "https://github.com/matter-labs/zksync-era.git", rev = "bd268ac02bc3530c1d3247cb9496c3e13c2e52d9" } diff --git a/src/cheatcodes.rs b/src/cheatcodes.rs index f8efec0..ffe9e01 100644 --- a/src/cheatcodes.rs +++ b/src/cheatcodes.rs @@ -1,8 +1,9 @@ use era_test_node::utils::bytecode_to_factory_dep; use ethers::{abi::AbiDecode, prelude::abigen}; -use multivm::interface::dyn_tracers::vm_1_3_3::DynTracer; -use multivm::vm_refunds_enhancement::{HistoryMode, SimpleMemory, VmTracer}; -use multivm::zk_evm_1_3_3::tracing::{BeforeExecutionData, VmLocalStateData}; +// use multivm::interface::dyn_tracers::vm_1_3_3::DynTracer; +use multivm::interface::dyn_tracers::vm_1_4_0::DynTracer; +use multivm::vm_latest::{HistoryMode, SimpleMemory, VmTracer}; +use multivm::zk_evm_1_4_0::tracing::{BeforeExecutionData, VmLocalStateData}; use zk_evm::zkevm_opcode_defs::{FatPointer, Opcode, CALL_IMPLICIT_CALLDATA_FAT_PTR_REGISTER}; use zksync_basic_types::{AccountTreeId, H160}; use zksync_state::{StoragePtr, WriteStorage}; diff --git a/src/transactions.rs b/src/transactions.rs index 9e74e10..970c570 100644 --- a/src/transactions.rs +++ b/src/transactions.rs @@ -5,7 +5,7 @@ use era_test_node::{ }, system_contracts, }; -use multivm::{interface::VmExecutionResultAndLogs, vm_refunds_enhancement::ToTracerPointer}; +use multivm::{interface::VmExecutionResultAndLogs, vm_latest::ToTracerPointer}; use revm::{ primitives::{ Account, AccountInfo, Address, Bytes, EVMResult, Env, Eval, Halt, HashMap as rHashMap, From 8a113529c38391ec54bce55eb91566d9f10d8162 Mon Sep 17 00:00:00 2001 From: Dustin Brickwood Date: Wed, 6 Dec 2023 15:03:30 -0600 Subject: [PATCH 2/2] chore: remove unused import --- src/cheatcodes.rs | 1 - 1 file changed, 1 deletion(-) diff --git a/src/cheatcodes.rs b/src/cheatcodes.rs index ffe9e01..091915d 100644 --- a/src/cheatcodes.rs +++ b/src/cheatcodes.rs @@ -1,6 +1,5 @@ use era_test_node::utils::bytecode_to_factory_dep; use ethers::{abi::AbiDecode, prelude::abigen}; -// use multivm::interface::dyn_tracers::vm_1_3_3::DynTracer; use multivm::interface::dyn_tracers::vm_1_4_0::DynTracer; use multivm::vm_latest::{HistoryMode, SimpleMemory, VmTracer}; use multivm::zk_evm_1_4_0::tracing::{BeforeExecutionData, VmLocalStateData};