chore: update dependencies

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" }

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 }

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;

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};
 

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};

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};

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;
 

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};

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";