Use workspace deps (develop/compatible)

Cargo.toml

@@ -16,6 +16,77 @@ members = [
 ]
 resolver = "2"
 
+[workspace.dependencies]
+ark-algebra-test-templates = "0.4.2"
+ark-bn254 = { version = "0.4.0" }
+ark-ec = { version = "0.4.2", features = ["parallel"] }
+ark-ff = { version = "0.4.2", features = ["parallel", "asm"] }
+ark-poly = { version = "0.4.2", features = ["parallel"] }
+ark-serialize = "0.4.2"
+ark-std = "0.4.0"
+ark-test-curves = "0.4.2"
+base64 = "0.21.5"
+bcs = "0.1.3"
+bitvec = "1.0.0"
+blake2 = "0.10.0"
+bs58 = "0.5.0"
+clap = "4.4.6"
+colored = "2.0.0"
+command-fds = "0.3"
+convert_case = "0.6.0"
+criterion = "0.5"
+elf = "0.7.2"
+env_logger = "0.11.1"
+hex = { version = "0.4", features = ["serde"] }
+iai = "0.1"
+itertools = "0.12.1"
+libc = "0.2.62"
+libflate = "2"
+log = "0.4.20"
+num-bigint = { version = "0.4.3", features = ["rand", "serde"] }
+num-derive = "0.4"
+num-integer = "0.1.45"
+num-traits = "0.2"
+ocaml = { version = "0.22.2" }
+ocaml-gen = { version = "0.1.5" }
+once_cell = "1.10.0"
+os_pipe = { version = "1.1.4", features = ["io_safety"] }
+proc-macro2 = "1.0.43"
+proptest = "1.0.0"
+proptest-derive = "0.4.0"
+quote = "1.0.21"
+rand = { version = "0.8.5", features = ["std_rng"] }
+rand_chacha = { version = "0.3.0" }
+rand_core = { version = "0.6.3" }
+rayon = "1.5.0"
+regex = "1.10.2"
+rmp-serde = "1.1.1"
+secp256k1 = "0.28.2"
+serde = { version = "1.0.130", features = ["derive"] }
+serde_json = "1.0.79"
+serde_with = "3.6.0"
+sha2 = "0.10.2"
+strum = "0.26.1"
+strum_macros = "0.26.1"
+syn = { version = "1.0.109", features = ["full"] }
+thiserror = "1.0.30"
+tinytemplate = "1.1"
+wasm-bindgen = "=0.2.90"
+
+groupmap = { path = "./groupmap", version = "0.1.0" }
+internal-tracing = { path = "./internal-tracing", version = "0.1.0" }
+kimchi = { path = "./kimchi", version = "0.1.0", features = ["bn254"] }
+kimchi-visu = { path = "./tools/kimchi-visu", version = "0.1.0" }
+mina-curves = { path = "./curves", version = "0.1.0" }
+mina-hasher = { path = "./hasher", version = "0.1.0" }
+mina-poseidon = { path = "./poseidon", version = "0.1.0" }
+o1-utils = { path = "./utils", version = "0.1.0" }
+optimism = { path = "./optimism", version = "0.1.0" }
+poly-commitment = { path = "./poly-commitment", version = "0.1.0" }
+signer = { path = "./signer", version = "0.1.0" }
+turshi = { path = "./turshi", version = "0.1.0" }
+utils = { path = "./utils", version = "0.1.0" }
+
 [profile.release]
 lto = true
 panic = 'abort'

curves/Cargo.toml

@@ -10,12 +10,12 @@ edition = "2021"
 license = "Apache-2.0"
 
 [dependencies]
-ark-ec = { version = "0.4.2", features = ["parallel"] }
-ark-ff = { version = "0.4.2", features = ["parallel", "asm"] }
+ark-ec.workspace = true
+ark-ff.workspace = true
 
 [dev-dependencies]
-rand = { version = "0.8.5", default-features = false }
-ark-test-curves = "0.4.2"
-ark-algebra-test-templates = "0.4.2"
-ark-serialize="0.4.2"
-ark-std = "0.4.0"
+rand.workspace = true 
+ark-test-curves.workspace = true
+ark-algebra-test-templates.workspace = true
+ark-serialize.workspace = true
+ark-std.workspace = true

groupmap/Cargo.toml

@@ -13,9 +13,9 @@ license = "Apache-2.0"
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-ark-ff = { version = "0.4.2", features = [ "parallel", "asm" ] }
-ark-ec = { version = "0.4.2", features = [ "parallel" ] }
-rand = "0.8.4"
+ark-ff.workspace = true
+ark-ec.workspace = true
+rand.workspace = true
 
 [dev-dependencies]
-mina-curves = { path = "../curves", version = "0.1.0" }
+mina-curves.workspace = true

hasher/Cargo.toml

@@ -13,14 +13,14 @@ license = "Apache-2.0"
 path = "src/lib.rs"
 
 [dependencies]
-mina-poseidon = { path = "../poseidon", version = "0.1.0" }
-mina-curves = { path = "../curves", version = "0.1.0" }
-o1-utils = { path = "../utils", version = "0.1.0" }
+mina-poseidon.workspace = true
+mina-curves.workspace = true
+o1-utils.workspace = true
 
-ark-ff = { version = "0.4.2", features = [ "parallel", "asm" ] }
+ark-ff.workspace = true
 
-bitvec = "1.0.0"
-serde = { version = "1.0", features = ["derive"] }
+bitvec.workspace = true
+serde.workspace = true
 
 [dev-dependencies]
-serde_json = { version = "1.0" }
+serde_json.workspace = true

internal-tracing/Cargo.toml

@@ -5,10 +5,10 @@ edition = "2021"
 license = "Apache-2.0"
 
 [dependencies]
-serde = { version = "*", features = ["derive"], optional = true }
-serde_json = { version = "*", optional = true }
-ocaml = { version = "0.22.2", optional = true }
-ocaml-gen = { version = "0.1.5", optional = true }
+serde = { workspace = true, features = ["derive"], optional = true }
+serde_json = { workspace = true, optional = true }
+ocaml = { workspace = true, optional = true }
+ocaml-gen = { workspace = true, optional = true }
 
 [features]
 enabled = [ "serde", "serde_json" ]

kimchi/Cargo.toml

@@ -11,60 +11,62 @@ license = "Apache-2.0"
 
 [lib]
 path = "src/lib.rs"
-bench = false # needed for criterion (https://bheisler.github.io/criterion.rs/book/faq.html#cargo-bench-gives-unrecognized-option-errors-for-valid-command-line-options)
+bench = false       # needed for criterion (https://bheisler.github.io/criterion.rs/book/faq.html#cargo-bench-gives-unrecognized-option-errors-for-valid-command-line-options)
 
 [dependencies]
-ark-ff = { version = "0.4.2", features = [ "parallel", "asm" ] }
-ark-ec = { version = "0.4.2", features = [ "parallel" ] }
-ark-poly = { version = "0.4.2", features = [ "parallel" ] }
-ark-serialize = "0.4.2"
-ark-bn254 = { version = "0.4.0", optional = true }
-blake2 = "0.10.0"
-num-bigint = { version = "0.4.3", features = ["rand", "serde"]}
-num-derive = "0.3"
-num-integer = "0.1.45"
-num-traits = "0.2"
-itertools = "0.10.3"
-rand = { version = "0.8.0", features = ["std_rng"] }
-rand_core = "0.6.3"
-rayon = "1.5.0"
-rmp-serde = "1.1.1"
-serde = "1.0.130"
-serde_with = "1.10.0"
-thiserror = "1.0.30"
-once_cell = "1.10.0"
-hex = "0.4"
-strum = "0.24.0"
-strum_macros = "0.24.0"
+ark-ff.workspace = true
+ark-ec.workspace = true
+ark-poly.workspace = true
+ark-serialize.workspace = true
+ark-bn254 = { workspace = true, optional = true }
+blake2.workspace = true
+num-bigint.workspace = true
+num-derive.workspace = true
+num-integer.workspace = true
+num-traits.workspace = true
+itertools.workspace = true
+rand = { workspace = true, features = ["std_rng"] }
+rand_core.workspace = true
+rayon.workspace = true
+rmp-serde.workspace = true
+serde.workspace = true
+serde_with.workspace = true
+thiserror.workspace = true
+once_cell.workspace = true
+hex.workspace = true
+strum.workspace = true
+strum_macros.workspace = true
+
 
 # TODO: audit this
 disjoint-set = "0.0.2"
 
-turshi = { path = "../turshi", version = "0.1.0" }
-poly-commitment = { path = "../poly-commitment", version = "0.1.0" }
-groupmap = { path = "../groupmap", version = "0.1.0" }
-mina-curves = { path = "../curves", version = "0.1.0" }
-o1-utils = { path = "../utils", version = "0.1.0" }
-mina-poseidon = { path = "../poseidon", version = "0.1.0" }
 
-ocaml = { version = "0.22.2", optional = true }
-ocaml-gen = { version = "0.1.5", optional = true }
+turshi.workspace = true
+poly-commitment.workspace = true
+groupmap.workspace = true
+mina-curves.workspace = true
+o1-utils.workspace = true
+mina-poseidon.workspace = true
+
+ocaml = { workspace = true, optional = true }
+ocaml-gen = { workspace = true, optional = true }
 
-wasm-bindgen = { version = "=0.2.87", optional = true }
+wasm-bindgen = { workspace = true, optional = true }
 
-internal-tracing = { path = "../internal-tracing", version = "0.1.0" }
+internal-tracing.workspace = true
 
 [dev-dependencies]
-proptest = "1.0.0"
-proptest-derive = "0.3.0"
-colored = "2.0.0"
-serde_json = { version = "1.0" }
-num-bigint = { version = "0.4.3", features = ["rand"] }
-secp256k1 = "0.24.2"
+proptest.workspace = true
+proptest-derive.workspace = true
+colored.workspace = true
+serde_json.workspace = true
+num-bigint.workspace = true
+secp256k1.workspace = true
 
 # benchmarks
-criterion = "0.3"
-iai = "0.1"
+criterion.workspace = true
+iai.workspace = true
 
 [[bench]]
 name = "proof_criterion"
@@ -80,8 +82,14 @@ harness = false
 
 [features]
 default = []
-internal_tracing = [ "internal-tracing/enabled" ]
-ocaml_types = [ "ocaml", "ocaml-gen", "poly-commitment/ocaml_types", "mina-poseidon/ocaml_types", "internal-tracing/ocaml_types" ]
-bn254 = [ "ark-bn254" ]
-wasm_types = [ "wasm-bindgen" ]
+internal_tracing = ["internal-tracing/enabled"]
+ocaml_types = [
+    "ocaml",
+    "ocaml-gen",
+    "poly-commitment/ocaml_types",
+    "mina-poseidon/ocaml_types",
+    "internal-tracing/ocaml_types",
+]
+bn254 = ["ark-bn254"]
+wasm_types = ["wasm-bindgen"]
 check_feature_flags = []

poly-commitment/Cargo.toml

@@ -10,34 +10,34 @@ edition = "2021"
 license = "Apache-2.0"
 
 [dependencies]
-ark-ff = { version = "0.4.2", features = [ "parallel", "asm" ] }
-ark-ec = { version = "0.4.2", features = [ "parallel" ] }
-ark-poly = { version = "0.4.2", features = [ "parallel" ] }
-ark-serialize = "0.4.2"
+ark-ff.workspace = true
+ark-ec.workspace = true
+ark-poly.workspace = true
+ark-serialize.workspace = true
 
-blake2 = "0.10.0"
-itertools = "0.10.3"
-once_cell = "1.10.0"
-rand = "0.8.0"
-rand_core = { version = "0.6.0" }
-rayon = { version = "1" }
-rmp-serde = "1.1.1"
-serde = "1.0.130"
-serde_with = "1.10.0"
-thiserror = "1.0.31"
+blake2.workspace = true
+itertools.workspace = true
+once_cell.workspace = true
+rand.workspace = true
+rand_core.workspace = true
+rayon.workspace = true
+rmp-serde.workspace = true
+serde.workspace = true
+serde_with.workspace = true
+thiserror.workspace = true
 
-groupmap = { path = "../groupmap", version = "0.1.0" }
-mina-curves = { path = "../curves", version = "0.1.0" }
-o1-utils = { path = "../utils", version = "0.1.0" }
-mina-poseidon = { path = "../poseidon", version = "0.1.0" }
+groupmap.workspace = true
+mina-curves.workspace = true
+o1-utils.workspace = true
+mina-poseidon.workspace = true
 
-ocaml = { version = "0.22.2", optional = true }
-ocaml-gen = { version = "0.1.5", optional = true }
+ocaml = { workspace = true, optional = true }
+ocaml-gen = { workspace = true, optional = true }
 
 [dev-dependencies]
-colored = "2.0.0"
-rand_chacha = { version = "0.3.0" }
-ark-bn254 = { version = "0.4.0" }
+colored.workspace = true
+rand_chacha.workspace = true
+ark-bn254.workspace = true
 
 [features]
-ocaml_types = [ "ocaml", "ocaml-gen" ]
+ocaml_types = ["ocaml", "ocaml-gen"]

poseidon/Cargo.toml

@@ -13,27 +13,26 @@ license = "Apache-2.0"
 path = "src/lib.rs"
 
 [dependencies]
-ark-ff = { version = "0.4.2", features = [ "parallel", "asm" ] }
-ark-ec = { version = "0.4.2", features = [ "parallel" ] }
-ark-poly = { version = "0.4.2", features = [ "parallel" ] }
-ark-serialize = { version = "0.4.2", features = ["derive"]}
-rand = "0.8.0"
-rayon = "1"
-serde = { version = "1.0", features = ["derive"] }
-serde_with = "1.10.0"
-once_cell = "1.10.0"
+ark-ff.workspace = true
+ark-ec.workspace = true
+ark-poly.workspace = true
+ark-serialize.workspace = true
+rand.workspace = true
+rayon.workspace = true
+serde.workspace = true
+serde_with.workspace = true
+once_cell.workspace = true
 
-mina-curves = { path = "../curves", version = "0.1.0" }
-o1-utils = { path = "../utils", version = "0.1.0" }
+mina-curves.workspace = true
+o1-utils.workspace = true
 
 # for ocaml
-ocaml = { version = "0.22.2", optional = true }
-ocaml-gen = { version = "0.1.5", optional = true }
+ocaml = { workspace = true, optional = true }
+ocaml-gen = { workspace = true, optional = true }
 
 [dev-dependencies]
-serde_json = "1.0"
-hex = "0.4"
-ark-serialize = "0.4.2"
+serde_json.workspace = true
+hex.workspace = true
 
 [features]
 default = []