From 84ac759d4eac39d573a9bfb097c7af205ec683cb Mon Sep 17 00:00:00 2001 From: thesimplekid Date: Tue, 21 Jan 2025 23:12:04 +0000 Subject: [PATCH] feat: tonic msrv --- crates/cdk-cli/Cargo.toml | 2 +- crates/cdk-mint-rpc/Cargo.toml | 16 +++++++++++----- crates/cdk-mint-rpc/src/bin/mint_rpc_cli.rs | 2 +- crates/cdk-mintd/Cargo.toml | 2 +- flake.nix | 7 +++++++ 5 files changed, 21 insertions(+), 8 deletions(-) diff --git a/crates/cdk-cli/Cargo.toml b/crates/cdk-cli/Cargo.toml index 640ad7494..254e2e2fc 100644 --- a/crates/cdk-cli/Cargo.toml +++ b/crates/cdk-cli/Cargo.toml @@ -17,7 +17,7 @@ bip39 = "2.0" cdk = { path = "../cdk", version = "0.6.0", default-features = false, features = ["wallet"]} cdk-redb = { path = "../cdk-redb", version = "0.6.0", default-features = false, features = ["wallet"] } cdk-sqlite = { path = "../cdk-sqlite", version = "0.6.0", default-features = false, features = ["wallet"] } -clap = { version = "4.4.8", features = ["derive", "env", "default"] } +clap = { version = "~4.0.32", features = ["derive"] } serde = { version = "1", default-features = false, features = ["derive"] } serde_json = "1" tokio = { version = "1", default-features = false } diff --git a/crates/cdk-mint-rpc/Cargo.toml b/crates/cdk-mint-rpc/Cargo.toml index e69c1d440..12b2296ed 100644 --- a/crates/cdk-mint-rpc/Cargo.toml +++ b/crates/cdk-mint-rpc/Cargo.toml @@ -12,11 +12,15 @@ anyhow = "1" cdk = { path = "../cdk", version = "0.6.0", default-features = false, features = [ "mint", ] } -clap = { version = "4.4.8", features = ["derive", "env", "default"] } -tonic = { version = "0.12.2", features = [ +clap = { version = "~4.0.32", features = ["derive"] } +# tonic = { version = ">=0.9, <0.12", features = [ +# "channel", +# "tls", +# "tls-webpki-roots", +# ] } +tonic = { version = "0.9", features = [ "channel", "tls", - "tls-native-roots", "tls-webpki-roots", ] } tracing = { version = "0.1", default-features = false, features = [ @@ -28,8 +32,10 @@ tokio = { version = "1", default-features = false } serde_json = "1" serde = { version = "1", features = ["derive"] } thiserror = "1" -prost = "0.13.3" +# prost = ">=0.11.0, <0.13.0" +prost = "0.11.0" [build-dependencies] -tonic-build = "0.12.2" +# tonic-build = ">=0.9, <0.12" +tonic-build = "0.9" diff --git a/crates/cdk-mint-rpc/src/bin/mint_rpc_cli.rs b/crates/cdk-mint-rpc/src/bin/mint_rpc_cli.rs index 774662f43..b50d12456 100644 --- a/crates/cdk-mint-rpc/src/bin/mint_rpc_cli.rs +++ b/crates/cdk-mint-rpc/src/bin/mint_rpc_cli.rs @@ -65,7 +65,7 @@ async fn main() -> Result<(), Box> { tracing_subscriber::fmt().with_env_filter(env_filter).init(); let cli = Cli::parse(); - let tls_config = ClientTlsConfig::new().with_enabled_roots(); + let tls_config = ClientTlsConfig::new(); let channel = Channel::from_shared(cli.addr.to_string())? .tls_config(tls_config)? .connect() diff --git a/crates/cdk-mintd/Cargo.toml b/crates/cdk-mintd/Cargo.toml index 0997a4dc4..000f80edc 100644 --- a/crates/cdk-mintd/Cargo.toml +++ b/crates/cdk-mintd/Cargo.toml @@ -30,7 +30,7 @@ cdk-strike = { path = "../cdk-strike", version = "0.6.0" } cdk-axum = { path = "../cdk-axum", version = "0.6.0", default-features = false } cdk-mint-rpc = { path = "../cdk-mint-rpc", version = "0.1.0", default-features = false } config = { version = "0.13.3", features = ["toml"] } -clap = { version = "4.4.8", features = ["derive", "env", "default"] } +clap = { version = "~4.0.32", features = ["derive"] } tokio = { version = "1", default-features = false } tracing = { version = "0.1", default-features = false, features = [ "attributes", diff --git a/flake.nix b/flake.nix index 0ecd721e4..67dd95e5d 100644 --- a/flake.nix +++ b/flake.nix @@ -242,6 +242,13 @@ cargo update -p async-compression --precise 0.4.3 cargo update -p zstd-sys --precise 2.0.8+zstd.1.5.5 + cargo update -p clap_lex --precise 0.3.0 + cargo update -p regex --precise 1.9.6 + cargo update -p petgraph --precise 0.6.2 + cargo update -p hashbrown@0.15.2 --precise 0.15.0 + cargo update -p async-stream --precise 0.3.5 + cargo update -p home --precise 0.5.5 + # For wasm32-unknown-unknown target cargo update -p bumpalo --precise 3.12.0 cargo update -p moka --precise 0.11.1