diff --git a/Cargo.lock b/Cargo.lock index 704d614b..2ae7522e 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -898,7 +898,7 @@ dependencies = [ "hex", "http-body 0.4.6", "hyper 0.14.28", - "hyper-rustls", + "hyper-rustls 0.24.2", "prost 0.12.3", "rustls 0.21.10", "rustls-pemfile", @@ -1394,6 +1394,23 @@ dependencies = [ "tokio-rustls 0.24.1", ] +[[package]] +name = "hyper-rustls" +version = "0.26.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a0bea761b46ae2b24eb4aef630d8d1c398157b6fc29e6350ecf090a0b70c952c" +dependencies = [ + "futures-util", + "http 1.1.0", + "hyper 1.2.0", + "hyper-util", + "rustls 0.22.2", + "rustls-pki-types", + "tokio", + "tokio-rustls 0.25.0", + "tower-service", +] + [[package]] name = "hyper-timeout" version = "0.4.1" @@ -1832,14 +1849,14 @@ dependencies = [ "fedimint-tonic-lnd", "hex", "http-body-util", - "hyper 0.14.28", + "hyper 1.2.0", "lightning-invoice 0.26.0", "mockall", "moksha-core", "opentelemetry", "opentelemetry-otlp", "opentelemetry_sdk", - "reqwest 0.11.27", + "reqwest 0.12.1", "secp256k1 0.28.2", "serde", "serde_json", @@ -1872,7 +1889,7 @@ dependencies = [ "lightning-invoice 0.29.0", "mockall", "moksha-core", - "reqwest 0.11.27", + "reqwest 0.12.1", "rexie", "secp256k1 0.28.2", "serde", @@ -2550,7 +2567,6 @@ dependencies = [ "http 0.2.12", "http-body 0.4.6", "hyper 0.14.28", - "hyper-rustls", "ipnet", "js-sys", "log", @@ -2558,22 +2574,17 @@ dependencies = [ "once_cell", "percent-encoding", "pin-project-lite", - "rustls 0.21.10", - "rustls-pemfile", "serde", "serde_json", "serde_urlencoded", "sync_wrapper", "system-configuration", "tokio", - "tokio-rustls 0.24.1", - "tokio-socks", "tower-service", "url", "wasm-bindgen", "wasm-bindgen-futures", "web-sys", - "webpki-roots", "winreg", ] @@ -2591,6 +2602,7 @@ dependencies = [ "http-body 1.0.0", "http-body-util", "hyper 1.2.0", + "hyper-rustls 0.26.0", "hyper-util", "ipnet", "js-sys", @@ -2599,16 +2611,22 @@ dependencies = [ "once_cell", "percent-encoding", "pin-project-lite", + "rustls 0.22.2", + "rustls-pemfile", + "rustls-pki-types", "serde", "serde_json", "serde_urlencoded", "sync_wrapper", "tokio", + "tokio-rustls 0.25.0", + "tokio-socks", "tower-service", "url", "wasm-bindgen", "wasm-bindgen-futures", "web-sys", + "webpki-roots 0.26.1", "winreg", ] @@ -2750,10 +2768,24 @@ checksum = "f9d5a6813c0759e4609cd494e8e725babae6a2ca7b62a5536a13daaec6fcb7ba" dependencies = [ "log", "ring 0.17.8", - "rustls-webpki", + "rustls-webpki 0.101.7", "sct", ] +[[package]] +name = "rustls" +version = "0.22.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e87c9956bd9807afa1f77e0f7594af32566e830e088a5576d27c5b6f30f49d41" +dependencies = [ + "log", + "ring 0.17.8", + "rustls-pki-types", + "rustls-webpki 0.102.2", + "subtle", + "zeroize", +] + [[package]] name = "rustls-pemfile" version = "1.0.4" @@ -2763,6 +2795,12 @@ dependencies = [ "base64 0.21.7", ] +[[package]] +name = "rustls-pki-types" +version = "1.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "868e20fada228fefaf6b652e00cc73623d54f8171e7352c18bb281571f2d92da" + [[package]] name = "rustls-webpki" version = "0.101.7" @@ -2773,6 +2811,17 @@ dependencies = [ "untrusted 0.9.0", ] +[[package]] +name = "rustls-webpki" +version = "0.102.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "faaa0a62740bedb9b2ef5afa303da42764c012f743917351dc9a237ea1663610" +dependencies = [ + "ring 0.17.8", + "rustls-pki-types", + "untrusted 0.9.0", +] + [[package]] name = "rustversion" version = "1.0.14" @@ -3157,7 +3206,7 @@ dependencies = [ "tracing", "url", "uuid", - "webpki-roots", + "webpki-roots 0.25.4", ] [[package]] @@ -3564,6 +3613,17 @@ dependencies = [ "tokio", ] +[[package]] +name = "tokio-rustls" +version = "0.25.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "775e0c0f0adb3a2f22a00c4745d728b479985fc15ee7ca6a2608388c5569860f" +dependencies = [ + "rustls 0.22.2", + "rustls-pki-types", + "tokio", +] + [[package]] name = "tokio-socks" version = "0.5.1" @@ -4175,6 +4235,15 @@ version = "0.25.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5f20c57d8d7db6d3b86154206ae5d8fba62dd39573114de97c2cb0578251f8e1" +[[package]] +name = "webpki-roots" +version = "0.26.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b3de34ae270483955a94f4b21bdaaeb83d508bb84a01435f393818edb0012009" +dependencies = [ + "rustls-pki-types", +] + [[package]] name = "which" version = "4.4.2" diff --git a/integrationtests/Cargo.toml b/integrationtests/Cargo.toml index 42fb0489..31732b94 100644 --- a/integrationtests/Cargo.toml +++ b/integrationtests/Cargo.toml @@ -28,7 +28,7 @@ fedimint-tonic-lnd = { version = "0.2.0", features = ["lightningrpc", "walletrpc url = "2.5.0" moksha-mint = { path = "../moksha-mint" } hex = "0.4.3" -reqwest = { version = "0.12.0", default-features = false } +reqwest = { version = "0.12.1", default-features = false } [target.'cfg(not(target_family="wasm"))'.dependencies] tokio = { version = "1.35.1", features = ["sync", "rt-multi-thread"] } @@ -36,7 +36,7 @@ tokio = { version = "1.35.1", features = ["sync", "rt-multi-thread"] } [dev-dependencies] anyhow = { version = "1.0.80", features = ["backtrace"] } tokio = { version = "1.36.0", features = ["full"] } -reqwest = { version = "0.12.0", default-features = false } +reqwest = { version = "0.12.1", default-features = false } moksha-mint = { path = "../moksha-mint" } moksha-wallet = { path = "../moksha-wallet" } moksha-core = { path = "../moksha-core" } diff --git a/moksha-mint/Cargo.toml b/moksha-mint/Cargo.toml index 4b9de302..fa63d75f 100644 --- a/moksha-mint/Cargo.toml +++ b/moksha-mint/Cargo.toml @@ -22,7 +22,7 @@ hex = "0.4.3" async-trait = "0.1.74" anyhow = { version = "1.0.75", features = ["backtrace"] } axum = { version = "0.7.4", features = ["http2"] } -hyper = "0.14.28" +hyper = "1" serde = { version = "1.0.193", features = ["derive"] } serde_json = "1.0.108" tokio = { version = "1.36.0", features = ["full"] } @@ -32,7 +32,7 @@ secp256k1 = { version = "0.28.2", default-features = false, features = ["rand", thiserror = "1.0.50" moksha-core = { path = "../moksha-core", version = "0.2.1" } lightning-invoice = "0.26.0" -reqwest = { version = "0.11.25", default-features = false, features = ["serde_json", "json", "rustls-tls", "socks"] } +reqwest = { version = "0.12.1", default-features = false, features = ["json", "rustls-tls", "socks"] } url = "2.4.1" dotenvy = "0.15.7" fedimint-tonic-lnd = { version = "0.2.0", features = ["lightningrpc", "walletrpc"] } diff --git a/moksha-wallet/Cargo.toml b/moksha-wallet/Cargo.toml index 781bc67d..3a4b74d1 100644 --- a/moksha-wallet/Cargo.toml +++ b/moksha-wallet/Cargo.toml @@ -33,7 +33,7 @@ rexie = "0.5.0" tokio = { version = "1.35.1", features = ["rt", "sync"] } [target.'cfg(not(target_family="wasm"))'.dependencies] -reqwest = { version = "0.11.25", features = ["serde_json", "json", "rustls-tls"], default-features = false } +reqwest = { version = "0.12.1", features = ["json", "rustls-tls"], default-features = false } tokio = { version = "1.35.1", features = ["rt", "rt-multi-thread", "macros"] } sqlx = { version = "0.7.4", default-features = false, features = ["sqlite", "runtime-tokio", "tls-rustls", "migrate", "macros"] }