Skip to content

Commit fc94276

Browse files
0xVolosnikov0xVolosnikov
authored
chore: Deps cleanup (#534)
## What ❔ Removing unused dependencies ## Why ❔ <!-- Why are these changes done? What goal do they contribute to? What are the principles behind them? --> <!-- The `Why` has to be clear to non-Matter Labs entities running their own ZK Chain --> <!-- Example: PR templates ensure PR reviewers, observers, and future iterators are in context about the evolution of repos. --> ## Is this a breaking change? - [ ] Yes - [ ] No ## Checklist <!-- Check your PR fulfills the following items. --> <!-- For draft PRs check the boxes as you complete them. --> - [ ] PR title corresponds to the body of PR (we generate changelog entries from PRs). - [ ] Tests for the changes have been added / updated. - [ ] Documentation comments have been added / updated. - [ ] Code has been formatted.
1 parent 762daa0 commit fc94276

File tree

43 files changed

+113
-350
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

43 files changed

+113
-350
lines changed

‎.github/workflows/bench.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ concurrency:
1717
jobs:
1818
vm-benchmarks:
1919
name: Run benchmarks
20-
runs-on: [matterlabs-ci-runner]
20+
runs-on: [matterlabs-ci-runner-highmem]
2121
permissions:
2222
contents: read
2323
pull-requests: write

‎.github/workflows/ci.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ jobs:
4646
run: cargo test --release -j 3
4747
crypto_test:
4848
name: crypto crate tests
49-
runs-on: [matterlabs-ci-runner]
49+
runs-on: [matterlabs-ci-runner-high-performance]
5050
steps:
5151
- uses: actions/checkout@v3
5252
- uses: actions-rust-lang/setup-rust-toolchain@v1

‎Cargo.toml‎

Lines changed: 21 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -60,10 +60,10 @@ categories = ["cryptography"]
6060

6161
[workspace.dependencies]
6262
zksync_os_evm_errors = { version = "0.0.13", default-features = false }
63-
zksync_os_interface = { version = "0.0.13"}
63+
zksync_os_interface = { version = "0.0.13", default-features = false }
6464

6565
risc_v_simulator = { git = "https://github.com/matter-labs/zksync-airbender", tag = "v0.5.2"}
66-
blake2s_u32 = { git = "https://github.com/matter-labs/zksync-airbender", tag = "v0.5.2"}
66+
blake2s_u32 = { git = "https://github.com/matter-labs/zksync-airbender", tag = "v0.5.2", default-features = false }
6767
prover_examples = { git = "https://github.com/matter-labs/zksync-airbender", tag = "v0.5.2"}
6868
execution_utils = { git = "https://github.com/matter-labs/zksync-airbender", tag = "v0.5.2"}
6969
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
7373
ruint = { version = "1.16", default-features = false }
7474
arrayvec = { version = "0.7", default-features = false }
7575
serde = { version = "1", default-features = false }
76+
hex = "0.4.3"
77+
paste = "1.0.15"
78+
strum_macros = "0.27.1"
79+
cfg-if = "1.0.4"
80+
either = { version = "1.15.0", default-features = false }
81+
num-bigint = { version = "0.4", default-features = false }
82+
num-traits = { version = "0.2", default-features = false }
83+
num-integer = { version = "0.1", default-features = false }
84+
proptest = "1.7.0"
85+
alloy = { version = "1", default-features = false }
86+
alloy-rlp = "0.3.13"
87+
alloy-sol-types = "1"
88+
alloy-primitives = "1"
89+
alloy-rpc-types-debug = { version = "1", default-features = false }
90+
reqwest = "0.12"
91+
serde_json = "1"
92+
log = "0.4.22"
93+
env_logger = "0.11.6"
94+
once_cell = "1.20.3"
7695

7796

7897
# zerocopy 0.8.29 introduced a compilation issue, remove this
@@ -105,4 +124,3 @@ debug = true
105124
# prover_examples = { path = "../zksync-airbender/circuit_defs/prover_examples" }
106125
# risc_v_simulator = { path = "../zksync-airbender/risc_v_simulator" }
107126
# execution_utils = { path = "../zksync-airbender/execution_utils" }
108-

‎api/Cargo.toml‎

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -13,20 +13,16 @@ categories.workspace = true
1313

1414
forward_system = { path = "../forward_system", default-features = false}
1515
oracle_provider = { path = "../oracle_provider" }
16-
callable_oracles = { path = "../callable_oracles/" }
1716
zksync_os_runner = { path = "../zksync_os_runner"}
18-
risc_v_simulator = { workspace = true }
1917
zk_ee = { path = "../zk_ee", default-features = false }
2018
crypto = { path = "../crypto", default-features = false }
2119
basic_system = { path = "../basic_system", default-features = false }
2220
basic_bootloader = { path = "../basic_bootloader", default-features = false }
2321
evm_interpreter = { path = "../evm_interpreter", default-features = false }
2422
ruint = { workspace = true, default-features = false }
25-
alloy = { version = "=1", default-features = false, features = ["eip712", "consensus", "rpc-types", "signer-local", "dyn-abi", "network"] }
23+
alloy = { workspace = true, features = ["eip712", "consensus", "rpc-types", "signer-local", "dyn-abi", "network"] }
2624
zksync_os_interface = { workspace = true }
27-
alloy-sol-types = "1"
25+
alloy-sol-types = { workspace = true }
2826

2927

3028
[features]
31-
# By default, use the risc_v_simulator with delegation (which is faster).
32-
default = ["risc_v_simulator/delegation"]

‎basic_bootloader/Cargo.toml‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -19,17 +19,17 @@ ruint = { workspace = true, default-features = false }
1919
arrayvec = { workspace = true, default-features = false }
2020
serde = { workspace = true, default-features = false, features = ["derive"], optional = true }
2121
crypto = { path = "../crypto", default-features = false }
22-
hex = {version = "*", optional = true}
23-
strum_macros = "0.27.1"
24-
paste = "1.0.15"
25-
cfg-if = "*"
22+
hex = { workspace = true, optional = true }
23+
strum_macros = { workspace = true }
24+
paste = { workspace = true }
25+
cfg-if = { workspace = true }
2626
serde-big-array = "0.5"
2727

2828

2929
[dev-dependencies]
30-
alloy = { version = "1", features = ["rlp", "full"] }
31-
alloy-rlp = { version = "*" }
32-
alloy-primitives = { version = "1", features = ["arbitrary"] }
30+
alloy = { workspace = true, features = ["rlp", "full"] }
31+
alloy-rlp = { workspace = true }
32+
alloy-primitives = { workspace = true, features = ["arbitrary"] }
3333

3434
[features]
3535
serde = ["dep:serde", "ruint/serde"]

‎basic_system/Cargo.toml‎

Lines changed: 15 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -16,24 +16,18 @@ ruint = { workspace = true, default-features = false, features = ["serde"] }
1616
arrayvec = { workspace = true, default-features = false }
1717
serde = { workspace = true, default-features = false, features = ["derive"], optional = true }
1818
crypto = { path = "../crypto", default-features = false, features = ["secp256k1-static-context"]}
19-
either = { version = "*", default-features = false }
19+
either = { workspace = true, default-features = false }
2020
storage_models = { path = "../storage_models", default-features = false }
2121
modexp = { path = "../supporting_crates/modexp" }
2222
cycle_marker = { path = "../cycle_marker" }
23-
num-bigint = { version = "0.4", optional = true}
24-
num-traits = { version = "*", optional = true}
25-
system_hooks = { path = "../system_hooks", default-features = false }
23+
num-bigint = { workspace = true, default-features = true, optional = true }
24+
num-traits = { workspace = true, default-features = true, optional = true }
2625
cc-traits = { path = "src/system_implementation/ethereum_storage_model/supporting_crates/cc-traits" }
27-
28-
cfg-if = "1.0.0"
29-
const_for = "0.1.5"
3026
const-hex = { version = "1", default-features = false }
3127

3228
rand = {version = "0.9.0", optional = true}
33-
strum_macros = "0.27.1"
34-
paste = "1.0.15"
35-
zerocopy = { workspace = true }
36-
29+
strum_macros = { workspace = true }
30+
paste = { workspace = true }
3731
[features]
3832
testing = ["zk_ee/testing", "evm_interpreter/testing", "serde", "ruint/serde", "rand", "crypto/testing", "num-bigint", "num-traits"]
3933
default = ["testing"]
@@ -45,18 +39,18 @@ multiblock-batch = []
4539
state-diffs-pi = []
4640

4741
[dev-dependencies]
48-
hex = {version = "0.4.3"}
49-
proptest = "1.6.0"
42+
hex = { workspace = true }
43+
proptest = { workspace = true }
5044
crypto = { path = "../crypto", default-features = false, features = ["secp256k1-static-context", "testing"]}
51-
num-bigint = "*"
52-
num-traits = "*"
45+
num-bigint = { workspace = true, default-features = true }
46+
num-traits = { workspace = true, default-features = true }
5347
arbitrary = { version = "1", features = ["derive"] }
54-
serde_json = "*"
55-
alloy-rpc-types-debug = { version = "*", default-features = false }
56-
alloy = { version = "1", features = ["rlp", "full"] }
57-
alloy-rlp = { version = "*" }
58-
alloy-primitives = { version = "1", features = ["arbitrary"] }
59-
reqwest = { version = "*", features = ["blocking", "json"] }
48+
serde_json = { workspace = true }
49+
alloy-rpc-types-debug = { workspace = true }
50+
alloy = { workspace = true, features = ["rlp", "full"] }
51+
alloy-rlp = { workspace = true }
52+
alloy-primitives = { workspace = true, features = ["arbitrary"] }
53+
reqwest = { workspace = true, features = ["blocking", "json"] }
6054
reth-trie-common = { git = "https://github.com/paradigmxyz/reth.git", tag = "v1.8.4" }
6155
reth-trie-sparse = { git = "https://github.com/paradigmxyz/reth.git", tag = "v1.8.4" }
6256

‎callable_oracles/Cargo.toml‎

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -18,15 +18,11 @@ basic_system = { path = "../basic_system", default-features = false }
1818
basic_bootloader = { path = "../basic_bootloader", default-features = false }
1919

2020
risc_v_simulator = { workspace = true, optional = true }
21-
num-bigint = { version = "*", optional = true }
22-
num-traits = { version = "*", optional = true }
23-
24-
alloy-consensus = "1.0.41"
2521
c-kzg = "2.1.5"
2622

2723
[dev-dependencies]
28-
hex = "*"
24+
hex = { workspace = true }
2925

3026
[features]
3127
default = ["evaluate"]
32-
evaluate = ["risc_v_simulator", "num-bigint", "num-traits"]
28+
evaluate = ["risc_v_simulator"]

‎crypto/Cargo.toml‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ blake2s_u32 = { workspace = true, optional = true, default-features = false }
2020
ripemd = { version = "0.1", default-features = false }
2121
ruint = { workspace = true, default-features = false }
2222

23-
cfg-if = "1.0.4"
23+
cfg-if = { workspace = true }
2424
const_for = "0.1.5"
2525

2626
# zeroize = { version = "1", default-features = false, optional = true }
@@ -34,11 +34,11 @@ ark-ec = { version = "0.5", default-features = false }
3434
ark-serialize = { version = "0.5", default-features = false }
3535
ark-bn254 = { version = "0.5", default-features = false, features = ["curve", "scalar_field"] }
3636
ark-bls12-381 = { version = "0.5", default-features = false, features = ["curve", "scalar_field"] }
37-
num-bigint = { version = "0.4", default-features = false }
37+
num-bigint = { workspace = true, default-features = false }
3838
zeroize = { version = "1", default-features = false }
3939
itertools = { version = "0.14.0", default-features = false }
4040
educe = { version = "0.6.0", default-features = false }
41-
num-traits = { version = "0.2", default-features = false }
41+
num-traits = { workspace = true, default-features = false }
4242

4343
# ark-ff = { path = "../../git_copies/algebra/ff", default-features = false }
4444
# ark-ec = { path = "../../git_copies/algebra/ec", default-features = false }
@@ -52,10 +52,10 @@ risc_v_simulator = { workspace = true, features = ["delegation"] }
5252
# blake2s_u32 = {path = "../../zksync-airbender/blake2s_u32", optional = true, default-features = false}
5353
ark-std = { version = "0.5" }
5454
zeroize = { version = "1", default-features = false }
55-
num-traits = { version = "0.2", default-features = false }
56-
num-bigint = { version = "0.4", default-features = false }
57-
num-integer = { version = "0.1", default-features = false }
58-
proptest = "1.0.0"
55+
num-traits = { workspace = true, default-features = false }
56+
num-bigint = { workspace = true, default-features = false }
57+
num-integer = { workspace = true, default-features = false }
58+
proptest = { workspace = true }
5959
hex-literal = "0.4.1"
6060
ark-test-curves = { version = "0.5", features = ["secp256k1", "bls12_381_curve"] }
6161
rand_core = { version = "0.6.4", features = ["getrandom"] }
@@ -74,4 +74,4 @@ alloc = []
7474
testing = []
7575

7676
[lints.rust]
77-
unexpected_cfgs = { level = "warn", check-cfg = ["cfg(fuzzing)"] }
77+
unexpected_cfgs = { level = "warn", check-cfg = ["cfg(fuzzing)"] }

‎evm_interpreter/Cargo.toml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,10 @@ ruint = { workspace = true, default-features = false }
1616
arrayvec = { workspace = true, default-features = false }
1717
zk_ee = { path = "../zk_ee", default-features = false }
1818
crypto = { path = "../crypto", default-features = false }
19-
either = { version = "*", default-features = false }
19+
either = { workspace = true, default-features = false }
2020
cycle_marker = { path = "../cycle_marker" }
21-
strum_macros = "0.27.1"
22-
paste = "1.0.15"
21+
strum_macros = { workspace = true }
22+
paste = { workspace = true }
2323

2424
[features]
2525
point_eval_precompile = []

‎forward_system/Cargo.toml‎

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -21,20 +21,19 @@ evm_interpreter = { path = "../evm_interpreter", default-features = false }
2121
basic_system = { path = "../basic_system", default-features = false }
2222
basic_bootloader = { path = "../basic_bootloader", default-features = false }
2323
zksync_os_evm_errors = { workspace = true, default-features = false }
24-
zksync_os_interface = { workspace = true, default-features = false }
24+
zksync_os_interface = { workspace = true }
2525
system_hooks = { path = "../system_hooks", default-features = false }
2626
crypto = { path = "../crypto", default-features = false }
2727

2828

2929
ruint = { workspace = true, default-features = false }
30-
arrayvec = { workspace = true, default-features = false }
3130
serde = { workspace = true, default-features = false, features = ["derive", "alloc"] }
3231

33-
alloy = { version = "1", default-features = false, features = ["consensus"] }
34-
hex = { version = "*" }
32+
alloy = { workspace = true, features = ["consensus"] }
33+
hex = { workspace = true }
3534
bincode = "1.3"
36-
strum_macros = "0.27.1"
37-
paste = "1.0.15"
35+
strum_macros = { workspace = true }
36+
paste = { workspace = true }
3837

3938
[features]
4039
testing = ["zk_ee/testing", "evm_interpreter/testing", "basic_system/testing", "basic_bootloader/testing"]

0 commit comments

Comments
 (0)