diff --git a/Cargo.toml b/Cargo.toml index 47f2ef724..a195f73af 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -48,11 +48,11 @@ sqlx = { version = "0.8", features = [ ] } # Redis -redis = { version = "0.27", features = ["tokio-comp", "connection-manager"] } -deadpool-redis = { version = "0.18", features = ["rt_tokio_1"] } +redis = { version = "0.32", features = ["tokio-comp", "connection-manager"] } +deadpool-redis = { version = "0.23", features = ["rt_tokio_1"] } # Nostr -nostr = { version = "0.36" } +nostr = { version = "0.44" } # Serialization serde = { version = "1", features = ["derive"] } diff --git a/Dockerfile b/Dockerfile index bd41102a2..d0a357325 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,6 +1,6 @@ # ── Build stage (Rust) ────────────────────────────────────── # Hard-code --platform to prevent exec format error on ARM Macs. -FROM --platform=linux/amd64 rust:1.93-bookworm AS builder +FROM --platform=linux/amd64 rust:1.95-bookworm AS builder WORKDIR /build COPY . . RUN cargo build --release -p sprout-relay \ diff --git a/crates/sprout-pair-relay/Cargo.toml b/crates/sprout-pair-relay/Cargo.toml index a4b727895..2b993270a 100644 --- a/crates/sprout-pair-relay/Cargo.toml +++ b/crates/sprout-pair-relay/Cargo.toml @@ -25,12 +25,12 @@ parking_lot = "0.12" hyper = { version = "1", features = ["server", "http1"] } hyper-util = { version = "0.1", features = ["tokio"] } http-body-util = "0.1" -secp256k1 = { version = "0.29", features = ["global-context"] } -sha2 = "0.10" +secp256k1 = { version = "0.31", features = ["global-context"] } +sha2 = "0.11" [dev-dependencies] tokio = { workspace = true, features = ["test-util"] } tokio-tungstenite = { workspace = true } -secp256k1 = { version = "0.29", features = ["global-context", "rand-std"] } -sha2 = "0.10" -rand = "0.8" +secp256k1 = { version = "0.31", features = ["global-context", "rand-std"] } +sha2 = "0.11" +rand = "0.10" diff --git a/desktop/src-tauri/Cargo.lock b/desktop/src-tauri/Cargo.lock index b6b24ae41..51f928ed7 100644 --- a/desktop/src-tauri/Cargo.lock +++ b/desktop/src-tauri/Cargo.lock @@ -403,16 +403,6 @@ dependencies = [ "tracing", ] -[[package]] -name = "base58ck" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2c8d66485a3a2ea485c1913c4572ce0256067a5377ac8c75c4960e1cda98605f" -dependencies = [ - "bitcoin-internals", - "bitcoin_hashes", -] - [[package]] name = "base64" version = "0.21.7" @@ -463,49 +453,12 @@ version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5e764a1d40d510daf35e07be9eb06e75770908c27d411ee6c92109c9840eaaf7" -[[package]] -name = "bitcoin" -version = "0.32.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e499f9fc0407f50fe98af744ab44fa67d409f76b6772e1689ec8485eb0c0f66" -dependencies = [ - "base58ck", - "bech32", - "bitcoin-internals", - "bitcoin-io", - "bitcoin-units", - "bitcoin_hashes", - "hex-conservative", - "hex_lit", - "secp256k1", - "serde", -] - -[[package]] -name = "bitcoin-internals" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "30bdbe14aa07b06e6cfeffc529a1f099e5fbe249524f8125358604df99a4bed2" -dependencies = [ - "serde", -] - [[package]] name = "bitcoin-io" version = "0.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2dee39a0ee5b4095224a0cfc6bf4cc1baf0f9624b96b367e53b66d974e51d953" -[[package]] -name = "bitcoin-units" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5285c8bcaa25876d07f37e3d30c303f2609179716e11d688f51e8f1fe70063e2" -dependencies = [ - "bitcoin-internals", - "serde", -] - [[package]] name = "bitcoin_hashes" version = "0.14.1" @@ -648,6 +601,15 @@ dependencies = [ "bzip2-sys", ] +[[package]] +name = "bzip2" +version = "0.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f3a53fac24f34a81bc9954b5d6cfce0c21e18ec6959f44f56e8e90e4bb7c346c" +dependencies = [ + "libbz2-rs-sys", +] + [[package]] name = "bzip2-sys" version = "0.1.13+1.0.8" @@ -1324,7 +1286,7 @@ dependencies = [ "libc", "option-ext", "redox_users", - "windows-sys 0.61.2", + "windows-sys 0.59.0", ] [[package]] @@ -1435,12 +1397,9 @@ checksum = "d0881ea181b1df73ff77ffaaf9c7544ecc11e82fba9b5f27b262a3c73a332555" [[package]] name = "earshot" -version = "1.0.0" +version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d393a8f23619412e0502df1b94cd148e34855a50a4143d365cc6336cc338b4f4" -dependencies = [ - "libm", -] +checksum = "7984231f8b4c72eb3b88c70040dc1e4ff6803fa9169e93c0ac465942d74fa36a" [[package]] name = "either" @@ -1528,7 +1487,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "39cab71617ae0d63f51a36d69f866391735b51691dbda63cf6f96d042b63efeb" dependencies = [ "libc", - "windows-sys 0.61.2", + "windows-sys 0.52.0", ] [[package]] @@ -2204,12 +2163,6 @@ dependencies = [ "arrayvec", ] -[[package]] -name = "hex_lit" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3011d1213f159867b13cfd6ac92d2cd5f1345762c63be3554e84092d85a50bbd" - [[package]] name = "hmac" version = "0.12.1" @@ -2336,7 +2289,6 @@ dependencies = [ "tokio", "tokio-rustls", "tower-service", - "webpki-roots 1.0.6", ] [[package]] @@ -2361,7 +2313,7 @@ dependencies = [ "tokio", "tower-service", "tracing", - "windows-registry 0.6.1", + "windows-registry", ] [[package]] @@ -2778,11 +2730,17 @@ dependencies = [ "once_cell", ] +[[package]] +name = "libbz2-rs-sys" +version = "0.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b3a6a8c165077efc8f3a971534c50ea6a1a18b329ef4a66e897a7e3a1494565f" + [[package]] name = "libc" -version = "0.2.185" +version = "0.2.186" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "52ff2c0fe9bc6cb6b14a0592c2ff4fa9ceb83eea9db979b0487cd054946a2b8f" +checksum = "68ab91017fe16c622486840e4c83c9a37afeff978bd239b5293d61ece587de66" [[package]] name = "libloading" @@ -3089,18 +3047,6 @@ dependencies = [ "jni-sys 0.3.1", ] -[[package]] -name = "negentropy" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e664971378a3987224f7a0e10059782035e89899ae403718ee07de85bec42afe" - -[[package]] -name = "negentropy" -version = "0.4.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "43a88da9dd148bbcdce323dd6ac47d369b4769d4a3b78c6c52389b9269f77932" - [[package]] name = "new_debug_unreachable" version = "1.0.6" @@ -3127,56 +3073,22 @@ checksum = "72ef4a56884ca558e5ddb05a1d1e7e1bfd9a68d9ed024c21704cc98872dae1bb" [[package]] name = "nostr" -version = "0.36.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "14ad56c1d9a59f4edc46b17bc64a217b38b99baefddc0080f85ad98a0855336d" -dependencies = [ - "aes", - "async-trait", - "base64 0.22.1", - "bech32", - "bip39", - "bitcoin", - "cbc", - "chacha20 0.9.1", - "chacha20poly1305", - "getrandom 0.2.17", - "instant", - "js-sys", - "negentropy 0.3.1", - "negentropy 0.4.3", - "once_cell", - "reqwest 0.12.28", - "scrypt", - "serde", - "serde_json", - "unicode-normalization", - "url", - "wasm-bindgen", - "wasm-bindgen-futures", - "web-sys", -] - -[[package]] -name = "nostr" -version = "0.37.0" +version = "0.44.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8aad4b767bbed24ac5eb4465bfb83bc1210522eb99d67cf4e547ec2ec7e47786" +checksum = "3aa5e3b6a278ed061835fe1ee293b71641e6bf8b401cfe4e1834bbf4ef0a34e1" dependencies = [ - "async-trait", "base64 0.22.1", "bech32", "bip39", - "bitcoin", + "bitcoin_hashes", "cbc", "chacha20 0.9.1", "chacha20poly1305", "getrandom 0.2.17", + "hex", "instant", - "negentropy 0.3.1", - "negentropy 0.4.3", - "once_cell", "scrypt", + "secp256k1", "serde", "serde_json", "unicode-normalization", @@ -4473,47 +4385,9 @@ checksum = "dc897dd8d9e8bd1ed8cdad82b5966c3e0ecae09fb1907d58efaa013543185d0a" [[package]] name = "reqwest" -version = "0.12.28" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eddd3ca559203180a307f12d114c268abf583f59b03cb906fd0b3ff8646c1147" -dependencies = [ - "base64 0.22.1", - "bytes", - "futures-core", - "http", - "http-body", - "http-body-util", - "hyper", - "hyper-rustls", - "hyper-util", - "js-sys", - "log", - "percent-encoding", - "pin-project-lite", - "quinn", - "rustls", - "rustls-pki-types", - "serde", - "serde_json", - "serde_urlencoded", - "sync_wrapper", - "tokio", - "tokio-rustls", - "tower", - "tower-http", - "tower-service", - "url", - "wasm-bindgen", - "wasm-bindgen-futures", - "web-sys", - "webpki-roots 1.0.6", -] - -[[package]] -name = "reqwest" -version = "0.13.2" +version = "0.13.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ab3f43e3283ab1488b624b44b0e988d0acea0b3214e694730a055cb6b2efa801" +checksum = "62e0021ea2c22aed41653bc7e1419abb2c97e038ff2c33d0e1309e49a97deec0" dependencies = [ "base64 0.22.1", "bytes", @@ -4678,7 +4552,7 @@ dependencies = [ "errno", "libc", "linux-raw-sys", - "windows-sys 0.61.2", + "windows-sys 0.52.0", ] [[package]] @@ -4737,7 +4611,7 @@ dependencies = [ "security-framework", "security-framework-sys", "webpki-root-certs", - "windows-sys 0.61.2", + "windows-sys 0.52.0", ] [[package]] @@ -4872,7 +4746,6 @@ version = "0.29.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9465315bc9d4566e1724f0fffcbcc446268cb522e60f9a27bcded6b19c108113" dependencies = [ - "bitcoin_hashes", "rand 0.8.5", "secp256k1-sys", "serde", @@ -5016,7 +4889,6 @@ version = "1.0.149" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "83fc039473c5595ace860d8c4fafa220ff474b3fc6bfdb4293327f1a37e94d86" dependencies = [ - "indexmap 2.14.0", "itoa", "memchr", "serde", @@ -5196,9 +5068,9 @@ dependencies = [ [[package]] name = "sherpa-onnx" -version = "1.12.38" +version = "1.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "72788b30c5d1ec4a38fbedd57b5c82c429d187b14ccb7e029dc18e5ec7aec69c" +checksum = "071b3daa7bf126fe47caf8f1f7fcd5af6a4ff40e67f410503c81de55b7608b20" dependencies = [ "serde", "serde_json", @@ -5207,9 +5079,9 @@ dependencies = [ [[package]] name = "sherpa-onnx-sys" -version = "1.12.38" +version = "1.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "384b71e9586b28493902080ed89e9b4457d2c684521d4c10df62c381b6fdcb51" +checksum = "c231bdd33c5b31cbf42996e426d186d453b3fc0574f194ecc661bfae7aea1114" dependencies = [ "bzip2 0.4.4", "tar", @@ -5269,7 +5141,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3a766e1110788c36f4fa1c2b71b387a7815aa65f88ce0229841826633d93723e" dependencies = [ "libc", - "windows-sys 0.61.2", + "windows-sys 0.60.2", ] [[package]] @@ -5339,7 +5211,7 @@ dependencies = [ "audioadapter-buffers", "axum", "base64 0.22.1", - "bzip2 0.5.2", + "bzip2 0.6.1", "chrono", "dirs", "earshot", @@ -5348,13 +5220,12 @@ dependencies = [ "infer", "libc", "ndarray", - "nostr 0.36.0", - "nostr 0.37.0", + "nostr", "opus", "ort", "png 0.18.1", "regex", - "reqwest 0.13.2", + "reqwest", "rodio", "rubato", "serde", @@ -5394,7 +5265,7 @@ version = "0.1.0" dependencies = [ "chrono", "hex", - "nostr 0.36.0", + "nostr", "percent-encoding", "rand 0.10.1", "serde", @@ -5420,7 +5291,7 @@ dependencies = [ name = "sprout-sdk" version = "0.1.0" dependencies = [ - "nostr 0.36.0", + "nostr", "serde", "serde_json", "sprout-core", @@ -5831,7 +5702,7 @@ dependencies = [ "percent-encoding", "plist", "raw-window-handle", - "reqwest 0.13.2", + "reqwest", "serde", "serde_json", "serde_repr", @@ -5949,15 +5820,15 @@ dependencies = [ "thiserror 2.0.18", "tracing", "url", - "windows-registry 0.5.3", + "windows-registry", "windows-result 0.3.4", ] [[package]] name = "tauri-plugin-dialog" -version = "2.7.0" +version = "2.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a1fa4150c95ae391946cc8b8f905ab14797427caba3a8a2f79628e956da91809" +checksum = "65981abb771e74e571a38196c3baa11c459379164791eba0e67abc1a5fac9884" dependencies = [ "log", "raw-window-handle", @@ -5973,9 +5844,9 @@ dependencies = [ [[package]] name = "tauri-plugin-fs" -version = "2.5.0" +version = "2.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "36e1ec28b79f3d0683f4507e1615c36292c0ea6716668770d4396b9b39871ed8" +checksum = "b7ecc274121aca0c036a2b42d1cbe83d368d348f54e0bb8a735c2b1548e8f371" dependencies = [ "anyhow", "dunce", @@ -5991,7 +5862,7 @@ dependencies = [ "tauri-plugin", "tauri-utils", "thiserror 2.0.18", - "toml 0.9.12+spec-1.1.0", + "toml 1.1.2+spec-1.1.0", "url", ] @@ -6031,9 +5902,9 @@ dependencies = [ [[package]] name = "tauri-plugin-opener" -version = "2.5.3" +version = "2.5.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fc624469b06f59f5a29f874bbc61a2ed737c0f9c23ef09855a292c389c42e83f" +checksum = "17e1bea14edce6b793a04e2417e3fd924b9bc4faae83cdee7d714156cceeed29" dependencies = [ "dunce", "glob", @@ -6093,7 +5964,7 @@ dependencies = [ "minisign-verify", "osakit", "percent-encoding", - "reqwest 0.13.2", + "reqwest", "rustls", "semver", "serde", @@ -6264,10 +6135,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "32497e9a4c7b38532efcdebeef879707aa9f794296a4f0244f6f69e9bc8574bd" dependencies = [ "fastrand", - "getrandom 0.4.2", + "getrandom 0.3.4", "once_cell", "rustix", - "windows-sys 0.61.2", + "windows-sys 0.52.0", ] [[package]] @@ -6398,9 +6269,9 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" [[package]] name = "tokio" -version = "1.51.1" +version = "1.52.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f66bf9585cda4b724d3e78ab34b73fb2bbaba9011b9bfdf69dc836382ea13b8c" +checksum = "110a78583f19d5cdb2c5ccf321d1290344e71313c6c37d43520d386027d18386" dependencies = [ "bytes", "libc", @@ -6505,6 +6376,21 @@ dependencies = [ "winnow 0.7.15", ] +[[package]] +name = "toml" +version = "1.1.2+spec-1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "81f3d15e84cbcd896376e6730314d59fb5a87f31e4b038454184435cd57defee" +dependencies = [ + "indexmap 2.14.0", + "serde_core", + "serde_spanned 1.1.1", + "toml_datetime 1.1.1+spec-1.1.0", + "toml_parser", + "toml_writer", + "winnow 1.0.1", +] + [[package]] name = "toml_datetime" version = "0.6.3" @@ -6756,7 +6642,7 @@ checksum = "f2f6fb2847f6742cd76af783a2a2c49e9375d0a111c7bef6f71cd9e738c72d6e" dependencies = [ "memoffset", "tempfile", - "windows-sys 0.61.2", + "windows-sys 0.60.2", ] [[package]] @@ -6940,9 +6826,9 @@ checksum = "b6c140620e7ffbb22c2dee59cafe6084a59b5ffc27a8859a5f0d494b5d52b6be" [[package]] name = "uuid" -version = "1.23.0" +version = "1.23.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5ac8b6f42ead25368cf5b098aeb3dc8a1a2c05a3eee8a9a1a68c640edbfc79d9" +checksum = "ddd74a9687298c6858e9b88ec8935ec45d22e8fd5e6394fa1bd4e99a87789c76" dependencies = [ "getrandom 0.4.2", "js-sys", @@ -7311,7 +7197,7 @@ version = "0.1.11" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c2a7b1c03c876122aa43f3020e6c3c3ee5c05081c9a00739faf7503aeba10d22" dependencies = [ - "windows-sys 0.61.2", + "windows-sys 0.52.0", ] [[package]] @@ -7500,17 +7386,6 @@ dependencies = [ "windows-strings 0.4.2", ] -[[package]] -name = "windows-registry" -version = "0.6.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "02752bf7fbdcce7f2a27a742f798510f3e5ad88dbe84871e5168e2120c3d5720" -dependencies = [ - "windows-link 0.2.1", - "windows-result 0.4.1", - "windows-strings 0.5.1", -] - [[package]] name = "windows-result" version = "0.3.4" diff --git a/desktop/src-tauri/Cargo.toml b/desktop/src-tauri/Cargo.toml index 8720843b0..13ed5edb8 100644 --- a/desktop/src-tauri/Cargo.toml +++ b/desktop/src-tauri/Cargo.toml @@ -44,8 +44,8 @@ futures-util = "0.3" opus = "0.3" serde = { version = "1", features = ["derive"] } serde_json = "1" -nostr = { version = "0.37", features = ["nip44"] } -nostr-compat = { package = "nostr", version = "0.36" } +nostr = { version = "0.44", features = ["nip44"] } +nostr-compat = { package = "nostr", version = "0.44" } zeroize = "1" reqwest = { version = "0.13", features = ["json", "query", "stream"] } url = "2" @@ -55,7 +55,7 @@ sprout-sdk = { path = "../../crates/sprout-sdk" } base64 = "0.22" sha2 = "0.11" tar = "0.4" -bzip2 = "0.5" +bzip2 = "0.6" chrono = { version = "0.4", features = ["serde"] } tauri-plugin-global-shortcut = "2" tauri-plugin-notification = "2.3.3" diff --git a/mobile/android/gradle/wrapper/gradle-wrapper.properties b/mobile/android/gradle/wrapper/gradle-wrapper.properties index e4ef43fb9..41d01ac9b 100644 --- a/mobile/android/gradle/wrapper/gradle-wrapper.properties +++ b/mobile/android/gradle/wrapper/gradle-wrapper.properties @@ -2,4 +2,4 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.14-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.4-all.zip diff --git a/mobile/android/settings.gradle.kts b/mobile/android/settings.gradle.kts index ca7fe065c..7368634c4 100644 --- a/mobile/android/settings.gradle.kts +++ b/mobile/android/settings.gradle.kts @@ -19,7 +19,7 @@ pluginManagement { plugins { id("dev.flutter.flutter-plugin-loader") version "1.0.0" - id("com.android.application") version "8.11.1" apply false + id("com.android.application") version "8.13.2" apply false id("org.jetbrains.kotlin.android") version "2.2.20" apply false } diff --git a/package.json b/package.json index 09cdd186a..dba1b7895 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "sprout-workspace", "private": true, - "packageManager": "pnpm@10.33.0", + "packageManager": "pnpm@10.33.3", "scripts": { "check": "pnpm -r check" },