diff --git a/Cargo-minimal.lock b/Cargo-minimal.lock index 10c0bad56..104ed24d8 100644 --- a/Cargo-minimal.lock +++ b/Cargo-minimal.lock @@ -64,6 +64,18 @@ dependencies = [ "version_check", ] +[[package]] +name = "ahash" +version = "0.8.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "77c3a9648d43b9cd48db467b3f87fdd6e146bcc88ab0180006cef2179fe11d01" +dependencies = [ + "cfg-if 1.0.0", + "once_cell", + "version_check", + "zerocopy 0.7.31", +] + [[package]] name = "aho-corasick" version = "1.0.0" @@ -421,7 +433,7 @@ dependencies = [ "hyper", "hyper-util", "pin-project-lite", - "rustls 0.23.38", + "rustls", "rustls-pki-types", "tokio", "tokio-rustls", @@ -438,12 +450,6 @@ dependencies = [ "bitcoin_hashes 0.14.0", ] -[[package]] -name = "base64" -version = "0.13.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "904dfeac50f3cdaba28fc6f57fdcddb75f49ed61346676a78c4ffe55877802fd" - [[package]] name = "base64" version = "0.21.3" @@ -466,45 +472,42 @@ dependencies = [ ] [[package]] -name = "bdk" -version = "0.29.0" +name = "bdk_chain" +version = "0.23.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2fc1fc1a92e0943bfbcd6eb7d32c1b2a79f2f1357eb1e2eee9d7f36d6d7ca44a" +checksum = "c290eff038799a8ac0c5a82b6160a9ca456baa299a6f22b262c771342d2846c0" dependencies = [ - "async-trait", - "bdk-macros", - "bip39", - "bitcoin 0.30.0", - "core-rpc", - "electrum-client", - "esplora-client", - "getrandom 0.2.10", - "js-sys", - "log", + "bdk_core", + "bitcoin", "miniscript", - "rand 0.8.0", "serde", - "serde_json", - "sled", - "tokio", ] [[package]] -name = "bdk-macros" -version = "0.6.0" +name = "bdk_core" +version = "0.6.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "81c1980e50ae23bb6efa9283ae8679d6ea2c6fa6a99fe62533f65f4a25a1a56c" +checksum = "cb3028782f6bf14a6df987244333d34e6b272b5a40a53e4879ec2dfd82275a3a" dependencies = [ - "proc-macro2", - "quote", - "syn 1.0.74", + "bitcoin", + "hashbrown 0.14.5", + "serde", ] [[package]] -name = "bech32" -version = "0.9.0" +name = "bdk_wallet" +version = "3.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c5738be7561b0eeb501ef1d5c5db3f24e01ceb55fededd9b00039aada34966ad" +checksum = "1284fb23acc3e3022673712b55f4d5ce7e38aadc2c49bbef830dc3935f0a3289" +dependencies = [ + "bdk_chain", + "bip39", + "bitcoin", + "miniscript", + "rand_core 0.6.4", + "serde", + "serde_json", +] [[package]] name = "bech32" @@ -523,28 +526,13 @@ dependencies = [ [[package]] name = "bip39" -version = "2.0.0" +version = "2.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "93f2635620bf0b9d4576eb7bb9a38a55df78bd1205d26fa994b25911a69f212f" +checksum = "90dbd31c98227229239363921e60fcf5e558e43ec69094d46fc4996f08d1d5bc" dependencies = [ - "bitcoin_hashes 0.11.0", - "serde", - "unicode-normalization", -] - -[[package]] -name = "bitcoin" -version = "0.30.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b36f4c848f6bd9ff208128f08751135846cc23ae57d66ab10a22efff1c675f3c" -dependencies = [ - "base64 0.13.0", - "bech32 0.9.0", - "bitcoin-private", "bitcoin_hashes 0.12.0", - "hex_lit", - "secp256k1 0.27.0", "serde", + "unicode-normalization", ] [[package]] @@ -555,14 +543,14 @@ checksum = "9cf93e61f2dbc3e3c41234ca26a65e2c0b0975c52e0f069ab9893ebbede584d3" dependencies = [ "base58ck", "base64 0.21.3", - "bech32 0.11.0", + "bech32", "bitcoin-internals 0.3.0", "bitcoin-io", "bitcoin-units", "bitcoin_hashes 0.14.0", "hex-conservative 0.2.2", "hex_lit", - "secp256k1 0.29.1", + "secp256k1", "serde", ] @@ -578,19 +566,13 @@ dependencies = [ "generic-array", "hkdf 0.12.3", "hmac 0.12.1", - "rand_core 0.6.2", - "secp256k1 0.29.1", + "rand_core 0.6.4", + "secp256k1", "sha2 0.10.1", "subtle", "zeroize", ] -[[package]] -name = "bitcoin-internals" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1f9997f8650dd818369931b5672a18dbef95324d0513aa99aae758de8ce86e5b" - [[package]] name = "bitcoin-internals" version = "0.2.0" @@ -651,12 +633,6 @@ dependencies = [ "serde", ] -[[package]] -name = "bitcoin_hashes" -version = "0.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "90064b8dee6815a6470d60bad07bbbaee885c0e12d04177138fa3291a01b7bc4" - [[package]] name = "bitcoin_hashes" version = "0.12.0" @@ -664,7 +640,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5d7066118b13d4b20b23645932dfb3a81ce7e29f95726c2036fa33cd7b092501" dependencies = [ "bitcoin-private", - "serde", ] [[package]] @@ -694,7 +669,7 @@ version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0e0a228e083d1702f83389b0ac71eb70078dc8d7fcbb6cde864d1cbca145f5cc" dependencies = [ - "bitcoin 0.32.9", + "bitcoin", "percent-encoding-rfc3986", ] @@ -705,11 +680,11 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fbfef338cdb79b56b6ef8133a8b18058d8b64e057164674a0ff41199b5cd44de" dependencies = [ "base64 0.22.1", - "bitcoin 0.32.9", - "bitreq", + "bitcoin", + "bitreq 0.3.5", "corepc-types 0.13.0", "hex-conservative 0.2.2", - "secp256k1 0.29.1", + "secp256k1", "serde", "serde_json", "thiserror 2.0.18", @@ -732,17 +707,27 @@ dependencies = [ "serde", ] +[[package]] +name = "bitreq" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7c84f27ed293cb5218ab015faad9fbb95cf7905865ce71df075c8805a0b33b71" +dependencies = [ + "serde", + "serde_json", +] + [[package]] name = "bitreq" version = "0.3.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6df90cd78f0510165fd370574676aeb57dbec0ee3bfff68645bb7b0e9a65dbd5" dependencies = [ - "rustls 0.23.38", - "rustls-webpki 0.103.13", + "rustls", + "rustls-webpki", "tokio", "tokio-rustls", - "webpki-roots 1.0.7", + "webpki-roots", ] [[package]] @@ -843,7 +828,7 @@ checksum = "fb9ac64500cc83ce4b9f8dafa78186aa008c8dea77a09b94cd307fd0cd5022a8" dependencies = [ "camino", "cargo-platform", - "semver 1.0.7", + "semver", "serde", "serde_json", "thiserror 1.0.37", @@ -857,7 +842,7 @@ checksum = "afc309ed89476c8957c50fb818f56fe894db857866c3e163335faa91dc34eb85" dependencies = [ "camino", "cargo-platform", - "semver 1.0.7", + "semver", "serde", "serde_json", "thiserror 1.0.37", @@ -876,9 +861,9 @@ dependencies = [ [[package]] name = "cfg-if" -version = "0.1.2" +version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d4c819a1287eb618df47cc647173c5c4c66ba19d888a6e50d605672aed3140de" +checksum = "de1e760d7b6535af4241fca8bd8adf68e2e7edacc6b29f5d399050c5e48cf88c" [[package]] name = "cfg-if" @@ -1128,41 +1113,15 @@ version = "0.8.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "06ea2b9bc92be3c2baa9334a323ebca2d6f074ff852cd1d7b11064035cd3868f" -[[package]] -name = "core-rpc" -version = "0.17.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26d77079e1b71c2778d6e1daf191adadcd4ff5ec3ccad8298a79061d865b235b" -dependencies = [ - "bitcoin-private", - "core-rpc-json", - "jsonrpc 0.13.0", - "log", - "serde", - "serde_json", -] - -[[package]] -name = "core-rpc-json" -version = "0.17.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "581898ed9a83f31c64731b1d8ca2dfffcfec14edf1635afacd5234cddbde3a41" -dependencies = [ - "bitcoin 0.30.0", - "bitcoin-private", - "serde", - "serde_json", -] - [[package]] name = "corepc-client" -version = "0.10.0" +version = "0.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7755b8b9219b23d166a5897b5e2d8266cbdd0de5861d351b96f6db26bcf415f3" +checksum = "dc0d0096927a820ea80d4a43a2355209d9a69ef5b420861bf413c7e667cbff0b" dependencies = [ - "bitcoin 0.32.9", - "corepc-types 0.10.0", - "jsonrpc 0.18.0", + "bitcoin", + "corepc-types 0.12.0", + "jsonrpc", "log", "serde", "serde_json", @@ -1170,16 +1129,16 @@ dependencies = [ [[package]] name = "corepc-node" -version = "0.10.0" +version = "0.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "69bd382fc775f760a8b55d658527621b890eaa3d8e8bc9779864659b172e81c6" +checksum = "2f8749105873c391b77fc943b7fdf8c05b6c1d06f6e71c6d2746ee7f8bda0072" dependencies = [ "anyhow", "bitcoin_hashes 0.13.0", + "bitreq 0.3.5", "corepc-client", "flate2", "log", - "minreq", "serde_json", "tar", "tempfile", @@ -1189,11 +1148,11 @@ dependencies = [ [[package]] name = "corepc-types" -version = "0.10.0" +version = "0.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4e94b68cfbafce3a4f7a0d0f3553dedcf83586f71ddf16d737694915c28823b5" +checksum = "1583872320eb2ac629c36753023fd072f1ca1b3b74b20cc62bab055b54278789" dependencies = [ - "bitcoin 0.32.9", + "bitcoin", "serde", "serde_json", ] @@ -1204,7 +1163,7 @@ version = "0.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b96c7869aa8234d10a41cbe3a1697bcb3a2482c48d9eb3541b3a4014a81afdad" dependencies = [ - "bitcoin 0.32.9", + "bitcoin", "serde", "serde_json", ] @@ -1233,32 +1192,6 @@ dependencies = [ "cfg-if 1.0.0", ] -[[package]] -name = "crossbeam-epoch" -version = "0.8.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "058ed274caafc1f60c4997b5fc07bf7dc7cca454af7c6e81edffe5f33f70dace" -dependencies = [ - "autocfg", - "cfg-if 0.1.2", - "crossbeam-utils 0.7.2", - "lazy_static", - "maybe-uninit", - "memoffset", - "scopeguard", -] - -[[package]] -name = "crossbeam-utils" -version = "0.7.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c3c7c73a2d1e9fc0886a08b93e98eb643461230d5f1925e4036204d5f2e261a8" -dependencies = [ - "autocfg", - "cfg-if 0.1.2", - "lazy_static", -] - [[package]] name = "crossbeam-utils" version = "0.8.8" @@ -1282,7 +1215,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1bfb12502f3fc46cca1bb51ac28df9d618d813cdc3d2f25b9fe775a34af26bb3" dependencies = [ "generic-array", - "rand_core 0.6.2", + "rand_core 0.6.4", "typenum", ] @@ -1446,25 +1379,6 @@ version = "1.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "60b1af1c220855b6ceac025d3f6ecdd2b7c4894bfe9cd9bda4fbb4bc7c0d4cf0" -[[package]] -name = "electrum-client" -version = "0.18.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6bc133f1c8d829d254f013f946653cbeb2b08674b960146361d1e9b67733ad19" -dependencies = [ - "bitcoin 0.30.0", - "bitcoin-private", - "byteorder", - "libc", - "log", - "rustls 0.21.8", - "serde", - "serde_json", - "webpki", - "webpki-roots 0.22.0", - "winapi 0.3.9", -] - [[package]] name = "encoding_rs" version = "0.8.33" @@ -1499,19 +1413,6 @@ dependencies = [ "windows-sys 0.52.0", ] -[[package]] -name = "esplora-client" -version = "0.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0cb1f7f2489cce83bc3bd92784f9ba5271eeb6e729b975895fc541f78cbfcdca" -dependencies = [ - "bitcoin 0.30.0", - "bitcoin-internals 0.1.0", - "log", - "serde", - "ureq", -] - [[package]] name = "extend" version = "1.1.0" @@ -1554,9 +1455,9 @@ version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "08530a39af0bd442c40aabb9e854f442a83bd2403feb1ed58fbe982dec2385f3" dependencies = [ - "cfg-if 0.1.2", + "cfg-if 0.1.0", "libc", - "redox_syscall 0.1.56", + "redox_syscall 0.1.0", ] [[package]] @@ -1606,16 +1507,6 @@ dependencies = [ "tokio", ] -[[package]] -name = "fs2" -version = "0.4.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9564fc758e15025b46aa6643b1b77d047d1a56a1aea6e01002ac0c7026876213" -dependencies = [ - "libc", - "winapi 0.3.9", -] - [[package]] name = "futures" version = "0.3.21" @@ -1705,15 +1596,6 @@ dependencies = [ "slab", ] -[[package]] -name = "fxhash" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c31b6d751ae2c7f11320402d34e41349dd1016f8d5d45e48c4312bc8625af50c" -dependencies = [ - "byteorder", -] - [[package]] name = "genco" version = "0.17.5" @@ -1810,7 +1692,7 @@ dependencies = [ "futures-sink", "futures-util", "http", - "indexmap 2.6.0", + "indexmap 2.2.1", "slab", "tokio", "tokio-util", @@ -1829,14 +1711,18 @@ version = "0.12.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888" dependencies = [ - "ahash", + "ahash 0.7.8", ] [[package]] name = "hashbrown" -version = "0.14.0" +version = "0.14.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2c6201b9ff9fd90a5a3bac2e56a830d0caa509576f0e503818ee82c181b3437a" +checksum = "e5274423e17b7c9fc20b6e7e208532f9b19825d82dfd615708b70edd83df41f1" +dependencies = [ + "ahash 0.8.7", + "serde", +] [[package]] name = "hashbrown" @@ -2029,13 +1915,13 @@ dependencies = [ "http", "hyper", "hyper-util", - "rustls 0.23.38", + "rustls", "rustls-native-certs", "rustls-pki-types", "tokio", "tokio-rustls", "tower-service", - "webpki-roots 1.0.7", + "webpki-roots", ] [[package]] @@ -2148,12 +2034,12 @@ dependencies = [ [[package]] name = "indexmap" -version = "2.6.0" +version = "2.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "707907fe3c25f5424cce2cb7e1cbcafee6bdbe735ca90ef77c29e84591e5b9da" +checksum = "433de089bd45971eecf4668ee0ee8f4cec17db4f8bd8f7bc3197a6ce37aa7d9b" dependencies = [ "equivalent", - "hashbrown 0.15.0", + "hashbrown 0.14.5", "serde", ] @@ -2166,12 +2052,6 @@ dependencies = [ "generic-array", ] -[[package]] -name = "instant" -version = "0.1.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7777a24a1ce5de49fcdde84ec46efa487c3af49d5b6e6e0a50367cc5c1096182" - [[package]] name = "ipnet" version = "2.9.0" @@ -2231,23 +2111,12 @@ dependencies = [ [[package]] name = "jsonrpc" -version = "0.13.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fd8d6b3f301ba426b30feca834a2a18d48d5b54e5065496b5c1b05537bee3639" -dependencies = [ - "base64 0.13.0", - "serde", - "serde_json", -] - -[[package]] -name = "jsonrpc" -version = "0.18.0" +version = "0.19.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3662a38d341d77efecb73caf01420cfa5aa63c0253fd7bc05289ef9f6616e1bf" +checksum = "629d2b4ae586d04b6bae3c75879d7ddd39325c2b67a9c87634f4ec88a488dc65" dependencies = [ - "base64 0.13.0", - "minreq", + "base64 0.22.1", + "bitreq 0.2.0", "serde", "serde_json", ] @@ -2369,27 +2238,12 @@ dependencies = [ "thiserror 2.0.18", ] -[[package]] -name = "maybe-uninit" -version = "2.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "60302e4db3a61da70c0cb7991976248362f30319e88850c487b9b95bbf059e00" - [[package]] name = "memchr" version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2dffe52ecf27772e601905b7522cb4ef790d2cc203488bbd0e2fe85fcb74566d" -[[package]] -name = "memoffset" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dea4bf2ae5c6a9c64c2ba12b0c5a73b2e24d9aa205a1c3e1cdd7d0c0c1bfe3b2" -dependencies = [ - "rustc_version", -] - [[package]] name = "mime" version = "0.3.16" @@ -2404,12 +2258,12 @@ checksum = "4e80d6719ad8ce5647db5cb8cd162588ee448cbae498eca06a28e6c95e604e00" [[package]] name = "miniscript" -version = "10.0.0" +version = "12.3.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1eb102b66b2127a872dbcc73095b7b47aeb9d92f7b03c2b2298253ffc82c7594" +checksum = "487906208f38448e186e3deb02f2b8ef046a9078b0de00bdb28bf4fb9b76951c" dependencies = [ - "bitcoin 0.30.0", - "bitcoin-private", + "bech32", + "bitcoin", "serde", ] @@ -2422,21 +2276,6 @@ dependencies = [ "adler2", ] -[[package]] -name = "minreq" -version = "2.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cb3371dfc7b772c540da1380123674a8e20583aca99907087d990ca58cf44203" -dependencies = [ - "log", - "once_cell", - "rustls 0.21.8", - "rustls-webpki 0.101.7", - "serde", - "serde_json", - "webpki-roots 0.25.2", -] - [[package]] name = "mio" version = "1.2.0" @@ -2674,7 +2513,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "04d84ee66570a6460dc6143a5c4835f3a4179201ce91c25fc717d4eb3dc31db9" dependencies = [ "dlv-list", - "hashbrown 0.14.0", + "hashbrown 0.14.5", ] [[package]] @@ -2692,17 +2531,6 @@ version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b15813163c1d831bf4a13c3610c05c0d03b39feb07f7e09fa234dac9b15aaf39" -[[package]] -name = "parking_lot" -version = "0.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a4893845fa2ca272e647da5d0e46660a314ead9c2fdd9a883aabc32e481a8733" -dependencies = [ - "instant", - "lock_api", - "parking_lot_core 0.8.1", -] - [[package]] name = "parking_lot" version = "0.12.0" @@ -2710,21 +2538,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "87f5ec2493a61ac0506c0f4199f99070cbe83857b0337006a30f3e6719b8ef58" dependencies = [ "lock_api", - "parking_lot_core 0.9.0", -] - -[[package]] -name = "parking_lot_core" -version = "0.8.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d7c6d9b8427445284a09c55be860a15855ab580a417ccad9da88f5a06787ced0" -dependencies = [ - "cfg-if 1.0.0", - "instant", - "libc", - "redox_syscall 0.1.56", - "smallvec", - "winapi 0.3.9", + "parking_lot_core", ] [[package]] @@ -2757,7 +2571,7 @@ name = "payjoin" version = "1.0.0-rc.4" dependencies = [ "bhttp", - "bitcoin 0.32.9", + "bitcoin", "bitcoin-hpke", "bitcoin-ohttp", "bitcoin-units", @@ -2768,7 +2582,7 @@ dependencies = [ "payjoin-test-utils", "percent-encoding-rfc3986", "reqwest", - "rustls 0.23.38", + "rustls", "serde", "serde_json", "tokio", @@ -2780,7 +2594,7 @@ dependencies = [ name = "payjoin-cli" version = "0.2.0" dependencies = [ - "ahash", + "ahash 0.7.8", "anyhow", "async-trait", "bitcoind-async-client", @@ -2813,7 +2627,7 @@ name = "payjoin-ffi" version = "0.24.0" dependencies = [ "async-trait", - "bdk", + "bdk_wallet", "getrandom 0.2.10", "icu_locale_core", "icu_provider", @@ -2849,7 +2663,7 @@ dependencies = [ "axum", "axum-server", "bhttp", - "bitcoin 0.32.9", + "bitcoin", "bitcoin-ohttp", "byteorder", "bytes", @@ -2875,7 +2689,7 @@ dependencies = [ "rand 0.8.0", "rcgen 0.12.0", "reqwest", - "rustls 0.23.38", + "rustls", "serde", "tempfile", "tokio", @@ -2897,7 +2711,7 @@ name = "payjoin-test-utils" version = "0.0.1" dependencies = [ "axum-server", - "bitcoin 0.32.9", + "bitcoin", "bitcoin-ohttp", "corepc-node", "futures", @@ -2907,7 +2721,7 @@ dependencies = [ "payjoin-mailroom", "rcgen 0.14.7", "reqwest", - "rustls 0.23.38", + "rustls", "tar", "tempfile", "time", @@ -3146,7 +2960,7 @@ dependencies = [ "quinn-proto", "quinn-udp", "rustc-hash 1.1.0", - "rustls 0.23.38", + "rustls", "thiserror 1.0.37", "tokio", "tracing", @@ -3160,9 +2974,9 @@ checksum = "e974563a4b1c2206bbc61191ca4da9c22e4308b4c455e8906751cc7828393f08" dependencies = [ "bytes", "rand 0.8.0", - "ring 0.17.12", + "ring", "rustc-hash 1.1.0", - "rustls 0.23.38", + "rustls", "slab", "thiserror 1.0.37", "tinyvec", @@ -3198,7 +3012,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "51de85fb3fb6524929c8a2eb85e6b6d363de4e8c48f9e2c2eac4944abc181c93" dependencies = [ "log", - "parking_lot 0.12.0", + "parking_lot", "scheduled-thread-pool", ] @@ -3221,7 +3035,7 @@ checksum = "a76330fb486679b4ace3670f117bbc9e16204005c4bde9c4bd372f45bed34f12" dependencies = [ "libc", "rand_chacha 0.3.0", - "rand_core 0.6.2", + "rand_core 0.6.4", "rand_hc", ] @@ -3233,7 +3047,7 @@ checksum = "3779b94aeb87e8bd4e834cee3650289ee9e0d5677f976ecdb6d219e5f4f6cd94" dependencies = [ "rand_chacha 0.9.0", "rand_core 0.9.0", - "zerocopy", + "zerocopy 0.8.0", ] [[package]] @@ -3243,7 +3057,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e12735cf05c9e10bf21534da50a147b924d555dc7a547c42e6bb2d5b6017ae0d" dependencies = [ "ppv-lite86", - "rand_core 0.6.2", + "rand_core 0.6.4", ] [[package]] @@ -3258,9 +3072,9 @@ dependencies = [ [[package]] name = "rand_core" -version = "0.6.2" +version = "0.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "34cf66eb183df1c5876e2dcf6b13d57340741e8dc255b48e40a26de954d06ae7" +checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c" dependencies = [ "getrandom 0.2.10", ] @@ -3272,7 +3086,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b08f3c9802962f7e1b25113931d94f43ed9725bebc59db9d0c3e9a23b67e15ff" dependencies = [ "getrandom 0.3.0", - "zerocopy", + "zerocopy 0.8.0", ] [[package]] @@ -3281,7 +3095,7 @@ version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3190ef7066a446f2e7f42e239d161e905420ccab01eb967c9eb27d21b2322a73" dependencies = [ - "rand_core 0.6.2", + "rand_core 0.6.4", ] [[package]] @@ -3291,7 +3105,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5d918c80c5a4c7560db726763020bd16db179e4d5b828078842274a443addb5d" dependencies = [ "pem", - "ring 0.17.12", + "ring", "time", "yasna", ] @@ -3303,7 +3117,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "10b99e0098aa4082912d4c649628623db6aba77335e4f4569ff5083a6448b32e" dependencies = [ "pem", - "ring 0.17.12", + "ring", "rustls-pki-types", "time", "x509-parser", @@ -3312,9 +3126,9 @@ dependencies = [ [[package]] name = "redox_syscall" -version = "0.1.56" +version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2439c63f3f6139d1b57529d16bc3b8bb855230c8efcc5d3a896c8bea7c3b1e84" +checksum = "35a48131ab10dbeb17202bd1dcb9c9798963a58a50c9ec31640f237358832094" [[package]] name = "redox_syscall" @@ -3401,7 +3215,7 @@ dependencies = [ "percent-encoding", "pin-project-lite", "quinn", - "rustls 0.23.38", + "rustls", "rustls-native-certs", "rustls-pki-types", "serde", @@ -3417,22 +3231,7 @@ dependencies = [ "wasm-bindgen", "wasm-bindgen-futures", "web-sys", - "webpki-roots 1.0.7", -] - -[[package]] -name = "ring" -version = "0.16.19" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "024a1e66fea74c66c66624ee5622a7ff0e4b73a13b4f5c326ddb50c708944226" -dependencies = [ - "cc", - "libc", - "once_cell", - "spin", - "untrusted 0.7.1", - "web-sys", - "winapi 0.3.9", + "webpki-roots", ] [[package]] @@ -3445,7 +3244,7 @@ dependencies = [ "cfg-if 1.0.0", "getrandom 0.2.10", "libc", - "untrusted 0.9.0", + "untrusted", "windows-sys 0.52.0", ] @@ -3497,15 +3296,6 @@ version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "583034fd73374156e66797ed8e5b0d5690409c9226b22d87cb7f19821c05d152" -[[package]] -name = "rustc_version" -version = "0.2.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "138e3e0acb6c9fb258b19b67cb8abd63c00679d2851805ea151465464fe9030a" -dependencies = [ - "semver 0.9.0", -] - [[package]] name = "rusticata-macros" version = "4.0.0" @@ -3528,18 +3318,6 @@ dependencies = [ "windows-sys 0.52.0", ] -[[package]] -name = "rustls" -version = "0.21.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "446e14c5cda4f3f30fe71863c34ec70f5ac79d6087097ad0bb433e1be5edf04c" -dependencies = [ - "log", - "ring 0.17.12", - "rustls-webpki 0.101.7", - "sct", -] - [[package]] name = "rustls" version = "0.23.38" @@ -3547,9 +3325,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "69f9466fb2c14ea04357e91413efb882e2a6d4a406e625449bc0a5d360d53a21" dependencies = [ "once_cell", - "ring 0.17.12", + "ring", "rustls-pki-types", - "rustls-webpki 0.103.13", + "rustls-webpki", "subtle", "zeroize", ] @@ -3586,35 +3364,15 @@ dependencies = [ "zeroize", ] -[[package]] -name = "rustls-webpki" -version = "0.100.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f3ebea7be4213f3fcfb1a680824ebbd3b39f1521d167c2cf060f7bf994b7ac44" -dependencies = [ - "ring 0.16.19", - "untrusted 0.7.1", -] - -[[package]] -name = "rustls-webpki" -version = "0.101.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8b6275d1ee7a1cd780b64aca7726599a1dbc893b1e64144529e55c3c2f745765" -dependencies = [ - "ring 0.17.12", - "untrusted 0.9.0", -] - [[package]] name = "rustls-webpki" version = "0.103.13" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "61c429a8649f110dddef65e2a5ad240f747e85f7758a6bccc7e5777bd33f756e" dependencies = [ - "ring 0.17.12", + "ring", "rustls-pki-types", - "untrusted 0.9.0", + "untrusted", ] [[package]] @@ -3674,28 +3432,6 @@ dependencies = [ "syn 2.0.87", ] -[[package]] -name = "sct" -version = "0.7.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da046153aa2352493d6cb7da4b6e5c0c057d8a1d0a9aa8560baffdd945acd414" -dependencies = [ - "ring 0.17.12", - "untrusted 0.9.0", -] - -[[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.0", - "secp256k1-sys 0.8.1", - "serde", -] - [[package]] name = "secp256k1" version = "0.29.1" @@ -3704,19 +3440,10 @@ checksum = "9465315bc9d4566e1724f0fffcbcc446268cb522e60f9a27bcded6b19c108113" dependencies = [ "bitcoin_hashes 0.12.0", "rand 0.8.0", - "secp256k1-sys 0.10.0", + "secp256k1-sys", "serde", ] -[[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-sys" version = "0.10.0" @@ -3749,15 +3476,6 @@ dependencies = [ "libc", ] -[[package]] -name = "semver" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1d7eb9ef2c18661902cc47e535f9bc51b78acd254da71d375c2f6720d9a40403" -dependencies = [ - "semver-parser", -] - [[package]] name = "semver" version = "1.0.7" @@ -3767,12 +3485,6 @@ dependencies = [ "serde", ] -[[package]] -name = "semver-parser" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "388a1df253eca08550bef6c72392cfe7c30914bf41df5269b68cbd6ff8f570a3" - [[package]] name = "serde" version = "1.0.228" @@ -3972,22 +3684,6 @@ version = "0.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c111b5bd5695e56cffe5129854aa230b39c93a305372fdbb2668ca2394eea9f8" -[[package]] -name = "sled" -version = "0.34.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2b2aed3832b6d0c828efe6bcb6c309a18cf487dffc5cc0787da2ce140f0fb0ce" -dependencies = [ - "crc32fast", - "crossbeam-epoch", - "crossbeam-utils 0.7.2", - "fs2", - "fxhash", - "libc", - "log", - "parking_lot 0.11.0", -] - [[package]] name = "smallvec" version = "1.13.1" @@ -4031,12 +3727,6 @@ dependencies = [ "winapi 0.3.9", ] -[[package]] -name = "spin" -version = "0.5.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6e63cff320ae2c57904679ba7cb63280a3dc4613885beafb148ee7bf9aa9042d" - [[package]] name = "stable_deref_trait" version = "1.2.0" @@ -4153,7 +3843,7 @@ checksum = "a303ba60a099fcd2aaa646b14d2724591a96a75283e4b7ed3d1a1658909d9ae2" dependencies = [ "filetime", "libc", - "redox_syscall 0.1.56", + "redox_syscall 0.1.0", "xattr", ] @@ -4318,7 +4008,7 @@ dependencies = [ "bytes", "libc", "mio", - "parking_lot 0.12.0", + "parking_lot", "pin-project-lite", "signal-hook-registry", "socket2 0.6.3", @@ -4363,7 +4053,7 @@ version = "0.26.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1729aa945f29d91ba541258c8df89027d5792d85a8841fb65e8bf0f4ede4ef61" dependencies = [ - "rustls 0.23.38", + "rustls", "tokio", ] @@ -4384,15 +4074,15 @@ dependencies = [ "proc-macro2", "rcgen 0.14.7", "reqwest", - "ring 0.17.12", - "rustls 0.23.38", + "ring", + "rustls", "serde", "serde_json", "thiserror 2.0.18", "time", "tokio", "tokio-rustls", - "webpki-roots 1.0.7", + "webpki-roots", "x509-parser", ] @@ -4491,7 +4181,7 @@ version = "0.20.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8ff63e60a958cefbb518ae1fd6566af80d9d4be430a33f3723dfc47d1d411d95" dependencies = [ - "indexmap 2.6.0", + "indexmap 2.2.1", "serde", "serde_spanned 0.6.3", "toml_datetime 0.6.3", @@ -4825,7 +4515,7 @@ dependencies = [ "glob", "goblin", "heck 0.5.0", - "indexmap 2.6.0", + "indexmap 2.2.1", "once_cell", "serde", "tempfile", @@ -4881,7 +4571,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4641669b48fefbc5e80ff08c5004d9c7617fb91232131a6734ab6712779cb04c" dependencies = [ "anyhow", - "indexmap 2.6.0", + "indexmap 2.2.1", "proc-macro2", "quote", "syn 2.0.87", @@ -4924,7 +4614,7 @@ checksum = "032739b3ec725576914c15899dedaf080163ced86b6934566c20ec2b20ce90ca" dependencies = [ "anyhow", "heck 0.5.0", - "indexmap 2.6.0", + "indexmap 2.2.1", "tempfile", "uniffi_internal_macros", ] @@ -4961,37 +4651,12 @@ dependencies = [ "subtle", ] -[[package]] -name = "untrusted" -version = "0.7.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a156c684c91ea7d62626509bce3cb4e1d9ed5c4d978f7b4352658f96a4c26b4a" - [[package]] name = "untrusted" version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8ecb6da28b8a351d773b68d5825ac39017e680750f980f3a1a85cd8dd28a47c1" -[[package]] -name = "ureq" -version = "2.7.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b11c96ac7ee530603dcdf68ed1557050f374ce55a5a07193ebf8cbc9f8927e9" -dependencies = [ - "base64 0.21.3", - "flate2", - "log", - "once_cell", - "rustls 0.21.8", - "rustls-webpki 0.100.0", - "serde", - "serde_json", - "socks", - "url", - "webpki-roots 0.23.0", -] - [[package]] name = "url" version = "2.5.4" @@ -5053,9 +4718,9 @@ checksum = "df74ff70e2ced9607f67e06640f89a6a6374b459b51bdef290a5cfa657fe4fcc" [[package]] name = "version_check" -version = "0.9.0" +version = "0.9.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "45d3d553fd9413fffe7147a20171d640eda0ad4c070acd7d0c885a21bcd2e8b7" +checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" [[package]] name = "want" @@ -5155,9 +4820,9 @@ dependencies = [ [[package]] name = "web-sys" -version = "0.3.37" +version = "0.3.36" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2d6f51648d8c56c366144378a33290049eafdd784071077f6fe37dae64c1c4cb" +checksum = "721c6263e2c66fd44501cc5efbfa2b7dfa775d13e4ea38c46299646ed1f9c70a" dependencies = [ "js-sys", "wasm-bindgen", @@ -5173,40 +4838,6 @@ dependencies = [ "wasm-bindgen", ] -[[package]] -name = "webpki" -version = "0.22.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f095d78192e208183081cc07bc5515ef55216397af48b873e5edcd72637fa1bd" -dependencies = [ - "ring 0.16.19", - "untrusted 0.7.1", -] - -[[package]] -name = "webpki-roots" -version = "0.22.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b533367e7546a31c15093b12a273004b79eb3b57b15359af710460f9aee94cf8" -dependencies = [ - "webpki", -] - -[[package]] -name = "webpki-roots" -version = "0.23.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aa54963694b65584e170cf5dc46aeb4dcaa5584e652ff5f3952e56d66aff0125" -dependencies = [ - "rustls-webpki 0.100.0", -] - -[[package]] -name = "webpki-roots" -version = "0.25.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "14247bb57be4f377dfb94c72830b8ce8fc6beac03cf4bf7b9732eadd414123fc" - [[package]] name = "webpki-roots" version = "1.0.7" @@ -5598,7 +5229,7 @@ dependencies = [ "lazy_static", "nom", "oid-registry", - "ring 0.17.12", + "ring", "rusticata-macros", "thiserror 2.0.18", "time", @@ -5657,13 +5288,33 @@ dependencies = [ "synstructure 0.13.0", ] +[[package]] +name = "zerocopy" +version = "0.7.31" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1c4061bedbb353041c12f413700357bec76df2c7e2ca8e4df8bac24c6bf68e3d" +dependencies = [ + "zerocopy-derive 0.7.31", +] + [[package]] name = "zerocopy" version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "df7885ffcb82507a0f213c593e77c5f13d12cb96588d4e835ad7e9423ba034db" dependencies = [ - "zerocopy-derive", + "zerocopy-derive 0.8.0", +] + +[[package]] +name = "zerocopy-derive" +version = "0.7.31" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b3c129550b3e6de3fd0ba67ba5c81818f9805e58b8d7fee80a3a59d2c9fc601a" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.87", ] [[package]] @@ -5749,7 +5400,7 @@ dependencies = [ "byteorder", "bzip2", "crc32fast", - "crossbeam-utils 0.8.8", + "crossbeam-utils", "flate2", ] diff --git a/Cargo-recent.lock b/Cargo-recent.lock index b27a37f90..38d71be7f 100644 --- a/Cargo-recent.lock +++ b/Cargo-recent.lock @@ -431,7 +431,7 @@ dependencies = [ "hyper", "hyper-util", "pin-project-lite", - "rustls 0.23.41", + "rustls", "rustls-pki-types", "tokio", "tokio-rustls", @@ -444,15 +444,9 @@ version = "0.1.101" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "365c0acd5b2e8dd0111a46c4faea83fb3cfb6e39a49a7c73a06e090db7b2eff0" dependencies = [ - "bitcoin_hashes 0.14.101", + "bitcoin_hashes", ] -[[package]] -name = "base64" -version = "0.13.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9e1b586273c5702936fe7b7d6896644d8be71e6314cfe09d3167c95f712589e8" - [[package]] name = "base64" version = "0.21.7" @@ -475,45 +469,42 @@ dependencies = [ ] [[package]] -name = "bdk" -version = "0.29.0" +name = "bdk_chain" +version = "0.23.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2fc1fc1a92e0943bfbcd6eb7d32c1b2a79f2f1357eb1e2eee9d7f36d6d7ca44a" +checksum = "c290eff038799a8ac0c5a82b6160a9ca456baa299a6f22b262c771342d2846c0" dependencies = [ - "async-trait", - "bdk-macros", - "bip39", - "bitcoin 0.30.3", - "core-rpc", - "electrum-client", - "esplora-client", - "getrandom 0.2.17", - "js-sys", - "log", + "bdk_core", + "bitcoin", "miniscript", - "rand 0.8.7", "serde", - "serde_json", - "sled", - "tokio", ] [[package]] -name = "bdk-macros" -version = "0.6.0" +name = "bdk_core" +version = "0.6.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "81c1980e50ae23bb6efa9283ae8679d6ea2c6fa6a99fe62533f65f4a25a1a56c" +checksum = "cb3028782f6bf14a6df987244333d34e6b272b5a40a53e4879ec2dfd82275a3a" dependencies = [ - "proc-macro2", - "quote", - "syn 1.0.109", + "bitcoin", + "hashbrown 0.14.5", + "serde", ] [[package]] -name = "bech32" -version = "0.9.1" +name = "bdk_wallet" +version = "3.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d86b93f97252c47b41663388e6d155714a9d0c398b99f1005cbc5f978b29f445" +checksum = "1284fb23acc3e3022673712b55f4d5ce7e38aadc2c49bbef830dc3935f0a3289" +dependencies = [ + "bdk_chain", + "bip39", + "bitcoin", + "miniscript", + "rand_core 0.6.4", + "serde", + "serde_json", +] [[package]] name = "bech32" @@ -536,27 +527,11 @@ version = "2.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "90dbd31c98227229239363921e60fcf5e558e43ec69094d46fc4996f08d1d5bc" dependencies = [ - "bitcoin_hashes 0.14.101", + "bitcoin_hashes", "serde", "unicode-normalization", ] -[[package]] -name = "bitcoin" -version = "0.30.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "39f50161c4b69a2c8fd7d5d7d8b58bb83900a7ba7080010014cca7a80fe56d1d" -dependencies = [ - "base64 0.13.1", - "bech32 0.9.1", - "bitcoin-private", - "bitcoin_hashes 0.12.0", - "hex-conservative 0.2.2", - "hex_lit", - "secp256k1 0.27.0", - "serde", -] - [[package]] name = "bitcoin" version = "0.32.101" @@ -565,13 +540,13 @@ checksum = "8ed8ccb78a9ff7a6fbb90e2fb9b8588b4a9928d49d8af3cb789108a84ea6b0ce" dependencies = [ "base58ck", "base64 0.21.7", - "bech32 0.11.1", + "bech32", "bitcoin-io", "bitcoin-units", - "bitcoin_hashes 0.14.101", + "bitcoin_hashes", "hex-conservative 0.2.2", "hex_lit", - "secp256k1 0.29.1", + "secp256k1", "serde", ] @@ -581,7 +556,7 @@ version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b2d6094e2a1ba3c93b5a596fe5a10d1a10c3c6e06785cde89f693a044c01aa40" dependencies = [ - "bitcoin-internals 0.5.0", + "bitcoin-internals", ] [[package]] @@ -597,18 +572,12 @@ dependencies = [ "hkdf 0.12.4", "hmac 0.12.1", "rand_core 0.6.4", - "secp256k1 0.29.1", + "secp256k1", "sha2 0.10.9", "subtle", "zeroize", ] -[[package]] -name = "bitcoin-internals" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1f9997f8650dd818369931b5672a18dbef95324d0513aa99aae758de8ce86e5b" - [[package]] name = "bitcoin-internals" version = "0.5.0" @@ -650,12 +619,6 @@ dependencies = [ "toml 0.5.11", ] -[[package]] -name = "bitcoin-private" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "73290177011694f38ec25e165d0387ab7ea749a4b81cd4c80dae5988229f7a57" - [[package]] name = "bitcoin-units" version = "0.1.101" @@ -666,16 +629,6 @@ dependencies = [ "serde", ] -[[package]] -name = "bitcoin_hashes" -version = "0.12.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5d7066118b13d4b20b23645932dfb3a81ce7e29f95726c2036fa33cd7b092501" -dependencies = [ - "bitcoin-private", - "serde", -] - [[package]] name = "bitcoin_hashes" version = "0.14.101" @@ -693,7 +646,7 @@ version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0e0a228e083d1702f83389b0ac71eb70078dc8d7fcbb6cde864d1cbca145f5cc" dependencies = [ - "bitcoin 0.32.101", + "bitcoin", "percent-encoding-rfc3986", ] @@ -704,11 +657,11 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fbfef338cdb79b56b6ef8133a8b18058d8b64e057164674a0ff41199b5cd44de" dependencies = [ "base64 0.22.1", - "bitcoin 0.32.101", - "bitreq", + "bitcoin", + "bitreq 0.3.7", "corepc-types 0.13.0", "hex-conservative 0.2.2", - "secp256k1 0.29.1", + "secp256k1", "serde", "serde_json", "thiserror 2.0.18", @@ -731,17 +684,27 @@ dependencies = [ "serde_core", ] +[[package]] +name = "bitreq" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7c84f27ed293cb5218ab015faad9fbb95cf7905865ce71df075c8805a0b33b71" +dependencies = [ + "serde", + "serde_json", +] + [[package]] name = "bitreq" version = "0.3.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b65c2e1ab98050c93cc9ada070d5070e014329c65196d03f6f8f1f75c2666f37" dependencies = [ - "rustls 0.23.41", - "rustls-webpki 0.103.13", + "rustls", + "rustls-webpki", "tokio", "tokio-rustls", - "webpki-roots 1.0.8", + "webpki-roots", ] [[package]] @@ -1131,41 +1094,15 @@ version = "0.8.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "773648b94d0e5d620f64f280777445740e61fe701025087ec8b57f45c791888b" -[[package]] -name = "core-rpc" -version = "0.17.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26d77079e1b71c2778d6e1daf191adadcd4ff5ec3ccad8298a79061d865b235b" -dependencies = [ - "bitcoin-private", - "core-rpc-json", - "jsonrpc 0.13.0", - "log", - "serde", - "serde_json", -] - -[[package]] -name = "core-rpc-json" -version = "0.17.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "581898ed9a83f31c64731b1d8ca2dfffcfec14edf1635afacd5234cddbde3a41" -dependencies = [ - "bitcoin 0.30.3", - "bitcoin-private", - "serde", - "serde_json", -] - [[package]] name = "corepc-client" -version = "0.10.0" +version = "0.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7755b8b9219b23d166a5897b5e2d8266cbdd0de5861d351b96f6db26bcf415f3" +checksum = "dc0d0096927a820ea80d4a43a2355209d9a69ef5b420861bf413c7e667cbff0b" dependencies = [ - "bitcoin 0.32.101", - "corepc-types 0.10.1", - "jsonrpc 0.18.0", + "bitcoin", + "corepc-types 0.12.0", + "jsonrpc", "log", "serde", "serde_json", @@ -1173,16 +1110,16 @@ dependencies = [ [[package]] name = "corepc-node" -version = "0.10.1" +version = "0.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "768391062ec3812e223bb3031c5b2fcdd6e0e60b816157f21df82fd3e6617dc0" +checksum = "2f8749105873c391b77fc943b7fdf8c05b6c1d06f6e71c6d2746ee7f8bda0072" dependencies = [ "anyhow", - "bitcoin_hashes 0.14.101", + "bitcoin_hashes", + "bitreq 0.3.7", "corepc-client", "flate2", "log", - "minreq", "serde_json", "tar", "tempfile", @@ -1192,11 +1129,11 @@ dependencies = [ [[package]] name = "corepc-types" -version = "0.10.1" +version = "0.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c22db78b0223b66f82f92b14345f06307078f76d94b18280431ea9bc6cd9cbb6" +checksum = "1583872320eb2ac629c36753023fd072f1ca1b3b74b20cc62bab055b54278789" dependencies = [ - "bitcoin 0.32.101", + "bitcoin", "serde", "serde_json", ] @@ -1207,7 +1144,7 @@ version = "0.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b96c7869aa8234d10a41cbe3a1697bcb3a2482c48d9eb3541b3a4014a81afdad" dependencies = [ - "bitcoin 0.32.101", + "bitcoin", "serde", "serde_json", ] @@ -1248,15 +1185,6 @@ dependencies = [ "cfg-if", ] -[[package]] -name = "crossbeam-epoch" -version = "0.9.20" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2d6914041f254d6e9176c01941b21115dcfb7089e55135a35411081bd106ef3f" -dependencies = [ - "crossbeam-utils", -] - [[package]] name = "crossbeam-utils" version = "0.8.22" @@ -1446,25 +1374,6 @@ version = "1.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "91622ff5e7162018101f2fea40d6ebf4a78bbe5a49736a2020649edf9693679e" -[[package]] -name = "electrum-client" -version = "0.18.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6bc133f1c8d829d254f013f946653cbeb2b08674b960146361d1e9b67733ad19" -dependencies = [ - "bitcoin 0.30.3", - "bitcoin-private", - "byteorder", - "libc", - "log", - "rustls 0.21.12", - "serde", - "serde_json", - "webpki", - "webpki-roots 0.22.6", - "winapi", -] - [[package]] name = "encoding_rs" version = "0.8.35" @@ -1501,19 +1410,6 @@ dependencies = [ "windows-sys 0.61.2", ] -[[package]] -name = "esplora-client" -version = "0.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0cb1f7f2489cce83bc3bd92784f9ba5271eeb6e729b975895fc541f78cbfcdca" -dependencies = [ - "bitcoin 0.30.3", - "bitcoin-internals 0.1.0", - "log", - "serde", - "ureq", -] - [[package]] name = "extend" version = "1.2.0" @@ -1609,16 +1505,6 @@ dependencies = [ "tokio", ] -[[package]] -name = "fs2" -version = "0.4.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9564fc758e15025b46aa6643b1b77d047d1a56a1aea6e01002ac0c7026876213" -dependencies = [ - "libc", - "winapi", -] - [[package]] name = "futures" version = "0.3.32" @@ -1707,15 +1593,6 @@ dependencies = [ "slab", ] -[[package]] -name = "fxhash" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c31b6d751ae2c7f11320402d34e41349dd1016f8d5d45e48c4312bc8625af50c" -dependencies = [ - "byteorder", -] - [[package]] name = "genco" version = "0.17.10" @@ -1847,6 +1724,7 @@ checksum = "e5274423e17b7c9fc20b6e7e208532f9b19825d82dfd615708b70edd83df41f1" dependencies = [ "ahash 0.8.12", "allocator-api2", + "serde", ] [[package]] @@ -2062,12 +1940,12 @@ dependencies = [ "http", "hyper", "hyper-util", - "rustls 0.23.41", + "rustls", "rustls-native-certs", "tokio", "tokio-rustls", "tower-service", - "webpki-roots 1.0.8", + "webpki-roots", ] [[package]] @@ -2268,15 +2146,6 @@ dependencies = [ "generic-array", ] -[[package]] -name = "instant" -version = "0.1.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e0242819d153cba4b4b05a5a8f2a7e9bbf97b6055b2a002b395c96b5ff3c0222" -dependencies = [ - "cfg-if", -] - [[package]] name = "ipnet" version = "2.12.0" @@ -2393,23 +2262,12 @@ dependencies = [ [[package]] name = "jsonrpc" -version = "0.13.0" +version = "0.19.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fd8d6b3f301ba426b30feca834a2a18d48d5b54e5065496b5c1b05537bee3639" +checksum = "629d2b4ae586d04b6bae3c75879d7ddd39325c2b67a9c87634f4ec88a488dc65" dependencies = [ - "base64 0.13.1", - "serde", - "serde_json", -] - -[[package]] -name = "jsonrpc" -version = "0.18.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3662a38d341d77efecb73caf01420cfa5aa63c0253fd7bc05289ef9f6616e1bf" -dependencies = [ - "base64 0.13.1", - "minreq", + "base64 0.22.1", + "bitreq 0.2.0", "serde", "serde_json", ] @@ -2543,12 +2401,12 @@ checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a" [[package]] name = "miniscript" -version = "10.2.3" +version = "12.3.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2e88ef03cc0ce21bcf584da157890b292fc4b69bfeaa4e9d41bbf492da59b22f" +checksum = "b8343cc1ef1408bd9bdbf69f7aef47017dfab7e6349ec26fddf62e0e9fb5a4cf" dependencies = [ - "bitcoin 0.30.3", - "bitcoin-private", + "bech32", + "bitcoin", "serde", ] @@ -2562,19 +2420,6 @@ dependencies = [ "simd-adler32", ] -[[package]] -name = "minreq" -version = "2.14.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "05015102dad0f7d61691ca347e9d9d9006685a64aefb3d79eecf62665de2153d" -dependencies = [ - "rustls 0.21.12", - "rustls-webpki 0.101.7", - "serde", - "serde_json", - "webpki-roots 0.25.4", -] - [[package]] name = "mio" version = "1.2.1" @@ -2817,17 +2662,6 @@ version = "6.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e2355d85b9a3786f481747ced0e0ff2ba35213a1f9bd406ed906554d7af805a1" -[[package]] -name = "parking_lot" -version = "0.11.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7d17b78036a60663b797adeaee46f5c9dfebb86948d1255007a1d6be0271ff99" -dependencies = [ - "instant", - "lock_api", - "parking_lot_core 0.8.6", -] - [[package]] name = "parking_lot" version = "0.12.5" @@ -2835,21 +2669,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "93857453250e3077bd71ff98b6a65ea6621a19bb0f559a85248955ac12c45a1a" dependencies = [ "lock_api", - "parking_lot_core 0.9.12", -] - -[[package]] -name = "parking_lot_core" -version = "0.8.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "60a2cfe6f0ad2bfc16aefa463b497d5c7a5ecd44a23efa72aa342d90177356dc" -dependencies = [ - "cfg-if", - "instant", - "libc", - "redox_syscall 0.2.16", - "smallvec", - "winapi", + "parking_lot_core", ] [[package]] @@ -2860,7 +2680,7 @@ checksum = "2621685985a2ebf1c516881c026032ac7deafcda1a2c9b7850dc81e3dfcb64c1" dependencies = [ "cfg-if", "libc", - "redox_syscall 0.5.18", + "redox_syscall", "smallvec", "windows-link", ] @@ -2882,7 +2702,7 @@ name = "payjoin" version = "1.0.0-rc.4" dependencies = [ "bhttp", - "bitcoin 0.32.101", + "bitcoin", "bitcoin-hpke", "bitcoin-ohttp", "bitcoin-units", @@ -2893,7 +2713,7 @@ dependencies = [ "payjoin-test-utils", "percent-encoding-rfc3986", "reqwest 0.12.28", - "rustls 0.23.41", + "rustls", "serde", "serde_json", "tokio", @@ -2938,7 +2758,7 @@ name = "payjoin-ffi" version = "0.24.0" dependencies = [ "async-trait", - "bdk", + "bdk_wallet", "getrandom 0.2.17", "icu_locale_core", "icu_provider", @@ -2974,7 +2794,7 @@ dependencies = [ "axum", "axum-server", "bhttp", - "bitcoin 0.32.101", + "bitcoin", "bitcoin-ohttp", "byteorder", "bytes", @@ -3000,7 +2820,7 @@ dependencies = [ "rand 0.8.7", "rcgen 0.12.1", "reqwest 0.12.28", - "rustls 0.23.41", + "rustls", "serde", "tempfile", "tokio", @@ -3022,7 +2842,7 @@ name = "payjoin-test-utils" version = "0.0.1" dependencies = [ "axum-server", - "bitcoin 0.32.101", + "bitcoin", "bitcoin-ohttp", "corepc-node", "futures", @@ -3032,7 +2852,7 @@ dependencies = [ "payjoin-mailroom", "rcgen 0.14.7", "reqwest 0.12.28", - "rustls 0.23.41", + "rustls", "tar", "tempfile", "time", @@ -3275,7 +3095,7 @@ dependencies = [ "quinn-proto", "quinn-udp", "rustc-hash", - "rustls 0.23.41", + "rustls", "socket2 0.6.4", "thiserror 2.0.18", "tokio", @@ -3296,7 +3116,7 @@ dependencies = [ "rand_pcg", "ring", "rustc-hash", - "rustls 0.23.41", + "rustls", "rustls-pki-types", "slab", "thiserror 2.0.18", @@ -3347,7 +3167,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "51de85fb3fb6524929c8a2eb85e6b6d363de4e8c48f9e2c2eac4944abc181c93" dependencies = [ "log", - "parking_lot 0.12.5", + "parking_lot", "scheduled-thread-pool", ] @@ -3473,15 +3293,6 @@ dependencies = [ "yasna", ] -[[package]] -name = "redox_syscall" -version = "0.2.16" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fb5a58c1855b4b6819d59012155603f0b22ad30cad752600aadfcb695265519a" -dependencies = [ - "bitflags 1.3.2", -] - [[package]] name = "redox_syscall" version = "0.5.18" @@ -3579,7 +3390,7 @@ dependencies = [ "percent-encoding", "pin-project-lite", "quinn", - "rustls 0.23.41", + "rustls", "rustls-native-certs", "rustls-pki-types", "serde", @@ -3595,7 +3406,7 @@ dependencies = [ "wasm-bindgen", "wasm-bindgen-futures", "web-sys", - "webpki-roots 1.0.8", + "webpki-roots", ] [[package]] @@ -3617,7 +3428,7 @@ dependencies = [ "log", "percent-encoding", "pin-project-lite", - "rustls 0.23.41", + "rustls", "rustls-pki-types", "rustls-platform-verifier", "sync_wrapper", @@ -3721,29 +3532,16 @@ dependencies = [ "windows-sys 0.61.2", ] -[[package]] -name = "rustls" -version = "0.21.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3f56a14d1f48b391359b22f731fd4bd7e43c97f3c50eee276f3aa09c94784d3e" -dependencies = [ - "log", - "ring", - "rustls-webpki 0.101.7", - "sct", -] - [[package]] name = "rustls" version = "0.23.41" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6b92b125634d9b795e7beca796cc790df15a7fb38323bf3196fda83292d06b1f" dependencies = [ - "log", "once_cell", "ring", "rustls-pki-types", - "rustls-webpki 0.103.13", + "rustls-webpki", "subtle", "zeroize", ] @@ -3781,10 +3579,10 @@ dependencies = [ "jni", "log", "once_cell", - "rustls 0.23.41", + "rustls", "rustls-native-certs", "rustls-platform-verifier-android", - "rustls-webpki 0.103.13", + "rustls-webpki", "security-framework", "security-framework-sys", "webpki-root-certs", @@ -3797,16 +3595,6 @@ version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f87165f0995f63a9fbeea62b64d10b4d9d8e78ec6d7d51fb2125fda7bb36788f" -[[package]] -name = "rustls-webpki" -version = "0.101.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8b6275d1ee7a1cd780b64aca7726599a1dbc893b1e64144529e55c3c2f745765" -dependencies = [ - "ring", - "untrusted", -] - [[package]] name = "rustls-webpki" version = "0.103.13" @@ -3854,7 +3642,7 @@ version = "0.2.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3cbc66816425a074528352f5789333ecff06ca41b36b0b0efdfbb29edc391a19" dependencies = [ - "parking_lot 0.12.5", + "parking_lot", ] [[package]] @@ -3907,49 +3695,18 @@ dependencies = [ "syn 2.0.118", ] -[[package]] -name = "sct" -version = "0.7.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da046153aa2352493d6cb7da4b6e5c0c057d8a1d0a9aa8560baffdd945acd414" -dependencies = [ - "ring", - "untrusted", -] - -[[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.7", - "secp256k1-sys 0.8.2", - "serde", -] - [[package]] name = "secp256k1" version = "0.29.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9465315bc9d4566e1724f0fffcbcc446268cb522e60f9a27bcded6b19c108113" dependencies = [ - "bitcoin_hashes 0.14.101", + "bitcoin_hashes", "rand 0.8.7", - "secp256k1-sys 0.10.1", + "secp256k1-sys", "serde", ] -[[package]] -name = "secp256k1-sys" -version = "0.8.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4473013577ec77b4ee3668179ef1186df3146e2cf2d927bd200974c6fe60fd99" -dependencies = [ - "cc", -] - [[package]] name = "secp256k1-sys" version = "0.10.1" @@ -4210,22 +3967,6 @@ version = "0.4.12" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0c790de23124f9ab44544d7ac05d60440adc586479ce501c1d6d7da3cd8c9cf5" -[[package]] -name = "sled" -version = "0.34.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f96b4737c2ce5987354855aed3797279def4ebf734436c6aa4552cf8e169935" -dependencies = [ - "crc32fast", - "crossbeam-epoch", - "crossbeam-utils", - "fs2", - "fxhash", - "libc", - "log", - "parking_lot 0.11.2", -] - [[package]] name = "smallvec" version = "1.15.2" @@ -4521,7 +4262,7 @@ dependencies = [ "bytes", "libc", "mio", - "parking_lot 0.12.5", + "parking_lot", "pin-project-lite", "signal-hook-registry", "socket2 0.6.4", @@ -4566,7 +4307,7 @@ version = "0.26.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1729aa945f29d91ba541258c8df89027d5792d85a8841fb65e8bf0f4ede4ef61" dependencies = [ - "rustls 0.23.41", + "rustls", "tokio", ] @@ -4588,14 +4329,14 @@ dependencies = [ "rcgen 0.14.7", "reqwest 0.13.4", "ring", - "rustls 0.23.41", + "rustls", "serde", "serde_json", "thiserror 2.0.18", "time", "tokio", "tokio-rustls", - "webpki-roots 1.0.8", + "webpki-roots", "x509-parser", ] @@ -5149,25 +4890,6 @@ version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8ecb6da28b8a351d773b68d5825ac39017e680750f980f3a1a85cd8dd28a47c1" -[[package]] -name = "ureq" -version = "2.12.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "02d1a66277ed75f640d608235660df48c8e3c19f3b4edb6a263315626cc3c01d" -dependencies = [ - "base64 0.22.1", - "flate2", - "log", - "once_cell", - "rustls 0.23.41", - "rustls-pki-types", - "serde", - "serde_json", - "socks", - "url", - "webpki-roots 0.26.11", -] - [[package]] name = "url" version = "2.5.8" @@ -5337,16 +5059,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", - "untrusted", -] - [[package]] name = "webpki-root-certs" version = "1.0.8" @@ -5356,30 +5068,6 @@ dependencies = [ "rustls-pki-types", ] -[[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" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f20c57d8d7db6d3b86154206ae5d8fba62dd39573114de97c2cb0578251f8e1" - -[[package]] -name = "webpki-roots" -version = "0.26.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "521bc38abb08001b01866da9f51eb7c5d647a19260e00054a8c7fd5f9e57f7a9" -dependencies = [ - "webpki-roots 1.0.8", -] - [[package]] name = "webpki-roots" version = "1.0.8" diff --git a/payjoin-ffi/Cargo.toml b/payjoin-ffi/Cargo.toml index 0a7161dbb..a7b266748 100644 --- a/payjoin-ffi/Cargo.toml +++ b/payjoin-ffi/Cargo.toml @@ -43,10 +43,5 @@ url = "2.5.4" ignored = ["getrandom", "icu_provider", "icu_locale_core", "socks"] [dev-dependencies] -bdk = { version = "0.29.0", features = [ - "all-keys", - "use-esplora-ureq", - "keys-bip39", - "rpc", -] } +bdk_wallet = { version = "3.1.0", features = ["all-keys"] } socks = "0.3.4" diff --git a/payjoin-test-utils/Cargo.toml b/payjoin-test-utils/Cargo.toml index e25bc7fdc..55d6b2e16 100644 --- a/payjoin-test-utils/Cargo.toml +++ b/payjoin-test-utils/Cargo.toml @@ -27,7 +27,7 @@ axum-server = { version = "0.8", features = [ "tls-rustls-no-provider", ], optional = true } bitcoin = { version = "0.32.9", features = ["base64"] } -corepc-node = { version = "0.10.0", features = ["download", "29_0"] } +corepc-node = { version = "0.12.0", features = ["download", "29_0"] } futures = { version = "0.3.21", default-features = false, features = ["std"] } http = { version = "1.3.1", optional = true } ohttp = { package = "bitcoin-ohttp", version = "0.6.0", optional = true } diff --git a/payjoin/tests/integration.rs b/payjoin/tests/integration.rs index 3a59409ba..6bf8dc15b 100644 --- a/payjoin/tests/integration.rs +++ b/payjoin/tests/integration.rs @@ -1631,10 +1631,7 @@ mod integration { let psbtin = PsbtInput { // NOTE: non_witness_utxo is not necessary because bitcoin-cli always supplies // witness_utxo, even for non-witness inputs - witness_utxo: Some(TxOut { - value: utxo.amount.to_unsigned().expect("amount should be unsigned"), - script_pubkey: utxo.script_pubkey, - }), + witness_utxo: Some(TxOut { value: utxo.amount, script_pubkey: utxo.script_pubkey }), redeem_script: utxo.redeem_script, //FIXME needs later corepc_node bitcoin version //witness_script: utxo.witness_script.clone(),