diff --git a/Cargo.lock b/Cargo.lock index 86961930..add29949 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -265,6 +265,7 @@ dependencies = [ "sha3", "solidity-adapter", "structopt", + "vm2", "web3", "which", "zkevm-assembly", @@ -473,6 +474,18 @@ dependencies = [ "cfg-if", ] +[[package]] +name = "enum_dispatch" +version = "0.3.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "aa18ce2bc66555b3218614519ac839ddb759a7d6720732f979ef8d13be147ecd" +dependencies = [ + "once_cell", + "proc-macro2", + "quote", + "syn 2.0.65", +] + [[package]] name = "env_logger" version = "0.9.3" @@ -2579,7 +2592,6 @@ checksum = "2266fcb904c50fb17fda4c9a751a1715629ecf8b21f4c9d78b4890fb71525d71" name = "vm2" version = "0.1.0" dependencies = [ - "arbitrary", "enum_dispatch", "primitive-types", "zk_evm_abstractions", diff --git a/compiler_tester/Cargo.toml b/compiler_tester/Cargo.toml index 6819f1e0..86fca4d0 100644 --- a/compiler_tester/Cargo.toml +++ b/compiler_tester/Cargo.toml @@ -44,7 +44,7 @@ zkevm-assembly = { git = "https://github.com/matter-labs/era-zkEVM-assembly", br zkevm_opcode_defs = { git = "https://github.com/matter-labs/era-zkevm_opcode_defs", branch = "v1.5.0" } zkevm_tester = { git = "https://github.com/matter-labs/era-zkevm_tester", branch = "v1.5.0" } -# vm2 = { git = "https://github.com/matter-labs/vm2", optional = true } +vm2 = { git = "https://github.com/matter-labs/vm2", optional = true } era-compiler-common = { git = "https://github.com/matter-labs/era-compiler-common", branch = "main" } era-compiler-llvm-context = { git = "https://github.com/matter-labs/era-compiler-llvm-context", branch = "main" }