chore: move to v0.11

Cargo.toml

@@ -3,7 +3,7 @@ members = [".", "cli"]
 exclude = ["convert"]
 
 [workspace.package]
-version = "0.10.0-beta.1"
+version = "0.11.0-beta.1"
 keywords = ["bitcoin", "wallet", "descriptor-wallet", "psbt", "taproot"]
 categories = ["cryptography::cryptocurrencies"]
 authors = ["Dr Maxim Orlovsky <[email protected]>"]
@@ -16,10 +16,10 @@ license = "Apache-2.0"
 [workspace.dependencies]
 amplify = "4.5.0"
 strict_encoding = "2.6.1"
-bp-std = "0.10.0-beta.1"
-psbt = "=0.10.0-BP-beta.1"
-descriptors = "=0.10.0-BP-beta.1"
-bp-esplora = "0.10.0"
+bp-std = "0.11.0-beta.1"
+psbt = "0.11.0-beta.1"
+descriptors = "0.11.0-beta.1"
+bp-esplora = "0.11.0-beta.1"
 serde_crate = { package = "serde", version = "1", features = ["derive"] }
 serde_yaml = "0.9.19"
 toml = "0.8.2"
@@ -58,3 +58,10 @@ all = ["esplora", "fs"]
 esplora = ["bp-esplora"]
 fs = ["serde"]
 serde = ["serde_crate", "serde_yaml", "toml", "bp-std/serde"]
+
+[patch.crates-io]
+bp-consensus = { git = "https://github.com/BP-WG/bp-core", branch = "v0.11" }
+bp-std = { git = "https://github.com/BP-WG/bp-std", branch = "master" }
+psbt = { git = "https://github.com/BP-WG/bp-std", branch = "master" }
+descriptors = { git = "https://github.com/BP-WG/bp-std", branch = "master" }
+bp-esplora = { git = "https://github.com/BP-WG/bp-esplora-client", branch = "master" }

cli/Cargo.toml

@@ -21,15 +21,15 @@ path = "src/bin/bp.rs"
 [dependencies]
 amplify = { workspace = true, features = ["serde"] }
 strict_encoding = { workspace = true }
-bp-wallet = { version = "0.10.0-beta.1", path = "..", features = ["serde", "fs"] }
+bp-wallet = { version = "0.11.0-beta.1", path = "..", 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"
 log = { workspace = true }
 env_logger = "0.10.0"
-clap = { version = "4.4.6", features = ["derive", "env"] }
+clap = { version = "4.4.8", features = ["derive", "env"] }
 shellexpand = "3.1.0"
 serde_crate = { workspace = true }
 serde_yaml = { workspace = true }

cli/src/args.rs

@@ -90,7 +90,7 @@ impl<C: Clone + Eq + Debug + Subcommand, O: DescriptorOpts> Args<C, O> {
         eprint!("Loading descriptor");
         let mut runtime: Runtime<D> = if let Some(d) = self.wallet.descriptor_opts.descriptor() {
             eprint!(" from command-line argument ... ");
-            Runtime::new_standard(d.into(), self.general.chain)
+            Runtime::new_standard(d.into(), self.general.network)
         } else if let Some(wallet_path) = self.wallet.wallet_path.clone() {
             eprint!(" from specified wallet directory ... ");
             Runtime::load_standard(wallet_path)?

cli/src/opts.rs

@@ -23,7 +23,7 @@
 use std::fmt::Debug;
 use std::path::{Path, PathBuf};
 
-use bpstd::{Chain, XpubDerivable};
+use bpstd::{Network, XpubDerivable};
 use clap::ValueHint;
 use descriptors::{Descriptor, DescriptorStd, TrKey, Wpkh};
 use strict_encoding::Ident;
@@ -131,7 +131,7 @@ pub struct GeneralOpts {
 
     /// Blockchain to use.
     #[arg(short, long, global = true, default_value = "testnet", env = "LNPBP_NETWORK")]
-    pub chain: Chain,
+    pub network: Network,
 }
 
 impl GeneralOpts {
@@ -142,7 +142,7 @@ impl GeneralOpts {
 
     pub fn base_dir(&self) -> PathBuf {
         let mut dir = self.data_dir.clone();
-        dir.push(self.chain.to_string());
+        dir.push(self.network.to_string());
         dir
     }
 

convert/Cargo.toml

@@ -17,8 +17,8 @@ name = "bconv"
 
 [dependencies]
 amplify = "4.0.0"
-secp256k1 = "0.27.0"
-bitcoin = "0.30.1"
+secp256k1 = "0.28.0"
+bitcoin = "0.31.0"
 bp-wallet = { path = ".." }
 
 [patch.crates-io]

src/indexers/esplora.rs

@@ -155,7 +155,7 @@ impl Indexer for BlockingClient {
                             .balance
                             .saturating_add(debit.value.sats().try_into().expect("sats overflow"));
                     } else if debit.beneficiary.is_unknown() {
-                        Address::with(&s, descriptor.chain())
+                        Address::with(&s, descriptor.network())
                             .map(|addr| {
                                 debit.beneficiary = Party::Counterparty(addr);
                             })
@@ -179,7 +179,7 @@ impl Indexer for BlockingClient {
                             .balance
                             .saturating_sub(credit.value.sats().try_into().expect("sats overflow"));
                     } else if credit.payer.is_unknown() {
-                        Address::with(&s, descriptor.chain())
+                        Address::with(&s, descriptor.network())
                             .map(|addr| {
                                 credit.payer = Party::Counterparty(addr);
                             })

src/runtime.rs

@@ -26,7 +26,7 @@ use std::path::PathBuf;
 use std::{error, io};
 
 use amplify::IoError;
-use bpstd::{Chain, XpubDerivable};
+use bpstd::{Network, XpubDerivable};
 use descriptors::{Descriptor, DescriptorStd};
 
 use crate::wallet::fs::Warning;
@@ -107,7 +107,7 @@ impl<K, D: Descriptor<K>, L2: Layer2> DerefMut for Runtime<D, K, L2> {
 }
 
 impl<K, D: Descriptor<K>> Runtime<D, K> {
-    pub fn new_standard(descr: D, network: Chain) -> Self {
+    pub fn new_standard(descr: D, network: Network) -> Self {
         Runtime {
             path: None,
             wallet: Wallet::new_standard(descr, network),
@@ -117,7 +117,7 @@ impl<K, D: Descriptor<K>> Runtime<D, K> {
 }
 
 impl<K, D: Descriptor<K>, L2: Layer2> Runtime<D, K, L2> {
-    pub fn new_layer2(descr: D, l2_descr: L2::Descr, layer2: L2, network: Chain) -> Self {
+    pub fn new_layer2(descr: D, l2_descr: L2::Descr, layer2: L2, network: Network) -> Self {
         Runtime {
             path: None,
             wallet: Wallet::new_layer2(descr, l2_descr, layer2, network),
@@ -159,15 +159,15 @@ where for<'de> D: serde::Serialize + serde::Deserialize<'de>
 
     pub fn load_standard_or_init<E>(
         data_dir: PathBuf,
-        chain: Chain,
+        network: Network,
         init: impl FnOnce(LoadError) -> Result<D, E>,
     ) -> Result<Self, LoadError>
     where
         LoadError: From<E>,
     {
         Self::load_standard(data_dir).or_else(|err| {
             let descriptor = init(err)?;
-            Ok(Self::new_standard(descriptor, chain))
+            Ok(Self::new_standard(descriptor, network))
         })
     }
 }
@@ -191,7 +191,7 @@ where
 
     pub fn load_layer2_or_init<E1, E2>(
         data_dir: PathBuf,
-        chain: Chain,
+        network: Network,
         init: impl FnOnce(LoadError<L2::LoadError>) -> Result<D, E1>,
         init_l2: impl FnOnce() -> Result<(L2, L2::Descr), E2>,
     ) -> Result<Self, LoadError<L2::LoadError>>
@@ -202,7 +202,7 @@ where
         Self::load_layer2(data_dir).or_else(|err| {
             let descriptor = init(err)?;
             let (layer2, l2_descr) = init_l2()?;
-            Ok(Self::new_layer2(descriptor, l2_descr, layer2, chain))
+            Ok(Self::new_layer2(descriptor, l2_descr, layer2, network))
         })
     }