Skip to content
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.

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

deps: avoid duplicate crates #840

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
29 changes: 29 additions & 0 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -5,3 +5,32 @@ members = [
"halo2_poseidon",
"halo2_proofs",
]

[workspace.dependencies]
arrayvec = "0.7.0"
assert_matches = "1.5"
backtrace = "0.3"
bitvec = { version = "1", default-features = false }
blake2b_simd = "1"
criterion = "0.3"
dashmap = ">=5, <5.5.0"
ff = { version = "0.13", default-features = false }
group = "0.13"
gumdrop = "0.8"
halo2_legacy_pdqsort = "0.1.0"
halo2_poseidon = { version = "0.1", path = "halo2_poseidon", default-features = false }
halo2_proofs = { version = "0.3", path = "halo2_proofs", default-features = false }
image = ">=0.24, <0.24.5"
lazy_static = "1"
maybe-rayon = { version = "0.1.0", default-features = false }
pasta_curves = "0.5"
plotters = { version = "0.3.0", default-features = false }
proptest = "1.0.0"
rand = "0.8"
rand_core = { version = "0.6", default-features = false }
sinsemilla = "0.1"
subtle = "2.3"
tabbycat = "0.1"
tempfile = ">=3, <3.7.0"
tracing = "0.1"
uint = "0.9.2"
2 changes: 1 addition & 1 deletion halo2/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ all-features = true
rustdoc-args = ["--cfg", "docsrs", "--html-in-header", "katex-header.html"]

[dependencies]
halo2_proofs = { version = "0.3", path = "../halo2_proofs", default-features = false }
halo2_proofs = { workspace = true }

[lib]
bench = false
36 changes: 18 additions & 18 deletions halo2_gadgets/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -22,28 +22,28 @@ all-features = true
rustdoc-args = ["--cfg", "docsrs", "--html-in-header", "katex-header.html"]

[dependencies]
arrayvec = "0.7.0"
bitvec = "1"
ff = "0.13"
group = "0.13"
halo2_poseidon = { version = "0.1", path = "../halo2_poseidon", default-features = false }
halo2_proofs = { version = "0.3", path = "../halo2_proofs", default-features = false }
lazy_static = "1"
pasta_curves = "0.5"
proptest = { version = "1.0.0", optional = true }
rand = "0.8"
sinsemilla = "0.1"
subtle = "2.3"
uint = "0.9.2" # MSRV 1.56.1
arrayvec = { workspace = true }
bitvec = { workspace = true }
ff = { workspace = true }
group = { workspace = true }
halo2_poseidon = { workspace = true }
halo2_proofs = { workspace = true }
lazy_static = { workspace = true }
pasta_curves = { workspace = true }
proptest = { workspace = true, optional = true }
rand = { workspace = true }
sinsemilla = { workspace = true }
subtle = { workspace = true }
uint = { workspace = true } # MSRV 1.56.1

# Developer tooling dependencies
plotters = { version = "0.3.0", default-features = false, optional = true }
plotters = { workspace = true, optional = true }

[dev-dependencies]
criterion = "0.3"
halo2_poseidon = { version = "0.1", path = "../halo2_poseidon", default-features = false, features = ["test-dependencies"] }
proptest = "1.0.0"
sinsemilla = { version = "0.1", features = ["test-dependencies"] }
criterion = { workspace = true }
halo2_poseidon = { workspace = true, features = ["test-dependencies"] }
proptest = { workspace = true }
sinsemilla = { workspace = true, features = ["test-dependencies"] }

[target.'cfg(unix)'.dev-dependencies]
inferno = ">=0.11, <0.11.5" # MSRV 1.59
Expand Down
8 changes: 4 additions & 4 deletions halo2_poseidon/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,10 @@ readme = "README.md"
categories = ["cryptography"]

[dependencies]
bitvec = { version = "1", default-features = false }
ff = { version = "0.13", default-features = false }
group = "0.13"
pasta_curves = "0.5"
bitvec = { workspace = true }
ff = { workspace = true }
group = { workspace = true }
pasta_curves = { workspace = true }

[features]
test-dependencies = []
38 changes: 19 additions & 19 deletions halo2_proofs/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -44,33 +44,33 @@ name = "fft"
harness = false

[dependencies]
backtrace = { version = "0.3", optional = true }
ff = "0.13"
group = "0.13"
pasta_curves = "0.5"
rand_core = { version = "0.6", default-features = false }
tracing = "0.1"
blake2b_simd = "1"
maybe-rayon = {version = "0.1.0", default-features = false}
backtrace = { workspace = true, optional = true }
ff = { workspace = true }
group = { workspace = true }
pasta_curves = { workspace = true }
rand_core = { workspace = true }
tracing = { workspace = true }
blake2b_simd = { workspace = true }
maybe-rayon = { workspace = true }

# Developer tooling dependencies
plotters = { version = "0.3.0", default-features = false, optional = true }
tabbycat = { version = "0.1", features = ["attributes"], optional = true }
plotters = { workspace = true, optional = true }
tabbycat = { workspace = true, features = ["attributes"], optional = true }

# Legacy circuit compatibility
halo2_legacy_pdqsort = { version = "0.1.0", optional = true }
halo2_legacy_pdqsort = { workspace = true, optional = true }

[dev-dependencies]
assert_matches = "1.5"
criterion = "0.3"
gumdrop = "0.8"
proptest = "1"
rand_core = { version = "0.6", default-features = false, features = ["getrandom"] }
assert_matches = { workspace = true }
criterion = { workspace = true }
gumdrop = { workspace = true }
proptest = { workspace = true }
rand_core = { workspace = true, features = ["getrandom"] }

# Indirect dev-dependencies that we pin to preserve MSRV in CI checks.
dashmap = ">=5, <5.5.0" # dashmap 5.5.0 has MSRV 1.64
image = ">=0.24, <0.24.5" # image 0.24.5 has MSRV 1.61
tempfile = ">=3, <3.7.0" # tempfile 3.7.0 has MSRV 1.63
dashmap = { workspace = true } # dashmap 5.5.0 has MSRV 1.64
image = { workspace = true } # image 0.24.5 has MSRV 1.61
tempfile = { workspace = true } # tempfile 3.7.0 has MSRV 1.63

[target.'cfg(all(target_arch = "wasm32", target_os = "unknown"))'.dev-dependencies]
getrandom = { version = "0.2", features = ["js"] }
Expand Down