Improvements and bugfixes for command-line interface

Cargo.toml

@@ -22,7 +22,7 @@ license = "Apache-2.0"
 
 [workspace.dependencies]
 amplify = "4.7.0"
-nonasync = { version = "0.1.0", features = ["log"] }
+nonasync = { version = "0.1.2", features = ["log"] }
 baid64 = "0.2.2"
 strict_encoding = "2.7.0"
 strict_types = "2.7.0"
@@ -37,7 +37,6 @@ psbt = { version = "0.11.0-beta.8", features = ["client-side-validation"] }
 bp-wallet = { version = "0.11.0-beta.8" }
 rgb-std = { version = "0.11.0-beta.8" }
 rgb-psbt = { version = "0.11.0-beta.8", path = "psbt" }
-rgb-interfaces = "0.11.0-beta.8"
 indexmap = "2.4.0"
 chrono = "0.4.38"
 serde_crate = { package = "serde", version = "1", features = ["derive"] }
@@ -103,3 +102,8 @@ serde = ["serde_crate", "serde_yaml", "bp-std/serde", "descriptors/serde", "rgb-
 
 [package.metadata.docs.rs]
 features = ["all"]
+
+[patch.crates-io]
+bp-wallet = { git = "https://github.com/BP-WG/bp-wallet", branch = "develop" }
+rgb-core = { git = "https://github.com/RGB-WG/rgb-core", branch = "fix/273" }
+rgb-std = { git = "https://github.com/RGB-WG/rgb-std", branch = "fix/rgb-252" }

cli/Cargo.toml

@@ -26,8 +26,7 @@ bp-std = { workspace = true, features = ["serde"] }
 bp-wallet = { workspace = true, features = ["cli"] }
 psbt = { workspace = true }
 rgb-std = { workspace = true, features = ["serde"] }
-rgb-interfaces = { workspace = true }
-rgb-runtime = { version = "0.11.0-beta.7", path = "..", features = ["electrum_blocking", "esplora_blocking", "mempool_blocking", "log", "serde", "fs", "cli"] }
+rgb-runtime = { version = "0.11.0-beta.8", path = "..", features = ["electrum_blocking", "esplora_blocking", "mempool_blocking", "log", "serde", "fs", "cli"] }
 log = { workspace = true }
 env_logger = "0.11.5"
 clap = { version = "4.5.17", features = ["derive", "env"] }

cli/src/args.rs

@@ -104,19 +104,27 @@ impl RgbArgs {
         }
 
         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) {
+        let mut stock = Stock::load(provider, true).or_else(|err| {
+            if err
+                .0
+                .downcast_ref::<DeserializeError>()
+                .map(|e| matches!(e, DeserializeError::Decode(DecodeError::Io(ref e)) if e.kind() == ErrorKind::NotFound))
+                .unwrap_or_default()
+            {
                 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 mut stock = Stock::in_memory();
-                stock.make_persistent(provider, true).map_err(WalletError::StockPersist)?;
+                stock
+                    .make_persistent(provider, true)
+                    .map_err(WalletError::StockPersist)?;
                 return Ok(stock);
             }
             eprintln!("stock file is damaged, failing");
-            Err(err)
+            error!("Unable to load stock data: {err:?}");
+            Err(WalletError::StockPersist(err))
         })?;
 
         if self.sync {