Skip to content

Commit

Permalink
all: run cargo autoinherit to simplify dependency management (#468)
Browse files Browse the repository at this point in the history
  • Loading branch information
conradoplg authored Feb 20, 2025
1 parent f4d53a5 commit 6f50c25
Show file tree
Hide file tree
Showing 9 changed files with 229 additions and 167 deletions.
65 changes: 65 additions & 0 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,71 @@ members = [
]
resolver = "2"

[workspace.dependencies]
async-trait = "0.1.85"
axum = "0.8.1"
axum-extra = "0.10.0"
axum-server = "0.7"
axum-test = "17.2.0"
base64 = "0.22.1"
bech32 = "0.11.0"
clap = "4.5.23"
coordinator = { path = "coordinator" }
delay_map = "0.4.0"
derivative = "2.2.0"
dirs = "5.0.1"
dkg = { path = "dkg" }
exitcode = "1.1.2"
eyre = "0.6.12"
frost-core = "2.0.0"
frost-ed25519 = "2.0.0"
frost-rerandomized = "2.0.0-rc.0"
frostd = { path = "frostd" }
futures = "0.3.31"
futures-util = "0.3.31"
halo2_gadgets = "0.3.0"
halo2_proofs = "0.3.0"
hex = "0.4.3"
itertools = "0.14.0"
lazy_static = "1.5.0"
message-io = "0.18"
orchard = "0.10.1"
participant = { path = "participant" }
postcard = "1.1.1"
rand = "0.8.5"
rand_core = "0.6.4"
rcgen = "0.13.2"
reddsa = { git = "https://github.com/ZcashFoundation/reddsa.git", rev = "ed49e9ca0699a6450f6d4a9fe62ff168f5ea1ead" }
regex = "1.11.1"
reqwest = "0.12.12"
rpassword = "7.3.1"
rustls = "0.23.21"
sapling-crypto = "0.4.0"
serde = "1.0.204"
serde-hex = "0.1.0"
serde_json = "1.0.138"
serde_with = "3.9.0"
serdect = "0.3.0"
snow = "0.9.6"
stable-eyre = "0.2"
tempfile = "3.16.0"
thiserror = "2.0.11"
tokio = "1.42"
toml = "0.8.19"
tower-http = "0.6.2"
tracing = "0.1"
tracing-subscriber = "0.3"
trusted-dealer = { path = "trusted-dealer" }
uuid = "1.11.0"
xeddsa = "1.0.2"
zcash_address = "0.6.2"
zcash_client_backend = "0.16.0"
zcash_encoding = "0.2.2"
zcash_keys = "0.6.0"
zcash_primitives = "0.21.0"
zcash_proofs = "0.21.0"
zcash_protocol = "0.4.3"

[patch.crates-io]
# TODO: remove this when https://github.com/zcash/orchard/issues/430 is fully
# addressed and a new release is made
Expand Down
40 changes: 20 additions & 20 deletions coordinator/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -6,26 +6,26 @@ edition = "2021"
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html

[dependencies]
async-trait = "0.1.85"
eyre = "0.6.12"
frost-core = { version = "2.0.0", features = ["serde"] }
frost-rerandomized = { version = "2.0.0-rc.0", features = ["serde"] }
frost-ed25519 = { version = "2.0.0", features = ["serde"] }
reddsa = { git = "https://github.com/ZcashFoundation/reddsa.git", rev = "ed49e9ca0699a6450f6d4a9fe62ff168f5ea1ead", features = ["frost", "serde"] }
hex = { version = "0.4", features = ["serde"] }
thiserror = "2.0"
rand = "0.8"
serde_json = "1.0"
serdect = { version = "0.3.0" }
clap = { version = "4.5.23", features = ["derive"] }
reqwest = { version = "0.12.12", features = ["json"] }
frostd = { path = "../frostd" }
participant = { path = "../participant" }
tokio = { version = "1", features = ["full"] }
message-io = "0.18"
rpassword = "7.3.1"
snow = "0.9.6"
xeddsa = "1.0.2"
async-trait = { workspace = true }
eyre = { workspace = true }
frost-core = { workspace = true, features = ["serde"] }
frost-rerandomized = { workspace = true, features = ["serde"] }
frost-ed25519 = { workspace = true, features = ["serde"] }
reddsa = { workspace = true, features = ["frost", "serde"] }
hex = { workspace = true, features = ["serde"] }
thiserror = { workspace = true }
rand = { workspace = true }
serde_json = { workspace = true }
serdect = { workspace = true }
clap = { workspace = true, features = ["derive"] }
reqwest = { workspace = true, features = ["json"] }
frostd = { workspace = true }
participant = { workspace = true }
tokio = { workspace = true, features = ["full"] }
message-io = { workspace = true }
rpassword = { workspace = true }
snow = { workspace = true }
xeddsa = { workspace = true }

[features]
default = []
32 changes: 16 additions & 16 deletions dkg/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -6,22 +6,22 @@ edition = "2021"
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html

[dependencies]
async-trait = "0.1"
eyre = "0.6.12"
frost-core = { version = "2.0.0", features = ["serde"] }
frost-ed25519 = { version = "2.0.0", features = ["serde"] }
reddsa = { git = "https://github.com/ZcashFoundation/reddsa.git", rev = "ed49e9ca0699a6450f6d4a9fe62ff168f5ea1ead", features = ["frost"] }
clap = { version = "4.5.23", features = ["derive"] }
hex = { version = "0.4", features = ["serde"] }
thiserror = "2.0"
rand = "0.8"
serde_json = "1.0"
frostd = { path = "../frostd" }
participant = { path = "../participant" }
xeddsa = "1.0.2"
reqwest = { version = "0.12.12", features = ["json"] }
tokio = { version = "1", features = ["full"] }
snow = "0.9.6"
async-trait = { workspace = true }
eyre = { workspace = true }
frost-core = { workspace = true, features = ["serde"] }
frost-ed25519 = { workspace = true, features = ["serde"] }
reddsa = { workspace = true, features = ["frost"] }
clap = { workspace = true, features = ["derive"] }
hex = { workspace = true, features = ["serde"] }
thiserror = { workspace = true }
rand = { workspace = true }
serde_json = { workspace = true }
frostd = { workspace = true }
participant = { workspace = true }
xeddsa = { workspace = true }
reqwest = { workspace = true, features = ["json"] }
tokio = { workspace = true, features = ["full"] }
snow = { workspace = true }

[features]
default = []
56 changes: 28 additions & 28 deletions frost-client/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -4,31 +4,31 @@ version = "0.1.0"
edition = "2021"

[dependencies]
clap = { version = "4.5.23", features = ["derive"] }
reqwest = { version = "0.12.12", features = ["json"] }
serde = { version = "1.0", features = ["derive"] }
snow = "0.9.6"
toml = "0.8.19"
frostd = { path = "../frostd" }
trusted-dealer = { path = "../trusted-dealer" }
coordinator = { path = "../coordinator" }
participant = { path = "../participant" }
dkg = { path = "../dkg" }
eyre = "0.6.12"
rpassword = "7.3.1"
dirs = "5.0.1"
hex = "0.4.3"
tokio = { version = "1.42", features = ["full"] }
serdect = "0.3.0"
bech32 = "0.11.0"
postcard = "1.1.1"
tempfile = "3.16.0"
serde_json = "1.0"
frost-core = { version = "2.0.0", features = ["serde"] }
frost-ed25519 = { version = "2.0.0", features = ["serde"] }
frost-rerandomized = { version = "2.0.0-rc.0", features = ["serde"] }
reddsa = { git = "https://github.com/ZcashFoundation/reddsa.git", rev = "ed49e9ca0699a6450f6d4a9fe62ff168f5ea1ead", features = ["frost"] }
rand = "0.8"
stable-eyre = "0.2"
itertools = "0.14.0"
xeddsa = "1.0.2"
clap = { workspace = true, features = ["derive"] }
reqwest = { workspace = true, features = ["json"] }
serde = { workspace = true, features = ["derive"] }
snow = { workspace = true }
toml = { workspace = true }
frostd = { workspace = true }
trusted-dealer = { workspace = true }
coordinator = { workspace = true }
participant = { workspace = true }
dkg = { workspace = true }
eyre = { workspace = true }
rpassword = { workspace = true }
dirs = { workspace = true }
hex = { workspace = true }
tokio = { workspace = true, features = ["full"] }
serdect = { workspace = true }
bech32 = { workspace = true }
postcard = { workspace = true }
tempfile = { workspace = true }
serde_json = { workspace = true }
frost-core = { workspace = true, features = ["serde"] }
frost-ed25519 = { workspace = true, features = ["serde"] }
frost-rerandomized = { workspace = true, features = ["serde"] }
reddsa = { workspace = true, features = ["frost"] }
rand = { workspace = true }
stable-eyre = { workspace = true }
itertools = { workspace = true }
xeddsa = { workspace = true }
71 changes: 34 additions & 37 deletions frostd/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -6,30 +6,30 @@ edition = "2021"
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html

[dependencies]
async-trait = "0.1"
axum = "0.8.1"
axum-extra = { version = "0.10.0", features = ["typed-header"] }
axum-server = { version = "0.7", features = ["tls-rustls"] }
clap = { version = "4.5.23", features = ["derive"] }
delay_map = "0.4.0"
derivative = "2.2.0"
eyre = "0.6.11"
frost-core = { version = "2.0.0", features = ["serde"] }
frost-rerandomized = { version = "2.0.0-rc.0", features = ["serde"] }
hex = "0.4"
rand = "0.8"
serde = { version = "1.0", features = ["derive"] }
serdect = { version = "0.3.0" }
serde_json = "1.0.138"
tokio = { version = "1.42", features = ["full"] }
tower-http = { version = "0.6.2", features = ["trace"] }
tracing = "0.1"
tracing-subscriber = { version = "0.3", features = ["env-filter"] }
uuid = { version = "1.11.0", features = ["v4", "fast-rng", "serde"] }
xeddsa = "1.0.2"
futures-util = "0.3.31"
futures = "0.3.31"
thiserror = "2.0.11"
async-trait = { workspace = true }
axum = { workspace = true }
axum-extra = { workspace = true, features = ["typed-header"] }
axum-server = { workspace = true, features = ["tls-rustls"] }
clap = { workspace = true, features = ["derive"] }
delay_map = { workspace = true }
derivative = { workspace = true }
eyre = { workspace = true }
frost-core = { workspace = true, features = ["serde"] }
frost-rerandomized = { workspace = true, features = ["serde"] }
hex = { workspace = true }
rand = { workspace = true }
serde = { workspace = true, features = ["derive"] }
serdect = { workspace = true }
serde_json = { workspace = true }
tokio = { workspace = true, features = ["full"] }
tower-http = { workspace = true, features = ["trace"] }
tracing = { workspace = true }
tracing-subscriber = { workspace = true, features = ["env-filter"] }
uuid = { workspace = true, features = ["v4", "fast-rng", "serde"] }
xeddsa = { workspace = true }
futures-util = { workspace = true }
futures = { workspace = true }
thiserror = { workspace = true }
# ring is enabled due to the following issue:
# - we enable rustls for reqwest because it's required to workaround an issue
# when adding root certificates (see test_http), and that imports rustls
Expand All @@ -39,21 +39,18 @@ thiserror = "2.0.11"
# - compiling just frostd does not require reqwest, but it tries to initialize
# the ring CryptoProvider, which is not available.
# For this reason we just simply always enable ring.
rustls = { version = "0.23.21", features = ["ring"] }
rustls = { workspace = true, features = ["ring"] }

[dev-dependencies]
axum-test = "17.2.0"
frost-ed25519 = { version = "2.0.0", features = ["serde"] }
reddsa = { git = "https://github.com/ZcashFoundation/reddsa.git", rev = "ed49e9ca0699a6450f6d4a9fe62ff168f5ea1ead", features = [
"frost",
"serde",
] }
reqwest = { version = "0.12.12", features = ["json", "rustls-tls-manual-roots"] }
regex = "1.11.1"
coordinator = { path = "../coordinator" }
rcgen = "0.13.2"
snow = "0.9.6"
tempfile = "3.16.0"
axum-test = { workspace = true }
frost-ed25519 = { workspace = true, features = ["serde"] }
reddsa = { workspace = true, features = ["frost", "serde"] }
reqwest = { workspace = true, features = ["json", "rustls-tls-manual-roots"] }
regex = { workspace = true }
coordinator = { workspace = true }
rcgen = { workspace = true }
snow = { workspace = true }
tempfile = { workspace = true }

[features]
default = []
40 changes: 20 additions & 20 deletions participant/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -6,26 +6,26 @@ edition = "2021"
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html

[dependencies]
async-trait = "0.1.85"
derivative = "2.2.0"
frost-core = { version = "2.0.0", features = ["serde"] }
frost-rerandomized = { version = "2.0.0-rc.0", features = ["serde"] }
frost-ed25519 = { version = "2.0.0", features = ["serde"] }
reddsa = { git = "https://github.com/ZcashFoundation/reddsa.git", rev = "ed49e9ca0699a6450f6d4a9fe62ff168f5ea1ead", features = ["frost"] }
hex = "0.4"
rand = "0.8"
eyre = "0.6.12"
exitcode = "1.1.2"
serde_json = "1.0"
serdect = { version = "0.3.0" }
clap = { version = "4.5.23", features = ["derive"] }
tokio = { version = "1", features = ["full"] }
message-io = "0.18"
reqwest = { version = "0.12.12", features = ["json"] }
frostd = { path = "../frostd" }
rpassword = "7.3.1"
snow = "0.9.6"
xeddsa = "1.0.2"
async-trait = { workspace = true }
derivative = { workspace = true }
frost-core = { workspace = true, features = ["serde"] }
frost-rerandomized = { workspace = true, features = ["serde"] }
frost-ed25519 = { workspace = true, features = ["serde"] }
reddsa = { workspace = true, features = ["frost"] }
hex = { workspace = true }
rand = { workspace = true }
eyre = { workspace = true }
exitcode = { workspace = true }
serde_json = { workspace = true }
serdect = { workspace = true }
clap = { workspace = true, features = ["derive"] }
tokio = { workspace = true, features = ["full"] }
message-io = { workspace = true }
reqwest = { workspace = true, features = ["json"] }
frostd = { workspace = true }
rpassword = { workspace = true }
snow = { workspace = true }
xeddsa = { workspace = true }

[features]
default = []
28 changes: 14 additions & 14 deletions tests/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -4,22 +4,22 @@ version = "0.1.0"
edition = "2021"

[dependencies]
frost-ed25519 = { version = "2.0.0", features = ["serde"] }
reddsa = { git = "https://github.com/ZcashFoundation/reddsa.git", rev = "ed49e9ca0699a6450f6d4a9fe62ff168f5ea1ead", features = ["frost"] }
hex = "0.4"
rand = "0.8"
exitcode = "1.1.2"
serde_json = "1.0"
tokio = { version = "1", features = ["full"] }
frost-ed25519 = { workspace = true, features = ["serde"] }
reddsa = { workspace = true, features = ["frost"] }
hex = { workspace = true }
rand = { workspace = true }
exitcode = { workspace = true }
serde_json = { workspace = true }
tokio = { workspace = true, features = ["full"] }

[dev-dependencies]
frost-ed25519 = { version = "2.0.0", features = ["serde"] }
dkg = { path = "../dkg"}
trusted-dealer = { path = "../trusted-dealer"}
participant = { path = "../participant"}
coordinator = { path = "../coordinator"}
frostd = { path = "../frostd"}
rand = "0.8"
frost-ed25519 = { workspace = true, features = ["serde"] }
dkg = { workspace = true }
trusted-dealer = { workspace = true }
participant = { workspace = true }
coordinator = { workspace = true }
frostd = { workspace = true }
rand = { workspace = true }

[features]
default = []
Loading

0 comments on commit 6f50c25

Please sign in to comment.