diff --git a/Cargo.lock b/Cargo.lock index 39804d7..b4e648d 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -77,12 +77,6 @@ dependencies = [ "libc", ] -[[package]] -name = "arrayref" -version = "0.3.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6b4930d2cb77ce62f89ee5d5289b4ac049559b1c45539271f5ed4fdc7db34545" - [[package]] name = "arrayvec" version = "0.7.4" @@ -100,33 +94,27 @@ dependencies = [ [[package]] name = "autocfg" -version = "1.2.0" +version = "1.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f1fdabc7756949593fe60f30ec81974b613357de856987752631dea1e3394c80" +checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0" [[package]] -name = "baid58" -version = "0.4.4" +name = "baid64" +version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bc0585242d87ed976e05db6ae86a0f771f140104a4b6c91b4c3e43b9b2357486" +checksum = "dd5e666513565d0a35116973541fbcb35700619316e1865cb27c7dba5de98668" dependencies = [ - "base58", - "blake3", + "amplify", + "base64", "mnemonic", "sha2", ] -[[package]] -name = "base58" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6107fe1be6682a68940da878d9e9f5e90ca5745b3dec9fd1bb393c8777d4f581" - [[package]] name = "base64" -version = "0.21.7" +version = "0.22.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9d297deb1925b89f2ccc13d7635fa0714f12c87adce1c75356b39ca9b7178567" +checksum = "72b3254f16251a8381aa12e40e3c4d2f0199f8c6508fbecb9d91f575e0fbb8c6" [[package]] name = "base85" @@ -144,18 +132,18 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d86b93f97252c47b41663388e6d155714a9d0c398b99f1005cbc5f978b29f445" [[package]] -name = "bitcoin-internals" -version = "0.2.0" +name = "bitcoin-io" +version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9425c3bf7089c983facbae04de54513cce73b41c7f9ff8c845b54e7bc64ebbfb" +checksum = "340e09e8399c7bd8912f495af6aa58bea0c9214773417ffaa8f6460f93aaee56" [[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", + "bitcoin-io", "hex-conservative", ] @@ -165,19 +153,6 @@ version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cf4b9d6a944f767f8e5e0db018570623c85f3d925ac718db4e06d0187adb21c1" -[[package]] -name = "blake3" -version = "1.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "30cca6d3674597c30ddf2c587bf8d9d65c9a84d2326d941cc79c9842dfe0ef52" -dependencies = [ - "arrayref", - "arrayvec", - "cc", - "cfg-if", - "constant_time_eq", -] - [[package]] name = "block-buffer" version = "0.10.4" @@ -189,8 +164,9 @@ dependencies = [ [[package]] name = "bp-consensus" -version = "0.11.0-beta.5" -source = "git+https://github.com/BP-WG/bp-core?branch=v0.11#27a4b711613f88276b5b7da0c2a3b27164b431e8" +version = "0.11.0-beta.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f126ed462c6b054ccd027d3ed59fdc0eed5d720cbada79e4d8b7ef8e4779d9b8" dependencies = [ "amplify", "chrono", @@ -202,8 +178,9 @@ dependencies = [ [[package]] name = "bp-core" -version = "0.11.0-beta.5" -source = "git+https://github.com/BP-WG/bp-core?branch=v0.11#27a4b711613f88276b5b7da0c2a3b27164b431e8" +version = "0.11.0-beta.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6ea9b90b2e6cfafc0e45dc0a856e9b45e933ab4147c576ca8c26f038ba8c97bb" dependencies = [ "amplify", "bp-consensus", @@ -218,8 +195,9 @@ dependencies = [ [[package]] name = "bp-dbc" -version = "0.11.0-beta.5" -source = "git+https://github.com/BP-WG/bp-core?branch=v0.11#27a4b711613f88276b5b7da0c2a3b27164b431e8" +version = "0.11.0-beta.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ec406f105bf1e421ead00b47e309901028d10de7033fe918445b089cf7505669" dependencies = [ "amplify", "base85", @@ -231,7 +209,7 @@ dependencies = [ [[package]] name = "bp-derive" -version = "0.11.0-beta.5" +version = "0.11.0-beta.6" dependencies = [ "amplify", "bitcoin_hashes", @@ -244,7 +222,7 @@ dependencies = [ [[package]] name = "bp-invoice" -version = "0.11.0-beta.5" +version = "0.11.0-beta.6" dependencies = [ "amplify", "bech32", @@ -255,11 +233,12 @@ dependencies = [ [[package]] name = "bp-seals" -version = "0.11.0-beta.5" -source = "git+https://github.com/BP-WG/bp-core?branch=v0.11#27a4b711613f88276b5b7da0c2a3b27164b431e8" +version = "0.11.0-beta.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e4f81b41d82e4138d4bcac17afbb421099c887e406947430131c14ba22abe45d" dependencies = [ "amplify", - "baid58", + "baid64", "bp-consensus", "bp-dbc", "commit_verify", @@ -270,7 +249,7 @@ dependencies = [ [[package]] name = "bp-std" -version = "0.11.0-beta.5" +version = "0.11.0-beta.6" dependencies = [ "amplify", "bp-consensus", @@ -290,9 +269,9 @@ checksum = "79296716171880943b8470b5f8d03aa55eb2e645a4874bdbb28adb49162e012c" [[package]] name = "cc" -version = "1.0.94" +version = "1.0.98" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "17f6e324229dc011159fcc089755d1e2e216a90d43a7dea6853ca740b84f35e7" +checksum = "41c270e7540d725e65ac7f1b212ac8ce349719624d7bcff99f8e2e488e8cf03f" [[package]] name = "cfg-if" @@ -317,7 +296,8 @@ dependencies = [ [[package]] name = "commit_encoding_derive" version = "0.11.0-beta.5" -source = "git+https://github.com/LNP-BP/client_side_validation?branch=v0.11#d32e1af11a599643b235706efd51d0097347f082" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5d660fdac917fb67edd1707bc9481e51ed9062ab4ba1c4e56ed7856977fff9f3" dependencies = [ "amplify", "amplify_syn", @@ -328,8 +308,9 @@ dependencies = [ [[package]] name = "commit_verify" -version = "0.11.0-beta.5" -source = "git+https://github.com/LNP-BP/client_side_validation?branch=v0.11#d32e1af11a599643b235706efd51d0097347f082" +version = "0.11.0-beta.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b350bc4d1c5992571e3323810921d0eb4a65a3171cbf06fd1b9d1249cf1c3339" dependencies = [ "amplify", "commit_encoding_derive", @@ -341,12 +322,6 @@ dependencies = [ "vesper-lang", ] -[[package]] -name = "constant_time_eq" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f7144d30dcf0fafbce74250a3963025d8d52177934239851c917d29f1df280c2" - [[package]] name = "core-foundation-sys" version = "0.8.6" @@ -380,7 +355,7 @@ dependencies = [ [[package]] name = "descriptors" -version = "0.11.0-beta.5" +version = "0.11.0-beta.6" dependencies = [ "amplify", "bp-derive", @@ -416,9 +391,9 @@ dependencies = [ [[package]] name = "getrandom" -version = "0.2.14" +version = "0.2.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "94b22e06ecb0110981051723910cbf0b5f5e09a2062dd7663334ee79a9d1286c" +checksum = "c4567c8db10ae91089c99af84c68c38da3ec2f087c3f82960bcdbf3656b6f4d7" dependencies = [ "cfg-if", "js-sys", @@ -429,18 +404,19 @@ dependencies = [ [[package]] name = "half" -version = "2.2.1" +version = "2.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "02b4af3693f1b705df946e9fe5631932443781d0aabb423b62fcd4d73f6d2fd0" +checksum = "6dd08c532ae367adf81c312a4580bc67f1d0fe8bc9c460520283f4c0ff277888" dependencies = [ + "cfg-if", "crunchy", ] [[package]] name = "hashbrown" -version = "0.14.3" +version = "0.14.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "290f1a1d9242c78d09ce40a5e87e7554ee637af1351968159f4952f028f75604" +checksum = "e5274423e17b7c9fc20b6e7e208532f9b19825d82dfd615708b70edd83df41f1" [[package]] name = "heck" @@ -450,9 +426,12 @@ checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8" [[package]] name = "hex-conservative" -version = "0.1.1" +version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "30ed443af458ccb6d81c1e7e661545f94d3176752fb1df2f543b902a1e0f51e2" +checksum = "5313b072ce3c597065a808dbf612c4c8e8590bdbf8b579508bf7a762c5eae6cd" +dependencies = [ + "arrayvec", +] [[package]] name = "iana-time-zone" @@ -499,9 +478,9 @@ dependencies = [ [[package]] name = "libc" -version = "0.2.153" +version = "0.2.155" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c198f91728a82281a64e1f4f9eeb25d82cb32a5de251c6bd1b5154d63a8e7bd" +checksum = "97b3888a4aecf77e811145cadf6eef5901f4782c53886191b2f693f24761847c" [[package]] name = "log" @@ -517,9 +496,9 @@ checksum = "f2b8f3a258db515d5e91a904ce4ae3f73e091149b90cadbdb93d210bee07f63b" [[package]] name = "num-traits" -version = "0.2.18" +version = "0.2.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da0df0e5185db44f69b44f26786fe401b6c293d1907744beaa7fa62b2e5a517a" +checksum = "071dfc062690e90b734c0b2273ce72ad0ffa95f0c74596bc250dcfd960262841" dependencies = [ "autocfg", ] @@ -532,9 +511,9 @@ checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92" [[package]] name = "paste" -version = "1.0.14" +version = "1.0.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "de3145af08024dea9fa9914f381a17b8fc6034dfb00f3a84013f7ff43f29ed4c" +checksum = "57c0d7b74b563b49d38dae00a0c37d4d6de9b432382b2892f0574ddcae73fd0a" [[package]] name = "ppv-lite86" @@ -544,16 +523,16 @@ checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de" [[package]] name = "proc-macro2" -version = "1.0.81" +version = "1.0.83" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3d1597b0c024618f09a9c3b8655b7e430397a36d23fdafec26d6965e9eec3eba" +checksum = "0b33eb56c327dec362a9e55b3ad14f9d2f0904fb5a5b03b513ab5465399e9f43" dependencies = [ "unicode-ident", ] [[package]] name = "psbt" -version = "0.11.0-beta.5" +version = "0.11.0-beta.6" dependencies = [ "amplify", "base64", @@ -637,22 +616,22 @@ dependencies = [ [[package]] name = "serde" -version = "1.0.198" +version = "1.0.202" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9846a40c979031340571da2545a4e5b7c4163bdae79b301d5f86d03979451fcc" +checksum = "226b61a0d411b2ba5ff6d7f73a476ac4f8bb900373459cd00fab8512828ba395" dependencies = [ "serde_derive", ] [[package]] name = "serde_derive" -version = "1.0.198" +version = "1.0.202" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e88edab869b01783ba905e7d0153f9fc1a6505a96e4ad3018011eedb838566d9" +checksum = "6048858004bcff69094cd972ed40a32500f153bd3be9f716b2eed2e8217c4838" dependencies = [ "proc-macro2", "quote", - "syn 2.0.60", + "syn 2.0.66", ] [[package]] @@ -678,18 +657,18 @@ dependencies = [ [[package]] name = "single_use_seals" -version = "0.11.0-beta.5" +version = "0.11.0-beta.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8893da91eab5290895bb7913a786e26b2e170c568542451c12bf00cf1812035a" +checksum = "55367b3a0d642ee289fec6781fda0b527a35d45511a04bb4cd19fa315c441b77" dependencies = [ "amplify_derive", ] [[package]] name = "strict_encoding" -version = "2.7.0-beta.3" +version = "2.7.0-beta.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c463f8ea993e323740d78544473e791adb91ac659f5bf2c1a59db64a34f99fc" +checksum = "a2854135bbecf01fac5bae609ec3408e130259670424e2cd755660556d239c92" dependencies = [ "amplify", "half", @@ -711,12 +690,12 @@ dependencies = [ [[package]] name = "strict_types" -version = "2.7.0-beta.3" +version = "2.7.0-beta.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "152bd04284e9093f23a911d0d89b7dd950a461af1ed5e243f6215fbcd45e9445" +checksum = "f7a5479921604482fd8775ec07fbb9075c92e12649358d1f70dc9552783d0d1e" dependencies = [ "amplify", - "baid58", + "baid64", "half", "indexmap", "sha2", @@ -747,9 +726,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.60" +version = "2.0.66" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "909518bc7b1c9b779f1bbf07f2929d35af9f0f37e47c6e9ef7f9dddc1e1821f3" +checksum = "c42f3f41a2de00b01c0aaad383c5a45241efc8b2d1eda5661812fda5f3cdcff5" dependencies = [ "proc-macro2", "quote", @@ -758,22 +737,22 @@ dependencies = [ [[package]] name = "thiserror" -version = "1.0.58" +version = "1.0.61" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "03468839009160513471e86a034bb2c5c0e4baae3b43f79ffc55c4a5427b3297" +checksum = "c546c80d6be4bc6a00c0f01730c08df82eaa7a7a61f11d656526506112cc1709" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.58" +version = "1.0.61" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c61f3ba182994efc43764a46c018c347bc492c79f024e705f46567b418f6d4f7" +checksum = "46c3384250002a6d5af4d114f2845d37b57521033f30d5c3f46c4d70e1197533" dependencies = [ "proc-macro2", "quote", - "syn 2.0.60", + "syn 2.0.66", ] [[package]] @@ -831,7 +810,7 @@ dependencies = [ "once_cell", "proc-macro2", "quote", - "syn 2.0.60", + "syn 2.0.66", "wasm-bindgen-shared", ] @@ -853,7 +832,7 @@ checksum = "e94f17b526d0a461a191c78ea52bbce64071ed5c04c9ffe424dcb38f74171bb7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.60", + "syn 2.0.66", "wasm-bindgen-backend", "wasm-bindgen-shared", ] diff --git a/Cargo.toml b/Cargo.toml index a76e340..b591dc3 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -3,7 +3,7 @@ members = ["invoice", "derive", "descriptors", "psbt", "."] resolver = "2" [workspace.package] -version = "0.11.0-beta.5" +version = "0.11.0-beta.6" keywords = ["bitcoin", "wallet", "descriptors", "psbt", "taproot"] categories = ["cryptography::cryptocurrencies"] authors = ["Dr Maxim Orlovsky "] @@ -16,15 +16,15 @@ license = "Apache-2.0" [workspace.dependencies] amplify = "4.6.0" bech32 = "0.9.1" -bitcoin_hashes = "0.13.0" # TODO: Remove and replace with commit_verify -commit_verify = "0.11.0-beta.5" -strict_encoding = "2.7.0-beta.3" -bp-consensus = "0.11.0-beta.5" -bp-core = { version = "0.11.0-beta.5" } -bp-invoice = { version = "0.11.0-beta.5", path = "invoice" } -bp-derive = { version = "0.11.0-beta.5", path = "derive" } -descriptors = { version = "0.11.0-beta.5", path = "descriptors" } -psbt = { version = "0.11.0-beta.5", path = "psbt" } +bitcoin_hashes = "0.14.0" # TODO: Remove and replace with commit_verify +commit_verify = "0.11.0-beta.6" +strict_encoding = "2.7.0-beta.4" +bp-consensus = "0.11.0-beta.6" +bp-core = { version = "0.11.0-beta.6" } +bp-invoice = { version = "0.11.0-beta.6", path = "invoice" } +bp-derive = { version = "0.11.0-beta.6", path = "derive" } +descriptors = { version = "0.11.0-beta.6", path = "descriptors" } +psbt = { version = "0.11.0-beta.6", path = "psbt" } indexmap = "2.0.0" serde_crate = { package = "serde", version = "1", features = ["derive"] } @@ -61,10 +61,3 @@ all = ["client-side-validation", "strict_encoding", "serde"] strict_encoding = ["psbt/strict_encoding"] client-side-validation = ["bp-core", "psbt/client-side-validation"] serde = ["serde_crate", "bp-consensus/serde", "bp-invoice/serde", "bp-derive/serde", "descriptors/serde", "psbt/serde"] - -[patch.crates-io] -commit_verify = { git = "https://github.com/LNP-BP/client_side_validation", branch = "v0.11" } -bp-consensus = { git = "https://github.com/BP-WG/bp-core", branch = "v0.11" } -bp-dbc = { git = "https://github.com/BP-WG/bp-core", branch = "v0.11" } -bp-seals = { git = "https://github.com/BP-WG/bp-core", branch = "v0.11" } -bp-core = { git = "https://github.com/BP-WG/bp-core", branch = "v0.11" } diff --git a/psbt/Cargo.toml b/psbt/Cargo.toml index c961656..b3c6ee1 100644 --- a/psbt/Cargo.toml +++ b/psbt/Cargo.toml @@ -20,8 +20,8 @@ bp-core = { workspace = true, optional = true } bp-derive = { workspace = true } descriptors = { workspace = true } indexmap = { workspace = true } -base64 = "0.21.5" -chrono = "0.4.31" +base64 = "0.22.1" +chrono = "0.4.38" serde_crate = { workspace = true, optional = true } [features]