From 288bee217385bc1ec87c6978b17cc70a81d9a0e8 Mon Sep 17 00:00:00 2001 From: Dr Maxim Orlovsky Date: Fri, 30 Aug 2024 02:15:06 +0200 Subject: [PATCH 1/4] use new StoreProvider APIs --- Cargo.lock | 90 ++++++++++++++++++++++++++++------------------ Cargo.toml | 9 +++++ cli/src/args.rs | 17 ++++++--- cli/src/command.rs | 43 +++++++++++++++------- src/errors.rs | 13 ++++--- src/pay.rs | 17 +++++---- src/wallet.rs | 39 ++++++++++---------- src/wrapper.rs | 15 +++----- 8 files changed, 150 insertions(+), 93 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 44c2a68..ef06624 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -23,7 +23,7 @@ version = "0.11.0-beta.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1aaa9bf6c54f2d232adc6a9e748f359f1b4570d0a498f92e7823321ae7c656b5" dependencies = [ - "amplify", + "amplify 4.7.0", "ascii-armor", "baid64", "blake3", @@ -55,6 +55,18 @@ dependencies = [ "wasm-bindgen", ] +[[package]] +name = "amplify" +version = "5.0.0-beta.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d41888768802fc62c27b46427127b119e8a16e1f1f59495aced93a340f55eb25" +dependencies = [ + "amplify_derive", + "amplify_num", + "ascii", + "wasm-bindgen", +] + [[package]] name = "amplify_apfloat" version = "0.3.1" @@ -190,7 +202,7 @@ version = "0.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9ad861dfcd5f348ac79e0df2e70494641c62d3ac37587af68c52a16ab355afdb" dependencies = [ - "amplify", + "amplify 4.7.0", "baid64", "base85", "sha2", @@ -236,7 +248,7 @@ version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "95dabc2759e01e2c382968639868a701f384a18890934f9e75d4feb4d6623794" dependencies = [ - "amplify", + "amplify 4.7.0", "base64", "mnemonic", "sha2", @@ -332,7 +344,7 @@ version = "0.11.0-beta.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d23ea438647522d1f1a8fc8fa1420cc56321433d5d5964636294991f18f9e0c9" dependencies = [ - "amplify", + "amplify 4.7.0", "chrono", "commit_verify", "secp256k1", @@ -347,7 +359,7 @@ version = "0.11.0-beta.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b43a6b5389fd99298fca47f4566dda754fa10bdb41200b5cdfc16147400f5951" dependencies = [ - "amplify", + "amplify 4.7.0", "bp-consensus", "bp-dbc", "bp-seals", @@ -366,7 +378,7 @@ version = "0.11.0-beta.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f0f70bd407dfcbeadfbc012959e04decbe63e7dc6f30a4f705b804b699b37a0a" dependencies = [ - "amplify", + "amplify 4.7.0", "base85", "bp-consensus", "commit_verify", @@ -381,7 +393,7 @@ version = "0.11.0-beta.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a5a1a38a6324920d6aa183245be6f13acde5aef1008b24fecf5f8e4036f33fe8" dependencies = [ - "amplify", + "amplify 4.7.0", "bp-consensus", "bp-invoice", "commit_verify", @@ -397,7 +409,7 @@ version = "0.11.0-beta.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "760cbe0955ad8b3531e113b9c7917ab78646b979a0c1a450ce3c6356c7bd80e5" dependencies = [ - "amplify", + "amplify 4.7.0", "bp-std", "byteorder", "libc", @@ -416,7 +428,7 @@ version = "0.11.0-beta.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b894bcb5df729d67e0d2a802fabbf889ff41cf8820cd35a468df36ac407f3630" dependencies = [ - "amplify", + "amplify 4.7.0", "bp-std", "log", "serde", @@ -431,7 +443,7 @@ version = "0.11.0-beta.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ddcb55fe081418fc6e508370eaf8431001274727862e57e6672b6c892b8d3d66" dependencies = [ - "amplify", + "amplify 4.7.0", "bech32", "bp-consensus", "commit_verify", @@ -444,7 +456,7 @@ version = "0.11.0-beta.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "497bb5989b9b549cd8e4ebfabc50a5d57cf318ab56affd3d4d7b7749fcd780da" dependencies = [ - "amplify", + "amplify 4.7.0", "baid64", "bp-consensus", "bp-dbc", @@ -461,7 +473,7 @@ version = "0.11.0-beta.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ac66f7e326e203f228fd60f1fb1f5629f6ec20f37c61b580a627c3194e85d7fc" dependencies = [ - "amplify", + "amplify 4.7.0", "bp-consensus", "bp-derive", "bp-invoice", @@ -476,10 +488,9 @@ dependencies = [ [[package]] name = "bp-wallet" version = "0.11.0-beta.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ced31423a2325a666532e92c1ca7ceff986eda9f147a241ba812e5ed2fee0eaf" +source = "git+https://github.com/BP-WG/bp-wallet?branch=store#01a6a165c03ff9ebd5e9e38fed87326265c6b6e0" dependencies = [ - "amplify", + "amplify 4.7.0", "base64", "bp-electrum", "bp-esplora", @@ -489,6 +500,7 @@ dependencies = [ "descriptors", "env_logger", "log", + "nonasync", "psbt", "serde", "serde_json", @@ -634,7 +646,7 @@ version = "0.11.0-beta.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ca41bd14a6c400486463a5b0e7e8916b1c7bad554a382f62c3b11bd58dea5934" dependencies = [ - "amplify", + "amplify 4.7.0", "amplify_syn", "proc-macro2", "quote", @@ -647,7 +659,7 @@ version = "0.11.0-beta.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "538b69bbb2f7259c1d07334fa8adae0006c8b559efbdb6daafacb6df249b897b" dependencies = [ - "amplify", + "amplify 4.7.0", "commit_encoding_derive", "rand", "ripemd", @@ -765,7 +777,7 @@ version = "0.11.0-beta.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "88b6883b7b23aedc5a2ff149a54b0f57496935be3fd4b453f0c76361b08f5649" dependencies = [ - "amplify", + "amplify 4.7.0", "bp-derive", "indexmap 2.4.0", "serde", @@ -1196,6 +1208,15 @@ dependencies = [ "minimal-lexical", ] +[[package]] +name = "nonasync" +version = "0.1.0" +source = "git+https://github.com/rust-amplify/amplify-nonasync#9c6ab8f0e19d80cc787633bad328e7817c256de4" +dependencies = [ + "amplify 5.0.0-beta.1", + "log", +] + [[package]] name = "num-conv" version = "0.1.0" @@ -1275,7 +1296,7 @@ version = "0.11.0-beta.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2afd0eef00260666da5c2c72e61c23bd2e07076e0791ea4cc3e79ab408246a17" dependencies = [ - "amplify", + "amplify 4.7.0", "base64", "bp-core", "bp-derive", @@ -1369,11 +1390,10 @@ checksum = "7a66a03ae7c801facd77a29370b4faec201768915ac14a721ba36f20bc9c209b" [[package]] name = "rgb-core" version = "0.11.0-beta.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "243f1dcdf028b1cbadc9ed27866619feed0608eba0c84f59b344026648312731" +source = "git+https://github.com/RGB-WG/rgb-core?branch=master#4f67584ef950a8097cc2c41f8caedb26bdd9996c" dependencies = [ "aluvm", - "amplify", + "amplify 4.7.0", "baid64", "bp-core", "chrono", @@ -1395,7 +1415,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fcaa75b09d8f4d0f80f814d2edde1815bc22532b2e26b738797169e0a940d050" dependencies = [ "aluvm", - "amplify", + "amplify 4.7.0", "bp-core", "chrono", "getrandom", @@ -1410,10 +1430,9 @@ dependencies = [ [[package]] name = "rgb-invoice" version = "0.11.0-beta.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d43cd206275a055440a8c496cb7b5040842d6a0e354d00df268bc635ee07b871" +source = "git+https://github.com/RGB-WG/rgb-std?branch=store#c274066a0d50036e061e3537639783b27e936f23" dependencies = [ - "amplify", + "amplify 4.7.0", "baid64", "bp-core", "bp-invoice", @@ -1432,7 +1451,7 @@ dependencies = [ name = "rgb-psbt" version = "0.11.0-beta.7" dependencies = [ - "amplify", + "amplify 4.7.0", "baid64", "bp-core", "bp-std", @@ -1450,7 +1469,7 @@ dependencies = [ name = "rgb-runtime" version = "0.11.0-beta.7" dependencies = [ - "amplify", + "amplify 4.7.0", "baid64", "bp-core", "bp-electrum", @@ -1463,6 +1482,7 @@ dependencies = [ "getrandom", "indexmap 2.4.0", "log", + "nonasync", "rand", "rgb-psbt", "rgb-std", @@ -1476,11 +1496,10 @@ dependencies = [ [[package]] name = "rgb-std" version = "0.11.0-beta.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c66b8810d29c080f3ee5046bd9dda7b42ab2321e09dd914bc9a4702b4731f15c" +source = "git+https://github.com/RGB-WG/rgb-std?branch=store#c274066a0d50036e061e3537639783b27e936f23" dependencies = [ "aluvm", - "amplify", + "amplify 4.7.0", "ascii-armor", "baid64", "base85", @@ -1489,6 +1508,7 @@ dependencies = [ "commit_verify", "getrandom", "indexmap 2.4.0", + "nonasync", "rand", "rgb-core", "rgb-invoice", @@ -1502,7 +1522,7 @@ dependencies = [ name = "rgb-wallet" version = "0.11.0-beta.7" dependencies = [ - "amplify", + "amplify 4.7.0", "baid64", "bp-seals", "bp-std", @@ -1816,7 +1836,7 @@ version = "2.7.0-rc.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "662b8c3ff360ff33370e6875dd5bdcbf3cecc992241f30e5f7071227ef693451" dependencies = [ - "amplify", + "amplify 4.7.0", "half", "serde", "strict_encoding_derive", @@ -1842,7 +1862,7 @@ version = "2.7.0-rc.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e6e182f593e9c4f02ccfcea7929bef866cff12a3f8e213338ce48a706bb263c1" dependencies = [ - "amplify", + "amplify 4.7.0", "ascii-armor", "baid64", "half", @@ -2088,7 +2108,7 @@ version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f72ebd3b32f16ee8ace2bd3058c2bfa0f4820992bd4ea86e73ba228bb13dd2b0" dependencies = [ - "amplify", + "amplify 4.7.0", "strict_encoding", ] diff --git a/Cargo.toml b/Cargo.toml index de871cc..a405d68 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -22,6 +22,7 @@ license = "Apache-2.0" [workspace.dependencies] amplify = "4.7.0" +nonasync = { version = "0.1.0", features = ["log"] } baid64 = "0.2.2" strict_encoding = "2.7.0-rc.1" strict_types = "2.7.0-rc.1" @@ -63,6 +64,7 @@ crate-type = ["cdylib", "rlib"] [dependencies] amplify = { workspace = true } +nonasync = { workspace = true } baid64 = { workspace = true } bp-electrum = { workspace = true, optional = true } commit_verify = { workspace = true } @@ -100,3 +102,10 @@ serde = ["serde_crate", "serde_yaml", "bp-std/serde", "descriptors/serde", "rgb- [package.metadata.docs.rs] features = ["all"] + +[patch.crates-io] +nonasync = { git = "https://github.com/rust-amplify/amplify-nonasync" } +bp-wallet = { git = "https://github.com/BP-WG/bp-wallet", branch = "store" } +rgb-core = { git = "https://github.com/RGB-WG/rgb-core", branch = "master" } +rgb-invoice = { git = "https://github.com/RGB-WG/rgb-std", branch = "store" } +rgb-std = { git = "https://github.com/RGB-WG/rgb-std", branch = "store" } diff --git a/cli/src/args.rs b/cli/src/args.rs index 0a600dc..a284f7f 100644 --- a/cli/src/args.rs +++ b/cli/src/args.rs @@ -32,6 +32,7 @@ use bpwallet::Wallet; use rgb::persistence::Stock; use rgb::resolvers::AnyResolver; use rgb::{RgbDescr, RgbWallet, TapretKey, WalletError}; +use rgbstd::persistence::fs::FsBinStore; use strict_types::encoding::{DecodeError, DeserializeError}; use crate::Command; @@ -102,14 +103,16 @@ impl RgbArgs { eprint!("Loading stock from `{}` ... ", stock_path.display()); } - let mut stock = Stock::load(stock_path.clone()).map_err(WalletError::from).or_else(|err| { + let provider = FsBinStore::new(stock_path.clone()); + let mut stock = Stock::load(provider, true).map_err(WalletError::WalletPersist).or_else(|err| { if matches!(err, WalletError::Deserialize(DeserializeError::Decode(DecodeError::Io(ref err))) if err.kind() == ErrorKind::NotFound) { if self.verbose > 1 { eprint!("stock file is absent, creating a new one ... "); } fs::create_dir_all(&stock_path)?; - let stock = Stock::new(stock_path.to_owned()); - stock.store()?; + let provider = FsBinStore::new(stock_path); + let mut stock = Stock::in_memory(); + stock.make_persistent(provider, true).map_err(WalletError::StockPersist)?; return Ok(stock); } eprintln!("stock file is damaged, failing"); @@ -151,14 +154,18 @@ impl RgbArgs { ) -> Result>, WalletError> { let stock = self.rgb_stock()?; self.rgb_wallet_from_stock(config, stock) + .map_err(|(_, err)| err) } pub fn rgb_wallet_from_stock( &self, config: &Config, stock: Stock, - ) -> Result>, WalletError> { - let wallet = self.inner.bp_wallet::(config)?; + ) -> Result>, (Stock, WalletError)> { + let wallet = match self.inner.bp_wallet::(config) { + Ok(wallet) => wallet, + Err(e) => return Err((stock, e.into())), + }; let wallet = RgbWallet::new(stock, wallet); Ok(wallet) diff --git a/cli/src/command.rs b/cli/src/command.rs index 412a04a..b6cd513 100644 --- a/cli/src/command.rs +++ b/cli/src/command.rs @@ -47,7 +47,7 @@ use rgb::{ XOutpoint, XOutputSeal, XWitnessId, }; use rgbstd::containers::ConsignmentExt; -use rgbstd::persistence::MemContract; +use rgbstd::persistence::{MemContract, Stock}; use seals::SecretSeal; use serde_crate::{Deserialize, Serialize}; use strict_types::encoding::{FieldName, TypeName}; @@ -485,18 +485,37 @@ impl Exec for RgbArgs { let stock_path = self.general.base_dir(); let stock = self.load_stock(stock_path)?; - let contract = stock.contract_iface(*contract_id, tn!(iface.to_owned()))?; + enum StockOrWallet { + Stock(Stock), + Wallet(RgbWallet>), + } + impl StockOrWallet { + fn stock(&self) -> &Stock { + match self { + StockOrWallet::Stock(stock) => stock, + StockOrWallet::Wallet(wallet) => wallet.stock(), + } + } + } + + let stock_wallet = match self.rgb_wallet_from_stock(&config, stock) { + Ok(wallet) => StockOrWallet::Wallet(wallet), + Err((stock, _)) => StockOrWallet::Stock(stock), + }; - // TODO: Remove clone - let filter = match self.rgb_wallet_from_stock(&config, stock.clone()) { - Ok(wallet) if *all => Filter::WalletAll(wallet), - Ok(wallet) => Filter::Wallet(wallet), - Err(_) => { + let filter = match stock_wallet { + StockOrWallet::Wallet(ref wallet) if *all => Filter::WalletAll(wallet), + StockOrWallet::Wallet(ref wallet) => Filter::Wallet(wallet), + StockOrWallet::Stock(_) => { println!("no wallets found"); Filter::NoWallet } }; + let contract = stock_wallet + .stock() + .contract_iface(*contract_id, tn!(iface.to_owned()))?; + println!("\nGlobal:"); for global in &contract.iface.global_state { if let Ok(values) = contract.global(global.name.clone()) { @@ -506,12 +525,12 @@ impl Exec for RgbArgs { } } - enum Filter { - Wallet(RgbWallet>), - WalletAll(RgbWallet>), + enum Filter<'w> { + Wallet(&'w RgbWallet>), + WalletAll(&'w RgbWallet>), NoWallet, } - impl OutpointFilter for Filter { + impl<'w> OutpointFilter for Filter<'w> { fn include_outpoint(&self, outpoint: impl Into) -> bool { match self { Filter::Wallet(wallet) => { @@ -521,7 +540,7 @@ impl Exec for RgbArgs { } } } - impl Filter { + impl<'w> Filter<'w> { fn comment(&self, outpoint: XOutpoint) -> &'static str { match self { Filter::Wallet(wallet) | Filter::WalletAll(wallet) diff --git a/src/errors.rs b/src/errors.rs index 2af84a5..70bfce9 100644 --- a/src/errors.rs +++ b/src/errors.rs @@ -26,11 +26,12 @@ use std::io; use amplify::IoError; use bpstd::Psbt; +use nonasync::persistence::PersistenceError; use psrgbt::{CommitError, ConstructionError, EmbedError, TapretKeyError}; use rgbstd::containers::LoadError; use rgbstd::interface::{BuilderError, ContractError}; use rgbstd::persistence::{ - ComposeError, ConsignError, ContractIfaceError, FasciaError, StockError, StockErrorAll, + ComposeError, ConsignError, ContractIfaceError, FasciaError, Stock, StockError, StockErrorAll, StockErrorMem, }; use strict_types::encoding::{DeserializeError, Ident, SerializeError}; @@ -53,9 +54,9 @@ pub enum WalletError { #[from] StockLoad(LoadError), - #[cfg(feature = "fs")] - #[from] - WalletLoad(bpwallet::fs::LoadError), + WalletPersist(PersistenceError), + + StockPersist(PersistenceError), #[cfg(feature = "cli")] #[from] @@ -113,6 +114,10 @@ impl From for WalletError { fn from(_: Infallible) -> Self { unreachable!() } } +impl From<(Stock, WalletError)> for WalletError { + fn from((_, e): (Stock, WalletError)) -> Self { e } +} + #[derive(Debug, Display, Error, From)] #[display(doc_comments)] pub enum HistoryError { diff --git a/src/pay.rs b/src/pay.rs index d2d82b6..c02b2b4 100644 --- a/src/pay.rs +++ b/src/pay.rs @@ -26,7 +26,7 @@ use bp::dbc::tapret::TapretProof; use bp::seals::txout::ExplicitSeal; use bp::{Outpoint, Sats, ScriptPubkey, Vout}; use bpstd::{psbt, Address}; -use bpwallet::{Save, Wallet, WalletDescr}; +use bpwallet::{Wallet, WalletDescr}; use psrgbt::{ Beneficiary as BpBeneficiary, Psbt, PsbtConstructor, PsbtMeta, RgbPsbt, TapretKeyError, TxParams, @@ -103,7 +103,10 @@ where Self::Descr: DescriptorRgb type Filter<'a>: Copy + OutpointFilter where Self: 'a; fn filter(&self) -> Self::Filter<'_>; - fn descriptor_mut(&mut self, f: impl FnOnce(&mut WalletDescr) -> R) -> R; + fn with_descriptor_mut( + &mut self, + f: impl FnOnce(&mut WalletDescr) -> R, + ) -> R; fn outpoints(&self) -> impl Iterator; fn txids(&self) -> impl Iterator; @@ -292,7 +295,9 @@ where Self::Descr: DescriptorRgb .terminal_derivation() .ok_or(CompletionError::InconclusiveDerivation)?; let tapret_commitment = output.tapret_commitment()?; - self.descriptor_mut(|descr| descr.add_tapret_tweak(terminal, tapret_commitment))?; + self.with_descriptor_mut(|descr| { + descr.with_descriptor_mut(|d| d.add_tapret_tweak(terminal, tapret_commitment)) + })?; } let witness_txid = psbt.txid(); @@ -345,14 +350,12 @@ where Self::Descr: DescriptorRgb } } -impl> WalletProvider for Wallet -where Wallet: Save -{ +impl> WalletProvider for Wallet { type Filter<'a> = WalletWrapper<'a, K, D> where Self: 'a; fn filter(&self) -> Self::Filter<'_> { WalletWrapper(self) } - fn descriptor_mut(&mut self, f: impl FnOnce(&mut WalletDescr) -> R) -> R { + fn with_descriptor_mut(&mut self, f: impl FnOnce(&mut WalletDescr) -> R) -> R { self.descriptor_mut(f) } fn outpoints(&self) -> impl Iterator { self.coins().map(|coin| coin.outpoint) } diff --git a/src/wallet.rs b/src/wallet.rs index 797af2f..62082a8 100644 --- a/src/wallet.rs +++ b/src/wallet.rs @@ -22,18 +22,19 @@ use std::collections::HashMap; use std::marker::PhantomData; #[cfg(feature = "fs")] -use std::path::{Path, PathBuf}; +use std::path::PathBuf; use bpstd::XpubDerivable; #[cfg(feature = "fs")] -use bpwallet::fs::Warning; +use bpwallet::fs::FsTextStore; #[cfg(feature = "fs")] -use bpwallet::{Wallet, WalletDescr}; +use bpwallet::Wallet; +use nonasync::persistence::PersistenceProvider; use psrgbt::{Psbt, PsbtMeta}; use rgbstd::containers::Transfer; use rgbstd::interface::{AmountChange, IfaceOp, IfaceRef}; #[cfg(feature = "fs")] -use rgbstd::persistence::fs::FsStored; +use rgbstd::persistence::fs::FsBinStore; use rgbstd::persistence::{ IndexProvider, MemIndex, MemStash, MemState, StashProvider, StateProvider, Stock, }; @@ -55,8 +56,6 @@ pub struct RgbWallet< { stock: Stock, wallet: W, - #[cfg(feature = "fs")] - warnings: Vec, #[getter(skip)] _phantom: PhantomData, } @@ -64,24 +63,26 @@ pub struct RgbWallet< #[cfg(feature = "fs")] impl, S: StashProvider, H: StateProvider, P: IndexProvider> RgbWallet, K, S, H, P> -where - S: FsStored, - H: FsStored, - P: FsStored, - for<'de> WalletDescr: serde::Serialize + serde::Deserialize<'de>, - for<'de> D: serde::Serialize + serde::Deserialize<'de>, { #[allow(clippy::result_large_err)] pub fn load( - stock_path: impl ToOwned, - wallet_path: impl AsRef, - ) -> Result { - let stock = Stock::load(stock_path)?; - let (wallet, warnings) = Wallet::load(wallet_path.as_ref(), true)?; + stock_path: PathBuf, + wallet_path: PathBuf, + autosave: bool, + ) -> Result + where + D: serde::Serialize + for<'de> serde::Deserialize<'de>, + FsBinStore: PersistenceProvider, + FsBinStore: PersistenceProvider, + FsBinStore: PersistenceProvider

, + { + let provider = FsBinStore::new(stock_path); + let stock = Stock::load(provider, autosave).map_err(WalletError::StockPersist)?; + let provider = FsTextStore::new(wallet_path); + let wallet = Wallet::load(provider, autosave).map_err(WalletError::WalletPersist)?; Ok(Self { wallet, stock, - warnings, _phantom: PhantomData, }) } @@ -95,8 +96,6 @@ where W::Descr: DescriptorRgb Self { stock, wallet, - #[cfg(feature = "fs")] - warnings: none!(), _phantom: PhantomData, } } diff --git a/src/wrapper.rs b/src/wrapper.rs index da81e8b..fd46e1e 100644 --- a/src/wrapper.rs +++ b/src/wrapper.rs @@ -19,24 +19,19 @@ // See the License for the specific language governing permissions and // limitations under the License. -use bpwallet::{Save, Wallet}; +use bpwallet::Wallet; use rgbstd::interface::OutpointFilter; use crate::{DescriptorRgb, WalletProvider, XChain, XOutpoint}; -pub struct WalletWrapper<'a, K, D: DescriptorRgb>(pub &'a Wallet) -where Wallet: Save; +pub struct WalletWrapper<'a, K, D: DescriptorRgb>(pub &'a Wallet); -impl<'a, K, D: DescriptorRgb> Copy for WalletWrapper<'a, K, D> where Wallet: Save {} -impl<'a, K, D: DescriptorRgb> Clone for WalletWrapper<'a, K, D> -where Wallet: Save -{ +impl<'a, K, D: DescriptorRgb> Copy for WalletWrapper<'a, K, D> {} +impl<'a, K, D: DescriptorRgb> Clone for WalletWrapper<'a, K, D> { fn clone(&self) -> Self { *self } } -impl<'a, K, D: DescriptorRgb> OutpointFilter for WalletWrapper<'a, K, D> -where Wallet: Save -{ +impl<'a, K, D: DescriptorRgb> OutpointFilter for WalletWrapper<'a, K, D> { fn include_outpoint(&self, output: impl Into) -> bool { let output = output.into(); self.0 From e4c744fd2e5a86fcf1c9de9d9ae1e55ff2347aa5 Mon Sep 17 00:00:00 2001 From: Dr Maxim Orlovsky Date: Fri, 30 Aug 2024 11:02:35 +0200 Subject: [PATCH 2/4] ci: add build for log feature --- .github/workflows/build.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index ec17ca2..269b2ee 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -36,6 +36,7 @@ jobs: feature: - fs - cli + - log - esplora_blocking - electrum_blocking - mempool_blocking From 4085e0e803b0e529ffdc5008fe5f5ebfa1b2933f Mon Sep 17 00:00:00 2001 From: Dr Maxim Orlovsky Date: Mon, 2 Sep 2024 21:56:56 +0200 Subject: [PATCH 3/4] chore: update dependencies --- Cargo.lock | 137 +++++++++++++++++++++++------------------------- Cargo.toml | 5 ++ cli/src/args.rs | 4 +- src/wallet.rs | 4 +- 4 files changed, 75 insertions(+), 75 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index ef06624..d5c693e 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -198,9 +198,9 @@ dependencies = [ [[package]] name = "ascii-armor" -version = "0.7.1" +version = "0.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9ad861dfcd5f348ac79e0df2e70494641c62d3ac37587af68c52a16ab355afdb" +checksum = "e4966ac403dc4a666d8131dfe4df684f45acc68d4c7e768db89c463aa5617910" dependencies = [ "amplify 4.7.0", "baid64", @@ -294,7 +294,7 @@ dependencies = [ "regex", "rustc-hash", "shlex", - "syn 2.0.75", + "syn 2.0.77", "which", ] @@ -390,15 +390,14 @@ dependencies = [ [[package]] name = "bp-derive" version = "0.11.0-beta.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a5a1a38a6324920d6aa183245be6f13acde5aef1008b24fecf5f8e4036f33fe8" +source = "git+https://github.com/BP-WG/bp-std?branch=store#efb5b6779b134208e4bca79cb55828de8094b821" dependencies = [ "amplify 4.7.0", "bp-consensus", "bp-invoice", "commit_verify", "hmac", - "indexmap 2.4.0", + "indexmap 2.5.0", "serde", "sha2", ] @@ -440,8 +439,7 @@ dependencies = [ [[package]] name = "bp-invoice" version = "0.11.0-beta.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ddcb55fe081418fc6e508370eaf8431001274727862e57e6672b6c892b8d3d66" +source = "git+https://github.com/BP-WG/bp-std?branch=store#efb5b6779b134208e4bca79cb55828de8094b821" dependencies = [ "amplify 4.7.0", "bech32", @@ -470,8 +468,7 @@ dependencies = [ [[package]] name = "bp-std" version = "0.11.0-beta.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ac66f7e326e203f228fd60f1fb1f5629f6ec20f37c61b580a627c3194e85d7fc" +source = "git+https://github.com/BP-WG/bp-std?branch=store#efb5b6779b134208e4bca79cb55828de8094b821" dependencies = [ "amplify 4.7.0", "bp-consensus", @@ -488,7 +485,7 @@ dependencies = [ [[package]] name = "bp-wallet" version = "0.11.0-beta.7" -source = "git+https://github.com/BP-WG/bp-wallet?branch=store#01a6a165c03ff9ebd5e9e38fed87326265c6b6e0" +source = "git+https://github.com/BP-WG/bp-wallet?branch=store#617daad6c8b108cb41148ca0914f1655b3133622" dependencies = [ "amplify 4.7.0", "base64", @@ -525,9 +522,9 @@ checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b" [[package]] name = "cc" -version = "1.1.13" +version = "1.1.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "72db2f7947ecee9b03b510377e8bb9077afa27176fdbff55c51027e976fdcc48" +checksum = "57b6a275aa2903740dc87da01c62040406b8812552e97129a63ea8850a17c6e6" dependencies = [ "jobserver", "libc", @@ -606,7 +603,7 @@ dependencies = [ "heck", "proc-macro2", "quote", - "syn 2.0.75", + "syn 2.0.77", ] [[package]] @@ -682,9 +679,9 @@ dependencies = [ [[package]] name = "constant_time_eq" -version = "0.3.0" +version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f7144d30dcf0fafbce74250a3963025d8d52177934239851c917d29f1df280c2" +checksum = "7c74b8349d32d297c9134b8c88677813a227df8f779daa29bfc29c183fe3dca6" [[package]] name = "core-foundation-sys" @@ -747,7 +744,7 @@ dependencies = [ "proc-macro2", "quote", "strsim", - "syn 2.0.75", + "syn 2.0.77", ] [[package]] @@ -758,7 +755,7 @@ checksum = "d336a2a514f6ccccaa3e09b02d41d35330c07ddf03a62165fcec10bb561c7806" dependencies = [ "darling_core", "quote", - "syn 2.0.75", + "syn 2.0.77", ] [[package]] @@ -774,12 +771,11 @@ dependencies = [ [[package]] name = "descriptors" version = "0.11.0-beta.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "88b6883b7b23aedc5a2ff149a54b0f57496935be3fd4b453f0c76361b08f5649" +source = "git+https://github.com/BP-WG/bp-std?branch=store#efb5b6779b134208e4bca79cb55828de8094b821" dependencies = [ "amplify 4.7.0", "bp-derive", - "indexmap 2.4.0", + "indexmap 2.5.0", "serde", ] @@ -874,9 +870,9 @@ checksum = "27ea9bdb2356e5a92403cf23ac493f9b43bd71e4ffd0f800862b841dd723994c" [[package]] name = "flate2" -version = "1.0.32" +version = "1.0.33" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c0596c1eac1f9e04ed902702e9878208b336edc9d6fddc8a48387349bab3666" +checksum = "324a1be68054ef05ad64b861cc9eaf1d623d2d8cb25b4bf2cb9cdd902b4bf253" dependencies = [ "crc32fast", "miniz_oxide", @@ -1051,9 +1047,9 @@ dependencies = [ [[package]] name = "indexmap" -version = "2.4.0" +version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "93ead53efc7ea8ed3cfb0c79fc8023fbb782a5432b52830b6518941cebe6505c" +checksum = "68b900aa2f7301e21c36462b170ee99994de34dff39a4a6a528e80e7376d07e5" dependencies = [ "equivalent", "hashbrown 0.14.5", @@ -1211,7 +1207,7 @@ dependencies = [ [[package]] name = "nonasync" version = "0.1.0" -source = "git+https://github.com/rust-amplify/amplify-nonasync#9c6ab8f0e19d80cc787633bad328e7817c256de4" +source = "git+https://github.com/rust-amplify/amplify-nonasync#b1bf3542060beabe3dcdf66517be6ee3eb2ac302" dependencies = [ "amplify 5.0.0-beta.1", "log", @@ -1273,12 +1269,12 @@ dependencies = [ [[package]] name = "prettyplease" -version = "0.2.20" +version = "0.2.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f12335488a2f3b0a83b14edad48dca9879ce89b2edd10e80237e4e852dd645e" +checksum = "479cf940fbbb3426c32c5d5176f62ad57549a0bb84773423ba8be9d089f5faba" dependencies = [ "proc-macro2", - "syn 2.0.75", + "syn 2.0.77", ] [[package]] @@ -1293,8 +1289,7 @@ dependencies = [ [[package]] name = "psbt" version = "0.11.0-beta.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2afd0eef00260666da5c2c72e61c23bd2e07076e0791ea4cc3e79ab408246a17" +source = "git+https://github.com/BP-WG/bp-std?branch=store#efb5b6779b134208e4bca79cb55828de8094b821" dependencies = [ "amplify 4.7.0", "base64", @@ -1303,16 +1298,16 @@ dependencies = [ "chrono", "commit_verify", "descriptors", - "indexmap 2.4.0", + "indexmap 2.5.0", "serde", "strict_encoding", ] [[package]] name = "quote" -version = "1.0.36" +version = "1.0.37" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0fa76aaf39101c457836aec0ce2316dbdc3ab723cdda1c6bd4e6ad4208acaca7" +checksum = "b5b9d34b8991d19d98081b46eacdd8eb58c6f2b201139f7c5f643cc155a633af" dependencies = [ "proc-macro2", ] @@ -1430,7 +1425,7 @@ dependencies = [ [[package]] name = "rgb-invoice" version = "0.11.0-beta.7" -source = "git+https://github.com/RGB-WG/rgb-std?branch=store#c274066a0d50036e061e3537639783b27e936f23" +source = "git+https://github.com/RGB-WG/rgb-std?branch=store#47e81b939e66ed03856ba3b970c44e4070ac8a25" dependencies = [ "amplify 4.7.0", "baid64", @@ -1438,7 +1433,7 @@ dependencies = [ "bp-invoice", "fast32", "fluent-uri", - "indexmap 2.4.0", + "indexmap 2.5.0", "percent-encoding", "rand", "rgb-core", @@ -1480,7 +1475,7 @@ dependencies = [ "commit_verify", "descriptors", "getrandom", - "indexmap 2.4.0", + "indexmap 2.5.0", "log", "nonasync", "rand", @@ -1496,7 +1491,7 @@ dependencies = [ [[package]] name = "rgb-std" version = "0.11.0-beta.7" -source = "git+https://github.com/RGB-WG/rgb-std?branch=store#c274066a0d50036e061e3537639783b27e936f23" +source = "git+https://github.com/RGB-WG/rgb-std?branch=store#47e81b939e66ed03856ba3b970c44e4070ac8a25" dependencies = [ "aluvm", "amplify 4.7.0", @@ -1507,7 +1502,7 @@ dependencies = [ "chrono", "commit_verify", "getrandom", - "indexmap 2.4.0", + "indexmap 2.5.0", "nonasync", "rand", "rgb-core", @@ -1575,9 +1570,9 @@ checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2" [[package]] name = "rustix" -version = "0.38.34" +version = "0.38.35" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "70dc5ec042f7a43c4a73241207cecc9873a06d45debb38b329f8541d85c2730f" +checksum = "a85d50532239da68e9addb745ba38ff4612a242c1c7ceea689c4bc7c2f43c36f" dependencies = [ "bitflags 2.6.0", "errno", @@ -1610,9 +1605,9 @@ checksum = "fc0a2ce646f8655401bb81e7927b812614bd5d91dbc968696be50603510fcaf0" [[package]] name = "rustls-webpki" -version = "0.102.6" +version = "0.102.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e6b52d4fda176fd835fdc55a835d4a89b8499cad995885a21149d5ad62f852e" +checksum = "84678086bd54edf2b415183ed7a94d0efb049f1b646a33e22a36f3794be6ae56" dependencies = [ "aws-lc-rs", "ring", @@ -1686,29 +1681,29 @@ dependencies = [ [[package]] name = "serde" -version = "1.0.208" +version = "1.0.209" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cff085d2cb684faa248efb494c39b68e522822ac0de72ccf08109abde717cfb2" +checksum = "99fce0ffe7310761ca6bf9faf5115afbc19688edd00171d81b1bb1b116c63e09" dependencies = [ "serde_derive", ] [[package]] name = "serde_derive" -version = "1.0.208" +version = "1.0.209" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "24008e81ff7613ed8e5ba0cfaf24e2c2f1e5b8a0495711e44fcd4882fca62bcf" +checksum = "a5831b979fd7b5439637af1752d535ff49f4860c0f341d1baeb6faf0f4242170" dependencies = [ "proc-macro2", "quote", - "syn 2.0.75", + "syn 2.0.77", ] [[package]] name = "serde_json" -version = "1.0.125" +version = "1.0.127" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "83c8e735a073ccf5be70aa8066aa984eaf2fa000db6c8d0100ae605b366d31ed" +checksum = "8043c06d9f82bd7271361ed64f415fe5e12a77fdb52e573e7f06a516dea329ad" dependencies = [ "itoa", "memchr", @@ -1745,7 +1740,7 @@ dependencies = [ "chrono", "hex", "indexmap 1.9.3", - "indexmap 2.4.0", + "indexmap 2.5.0", "serde", "serde_derive", "serde_json", @@ -1762,7 +1757,7 @@ dependencies = [ "darling", "proc-macro2", "quote", - "syn 2.0.75", + "syn 2.0.77", ] [[package]] @@ -1771,7 +1766,7 @@ version = "0.9.34+deprecated" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6a8b1a1a2ebf674015cc02edccce75287f1a0130d394307b36743c2f5d504b47" dependencies = [ - "indexmap 2.4.0", + "indexmap 2.5.0", "itoa", "ryu", "serde", @@ -1832,9 +1827,9 @@ checksum = "6980e8d7511241f8acf4aebddbb1ff938df5eebe98691418c4468d0b72a96a67" [[package]] name = "strict_encoding" -version = "2.7.0-rc.1" +version = "2.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "662b8c3ff360ff33370e6875dd5bdcbf3cecc992241f30e5f7071227ef693451" +checksum = "d69b4893cf054e129d5288a565102124520d7b94eb9589d1e78202abc7e2092d" dependencies = [ "amplify 4.7.0", "half", @@ -1845,9 +1840,9 @@ dependencies = [ [[package]] name = "strict_encoding_derive" -version = "2.7.0-rc.1" +version = "2.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0ad171ee0ac09497f5f87d90bb36acc21992fb58f3565ad8c2663160c07c306d" +checksum = "0d4f9b678862372f8e439bcaafc27df7610ea93b06d2deb6244dec0af4259ce6" dependencies = [ "amplify_syn", "heck", @@ -1858,15 +1853,15 @@ dependencies = [ [[package]] name = "strict_types" -version = "2.7.0-rc.1" +version = "2.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e6e182f593e9c4f02ccfcea7929bef866cff12a3f8e213338ce48a706bb263c1" +checksum = "5f16e8855a575633815f01482ac927ebaca3d2485aec8e17226c6826de29154e" dependencies = [ "amplify 4.7.0", "ascii-armor", "baid64", "half", - "indexmap 2.4.0", + "indexmap 2.5.0", "serde", "serde_json", "serde_yaml", @@ -1912,9 +1907,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.75" +version = "2.0.77" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f6af063034fc1935ede7be0122941bafa9bacb949334d090b77ca98b5817c7d9" +checksum = "9f35bcdf61fd8e7be6caf75f429fdca8beb3ed76584befb503b1569faee373ed" dependencies = [ "proc-macro2", "quote", @@ -1938,7 +1933,7 @@ checksum = "a4558b58466b9ad7ca0f102865eccc95938dca1a74a856f2b57b6629050da261" dependencies = [ "proc-macro2", "quote", - "syn 2.0.75", + "syn 2.0.77", ] [[package]] @@ -2014,7 +2009,7 @@ version = "0.22.20" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "583c44c02ad26b0c3f3066fe629275e50627026c51ac2e595cca4c230ce1ce1d" dependencies = [ - "indexmap 2.4.0", + "indexmap 2.5.0", "serde", "serde_spanned", "toml_datetime", @@ -2150,7 +2145,7 @@ dependencies = [ "once_cell", "proc-macro2", "quote", - "syn 2.0.75", + "syn 2.0.77", "wasm-bindgen-shared", ] @@ -2184,7 +2179,7 @@ checksum = "afc340c74d9005395cf9dd098506f7f44e38f2b4a21c6aaacf9a105ea5e1e836" dependencies = [ "proc-macro2", "quote", - "syn 2.0.75", + "syn 2.0.77", "wasm-bindgen-backend", "wasm-bindgen-shared", ] @@ -2218,7 +2213,7 @@ checksum = "4b8220be1fa9e4c889b30fd207d4906657e7e90b12e0e6b0c8b8d8709f5de021" dependencies = [ "proc-macro2", "quote", - "syn 2.0.75", + "syn 2.0.77", ] [[package]] @@ -2233,9 +2228,9 @@ dependencies = [ [[package]] name = "webpki-roots" -version = "0.26.3" +version = "0.26.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bd7c23921eeb1713a4e851530e9b9756e4fb0e89978582942612524cf09f01cd" +checksum = "0bd24728e5af82c6c4ec1b66ac4844bdf8156257fccda846ec58b42cd0cdbe6a" dependencies = [ "rustls-pki-types", ] @@ -2467,7 +2462,7 @@ checksum = "fa4f8080344d4671fb4e831a13ad1e68092748387dfc4f55e356242fae12ce3e" dependencies = [ "proc-macro2", "quote", - "syn 2.0.75", + "syn 2.0.77", ] [[package]] @@ -2487,5 +2482,5 @@ checksum = "ce36e65b0d2999d2aafac989fb249189a141aee1f53c612c1f37d72631959f69" dependencies = [ "proc-macro2", "quote", - "syn 2.0.75", + "syn 2.0.77", ] diff --git a/Cargo.toml b/Cargo.toml index a405d68..6b89887 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -105,6 +105,11 @@ features = ["all"] [patch.crates-io] nonasync = { git = "https://github.com/rust-amplify/amplify-nonasync" } +bp-invoice = { git = "https://github.com/BP-WG/bp-std", branch = "store" } +bp-derive = { git = "https://github.com/BP-WG/bp-std", branch = "store" } +descriptors = { git = "https://github.com/BP-WG/bp-std", branch = "store" } +psbt = { git = "https://github.com/BP-WG/bp-std", branch = "store" } +bp-std = { git = "https://github.com/BP-WG/bp-std", branch = "store" } bp-wallet = { git = "https://github.com/BP-WG/bp-wallet", branch = "store" } rgb-core = { git = "https://github.com/RGB-WG/rgb-core", branch = "master" } rgb-invoice = { git = "https://github.com/RGB-WG/rgb-std", branch = "store" } diff --git a/cli/src/args.rs b/cli/src/args.rs index a284f7f..4f4697a 100644 --- a/cli/src/args.rs +++ b/cli/src/args.rs @@ -103,14 +103,14 @@ impl RgbArgs { eprint!("Loading stock from `{}` ... ", stock_path.display()); } - let provider = FsBinStore::new(stock_path.clone()); + let provider = FsBinStore::new(stock_path.clone())?; let mut stock = Stock::load(provider, true).map_err(WalletError::WalletPersist).or_else(|err| { if matches!(err, WalletError::Deserialize(DeserializeError::Decode(DecodeError::Io(ref err))) if err.kind() == ErrorKind::NotFound) { if self.verbose > 1 { eprint!("stock file is absent, creating a new one ... "); } fs::create_dir_all(&stock_path)?; - let provider = FsBinStore::new(stock_path); + let provider = FsBinStore::new(stock_path)?; let mut stock = Stock::in_memory(); stock.make_persistent(provider, true).map_err(WalletError::StockPersist)?; return Ok(stock); diff --git a/src/wallet.rs b/src/wallet.rs index 62082a8..e47d364 100644 --- a/src/wallet.rs +++ b/src/wallet.rs @@ -76,9 +76,9 @@ impl, S: StashProvider, H: StateProvider, P: IndexProvide FsBinStore: PersistenceProvider, FsBinStore: PersistenceProvider

, { - let provider = FsBinStore::new(stock_path); + let provider = FsBinStore::new(stock_path)?; let stock = Stock::load(provider, autosave).map_err(WalletError::StockPersist)?; - let provider = FsTextStore::new(wallet_path); + let provider = FsTextStore::new(wallet_path)?; let wallet = Wallet::load(provider, autosave).map_err(WalletError::WalletPersist)?; Ok(Self { wallet, From c1ed3409f7824f5bad239ea191cff907382a2400 Mon Sep 17 00:00:00 2001 From: Dr Maxim Orlovsky Date: Thu, 5 Sep 2024 10:39:13 +0200 Subject: [PATCH 4/4] chore: update dependencies patches to use master branches --- Cargo.lock | 68 +++++++++++++++++++++++++++--------------------------- Cargo.toml | 16 ++++++------- 2 files changed, 42 insertions(+), 42 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index d5c693e..8201b55 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -19,9 +19,9 @@ dependencies = [ [[package]] name = "aluvm" -version = "0.11.0-beta.7" +version = "0.11.0-beta.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1aaa9bf6c54f2d232adc6a9e748f359f1b4570d0a498f92e7823321ae7c656b5" +checksum = "db04c1d697d7f5b86d935bfe06cfd0310fd8a6c491b043118bec228597dcede9" dependencies = [ "amplify 4.7.0", "ascii-armor", @@ -340,9 +340,9 @@ dependencies = [ [[package]] name = "bp-consensus" -version = "0.11.0-beta.7" +version = "0.11.0-beta.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d23ea438647522d1f1a8fc8fa1420cc56321433d5d5964636294991f18f9e0c9" +checksum = "ae3a99a46063d23d20a3177a04923652b245f31c2a04a6d0c47d5a93dc201a80" dependencies = [ "amplify 4.7.0", "chrono", @@ -355,9 +355,9 @@ dependencies = [ [[package]] name = "bp-core" -version = "0.11.0-beta.7" +version = "0.11.0-beta.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b43a6b5389fd99298fca47f4566dda754fa10bdb41200b5cdfc16147400f5951" +checksum = "60b8caf04291e2703ce267b1f8baf14f03879a6d1a5afe76e011ada489f172f9" dependencies = [ "amplify 4.7.0", "bp-consensus", @@ -374,9 +374,9 @@ dependencies = [ [[package]] name = "bp-dbc" -version = "0.11.0-beta.7" +version = "0.11.0-beta.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f0f70bd407dfcbeadfbc012959e04decbe63e7dc6f30a4f705b804b699b37a0a" +checksum = "11fc4081db2147411381b9650765ce683e5065559f1125508696f79cc4cbfedf" dependencies = [ "amplify 4.7.0", "base85", @@ -390,7 +390,7 @@ dependencies = [ [[package]] name = "bp-derive" version = "0.11.0-beta.7" -source = "git+https://github.com/BP-WG/bp-std?branch=store#efb5b6779b134208e4bca79cb55828de8094b821" +source = "git+https://github.com/BP-WG/bp-std?branch=master#9387b53262db593c347f72bf0adb043eb5d8faf7" dependencies = [ "amplify 4.7.0", "bp-consensus", @@ -439,7 +439,7 @@ dependencies = [ [[package]] name = "bp-invoice" version = "0.11.0-beta.7" -source = "git+https://github.com/BP-WG/bp-std?branch=store#efb5b6779b134208e4bca79cb55828de8094b821" +source = "git+https://github.com/BP-WG/bp-std?branch=master#9387b53262db593c347f72bf0adb043eb5d8faf7" dependencies = [ "amplify 4.7.0", "bech32", @@ -450,9 +450,9 @@ dependencies = [ [[package]] name = "bp-seals" -version = "0.11.0-beta.7" +version = "0.11.0-beta.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "497bb5989b9b549cd8e4ebfabc50a5d57cf318ab56affd3d4d7b7749fcd780da" +checksum = "d607238c2bf2c34d048d14cd798a6365306e0fb6b02211235f3ccad0bc7fa8f1" dependencies = [ "amplify 4.7.0", "baid64", @@ -468,7 +468,7 @@ dependencies = [ [[package]] name = "bp-std" version = "0.11.0-beta.7" -source = "git+https://github.com/BP-WG/bp-std?branch=store#efb5b6779b134208e4bca79cb55828de8094b821" +source = "git+https://github.com/BP-WG/bp-std?branch=master#9387b53262db593c347f72bf0adb043eb5d8faf7" dependencies = [ "amplify 4.7.0", "bp-consensus", @@ -485,7 +485,7 @@ dependencies = [ [[package]] name = "bp-wallet" version = "0.11.0-beta.7" -source = "git+https://github.com/BP-WG/bp-wallet?branch=store#617daad6c8b108cb41148ca0914f1655b3133622" +source = "git+https://github.com/BP-WG/bp-wallet?branch=master#3d10e976f24ab8783778b8578471840fab4437a2" dependencies = [ "amplify 4.7.0", "base64", @@ -522,9 +522,9 @@ checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b" [[package]] name = "cc" -version = "1.1.15" +version = "1.1.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "57b6a275aa2903740dc87da01c62040406b8812552e97129a63ea8850a17c6e6" +checksum = "e9d013ecb737093c0e86b151a7b837993cf9ec6c502946cfb44bedc392421e0b" dependencies = [ "jobserver", "libc", @@ -574,9 +574,9 @@ dependencies = [ [[package]] name = "clap" -version = "4.5.16" +version = "4.5.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ed6719fffa43d0d87e5fd8caeab59be1554fb028cd30edc88fc4369b17971019" +checksum = "3e5a21b8495e732f1b3c364c9949b201ca7bae518c502c80256c96ad79eaf6ac" dependencies = [ "clap_builder", "clap_derive", @@ -584,9 +584,9 @@ dependencies = [ [[package]] name = "clap_builder" -version = "4.5.15" +version = "4.5.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "216aec2b177652e3846684cbfe25c9964d18ec45234f0f5da5157b207ed1aab6" +checksum = "8cf2dd12af7a047ad9d6da2b6b249759a22a7abc0f474c1dae1777afa4b21a73" dependencies = [ "anstream", "anstyle", @@ -639,9 +639,9 @@ dependencies = [ [[package]] name = "commit_encoding_derive" -version = "0.11.0-beta.7" +version = "0.11.0-beta.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca41bd14a6c400486463a5b0e7e8916b1c7bad554a382f62c3b11bd58dea5934" +checksum = "ea07c5ad73a637276dc4f8a957f8285764018d45bdefef35eb9137f32d0e3c81" dependencies = [ "amplify 4.7.0", "amplify_syn", @@ -652,9 +652,9 @@ dependencies = [ [[package]] name = "commit_verify" -version = "0.11.0-beta.7" +version = "0.11.0-beta.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "538b69bbb2f7259c1d07334fa8adae0006c8b559efbdb6daafacb6df249b897b" +checksum = "82a1982dc6c54d2dcfa2bf4398d97e4e80a93f24d2537e58d6110b2b272cff0c" dependencies = [ "amplify 4.7.0", "commit_encoding_derive", @@ -771,7 +771,7 @@ dependencies = [ [[package]] name = "descriptors" version = "0.11.0-beta.7" -source = "git+https://github.com/BP-WG/bp-std?branch=store#efb5b6779b134208e4bca79cb55828de8094b821" +source = "git+https://github.com/BP-WG/bp-std?branch=master#9387b53262db593c347f72bf0adb043eb5d8faf7" dependencies = [ "amplify 4.7.0", "bp-derive", @@ -1289,7 +1289,7 @@ dependencies = [ [[package]] name = "psbt" version = "0.11.0-beta.7" -source = "git+https://github.com/BP-WG/bp-std?branch=store#efb5b6779b134208e4bca79cb55828de8094b821" +source = "git+https://github.com/BP-WG/bp-std?branch=master#9387b53262db593c347f72bf0adb043eb5d8faf7" dependencies = [ "amplify 4.7.0", "base64", @@ -1384,8 +1384,8 @@ checksum = "7a66a03ae7c801facd77a29370b4faec201768915ac14a721ba36f20bc9c209b" [[package]] name = "rgb-core" -version = "0.11.0-beta.7" -source = "git+https://github.com/RGB-WG/rgb-core?branch=master#4f67584ef950a8097cc2c41f8caedb26bdd9996c" +version = "0.11.0-beta.8" +source = "git+https://github.com/RGB-WG/rgb-core?branch=master#8be49626a968a45fc868db1e1454095b75349c17" dependencies = [ "aluvm", "amplify 4.7.0", @@ -1425,7 +1425,7 @@ dependencies = [ [[package]] name = "rgb-invoice" version = "0.11.0-beta.7" -source = "git+https://github.com/RGB-WG/rgb-std?branch=store#47e81b939e66ed03856ba3b970c44e4070ac8a25" +source = "git+https://github.com/RGB-WG/rgb-std?branch=master#4e4327ab9eef98bf407ce6d9d82a7de0530be05c" dependencies = [ "amplify 4.7.0", "baid64", @@ -1491,7 +1491,7 @@ dependencies = [ [[package]] name = "rgb-std" version = "0.11.0-beta.7" -source = "git+https://github.com/RGB-WG/rgb-std?branch=store#47e81b939e66ed03856ba3b970c44e4070ac8a25" +source = "git+https://github.com/RGB-WG/rgb-std?branch=master#4e4327ab9eef98bf407ce6d9d82a7de0530be05c" dependencies = [ "aluvm", "amplify 4.7.0", @@ -1701,9 +1701,9 @@ dependencies = [ [[package]] name = "serde_json" -version = "1.0.127" +version = "1.0.128" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8043c06d9f82bd7271361ed64f415fe5e12a77fdb52e573e7f06a516dea329ad" +checksum = "6ff5456707a1de34e7e37f2a6fd3d3f808c318259cbd01ab6377795054b483d8" dependencies = [ "itoa", "memchr", @@ -1801,9 +1801,9 @@ checksum = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64" [[package]] name = "single_use_seals" -version = "0.11.0-beta.7" +version = "0.11.0-beta.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "66c34b7d0a73e5b821f2647331b1303463ce58c51b32f54b006f0e7bb3edcd8a" +checksum = "c1a4c51f21507cf63984c367507f281215073e85b08711ed7da4fc63dbd709e0" dependencies = [ "amplify_derive", ] diff --git a/Cargo.toml b/Cargo.toml index 6b89887..04f028f 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -105,12 +105,12 @@ features = ["all"] [patch.crates-io] nonasync = { git = "https://github.com/rust-amplify/amplify-nonasync" } -bp-invoice = { git = "https://github.com/BP-WG/bp-std", branch = "store" } -bp-derive = { git = "https://github.com/BP-WG/bp-std", branch = "store" } -descriptors = { git = "https://github.com/BP-WG/bp-std", branch = "store" } -psbt = { git = "https://github.com/BP-WG/bp-std", branch = "store" } -bp-std = { git = "https://github.com/BP-WG/bp-std", branch = "store" } -bp-wallet = { git = "https://github.com/BP-WG/bp-wallet", branch = "store" } +bp-invoice = { git = "https://github.com/BP-WG/bp-std", branch = "master" } +bp-derive = { git = "https://github.com/BP-WG/bp-std", branch = "master" } +descriptors = { git = "https://github.com/BP-WG/bp-std", branch = "master" } +psbt = { git = "https://github.com/BP-WG/bp-std", branch = "master" } +bp-std = { git = "https://github.com/BP-WG/bp-std", branch = "master" } +bp-wallet = { git = "https://github.com/BP-WG/bp-wallet", branch = "master" } rgb-core = { git = "https://github.com/RGB-WG/rgb-core", branch = "master" } -rgb-invoice = { git = "https://github.com/RGB-WG/rgb-std", branch = "store" } -rgb-std = { git = "https://github.com/RGB-WG/rgb-std", branch = "store" } +rgb-invoice = { git = "https://github.com/RGB-WG/rgb-std", branch = "master" } +rgb-std = { git = "https://github.com/RGB-WG/rgb-std", branch = "master" }