From 4695154c36cd871c8acbd010c001c7e2b6e149dd Mon Sep 17 00:00:00 2001 From: AntonD3 Date: Thu, 7 Dec 2023 05:55:24 +0800 Subject: [PATCH] Update zksync-era to 1.4.1 --- Cargo.lock | 102 ++++++++++++++++++++++++++++------------ Cargo.toml | 16 +++---- src/bootloader_debug.rs | 2 +- 3 files changed, 81 insertions(+), 39 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index d30816ca..7b024fcb 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -4834,7 +4834,7 @@ checksum = "e5ce46fe64a9d73be07dcbe690a38ce1b293be448fd8ce1e6c1b8062c9f72c6a" [[package]] name = "multivm" version = "0.1.0" -source = "git+https://github.com/matter-labs/zksync-era.git?rev=bd268ac02bc3530c1d3247cb9496c3e13c2e52d9#bd268ac02bc3530c1d3247cb9496c3e13c2e52d9" +source = "git+https://github.com/matter-labs/zksync-era.git?rev=0b0008d3ec270d3bad5d280bfe631b59a81e9379#0b0008d3ec270d3bad5d280bfe631b59a81e9379" dependencies = [ "anyhow", "hex", @@ -4846,6 +4846,7 @@ dependencies = [ "zk_evm 1.3.1", "zk_evm 1.3.3 (git+https://github.com/matter-labs/era-zk_evm.git?tag=v1.3.3-rc2)", "zk_evm 1.4.0", + "zk_evm 1.4.1", "zksync_contracts", "zksync_state", "zksync_system_constants", @@ -5996,7 +5997,7 @@ dependencies = [ [[package]] name = "prometheus_exporter" version = "0.1.0" -source = "git+https://github.com/matter-labs/zksync-era.git?rev=bd268ac02bc3530c1d3247cb9496c3e13c2e52d9#bd268ac02bc3530c1d3247cb9496c3e13c2e52d9" +source = "git+https://github.com/matter-labs/zksync-era.git?rev=0b0008d3ec270d3bad5d280bfe631b59a81e9379#0b0008d3ec270d3bad5d280bfe631b59a81e9379" dependencies = [ "anyhow", "metrics", @@ -8738,7 +8739,7 @@ dependencies = [ [[package]] name = "vlog" version = "0.1.0" -source = "git+https://github.com/matter-labs/zksync-era.git?rev=bd268ac02bc3530c1d3247cb9496c3e13c2e52d9#bd268ac02bc3530c1d3247cb9496c3e13c2e52d9" +source = "git+https://github.com/matter-labs/zksync-era.git?rev=0b0008d3ec270d3bad5d280bfe631b59a81e9379#0b0008d3ec270d3bad5d280bfe631b59a81e9379" dependencies = [ "chrono", "sentry", @@ -9282,7 +9283,7 @@ dependencies = [ "serde", "serde_json", "static_assertions", - "zk_evm_abstractions", + "zk_evm_abstractions 0.1.0", "zkevm_opcode_defs 1.3.2", ] @@ -9297,7 +9298,7 @@ dependencies = [ "serde", "serde_json", "static_assertions", - "zk_evm_abstractions", + "zk_evm_abstractions 0.1.0", "zkevm_opcode_defs 1.3.2", ] @@ -9312,10 +9313,25 @@ dependencies = [ "serde", "serde_json", "static_assertions", - "zk_evm_abstractions", + "zk_evm_abstractions 0.1.0", "zkevm_opcode_defs 1.3.2", ] +[[package]] +name = "zk_evm" +version = "1.4.1" +source = "git+https://github.com/matter-labs/era-zk_evm.git?branch=v1.4.1#6250dbf64b2d14ced87a127735da559f27a432d5" +dependencies = [ + "anyhow", + "lazy_static", + "num 0.4.1", + "serde", + "serde_json", + "static_assertions", + "zk_evm_abstractions 1.4.1", + "zkevm_opcode_defs 1.4.1", +] + [[package]] name = "zk_evm_abstractions" version = "0.1.0" @@ -9327,6 +9343,17 @@ dependencies = [ "zkevm_opcode_defs 1.3.2", ] +[[package]] +name = "zk_evm_abstractions" +version = "1.4.1" +source = "git+https://github.com/matter-labs/era-zk_evm_abstractions.git?branch=v1.4.1#e4ecf19c4d4d206a0de2719ba43294bfcddae92a" +dependencies = [ + "anyhow", + "serde", + "static_assertions", + "zkevm_opcode_defs 1.4.1", +] + [[package]] name = "zkevm-assembly" version = "1.3.2" @@ -9392,6 +9419,20 @@ dependencies = [ "sha3 0.10.6", ] +[[package]] +name = "zkevm_opcode_defs" +version = "1.4.1" +source = "git+https://github.com/matter-labs/era-zkevm_opcode_defs.git?branch=v1.4.1#ba8228ff0582d21f64d6a319d50d0aec48e9e7b6" +dependencies = [ + "bitflags 2.4.1", + "blake2 0.10.6 (registry+https://github.com/rust-lang/crates.io-index)", + "ethereum-types 0.14.1", + "k256 0.13.2", + "lazy_static", + "sha2 0.10.8", + "sha3 0.10.8", +] + [[package]] name = "zkevm_test_harness" version = "1.3.3" @@ -9466,7 +9507,7 @@ dependencies = [ [[package]] name = "zksync_basic_types" version = "0.1.0" -source = "git+https://github.com/matter-labs/zksync-era.git?rev=bd268ac02bc3530c1d3247cb9496c3e13c2e52d9#bd268ac02bc3530c1d3247cb9496c3e13c2e52d9" +source = "git+https://github.com/matter-labs/zksync-era.git?rev=0b0008d3ec270d3bad5d280bfe631b59a81e9379#0b0008d3ec270d3bad5d280bfe631b59a81e9379" dependencies = [ "serde", "serde_json", @@ -9476,7 +9517,7 @@ dependencies = [ [[package]] name = "zksync_circuit_breaker" version = "0.1.0" -source = "git+https://github.com/matter-labs/zksync-era.git?rev=bd268ac02bc3530c1d3247cb9496c3e13c2e52d9#bd268ac02bc3530c1d3247cb9496c3e13c2e52d9" +source = "git+https://github.com/matter-labs/zksync-era.git?rev=0b0008d3ec270d3bad5d280bfe631b59a81e9379#0b0008d3ec270d3bad5d280bfe631b59a81e9379" dependencies = [ "anyhow", "async-trait", @@ -9499,7 +9540,7 @@ dependencies = [ [[package]] name = "zksync_commitment_utils" version = "0.1.0" -source = "git+https://github.com/matter-labs/zksync-era.git?rev=bd268ac02bc3530c1d3247cb9496c3e13c2e52d9#bd268ac02bc3530c1d3247cb9496c3e13c2e52d9" +source = "git+https://github.com/matter-labs/zksync-era.git?rev=0b0008d3ec270d3bad5d280bfe631b59a81e9379#0b0008d3ec270d3bad5d280bfe631b59a81e9379" dependencies = [ "zkevm_test_harness 1.4.0", "zksync_types", @@ -9527,7 +9568,7 @@ dependencies = [ [[package]] name = "zksync_config" version = "0.1.0" -source = "git+https://github.com/matter-labs/zksync-era.git?rev=bd268ac02bc3530c1d3247cb9496c3e13c2e52d9#bd268ac02bc3530c1d3247cb9496c3e13c2e52d9" +source = "git+https://github.com/matter-labs/zksync-era.git?rev=0b0008d3ec270d3bad5d280bfe631b59a81e9379#0b0008d3ec270d3bad5d280bfe631b59a81e9379" dependencies = [ "anyhow", "serde", @@ -9681,7 +9722,7 @@ dependencies = [ [[package]] name = "zksync_contracts" version = "0.1.0" -source = "git+https://github.com/matter-labs/zksync-era.git?rev=bd268ac02bc3530c1d3247cb9496c3e13c2e52d9#bd268ac02bc3530c1d3247cb9496c3e13c2e52d9" +source = "git+https://github.com/matter-labs/zksync-era.git?rev=0b0008d3ec270d3bad5d280bfe631b59a81e9379#0b0008d3ec270d3bad5d280bfe631b59a81e9379" dependencies = [ "envy", "ethabi 18.0.0", @@ -9695,7 +9736,7 @@ dependencies = [ [[package]] name = "zksync_core" version = "0.1.0" -source = "git+https://github.com/matter-labs/zksync-era.git?rev=bd268ac02bc3530c1d3247cb9496c3e13c2e52d9#bd268ac02bc3530c1d3247cb9496c3e13c2e52d9" +source = "git+https://github.com/matter-labs/zksync-era.git?rev=0b0008d3ec270d3bad5d280bfe631b59a81e9379#0b0008d3ec270d3bad5d280bfe631b59a81e9379" dependencies = [ "actix-cors", "actix-rt", @@ -9766,7 +9807,7 @@ dependencies = [ [[package]] name = "zksync_crypto" version = "0.1.0" -source = "git+https://github.com/matter-labs/zksync-era.git?rev=bd268ac02bc3530c1d3247cb9496c3e13c2e52d9#bd268ac02bc3530c1d3247cb9496c3e13c2e52d9" +source = "git+https://github.com/matter-labs/zksync-era.git?rev=0b0008d3ec270d3bad5d280bfe631b59a81e9379#0b0008d3ec270d3bad5d280bfe631b59a81e9379" dependencies = [ "base64 0.13.1", "blake2 0.10.6 (registry+https://github.com/rust-lang/crates.io-index)", @@ -9781,7 +9822,7 @@ dependencies = [ [[package]] name = "zksync_dal" version = "0.1.0" -source = "git+https://github.com/matter-labs/zksync-era.git?rev=bd268ac02bc3530c1d3247cb9496c3e13c2e52d9#bd268ac02bc3530c1d3247cb9496c3e13c2e52d9" +source = "git+https://github.com/matter-labs/zksync-era.git?rev=0b0008d3ec270d3bad5d280bfe631b59a81e9379#0b0008d3ec270d3bad5d280bfe631b59a81e9379" dependencies = [ "anyhow", "bigdecimal", @@ -9810,7 +9851,7 @@ dependencies = [ [[package]] name = "zksync_eth_client" version = "0.1.0" -source = "git+https://github.com/matter-labs/zksync-era.git?rev=bd268ac02bc3530c1d3247cb9496c3e13c2e52d9#bd268ac02bc3530c1d3247cb9496c3e13c2e52d9" +source = "git+https://github.com/matter-labs/zksync-era.git?rev=0b0008d3ec270d3bad5d280bfe631b59a81e9379#0b0008d3ec270d3bad5d280bfe631b59a81e9379" dependencies = [ "anyhow", "async-trait", @@ -9830,7 +9871,7 @@ dependencies = [ [[package]] name = "zksync_eth_signer" version = "0.1.0" -source = "git+https://github.com/matter-labs/zksync-era.git?rev=bd268ac02bc3530c1d3247cb9496c3e13c2e52d9#bd268ac02bc3530c1d3247cb9496c3e13c2e52d9" +source = "git+https://github.com/matter-labs/zksync-era.git?rev=0b0008d3ec270d3bad5d280bfe631b59a81e9379#0b0008d3ec270d3bad5d280bfe631b59a81e9379" dependencies = [ "async-trait", "hex", @@ -9849,7 +9890,7 @@ dependencies = [ [[package]] name = "zksync_health_check" version = "0.1.0" -source = "git+https://github.com/matter-labs/zksync-era.git?rev=bd268ac02bc3530c1d3247cb9496c3e13c2e52d9#bd268ac02bc3530c1d3247cb9496c3e13c2e52d9" +source = "git+https://github.com/matter-labs/zksync-era.git?rev=0b0008d3ec270d3bad5d280bfe631b59a81e9379#0b0008d3ec270d3bad5d280bfe631b59a81e9379" dependencies = [ "async-trait", "futures 0.3.29", @@ -9862,7 +9903,7 @@ dependencies = [ [[package]] name = "zksync_mempool" version = "0.1.0" -source = "git+https://github.com/matter-labs/zksync-era.git?rev=bd268ac02bc3530c1d3247cb9496c3e13c2e52d9#bd268ac02bc3530c1d3247cb9496c3e13c2e52d9" +source = "git+https://github.com/matter-labs/zksync-era.git?rev=0b0008d3ec270d3bad5d280bfe631b59a81e9379#0b0008d3ec270d3bad5d280bfe631b59a81e9379" dependencies = [ "tracing", "zksync_types", @@ -9871,7 +9912,7 @@ dependencies = [ [[package]] name = "zksync_merkle_tree" version = "0.1.0" -source = "git+https://github.com/matter-labs/zksync-era.git?rev=bd268ac02bc3530c1d3247cb9496c3e13c2e52d9#bd268ac02bc3530c1d3247cb9496c3e13c2e52d9" +source = "git+https://github.com/matter-labs/zksync-era.git?rev=0b0008d3ec270d3bad5d280bfe631b59a81e9379#0b0008d3ec270d3bad5d280bfe631b59a81e9379" dependencies = [ "leb128", "once_cell", @@ -9888,7 +9929,7 @@ dependencies = [ [[package]] name = "zksync_mini_merkle_tree" version = "0.1.0" -source = "git+https://github.com/matter-labs/zksync-era.git?rev=bd268ac02bc3530c1d3247cb9496c3e13c2e52d9#bd268ac02bc3530c1d3247cb9496c3e13c2e52d9" +source = "git+https://github.com/matter-labs/zksync-era.git?rev=0b0008d3ec270d3bad5d280bfe631b59a81e9379#0b0008d3ec270d3bad5d280bfe631b59a81e9379" dependencies = [ "once_cell", "zksync_basic_types", @@ -9898,7 +9939,7 @@ dependencies = [ [[package]] name = "zksync_object_store" version = "0.1.0" -source = "git+https://github.com/matter-labs/zksync-era.git?rev=bd268ac02bc3530c1d3247cb9496c3e13c2e52d9#bd268ac02bc3530c1d3247cb9496c3e13c2e52d9" +source = "git+https://github.com/matter-labs/zksync-era.git?rev=0b0008d3ec270d3bad5d280bfe631b59a81e9379#0b0008d3ec270d3bad5d280bfe631b59a81e9379" dependencies = [ "anyhow", "async-trait", @@ -9950,7 +9991,7 @@ dependencies = [ [[package]] name = "zksync_prover_utils" version = "0.1.0" -source = "git+https://github.com/matter-labs/zksync-era.git?rev=bd268ac02bc3530c1d3247cb9496c3e13c2e52d9#bd268ac02bc3530c1d3247cb9496c3e13c2e52d9" +source = "git+https://github.com/matter-labs/zksync-era.git?rev=0b0008d3ec270d3bad5d280bfe631b59a81e9379#0b0008d3ec270d3bad5d280bfe631b59a81e9379" dependencies = [ "anyhow", "async-trait", @@ -9970,7 +10011,7 @@ dependencies = [ [[package]] name = "zksync_queued_job_processor" version = "0.1.0" -source = "git+https://github.com/matter-labs/zksync-era.git?rev=bd268ac02bc3530c1d3247cb9496c3e13c2e52d9#bd268ac02bc3530c1d3247cb9496c3e13c2e52d9" +source = "git+https://github.com/matter-labs/zksync-era.git?rev=0b0008d3ec270d3bad5d280bfe631b59a81e9379#0b0008d3ec270d3bad5d280bfe631b59a81e9379" dependencies = [ "anyhow", "async-trait", @@ -9983,7 +10024,7 @@ dependencies = [ [[package]] name = "zksync_state" version = "0.1.0" -source = "git+https://github.com/matter-labs/zksync-era.git?rev=bd268ac02bc3530c1d3247cb9496c3e13c2e52d9#bd268ac02bc3530c1d3247cb9496c3e13c2e52d9" +source = "git+https://github.com/matter-labs/zksync-era.git?rev=0b0008d3ec270d3bad5d280bfe631b59a81e9379#0b0008d3ec270d3bad5d280bfe631b59a81e9379" dependencies = [ "anyhow", "itertools 0.10.5", @@ -10000,7 +10041,7 @@ dependencies = [ [[package]] name = "zksync_storage" version = "0.1.0" -source = "git+https://github.com/matter-labs/zksync-era.git?rev=bd268ac02bc3530c1d3247cb9496c3e13c2e52d9#bd268ac02bc3530c1d3247cb9496c3e13c2e52d9" +source = "git+https://github.com/matter-labs/zksync-era.git?rev=0b0008d3ec270d3bad5d280bfe631b59a81e9379#0b0008d3ec270d3bad5d280bfe631b59a81e9379" dependencies = [ "num_cpus", "once_cell", @@ -10012,7 +10053,7 @@ dependencies = [ [[package]] name = "zksync_system_constants" version = "0.1.0" -source = "git+https://github.com/matter-labs/zksync-era.git?rev=bd268ac02bc3530c1d3247cb9496c3e13c2e52d9#bd268ac02bc3530c1d3247cb9496c3e13c2e52d9" +source = "git+https://github.com/matter-labs/zksync-era.git?rev=0b0008d3ec270d3bad5d280bfe631b59a81e9379#0b0008d3ec270d3bad5d280bfe631b59a81e9379" dependencies = [ "anyhow", "bigdecimal", @@ -10030,7 +10071,7 @@ dependencies = [ [[package]] name = "zksync_types" version = "0.1.0" -source = "git+https://github.com/matter-labs/zksync-era.git?rev=bd268ac02bc3530c1d3247cb9496c3e13c2e52d9#bd268ac02bc3530c1d3247cb9496c3e13c2e52d9" +source = "git+https://github.com/matter-labs/zksync-era.git?rev=0b0008d3ec270d3bad5d280bfe631b59a81e9379#0b0008d3ec270d3bad5d280bfe631b59a81e9379" dependencies = [ "anyhow", "blake2 0.10.6 (registry+https://github.com/rust-lang/crates.io-index)", @@ -10051,6 +10092,7 @@ dependencies = [ "thiserror", "zk_evm 1.3.3 (git+https://github.com/matter-labs/era-zk_evm.git?tag=v1.3.3-rc2)", "zk_evm 1.4.0", + "zk_evm 1.4.1", "zkevm_test_harness 1.3.3", "zksync_basic_types", "zksync_consensus_roles", @@ -10065,7 +10107,7 @@ dependencies = [ [[package]] name = "zksync_utils" version = "0.1.0" -source = "git+https://github.com/matter-labs/zksync-era.git?rev=bd268ac02bc3530c1d3247cb9496c3e13c2e52d9#bd268ac02bc3530c1d3247cb9496c3e13c2e52d9" +source = "git+https://github.com/matter-labs/zksync-era.git?rev=0b0008d3ec270d3bad5d280bfe631b59a81e9379#0b0008d3ec270d3bad5d280bfe631b59a81e9379" dependencies = [ "anyhow", "bigdecimal", @@ -10087,7 +10129,7 @@ dependencies = [ [[package]] name = "zksync_verification_key_generator_and_server" version = "0.1.0" -source = "git+https://github.com/matter-labs/zksync-era.git?rev=bd268ac02bc3530c1d3247cb9496c3e13c2e52d9#bd268ac02bc3530c1d3247cb9496c3e13c2e52d9" +source = "git+https://github.com/matter-labs/zksync-era.git?rev=0b0008d3ec270d3bad5d280bfe631b59a81e9379#0b0008d3ec270d3bad5d280bfe631b59a81e9379" dependencies = [ "anyhow", "bincode", @@ -10107,7 +10149,7 @@ dependencies = [ [[package]] name = "zksync_web3_decl" version = "0.1.0" -source = "git+https://github.com/matter-labs/zksync-era.git?rev=bd268ac02bc3530c1d3247cb9496c3e13c2e52d9#bd268ac02bc3530c1d3247cb9496c3e13c2e52d9" +source = "git+https://github.com/matter-labs/zksync-era.git?rev=0b0008d3ec270d3bad5d280bfe631b59a81e9379#0b0008d3ec270d3bad5d280bfe631b59a81e9379" dependencies = [ "bigdecimal", "chrono", diff --git a/Cargo.toml b/Cargo.toml index 92ab38c2..7019e9d8 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -11,14 +11,14 @@ categories = ["cryptography"] publish = false # We don't want to publish our binaries. [dependencies] -zksync_basic_types = { git = "https://github.com/matter-labs/zksync-era.git", rev = "bd268ac02bc3530c1d3247cb9496c3e13c2e52d9" } -zksync_core = { git = "https://github.com/matter-labs/zksync-era.git", rev = "bd268ac02bc3530c1d3247cb9496c3e13c2e52d9" } -multivm = { git = "https://github.com/matter-labs/zksync-era.git", rev = "bd268ac02bc3530c1d3247cb9496c3e13c2e52d9" } -zksync_contracts = { 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_utils = { git = "https://github.com/matter-labs/zksync-era.git", rev = "bd268ac02bc3530c1d3247cb9496c3e13c2e52d9" } -zksync_state = { git = "https://github.com/matter-labs/zksync-era.git", rev = "bd268ac02bc3530c1d3247cb9496c3e13c2e52d9" } -zksync_web3_decl = { git = "https://github.com/matter-labs/zksync-era.git", rev = "bd268ac02bc3530c1d3247cb9496c3e13c2e52d9" } +zksync_basic_types = { git = "https://github.com/matter-labs/zksync-era.git", rev = "0b0008d3ec270d3bad5d280bfe631b59a81e9379" } +zksync_core = { git = "https://github.com/matter-labs/zksync-era.git", rev = "0b0008d3ec270d3bad5d280bfe631b59a81e9379" } +multivm = { git = "https://github.com/matter-labs/zksync-era.git", rev = "0b0008d3ec270d3bad5d280bfe631b59a81e9379" } +zksync_contracts = { git = "https://github.com/matter-labs/zksync-era.git", rev = "0b0008d3ec270d3bad5d280bfe631b59a81e9379" } +zksync_types = { git = "https://github.com/matter-labs/zksync-era.git", rev = "0b0008d3ec270d3bad5d280bfe631b59a81e9379" } +zksync_utils = { git = "https://github.com/matter-labs/zksync-era.git", rev = "0b0008d3ec270d3bad5d280bfe631b59a81e9379" } +zksync_state = { git = "https://github.com/matter-labs/zksync-era.git", rev = "0b0008d3ec270d3bad5d280bfe631b59a81e9379" } +zksync_web3_decl = { git = "https://github.com/matter-labs/zksync-era.git", rev = "0b0008d3ec270d3bad5d280bfe631b59a81e9379" } sha3 = "0.10.6" diff --git a/src/bootloader_debug.rs b/src/bootloader_debug.rs index c83b9a80..1da296d0 100644 --- a/src/bootloader_debug.rs +++ b/src/bootloader_debug.rs @@ -1,4 +1,4 @@ -use multivm::interface::{dyn_tracers::vm_1_4_0::DynTracer, tracer::VmExecutionStopReason}; +use multivm::interface::{dyn_tracers::vm_1_4_1::DynTracer, tracer::VmExecutionStopReason}; use std::sync::Arc; use multivm::vm_latest::{