Skip to content

deps: avoid duplicate crates #203

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.

Sign up for GitHub

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

Closed
rex4539 wants to merge 1 commit into from
Closed

deps: avoid duplicate crates #203

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
13 changes: 13 additions & 0 deletions Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -135,6 +135,19 @@ alloy-sol-types = "0.7.7"
downloader = { version = "0.2", default-features = false }
ethers = { version = "2", default-features = false }
sysinfo = "0.31.2"
sphinx-core = { path = "core" }
sphinx-derive = { path = "derive" }
sphinx-lib = { path = "zkvm/lib" }
sphinx-primitives = { path = "primitives" }
sphinx-prover = { path = "prover" }
sphinx-recursion-circuit = { path = "recursion/circuit" }
sphinx-recursion-compiler = { path = "recursion/compiler" }
sphinx-recursion-core = { path = "recursion/core" }
sphinx-recursion-derive = { path = "recursion/derive" }
sphinx-recursion-gnark-ffi = { path = "recursion/gnark-ffi" }
sphinx-recursion-program = { path = "recursion/program" }
sphinx-sdk = { path = "sdk" }
sphinx-zkvm = { path = "zkvm/entrypoint" }

[profile.dev-ci]
inherits = "dev"
Expand Down
6 changes: 3 additions & 3 deletions cli/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,9 @@ vergen = { workspace = true, features = ["build", "git", "git2"] }
anyhow = { workspace = true, features = ["backtrace"] }
cargo_metadata = { workspace = true }
clap = { workspace = true, features = ["derive", "env"] }
sphinx-prover = { path = "../prover" }
sphinx-sdk = { path = "../sdk" }
sphinx-core = { path = "../core" }
sphinx-prover = { workspace = true }
sphinx-sdk = { workspace = true }
sphinx-core = { workspace = true }
reqwest = { workspace = true, features = ["stream", "json", "rustls-tls"] }
futures-util = { workspace = true }
indicatif = { workspace = true }
Expand Down
6 changes: 3 additions & 3 deletions core/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,8 @@ p3-symmetric = { workspace = true }
p3-uni-stark = { workspace = true }
p3-util = { workspace = true }
rrs-lib = { workspace = true }
sphinx-derive = { path = "../derive" }
sphinx-primitives = { path = "../primitives" }
sphinx-derive = { workspace = true }
sphinx-primitives = { workspace = true }

anyhow = { workspace = true }
arrayref = { workspace = true }
Expand Down Expand Up @@ -68,7 +68,7 @@ tiny-keccak = { workspace = true, features = ["keccak"] }
criterion = { workspace = true }
num = { workspace = true, features = ["rand"] }
rand = { workspace = true }
sphinx-zkvm = { path = "../zkvm/entrypoint" }
sphinx-zkvm = { workspace = true }

[features]
debug = []
Expand Down
4 changes: 2 additions & 2 deletions eval/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ repository.workspace = true
license.workspace = true

[dependencies]
sphinx-core = { path = "../core" }
sphinx-prover = { path = "../prover" }
sphinx-core = { workspace = true }
sphinx-prover = { workspace = true }

clap = { workspace = true, features = ["derive"] }
csv = { workspace = true }
Expand Down
14 changes: 7 additions & 7 deletions prover/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,13 @@ repository.workspace = true
license.workspace = true

[dependencies]
sphinx-recursion-program = { path = "../recursion/program" }
sphinx-recursion-circuit = { path = "../recursion/circuit" }
sphinx-recursion-compiler = { path = "../recursion/compiler" }
sphinx-recursion-core = { path = "../recursion/core" }
sphinx-recursion-gnark-ffi = { path = "../recursion/gnark-ffi" }
sphinx-core = { path = "../core" }
sphinx-primitives = { path = "../primitives" }
sphinx-recursion-program = { workspace = true }
sphinx-recursion-circuit = { workspace = true }
sphinx-recursion-compiler = { workspace = true }
sphinx-recursion-core = { workspace = true }
sphinx-recursion-gnark-ffi = { workspace = true }
sphinx-core = { workspace = true }
sphinx-primitives = { workspace = true }
p3-field = { workspace = true }
p3-challenger = { workspace = true }
p3-baby-bear = { workspace = true }
Expand Down
12 changes: 6 additions & 6 deletions recursion/circuit/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,13 +12,13 @@ p3-commit = { workspace = true }
p3-fri = { workspace = true }
p3-matrix = { workspace = true }
p3-util = { workspace = true }
sphinx-recursion-core = { path = "../core" }
sphinx-core = { path = "../../core" }
sphinx-recursion-core = { workspace = true }
sphinx-core = { workspace = true }
itertools = { workspace = true }
serde = { workspace = true, features = ["derive"] }
sphinx-recursion-derive = { path = "../derive" }
sphinx-recursion-compiler = { path = "../compiler" }
sphinx-recursion-program = { path = "../program" }
sphinx-recursion-derive = { workspace = true }
sphinx-recursion-compiler = { workspace = true }
sphinx-recursion-program = { workspace = true }
p3-bn254-fr = { workspace = true }
p3-baby-bear = { workspace = true }
bincode = { workspace = true }
Expand All @@ -32,7 +32,7 @@ p3-merkle-tree = { workspace = true }
p3-poseidon2 = { workspace = true }
zkhash = { workspace = true }
rand = { workspace = true }
sphinx-recursion-gnark-ffi = { path = "../gnark-ffi" }
sphinx-recursion-gnark-ffi = { workspace = true }

[features]
plonk = ["sphinx-recursion-gnark-ffi/plonk"]
8 changes: 4 additions & 4 deletions recursion/compiler/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,12 +13,12 @@ p3-fri = { workspace = true }
p3-matrix = { workspace = true }
p3-symmetric = { workspace = true }
p3-util = { workspace = true }
sphinx-recursion-core = { path = "../core" }
sphinx-core = { path = "../../core" }
sphinx-recursion-core = { workspace = true }
sphinx-core = { workspace = true }
itertools = { workspace = true }
serde = { workspace = true, features = ["derive"] }
sphinx-primitives = { path = "../../primitives"}
sphinx-recursion-derive = { path = "../derive" }
sphinx-primitives = { workspace = true }
sphinx-recursion-derive = { workspace = true }
p3-bn254-fr = { workspace = true }
p3-baby-bear = { workspace = true }
p3-poseidon2 = { workspace = true }
Expand Down
6 changes: 3 additions & 3 deletions recursion/core/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,10 @@ p3-maybe-rayon = { workspace = true, features = ["parallel"] }
p3-poseidon2 = { workspace = true }
p3-symmetric = { workspace = true }
p3-util = { workspace = true }
sphinx-derive = { path = "../../derive" }
sphinx-primitives = { path = "../../primitives" }
sphinx-derive = { workspace = true }
sphinx-primitives = { workspace = true }
tracing = { workspace = true }
sphinx-core = { path = "../../core" }
sphinx-core = { workspace = true }
hashbrown = { workspace = true }
itertools = { workspace = true }
p3-bn254-fr = { workspace = true }
Expand Down
4 changes: 2 additions & 2 deletions recursion/gnark-ffi/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@ license.workspace = true
p3-field = { workspace = true }
p3-symmetric = { workspace = true }
p3-baby-bear = { workspace = true }
sphinx-recursion-compiler = { path = "../compiler" }
sphinx-core = { path = "../../core" }
sphinx-recursion-compiler = { workspace = true }
sphinx-core = { workspace = true }
serde = { workspace = true }
serde_json = { workspace = true }
tempfile = { workspace = true }
Expand Down
8 changes: 4 additions & 4 deletions recursion/program/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,10 +19,10 @@ p3-baby-bear = { workspace = true }
p3-dft = { workspace = true }
p3-merkle-tree = { workspace = true }
p3-poseidon2 = { workspace = true }
sphinx-primitives = { path = "../../primitives" }
sphinx-recursion-core = { path = "../core" }
sphinx-recursion-compiler = { path = "../compiler" }
sphinx-core = { path = "../../core" }
sphinx-primitives = { workspace = true }
sphinx-recursion-core = { workspace = true }
sphinx-recursion-compiler = { workspace = true }
sphinx-core = { workspace = true }
stacker = { workspace = true }
itertools = { workspace = true }
serde = { workspace = true, features = ["derive"] }
Expand Down
4 changes: 2 additions & 2 deletions sdk/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@ async-trait = { workspace = true }
reqwest-middleware = { workspace = true }
reqwest = { workspace = true, features = ["rustls-tls", "trust-dns", "stream"] }
anyhow = { workspace = true }
sphinx-prover = { path = "../prover" }
sphinx-core = { path = "../core" }
sphinx-prover = { workspace = true }
sphinx-core = { workspace = true }
futures = { workspace = true }
bincode = { workspace = true }
tokio = { workspace = true, features = ["full"] }
Expand Down
4 changes: 2 additions & 2 deletions tutorials/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,6 @@ p3-air = { workspace = true }
p3-matrix = { workspace = true }
p3-maybe-rayon = { workspace = true }
p3-uni-stark = { workspace = true }
sphinx-derive = { path = "../derive" }
sphinx-core = { path = "../core" }
sphinx-derive = { workspace = true }
sphinx-core = { workspace = true }
itertools = { workspace = true }
4 changes: 2 additions & 2 deletions zkvm/entrypoint/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@ sha2 = { workspace = true }
lazy_static = { workspace = true }

# optional
sphinx-lib = { path = "../lib", optional = true }
sphinx-primitives = { path = "../../primitives", optional = true }
sphinx-lib = { workspace = true, optional = true }
sphinx-primitives = { workspace = true, optional = true }
p3-baby-bear = { workspace = true, optional = true }
p3-field = { workspace = true, optional = true }

Expand Down