Merge pull request fedimint#4557 from maan2003/bump-all-deps

chore: backwards incompatible deps updates (1/n)

devimint/Cargo.toml

@@ -13,7 +13,7 @@ path = "src/main.rs"
 
 [dependencies]
 anyhow = { version = "1.0.81", features = ["backtrace"] }
-axum = { version = "0.6.20", features = ["tracing"] }
+axum = { version = "0.7.4", features = ["tracing"] }
 bitcoincore-rpc = "0.16.0"
 clap = { version = "4.5.2", features = ["derive", "env", "std", "help", "usage", "error-context", "suggestions"], default-features = false }
 cln-rpc = { workspace = true }
@@ -30,13 +30,13 @@ fedimint-testing = { path = "../fedimint-testing" }
 futures = "0.3.30"
 hex = "0.4.3"
 ln-gateway = { package = "fedimint-ln-gateway", path = "../gateway/ln-gateway" }
-nix = { version = "0.26.4", features = ["signal"] }
+nix = { version = "0.28.0", features = ["signal"] }
 rand = "0.8.5"
 semver = "1.0.22"
 serde_json = "1.0.114"
 tokio = { version = "1.36.0", features = ["full", "tracing"] }
 tonic_lnd = { workspace = true }
-tower-http = { version = "0.4.4", features = ["cors", "auth"] }
+tower-http = { version = "0.5.2", features = ["cors", "auth"] }
 tracing = "0.1.40"
 tracing-subscriber = "0.3.18"
 serde = "1.0.197"

devimint/src/bin/faucet.rs

@@ -11,6 +11,7 @@ use cln_rpc::primitives::{Amount as ClnAmount, AmountOrAny};
 use cln_rpc::ClnRpc;
 use fedimint_logging::TracingSetup;
 use ln_gateway::rpc::V1_API_ENDPOINT;
+use tokio::net::TcpListener;
 use tokio::sync::Mutex;
 use tower_http::cors::CorsLayer;
 
@@ -155,8 +156,7 @@ async fn main() -> anyhow::Result<()> {
         .layer(CorsLayer::permissive())
         .with_state(faucet);
 
-    axum::Server::bind(&cmd.bind_addr.parse()?)
-        .serve(router.into_make_service())
-        .await?;
+    let listener = TcpListener::bind(&cmd.bind_addr).await?;
+    axum::serve(listener, router.into_make_service()).await?;
     Ok(())
 }

fedimint-cli/Cargo.toml

@@ -23,7 +23,7 @@ path = "src/lib.rs"
 [dependencies]
 anyhow = "1.0.81"
 async-trait = "0.1.77"
-base64 = "0.21.7"
+base64 = "0.22.0"
 bip39 = { version = "2.0.0", features = ["rand"] }
 bitcoin = "0.29.2"
 bitcoin_hashes = "0.11.0"
@@ -54,7 +54,7 @@ tracing-subscriber = { version = "0.3.18", features = [ "env-filter" ] }
 serde_json = { version = "1.0.114", features = ["preserve_order"] }
 url = { version = "2.5.0", features = ["serde"] }
 clap_complete = "4.5.1"
-lnurl-rs = { version = "0.3.2", features = ["async"], default-features = false }
+lnurl-rs = { version = "0.4.1", features = ["async"], default-features = false }
 reqwest = { version = "0.11.26", features = [ "json", "rustls-tls" ], default-features = false }
 
 [build-dependencies]

fedimint-client/Cargo.toml

@@ -21,7 +21,7 @@ path = "src/lib.rs"
 
 [dependencies]
 anyhow = "1.0.81"
-aquamarine = "0.3.3"
+aquamarine = "0.5.0"
 async-stream = "0.3.5"
 async-trait = "0.1.77"
 bitcoin = "0.29.2"
@@ -31,13 +31,13 @@ fedimint-derive-secret = { version = "0.3.0-alpha", path = "../crypto/derive-sec
 fedimint-aead = { version = "0.3.0-alpha", path = "../crypto/aead" }
 fedimint-logging = { version = "0.3.0-alpha", path = "../fedimint-logging" }
 futures = "0.3.30"
-itertools = "0.10.5"
+itertools = "0.12.1"
 rand = "0.8.5"
 secp256k1-zkp = "0.7.0"
 serde = "1.0.197"
 serde_json = "1.0.114"
-strum = "0.24.1"
-strum_macros = "0.24.3"
+strum = "0.26.2"
+strum_macros = "0.26.2"
 thiserror = "1.0.58"
 tokio = { version = "1.36.0", features = [ "time", "macros" ] }
 tokio-stream = { version = "0.1.14", features = [ "time", "sync" ] }

fedimint-core/Cargo.toml

@@ -22,14 +22,14 @@ futures = "0.3.30"
 backtrace = "0.3.69"
 bincode = "1.3.3"
 bech32 = "0.9.1"
-itertools = "0.10.5"
+itertools = "0.12.1"
 jsonrpsee-types = { version = "0.22.2" }
-jsonrpsee-core = { version = "0.21.0", features = [ "client" ] }
+jsonrpsee-core = { version = "0.22.2", features = [ "client" ] }
 lru = "0.12.3"
 serde = { version = "1.0.197", features = [ "derive" ] }
 serde_json = "1.0.114"
-strum = "0.24"
-strum_macros = "0.24"
+strum = "0.26"
+strum_macros = "0.26"
 hex = { version = "0.4.3", features = [ "serde"] }
 sha3 = "0.10.8"
 tbs = { package = "fedimint-tbs", version = "0.3.0-alpha", path = "../crypto/tbs" }
@@ -41,32 +41,32 @@ url = { version = "2.5.0", features = ["serde"] }
 bitcoin = { version = "0.29.2", features = [ "rand", "serde" ] }
 bitcoin30 = { package = "bitcoin", version = "0.30.2" }
 bitcoin_hashes = { version = "0.11", features = ["serde"] }
-erased-serde = "0.3"
+erased-serde = "0.4"
 lightning = "0.0.118"
 lightning-invoice = "0.26.0"
 fedimint-derive = { version = "0.3.0-alpha", path = "../fedimint-derive" }
 fedimint-logging = { version = "0.3.0-alpha", path = "../fedimint-logging" }
 rand = "0.8.5"
 miniscript = { version = "10.0.0", features = [ "compiler", "serde" ] }
 secp256k1-zkp = { version = "0.7.0", features = [ "use-serde", "bitcoin_hashes", "global-context" ] }
-macro_rules_attribute = "0.1.3"
+macro_rules_attribute = "0.2.0"
 bitvec = "1.0.1"
 parity-scale-codec = { version = "3.6.9", features = ["derive"] }
 imbl = "2.0.3"
 
 [target.'cfg(not(target_family = "wasm"))'.dependencies]
-jsonrpsee-ws-client = { version = "0.21.0", features = ["webpki-tls"], default-features = false }
+jsonrpsee-ws-client = { version = "0.22.2", features = ["webpki-tls"], default-features = false }
 tokio = { version = "1.36.0", features = ["full", "tracing"] }
 tokio-rustls = "0.23.4"
 
 [target.'cfg(target_family = "wasm")'.dependencies]
-jsonrpsee-wasm-client = { version = "0.21.0", default-features = false }
-async-lock = "2.8"
+jsonrpsee-wasm-client = { version = "0.22.2", default-features = false }
+async-lock = "3.3"
 # getrandom is transitive dependency of rand
 # on wasm, we need to enable the js backend
 # see https://docs.rs/getrandom/latest/getrandom/#indirect-dependencies and https://docs.rs/getrandom/latest/getrandom/#webassembly-support
 getrandom = { version = "0.2.12", features = [ "js" ] }
-gloo-timers = { version = "0.2.6", features = ["futures"] }
+gloo-timers = { version = "0.3.0", features = ["futures"] }
 wasm-bindgen-futures = "0.4.42"
 js-sys = "0.3.69"
 

fedimint-dbtool/Cargo.toml

@@ -34,13 +34,13 @@ fedimint-logging = { version = "0.3.0-alpha", path = "../fedimint-logging" }
 fedimint-wallet-server = { version = "0.3.0-alpha", path = "../modules/fedimint-wallet-server" }
 fedimint-wallet-client = { version = "0.3.0-alpha", path = "../modules/fedimint-wallet-client" }
 futures = "0.3.30"
-erased-serde = "0.3"
+erased-serde = "0.4"
 hex = { version = "0.4.3", features = ["serde"] }
 ln-gateway = { package = "fedimint-ln-gateway", version = "0.3.0-alpha", path = "../gateway/ln-gateway" }
 serde = { version = "1.0.197", features = ["derive"] }
 serde_json = "1.0.114"
-strum = "0.24"
-strum_macros = "0.24"
+strum = "0.26"
+strum_macros = "0.26"
 tokio = "1.36.0"
 tracing = "0.1.40"
 

fedimint-derive/Cargo.toml

@@ -17,7 +17,7 @@ path = "src/lib.rs"
 diagnostics = []
 
 [dependencies]
-itertools = "0.11.0"
+itertools = "0.12.1"
 proc-macro2 = "1.0"
 quote = "1.0"
-syn = { version = "1.0", features = ["full"] }
+syn = { version = "2.0", features = ["full"] }

fedimint-derive/src/lib.rs

@@ -14,7 +14,7 @@ fn do_not_ignore(field: &Field) -> bool {
     !field
         .attrs
         .iter()
-        .any(|attr| attr.path.is_ident("encodable_ignore"))
+        .any(|attr| attr.path().is_ident("encodable_ignore"))
 }
 
 fn panic_if_ignored(field: &Field) -> bool {
@@ -28,7 +28,7 @@ fn is_default_variant_enforce_valid(variant: &Variant) -> bool {
     let is_default = variant
         .attrs
         .iter()
-        .any(|attr| attr.path.is_ident("encodable_default"));
+        .any(|attr| attr.path().is_ident("encodable_default"));
 
     if is_default {
         assert_eq!(

fedimint-load-test-tool/Cargo.toml

@@ -13,7 +13,7 @@ path = "src/main.rs"
 
 [dependencies]
 anyhow = "1"
-base64 = "0.21.7"
+base64 = "0.22.0"
 bitcoin = "0.29.2"
 clap = { version = "4.5.2", features = ["derive", "std", "help", "usage", "error-context", "suggestions", "env" ], default-features = false }
 devimint = { version = "0.3.0-alpha", path = "../devimint" }
@@ -26,7 +26,7 @@ fedimint-mint-client = { version = "0.3.0-alpha", path = "../modules/fedimint-mi
 fedimint-rocksdb = { version = "0.3.0-alpha", path = "../fedimint-rocksdb" }
 fedimint-wallet-client = { version = "0.3.0-alpha", path = "../modules/fedimint-wallet-client" }
 futures = "0.3"
-jsonrpsee-core = { version = "0.21.0", features = [ "client" ] }
+jsonrpsee-core = { version = "0.22.2", features = [ "client" ] }
 jsonrpsee-types = { version = "0.22.2" }
 lightning-invoice = { version = "0.26.0", features = [ "serde" ] }
 rand = "0.8"
@@ -37,7 +37,7 @@ tracing = "0.1"
 url = { version = "2.5.0", features = ["serde"] }
 
 [target.'cfg(not(target_family = "wasm"))'.dependencies]
-jsonrpsee-ws-client = { version = "0.21.0", features = ["webpki-tls"], default-features = false }
+jsonrpsee-ws-client = { version = "0.22.2", features = ["webpki-tls"], default-features = false }
 
 [build-dependencies]
 fedimint-build = { version = "0.3.0-alpha", path = "../fedimint-build" }

fedimint-logging/Cargo.toml

@@ -20,8 +20,8 @@ telemetry = ["tracing-opentelemetry", "opentelemetry-jaeger", "tracing-chrome",
 [dependencies]
 anyhow = "1.0.81"
 tracing-subscriber = { version = "0.3.18", features = [ "env-filter" ] }
-tracing-opentelemetry = { version = "0.20.0", optional = true}
-opentelemetry = { version = "0.20.0", optional = true }
-opentelemetry-jaeger = { version = "0.19.0", optional = true }
-console-subscriber = { version = "0.1.10", optional = true }
+tracing-opentelemetry = { version = "0.23.0", optional = true}
+opentelemetry = { version = "0.22.0", optional = true }
+opentelemetry-jaeger = { version = "0.21.0", optional = true }
+console-subscriber = { version = "0.2.0", optional = true }
 tracing-chrome = { version = "0.7.1", optional = true}

fedimint-metrics/Cargo.toml

@@ -16,7 +16,7 @@ path = "./src/lib.rs"
 
 [dependencies]
 anyhow = { version = "1.0.81", features = ["backtrace"] }
-axum = "0.6.20"
+axum = "0.7.4"
 fedimint-core = { version = "0.3.0-alpha", path = "../fedimint-core" }
 lazy_static = "1.4.0"
 prometheus = "0.13.3"

fedimint-metrics/src/lib.rs

@@ -9,6 +9,7 @@ pub use prometheus::{
     self, histogram_opts, opts, register_histogram, register_int_counter, Encoder, Histogram,
     IntCounter, TextEncoder,
 };
+use tokio::net::TcpListener;
 use tracing::error;
 
 async fn get_metrics() -> (StatusCode, String) {
@@ -30,13 +31,14 @@ pub async fn run_api_server(
     task_group: &mut TaskGroup,
 ) -> anyhow::Result<TaskShutdownToken> {
     let app = Router::new().route("/metrics", get(get_metrics));
-    let server = axum::Server::bind(bind_address).serve(app.into_make_service());
+    let listener = TcpListener::bind(bind_address).await?;
+    let serve = axum::serve(listener, app.into_make_service());
 
     let handle = task_group.make_handle();
     let shutdown_rx = handle.make_shutdown_rx().await;
     task_group
         .spawn("Metrics Api", move |_| async move {
-            let graceful = server.with_graceful_shutdown(async {
+            let graceful = serve.with_graceful_shutdown(async {
                 shutdown_rx.await;
             });
 

fedimint-server/Cargo.toml

@@ -28,7 +28,7 @@ bitcoin_hashes = "0.11.0"
 bytes = "1.5.0"
 futures = "0.3.30"
 hex = "0.4.3"
-itertools = "0.10.5"
+itertools = "0.12.1"
 fedimint-core = { version = "0.3.0-alpha", path = "../fedimint-core" }
 fedimint-logging = { version = "0.3.0-alpha", path = "../fedimint-logging" }
 rand = "0.8"
@@ -38,8 +38,8 @@ rand_chacha = "0.3.1"
 serde = { version = "1.0.197", features = [ "derive" ] }
 serde_json = "1.0.114"
 sha3 = "0.10.8"
-strum = "0.24"
-strum_macros = "0.24"
+strum = "0.26"
+strum_macros = "0.26"
 tar = "0.4.40"
 tbs = { package = "fedimint-tbs", version = "0.3.0-alpha", path = "../crypto/tbs" }
 thiserror = "1.0.58"

fedimintd/Cargo.toml

@@ -33,7 +33,7 @@ bitcoin = "0.29.2"
 bytes = "1.5.0"
 clap = { version = "4.5.2", features = ["derive", "std", "help", "usage", "error-context", "suggestions", "env"], default-features = false }
 futures = "0.3.30"
-itertools = "0.10.5"
+itertools = "0.12.1"
 jsonrpsee = { version = "0.22.2", features = ["server"] }
 fedimint-bitcoind = { version = "0.3.0-alpha", path = "../fedimint-bitcoind" }
 fedimint-core = { version = "0.3.0-alpha", path = "../fedimint-core" }
@@ -63,12 +63,12 @@ url = { version = "2.5.0", features = ["serde"] }
 threshold_crypto = { workspace = true }
 
 # setup dependencies
-axum = { version = "0.6.20", default-features = false, features = [ "form", "tokio" ] }
+axum = { version = "0.7.4", default-features = false, features = [ "form", "tokio" ] }
 http = "1.1"
 http-body = "1.0"
 hyper = { version = "1.2", features = ["full"] }
 tower = { version = "0.4", features = ["util"] }
-console-subscriber = "0.1.10"
+console-subscriber = "0.2.0"
 
 [build-dependencies]
 fedimint-build = { version = "0.3.0-alpha", path = "../fedimint-build" }

gateway/cli/Cargo.toml

@@ -19,8 +19,8 @@ path = "src/main.rs"
 [dependencies]
 anyhow = "1.0.81"
 async-trait = "0.1.77"
-axum = "0.6.20"
-axum-macros = "0.3.8"
+axum = "0.7.4"
+axum-macros = "0.4.1"
 bitcoin = { version = "0.29.2", features = ["serde"] }
 clap = { version = "4.5.2", features = ["derive", "std", "help", "usage", "error-context", "suggestions"], default-features = false }
 ln-gateway = { version = "0.3.0-alpha", package = "fedimint-ln-gateway", path= "../ln-gateway" }

gateway/ln-gateway/Cargo.toml

@@ -30,9 +30,9 @@ path = "tests/integration_tests.rs"
 anyhow = "1.0.81"
 async-stream = "0.3.5"
 async-trait = "0.1.77"
-axum = "0.6.20"
-axum-macros = "0.3.8"
-aquamarine = "0.3.3"
+axum = "0.7.4"
+axum-macros = "0.4.1"
+aquamarine = "0.5.0"
 bitcoin = { version = "0.29.2", features = ["serde"] }
 bitcoin_hashes = "0.11.0"
 clap = { version = "4.5.2", features = ["derive", "std", "help", "usage", "error-context", "suggestions", "env"], default-features = false }
@@ -49,7 +49,7 @@ fedimint-mint-client = { version = "0.3.0-alpha", path = "../../modules/fedimint
 fedimint-dummy-client = { version = "0.3.0-alpha", path = "../../modules/fedimint-dummy-client" }
 fedimint-wallet-client = { version = "0.3.0-alpha", path = "../../modules/fedimint-wallet-client" }
 futures = "0.3.30"
-erased-serde = "0.3"
+erased-serde = "0.4"
 lightning-invoice = "0.26.0"
 prost = "0.12.3"
 rand = "0.8"
@@ -58,14 +58,14 @@ secp256k1 = "0.24.3"
 secp256k1-zkp = { version = "0.7.0", features = [ "serde", "bitcoin_hashes" ] }
 serde = { version = "1.0", features = ["derive"] }
 serde_json = "1.0.114"
-strum = "0.24"
-strum_macros = "0.24"
+strum = "0.26"
+strum_macros = "0.26"
 thiserror = "1.0.58"
 tokio = { version = "1.36", features = ["full"] }
 tokio-stream = "0.1.14"
-tonic = { version = "0.10.2", features = ["transport", "tls"] }
+tonic = { version = "0.11.0", features = ["transport", "tls"] }
 tonic_lnd = { workspace = true }
-tower-http = { version = "0.4.4", features = ["cors", "auth"] }
+tower-http = { version = "0.5.2", features = ["cors", "auth"] }
 tracing = { version = "0.1.40", default-features = false, features= ["log", "attributes", "std"] }
 url = { version = "2.5.0", features = ["serde"] }
 
@@ -86,4 +86,4 @@ assert_matches = "1.5.0"
 
 [build-dependencies]
 fedimint-build = { version = "0.3.0-alpha", path = "../../fedimint-build" }
-tonic-build = "0.10.2"
+tonic-build = "0.11.0"

gateway/ln-gateway/src/rpc/rpc_server.rs

@@ -8,6 +8,7 @@ use bitcoin_hashes::hex::ToHex;
 use fedimint_core::task::TaskGroup;
 use fedimint_ln_client::pay::PayInvoicePayload;
 use serde_json::json;
+use tokio::net::TcpListener;
 use tower_http::cors::CorsLayer;
 use tower_http::validate_request::ValidateRequestHeaderLayer;
 use tracing::{error, instrument};
@@ -25,7 +26,7 @@ pub async fn run_webserver(
     bind_addr: SocketAddr,
     gateway: Gateway,
     task_group: &mut TaskGroup,
-) -> axum::response::Result<()> {
+) -> anyhow::Result<()> {
     let v1_routes = v1_routes(config, gateway.clone());
     let api_v1 = Router::new()
         .nest(&format!("/{V1_API_ENDPOINT}"), v1_routes.clone())
@@ -34,10 +35,11 @@ pub async fn run_webserver(
 
     let handle = task_group.make_handle();
     let shutdown_rx = handle.make_shutdown_rx().await;
-    let server = axum::Server::bind(&bind_addr).serve(api_v1.into_make_service());
+    let listener = TcpListener::bind(&bind_addr).await?;
+    let serve = axum::serve(listener, api_v1.into_make_service());
     task_group
         .spawn("Gateway Webserver", move |_| async move {
-            let graceful = server.with_graceful_shutdown(async {
+            let graceful = serve.with_graceful_shutdown(async {
                 shutdown_rx.await;
             });