From 83b21794cdcd9c3cc61982ace354a91b9618f9f0 Mon Sep 17 00:00:00 2001 From: Dimitris Apostolou Date: Mon, 24 Feb 2025 15:29:35 +0200 Subject: [PATCH] fix: avoid duplicate crates --- Cargo.toml | 13 +++++++++++++ cli/Cargo.toml | 6 +++--- core/Cargo.toml | 6 +++--- eval/Cargo.toml | 4 ++-- prover/Cargo.toml | 14 +++++++------- recursion/circuit/Cargo.toml | 12 ++++++------ recursion/compiler/Cargo.toml | 8 ++++---- recursion/core/Cargo.toml | 6 +++--- recursion/gnark-ffi/Cargo.toml | 4 ++-- recursion/program/Cargo.toml | 8 ++++---- sdk/Cargo.toml | 4 ++-- tutorials/Cargo.toml | 4 ++-- zkvm/entrypoint/Cargo.toml | 4 ++-- 13 files changed, 53 insertions(+), 40 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index dfc042746..065ee0290 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -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" diff --git a/cli/Cargo.toml b/cli/Cargo.toml index 7b61d814c..b32b58197 100644 --- a/cli/Cargo.toml +++ b/cli/Cargo.toml @@ -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 } diff --git a/core/Cargo.toml b/core/Cargo.toml index 6a8ad6f0c..9c7244d0f 100644 --- a/core/Cargo.toml +++ b/core/Cargo.toml @@ -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 } @@ -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 = [] diff --git a/eval/Cargo.toml b/eval/Cargo.toml index e9e29d2a1..8cac77750 100644 --- a/eval/Cargo.toml +++ b/eval/Cargo.toml @@ -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 } diff --git a/prover/Cargo.toml b/prover/Cargo.toml index 389ba2dd5..a24d57a76 100644 --- a/prover/Cargo.toml +++ b/prover/Cargo.toml @@ -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 } diff --git a/recursion/circuit/Cargo.toml b/recursion/circuit/Cargo.toml index 646ac641a..a69cd380f 100644 --- a/recursion/circuit/Cargo.toml +++ b/recursion/circuit/Cargo.toml @@ -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 } @@ -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"] diff --git a/recursion/compiler/Cargo.toml b/recursion/compiler/Cargo.toml index a9a561551..c4e397fef 100644 --- a/recursion/compiler/Cargo.toml +++ b/recursion/compiler/Cargo.toml @@ -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 } diff --git a/recursion/core/Cargo.toml b/recursion/core/Cargo.toml index 9babe3735..823dcbd56 100644 --- a/recursion/core/Cargo.toml +++ b/recursion/core/Cargo.toml @@ -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 } diff --git a/recursion/gnark-ffi/Cargo.toml b/recursion/gnark-ffi/Cargo.toml index c37e91acd..6abfda82d 100644 --- a/recursion/gnark-ffi/Cargo.toml +++ b/recursion/gnark-ffi/Cargo.toml @@ -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 } diff --git a/recursion/program/Cargo.toml b/recursion/program/Cargo.toml index 87a9addaf..5b993cffc 100644 --- a/recursion/program/Cargo.toml +++ b/recursion/program/Cargo.toml @@ -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"] } diff --git a/sdk/Cargo.toml b/sdk/Cargo.toml index 0a76232a2..226a67e4f 100644 --- a/sdk/Cargo.toml +++ b/sdk/Cargo.toml @@ -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"] } diff --git a/tutorials/Cargo.toml b/tutorials/Cargo.toml index 01b688493..9feefa01e 100644 --- a/tutorials/Cargo.toml +++ b/tutorials/Cargo.toml @@ -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 } diff --git a/zkvm/entrypoint/Cargo.toml b/zkvm/entrypoint/Cargo.toml index 5456ba3d2..9bdc72919 100644 --- a/zkvm/entrypoint/Cargo.toml +++ b/zkvm/entrypoint/Cargo.toml @@ -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 }