Skip to content

Commit

Permalink
Merge pull request #2561 from o1-labs/volhovm/single-cargo-lock-depen…
Browse files Browse the repository at this point in the history 
…dencies

Use workspace dependencies
  • Loading branch information
@volhovm
volhovm authored Sep 19, 2024
2 parents a03e92e + 4b68490 commit 66eaad5
Show file tree
Hide file tree
Showing 17 changed files with 794 additions and 695 deletions.
1,020 changes: 522 additions & 498 deletions Cargo.lock
View file

Large diffs are not rendered by default.

71 changes: 71 additions & 0 deletions Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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.3.6"
elf = "0.7.2"
env_logger = "0.11.1"
hex = { version = "0.4", features = ["serde"] }
iai = "0.1"
itertools = "0.10.5"
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.87"

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'
Expand Down
2 changes: 1 addition & 1 deletion book/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,5 +11,5 @@ license = "Apache-2.0"

[build-dependencies]
cargo-spec = { version = "0.5.0" }
time = { version = "~0.3.23" } # This crate is a known bad-actor for breaking rust version support.
time = { version = "~0.3.31" } # This crate is a known bad-actor for breaking rust version support.
plist = { version = "~1.5.0" } # This crate improperly constrains its bad-actor dependency (`time`).
52 changes: 26 additions & 26 deletions circuit-construction/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,34 +14,34 @@ 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)

[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"
blake2 = "0.10.0"
num-derive = "0.3"
num-traits = "0.2"
itertools = "0.10.3"
rand = "0.8.0"
rand_core = "0.6.3"
rayon = "1.5.0"
rmp-serde = "1.0.0"
serde = "1.0.130"
serde_with = "1.10.0"
thiserror = "1.0.30"
ark-ff.workspace = true
ark-ec.workspace = true
ark-poly.workspace = true
ark-serialize.workspace = true
blake2.workspace = true
num-derive.workspace = true
num-traits.workspace = true
itertools.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

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" }
kimchi = { path = "../kimchi", version = "0.1.0" }
poly-commitment.workspace = true
groupmap.workspace = true
mina-curves.workspace = true
o1-utils.workspace = true
mina-poseidon.workspace = true
kimchi.workspace = true

[dev-dependencies]
proptest = "1.0.0"
proptest-derive = "0.3.0"
colored = "2.0.0"
proptest.workspace = true
proptest-derive.workspace = true
colored.workspace = true

# benchmarks
criterion = "0.3"
iai = "0.1"
criterion.workspace = true
iai.workspace = true
14 changes: 7 additions & 7 deletions curves/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
8 changes: 4 additions & 4 deletions groupmap/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
14 changes: 7 additions & 7 deletions hasher/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
8 changes: 4 additions & 4 deletions internal-tracing/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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" ]
Expand Down
98 changes: 53 additions & 45 deletions kimchi/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand All @@ -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 = []
Loading

0 comments on commit 66eaad5

Please sign in to comment.