diff --git a/Cargo.lock b/Cargo.lock index 8d66131..40ed695 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -221,9 +221,9 @@ dependencies = [ [[package]] name = "anyhow" -version = "1.0.90" +version = "1.0.95" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "37bf3594c4c988a53154954629820791dde498571819ae4ca50ca811e060cc95" +checksum = "34ac096ce696dc2fcabef30516bb13c0a68a11d30131d3df6f04711467681b04" [[package]] name = "approx" @@ -245,7 +245,7 @@ dependencies = [ "proc-macro-error", "proc-macro2", "quote", - "syn 2.0.79", + "syn 2.0.95", ] [[package]] @@ -299,12 +299,23 @@ version = "0.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "20cd0e2e25ea8e5f7e9df04578dc6cf5c83577fd09b1a46aaf5c85e1c33f2a7e" dependencies = [ - "event-listener", + "event-listener 5.3.1", "event-listener-strategy", "futures-core", "pin-project-lite", ] +[[package]] +name = "async-channel" +version = "1.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "81953c529336010edd6d8e358f886d9581267795c61b19475b71314bffa46d35" +dependencies = [ + "concurrent-queue", + "event-listener 2.5.3", + "futures-core", +] + [[package]] name = "async-channel" version = "2.3.1" @@ -354,6 +365,21 @@ dependencies = [ "futures-lite", ] +[[package]] +name = "async-global-executor" +version = "2.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "05b1b633a2115cd122d73b955eadd9916c18c8f510ec9cd1686404c60ad1c29c" +dependencies = [ + "async-channel 2.3.1", + "async-executor", + "async-io", + "async-lock", + "blocking", + "futures-lite", + "once_cell", +] + [[package]] name = "async-io" version = "2.3.4" @@ -379,7 +405,7 @@ version = "3.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ff6e472cdea888a4bd64f342f09b3f50e1886d32afe8df3d663c01140b811b18" dependencies = [ - "event-listener", + "event-listener 5.3.1", "event-listener-strategy", "pin-project-lite", ] @@ -390,14 +416,14 @@ version = "2.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "63255f1dc2381611000436537bbedfe83183faa303a5a0edaf191edef06526bb" dependencies = [ - "async-channel", + "async-channel 2.3.1", "async-io", "async-lock", "async-signal", "async-task", "blocking", "cfg-if", - "event-listener", + "event-listener 5.3.1", "futures-lite", "rustix", "tracing", @@ -411,7 +437,7 @@ checksum = "3b43422f69d8ff38f95f1b2bb76517c91589a924d1559a0e935d7c8ce0274c11" dependencies = [ "proc-macro2", "quote", - "syn 2.0.79", + "syn 2.0.95", ] [[package]] @@ -432,6 +458,32 @@ dependencies = [ "windows-sys 0.59.0", ] +[[package]] +name = "async-std" +version = "1.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c634475f29802fde2b8f0b505b1bd00dfe4df7d4a000f0b36f7671197d5c3615" +dependencies = [ + "async-channel 1.9.0", + "async-global-executor", + "async-io", + "async-lock", + "crossbeam-utils", + "futures-channel", + "futures-core", + "futures-io", + "futures-lite", + "gloo-timers 0.3.0", + "kv-log-macro", + "log", + "memchr", + "once_cell", + "pin-project-lite", + "pin-utils", + "slab", + "wasm-bindgen-futures", +] + [[package]] name = "async-stream" version = "0.3.6" @@ -451,7 +503,7 @@ checksum = "c7c24de15d275a1ecfd47a380fb4d5ec9bfe0933f309ed5e705b775596a3574d" dependencies = [ "proc-macro2", "quote", - "syn 2.0.79", + "syn 2.0.95", ] [[package]] @@ -468,7 +520,7 @@ checksum = "721cae7de5c34fbb2acd27e21e6d2cf7b886dce0c27388d46c4e6c47ea4318dd" dependencies = [ "proc-macro2", "quote", - "syn 2.0.79", + "syn 2.0.95", ] [[package]] @@ -533,8 +585,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e4fa97bb310c33c811334143cf64c5bb2b7b3c06e453db6b095d7061eff8f113" dependencies = [ "fastrand", - "gloo-timers 0.3.0", - "tokio", ] [[package]] @@ -558,6 +608,16 @@ version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4c7f02d4ea65f2c1853089ffd8d2787bdbc63de2f0d29dedbcf8ccdfa0ccd4cf" +[[package]] +name = "base58ck" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2c8d66485a3a2ea485c1913c4572ce0256067a5377ac8c75c4960e1cda98605f" +dependencies = [ + "bitcoin-internals 0.3.0", + "bitcoin_hashes 0.14.0", +] + [[package]] name = "base64" version = "0.13.1" @@ -642,85 +702,81 @@ checksum = "349f9b6a179ed607305526ca489b34ad0a41aed5f7980fa90eb03160b69598fb" [[package]] name = "bitcoin" -version = "0.29.2" +version = "0.32.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0694ea59225b0c5f3cb405ff3f670e4828358ed26aec49dc352f730f0cb1a8a3" +checksum = "ce6bc65742dea50536e35ad42492b234c27904a27f0abdcbce605015cb4ea026" dependencies = [ - "bech32 0.9.1", - "bitcoin_hashes 0.11.0", - "secp256k1 0.24.3", - "serde", -] - -[[package]] -name = "bitcoin" -version = "0.30.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1945a5048598e4189e239d3f809b19bdad4845c4b2ba400d304d2dcf26d2c462" -dependencies = [ - "base64 0.13.1", - "bech32 0.9.1", - "bitcoin-private", - "bitcoin_hashes 0.12.0", + "base58ck", + "base64 0.21.7", + "bech32 0.11.0", + "bitcoin-internals 0.3.0", + "bitcoin-io", + "bitcoin-units", + "bitcoin_hashes 0.14.0", + "hex-conservative 0.2.1", "hex_lit", - "secp256k1 0.27.0", + "secp256k1", "serde", ] [[package]] name = "bitcoin-internals" -version = "0.1.0" +version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1f9997f8650dd818369931b5672a18dbef95324d0513aa99aae758de8ce86e5b" +checksum = "9425c3bf7089c983facbae04de54513cce73b41c7f9ff8c845b54e7bc64ebbfb" [[package]] name = "bitcoin-internals" -version = "0.2.0" +version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9425c3bf7089c983facbae04de54513cce73b41c7f9ff8c845b54e7bc64ebbfb" +checksum = "30bdbe14aa07b06e6cfeffc529a1f099e5fbe249524f8125358604df99a4bed2" +dependencies = [ + "serde", +] [[package]] -name = "bitcoin-private" -version = "0.1.0" +name = "bitcoin-io" +version = "0.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "73290177011694f38ec25e165d0387ab7ea749a4b81cd4c80dae5988229f7a57" +checksum = "0b47c4ab7a93edb0c7198c5535ed9b52b63095f4e9b45279c6736cec4b856baf" [[package]] -name = "bitcoin_hashes" -version = "0.11.0" +name = "bitcoin-units" +version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "90064b8dee6815a6470d60bad07bbbaee885c0e12d04177138fa3291a01b7bc4" +checksum = "5285c8bcaa25876d07f37e3d30c303f2609179716e11d688f51e8f1fe70063e2" dependencies = [ + "bitcoin-internals 0.3.0", "serde", ] [[package]] name = "bitcoin_hashes" -version = "0.12.0" +version = "0.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5d7066118b13d4b20b23645932dfb3a81ce7e29f95726c2036fa33cd7b092501" +checksum = "1930a4dabfebb8d7d9992db18ebe3ae2876f0a305fab206fd168df931ede293b" dependencies = [ - "bitcoin-private", - "serde", + "bitcoin-internals 0.2.0", + "hex-conservative 0.1.2", ] [[package]] name = "bitcoin_hashes" -version = "0.13.0" +version = "0.14.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1930a4dabfebb8d7d9992db18ebe3ae2876f0a305fab206fd168df931ede293b" +checksum = "bb18c03d0db0247e147a21a6faafd5a7eb851c743db062de72018b6b7e8e4d16" dependencies = [ - "bitcoin-internals 0.2.0", - "hex-conservative", + "bitcoin-io", + "hex-conservative 0.2.1", + "serde", ] [[package]] name = "bitcoincore-rpc" -version = "0.17.0" +version = "0.19.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9d6c0ee9354e3dac217db4cb1dd31941073a87fe53c86bcf3eb2b8bc97f00a08" +checksum = "aedd23ae0fd321affb4bbbc36126c6f49a32818dc6b979395d24da8c9d4e80ee" dependencies = [ - "bitcoin-private", "bitcoincore-rpc-json", "jsonrpc", "log", @@ -730,12 +786,11 @@ dependencies = [ [[package]] name = "bitcoincore-rpc-json" -version = "0.17.0" +version = "0.19.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d30ce6f40fb0a2e8d98522796219282504b7a4b14e2b4c26139a7bea6aec6586" +checksum = "d8909583c5fab98508e80ef73e5592a651c954993dc6b7739963257d19f0e71a" dependencies = [ - "bitcoin 0.30.2", - "bitcoin-private", + "bitcoin", "serde", "serde_json", ] @@ -787,7 +842,7 @@ checksum = "e0b121a9fe0df916e362fb3271088d071159cdf11db0e4182d02152850756eff" dependencies = [ "proc-macro2", "quote", - "syn 2.0.79", + "syn 2.0.95", ] [[package]] @@ -829,7 +884,7 @@ version = "1.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "703f41c54fc768e63e091340b424302bb1c29ef4aa0c7f10fe849dfb114d29ea" dependencies = [ - "async-channel", + "async-channel 2.3.1", "async-task", "futures-io", "futures-lite", @@ -891,7 +946,7 @@ checksum = "bcfcc3cd946cb52f0bbfdbbcfa2f4e24f75ebb6c0e1002f7c25904fada18b9ec" dependencies = [ "proc-macro2", "quote", - "syn 2.0.79", + "syn 2.0.95", ] [[package]] @@ -1039,7 +1094,7 @@ dependencies = [ "heck 0.5.0", "proc-macro2", "quote", - "syn 2.0.79", + "syn 2.0.95", ] [[package]] @@ -1404,7 +1459,7 @@ checksum = "f46882e17999c6cc590af592290432be3bce0428cb0d5f8b6715e4dc7b383eb3" dependencies = [ "proc-macro2", "quote", - "syn 2.0.79", + "syn 2.0.95", ] [[package]] @@ -1479,7 +1534,7 @@ dependencies = [ "proc-macro2", "quote", "strsim 0.11.1", - "syn 2.0.79", + "syn 2.0.95", ] [[package]] @@ -1501,7 +1556,7 @@ checksum = "d336a2a514f6ccccaa3e09b02d41d35330c07ddf03a62165fcec10bb561c7806" dependencies = [ "darling_core 0.20.10", "quote", - "syn 2.0.79", + "syn 2.0.95", ] [[package]] @@ -1594,7 +1649,7 @@ dependencies = [ "quote", "sha3", "strum 0.26.3", - "syn 2.0.79", + "syn 2.0.95", "void", ] @@ -1639,7 +1694,7 @@ dependencies = [ "proc-macro2", "quote", "rustc_version", - "syn 2.0.79", + "syn 2.0.95", ] [[package]] @@ -1671,7 +1726,7 @@ dependencies = [ "dsl_auto_type", "proc-macro2", "quote", - "syn 2.0.79", + "syn 2.0.95", ] [[package]] @@ -1691,7 +1746,7 @@ version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "209c735641a413bc68c4923a9d6ad4bcb3ca306b794edaa7eb0b3228a99ffb25" dependencies = [ - "syn 2.0.79", + "syn 2.0.95", ] [[package]] @@ -1770,7 +1825,7 @@ checksum = "97369cbbc041bc366949bc74d34658d6cda5621039731c6310521892a3a20ae0" dependencies = [ "proc-macro2", "quote", - "syn 2.0.79", + "syn 2.0.95", ] [[package]] @@ -1850,7 +1905,7 @@ dependencies = [ "heck 0.5.0", "proc-macro2", "quote", - "syn 2.0.79", + "syn 2.0.95", ] [[package]] @@ -1919,20 +1974,18 @@ checksum = "60b1af1c220855b6ceac025d3f6ecdd2b7c4894bfe9cd9bda4fbb4bc7c0d4cf0" [[package]] name = "electrum-client" -version = "0.18.0" +version = "0.21.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6bc133f1c8d829d254f013f946653cbeb2b08674b960146361d1e9b67733ad19" +checksum = "7a0bd443023f9f5c4b7153053721939accc7113cbdf810a024434eed454b3db1" dependencies = [ - "bitcoin 0.30.2", - "bitcoin-private", + "bitcoin", "byteorder", "libc", "log", - "rustls 0.21.12", + "rustls 0.23.15", "serde", "serde_json", - "webpki", - "webpki-roots 0.22.6", + "webpki-roots 0.25.4", "winapi", ] @@ -1989,7 +2042,7 @@ dependencies = [ "num-traits", "proc-macro2", "quote", - "syn 2.0.79", + "syn 2.0.95", ] [[package]] @@ -2010,7 +2063,7 @@ checksum = "de0d48a183585823424a4ce1aa132d174a6a81bd540895822eb4c8373a8e49e8" dependencies = [ "proc-macro2", "quote", - "syn 2.0.79", + "syn 2.0.95", ] [[package]] @@ -2060,12 +2113,13 @@ checksum = "a5d9305ccc6942a704f4335694ecd3de2ea531b114ac2d51f5f843750787a92f" [[package]] name = "esplora-client" -version = "0.6.0" +version = "0.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0cb1f7f2489cce83bc3bd92784f9ba5271eeb6e729b975895fc541f78cbfcdca" +checksum = "23be31c97b2e505ac6af0d72a201caead71298a957639061a10314f6d4860cd7" dependencies = [ - "bitcoin 0.30.2", - "bitcoin-internals 0.1.0", + "async-std", + "bitcoin", + "hex-conservative 0.2.1", "log", "reqwest 0.11.27", "serde", @@ -2090,6 +2144,12 @@ dependencies = [ "num-traits", ] +[[package]] +name = "event-listener" +version = "2.5.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0206175f82b8d6bf6652ff7d71a1e27fd2e4efde587fd368662814d6ec1d9ce0" + [[package]] name = "event-listener" version = "5.3.1" @@ -2107,7 +2167,7 @@ version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0f214dc438f977e6d4e3500aaa277f5ad94ca83fbbd9b1a15713ce2344ccc5a1" dependencies = [ - "event-listener", + "event-listener 5.3.1", "pin-project-lite", ] @@ -2146,8 +2206,9 @@ dependencies = [ [[package]] name = "fedimint-aead" -version = "0.5.0-alpha" -source = "git+https://github.com/fedimint/fedimint/?rev=54acaa63a45e6bd14e872cdaaf020e8c100d6b33#54acaa63a45e6bd14e872cdaaf020e8c100d6b33" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a8666e4c4f6b9615448912e496497d96f583a99117454c4997bbb4acb4aed605" dependencies = [ "anyhow", "argon2", @@ -2158,13 +2219,14 @@ dependencies = [ [[package]] name = "fedimint-api-client" -version = "0.5.0-alpha" -source = "git+https://github.com/fedimint/fedimint/?rev=54acaa63a45e6bd14e872cdaaf020e8c100d6b33#54acaa63a45e6bd14e872cdaaf020e8c100d6b33" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "debbfa0358d4e44cfa70c251159193d98fdd8b93cdc31187c6ed79b6eca428e9" dependencies = [ "anyhow", "async-trait", "base64 0.22.1", - "bitcoin 0.30.2", + "bitcoin", "curve25519-dalek", "fedimint-arti-client", "fedimint-core", @@ -2232,8 +2294,9 @@ dependencies = [ [[package]] name = "fedimint-bip39" -version = "0.5.0-alpha" -source = "git+https://github.com/fedimint/fedimint/?rev=54acaa63a45e6bd14e872cdaaf020e8c100d6b33#54acaa63a45e6bd14e872cdaaf020e8c100d6b33" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b6d4069dc0ed8c6074f8dc9d61467ff7851da93a044cadd9caf690b7d9e98f3c" dependencies = [ "bip39", "fedimint-client", @@ -2243,12 +2306,13 @@ dependencies = [ [[package]] name = "fedimint-bitcoind" -version = "0.5.0-alpha" -source = "git+https://github.com/fedimint/fedimint/?rev=54acaa63a45e6bd14e872cdaaf020e8c100d6b33#54acaa63a45e6bd14e872cdaaf020e8c100d6b33" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d30f80903f17e82aa2d059e6a58358407c40ccaaa0bde5be01800f2fd0b8e9f9" dependencies = [ "anyhow", "async-trait", - "bitcoin 0.30.2", + "bitcoin", "bitcoincore-rpc", "electrum-client", "esplora-client", @@ -2261,22 +2325,24 @@ dependencies = [ [[package]] name = "fedimint-build" -version = "0.5.0-alpha" -source = "git+https://github.com/fedimint/fedimint/?rev=54acaa63a45e6bd14e872cdaaf020e8c100d6b33#54acaa63a45e6bd14e872cdaaf020e8c100d6b33" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "08262387d31d9664615c89b1350304516ab7c8068686db89e94154fb08cb0cc9" dependencies = [ "serde_json", ] [[package]] name = "fedimint-client" -version = "0.5.0-alpha" -source = "git+https://github.com/fedimint/fedimint/?rev=54acaa63a45e6bd14e872cdaaf020e8c100d6b33#54acaa63a45e6bd14e872cdaaf020e8c100d6b33" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bf93e683c159ca253534eb9dab2968cabfcd410e6622394b1b918a5d04ce14fa" dependencies = [ "anyhow", "aquamarine", "async-stream", "async-trait", - "bitcoin 0.30.2", + "bitcoin", "fedimint-aead", "fedimint-api-client", "fedimint-build", @@ -2286,7 +2352,7 @@ dependencies = [ "futures", "itertools 0.13.0", "rand 0.8.5", - "reqwest 0.12.8", + "reqwest 0.12.12", "serde", "serde_json", "strum 0.26.3", @@ -2299,8 +2365,9 @@ dependencies = [ [[package]] name = "fedimint-core" -version = "0.5.0-alpha" -source = "git+https://github.com/fedimint/fedimint/?rev=54acaa63a45e6bd14e872cdaaf020e8c100d6b33#54acaa63a45e6bd14e872cdaaf020e8c100d6b33" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d7cf2e31dc7397d4e92712794e241f0acfbb059e42c75bb3584f174352e78a99" dependencies = [ "anyhow", "async-lock", @@ -2311,9 +2378,9 @@ dependencies = [ "base64-url", "bech32 0.11.0", "bincode", - "bitcoin 0.29.2", - "bitcoin 0.30.2", - "bitcoin_hashes 0.12.0", + "bitcoin", + "bitcoin-io", + "bitcoin-units", "bitvec", "bls12_381", "erased-serde", @@ -2331,12 +2398,12 @@ dependencies = [ "jsonrpsee-core", "lightning", "lightning-invoice", + "lightning-types", "macro_rules_attribute", "miniscript", "parity-scale-codec", "rand 0.8.5", - "secp256k1 0.27.0", - "secp256k1-zkp", + "secp256k1", "serde", "serde_json", "serdect", @@ -2352,47 +2419,50 @@ dependencies = [ [[package]] name = "fedimint-derive" -version = "0.5.0-alpha" -source = "git+https://github.com/fedimint/fedimint/?rev=54acaa63a45e6bd14e872cdaaf020e8c100d6b33#54acaa63a45e6bd14e872cdaaf020e8c100d6b33" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "98a148de373395de9f55472eef98e269e9e0ed30a859381b697b8f6e96872313" dependencies = [ "itertools 0.13.0", "proc-macro2", "quote", - "syn 2.0.79", + "syn 2.0.95", ] [[package]] name = "fedimint-derive-secret" -version = "0.5.0-alpha" -source = "git+https://github.com/fedimint/fedimint/?rev=54acaa63a45e6bd14e872cdaaf020e8c100d6b33#54acaa63a45e6bd14e872cdaaf020e8c100d6b33" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fc995f250fe2006c4df33dc510f31aff9ab67c68adfec67cbb8e76d7e522a98d" dependencies = [ "anyhow", - "bitcoin_hashes 0.11.0", + "bitcoin_hashes 0.14.0", "bls12_381", "fedimint-core", "fedimint-hkdf", "ring 0.17.8", - "secp256k1-zkp", ] [[package]] name = "fedimint-hkdf" -version = "0.5.0-alpha" -source = "git+https://github.com/fedimint/fedimint/?rev=54acaa63a45e6bd14e872cdaaf020e8c100d6b33#54acaa63a45e6bd14e872cdaaf020e8c100d6b33" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e5e2a95abd70113c6bc1b55c5ebe46c521c57c088dc419173a3ac9abe2d2d3c7" dependencies = [ - "bitcoin_hashes 0.12.0", + "bitcoin_hashes 0.14.0", ] [[package]] name = "fedimint-ln-client" -version = "0.5.0-alpha" -source = "git+https://github.com/fedimint/fedimint/?rev=54acaa63a45e6bd14e872cdaaf020e8c100d6b33#54acaa63a45e6bd14e872cdaaf020e8c100d6b33" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8a7b582fee5876f80c8e46f5bfd5ce48a50fb5eaac5396f73c256f5be61ffa05" dependencies = [ "anyhow", "aquamarine", "async-stream", "async-trait", - "bitcoin 0.30.2", + "bitcoin", "erased-serde", "fedimint-api-client", "fedimint-client", @@ -2404,8 +2474,7 @@ dependencies = [ "lightning-invoice", "lnurl-rs", "rand 0.8.5", - "reqwest 0.12.8", - "secp256k1 0.27.0", + "reqwest 0.12.12", "serde", "serde_json", "strum 0.26.3", @@ -2417,18 +2486,17 @@ dependencies = [ [[package]] name = "fedimint-ln-common" -version = "0.5.0-alpha" -source = "git+https://github.com/fedimint/fedimint/?rev=54acaa63a45e6bd14e872cdaaf020e8c100d6b33#54acaa63a45e6bd14e872cdaaf020e8c100d6b33" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e8a9399f12bea4d12dc571961a259a0884387491f0c2853234e19bf44f7dd6ae" dependencies = [ "anyhow", - "bitcoin 0.30.2", - "bitcoin_hashes 0.12.0", + "bitcoin", "fedimint-client", "fedimint-core", "fedimint-threshold-crypto", "lightning", "lightning-invoice", - "secp256k1 0.27.0", "serde", "serde-big-array", "serde_json", @@ -2438,8 +2506,9 @@ dependencies = [ [[package]] name = "fedimint-logging" -version = "0.5.0-alpha" -source = "git+https://github.com/fedimint/fedimint/?rev=54acaa63a45e6bd14e872cdaaf020e8c100d6b33#54acaa63a45e6bd14e872cdaaf020e8c100d6b33" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d1df98d98cf344d8f25e72e291ac45d693afb59fc2ac075fa6fb2e75c7f73d6c" dependencies = [ "anyhow", "tracing-subscriber", @@ -2447,8 +2516,9 @@ dependencies = [ [[package]] name = "fedimint-mint-client" -version = "0.5.0-alpha" -source = "git+https://github.com/fedimint/fedimint/?rev=54acaa63a45e6bd14e872cdaaf020e8c100d6b33#54acaa63a45e6bd14e872cdaaf020e8c100d6b33" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f2f6cf057d65613b6c27c779bac56f1c23f4fab6197796365aa4be08892b8cfa" dependencies = [ "anyhow", "aquamarine", @@ -2456,7 +2526,7 @@ dependencies = [ "async-trait", "base64 0.22.1", "base64-url", - "bitcoin_hashes 0.12.0", + "bitcoin_hashes 0.14.0", "bls12_381", "clap", "erased-serde", @@ -2471,7 +2541,7 @@ dependencies = [ "futures", "hex", "itertools 0.13.0", - "secp256k1-zkp", + "rayon", "serde", "serde-big-array", "serde_json", @@ -2485,15 +2555,15 @@ dependencies = [ [[package]] name = "fedimint-mint-common" -version = "0.5.0-alpha" -source = "git+https://github.com/fedimint/fedimint/?rev=54acaa63a45e6bd14e872cdaaf020e8c100d6b33#54acaa63a45e6bd14e872cdaaf020e8c100d6b33" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f97027e2033d5e4f66289c0a597694ff37b4635f8cda0f24b969532f57340db3" dependencies = [ "anyhow", "bincode", - "bitcoin_hashes 0.12.0", + "bitcoin_hashes 0.14.0", "fedimint-core", "fedimint-tbs", - "secp256k1-zkp", "serde", "thiserror", "tracing", @@ -2501,8 +2571,9 @@ dependencies = [ [[package]] name = "fedimint-tbs" -version = "0.5.0-alpha" -source = "git+https://github.com/fedimint/fedimint/?rev=54acaa63a45e6bd14e872cdaaf020e8c100d6b33#54acaa63a45e6bd14e872cdaaf020e8c100d6b33" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "03e154e134c476cac9c8c565c5663ecff555150a559f66f32b50cacc44fdf82c" dependencies = [ "bls12_381", "fedimint-core", @@ -2548,7 +2619,7 @@ dependencies = [ "derive_more", "digest", "educe", - "event-listener", + "event-listener 5.3.1", "fs-mistrust", "fslock", "futures", @@ -2589,14 +2660,15 @@ dependencies = [ [[package]] name = "fedimint-wallet-client" -version = "0.5.0-alpha" -source = "git+https://github.com/fedimint/fedimint/?rev=54acaa63a45e6bd14e872cdaaf020e8c100d6b33#54acaa63a45e6bd14e872cdaaf020e8c100d6b33" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "54b44bfc4daf6d306646220fd19e8f7922ab79f079ab45af9df8a416baddfa14" dependencies = [ "anyhow", "aquamarine", "async-stream", "async-trait", - "bitcoin 0.30.2", + "bitcoin", "erased-serde", "fedimint-api-client", "fedimint-bitcoind", @@ -2606,7 +2678,6 @@ dependencies = [ "fedimint-wallet-common", "futures", "rand 0.8.5", - "secp256k1 0.27.0", "serde", "serde_json", "strum 0.26.3", @@ -2617,16 +2688,16 @@ dependencies = [ [[package]] name = "fedimint-wallet-common" -version = "0.5.0-alpha" -source = "git+https://github.com/fedimint/fedimint/?rev=54acaa63a45e6bd14e872cdaaf020e8c100d6b33#54acaa63a45e6bd14e872cdaaf020e8c100d6b33" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "82e3bce01b1ede74e54fcebe17026dfa73bc5378d776f2c08d5185a9742aab54" dependencies = [ "anyhow", - "bitcoin 0.30.2", + "bitcoin", "fedimint-core", "hex", "impl-tools", "miniscript", - "secp256k1 0.27.0", "serde", "thiserror", "tracing", @@ -2778,7 +2849,7 @@ checksum = "1a5c6c585bc94aaf2c7b51dd4c2ba22680844aba4c687be581871a6f518c5742" dependencies = [ "proc-macro2", "quote", - "syn 2.0.79", + "syn 2.0.95", ] [[package]] @@ -2904,7 +2975,7 @@ checksum = "162ee34ebcb7c64a8abebc059ce0fee27c2262618d7b60ed8faf72fef13c3650" dependencies = [ "proc-macro2", "quote", - "syn 2.0.79", + "syn 2.0.95", ] [[package]] @@ -3239,7 +3310,7 @@ dependencies = [ "async-trait", "bincode", "bip39", - "bitcoin 0.30.2", + "bitcoin", "chrono", "diesel", "diesel_migrations", @@ -3267,7 +3338,7 @@ name = "harbor-ui" version = "0.1.0" dependencies = [ "bip39", - "bitcoin 0.30.2", + "bitcoin", "chrono", "fedimint-core", "fedimint-ln-common", @@ -3374,6 +3445,15 @@ version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "212ab92002354b4819390025006c897e8140934349e8635c9b077f47b4dcbd20" +[[package]] +name = "hex-conservative" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5313b072ce3c597065a808dbf612c4c8e8590bdbf8b579508bf7a762c5eae6cd" +dependencies = [ + "arrayvec", +] + [[package]] name = "hex_fmt" version = "0.3.0" @@ -3587,9 +3667,9 @@ dependencies = [ [[package]] name = "hyper-util" -version = "0.1.9" +version = "0.1.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "41296eb09f183ac68eec06e03cdbea2e759633d4067b2f6552fc2e009bcad08b" +checksum = "df2dcfbe0677734ab2f3ffa7fa7bfd4706bfdc1ef393f2ee30184aed67e631b4" dependencies = [ "bytes", "futures-channel", @@ -3811,6 +3891,124 @@ dependencies = [ "winit", ] +[[package]] +name = "icu_collections" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "db2fa452206ebee18c4b5c2274dbf1de17008e874b4dc4f0aea9d01ca79e4526" +dependencies = [ + "displaydoc", + "yoke", + "zerofrom", + "zerovec", +] + +[[package]] +name = "icu_locid" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "13acbb8371917fc971be86fc8057c41a64b521c184808a698c02acc242dbf637" +dependencies = [ + "displaydoc", + "litemap", + "tinystr", + "writeable", + "zerovec", +] + +[[package]] +name = "icu_locid_transform" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "01d11ac35de8e40fdeda00d9e1e9d92525f3f9d887cdd7aa81d727596788b54e" +dependencies = [ + "displaydoc", + "icu_locid", + "icu_locid_transform_data", + "icu_provider", + "tinystr", + "zerovec", +] + +[[package]] +name = "icu_locid_transform_data" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fdc8ff3388f852bede6b579ad4e978ab004f139284d7b28715f773507b946f6e" + +[[package]] +name = "icu_normalizer" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "19ce3e0da2ec68599d193c93d088142efd7f9c5d6fc9b803774855747dc6a84f" +dependencies = [ + "displaydoc", + "icu_collections", + "icu_normalizer_data", + "icu_properties", + "icu_provider", + "smallvec", + "utf16_iter", + "utf8_iter", + "write16", + "zerovec", +] + +[[package]] +name = "icu_normalizer_data" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f8cafbf7aa791e9b22bec55a167906f9e1215fd475cd22adfcf660e03e989516" + +[[package]] +name = "icu_properties" +version = "1.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "93d6020766cfc6302c15dbbc9c8778c37e62c14427cb7f6e601d849e092aeef5" +dependencies = [ + "displaydoc", + "icu_collections", + "icu_locid_transform", + "icu_properties_data", + "icu_provider", + "tinystr", + "zerovec", +] + +[[package]] +name = "icu_properties_data" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "67a8effbc3dd3e4ba1afa8ad918d5684b8868b3b26500753effea8d2eed19569" + +[[package]] +name = "icu_provider" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6ed421c8a8ef78d3e2dbc98a973be2f3770cb42b606e3ab18d6237c4dfde68d9" +dependencies = [ + "displaydoc", + "icu_locid", + "icu_provider_macros", + "stable_deref_trait", + "tinystr", + "writeable", + "yoke", + "zerofrom", + "zerovec", +] + +[[package]] +name = "icu_provider_macros" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1ec89e9337638ecdc08744df490b221a7399bf8d164eb52a665454e60e075ad6" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.95", +] + [[package]] name = "ident_case" version = "1.0.1" @@ -3819,12 +4017,23 @@ checksum = "b9e0384b61958566e926dc50660321d12159025e767c18e043daf26b70104c39" [[package]] name = "idna" -version = "0.5.0" +version = "1.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "634d9b1461af396cad843f47fdba5597a4f9e6ddd4bfb6ff5d85028c25cb12f6" +checksum = "686f825264d630750a544639377bae737628043f20d38bbc029e8f29ea968a7e" dependencies = [ - "unicode-bidi", - "unicode-normalization", + "idna_adapter", + "smallvec", + "utf8_iter", +] + +[[package]] +name = "idna_adapter" +version = "1.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "daca1df1c957320b2cf139ac61e7bd64fed304c5040df000a745aa1de3b4ef71" +dependencies = [ + "icu_normalizer", + "icu_properties", ] [[package]] @@ -3857,26 +4066,26 @@ dependencies = [ [[package]] name = "impl-tools" -version = "0.10.0" +version = "0.10.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d82c305b1081f1a99fda262883c788e50ab57d36c00830bdd7e0a82894ad965c" +checksum = "0ae95c9095c2f1126d7db785955c73cdc5fc33e7c3fa911bd4a42931672029a7" dependencies = [ "autocfg", "impl-tools-lib", - "proc-macro-error", - "syn 2.0.79", + "proc-macro-error2", + "syn 2.0.95", ] [[package]] name = "impl-tools-lib" -version = "0.10.0" +version = "0.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "85d3946d886eaab0702fa0c6585adcced581513223fa9df7ccfabbd9fa331a88" +checksum = "2a391adcea096a89a593317881fb61ef4e68d3e7d9de9e2338e6e1557be29e10" dependencies = [ - "proc-macro-error", + "proc-macro-error2", "proc-macro2", "quote", - "syn 2.0.79", + "syn 2.0.95", ] [[package]] @@ -4060,11 +4269,12 @@ dependencies = [ [[package]] name = "jsonrpc" -version = "0.14.1" +version = "0.18.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8128f36b47411cd3f044be8c1f5cc0c9e24d1d1bfdc45f0a57897b32513053f2" +checksum = "3662a38d341d77efecb73caf01420cfa5aa63c0253fd7bc05289ef9f6616e1bf" dependencies = [ "base64 0.13.1", + "minreq", "serde", "serde_json", ] @@ -4196,6 +4406,15 @@ dependencies = [ "smallvec", ] +[[package]] +name = "kv-log-macro" +version = "1.0.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0de8b303297635ad57c9f5059fd9cee7a47f8e8daa09df0fcd07dd39fb22977f" +dependencies = [ + "log", +] + [[package]] name = "lazy_static" version = "1.5.0" @@ -4207,9 +4426,9 @@ dependencies = [ [[package]] name = "libc" -version = "0.2.161" +version = "0.2.169" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e9489c2807c139ffd9c1794f4af0ebe86a828db53ecdc7fea2111d0fed085d1" +checksum = "b5aba8db14291edd000dfcc4d620c7ebfb122c613afb886ca8803fa4e128a20a" [[package]] name = "libloading" @@ -4262,27 +4481,39 @@ dependencies = [ [[package]] name = "lightning" -version = "0.0.123" +version = "0.0.125" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5fd92d4aa159374be430c7590e169b4a6c0fb79018f5bc4ea1bffde536384db3" +checksum = "767f388e50251da71f95a3737d6db32c9729f9de6427a54fa92bb994d04d793f" dependencies = [ - "bitcoin 0.30.2", - "hex-conservative", + "bech32 0.9.1", + "bitcoin", + "lightning-invoice", + "lightning-types", ] [[package]] name = "lightning-invoice" -version = "0.31.0" +version = "0.32.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26d07d01cf197bf2184b929b7dc94aa70d935aac6df896c256a3a9475b7e9d40" +checksum = "90ab9f6ea77e20e3129235e62a2e6bd64ed932363df104e864ee65ccffb54a8f" dependencies = [ "bech32 0.9.1", - "bitcoin 0.30.2", - "lightning", - "secp256k1 0.27.0", + "bitcoin", + "lightning-types", "serde", ] +[[package]] +name = "lightning-types" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1083b8d9137000edf3bfcb1ff011c0d25e0cdd2feb98cc21d6765e64a494148f" +dependencies = [ + "bech32 0.9.1", + "bitcoin", + "hex-conservative 0.2.1", +] + [[package]] name = "linux-raw-sys" version = "0.4.14" @@ -4295,20 +4526,26 @@ version = "0.6.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2a385b1be4e5c3e362ad2ffa73c392e53f031eaa5b7d648e64cd87f27f6063d7" +[[package]] +name = "litemap" +version = "0.7.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4ee93343901ab17bd981295f2cf0026d4ad018c7c31ba84549a4ddbb47a45104" + [[package]] name = "lnurl-rs" -version = "0.6.0" +version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "86f2347f6764fedbb74482d88f472dc3e2c7613304bfea31ce1b7ee8e1ebbf8c" +checksum = "2951a7783efa798febff75dfd9df4716c3ddc5bea969f132b282972a36bc7d8f" dependencies = [ "aes", "anyhow", "base64 0.22.1", "bech32 0.11.0", - "bitcoin 0.30.2", + "bitcoin", "cbc", "email_address", - "reqwest 0.12.8", + "reqwest 0.12.12", "serde", "serde_json", "url", @@ -4329,6 +4566,9 @@ name = "log" version = "0.4.22" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a7a70ba024b9dc04c27ea2f0c0548feb474ec5c54bba33a7f72f873a39d07b24" +dependencies = [ + "value-bag", +] [[package]] name = "lru" @@ -4505,12 +4745,12 @@ checksum = "6877bb514081ee2a7ff5ef9de3281f14a4dd4bceac4c09388074a6b5df8a139a" [[package]] name = "miniscript" -version = "10.2.0" +version = "12.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d371924f9eb7aa860ab395baaaa0bcdfa81a32f330b538c4e2c04617b2722fe3" +checksum = "5bd3c9608217b0d6fa9c9c8ddd875b85ab72bd4311cfc8db35e1b5a08fc11f4d" dependencies = [ - "bitcoin 0.30.2", - "bitcoin-private", + "bech32 0.11.0", + "bitcoin", "serde", ] @@ -4524,6 +4764,17 @@ dependencies = [ "simd-adler32", ] +[[package]] +name = "minreq" +version = "2.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "36a8e50e917e18a37d500d27d40b7bc7d127e71c0c94fb2d83f43b4afd308390" +dependencies = [ + "log", + "serde", + "serde_json", +] + [[package]] name = "mio" version = "1.0.2" @@ -4709,7 +4960,7 @@ dependencies = [ "proc-macro-crate 3.2.0", "proc-macro2", "quote", - "syn 2.0.79", + "syn 2.0.95", ] [[package]] @@ -5098,7 +5349,7 @@ dependencies = [ "by_address", "proc-macro2", "quote", - "syn 2.0.79", + "syn 2.0.95", ] [[package]] @@ -5243,7 +5494,7 @@ dependencies = [ "phf_shared", "proc-macro2", "quote", - "syn 2.0.79", + "syn 2.0.95", ] [[package]] @@ -5278,7 +5529,7 @@ checksum = "a4502d8515ca9f32f1fb543d987f63d95a14934883db45bdb48060b6b69257f8" dependencies = [ "proc-macro2", "quote", - "syn 2.0.79", + "syn 2.0.95", ] [[package]] @@ -5468,11 +5719,32 @@ dependencies = [ "version_check", ] +[[package]] +name = "proc-macro-error-attr2" +version = "2.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "96de42df36bb9bba5542fe9f1a054b8cc87e172759a1868aa05c1f3acc89dfc5" +dependencies = [ + "proc-macro2", + "quote", +] + +[[package]] +name = "proc-macro-error2" +version = "2.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "11ec05c52be0a07b08061f7dd003e7d7092e0472bc731b4af7bb1ef876109802" +dependencies = [ + "proc-macro-error-attr2", + "proc-macro2", + "quote", +] + [[package]] name = "proc-macro2" -version = "1.0.88" +version = "1.0.92" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7c3a7fc5db1e57d5a779a352c8cdb57b29aa4c40cc69c3a68a7fedc815fbf2f9" +checksum = "37d3544b3f2748c54e147655edb5025752e2303145b5aefb3c3ea2c78b973bb0" dependencies = [ "unicode-ident", ] @@ -5849,9 +6121,9 @@ dependencies = [ [[package]] name = "reqwest" -version = "0.12.8" +version = "0.12.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f713147fbe92361e52392c73b8c9e48c04c6625bce969ef54dc901e58e042a7b" +checksum = "43e734407157c3c2034e0258f5e4473ddb361b1e85f95a66690d67264d7cd1da" dependencies = [ "base64 0.22.1", "bytes", @@ -5883,10 +6155,13 @@ dependencies = [ "tokio", "tokio-rustls 0.26.0", "tokio-socks", + "tokio-util", + "tower", "tower-service", "url", "wasm-bindgen", "wasm-bindgen-futures", + "wasm-streams", "web-sys", "webpki-roots 0.26.6", "windows-registry", @@ -6248,67 +6523,23 @@ dependencies = [ [[package]] name = "secp256k1" -version = "0.24.3" +version = "0.29.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6b1629c9c557ef9b293568b338dddfc8208c98a18c59d722a9d53f859d9c9b62" +checksum = "9465315bc9d4566e1724f0fffcbcc446268cb522e60f9a27bcded6b19c108113" dependencies = [ - "bitcoin_hashes 0.11.0", + "bitcoin_hashes 0.14.0", "rand 0.8.5", - "secp256k1-sys 0.6.1", - "serde", -] - -[[package]] -name = "secp256k1" -version = "0.27.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "25996b82292a7a57ed3508f052cfff8640d38d32018784acd714758b43da9c8f" -dependencies = [ - "bitcoin_hashes 0.12.0", - "rand 0.8.5", - "secp256k1-sys 0.8.1", + "secp256k1-sys", "serde", ] [[package]] name = "secp256k1-sys" -version = "0.6.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "83080e2c2fc1006e625be82e5d1eb6a43b7fd9578b617fcc55814daf286bba4b" -dependencies = [ - "cc", -] - -[[package]] -name = "secp256k1-sys" -version = "0.8.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "70a129b9e9efbfb223753b9163c4ab3b13cff7fd9c7f010fbac25ab4099fa07e" -dependencies = [ - "cc", -] - -[[package]] -name = "secp256k1-zkp" -version = "0.9.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "026efcdacb95ee6aae5cc19144dc1549973eac36a4972700c28493de1ee5d69f" -dependencies = [ - "bitcoin-private", - "rand 0.8.5", - "secp256k1 0.27.0", - "secp256k1-zkp-sys", - "serde", -] - -[[package]] -name = "secp256k1-zkp-sys" -version = "0.8.1" +version = "0.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d03ab1ca75a18e1899e8d9b8d28b5998ae1ddcb42fec5956769718543293c723" +checksum = "d4387882333d3aa8cb20530a17c69a3752e97837832f34f6dccc760e715001d9" dependencies = [ "cc", - "secp256k1-sys 0.8.1", ] [[package]] @@ -6331,9 +6562,9 @@ checksum = "f638d531eccd6e23b980caf34876660d38e265409d8e99b397ab71eb3612fad0" [[package]] name = "serde" -version = "1.0.210" +version = "1.0.217" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c8e3592472072e6e22e0a54d5904d9febf8508f65fb8552499a1abc7d1078c3a" +checksum = "02fc4265df13d6fa1d00ecff087228cc0a2b5f3c0e87e258d8b94a156e984c70" dependencies = [ "serde_derive", ] @@ -6359,13 +6590,13 @@ dependencies = [ [[package]] name = "serde_derive" -version = "1.0.210" +version = "1.0.217" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "243902eda00fad750862fc144cea25caca5e20d615af0a81bee94ca738f1df1f" +checksum = "5a9bf7cf98d04a2b28aead066b7496853d4779c9cc183c440dbac457641e19a0" dependencies = [ "proc-macro2", "quote", - "syn 2.0.79", + "syn 2.0.95", ] [[package]] @@ -6379,9 +6610,9 @@ dependencies = [ [[package]] name = "serde_json" -version = "1.0.130" +version = "1.0.135" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "610f75ff4a8e3cb29b85da56eabdd1bff5b06739059a4b8e2967fef32e5d9944" +checksum = "2b0d7ba2887406110130a978386c4e1befb98c674b4fba677954e4db976630d9" dependencies = [ "itoa", "memchr", @@ -6397,7 +6628,7 @@ checksum = "6c64451ba24fc7a6a2d60fc75dd9c83c90903b19028d4eff35e88fc1e86564e9" dependencies = [ "proc-macro2", "quote", - "syn 2.0.79", + "syn 2.0.95", ] [[package]] @@ -6448,7 +6679,7 @@ dependencies = [ "darling 0.20.10", "proc-macro2", "quote", - "syn 2.0.79", + "syn 2.0.95", ] [[package]] @@ -6783,6 +7014,12 @@ dependencies = [ "zeroize", ] +[[package]] +name = "stable_deref_trait" +version = "1.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a8f112729512f8e442d81f95a8a7ddf2b7c6b8a1a6f509a95864142b30cab2d3" + [[package]] name = "static_assertions" version = "1.1.0" @@ -6838,7 +7075,7 @@ dependencies = [ "proc-macro2", "quote", "rustversion", - "syn 2.0.79", + "syn 2.0.95", ] [[package]] @@ -6851,7 +7088,7 @@ dependencies = [ "proc-macro2", "quote", "rustversion", - "syn 2.0.79", + "syn 2.0.95", ] [[package]] @@ -6900,9 +7137,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.79" +version = "2.0.95" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "89132cd0bf050864e1d38dc3bbc07a0eb8e7530af26344d3d2bbbef83499f590" +checksum = "46f71c0377baf4ef1cc3e3402ded576dccc315800fbc62dfc7fe04b009773b4a" dependencies = [ "proc-macro2", "quote", @@ -6924,6 +7161,17 @@ dependencies = [ "futures-core", ] +[[package]] +name = "synstructure" +version = "0.13.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c8af7666ab7b6390ab78131fb5b0fce11d6b7a6951602017c35fa82800708971" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.95", +] + [[package]] name = "sys-locale" version = "0.3.1" @@ -6994,22 +7242,22 @@ dependencies = [ [[package]] name = "thiserror" -version = "1.0.64" +version = "1.0.69" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d50af8abc119fb8bb6dbabcfa89656f46f84aa0ac7688088608076ad2b459a84" +checksum = "b6aaf5339b578ea85b50e080feb250a3e8ae8cfcdff9a461c9ec2904bc923f52" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.64" +version = "1.0.69" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "08904e7672f5eb876eaaf87e0ce17857500934f4981c4a0ab2b4aa98baac7fc3" +checksum = "4fee6c4efc90059e10f81e6d42c60a18f76588c3d74cb83a0b242a2b6c7504c1" dependencies = [ "proc-macro2", "quote", - "syn 2.0.79", + "syn 2.0.95", ] [[package]] @@ -7108,6 +7356,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9117f5d4db391c1cf6927e7bea3db74b9a1c1add8f7eda9ffd5364f40f57b82f" dependencies = [ "displaydoc", + "zerovec", ] [[package]] @@ -7127,9 +7376,9 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" [[package]] name = "tokio" -version = "1.40.0" +version = "1.43.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e2b070231665d27ad9ec9b8df639893f46727666c6767db40317fbe920a5d998" +checksum = "3d61fa4ffa3de412bfea335c6ecff681de2b609ba3c77ef3e00e521813a9ed9e" dependencies = [ "backtrace", "bytes", @@ -7146,13 +7395,13 @@ dependencies = [ [[package]] name = "tokio-macros" -version = "2.4.0" +version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "693d596312e88961bc67d7f1f97af8a70227d9f90c31bba5806eec004978d752" +checksum = "6e06d43f1345a3bcd39f6a56dbb7dcab2ba47e68e8ac134855e7e2bdbaf8cab8" dependencies = [ "proc-macro2", "quote", - "syn 2.0.79", + "syn 2.0.95", ] [[package]] @@ -7973,6 +8222,27 @@ dependencies = [ "thiserror", ] +[[package]] +name = "tower" +version = "0.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d039ad9159c98b70ecfd540b2573b97f7f52c3e8d9f8ad57a24b916a536975f9" +dependencies = [ + "futures-core", + "futures-util", + "pin-project-lite", + "sync_wrapper 1.0.1", + "tokio", + "tower-layer", + "tower-service", +] + +[[package]] +name = "tower-layer" +version = "0.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "121c2a6cda46980bb0fcd1647ffaf6cd3fc79a013de288782836f6df9c48780e" + [[package]] name = "tower-service" version = "0.3.3" @@ -7998,7 +8268,7 @@ checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.79", + "syn 2.0.95", ] [[package]] @@ -8058,7 +8328,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "04659ddb06c87d233c566112c1c9c5b9e98256d9af50ec3bc9c8327f873a7568" dependencies = [ "quote", - "syn 2.0.79", + "syn 2.0.95", ] [[package]] @@ -8215,9 +8485,9 @@ checksum = "8ecb6da28b8a351d773b68d5825ac39017e680750f980f3a1a85cd8dd28a47c1" [[package]] name = "url" -version = "2.5.2" +version = "2.5.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "22784dbdf76fdde8af1aeda5622b546b422b6fc585325248a2bf9f5e41e94d6c" +checksum = "32f8b686cadd1473f4bd0117a5d28d36b1ade384ea9b5069a1c40aefed7fda60" dependencies = [ "form_urlencoded", "idna", @@ -8252,6 +8522,18 @@ dependencies = [ "xmlwriter", ] +[[package]] +name = "utf16_iter" +version = "1.0.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c8232dd3cdaed5356e0f716d285e4b40b932ac434100fe9b7e0e8e935b9e6246" + +[[package]] +name = "utf8_iter" +version = "1.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b6c140620e7ffbb22c2dee59cafe6084a59b5ffc27a8859a5f0d494b5d52b6be" + [[package]] name = "utf8parse" version = "0.2.2" @@ -8273,6 +8555,12 @@ version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "830b7e5d4d90034032940e4ace0d9a9a057e7a45cd94e6c007832e39edb82f6d" +[[package]] +name = "value-bag" +version = "1.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3ef4c4aa54d5d05a279399bfa921ec387b7aba77caf7a682ae8d86785b8fdad2" + [[package]] name = "vcpkg" version = "0.2.15" @@ -8293,7 +8581,7 @@ checksum = "d674d135b4a8c1d7e813e2f8d1c9a58308aee4a680323066025e53132218bd91" dependencies = [ "proc-macro2", "quote", - "syn 2.0.79", + "syn 2.0.95", ] [[package]] @@ -8358,7 +8646,7 @@ dependencies = [ "once_cell", "proc-macro2", "quote", - "syn 2.0.79", + "syn 2.0.95", "wasm-bindgen-shared", ] @@ -8392,7 +8680,7 @@ checksum = "26c6ab57572f7a24a4985830b120de1594465e5d500f24afe89e16b4e833ef68" dependencies = [ "proc-macro2", "quote", - "syn 2.0.79", + "syn 2.0.95", "wasm-bindgen-backend", "wasm-bindgen-shared", ] @@ -8403,6 +8691,19 @@ version = "0.2.95" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "65fc09f10666a9f147042251e0dda9c18f166ff7de300607007e96bdebc1068d" +[[package]] +name = "wasm-streams" +version = "0.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "15053d8d85c7eccdbefef60f06769760a563c7f0a9d6902a13d35c7800b0ad65" +dependencies = [ + "futures-util", + "js-sys", + "wasm-bindgen", + "wasm-bindgen-futures", + "web-sys", +] + [[package]] name = "wasm-timer" version = "0.2.5" @@ -8553,25 +8854,6 @@ dependencies = [ "wasm-bindgen", ] -[[package]] -name = "webpki" -version = "0.22.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ed63aea5ce73d0ff405984102c42de94fc55a6b75765d621c65262469b3c9b53" -dependencies = [ - "ring 0.17.8", - "untrusted 0.9.0", -] - -[[package]] -name = "webpki-roots" -version = "0.22.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b6c71e40d7d2c34a5106301fb632274ca37242cd0c9d3e64dbece371a40a2d87" -dependencies = [ - "webpki", -] - [[package]] name = "webpki-roots" version = "0.25.4" @@ -9103,6 +9385,18 @@ dependencies = [ "windows-sys 0.48.0", ] +[[package]] +name = "write16" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d1890f4022759daae28ed4fe62859b1236caebfc61ede2f63ed4e695f3f6d936" + +[[package]] +name = "writeable" +version = "0.5.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1e9df38ee2d2c3c5948ea468a8406ff0db0b29ae1ffde1bcf20ef305bcc95c51" + [[package]] name = "wyz" version = "0.5.1" @@ -9219,6 +9513,30 @@ version = "0.1.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c94451ac9513335b5e23d7a8a2b61a7102398b8cca5160829d313e84c9d98be1" +[[package]] +name = "yoke" +version = "0.7.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "120e6aef9aa629e3d4f52dc8cc43a015c7724194c97dfaf45180d2daf2b77f40" +dependencies = [ + "serde", + "stable_deref_trait", + "yoke-derive", + "zerofrom", +] + +[[package]] +name = "yoke-derive" +version = "0.7.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2380878cad4ac9aac1e2435f3eb4020e8374b5f13c296cb75b4620ff8e229154" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.95", + "synstructure", +] + [[package]] name = "zbus" version = "4.4.0" @@ -9236,7 +9554,7 @@ dependencies = [ "async-trait", "blocking", "enumflags2", - "event-listener", + "event-listener 5.3.1", "futures-core", "futures-sink", "futures-util", @@ -9266,7 +9584,7 @@ dependencies = [ "proc-macro-crate 3.2.0", "proc-macro2", "quote", - "syn 2.0.79", + "syn 2.0.95", "zvariant_utils", ] @@ -9305,7 +9623,28 @@ checksum = "fa4f8080344d4671fb4e831a13ad1e68092748387dfc4f55e356242fae12ce3e" dependencies = [ "proc-macro2", "quote", - "syn 2.0.79", + "syn 2.0.95", +] + +[[package]] +name = "zerofrom" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cff3ee08c995dee1859d998dea82f7374f2826091dd9cd47def953cae446cd2e" +dependencies = [ + "zerofrom-derive", +] + +[[package]] +name = "zerofrom-derive" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "595eed982f7d355beb85837f651fa22e90b3c044842dc7f2c2842c086f295808" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.95", + "synstructure", ] [[package]] @@ -9325,7 +9664,29 @@ checksum = "ce36e65b0d2999d2aafac989fb249189a141aee1f53c612c1f37d72631959f69" dependencies = [ "proc-macro2", "quote", - "syn 2.0.79", + "syn 2.0.95", +] + +[[package]] +name = "zerovec" +version = "0.10.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "aa2b893d79df23bfb12d5461018d408ea19dfafe76c2c7ef6d4eba614f8ff079" +dependencies = [ + "yoke", + "zerofrom", + "zerovec-derive", +] + +[[package]] +name = "zerovec-derive" +version = "0.10.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6eafa6dfb17584ea3e2bd6e76e0cc15ad7af12b09abdd1ca55961bed9b1063c6" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.95", ] [[package]] @@ -9350,7 +9711,7 @@ dependencies = [ "proc-macro-crate 3.2.0", "proc-macro2", "quote", - "syn 2.0.79", + "syn 2.0.95", "zvariant_utils", ] @@ -9362,5 +9723,5 @@ checksum = "c51bcff7cc3dbb5055396bcf774748c3dab426b4b8659046963523cee4808340" dependencies = [ "proc-macro2", "quote", - "syn 2.0.79", + "syn 2.0.95", ] diff --git a/harbor-client/Cargo.toml b/harbor-client/Cargo.toml index 709ff0a..4dcd751 100644 --- a/harbor-client/Cargo.toml +++ b/harbor-client/Cargo.toml @@ -23,16 +23,16 @@ bincode = "1.3.3" hex = "0.4.3" home = "0.5.9" -bitcoin = { version = "0.30.2", features = ["base64"] } +bitcoin = { version = "0.32.4", features = ["base64"] } bip39 = "2.0.0" -fedimint-api-client = { git = "https://github.com/fedimint/fedimint/", rev = "54acaa63a45e6bd14e872cdaaf020e8c100d6b33"} -fedimint-client = { git = "https://github.com/fedimint/fedimint/", rev = "54acaa63a45e6bd14e872cdaaf020e8c100d6b33"} -fedimint-core = { git = "https://github.com/fedimint/fedimint/", rev = "54acaa63a45e6bd14e872cdaaf020e8c100d6b33"} -fedimint-wallet-client = { git = "https://github.com/fedimint/fedimint/", rev = "54acaa63a45e6bd14e872cdaaf020e8c100d6b33"} -fedimint-mint-client = { git = "https://github.com/fedimint/fedimint/", rev = "54acaa63a45e6bd14e872cdaaf020e8c100d6b33"} -fedimint-ln-client = { git = "https://github.com/fedimint/fedimint/", rev = "54acaa63a45e6bd14e872cdaaf020e8c100d6b33"} -fedimint-bip39 = { git = "https://github.com/fedimint/fedimint/", rev = "54acaa63a45e6bd14e872cdaaf020e8c100d6b33"} -fedimint-ln-common = { git = "https://github.com/fedimint/fedimint/", rev = "54acaa63a45e6bd14e872cdaaf020e8c100d6b33"} +fedimint-api-client = "0.5.0" +fedimint-client = "0.5.0" +fedimint-core = "0.5.0" +fedimint-wallet-client = "0.5.0" +fedimint-mint-client = "0.5.0" +fedimint-ln-client = "0.5.0" +fedimint-bip39 = "0.5.0" +fedimint-ln-common = "0.5.0" [dev-dependencies] tempdir = "0.3.7" diff --git a/harbor-client/src/db.rs b/harbor-client/src/db.rs index c00a1b6..67b0439 100644 --- a/harbor-client/src/db.rs +++ b/harbor-client/src/db.rs @@ -480,7 +480,6 @@ mod tests { }; use bip39::{Language, Mnemonic}; use bitcoin::hashes::Hash; - use bitcoin::secp256k1::ThirtyTwoByteHash; use bitcoin::{Address, Txid}; use fedimint_core::config::FederationId; use fedimint_core::core::OperationId; @@ -593,7 +592,7 @@ mod tests { payment.fedimint_id(), FederationId::from_str(FEDERATION_ID).unwrap() ); - assert_eq!(payment.payment_hash(), invoice.payment_hash().into_32()); + assert_eq!(payment.payment_hash(), invoice.payment_hash().to_byte_array()); assert_eq!(payment.bolt11(), invoice); assert_eq!(payment.amount(), Amount::from_sats(1_000)); assert_eq!(payment.fee(), Amount::from_sats(1)); @@ -645,7 +644,7 @@ mod tests { receive.fedimint_id(), FederationId::from_str(FEDERATION_ID).unwrap() ); - assert_eq!(receive.payment_hash(), invoice.payment_hash().into_32()); + assert_eq!(receive.payment_hash(), invoice.payment_hash().to_byte_array()); assert_eq!(receive.bolt11(), invoice); assert_eq!(receive.amount(), Amount::from_sats(1_000)); assert_eq!(receive.fee(), Amount::from_sats(1)); diff --git a/harbor-client/src/fedimint_client.rs b/harbor-client/src/fedimint_client.rs index 70543e2..3072c7d 100644 --- a/harbor-client/src/fedimint_client.rs +++ b/harbor-client/src/fedimint_client.rs @@ -83,7 +83,7 @@ impl FedimintClient { client_builder.with_module(MintClientInit); client_builder.with_module(LightningClientInit::default()); - client_builder.with_primary_module(1); + client_builder.with_primary_module_kind(fedimint_mint_client::KIND); trace!("Building fedimint client db"); let secret = Bip39RootSecretStrategy::<12>::to_root_secret(mnemonic); diff --git a/harbor-ui/Cargo.toml b/harbor-ui/Cargo.toml index 8e2acf6..86a043b 100644 --- a/harbor-ui/Cargo.toml +++ b/harbor-ui/Cargo.toml @@ -19,7 +19,7 @@ palette = "0.7" chrono = "0.4.38" uuid = { version = "1.8", features = ["v4"] } -bitcoin = { version = "0.30.2", features = ["base64"] } +bitcoin = { version = "0.32.4", features = ["base64"] } bip39 = "2.0.0" -fedimint-core = { git = "https://github.com/fedimint/fedimint/", rev = "54acaa63a45e6bd14e872cdaaf020e8c100d6b33" } -fedimint-ln-common = { git = "https://github.com/fedimint/fedimint/", rev = "54acaa63a45e6bd14e872cdaaf020e8c100d6b33" } +fedimint-core = "0.5.0" +fedimint-ln-common = "0.5.0"