diff --git a/.github/workflows/bench.yml b/.github/workflows/bench.yml index dcda57cf2..6525a1faf 100644 --- a/.github/workflows/bench.yml +++ b/.github/workflows/bench.yml @@ -17,7 +17,7 @@ concurrency: jobs: vm-benchmarks: name: Run benchmarks - runs-on: [matterlabs-ci-runner] + runs-on: [matterlabs-ci-runner-highmem] permissions: contents: read pull-requests: write diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index c48955d26..7e6a07930 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -46,7 +46,7 @@ jobs: run: cargo test --release -j 3 crypto_test: name: crypto crate tests - runs-on: [matterlabs-ci-runner] + runs-on: [matterlabs-ci-runner-high-performance] steps: - uses: actions/checkout@v3 - uses: actions-rust-lang/setup-rust-toolchain@v1 diff --git a/Cargo.toml b/Cargo.toml index 185a399ba..c02a50ae4 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -60,10 +60,10 @@ categories = ["cryptography"] [workspace.dependencies] zksync_os_evm_errors = { version = "0.0.13", default-features = false } -zksync_os_interface = { version = "0.0.13"} +zksync_os_interface = { version = "0.0.13", default-features = false } risc_v_simulator = { git = "https://github.com/matter-labs/zksync-airbender", tag = "v0.5.2"} -blake2s_u32 = { git = "https://github.com/matter-labs/zksync-airbender", tag = "v0.5.2"} +blake2s_u32 = { git = "https://github.com/matter-labs/zksync-airbender", tag = "v0.5.2", default-features = false } prover_examples = { git = "https://github.com/matter-labs/zksync-airbender", tag = "v0.5.2"} execution_utils = { git = "https://github.com/matter-labs/zksync-airbender", tag = "v0.5.2"} prover = { git = "https://github.com/matter-labs/zksync-airbender", tag = "v0.5.2" } @@ -73,6 +73,25 @@ gpu_prover = { git = "https://github.com/matter-labs/zksync-airbender", tag = "v ruint = { version = "1.16", default-features = false } arrayvec = { version = "0.7", default-features = false } serde = { version = "1", default-features = false } +hex = "0.4.3" +paste = "1.0.15" +strum_macros = "0.27.1" +cfg-if = "1.0.4" +either = { version = "1.15.0", default-features = false } +num-bigint = { version = "0.4", default-features = false } +num-traits = { version = "0.2", default-features = false } +num-integer = { version = "0.1", default-features = false } +proptest = "1.7.0" +alloy = { version = "1", default-features = false } +alloy-rlp = "0.3.13" +alloy-sol-types = "1" +alloy-primitives = "1" +alloy-rpc-types-debug = { version = "1", default-features = false } +reqwest = "0.12" +serde_json = "1" +log = "0.4.22" +env_logger = "0.11.6" +once_cell = "1.20.3" # zerocopy 0.8.29 introduced a compilation issue, remove this @@ -105,4 +124,3 @@ debug = true # prover_examples = { path = "../zksync-airbender/circuit_defs/prover_examples" } # risc_v_simulator = { path = "../zksync-airbender/risc_v_simulator" } # execution_utils = { path = "../zksync-airbender/execution_utils" } - diff --git a/api/Cargo.toml b/api/Cargo.toml index 0c285c3b8..0f217d422 100644 --- a/api/Cargo.toml +++ b/api/Cargo.toml @@ -13,20 +13,16 @@ categories.workspace = true forward_system = { path = "../forward_system", default-features = false} oracle_provider = { path = "../oracle_provider" } -callable_oracles = { path = "../callable_oracles/" } zksync_os_runner = { path = "../zksync_os_runner"} -risc_v_simulator = { workspace = true } zk_ee = { path = "../zk_ee", default-features = false } crypto = { path = "../crypto", default-features = false } basic_system = { path = "../basic_system", default-features = false } basic_bootloader = { path = "../basic_bootloader", default-features = false } evm_interpreter = { path = "../evm_interpreter", default-features = false } ruint = { workspace = true, default-features = false } -alloy = { version = "=1", default-features = false, features = ["eip712", "consensus", "rpc-types", "signer-local", "dyn-abi", "network"] } +alloy = { workspace = true, features = ["eip712", "consensus", "rpc-types", "signer-local", "dyn-abi", "network"] } zksync_os_interface = { workspace = true } -alloy-sol-types = "1" +alloy-sol-types = { workspace = true } [features] -# By default, use the risc_v_simulator with delegation (which is faster). -default = ["risc_v_simulator/delegation"] diff --git a/basic_bootloader/Cargo.toml b/basic_bootloader/Cargo.toml index d46c0ab08..724ee2716 100644 --- a/basic_bootloader/Cargo.toml +++ b/basic_bootloader/Cargo.toml @@ -19,17 +19,17 @@ ruint = { workspace = true, default-features = false } arrayvec = { workspace = true, default-features = false } serde = { workspace = true, default-features = false, features = ["derive"], optional = true } crypto = { path = "../crypto", default-features = false } -hex = {version = "*", optional = true} -strum_macros = "0.27.1" -paste = "1.0.15" -cfg-if = "*" +hex = { workspace = true, optional = true } +strum_macros = { workspace = true } +paste = { workspace = true } +cfg-if = { workspace = true } serde-big-array = "0.5" [dev-dependencies] -alloy = { version = "1", features = ["rlp", "full"] } -alloy-rlp = { version = "*" } -alloy-primitives = { version = "1", features = ["arbitrary"] } +alloy = { workspace = true, features = ["rlp", "full"] } +alloy-rlp = { workspace = true } +alloy-primitives = { workspace = true, features = ["arbitrary"] } [features] serde = ["dep:serde", "ruint/serde"] diff --git a/basic_system/Cargo.toml b/basic_system/Cargo.toml index 3e408d948..b2408ccf3 100644 --- a/basic_system/Cargo.toml +++ b/basic_system/Cargo.toml @@ -16,24 +16,18 @@ ruint = { workspace = true, default-features = false, features = ["serde"] } arrayvec = { workspace = true, default-features = false } serde = { workspace = true, default-features = false, features = ["derive"], optional = true } crypto = { path = "../crypto", default-features = false, features = ["secp256k1-static-context"]} -either = { version = "*", default-features = false } +either = { workspace = true, default-features = false } storage_models = { path = "../storage_models", default-features = false } modexp = { path = "../supporting_crates/modexp" } cycle_marker = { path = "../cycle_marker" } -num-bigint = { version = "0.4", optional = true} -num-traits = { version = "*", optional = true} -system_hooks = { path = "../system_hooks", default-features = false } +num-bigint = { workspace = true, default-features = true, optional = true } +num-traits = { workspace = true, default-features = true, optional = true } cc-traits = { path = "src/system_implementation/ethereum_storage_model/supporting_crates/cc-traits" } - -cfg-if = "1.0.0" -const_for = "0.1.5" const-hex = { version = "1", default-features = false } rand = {version = "0.9.0", optional = true} -strum_macros = "0.27.1" -paste = "1.0.15" -zerocopy = { workspace = true } - +strum_macros = { workspace = true } +paste = { workspace = true } [features] testing = ["zk_ee/testing", "evm_interpreter/testing", "serde", "ruint/serde", "rand", "crypto/testing", "num-bigint", "num-traits"] default = ["testing"] @@ -45,18 +39,18 @@ multiblock-batch = [] state-diffs-pi = [] [dev-dependencies] -hex = {version = "0.4.3"} -proptest = "1.6.0" +hex = { workspace = true } +proptest = { workspace = true } crypto = { path = "../crypto", default-features = false, features = ["secp256k1-static-context", "testing"]} -num-bigint = "*" -num-traits = "*" +num-bigint = { workspace = true, default-features = true } +num-traits = { workspace = true, default-features = true } arbitrary = { version = "1", features = ["derive"] } -serde_json = "*" -alloy-rpc-types-debug = { version = "*", default-features = false } -alloy = { version = "1", features = ["rlp", "full"] } -alloy-rlp = { version = "*" } -alloy-primitives = { version = "1", features = ["arbitrary"] } -reqwest = { version = "*", features = ["blocking", "json"] } +serde_json = { workspace = true } +alloy-rpc-types-debug = { workspace = true } +alloy = { workspace = true, features = ["rlp", "full"] } +alloy-rlp = { workspace = true } +alloy-primitives = { workspace = true, features = ["arbitrary"] } +reqwest = { workspace = true, features = ["blocking", "json"] } reth-trie-common = { git = "https://github.com/paradigmxyz/reth.git", tag = "v1.8.4" } reth-trie-sparse = { git = "https://github.com/paradigmxyz/reth.git", tag = "v1.8.4" } diff --git a/callable_oracles/Cargo.toml b/callable_oracles/Cargo.toml index 77414cf78..18b405b59 100644 --- a/callable_oracles/Cargo.toml +++ b/callable_oracles/Cargo.toml @@ -18,15 +18,11 @@ basic_system = { path = "../basic_system", default-features = false } basic_bootloader = { path = "../basic_bootloader", default-features = false } risc_v_simulator = { workspace = true, optional = true } -num-bigint = { version = "*", optional = true } -num-traits = { version = "*", optional = true } - -alloy-consensus = "1.0.41" c-kzg = "2.1.5" [dev-dependencies] -hex = "*" +hex = { workspace = true } [features] default = ["evaluate"] -evaluate = ["risc_v_simulator", "num-bigint", "num-traits"] +evaluate = ["risc_v_simulator"] diff --git a/crypto/Cargo.toml b/crypto/Cargo.toml index c959516d0..0500266b2 100644 --- a/crypto/Cargo.toml +++ b/crypto/Cargo.toml @@ -20,7 +20,7 @@ blake2s_u32 = { workspace = true, optional = true, default-features = false } ripemd = { version = "0.1", default-features = false } ruint = { workspace = true, default-features = false } -cfg-if = "1.0.4" +cfg-if = { workspace = true } const_for = "0.1.5" # zeroize = { version = "1", default-features = false, optional = true } @@ -34,11 +34,11 @@ ark-ec = { version = "0.5", default-features = false } ark-serialize = { version = "0.5", default-features = false } ark-bn254 = { version = "0.5", default-features = false, features = ["curve", "scalar_field"] } ark-bls12-381 = { version = "0.5", default-features = false, features = ["curve", "scalar_field"] } -num-bigint = { version = "0.4", default-features = false } +num-bigint = { workspace = true, default-features = false } zeroize = { version = "1", default-features = false } itertools = { version = "0.14.0", default-features = false } educe = { version = "0.6.0", default-features = false } -num-traits = { version = "0.2", default-features = false } +num-traits = { workspace = true, default-features = false } # ark-ff = { path = "../../git_copies/algebra/ff", default-features = false } # ark-ec = { path = "../../git_copies/algebra/ec", default-features = false } @@ -52,10 +52,10 @@ risc_v_simulator = { workspace = true, features = ["delegation"] } # blake2s_u32 = {path = "../../zksync-airbender/blake2s_u32", optional = true, default-features = false} ark-std = { version = "0.5" } zeroize = { version = "1", default-features = false } -num-traits = { version = "0.2", default-features = false } -num-bigint = { version = "0.4", default-features = false } -num-integer = { version = "0.1", default-features = false } -proptest = "1.0.0" +num-traits = { workspace = true, default-features = false } +num-bigint = { workspace = true, default-features = false } +num-integer = { workspace = true, default-features = false } +proptest = { workspace = true } hex-literal = "0.4.1" ark-test-curves = { version = "0.5", features = ["secp256k1", "bls12_381_curve"] } rand_core = { version = "0.6.4", features = ["getrandom"] } @@ -74,4 +74,4 @@ alloc = [] testing = [] [lints.rust] -unexpected_cfgs = { level = "warn", check-cfg = ["cfg(fuzzing)"] } \ No newline at end of file +unexpected_cfgs = { level = "warn", check-cfg = ["cfg(fuzzing)"] } diff --git a/evm_interpreter/Cargo.toml b/evm_interpreter/Cargo.toml index cd072a31c..cb6802b76 100644 --- a/evm_interpreter/Cargo.toml +++ b/evm_interpreter/Cargo.toml @@ -16,10 +16,10 @@ ruint = { workspace = true, default-features = false } arrayvec = { workspace = true, default-features = false } zk_ee = { path = "../zk_ee", default-features = false } crypto = { path = "../crypto", default-features = false } -either = { version = "*", default-features = false } +either = { workspace = true, default-features = false } cycle_marker = { path = "../cycle_marker" } -strum_macros = "0.27.1" -paste = "1.0.15" +strum_macros = { workspace = true } +paste = { workspace = true } [features] point_eval_precompile = [] diff --git a/forward_system/Cargo.toml b/forward_system/Cargo.toml index 0ce1589be..6110a8415 100644 --- a/forward_system/Cargo.toml +++ b/forward_system/Cargo.toml @@ -21,20 +21,19 @@ evm_interpreter = { path = "../evm_interpreter", default-features = false } basic_system = { path = "../basic_system", default-features = false } basic_bootloader = { path = "../basic_bootloader", default-features = false } zksync_os_evm_errors = { workspace = true, default-features = false } -zksync_os_interface = { workspace = true, default-features = false } +zksync_os_interface = { workspace = true } system_hooks = { path = "../system_hooks", default-features = false } crypto = { path = "../crypto", default-features = false } ruint = { workspace = true, default-features = false } -arrayvec = { workspace = true, default-features = false } serde = { workspace = true, default-features = false, features = ["derive", "alloc"] } -alloy = { version = "1", default-features = false, features = ["consensus"] } -hex = { version = "*" } +alloy = { workspace = true, features = ["consensus"] } +hex = { workspace = true } bincode = "1.3" -strum_macros = "0.27.1" -paste = "1.0.15" +strum_macros = { workspace = true } +paste = { workspace = true } [features] testing = ["zk_ee/testing", "evm_interpreter/testing", "basic_system/testing", "basic_bootloader/testing"] diff --git a/proof_running_system/Cargo.toml b/proof_running_system/Cargo.toml index 34686aa9d..fd4a287ed 100644 --- a/proof_running_system/Cargo.toml +++ b/proof_running_system/Cargo.toml @@ -18,17 +18,13 @@ basic_system = { path = "../basic_system", default-features = false } system_hooks = { path = "../system_hooks", default-features = false } basic_bootloader = { path = "../basic_bootloader", default-features = false } ruint = { workspace = true, default-features = false } -arrayvec = { workspace = true, default-features = false } crypto = { path = "../crypto", default-features = false } -cfg-if = "*" -cc-traits = { version = "*", default-features = false } -seq-macro = { version = "*", default-features = false } -talc = { version = "*", default-features = false, features = ["allocator", "nightly_api"]} -lock_api = "0.4.11" +cfg-if = { workspace = true } +talc = { version = "4.4.3", default-features = false, features = ["allocator", "nightly_api"]} # talc = { path = "../../talc", default-features = false, features = ["allocator", "nightly_api"]} [dev-dependencies] -hex = "*" +hex = { workspace = true } fastrand = "2.0.2" [features] @@ -60,4 +56,3 @@ eth_stf = ["basic_bootloader/eip-7702","basic_bootloader/eip_7623", "evm_interpr # Features used for evm_tester evm_tester = ["basic_bootloader/resources_for_tester", "basic_bootloader/disable_system_contracts", "zk_ee/prevrandao", "state-diffs-pi", "basic_bootloader/eip-7702", "system_hooks/p256_precompile", "basic_bootloader/burn_base_fee", "system_hooks/mock-unsupported-precompiles", "unlimited_native", "basic_bootloader/eip-4844"] - diff --git a/storage_models/Cargo.toml b/storage_models/Cargo.toml index e7d65ad1f..e9930d160 100644 --- a/storage_models/Cargo.toml +++ b/storage_models/Cargo.toml @@ -11,7 +11,6 @@ categories.workspace = true [dependencies] zk_ee = { path = "../zk_ee", default-features = false } -crypto = { path = "../crypto", default-features = false } [features] testing = ["zk_ee/testing"] diff --git a/supporting_crates/modexp/Cargo.toml b/supporting_crates/modexp/Cargo.toml index ce5adb3d4..d15b22e8e 100644 --- a/supporting_crates/modexp/Cargo.toml +++ b/supporting_crates/modexp/Cargo.toml @@ -10,10 +10,8 @@ keywords.workspace = true categories.workspace = true [dev-dependencies] -hex = {version = "*"} -num-bigint = "0.4" -num-integer = "*" +hex = { workspace = true } +num-bigint = { workspace = true, default-features = true } +num-integer = { workspace = true, default-features = true } [features] - - diff --git a/supporting_crates/solidity_abi/Cargo.toml b/supporting_crates/solidity_abi/Cargo.toml index 22c002d47..47b2e94b1 100644 --- a/supporting_crates/solidity_abi/Cargo.toml +++ b/supporting_crates/solidity_abi/Cargo.toml @@ -15,4 +15,4 @@ solidity_abi_derive = { path = "../solidity_abi_derive"} const_keccak256 = { path = "../keccak"} [dev-dependencies] -hex = "*" +hex = { workspace = true } diff --git a/supporting_crates/u256/Cargo.toml b/supporting_crates/u256/Cargo.toml index 2f2d59a64..48cd50648 100644 --- a/supporting_crates/u256/Cargo.toml +++ b/supporting_crates/u256/Cargo.toml @@ -19,4 +19,4 @@ serde = ["ruint/serde", "delegated_u256/serde"] delegation = [] [dev-dependencies] -proptest = "1.7.0" +proptest = { workspace = true } diff --git a/system_hooks/Cargo.toml b/system_hooks/Cargo.toml index 9fe425675..803f317e9 100644 --- a/system_hooks/Cargo.toml +++ b/system_hooks/Cargo.toml @@ -16,8 +16,8 @@ arrayvec = { workspace = true, default-features = false } evm_interpreter = { path = "../evm_interpreter", default-features = false } cycle_marker = { path = "../cycle_marker" } -strum_macros = "0.27.1" -paste = "1.0.15" +strum_macros = { workspace = true } +paste = { workspace = true } [features] point_eval_precompile = ["evm_interpreter/point_eval_precompile"] diff --git a/tests/common/Cargo.toml b/tests/common/Cargo.toml index 1085bbeff..7ffdad9cd 100644 --- a/tests/common/Cargo.toml +++ b/tests/common/Cargo.toml @@ -10,10 +10,9 @@ keywords.workspace = true categories.workspace = true [dependencies] -alloy = { version = "1", default-features = false, features = [ +alloy = { workspace = true, features = [ "serde", "serde-bincode-compat", ] } -ruint = { workspace = true, default-features = false } -zksync_os_interface = { workspace = true, default-features = false } +zksync_os_interface = { workspace = true } diff --git a/tests/evm_tester/Cargo.lock b/tests/evm_tester/Cargo.lock index 059c76bd3..52e9a5ede 100644 --- a/tests/evm_tester/Cargo.lock +++ b/tests/evm_tester/Cargo.lock @@ -427,9 +427,9 @@ dependencies = [ [[package]] name = "alloy-rlp" -version = "0.3.12" +version = "0.3.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f70d83b765fdc080dbcd4f4db70d8d23fe4761f2f02ebfa9146b833900634b4" +checksum = "e93e50f64a77ad9c5470bf2ad0ca02f228da70c792a8f06634801e202579f35e" dependencies = [ "alloy-rlp-derive", "arrayvec", @@ -438,9 +438,9 @@ dependencies = [ [[package]] name = "alloy-rlp-derive" -version = "0.3.12" +version = "0.3.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "64b728d511962dda67c1bc7ea7c03736ec275ed2cf4c35d9585298ac9ccf3b73" +checksum = "ce8849c74c9ca0f5a03da1c865e3eb6f768df816e67dd3721a398a8a7e398011" dependencies = [ "proc-macro2", "quote", @@ -1192,12 +1192,6 @@ dependencies = [ "rand 0.8.5", ] -[[package]] -name = "arraydeque" -version = "0.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7d902e3d592a523def97af8f317b08ce16b7ab854c1985a0c671e6f15cebc236" - [[package]] name = "arrayvec" version = "0.7.6" @@ -1664,9 +1658,7 @@ version = "0.1.0" dependencies = [ "arrayvec", "cc-traits", - "cfg-if", "const-hex", - "const_for", "crypto", "cycle_marker", "either", @@ -1680,8 +1672,6 @@ dependencies = [ "serde", "storage_models", "strum_macros", - "system_hooks", - "zerocopy", "zk_ee", ] @@ -1753,9 +1743,6 @@ name = "bitflags" version = "2.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "812e12b5285cc515a9c72a5c1d3b6d46a19dac5acfef5265968c166106e31dd3" -dependencies = [ - "serde_core", -] [[package]] name = "bitvec" @@ -1903,13 +1890,10 @@ dependencies = [ name = "callable_oracles" version = "0.1.0" dependencies = [ - "alloy-consensus", "basic_bootloader", "basic_system", "c-kzg", "crypto", - "num-bigint", - "num-traits", "oracle_provider", "risc_v_simulator", "ruint", @@ -2660,43 +2644,22 @@ dependencies = [ "alloy", "anyhow", "basic_bootloader", - "basic_system", - "bincode", "colored", - "crypto", - "evm_interpreter", "forward_system", - "glob", "hex", "itertools 0.13.0", "lazy_static", "md5", - "num-bigint", - "once_cell", - "oracle_provider", - "parity-scale-codec-derive", "rayon", "regex", - "reqwest 0.11.27", "rig", - "risc_v_simulator", - "rlp", - "ron", "ruint", - "semver 1.0.23", "serde", "serde_json", "serde_yaml", - "serde_yml", - "sha3", "structopt", - "system_hooks", "web3", - "which", - "yaml-rust2", - "zerocopy", "zk_ee", - "zksync_os_runner", ] [[package]] @@ -2866,7 +2829,6 @@ name = "forward_system" version = "0.1.0" dependencies = [ "alloy", - "arrayvec", "basic_bootloader", "basic_system", "bincode", @@ -3156,15 +3118,6 @@ dependencies = [ "serde_core", ] -[[package]] -name = "hashlink" -version = "0.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7382cf6263419f2d8df38c55d7da83da5c18aef87fc7a7fc1fb1e344edfe14c1" -dependencies = [ - "hashbrown 0.15.5", -] - [[package]] name = "headers" version = "0.3.9" @@ -3246,15 +3199,6 @@ dependencies = [ "digest 0.10.7", ] -[[package]] -name = "home" -version = "0.5.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cc627f471c528ff0c4a49e1d5e60450c8f6461dd6d10ba9dcd3a61d3dff7728d" -dependencies = [ - "windows-sys 0.61.2", -] - [[package]] name = "http" version = "0.2.12" @@ -3882,22 +3826,6 @@ dependencies = [ "vcpkg", ] -[[package]] -name = "libyml" -version = "0.0.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3302702afa434ffa30847a83305f0a69d6abd74293b6554c18ec85c7ef30c980" -dependencies = [ - "anyhow", - "version_check", -] - -[[package]] -name = "linux-raw-sys" -version = "0.4.15" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d26c52dbd32dccf2d10cac7725f8eae5296885fb5703b261f7d0a0739ec807ab" - [[package]] name = "linux-raw-sys" version = "0.11.0" @@ -4060,7 +3988,6 @@ checksum = "a5e44f723f1133c9deac646763579fdb3ac745e418f2a7af9cd0c431da1f20b9" dependencies = [ "num-integer", "num-traits", - "serde", ] [[package]] @@ -5092,18 +5019,6 @@ dependencies = [ "rustc-hex", ] -[[package]] -name = "ron" -version = "0.8.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b91f7eff05f748767f183df4320a63d6936e9c6107d97c9e6bdd9784f4289c94" -dependencies = [ - "base64 0.21.7", - "bitflags 2.10.0", - "serde", - "serde_derive", -] - [[package]] name = "ruint" version = "1.16.0" @@ -5183,19 +5098,6 @@ dependencies = [ "semver 1.0.23", ] -[[package]] -name = "rustix" -version = "0.38.44" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fdb5bc1ae2baa591800df16c9ca78619bf65c0488b41b96ccec5d11220d8c154" -dependencies = [ - "bitflags 2.10.0", - "errno", - "libc", - "linux-raw-sys 0.4.15", - "windows-sys 0.59.0", -] - [[package]] name = "rustix" version = "1.1.2" @@ -5205,7 +5107,7 @@ dependencies = [ "bitflags 2.10.0", "errno", "libc", - "linux-raw-sys 0.11.0", + "linux-raw-sys", "windows-sys 0.61.2", ] @@ -5484,9 +5386,6 @@ name = "semver" version = "1.0.23" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "61697e0a1c7e512e84a621326239844a24d8207b4669b41bc18b32ea5cbf988b" -dependencies = [ - "serde", -] [[package]] name = "semver-parser" @@ -5617,21 +5516,6 @@ dependencies = [ "unsafe-libyaml", ] -[[package]] -name = "serde_yml" -version = "0.0.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "59e2dd588bf1597a252c3b920e0143eb99b0f76e4e082f4c92ce34fbc9e71ddd" -dependencies = [ - "indexmap 2.12.1", - "itoa", - "libyml", - "memchr", - "ryu", - "serde", - "version_check", -] - [[package]] name = "serdect" version = "0.2.0" @@ -5811,7 +5695,6 @@ checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f" name = "storage_models" version = "0.1.0" dependencies = [ - "crypto", "zk_ee", ] @@ -6004,7 +5887,7 @@ dependencies = [ "fastrand", "getrandom 0.3.4", "once_cell", - "rustix 1.1.2", + "rustix", "windows-sys 0.61.2", ] @@ -6848,18 +6731,6 @@ dependencies = [ "rustls-pki-types", ] -[[package]] -name = "which" -version = "6.0.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b4ee928febd44d98f2f459a4a79bd4d928591333a494a10a868418ac1b39cf1f" -dependencies = [ - "either", - "home", - "rustix 0.38.44", - "winsafe", -] - [[package]] name = "widestring" version = "1.2.1" @@ -6943,15 +6814,6 @@ dependencies = [ "windows-targets 0.52.6", ] -[[package]] -name = "windows-sys" -version = "0.59.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e38bc4d79ed67fd075bcc251a1c39b32a1776bbe92e5bef1f0bf1f8c531853b" -dependencies = [ - "windows-targets 0.52.6", -] - [[package]] name = "windows-sys" version = "0.60.2" @@ -7175,12 +7037,6 @@ dependencies = [ "windows-sys 0.48.0", ] -[[package]] -name = "winsafe" -version = "0.0.19" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d135d17ab770252ad95e9a872d365cf3090e3be864a34ab46f48555993efc904" - [[package]] name = "wit-bindgen" version = "0.46.0" @@ -7236,17 +7092,6 @@ version = "0.13.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "66fee0b777b0f5ac1c69bb06d361268faafa61cd4682ae064a171c16c433e9e4" -[[package]] -name = "yaml-rust2" -version = "0.10.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2462ea039c445496d8793d052e13787f2b90e750b833afee748e601c17621ed9" -dependencies = [ - "arraydeque", - "encoding_rs", - "hashlink", -] - [[package]] name = "yoke" version = "0.8.1" @@ -7387,12 +7232,10 @@ dependencies = [ "alloy-sol-types", "basic_bootloader", "basic_system", - "callable_oracles", "crypto", "evm_interpreter", "forward_system", "oracle_provider", - "risc_v_simulator", "ruint", "zk_ee", "zksync_os_interface", @@ -7432,6 +7275,5 @@ name = "zksync_os_tests_common" version = "0.1.0" dependencies = [ "alloy", - "ruint", "zksync_os_interface", ] diff --git a/tests/evm_tester/Cargo.toml b/tests/evm_tester/Cargo.toml index 759b51311..dad1b04d5 100644 --- a/tests/evm_tester/Cargo.toml +++ b/tests/evm_tester/Cargo.toml @@ -19,58 +19,29 @@ doctest = false [dependencies] structopt = { version = "=0.3.26", default-features = false } anyhow = "=1.0.89" -which = "=6.0.3" colored = "=2.1.0" serde = { version = "=1.0", features = ["derive"] } serde_json = { version = "=1.0", features = ["arbitrary_precision"] } serde_yaml = "=0.9.34" -serde_yml = "0.0.12" -yaml-rust2 = "*" -num-bigint = { version = "0.4", features = ["serde"] } md5 = "=0.7.0" hex = "=0.4.3" -sha3 = "=0.10.8" -ron = "=0.8.1" -rlp = "=0.5.2" regex = "=1.11.0" -glob = "=0.3.1" -semver = { version = "=1.0.23", features = ["serde"] } itertools = "=0.13.0" -once_cell = "*" rayon = "=1.11.0" lazy_static = "=1.5.0" -bincode = "=1.3.3" -parity-scale-codec-derive = "=3.6.12" ruint = {version = "=1.16", features = ["primitive-types"]} alloy = { version = "=1.0.31", features = ["full", "eip712", "consensus"]} zksync_os_forward_system = {package = "forward_system", path = "../../forward_system" } zk_ee = { package = "zk_ee", path = "../../zk_ee" } -zksync_os_evm_interpreter = { package = "evm_interpreter", path = "../../evm_interpreter" } -zksync_os_basic_system = { package = "basic_system", path = "../../basic_system" } zksync_os_basic_bootloader = { package = "basic_bootloader", path = "../../basic_bootloader" } -zksync_os_system_hooks = { package = "system_hooks", path = "../../system_hooks"} -zksync_os_oracle_provider = {package = "oracle_provider", path = "../../oracle_provider"} -zksync_os_runner = {package = "zksync_os_runner", path = "../../zksync_os_runner" } -zksync_os_crypto = { package = "crypto", path="../../crypto" } zksync_os_rig = { package = "rig", path="../../tests/rig", features = ["evm_tester"]} -risc_v_simulator = { git = "https://github.com/matter-labs/zksync-airbender", tag = "v0.5.2", features=["delegation", "opcode_stats"]} - -# zerocopy 0.8.29 introduced a compilation issue, remove this -# when the compilation issue is resolved -zerocopy = { version = "=0.8.28" } - [dependencies.web3] version = "=0.19.0" default-features = false features = ["http-rustls-tls", "test", "signing"] -[dependencies.reqwest] -version = "=0.11.27" -default-features = false -features = ["blocking"] - diff --git a/tests/fuzzer/Cargo.toml b/tests/fuzzer/Cargo.toml index 15a9f5194..7ef0194a6 100644 --- a/tests/fuzzer/Cargo.toml +++ b/tests/fuzzer/Cargo.toml @@ -7,4 +7,3 @@ edition = "2021" members = ["fuzz"] [dependencies] -ruint = { version = "1.16", default-features = false } \ No newline at end of file diff --git a/tests/fuzzer/fuzz/Cargo.toml b/tests/fuzzer/fuzz/Cargo.toml index 8a50bbf92..92683f1ea 100644 --- a/tests/fuzzer/fuzz/Cargo.toml +++ b/tests/fuzzer/fuzz/Cargo.toml @@ -45,9 +45,6 @@ ark-ec = "0.4" ark-bn254 = "0.4" p256 = { version = "0.13", features = ["ecdsa"] } c-kzg = { version = "2.1.5" } -# zerocopy 0.8.29 introduced a compilation issue, remove this -# when the compilation issue is resolved -zerocopy = { version = "=0.8.28" } [[bin]] name = "ripemd160" diff --git a/tests/fuzzer/fuzz/wrappers/basic_system_forward/Cargo.toml b/tests/fuzzer/fuzz/wrappers/basic_system_forward/Cargo.toml index 764edbc98..77ee4618c 100644 --- a/tests/fuzzer/fuzz/wrappers/basic_system_forward/Cargo.toml +++ b/tests/fuzzer/fuzz/wrappers/basic_system_forward/Cargo.toml @@ -25,12 +25,7 @@ modexp = { path = "../../../../../supporting_crates/modexp" } cycle_marker = { path = "../../../../../cycle_marker" } num-bigint = { version = "*", optional = true} num-traits = { version = "*", optional = true} -system_hooks = { package = "system_hooks_forward", path = "../system_hooks_forward" } cc-traits = { path = "../../../../../basic_system/src/system_implementation/ethereum_storage_model/supporting_crates/cc-traits" } - - -cfg-if = "1.0.0" -const_for = "0.1.5" const-hex = { version = "1", default-features = false } rand = {version = "0.9.0", optional = true} diff --git a/tests/fuzzer/fuzz/wrappers/basic_system_proving/Cargo.toml b/tests/fuzzer/fuzz/wrappers/basic_system_proving/Cargo.toml index 969431390..1d5ccf6c1 100644 --- a/tests/fuzzer/fuzz/wrappers/basic_system_proving/Cargo.toml +++ b/tests/fuzzer/fuzz/wrappers/basic_system_proving/Cargo.toml @@ -25,12 +25,7 @@ modexp = { path = "../../../../../supporting_crates/modexp" } cycle_marker = { path = "../../../../../cycle_marker" } num-bigint = { version = "*", optional = true} num-traits = { version = "*", optional = true} -system_hooks = { package = "system_hooks_proving", path = "../system_hooks_proving" } cc-traits = { path = "../../../../../basic_system/src/system_implementation/ethereum_storage_model/supporting_crates/cc-traits" } - - -cfg-if = "1.0.0" -const_for = "0.1.5" const-hex = { version = "1", default-features = false } rand = {version = "0.9.0", optional = true} diff --git a/tests/fuzzer/fuzz/wrappers/evm_interpreter_forward/Cargo.toml b/tests/fuzzer/fuzz/wrappers/evm_interpreter_forward/Cargo.toml index de35fe365..4d05e8d20 100644 --- a/tests/fuzzer/fuzz/wrappers/evm_interpreter_forward/Cargo.toml +++ b/tests/fuzzer/fuzz/wrappers/evm_interpreter_forward/Cargo.toml @@ -21,6 +21,7 @@ zk_ee = { package = "zk_ee_forward", path = "../zk_ee_forward" } crypto = { package = "crypto_forward", path = "../crypto_forward", default-features = false } arrayvec = { version = "0.7.4", default-features = false } either = { version = "*", default-features = false } + cycle_marker = { path = "../../../../../cycle_marker" } strum_macros = "0.27.1" paste = "1.0.15" diff --git a/tests/fuzzer/fuzz/wrappers/evm_interpreter_proving/Cargo.toml b/tests/fuzzer/fuzz/wrappers/evm_interpreter_proving/Cargo.toml index fe66d8a10..26c78b80e 100644 --- a/tests/fuzzer/fuzz/wrappers/evm_interpreter_proving/Cargo.toml +++ b/tests/fuzzer/fuzz/wrappers/evm_interpreter_proving/Cargo.toml @@ -21,6 +21,7 @@ zk_ee = { package = "zk_ee_proving", path = "../zk_ee_proving" } crypto = { package = "crypto_proving", path = "../crypto_proving", default-features = false } arrayvec = { version = "0.7.4", default-features = false } either = { version = "*", default-features = false } + cycle_marker = { path = "../../../../../cycle_marker" } strum_macros = "0.27.1" paste = "1.0.15" diff --git a/tests/fuzzer/fuzz/wrappers/fuzz_precompiles_proving/Cargo.toml b/tests/fuzzer/fuzz/wrappers/fuzz_precompiles_proving/Cargo.toml index 645fcbfda..fd02440f2 100644 --- a/tests/fuzzer/fuzz/wrappers/fuzz_precompiles_proving/Cargo.toml +++ b/tests/fuzzer/fuzz/wrappers/fuzz_precompiles_proving/Cargo.toml @@ -6,4 +6,3 @@ edition = "2021" [dependencies] basic_system = { package = "basic_system_proving", path = "../basic_system_proving", features = ["proving"]} zk_ee = { package = "zk_ee_proving", path = "../zk_ee_proving" } -crypto = { package = "crypto_proving", path = "../crypto_proving", features = ["proving"]} \ No newline at end of file diff --git a/tests/fuzzer/fuzz/wrappers/storage_models_forward/Cargo.toml b/tests/fuzzer/fuzz/wrappers/storage_models_forward/Cargo.toml index 8f564331e..c4261fcd6 100644 --- a/tests/fuzzer/fuzz/wrappers/storage_models_forward/Cargo.toml +++ b/tests/fuzzer/fuzz/wrappers/storage_models_forward/Cargo.toml @@ -15,7 +15,6 @@ path = "../../../../../storage_models/src/lib.rs" [dependencies] zk_ee = { package = "zk_ee_forward", path = "../zk_ee_forward" } -crypto = { package = "crypto_forward", path = "../crypto_forward", default-features = false } [features] testing = ["zk_ee/testing"] diff --git a/tests/fuzzer/fuzz/wrappers/storage_models_proving/Cargo.toml b/tests/fuzzer/fuzz/wrappers/storage_models_proving/Cargo.toml index b382c5629..67ddfeab5 100644 --- a/tests/fuzzer/fuzz/wrappers/storage_models_proving/Cargo.toml +++ b/tests/fuzzer/fuzz/wrappers/storage_models_proving/Cargo.toml @@ -15,7 +15,6 @@ path = "../../../../../storage_models/src/lib.rs" [dependencies] zk_ee = { package = "zk_ee_proving", path = "../zk_ee_proving" } -crypto = { package = "crypto_proving", path = "../crypto_proving", default-features = false } [features] testing = ["zk_ee/testing"] diff --git a/tests/fuzzer/fuzz/wrappers/zk_ee_forward/Cargo.toml b/tests/fuzzer/fuzz/wrappers/zk_ee_forward/Cargo.toml index af4a7ae4e..3962cbac3 100644 --- a/tests/fuzzer/fuzz/wrappers/zk_ee_forward/Cargo.toml +++ b/tests/fuzzer/fuzz/wrappers/zk_ee_forward/Cargo.toml @@ -22,9 +22,10 @@ crypto = { package = "crypto_forward", path = "../crypto_forward", default-featu arrayvec = { version = "0.7.4", default-features = false } bitflags = { version = "2.6.0", default-features = false } serde = { version = "1.0", default-features = false, features = ["derive", "alloc"], optional = true } -cycle_marker = { path = "../../../../../cycle_marker" } strum_macros = "0.27.1" paste = "1.0.15" + +cycle_marker = { path = "../../../../../cycle_marker" } zksync_os_evm_errors = { version = "0.0.8", default-features = false } [features] diff --git a/tests/fuzzer/fuzz/wrappers/zk_ee_proving/Cargo.toml b/tests/fuzzer/fuzz/wrappers/zk_ee_proving/Cargo.toml index abc95bfd1..bf901f4a8 100644 --- a/tests/fuzzer/fuzz/wrappers/zk_ee_proving/Cargo.toml +++ b/tests/fuzzer/fuzz/wrappers/zk_ee_proving/Cargo.toml @@ -22,9 +22,10 @@ crypto = { package = "crypto_proving", path = "../crypto_proving", default-featu arrayvec = { version = "0.7.4", default-features = false } bitflags = { version = "2.6.0", default-features = false } serde = { version = "1.0", default-features = false, features = ["derive", "alloc"], optional = true } -cycle_marker = { path = "../../../../../cycle_marker" } strum_macros = "0.27.1" paste = "1.0.15" + +cycle_marker = { path = "../../../../../cycle_marker" } zksync_os_evm_errors = { version = "0.0.8", default-features = false } [features] diff --git a/tests/instances/eth_runner/Cargo.lock b/tests/instances/eth_runner/Cargo.lock index c7bd009bb..838cdffa4 100644 --- a/tests/instances/eth_runner/Cargo.lock +++ b/tests/instances/eth_runner/Cargo.lock @@ -431,9 +431,9 @@ dependencies = [ [[package]] name = "alloy-rlp" -version = "0.3.12" +version = "0.3.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f70d83b765fdc080dbcd4f4db70d8d23fe4761f2f02ebfa9146b833900634b4" +checksum = "e93e50f64a77ad9c5470bf2ad0ca02f228da70c792a8f06634801e202579f35e" dependencies = [ "alloy-rlp-derive", "arrayvec", @@ -442,9 +442,9 @@ dependencies = [ [[package]] name = "alloy-rlp-derive" -version = "0.3.12" +version = "0.3.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "64b728d511962dda67c1bc7ea7c03736ec275ed2cf4c35d9585298ac9ccf3b73" +checksum = "ce8849c74c9ca0f5a03da1c865e3eb6f768df816e67dd3721a398a8a7e398011" dependencies = [ "proc-macro2", "quote", @@ -1701,9 +1701,7 @@ version = "0.1.0" dependencies = [ "arrayvec", "cc-traits", - "cfg-if", "const-hex", - "const_for", "crypto", "cycle_marker", "either", @@ -1717,8 +1715,6 @@ dependencies = [ "serde", "storage_models", "strum_macros", - "system_hooks", - "zerocopy", "zk_ee", ] @@ -1957,13 +1953,10 @@ dependencies = [ name = "callable_oracles" version = "0.1.0" dependencies = [ - "alloy-consensus", "basic_bootloader", "basic_system", "c-kzg", "crypto", - "num-bigint", - "num-traits", "oracle_provider", "risc_v_simulator", "ruint", @@ -2821,7 +2814,6 @@ version = "0.1.0" dependencies = [ "alloy", "alloy-rpc-types-debug", - "alloy-rpc-types-eth", "anyhow", "basic_system", "bincode 2.0.1", @@ -2832,11 +2824,8 @@ dependencies = [ "ruint", "serde", "serde_json", - "serde_with", "sled", - "system_hooks", "ureq", - "zerocopy", "zk_ee", "zstd", ] @@ -3068,7 +3057,6 @@ name = "forward_system" version = "0.1.0" dependencies = [ "alloy", - "arrayvec", "basic_bootloader", "basic_system", "bincode 1.3.3", @@ -5998,7 +5986,6 @@ checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f" name = "storage_models" version = "0.1.0" dependencies = [ - "crypto", "zk_ee", ] @@ -7509,12 +7496,10 @@ dependencies = [ "alloy-sol-types", "basic_bootloader", "basic_system", - "callable_oracles", "crypto", "evm_interpreter", "forward_system", "oracle_provider", - "risc_v_simulator", "ruint", "zk_ee", "zksync_os_interface", @@ -7554,7 +7539,6 @@ name = "zksync_os_tests_common" version = "0.1.0" dependencies = [ "alloy", - "ruint", "zksync_os_interface", ] diff --git a/tests/instances/eth_runner/Cargo.toml b/tests/instances/eth_runner/Cargo.toml index 53b436c0c..d4fc4227a 100644 --- a/tests/instances/eth_runner/Cargo.toml +++ b/tests/instances/eth_runner/Cargo.toml @@ -14,25 +14,19 @@ serde = { version = "1.0", features = ["derive"] } ruint = { version = "1.16", default-features = false } alloy = { version = "1", features = ["full", "ssz"]} -alloy-rpc-types-eth = { version = "*", features = ["serde"] } serde_json = { version = "1.0", features = ["unbounded_depth"] } rig = { path = "../../rig", features = ["eth_runner"]} zk_ee = { path = "../../../zk_ee" } basic_system = { path = "../../../basic_system" } -system_hooks = {path = "../../../system_hooks" } clap = { version = "4.4", features = ["derive"] } anyhow = "=1.0.89" ureq = { version = "3", features = ["json", "gzip"] } sled = {version = "0.34" } bincode = { version = "2", features = ["serde"] } alloy-rpc-types-debug = { version = "*", default-features = false } -serde_with = "3.13.0" csv = "1.3" reqwest = { version = "0.12", features = ["json", "blocking", "rustls-tls"] } zstd = "0.13" -# zerocopy 0.8.29 introduced a compilation issue, remove this -# when the compilation issue is resolved -zerocopy = { version = "=0.8.28" } [features] simulate_witness_gen = ["rig/simulate_witness_gen"] diff --git a/tests/instances/evm/Cargo.toml b/tests/instances/evm/Cargo.toml index 0142b2151..1040dffa3 100644 --- a/tests/instances/evm/Cargo.toml +++ b/tests/instances/evm/Cargo.toml @@ -11,8 +11,8 @@ categories.workspace = true [dependencies] rig = { path = "../../rig", features = ["for_tests"] } -hex = "*" -alloy-sol-types = "1.4.0" +hex = { workspace = true } +alloy-sol-types = { workspace = true } [features] e2e_proving = ["rig/e2e_proving"] diff --git a/tests/instances/forge_tests/Cargo.toml b/tests/instances/forge_tests/Cargo.toml index 3eb8f1181..fe1c9fe52 100644 --- a/tests/instances/forge_tests/Cargo.toml +++ b/tests/instances/forge_tests/Cargo.toml @@ -12,4 +12,4 @@ categories.workspace = true [dependencies] rig = { path = "../../rig", features = ["for_tests"] } zk_ee = { path = "../../../zk_ee" } -hex = "*" +hex = { workspace = true } diff --git a/tests/instances/header/Cargo.toml b/tests/instances/header/Cargo.toml index e8eb4dcc1..139f66660 100644 --- a/tests/instances/header/Cargo.toml +++ b/tests/instances/header/Cargo.toml @@ -11,7 +11,6 @@ categories.workspace = true [dependencies] rig = { path = "../../rig", features = ["for_tests"] } -hex = "*" basic_bootloader = { path = "../../../basic_bootloader" } [features] diff --git a/tests/instances/multiblock_batch/Cargo.toml b/tests/instances/multiblock_batch/Cargo.toml index 89964898f..0e3c8f01d 100644 --- a/tests/instances/multiblock_batch/Cargo.toml +++ b/tests/instances/multiblock_batch/Cargo.toml @@ -13,7 +13,7 @@ categories.workspace = true rig = { path = "../../rig", features = ["for_tests"] } zksync_os_runner = { path = "../../../zksync_os_runner"} risc_v_simulator = { workspace = true } -hex = "*" +hex = { workspace = true } [features] e2e_proving = ["rig/e2e_proving"] diff --git a/tests/instances/precompiles/Cargo.toml b/tests/instances/precompiles/Cargo.toml index 26c95e2d2..78b54d2a5 100644 --- a/tests/instances/precompiles/Cargo.toml +++ b/tests/instances/precompiles/Cargo.toml @@ -12,7 +12,7 @@ categories.workspace = true [dependencies] rig = { path = "../../rig", features = ["for_tests"] } zksync_os_tests_common = { path = "../../common" } -hex = "*" +hex = { workspace = true } cycle_marker = { path = "../../../cycle_marker" } [features] diff --git a/tests/instances/system_hooks/Cargo.toml b/tests/instances/system_hooks/Cargo.toml index 4c78f0e2e..f16cbaac0 100644 --- a/tests/instances/system_hooks/Cargo.toml +++ b/tests/instances/system_hooks/Cargo.toml @@ -11,9 +11,8 @@ categories.workspace = true [dependencies] rig = { path = "../../rig", features = ["for_tests"] } -zksync_os_tests_common = { path = "../../common" } -hex = "*" -alloy-sol-types = "1.4.0" +hex = { workspace = true } +alloy-sol-types = { workspace = true } [features] e2e_proving = ["rig/e2e_proving"] diff --git a/tests/instances/transactions/Cargo.toml b/tests/instances/transactions/Cargo.toml index 0c937de76..8a9ae50b4 100644 --- a/tests/instances/transactions/Cargo.toml +++ b/tests/instances/transactions/Cargo.toml @@ -12,7 +12,7 @@ categories.workspace = true [dependencies] rig = { path = "../../rig", features = ["for_tests"] } zksync_os_tests_common = { path = "../../common" } -hex = "*" +hex = { workspace = true } [features] e2e_proving = ["rig/e2e_proving"] diff --git a/tests/instances/unit/Cargo.toml b/tests/instances/unit/Cargo.toml index 665e386fe..5526603f9 100644 --- a/tests/instances/unit/Cargo.toml +++ b/tests/instances/unit/Cargo.toml @@ -12,7 +12,7 @@ categories.workspace = true [dependencies] rig = { path = "../../rig", features = ["for_tests"] } zksync_os_tests_common = { path = "../../common" } -hex = "*" +hex = { workspace = true } [features] e2e_proving = ["rig/e2e_proving"] diff --git a/tests/rig/Cargo.toml b/tests/rig/Cargo.toml index 4a387f0d0..95996915d 100644 --- a/tests/rig/Cargo.toml +++ b/tests/rig/Cargo.toml @@ -23,7 +23,7 @@ system_hooks = { path = "../../system_hooks"} crypto = { path = "../../crypto" } cycle_marker = { path = "../../cycle_marker", optional = true } zksync_os_api = { path = "../../api" } -zksync_os_interface = { workspace = true, default-features = false } +zksync_os_interface = { workspace = true } cli = { workspace = true, optional = true } prover_examples = { workspace = true, optional = true} gpu_prover = { workspace = true, optional = true } @@ -31,13 +31,13 @@ gpu_prover = { workspace = true, optional = true } zksync_os_tests_common = { path = "../common" } ruint = { workspace = true, default-features = false } -env_logger = "0.11.6" -log = "0.4.22" -alloy = { version = "1", features = ["full", "eip712", "consensus"]} -alloy-rlp = { version = "0.3.12" } -alloy-sol-types = "1" -alloy-rpc-types-debug = { version = "*", default-features = false } -once_cell = "1.20.3" +env_logger = { workspace = true } +log = { workspace = true } +alloy = { workspace = true, features = ["full", "eip712", "consensus"] } +alloy-rlp = { workspace = true } +alloy-sol-types = { workspace = true } +alloy-rpc-types-debug = { workspace = true } +once_cell = { workspace = true } [features] default = ["testing", "risc_v_simulator/delegation"] @@ -61,5 +61,3 @@ evm_tester = ["forward_system/evm_tester"] # Features used for legacy evm_tester. Only defined in forward system, # as the legacy evm_tester does not perform a proof run. evm_tester_legacy = ["forward_system/evm_tester_legacy"] - - diff --git a/zk_ee/Cargo.toml b/zk_ee/Cargo.toml index abf3910b4..0dfae3aa2 100644 --- a/zk_ee/Cargo.toml +++ b/zk_ee/Cargo.toml @@ -16,12 +16,12 @@ ruint = { workspace = true, default-features = false } arrayvec = { workspace = true, default-features = false } serde = { workspace = true, default-features = false, features = ["derive"], optional = true } -cfg-if = "*" +cfg-if = { workspace = true } crypto = { path = "../crypto", default-features = false } bitflags = { version = "2.6.0", default-features = false } cycle_marker = { path = "../cycle_marker" } -strum_macros = "0.27.1" -paste = "1.0.15" +strum_macros = { workspace = true } +paste = { workspace = true } [features] # serde derivation has to be disabled for risc-v target until we update ruint version diff --git a/zksync_os/Cargo.toml b/zksync_os/Cargo.toml index 077b5ee20..06a10c413 100644 --- a/zksync_os/Cargo.toml +++ b/zksync_os/Cargo.toml @@ -12,15 +12,10 @@ categories = ["cryptography"] # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html [dependencies] -riscv = "0.11" heapless = { version = "*", default-features = false } proof_running_system = { path = "../proof_running_system", default-features = false} crypto = { path = "../crypto", optional = true } riscv_common = {git = "https://github.com/matter-labs/zksync-airbender.git", tag = "v0.5.2", features = ["custom_panic", "custom_allocator"]} -#riscv_common = {path = "../../zksync-airbender/riscv_common" , features = ["custom_panic", "custom_allocator"]} -# zerocopy 0.8.29 introduced a compilation issue, remove this -# when the compilation issue is resolved -zerocopy = { version = "=0.8.28" } [profile.dev] opt-level = 0