use new StoreProvider APIs

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

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<RgbWallet<Wallet<XpubDerivable, RgbDescr>>, 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<RgbWallet<Wallet<XpubDerivable, RgbDescr>>, WalletError> {
-        let wallet = self.inner.bp_wallet::<RgbDescr>(config)?;
+    ) -> Result<RgbWallet<Wallet<XpubDerivable, RgbDescr>>, (Stock, WalletError)> {
+        let wallet = match self.inner.bp_wallet::<RgbDescr>(config) {
+            Ok(wallet) => wallet,
+            Err(e) => return Err((stock, e.into())),
+        };
         let wallet = RgbWallet::new(stock, wallet);
 
         Ok(wallet)