Skip to content

chore: Deps cleanup #534

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
0xVolosnikov merged 7 commits into from
Feb 26, 2026
Merged

chore: Deps cleanup #534

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
9f54ee2
Unify deps
0xVolosnikov Feb 25, 2026
1b5341e
Continue cleanup
0xVolosnikov Feb 25, 2026
fbfb339
Run cargo machete
0xVolosnikov Feb 25, 2026
2ced13e
Fix fuzzer compilation
0xVolosnikov Feb 25, 2026
56428c5
Use high-performance runners for heavy CI jobs
0xVolosnikov Feb 25, 2026
9d5297b
Fix fuzzer compilation
0xVolosnikov Feb 25, 2026
60c82b4
Use matterlabs-ci-runner-highmem for benchmarks
0xVolosnikov Feb 25, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/bench.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
24 changes: 21 additions & 3 deletions Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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" }
Expand All @@ -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
Expand Down Expand Up @@ -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" }

8 changes: 2 additions & 6 deletions api/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"]
14 changes: 7 additions & 7 deletions basic_bootloader/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"]
Expand Down
36 changes: 15 additions & 21 deletions basic_system/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"]
Expand All @@ -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" }

Expand Down
8 changes: 2 additions & 6 deletions callable_oracles/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"]
16 changes: 8 additions & 8 deletions crypto/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 }
Expand All @@ -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 }
Expand All @@ -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"] }
Expand All @@ -74,4 +74,4 @@ alloc = []
testing = []

[lints.rust]
unexpected_cfgs = { level = "warn", check-cfg = ["cfg(fuzzing)"] }
unexpected_cfgs = { level = "warn", check-cfg = ["cfg(fuzzing)"] }
6 changes: 3 additions & 3 deletions evm_interpreter/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 = []
Expand Down
11 changes: 5 additions & 6 deletions forward_system/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"]
Expand Down
11 changes: 3 additions & 8 deletions proof_running_system/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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]
Expand Down Expand Up @@ -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"]

1 change: 0 additions & 1 deletion storage_models/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"]
8 changes: 3 additions & 5 deletions supporting_crates/modexp/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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]


2 changes: 1 addition & 1 deletion supporting_crates/solidity_abi/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,4 +15,4 @@ solidity_abi_derive = { path = "../solidity_abi_derive"}
const_keccak256 = { path = "../keccak"}

[dev-dependencies]
hex = "*"
hex = { workspace = true }
2 changes: 1 addition & 1 deletion supporting_crates/u256/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,4 +19,4 @@ serde = ["ruint/serde", "delegated_u256/serde"]
delegation = []

[dev-dependencies]
proptest = "1.7.0"
proptest = { workspace = true }
4 changes: 2 additions & 2 deletions system_hooks/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"]
Expand Down
5 changes: 2 additions & 3 deletions tests/common/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 }
Loading
Loading