From e019ea88977cd17beb6992c9f3de670982f426c5 Mon Sep 17 00:00:00 2001
From: Dr Maxim Orlovsky <orlovsky@lnp-bp.org>
Date: Mon, 9 Oct 2023 17:32:09 +0200
Subject: [PATCH] chore: update dependencies

---
 Cargo.lock                      | 269 ++++++++++++++------------------
 Cargo.toml                      |  14 +-
 runtime/Cargo.toml              |   1 +
 runtime/src/indexers/esplora.rs |   3 +-
 runtime/src/indexers/mod.rs     |   2 +-
 runtime/src/payments.rs         |   3 +-
 runtime/src/runtime.rs          |   3 +-
 runtime/src/wallet.rs           |   4 +-
 src/args.rs                     |   2 +-
 src/opts.rs                     |   3 +-
 test.psbt                       | Bin 0 -> 484 bytes
 11 files changed, 141 insertions(+), 163 deletions(-)
 create mode 100644 test.psbt

diff --git a/Cargo.lock b/Cargo.lock
index b8dab81..f794f51 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -19,29 +19,29 @@ checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe"
 
 [[package]]
 name = "aho-corasick"
-version = "1.1.1"
+version = "1.1.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ea5d730647d4fadd988536d06fecce94b7b4f2a7efdae548f1cf4b63205518ab"
+checksum = "b2969dcb958b36655471fc61f7e416fa76033bdd4bfed0678d8fee1e2d07a1f0"
 dependencies = [
  "memchr",
 ]
 
 [[package]]
 name = "amplify"
-version = "4.1.1"
+version = "4.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a3f58ae011435caa061fb64894c7b05d615321011d35dd07b53b2843a4b61933"
+checksum = "8629db306c0bbeb0a402e2918bdcf0026b5ddb24c46460f3bf5410b350d98710"
 dependencies = [
  "amplify_apfloat",
- "amplify_derive 3.0.1",
+ "amplify_derive",
  "amplify_num",
  "amplify_syn",
  "ascii",
  "serde",
  "serde_json",
- "serde_yaml 0.8.26",
+ "serde_yaml",
  "stringly_conversions",
- "toml 0.5.11",
+ "toml",
  "wasm-bindgen",
 ]
 
@@ -57,21 +57,9 @@ dependencies = [
 
 [[package]]
 name = "amplify_derive"
-version = "3.0.1"
+version = "4.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c87df0f28e6eb1f2d355f29ba6793fa9ca643967528609608d5cbd70bd68f9d1"
-dependencies = [
- "amplify_syn",
- "proc-macro2",
- "quote",
- "syn 1.0.109",
-]
-
-[[package]]
-name = "amplify_derive"
-version = "4.0.0-alpha.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "01c4835e964725149d7961ec5af2ca1302f6f68c8c738b4acb06185f596c3333"
+checksum = "759dcbfaf94d838367a86d493ec34ccc8aa6fe365cb7880d6bf89006de24d9c1"
 dependencies = [
  "amplify_syn",
  "proc-macro2",
@@ -244,18 +232,19 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d86b93f97252c47b41663388e6d155714a9d0c398b99f1005cbc5f978b29f445"
 
 [[package]]
-name = "bitcoin-private"
-version = "0.1.0"
+name = "bitcoin-internals"
+version = "0.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "73290177011694f38ec25e165d0387ab7ea749a4b81cd4c80dae5988229f7a57"
+checksum = "9425c3bf7089c983facbae04de54513cce73b41c7f9ff8c845b54e7bc64ebbfb"
 
 [[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",
+ "bitcoin-internals",
+ "hex-conservative",
 ]
 
 [[package]]
@@ -292,15 +281,27 @@ dependencies = [
  "generic-array",
 ]
 
+[[package]]
+name = "bp-consensus"
+version = "0.10.10"
+source = "git+https://github.com/BP-WG/bp-core?branch=consensus#f3fd08046d37f2f8c41e65a637bfc9815372d71c"
+dependencies = [
+ "amplify",
+ "chrono",
+ "commit_verify",
+ "secp256k1",
+ "serde",
+ "strict_encoding",
+]
+
 [[package]]
 name = "bp-core"
-version = "0.10.9"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "accdf591895f370bb02f0e332b5a26d6124354b058801ef4b155d781ed4eb0d0"
+version = "0.10.10"
+source = "git+https://github.com/BP-WG/bp-core?branch=consensus#f3fd08046d37f2f8c41e65a637bfc9815372d71c"
 dependencies = [
  "amplify",
+ "bp-consensus",
  "bp-dbc",
- "bp-primitives",
  "bp-seals",
  "commit_verify",
  "serde",
@@ -310,13 +311,12 @@ dependencies = [
 
 [[package]]
 name = "bp-dbc"
-version = "0.10.9"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bfc6323f4f8c78e4d001c2e4edf176f04f5fb41c319ed9e27431ab34f25c1750"
+version = "0.10.10"
+source = "git+https://github.com/BP-WG/bp-core?branch=consensus#f3fd08046d37f2f8c41e65a637bfc9815372d71c"
 dependencies = [
  "amplify",
  "base85",
- "bp-primitives",
+ "bp-consensus",
  "commit_verify",
  "secp256k1",
  "serde",
@@ -337,18 +337,6 @@ dependencies = [
  "ureq",
 ]
 
-[[package]]
-name = "bp-primitives"
-version = "0.10.7"
-source = "git+https://github.com/BP-WG/bp-core#f576847dc229cd2daf20fdb72c25834467214e6f"
-dependencies = [
- "amplify",
- "commit_verify",
- "secp256k1",
- "serde",
- "strict_encoding",
-]
-
 [[package]]
 name = "bp-runtime"
 version = "0.11.0"
@@ -357,23 +345,23 @@ dependencies = [
  "bp-esplora",
  "bp-std",
  "cfg_eval",
+ "descriptors",
  "psbt",
  "serde",
  "serde_with",
- "serde_yaml 0.9.25",
- "toml 0.7.8",
+ "serde_yaml",
+ "toml",
 ]
 
 [[package]]
 name = "bp-seals"
-version = "0.10.9"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "980cb7c5e1bebba10dc65c7c192ba58d254dfb3db7abb7ff10159886c35a17ba"
+version = "0.10.10"
+source = "git+https://github.com/BP-WG/bp-core?branch=consensus#f3fd08046d37f2f8c41e65a637bfc9815372d71c"
 dependencies = [
  "amplify",
  "baid58",
+ "bp-consensus",
  "bp-dbc",
- "bp-primitives",
  "commit_verify",
  "rand",
  "serde",
@@ -384,17 +372,16 @@ dependencies = [
 [[package]]
 name = "bp-std"
 version = "0.11.0"
-source = "git+https://github.com/BP-WG/bp-std#f7f9fa87134f8365360b9d5898dedc9d68a02528"
+source = "git+https://github.com/BP-WG/bp-std#f804e510294ed78d6ef9160d0016b4ba5a6b3552"
 dependencies = [
  "amplify",
  "bech32",
  "bitcoin_hashes",
+ "bp-consensus",
  "bp-core",
- "bp-primitives",
- "cfg_eval",
+ "commit_verify",
  "indexmap 2.0.2",
  "serde",
- "serde_with",
 ]
 
 [[package]]
@@ -407,14 +394,15 @@ dependencies = [
  "bp-runtime",
  "bp-std",
  "clap",
+ "descriptors",
  "env_logger",
  "log",
  "psbt",
  "serde",
- "serde_yaml 0.9.25",
+ "serde_yaml",
  "shellexpand",
  "strict_encoding",
- "toml 0.7.8",
+ "toml",
 ]
 
 [[package]]
@@ -425,9 +413,9 @@ checksum = "7f30e7476521f6f8af1a1c4c0b8cc94f0bee37d91763d0ca2665f299b6cd8aec"
 
 [[package]]
 name = "byteorder"
-version = "1.4.3"
+version = "1.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "14c189c53d098945499cdfa7ecc63567cf3886b3332b312a5b4585d8d3a6a610"
+checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b"
 
 [[package]]
 name = "bytes"
@@ -458,7 +446,7 @@ checksum = "45565fc9416b9896014f5732ac776f810ee53a66730c17e4020c3ec064a8f88f"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.37",
+ "syn 2.0.38",
 ]
 
 [[package]]
@@ -507,7 +495,7 @@ dependencies = [
  "heck",
  "proc-macro2",
  "quote",
- "syn 2.0.37",
+ "syn 2.0.38",
 ]
 
 [[package]]
@@ -537,13 +525,14 @@ dependencies = [
 
 [[package]]
 name = "commit_verify"
-version = "0.10.5"
+version = "0.10.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "caa8114b3ff20947176c8cbfd1e84e56649501eed4e33ba9205c70374b2615ae"
+checksum = "91d9d6e86f6cec8d4af19a0e418bac9cb266a6dc70660bcdcdac1e0fa924e0d1"
 dependencies = [
  "amplify",
  "commit_encoding_derive",
  "rand",
+ "ripemd",
  "serde",
  "sha2",
  "strict_encoding",
@@ -620,7 +609,7 @@ dependencies = [
  "proc-macro2",
  "quote",
  "strsim",
- "syn 2.0.37",
+ "syn 2.0.38",
 ]
 
 [[package]]
@@ -631,7 +620,7 @@ checksum = "836a9bbc7ad63342d6d6e7b815ccab164bc77a2d95d84bc3117a8c0d5c98e2d5"
 dependencies = [
  "darling_core",
  "quote",
- "syn 2.0.37",
+ "syn 2.0.38",
 ]
 
 [[package]]
@@ -643,6 +632,17 @@ dependencies = [
  "serde",
 ]
 
+[[package]]
+name = "descriptors"
+version = "0.11.0"
+source = "git+https://github.com/BP-WG/bp-std#f804e510294ed78d6ef9160d0016b4ba5a6b3552"
+dependencies = [
+ "amplify",
+ "bp-std",
+ "indexmap 2.0.2",
+ "serde",
+]
+
 [[package]]
 name = "digest"
 version = "0.10.7"
@@ -710,25 +710,14 @@ checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5"
 
 [[package]]
 name = "errno"
-version = "0.3.4"
+version = "0.3.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "add4f07d43996f76ef320709726a556a9d4f965d9410d8d0271132d2f8293480"
+checksum = "ac3e13f66a2f95e32a39eaa81f6b95d42878ca0e1db0c7543723dfe12557e860"
 dependencies = [
- "errno-dragonfly",
  "libc",
  "windows-sys",
 ]
 
-[[package]]
-name = "errno-dragonfly"
-version = "0.1.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "aa68f1b12764fab894d2755d2518754e71b4fd80ecfb822714a1206c2aab39bf"
-dependencies = [
- "cc",
- "libc",
-]
-
 [[package]]
 name = "fastrand"
 version = "2.0.1"
@@ -890,6 +879,12 @@ version = "0.4.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70"
 
+[[package]]
+name = "hex-conservative"
+version = "0.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "30ed443af458ccb6d81c1e7e661545f94d3176752fb1df2f543b902a1e0f51e2"
+
 [[package]]
 name = "http"
 version = "0.2.9"
@@ -1068,21 +1063,15 @@ checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646"
 
 [[package]]
 name = "libc"
-version = "0.2.148"
+version = "0.2.149"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9cdc71e17332e86d2e1d38c1f99edcb6288ee11b815fb1a4b049eaa2114d369b"
-
-[[package]]
-name = "linked-hash-map"
-version = "0.5.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0717cef1bc8b636c6e1c1bbdefc09e6322da8a9321966e8928ef80d20f7f770f"
+checksum = "a08173bc88b7955d1b3145aa561539096c421ac8debde8cbc3612ec635fee29b"
 
 [[package]]
 name = "linux-raw-sys"
-version = "0.4.8"
+version = "0.4.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3852614a3bd9ca9804678ba6be5e3b8ce76dfc902cae004e3e0c44051b6e88db"
+checksum = "da2479e8c062e40bf0066ffa0bc823de0a9368974af99c9f6df941d2c231e03f"
 
 [[package]]
 name = "log"
@@ -1152,9 +1141,9 @@ dependencies = [
 
 [[package]]
 name = "num-traits"
-version = "0.2.16"
+version = "0.2.17"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f30b0abd723be7e2ffca1272140fac1a2f084c77ec3e123c192b66af1ee9e6c2"
+checksum = "39e3200413f237f41ab11ad6d161bc7239c84dcb631773ccd7de3dfe4b5c267c"
 dependencies = [
  "autocfg",
 ]
@@ -1197,7 +1186,7 @@ checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.37",
+ "syn 2.0.38",
 ]
 
 [[package]]
@@ -1262,9 +1251,9 @@ checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de"
 
 [[package]]
 name = "proc-macro2"
-version = "1.0.67"
+version = "1.0.69"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3d433d9f1a3e8c1263d9456598b16fec66f4acc9a74dacffd35c7bb09b3a1328"
+checksum = "134c189feb4956b20f6f547d2cf727d4c0fe06722b20a0eec87ed445a97f92da"
 dependencies = [
  "unicode-ident",
 ]
@@ -1272,12 +1261,13 @@ dependencies = [
 [[package]]
 name = "psbt"
 version = "0.11.0"
-source = "git+https://github.com/BP-WG/bp-std#f7f9fa87134f8365360b9d5898dedc9d68a02528"
+source = "git+https://github.com/BP-WG/bp-std#f804e510294ed78d6ef9160d0016b4ba5a6b3552"
 dependencies = [
  "amplify",
  "base64",
  "bp-std",
  "chrono",
+ "descriptors",
  "indexmap 2.0.2",
  "serde",
 ]
@@ -1433,6 +1423,15 @@ dependencies = [
  "winapi",
 ]
 
+[[package]]
+name = "ripemd"
+version = "0.1.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bd124222d17ad93a644ed9d011a40f4fb64aa54275c08cc216524a9ea82fb09f"
+dependencies = [
+ "digest",
+]
+
 [[package]]
 name = "rustc-demangle"
 version = "0.1.23"
@@ -1441,9 +1440,9 @@ checksum = "d626bb9dae77e28219937af045c257c28bfd3f69333c512553507f5f9798cb76"
 
 [[package]]
 name = "rustix"
-version = "0.38.17"
+version = "0.38.18"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f25469e9ae0f3d0047ca8b93fc56843f38e6774f0914a107ff8b41be8be8e0b7"
+checksum = "5a74ee2d7c2581cd139b42447d7d9389b889bdaad3a73f1ebb16f2a3237bb19c"
 dependencies = [
  "bitflags 2.4.0",
  "errno",
@@ -1559,7 +1558,7 @@ checksum = "4eca7ac642d82aa35b60049a6eccb4be6be75e599bd2e9adb5f875a737654af2"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.37",
+ "syn 2.0.38",
 ]
 
 [[package]]
@@ -1630,19 +1629,7 @@ dependencies = [
  "darling",
  "proc-macro2",
  "quote",
- "syn 2.0.37",
-]
-
-[[package]]
-name = "serde_yaml"
-version = "0.8.26"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "578a7433b776b56a35785ed5ce9a7e777ac0598aac5a6dd1b4b18a307c7fc71b"
-dependencies = [
- "indexmap 1.9.3",
- "ryu",
- "serde",
- "yaml-rust",
+ "syn 2.0.38",
 ]
 
 [[package]]
@@ -1680,11 +1667,11 @@ dependencies = [
 
 [[package]]
 name = "single_use_seals"
-version = "0.10.0"
+version = "0.10.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7ae7f7cb6a68cfc99674a70a47ab790c6ede965107cd0823ed814b5e73b3bee2"
+checksum = "ed7655b4b597fca10d2cf7579d3dfee1987a45342bdeecf90cab5affec1c7197"
 dependencies = [
- "amplify_derive 4.0.0-alpha.6",
+ "amplify_derive",
 ]
 
 [[package]]
@@ -1735,9 +1722,9 @@ checksum = "6e63cff320ae2c57904679ba7cb63280a3dc4613885beafb148ee7bf9aa9042d"
 
 [[package]]
 name = "strict_encoding"
-version = "2.6.0"
+version = "2.6.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7c5667c167479cd4abf9f4e02a86fcc45b0d59cd1dbef97f341ecd31b7bcd320"
+checksum = "ab7b75b4af0aff9dd97b68df262bf0e807b7d007cc860fa217943f898a05a5ab"
 dependencies = [
  "amplify",
  "strict_encoding_derive",
@@ -1745,9 +1732,9 @@ dependencies = [
 
 [[package]]
 name = "strict_encoding_derive"
-version = "2.0.0"
+version = "2.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4f5adae55367464f5a229bfd539682c94f870b98a220be6e61dc43f85d612e7e"
+checksum = "37064ec285e2a633465eb525c8698eea51373dee889fe310e0d32df8343e7f4f"
 dependencies = [
  "amplify_syn",
  "heck",
@@ -1785,9 +1772,9 @@ dependencies = [
 
 [[package]]
 name = "syn"
-version = "2.0.37"
+version = "2.0.38"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7303ef2c05cd654186cb250d29049a24840ca25d2747c25c0381c8d9e2f582e8"
+checksum = "e96b79aaa137db8f61e26363a0c9b47d8b4ec75da28b7d1d614c2303e232408b"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -1854,7 +1841,7 @@ checksum = "10712f02019e9288794769fba95cd6847df9874d49d871d062172f9dd41bc4cc"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.37",
+ "syn 2.0.38",
 ]
 
 [[package]]
@@ -1902,9 +1889,9 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20"
 
 [[package]]
 name = "tokio"
-version = "1.32.0"
+version = "1.33.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "17ed6077ed6cd6c74735e21f37eb16dc3935f96878b1fe961074089cc80893f9"
+checksum = "4f38200e3ef7995e5ef13baec2f432a6da0aa9ac495b2c0e8f3b7eec2c92d653"
 dependencies = [
  "backtrace",
  "bytes",
@@ -1953,18 +1940,9 @@ dependencies = [
 
 [[package]]
 name = "toml"
-version = "0.5.11"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f4f7f0dd8d50a853a531c426359045b1998f04219d88799810762cd4ad314234"
-dependencies = [
- "serde",
-]
-
-[[package]]
-name = "toml"
-version = "0.7.8"
+version = "0.8.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dd79e69d3b627db300ff956027cc6c3798cef26d22526befdfcd12feeb6d2257"
+checksum = "185d8ab0dfbb35cf1399a6344d8484209c088f75f8f68230da55d48d95d43e3d"
 dependencies = [
  "serde",
  "serde_spanned",
@@ -1983,9 +1961,9 @@ dependencies = [
 
 [[package]]
 name = "toml_edit"
-version = "0.19.15"
+version = "0.20.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1b5bb770da30e5cbfde35a2d7b9b8a2c4b8ef89548a7a6aeab5c9a576e3e7421"
+checksum = "396e4d48bbb2b7554c944bde63101b5ae446cff6ec4a24227428f15eb72ef338"
 dependencies = [
  "indexmap 2.0.2",
  "serde",
@@ -2149,7 +2127,7 @@ dependencies = [
  "once_cell",
  "proc-macro2",
  "quote",
- "syn 2.0.37",
+ "syn 2.0.38",
  "wasm-bindgen-shared",
 ]
 
@@ -2183,7 +2161,7 @@ checksum = "54681b18a46765f095758388f2d0cf16eb8d4169b639ab575a8f5693af210c7b"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.37",
+ "syn 2.0.38",
  "wasm-bindgen-backend",
  "wasm-bindgen-shared",
 ]
@@ -2318,9 +2296,9 @@ checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538"
 
 [[package]]
 name = "winnow"
-version = "0.5.15"
+version = "0.5.16"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7c2e3184b9c4e92ad5167ca73039d0c42476302ab603e2fec4487511f38ccefc"
+checksum = "037711d82167854aff2018dfd193aa0fef5370f456732f0d5a0c59b0f1b4b907"
 dependencies = [
  "memchr",
 ]
@@ -2334,12 +2312,3 @@ dependencies = [
  "cfg-if",
  "windows-sys",
 ]
-
-[[package]]
-name = "yaml-rust"
-version = "0.4.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "56c1936c4cc7a1c9ab21a1ebb602eb942ba868cbd44a99cb7cdc5892335e1c85"
-dependencies = [
- "linked-hash-map",
-]
diff --git a/Cargo.toml b/Cargo.toml
index fb2c95e..ee3dd94 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -14,15 +14,16 @@ edition = "2021"
 license = "Apache-2.0"
 
 [workspace.dependencies]
-amplify = "4.1.1"
-strict_encoding = "2.6.0"
+amplify = "4.5.0"
+strict_encoding = "2.6.1"
 bp-std = "0.11.0"
 psbt = "0.11.0"
+descriptors = "0.11.0"
 bp-esplora = "0.11.0"
 serde_crate = { package = "serde", version = "1", features = ["derive"] }
 serde_with = "3.1.0"
 serde_yaml = "0.9.19"
-toml = "0.7.6"
+toml = "0.8.2"
 log = { version = "0.4", features = ["max_level_trace", "release_max_level_debug"] }
 
 [package]
@@ -51,6 +52,7 @@ amplify = { workspace = true, features = ["serde"] }
 strict_encoding = { workspace = true }
 bp-runtime = { path = "runtime", features = ["serde", "fs"] }
 bp-std = { workspace = true, features = ["serde"] }
+descriptors = { workspace = true, features = ["serde"] }
 psbt = { workspace = true, features = ["serde"] }
 bp-esplora = { workspace = true }
 base64 = "0.21.4"
@@ -60,14 +62,16 @@ clap = { version = "4.1.8", features = ["derive", "env"] }
 shellexpand = "3.0.0"
 serde_crate = { workspace = true }
 serde_yaml = { workspace = true }
-toml = "0.7.6"
+toml = { workspace = true }
 
 [features]
 default = []
 all = []
 
 [patch.crates-io]
-bp-primitives = { git = "https://github.com/BP-WG/bp-core" }
+bp-consensus = { git = "https://github.com/BP-WG/bp-core", branch = "consensus" }
+bp-core = { git = "https://github.com/BP-WG/bp-core", branch = "consensus" }
 bp-std = { git = "https://github.com/BP-WG/bp-std" }
 bp-esplora = { git = "https://github.com/BP-WG/bp-esplora-client" }
+descriptors = { git = "https://github.com/BP-WG/bp-std" }
 psbt = { git = "https://github.com/BP-WG/bp-std" }
diff --git a/runtime/Cargo.toml b/runtime/Cargo.toml
index a765c93..725bd1a 100644
--- a/runtime/Cargo.toml
+++ b/runtime/Cargo.toml
@@ -20,6 +20,7 @@ amplify = { workspace = true }
 bp-std = { workspace = true }
 bp-esplora = { workspace = true, optional = true }
 psbt = { workspace = true }
+descriptors = { workspace = true }
 cfg_eval = { version = "0.1.2", optional = true }
 serde_crate = { workspace = true, optional = true }
 serde_with = { workspace = true, optional = true }
diff --git a/runtime/src/indexers/esplora.rs b/runtime/src/indexers/esplora.rs
index 39a5c8d..e2bc6fe 100644
--- a/runtime/src/indexers/esplora.rs
+++ b/runtime/src/indexers/esplora.rs
@@ -23,7 +23,8 @@
 use std::collections::BTreeMap;
 use std::num::NonZeroU32;
 
-use bpstd::{Address, Descriptor, LockTime, Outpoint, SeqNo, Witness};
+use bpstd::{Address, LockTime, Outpoint, SeqNo, Witness};
+use descriptors::Descriptor;
 use esplora::{BlockingClient, Error};
 
 use super::BATCH_SIZE;
diff --git a/runtime/src/indexers/mod.rs b/runtime/src/indexers/mod.rs
index 7a1a0f7..d7f8a81 100644
--- a/runtime/src/indexers/mod.rs
+++ b/runtime/src/indexers/mod.rs
@@ -23,7 +23,7 @@
 #[cfg(feature = "esplora")]
 mod esplora;
 
-use bpstd::Descriptor;
+use descriptors::Descriptor;
 
 use crate::{Layer2, MayError, WalletCache, WalletDescr};
 
diff --git a/runtime/src/payments.rs b/runtime/src/payments.rs
index 553ecc6..ce55aa2 100644
--- a/runtime/src/payments.rs
+++ b/runtime/src/payments.rs
@@ -23,7 +23,8 @@
 use std::num::ParseIntError;
 use std::str::FromStr;
 
-use bpstd::{Address, AddressParseError, Descriptor, Idx, LockTime, Outpoint, Sats, SeqNo};
+use bpstd::{Address, AddressParseError, Idx, LockTime, Outpoint, Sats, SeqNo};
+use descriptors::Descriptor;
 use psbt::{Psbt, PsbtError, PsbtVer};
 
 use crate::{Layer2, Wallet};
diff --git a/runtime/src/runtime.rs b/runtime/src/runtime.rs
index 649d4da..a90947e 100644
--- a/runtime/src/runtime.rs
+++ b/runtime/src/runtime.rs
@@ -26,7 +26,8 @@ use std::path::PathBuf;
 use std::{error, io};
 
 use amplify::IoError;
-use bpstd::{Chain, Descriptor, DescriptorStd, XpubDerivable};
+use bpstd::{Chain, XpubDerivable};
+use descriptors::{Descriptor, DescriptorStd};
 
 use crate::wallet::fs::Warning;
 use crate::{ConstructionError, Indexer, Layer2, NoLayer2, Wallet};
diff --git a/runtime/src/wallet.rs b/runtime/src/wallet.rs
index 915b40e..334f0c4 100644
--- a/runtime/src/wallet.rs
+++ b/runtime/src/wallet.rs
@@ -26,9 +26,9 @@ use std::marker::PhantomData;
 use std::ops::{AddAssign, Deref};
 
 use bpstd::{
-    Address, AddressNetwork, Chain, DerivedAddr, Descriptor, Idx, NormalIndex, Outpoint, Sats,
-    Txid, Vout,
+    Address, AddressNetwork, Chain, DerivedAddr, Idx, NormalIndex, Outpoint, Sats, Txid, Vout,
 };
+use descriptors::Descriptor;
 #[cfg(feature = "serde")]
 use serde_with::DisplayFromStr;
 
diff --git a/src/args.rs b/src/args.rs
index cbd6274..71ebc1c 100644
--- a/src/args.rs
+++ b/src/args.rs
@@ -24,8 +24,8 @@ use std::fmt::Debug;
 use std::path::PathBuf;
 
 use bp_rt::Runtime;
-use bpstd::Descriptor;
 use clap::Subcommand;
+use descriptors::Descriptor;
 use strict_encoding::Ident;
 
 use crate::opts::{DescrStdOpts, DescriptorOpts};
diff --git a/src/opts.rs b/src/opts.rs
index 07ca226..bc34528 100644
--- a/src/opts.rs
+++ b/src/opts.rs
@@ -23,8 +23,9 @@
 use std::fmt::Debug;
 use std::path::{Path, PathBuf};
 
-use bpstd::{Chain, Descriptor, DescriptorStd, TrKey, Wpkh, XpubDerivable};
+use bpstd::{Chain, XpubDerivable};
 use clap::ValueHint;
+use descriptors::{Descriptor, DescriptorStd, TrKey, Wpkh};
 use strict_encoding::Ident;
 
 pub const DATA_DIR_ENV: &str = "LNPBP_DATA_DIR";
diff --git a/test.psbt b/test.psbt
new file mode 100644
index 0000000000000000000000000000000000000000..c8e677bfe604a691ad6a1ceefc36b7c7043ba15d
GIT binary patch
literal 484
zcmXRYPAd7&$WX|{z`(%B&-0~1uA5`W%VT;juRXTrKf4+rUR3{{vB^j$_NZ}w3?onx
z7%+7RLl|NVBCZ<DHz)l+RGV|YwmDkI<x133Rqt*Ixb$KD{~H30g?}&D+cf9o%+$u|
zAFfA(B>fp#Oxw>hUn*z$+5qJK`mpS|S7GQ{&U?$JPF`{?EXyZ%!`t>-z6^$)J2}d~
z-(y~V%9>&O#^*W_$8P3!?0+7e`sn+#WePlB{JCcYpWkCBB+wFk+#-a5p#kVfkbw;h
zjEwTPb$~1&06KHR<G2YdRu-Wg7FYkW?6*8;TU$LxiHX^tr%zyhm9u1m;`J=gD4jcv
z?A@lPiWWri%$pbgYth5w9tN&ViVQ3IcxOqxJNQDAU#97{yqAm`*M-hx&7PLnD675q
zPq;TRDQI5`$#LW1F<PIn{p$|-8odpZXU+0&^JfkCKcP{@WLE*B5*tCgBrv=HaXpY!
tVq#hpuUD>kC!_g+_G}HU(v51x|1X5s8Lv3DqqVppq4)nO4Bhb90sz42ugU-b

literal 0
HcmV?d00001