diff --git a/Cargo.lock b/Cargo.lock index 10a389bc..71e94c6c 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -266,13 +266,13 @@ checksum = "c79fed4cdb43e993fcdadc7e58a09fd0e3e649c4436fa11da71c9f1f3ee7feb9" [[package]] name = "bdk" -version = "0.28.0" +version = "0.29.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e9b650f45ae7dc8558544448253f3e1ae443433637ccd9f9d14d2089ff913480" +checksum = "2fc1fc1a92e0943bfbcd6eb7d32c1b2a79f2f1357eb1e2eee9d7f36d6d7ca44a" dependencies = [ "async-trait", "bdk-macros", - "bitcoin", + "bitcoin 0.30.2", "electrum-client", "getrandom 0.2.11", "js-sys", @@ -343,11 +343,25 @@ name = "bitcoin" version = "0.29.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0694ea59225b0c5f3cb405ff3f670e4828358ed26aec49dc352f730f0cb1a8a3" +dependencies = [ + "bech32", + "bitcoin_hashes 0.11.0", + "secp256k1 0.24.1", + "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", - "bitcoin_hashes", - "secp256k1", + "bitcoin-private", + "bitcoin_hashes 0.12.0", + "hex_lit", + "secp256k1 0.27.0", "serde", ] @@ -358,7 +372,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6b6a18713ec8acbc96d1e843f6998f00e8c5d81173e38760023b84926b8db3b8" dependencies = [ "base64 0.12.3", - "bitcoin", + "bitcoin 0.29.2", "bitcoincore-rpc-json", "futures", "hex", @@ -373,6 +387,12 @@ dependencies = [ "url", ] +[[package]] +name = "bitcoin-private" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "73290177011694f38ec25e165d0387ab7ea749a4b81cd4c80dae5988229f7a57" + [[package]] name = "bitcoin_hashes" version = "0.11.0" @@ -382,13 +402,23 @@ 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 = "bitcoincore-rpc-json" version = "0.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c231bea28e314879c5aef240f6052e8a72a369e3c9f9b20d9bfbb33ad18029b2" dependencies = [ - "bitcoin", + "bitcoin 0.29.2", "serde", "serde_json", ] @@ -1138,15 +1168,16 @@ dependencies = [ [[package]] name = "electrum-client" -version = "0.12.0" +version = "0.18.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "82a232d46710f8064b7bb2029d82819fc1f5fba053687e0e3bb47cc762af24f6" +checksum = "6bc133f1c8d829d254f013f946653cbeb2b08674b960146361d1e9b67733ad19" dependencies = [ - "bitcoin", + "bitcoin 0.30.2", + "bitcoin-private", "byteorder", "libc", "log", - "rustls 0.20.2", + "rustls 0.21.10", "serde", "serde_json", "webpki 0.22.0", @@ -1631,6 +1662,12 @@ version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46" +[[package]] +name = "hex_lit" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3011d1213f159867b13cfd6ac92d2cd5f1345762c63be3554e84092d85a50bbd" + [[package]] name = "hmac" version = "0.10.1" @@ -2411,11 +2448,12 @@ checksum = "0c835948974f68e0bd58636fc6c5b1fbff7b297e3046f11b3b3c18bbac012c6d" [[package]] name = "miniscript" -version = "9.0.0" +version = "10.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "123a10aae81d0712ecc09b780f6f0ae0b0f506a5c4c912974725760d59ba073e" +checksum = "1eb102b66b2127a872dbcc73095b7b47aeb9d92f7b03c2b2298253ffc82c7594" dependencies = [ - "bitcoin", + "bitcoin 0.30.2", + "bitcoin-private", "serde", ] @@ -3721,9 +3759,21 @@ version = "0.24.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ff55dc09d460954e9ef2fa8a7ced735a964be9981fd50e870b2b3b0705e14964" dependencies = [ - "bitcoin_hashes", + "bitcoin_hashes 0.11.0", "rand 0.8.3", - "secp256k1-sys", + "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.3", + "secp256k1-sys 0.8.1", "serde", ] @@ -3736,6 +3786,15 @@ 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 = "secp256kfun" version = "0.7.1" @@ -3743,7 +3802,7 @@ source = "git+https://github.com/LLFourn/secp256kfun#9657d8c12fd26df5e57254a0063 dependencies = [ "digest 0.10.7", "rand_core 0.6.2", - "secp256k1", + "secp256k1 0.24.1", "serde", "subtle-ng", ] @@ -4328,7 +4387,7 @@ dependencies = [ "base64 0.21.6", "bdk", "big-bytes", - "bitcoin", + "bitcoin 0.29.2", "bitcoin-harness", "bmrng", "comfy-table", diff --git a/swap/Cargo.toml b/swap/Cargo.toml index cb9dfb2a..c7d69934 100644 --- a/swap/Cargo.toml +++ b/swap/Cargo.toml @@ -15,7 +15,7 @@ async-trait = "0.1" atty = "0.2" backoff = { version = "0.4", features = [ "tokio" ] } base64 = "0.21" -bdk = "0.28" +bdk = "0.29" big-bytes = "1" bitcoin = { version = "0.29", features = [ "rand", "serde" ] } bmrng = "0.5"