feat: Bump crypto dependencies (#40)

- Switches to recently published crypto packages (including the new ones) - Uses workspace deps for crypto packages - Some minor cleanup in `Cargo.toml` files.
matter-labs · Sep 6, 2024 · 407645f · 407645f
1 parent 83f5084
commit 407645f
Show file tree

Hide file tree

Showing 11 changed files with 37 additions and 15 deletions.
diff --git a/Cargo.toml b/Cargo.toml
@@ -27,3 +27,9 @@ zkevm_opcode_defs = { version = "=0.150.4", path = "crates/zkevm_opcode_defs" }
 zkevm_test_harness = { version = "=0.150.4", path = "crates/zkevm_test_harness" }
 zkevm-assembly = { version = "=0.150.4", path = "crates/zkEVM-assembly" }
 
+# `zksync-crypto` repository
+snark_wrapper = "=0.30.1"
+bellman = { package = "zksync_bellman", version = "=0.30.1" }
+boojum = "=0.30.1"
+cs_derive = { package = "zksync_cs_derive", version = "=0.30.1" }
+
diff --git a/crates/circuit_definitions/Cargo.toml b/crates/circuit_definitions/Cargo.toml
@@ -11,9 +11,11 @@ categories.workspace = true
 description = "ZKsync Era circuits definitions"
 
 [dependencies]
+# "Owned" dependencies
 circuit_encodings.workspace = true
-snark_wrapper = "=0.1.2"
+snark_wrapper.workspace = true
 
+# "External" dependencies
 derivative = "2.2"
 serde = {version = "1", features = ["derive"]}
 crossbeam = "0.8"

diff --git a/crates/circuit_encodings/Cargo.toml b/crates/circuit_encodings/Cargo.toml
@@ -11,9 +11,11 @@ categories.workspace = true
 description = "ZKsync Era circuits encodings"
 
 [dependencies]
+# "Owned" dependencies
 zkevm_circuits.workspace = true
 zk_evm.workspace = true
 
+# "External" dependencies
 derivative = "2.2"
 serde = {version = "1", features = ["derive"]}
 

diff --git a/crates/circuit_sequencer_api/Cargo.toml b/crates/circuit_sequencer_api/Cargo.toml
@@ -13,7 +13,7 @@ description = "ZKsync Era circuit API for sequencer"
 [dependencies]
 
 circuit_encodings.workspace = true
-bellman = { package = "bellman_ce", version = "=0.7.0" }
+bellman.workspace = true
 
 
 derivative = "2.2"

diff --git a/crates/kzg/Cargo.toml b/crates/kzg/Cargo.toml
@@ -13,7 +13,11 @@ description = "ZKsync Era KZG implementation"
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
+# "Owned" dependencies
+boojum.workspace = true
+zkevm_circuits.workspace = true
 
+# "External" dependencies
 derivative = "2.2"
 serde = {version = "1", features = ["derive"]}
 serde_json = "1.0"
@@ -22,9 +26,6 @@ hex = "0.4"
 once_cell = "1"
 serde_with = {version = "1", features = ["hex"]}
 
-boojum = "=0.2.2"
-zkevm_circuits.workspace = true
-
 [dev-dependencies]
 rand = "0.4"
 

diff --git a/crates/zkEVM-assembly/Cargo.toml b/crates/zkEVM-assembly/Cargo.toml
@@ -15,6 +15,10 @@ name = "reader"
 path = "src/reader/main.rs"
 
 [dependencies]
+# "Owned" dependencies
+zkevm_opcode_defs.workspace = true
+
+# "External" dependencies
 log = "0.4"
 env_logger = "0.9"
 structopt = { version = "0.3", default-features = false }
@@ -25,5 +29,4 @@ sha3 = "0.10.8"
 num-bigint = "0.4"
 num-traits = "0.2"
 lazy_static = "1.4"
-zkevm_opcode_defs.workspace = true
 smallvec = "1.13"
diff --git a/crates/zk_evm/Cargo.toml b/crates/zk_evm/Cargo.toml
@@ -11,12 +11,15 @@ categories.workspace = true
 description = "ZKsync out-of-circuit EraEVM implementation"
 
 [dependencies]
+# "Owned" dependencies
+zk_evm_abstractions.workspace = true
+
+# "External" dependencies
 serde = { version = "1", features = ["derive"] }
 serde_json = "1.0"
 anyhow = "1.0"
 num = { version = "0.4"}
 static_assertions = "1"
-zk_evm_abstractions.workspace = true
 lazy_static = "1.4"
 
 [dev-dependencies]

diff --git a/crates/zk_evm_abstractions/Cargo.toml b/crates/zk_evm_abstractions/Cargo.toml
@@ -11,13 +11,14 @@ categories.workspace = true
 description = "ZKsync EraVM abstractions"
 
 [dependencies]
+# "Owned" dependencies
+zkevm_opcode_defs.workspace = true
+
+# "External" dependencies
 anyhow = "1.0"
 serde = { version = "1", features = ["derive"] }
 static_assertions = "1"
 num_enum = "0.6"
 
-zkevm_opcode_defs.workspace = true
-
-
 [dev-dependencies]
 hex = "0.4"
diff --git a/crates/zkevm_circuits/Cargo.toml b/crates/zkevm_circuits/Cargo.toml
@@ -11,6 +11,12 @@ categories.workspace = true
 description = "ZKsync Era circuits for EraVM"
 
 [dependencies]
+# "Owned" dependencies
+zkevm_opcode_defs.workspace = true
+cs_derive.workspace = true
+boojum.workspace = true
+
+# "External" dependencies
 derivative = "2"
 serde = { version = "1", features = ["derive"] }
 rand = "0.4"
@@ -25,10 +31,6 @@ rand_new = { package = "rand", version = "0.8" }
 hex = "0.4"
 seq-macro = "0.3"
 
-zkevm_opcode_defs.workspace = true
-cs_derive = "=0.2.2"
-boojum = "=0.2.2"
-
 [features]
 default = []
 log_tracing = ["boojum/log_tracing"]

diff --git a/crates/zkevm_opcode_defs/Cargo.toml b/crates/zkevm_opcode_defs/Cargo.toml
@@ -15,6 +15,7 @@ name = "circuit_pricing_generator"
 path = "src/circuit_pricing_generator/main.rs"
 
 [dependencies]
+# "External" dependencies
 bitflags = "2"
 lazy_static = "1.4"
 ethereum-types = "=0.14.1"

diff --git a/crates/zkevm_test_harness/Cargo.toml b/crates/zkevm_test_harness/Cargo.toml
@@ -23,12 +23,13 @@ name = "geometry_config_generator"
 path = "src/geometry_config_generator/main.rs"
 
 [dependencies]
+# "Owned" dependencies
 circuit_definitions.workspace = true
 circuit_sequencer_api.workspace = true
 kzg.workspace = true
-
 zkevm-assembly.workspace = true
 
+# "External" dependencies
 rand = "0.4"
 rayon = "1.10"
 derivative = "2.2"