From 9570a312789e19bb2ff7286166ee2b4607166499 Mon Sep 17 00:00:00 2001
From: Nisheeth Barthwal <nbaztec@gmail.com>
Date: Tue, 5 Nov 2024 20:48:34 +0100
Subject: [PATCH 1/2] update zksync deps
---
Cargo.lock | 115 ++++++++++++---------------
Cargo.toml | 16 ++--
crates/zksync/core/src/vm/inspect.rs | 6 +-
3 files changed, 60 insertions(+), 77 deletions(-)
diff --git a/Cargo.lock b/Cargo.lock
index 7879ced1b..d0b8fdec7 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -2546,14 +2546,14 @@ dependencies = [
[[package]]
name = "circuit_encodings"
-version = "0.150.6"
+version = "0.150.7"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f5128d4b8fbb27ac453f573a95601058e74487bdafd22a3168cded66bf340c28"
+checksum = "2501cc688ef391013019495ae7035cfd54f86987e36d10f73976ce4c5d413c5a"
dependencies = [
"derivative",
"serde",
- "zk_evm 0.150.6",
- "zkevm_circuits 0.150.6",
+ "zk_evm 0.150.7",
+ "zkevm_circuits 0.150.7",
]
[[package]]
@@ -2613,11 +2613,11 @@ dependencies = [
[[package]]
name = "circuit_sequencer_api"
-version = "0.150.6"
+version = "0.150.7"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "093d0c2c0b39144ddb4e1e88d73d95067ce34ec7750808b2eed01edbb510b88e"
+checksum = "917d27db531fdd98a51e42ea465bc097f48cc849e7fad68d7856087d15125be1"
dependencies = [
- "circuit_encodings 0.150.6",
+ "circuit_encodings 0.150.7",
"derivative",
"rayon",
"serde",
@@ -3975,8 +3975,8 @@ checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5"
[[package]]
name = "era_test_node"
-version = "0.1.0-alpha.29"
-source = "git+https://github.com/matter-labs/era-test-node.git?rev=56c4e92693b5dd5ab166e368b066d9169b438855#56c4e92693b5dd5ab166e368b066d9169b438855"
+version = "0.1.0-alpha.31"
+source = "git+https://github.com/matter-labs/era-test-node.git?rev=94503847b402f0161c3372d5f357a4cb16a2d66d#94503847b402f0161c3372d5f357a4cb16a2d66d"
dependencies = [
"anyhow",
"bigdecimal 0.3.1",
@@ -4006,8 +4006,6 @@ dependencies = [
"toml 0.8.19",
"tracing",
"tracing-subscriber",
- "zkevm_opcode_defs 0.150.0",
- "zksync_basic_types",
"zksync_contracts",
"zksync_multivm",
"zksync_types",
@@ -14207,9 +14205,9 @@ dependencies = [
[[package]]
name = "zk_evm"
-version = "0.150.6"
+version = "0.150.7"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c14bda6c101389145cd01fac900f1392876bc0284d98faf7f376237baa2cb19d"
+checksum = "3cc74fbe2b45fd19e95c59ea792c795feebdb616ebaa463f0ac567f495f47387"
dependencies = [
"anyhow",
"lazy_static",
@@ -14217,7 +14215,7 @@ dependencies = [
"serde",
"serde_json",
"static_assertions",
- "zk_evm_abstractions 0.150.6",
+ "zk_evm_abstractions 0.150.7",
]
[[package]]
@@ -14248,15 +14246,15 @@ dependencies = [
[[package]]
name = "zk_evm_abstractions"
-version = "0.150.6"
+version = "0.150.7"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a008f2442fc6a508bdd1f902380242cb6ff11b8b27acdac2677c6d9f75cbb004"
+checksum = "37f333a3b059899df09e40deb041af881bc03e496fda5eec618ffb5e854ee7df"
dependencies = [
"anyhow",
"num_enum 0.6.1",
"serde",
"static_assertions",
- "zkevm_opcode_defs 0.150.6",
+ "zkevm_opcode_defs 0.150.7",
]
[[package]]
@@ -14305,9 +14303,9 @@ dependencies = [
[[package]]
name = "zkevm_circuits"
-version = "0.150.6"
+version = "0.150.7"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1f68518aedd5358b17224771bb78bacd912cf66011aeda98b1f887cfb9e0972f"
+checksum = "d06fb35b00699d25175a2ad447f86a9088af8b0bc698bb57086fb04c13e52eab"
dependencies = [
"arrayvec 0.7.6",
"boojum",
@@ -14319,7 +14317,7 @@ dependencies = [
"seq-macro",
"serde",
"smallvec",
- "zkevm_opcode_defs 0.150.6",
+ "zkevm_opcode_defs 0.150.7",
"zksync_cs_derive",
]
@@ -14367,25 +14365,9 @@ dependencies = [
[[package]]
name = "zkevm_opcode_defs"
-version = "0.150.0"
-source = "git+https://github.com/matter-labs/era-zkevm_opcode_defs.git?branch=v1.5.0#cf5f9c18c580f845b32fc2a4d565a77380fd15bc"
-dependencies = [
- "bitflags 2.6.0",
- "blake2 0.10.6",
- "ethereum-types 0.14.1",
- "k256 0.13.4",
- "lazy_static",
- "p256",
- "serde",
- "sha2 0.10.8",
- "sha3 0.10.8",
-]
-
-[[package]]
-name = "zkevm_opcode_defs"
-version = "0.150.6"
+version = "0.150.7"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "762b5f1c1b283c5388995a85d40a05aef1c14f50eb904998b7e9364739f5b899"
+checksum = "b83f3b279248af4ca86dec20a54127f02110b45570f3f6c1d13df49ba75c28a5"
dependencies = [
"bitflags 2.6.0",
"blake2 0.10.6",
@@ -14422,7 +14404,7 @@ dependencies = [
[[package]]
name = "zksync_basic_types"
version = "0.1.0"
-source = "git+https://github.com/matter-labs/zksync-era.git?rev=cfbcc11be0826e8c55fafa84ae01b2aead25d127#cfbcc11be0826e8c55fafa84ae01b2aead25d127"
+source = "git+https://github.com/matter-labs/zksync-era.git?rev=6c034f6e180cc92e99766f14c8840c90efa56cec#6c034f6e180cc92e99766f14c8840c90efa56cec"
dependencies = [
"anyhow",
"chrono",
@@ -14484,7 +14466,7 @@ dependencies = [
[[package]]
name = "zksync_config"
version = "0.1.0"
-source = "git+https://github.com/matter-labs/zksync-era.git?rev=cfbcc11be0826e8c55fafa84ae01b2aead25d127#cfbcc11be0826e8c55fafa84ae01b2aead25d127"
+source = "git+https://github.com/matter-labs/zksync-era.git?rev=6c034f6e180cc92e99766f14c8840c90efa56cec#6c034f6e180cc92e99766f14c8840c90efa56cec"
dependencies = [
"anyhow",
"rand 0.8.5",
@@ -14579,7 +14561,7 @@ dependencies = [
[[package]]
name = "zksync_contracts"
version = "0.1.0"
-source = "git+https://github.com/matter-labs/zksync-era.git?rev=cfbcc11be0826e8c55fafa84ae01b2aead25d127#cfbcc11be0826e8c55fafa84ae01b2aead25d127"
+source = "git+https://github.com/matter-labs/zksync-era.git?rev=6c034f6e180cc92e99766f14c8840c90efa56cec#6c034f6e180cc92e99766f14c8840c90efa56cec"
dependencies = [
"envy",
"ethabi 18.0.0",
@@ -14593,7 +14575,7 @@ dependencies = [
[[package]]
name = "zksync_crypto_primitives"
version = "0.1.0"
-source = "git+https://github.com/matter-labs/zksync-era.git?rev=cfbcc11be0826e8c55fafa84ae01b2aead25d127#cfbcc11be0826e8c55fafa84ae01b2aead25d127"
+source = "git+https://github.com/matter-labs/zksync-era.git?rev=6c034f6e180cc92e99766f14c8840c90efa56cec#6c034f6e180cc92e99766f14c8840c90efa56cec"
dependencies = [
"anyhow",
"blake2 0.10.6",
@@ -14623,7 +14605,7 @@ dependencies = [
[[package]]
name = "zksync_dal"
version = "0.1.0"
-source = "git+https://github.com/matter-labs/zksync-era.git?rev=cfbcc11be0826e8c55fafa84ae01b2aead25d127#cfbcc11be0826e8c55fafa84ae01b2aead25d127"
+source = "git+https://github.com/matter-labs/zksync-era.git?rev=6c034f6e180cc92e99766f14c8840c90efa56cec#6c034f6e180cc92e99766f14c8840c90efa56cec"
dependencies = [
"anyhow",
"bigdecimal 0.4.5",
@@ -14660,7 +14642,7 @@ dependencies = [
[[package]]
name = "zksync_db_connection"
version = "0.1.0"
-source = "git+https://github.com/matter-labs/zksync-era.git?rev=cfbcc11be0826e8c55fafa84ae01b2aead25d127#cfbcc11be0826e8c55fafa84ae01b2aead25d127"
+source = "git+https://github.com/matter-labs/zksync-era.git?rev=6c034f6e180cc92e99766f14c8840c90efa56cec#6c034f6e180cc92e99766f14c8840c90efa56cec"
dependencies = [
"anyhow",
"rand 0.8.5",
@@ -14704,9 +14686,9 @@ dependencies = [
[[package]]
name = "zksync_kzg"
-version = "0.150.6"
+version = "0.150.7"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6c006b6b7a27cc50ff0c515b6d0b197dbb907bbf65d1d2ea42fc3ed21b315642"
+checksum = "dc58af8e4e4ad1a851ffd2275e6a44ead0f15a7eaac9dc9d60a56b3b9c9b08e8"
dependencies = [
"boojum",
"derivative",
@@ -14716,13 +14698,13 @@ dependencies = [
"serde",
"serde_json",
"serde_with",
- "zkevm_circuits 0.150.6",
+ "zkevm_circuits 0.150.7",
]
[[package]]
name = "zksync_l1_contract_interface"
version = "0.1.0"
-source = "git+https://github.com/matter-labs/zksync-era.git?rev=cfbcc11be0826e8c55fafa84ae01b2aead25d127#cfbcc11be0826e8c55fafa84ae01b2aead25d127"
+source = "git+https://github.com/matter-labs/zksync-era.git?rev=6c034f6e180cc92e99766f14c8840c90efa56cec#6c034f6e180cc92e99766f14c8840c90efa56cec"
dependencies = [
"anyhow",
"hex",
@@ -14738,7 +14720,7 @@ dependencies = [
[[package]]
name = "zksync_mini_merkle_tree"
version = "0.1.0"
-source = "git+https://github.com/matter-labs/zksync-era.git?rev=cfbcc11be0826e8c55fafa84ae01b2aead25d127#cfbcc11be0826e8c55fafa84ae01b2aead25d127"
+source = "git+https://github.com/matter-labs/zksync-era.git?rev=6c034f6e180cc92e99766f14c8840c90efa56cec#6c034f6e180cc92e99766f14c8840c90efa56cec"
dependencies = [
"once_cell",
"zksync_basic_types",
@@ -14748,14 +14730,14 @@ dependencies = [
[[package]]
name = "zksync_multivm"
version = "0.1.0"
-source = "git+https://github.com/matter-labs/zksync-era.git?rev=cfbcc11be0826e8c55fafa84ae01b2aead25d127#cfbcc11be0826e8c55fafa84ae01b2aead25d127"
+source = "git+https://github.com/matter-labs/zksync-era.git?rev=6c034f6e180cc92e99766f14c8840c90efa56cec#6c034f6e180cc92e99766f14c8840c90efa56cec"
dependencies = [
"anyhow",
"circuit_sequencer_api 0.133.1",
"circuit_sequencer_api 0.140.3",
"circuit_sequencer_api 0.141.2",
"circuit_sequencer_api 0.142.2",
- "circuit_sequencer_api 0.150.6",
+ "circuit_sequencer_api 0.150.7",
"ethabi 18.0.0",
"hex",
"itertools 0.10.5",
@@ -14767,8 +14749,9 @@ dependencies = [
"zk_evm 0.133.0",
"zk_evm 0.140.0",
"zk_evm 0.141.0",
- "zk_evm 0.150.6",
+ "zk_evm 0.150.7",
"zksync_contracts",
+ "zksync_mini_merkle_tree",
"zksync_system_constants",
"zksync_types",
"zksync_utils",
@@ -14779,7 +14762,7 @@ dependencies = [
[[package]]
name = "zksync_object_store"
version = "0.1.0"
-source = "git+https://github.com/matter-labs/zksync-era.git?rev=cfbcc11be0826e8c55fafa84ae01b2aead25d127#cfbcc11be0826e8c55fafa84ae01b2aead25d127"
+source = "git+https://github.com/matter-labs/zksync-era.git?rev=6c034f6e180cc92e99766f14c8840c90efa56cec#6c034f6e180cc92e99766f14c8840c90efa56cec"
dependencies = [
"anyhow",
"async-trait",
@@ -14854,10 +14837,10 @@ dependencies = [
[[package]]
name = "zksync_prover_interface"
version = "0.1.0"
-source = "git+https://github.com/matter-labs/zksync-era.git?rev=cfbcc11be0826e8c55fafa84ae01b2aead25d127#cfbcc11be0826e8c55fafa84ae01b2aead25d127"
+source = "git+https://github.com/matter-labs/zksync-era.git?rev=6c034f6e180cc92e99766f14c8840c90efa56cec#6c034f6e180cc92e99766f14c8840c90efa56cec"
dependencies = [
"chrono",
- "circuit_sequencer_api 0.150.6",
+ "circuit_sequencer_api 0.150.7",
"serde",
"serde_with",
"strum",
@@ -14869,7 +14852,7 @@ dependencies = [
[[package]]
name = "zksync_shared_metrics"
version = "0.1.0"
-source = "git+https://github.com/matter-labs/zksync-era.git?rev=cfbcc11be0826e8c55fafa84ae01b2aead25d127#cfbcc11be0826e8c55fafa84ae01b2aead25d127"
+source = "git+https://github.com/matter-labs/zksync-era.git?rev=6c034f6e180cc92e99766f14c8840c90efa56cec#6c034f6e180cc92e99766f14c8840c90efa56cec"
dependencies = [
"rustc_version 0.4.1",
"tracing",
@@ -14898,7 +14881,7 @@ dependencies = [
[[package]]
name = "zksync_state"
version = "0.1.0"
-source = "git+https://github.com/matter-labs/zksync-era.git?rev=cfbcc11be0826e8c55fafa84ae01b2aead25d127#cfbcc11be0826e8c55fafa84ae01b2aead25d127"
+source = "git+https://github.com/matter-labs/zksync-era.git?rev=6c034f6e180cc92e99766f14c8840c90efa56cec#6c034f6e180cc92e99766f14c8840c90efa56cec"
dependencies = [
"anyhow",
"async-trait",
@@ -14921,7 +14904,7 @@ dependencies = [
[[package]]
name = "zksync_storage"
version = "0.1.0"
-source = "git+https://github.com/matter-labs/zksync-era.git?rev=cfbcc11be0826e8c55fafa84ae01b2aead25d127#cfbcc11be0826e8c55fafa84ae01b2aead25d127"
+source = "git+https://github.com/matter-labs/zksync-era.git?rev=6c034f6e180cc92e99766f14c8840c90efa56cec#6c034f6e180cc92e99766f14c8840c90efa56cec"
dependencies = [
"num_cpus",
"once_cell",
@@ -14934,7 +14917,7 @@ dependencies = [
[[package]]
name = "zksync_system_constants"
version = "0.1.0"
-source = "git+https://github.com/matter-labs/zksync-era.git?rev=cfbcc11be0826e8c55fafa84ae01b2aead25d127#cfbcc11be0826e8c55fafa84ae01b2aead25d127"
+source = "git+https://github.com/matter-labs/zksync-era.git?rev=6c034f6e180cc92e99766f14c8840c90efa56cec#6c034f6e180cc92e99766f14c8840c90efa56cec"
dependencies = [
"once_cell",
"zksync_basic_types",
@@ -14944,7 +14927,7 @@ dependencies = [
[[package]]
name = "zksync_types"
version = "0.1.0"
-source = "git+https://github.com/matter-labs/zksync-era.git?rev=cfbcc11be0826e8c55fafa84ae01b2aead25d127#cfbcc11be0826e8c55fafa84ae01b2aead25d127"
+source = "git+https://github.com/matter-labs/zksync-era.git?rev=6c034f6e180cc92e99766f14c8840c90efa56cec#6c034f6e180cc92e99766f14c8840c90efa56cec"
dependencies = [
"anyhow",
"bigdecimal 0.4.5",
@@ -14977,7 +14960,7 @@ dependencies = [
[[package]]
name = "zksync_utils"
version = "0.1.0"
-source = "git+https://github.com/matter-labs/zksync-era.git?rev=cfbcc11be0826e8c55fafa84ae01b2aead25d127#cfbcc11be0826e8c55fafa84ae01b2aead25d127"
+source = "git+https://github.com/matter-labs/zksync-era.git?rev=6c034f6e180cc92e99766f14c8840c90efa56cec#6c034f6e180cc92e99766f14c8840c90efa56cec"
dependencies = [
"anyhow",
"bigdecimal 0.4.5",
@@ -14999,7 +14982,7 @@ dependencies = [
[[package]]
name = "zksync_vlog"
version = "0.1.0"
-source = "git+https://github.com/matter-labs/zksync-era.git?rev=cfbcc11be0826e8c55fafa84ae01b2aead25d127#cfbcc11be0826e8c55fafa84ae01b2aead25d127"
+source = "git+https://github.com/matter-labs/zksync-era.git?rev=6c034f6e180cc92e99766f14c8840c90efa56cec#6c034f6e180cc92e99766f14c8840c90efa56cec"
dependencies = [
"anyhow",
"chrono",
@@ -15029,8 +15012,8 @@ source = "git+https://github.com/matter-labs/vm2.git?rev=df5bec3d04d64d434f9b0cc
dependencies = [
"enum_dispatch",
"primitive-types 0.12.2",
- "zk_evm_abstractions 0.150.6",
- "zkevm_opcode_defs 0.150.6",
+ "zk_evm_abstractions 0.150.7",
+ "zkevm_opcode_defs 0.150.7",
"zksync_vm2_interface",
]
@@ -15045,7 +15028,7 @@ dependencies = [
[[package]]
name = "zksync_vm_interface"
version = "0.1.0"
-source = "git+https://github.com/matter-labs/zksync-era.git?rev=cfbcc11be0826e8c55fafa84ae01b2aead25d127#cfbcc11be0826e8c55fafa84ae01b2aead25d127"
+source = "git+https://github.com/matter-labs/zksync-era.git?rev=6c034f6e180cc92e99766f14c8840c90efa56cec#6c034f6e180cc92e99766f14c8840c90efa56cec"
dependencies = [
"anyhow",
"async-trait",
@@ -15062,7 +15045,7 @@ dependencies = [
[[package]]
name = "zksync_web3_decl"
version = "0.1.0"
-source = "git+https://github.com/matter-labs/zksync-era.git?rev=cfbcc11be0826e8c55fafa84ae01b2aead25d127#cfbcc11be0826e8c55fafa84ae01b2aead25d127"
+source = "git+https://github.com/matter-labs/zksync-era.git?rev=6c034f6e180cc92e99766f14c8840c90efa56cec#6c034f6e180cc92e99766f14c8840c90efa56cec"
dependencies = [
"anyhow",
"async-trait",
diff --git a/Cargo.toml b/Cargo.toml
index 65d173683..eeb2f5ecc 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -241,16 +241,16 @@ anstyle = "1.0.8"
terminal_size = "0.4"
## zksync
-era_test_node = { git="https://github.com/matter-labs/era-test-node.git" , rev = "56c4e92693b5dd5ab166e368b066d9169b438855" }
+era_test_node = { git="https://github.com/matter-labs/era-test-node.git" , rev = "94503847b402f0161c3372d5f357a4cb16a2d66d" }
zksync-web3-rs = {git = "https://github.com/jrigada/zksync-web3-rs.git", rev = "bc3e6d3e75b7ff3747ff2dccefa9fb74d770931b"}
# zksync-web3-rs = {git = "https://github.com/lambdaclass/zksync-web3-rs.git", rev = "56653345d14331e0865a6785c77cdda63c94eeba"}
-zksync_basic_types = { git = "https://github.com/matter-labs/zksync-era.git", rev = "cfbcc11be0826e8c55fafa84ae01b2aead25d127" }
-zksync_types = { git = "https://github.com/matter-labs/zksync-era.git", rev = "cfbcc11be0826e8c55fafa84ae01b2aead25d127" }
-zksync_state = { git = "https://github.com/matter-labs/zksync-era.git", rev = "cfbcc11be0826e8c55fafa84ae01b2aead25d127" }
-zksync_multivm = { git = "https://github.com/matter-labs/zksync-era.git", rev = "cfbcc11be0826e8c55fafa84ae01b2aead25d127" }
-zksync_web3_decl = { git = "https://github.com/matter-labs/zksync-era.git", rev = "cfbcc11be0826e8c55fafa84ae01b2aead25d127" }
-zksync_utils = { git = "https://github.com/matter-labs/zksync-era.git", rev = "cfbcc11be0826e8c55fafa84ae01b2aead25d127" }
-zksync_contracts = { git = "https://github.com/matter-labs/zksync-era.git", rev = "cfbcc11be0826e8c55fafa84ae01b2aead25d127" }
+zksync_basic_types = { git = "https://github.com/matter-labs/zksync-era.git", rev = "6c034f6e180cc92e99766f14c8840c90efa56cec" }
+zksync_types = { git = "https://github.com/matter-labs/zksync-era.git", rev = "6c034f6e180cc92e99766f14c8840c90efa56cec" }
+zksync_state = { git = "https://github.com/matter-labs/zksync-era.git", rev = "6c034f6e180cc92e99766f14c8840c90efa56cec" }
+zksync_multivm = { git = "https://github.com/matter-labs/zksync-era.git", rev = "6c034f6e180cc92e99766f14c8840c90efa56cec" }
+zksync_web3_decl = { git = "https://github.com/matter-labs/zksync-era.git", rev = "6c034f6e180cc92e99766f14c8840c90efa56cec" }
+zksync_utils = { git = "https://github.com/matter-labs/zksync-era.git", rev = "6c034f6e180cc92e99766f14c8840c90efa56cec" }
+zksync_contracts = { git = "https://github.com/matter-labs/zksync-era.git", rev = "6c034f6e180cc92e99766f14c8840c90efa56cec" }
# macros
proc-macro2 = "1.0.82"
diff --git a/crates/zksync/core/src/vm/inspect.rs b/crates/zksync/core/src/vm/inspect.rs
index 801c686a4..5742fba60 100644
--- a/crates/zksync/core/src/vm/inspect.rs
+++ b/crates/zksync/core/src/vm/inspect.rs
@@ -19,8 +19,8 @@ use tracing::{debug, error, info, trace, warn};
use zksync_basic_types::{ethabi, L2ChainId, Nonce, H160, H256, U256};
use zksync_multivm::{
interface::{
- Call, CallType, ExecutionResult, Halt, VmEvent, VmExecutionMode, VmExecutionResultAndLogs,
- VmFactory, VmInterface, VmRevertReason,
+ Call, CallType, ExecutionResult, Halt, InspectExecutionMode, VmEvent,
+ VmExecutionResultAndLogs, VmFactory, VmInterface, VmRevertReason,
},
tracers::CallTracer,
vm_latest::{HistoryDisabled, ToTracerPointer, Vm},
@@ -455,7 +455,7 @@ fn inspect_inner<S: ReadStorage>(
.into_tracer_pointer(),
];
let compressed_bytecodes = vm.push_transaction(tx).compressed_bytecodes.into_owned();
- let mut tx_result = vm.inspect(&mut tracers.into(), VmExecutionMode::OneTx);
+ let mut tx_result = vm.inspect(&mut tracers.into(), InspectExecutionMode::OneTx);
let mut call_traces = Arc::try_unwrap(call_tracer_result).unwrap().take().unwrap_or_default();
trace!(?tx_result.result, "zk vm result");
From 37b01386a892e575560b89ff3cea1cad9ae61917 Mon Sep 17 00:00:00 2001
From: Nisheeth Barthwal <nbaztec@gmail.com>
Date: Tue, 5 Nov 2024 20:48:37 +0100
Subject: [PATCH 2/2] fmt
---
crates/forge/tests/cli/build.rs | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/crates/forge/tests/cli/build.rs b/crates/forge/tests/cli/build.rs
index 5a4fa4bba..2cf60fb46 100644
--- a/crates/forge/tests/cli/build.rs
+++ b/crates/forge/tests/cli/build.rs
@@ -125,7 +125,9 @@ forgetest_init!(build_sizes_no_forge_std, |prj, cmd| {
forgetest_init!(test_zk_build_sizes, |prj, cmd| {
cmd.args(["build", "--sizes", "--zksync", "--evm-version", "shanghai"]);
let stdout = cmd.assert_success().get_output().stdout_lossy();
- let pattern = Regex::new(r"\|\s*Counter\s*\|\s*800\s*\|\s*800\s*\|\s*450,199\s*\|\s*450,199\s*\|").unwrap();
+ let pattern =
+ Regex::new(r"\|\s*Counter\s*\|\s*800\s*\|\s*800\s*\|\s*450,199\s*\|\s*450,199\s*\|")
+ .unwrap();
assert!(pattern.is_match(&stdout), "Unexpected size output:\n{stdout}");
});