Merge pull request #39 from RGB-WG/v0.11

Complete transfers with PSBT construction and tapret commitments

Cargo.toml

@@ -1,19 +1,19 @@
 [workspace]
 members = [
-    "invoice",
+    "psbt",
     "cli",
     "fs",
     "."
 ]
 default-members = [
-    "invoice",
+    "psbt",
     "cli",
     "fs",
     "."
 ]
 
 [workspace.package]
-version = "0.11.0-alpha.2"
+version = "0.11.0-beta.2"
 keywords = ["bitcoin", "lightning", "rgb", "smart-contracts", "lnp-bp"]
 categories = ["cryptography::cryptocurrencies"]
 authors = ["Dr Maxim Orlovsky <[email protected]>"]
@@ -26,16 +26,21 @@ license = "Apache-2.0"
 [workspace.dependencies]
 amplify = "4.5.0"
 baid58 = "0.4.4"
+commit_verify = "0.11.0-beta.2"
 strict_encoding = "2.6.1"
 strict_types = "1.6.3"
-bp-core = "0.11.0-beta.1"
-bp-seals = "0.11.0-beta.1"
-bp-std = "0.11.0-beta.2"
-bp-wallet = "0.11.0-beta.2"
-bp-utils = "0.11.0-beta.2"
-bp-esplora = "0.11.0-beta.1"
-rgb-std = { version = "0.11.0-beta.2", features = ["fs"] }
+bp-core = "0.11.0-beta.2"
+bp-seals = "0.11.0-beta.2"
+bp-std = "0.11.0-beta.3"
+bp-wallet = "0.11.0-beta.3"
+bp-util = "0.11.0-beta.3"
+bp-esplora = "0.11.0-beta.2"
+descriptors = "0.11.0-beta.2"
+psbt = { version = "0.11.0-beta.2", features = ["client-side-validation"] }
+rgb-std = { version = "0.11.0-beta.3", features = ["fs"] }
+rgb-psbt = { version = "0.11.0-beta.2", path = "psbt" }
 indexmap = "2.0.2"
+chrono = "0.4.31"
 serde_crate = { package = "serde", version = "1", features = ["derive"] }
 serde_yaml = "0.9.19"
 log = { version = "0.4", features = ["max_level_trace", "release_max_level_debug"] }
@@ -60,24 +65,27 @@ name = "rgb_rt"
 [dependencies]
 amplify = { workspace = true }
 baid58 = { workspace = true }
+commit_verify = { workspace = true }
 strict_types = { workspace = true }
 bp-core = { workspace = true }
 bp-std = { workspace = true }
 bp-wallet = { workspace = true, features = ["fs"] }
 bp-esplora = { workspace = true, optional = true }
-descriptors = "0.11.0-beta.2"
+descriptors = { workspace = true }
 rgb-std = { workspace = true }
+rgb-psbt = { workspace = true }
 rgb-persist-fs = { version = "0.11.0-alpha", path = "fs" }
 indexmap = { workspace = true }
+chrono = { workspace = true }
 serde_crate = { workspace = true, optional = true }
 serde_yaml = { workspace = true, optional = true }
 log = { workspace = true, optional = true }
 
 [features]
-default = []
+default = ["esplora"]
 all = ["esplora",  "serde", "log"]
 esplora = ["bp-esplora", "bp-wallet/esplora"]
-serde = ["serde_crate", "serde_yaml", "bp-std/serde", "bp-wallet/serde",]
+serde = ["serde_crate", "serde_yaml", "bp-std/serde", "bp-wallet/serde", "descriptors/serde", "rgb-psbt/serde"]
 
 [package.metadata.docs.rs]
 features = [ "all" ]

cli/Cargo.toml

@@ -20,15 +20,14 @@ path = "src/main.rs"
 amplify = { workspace = true }
 baid58 = { workspace = true }
 strict_types = { workspace = true, features = ["serde"] }
-commit_verify = "0.11.0-beta.1"
+commit_verify = { workspace = true }
 bp-seals = { workspace = true }
 bp-std = { workspace = true, features = ["serde"] }
 bp-wallet = { workspace = true }
-bp-esplora = { workspace = true }
-bp-util = "0.11.0-beta.2"
+bp-util = { workspace = true }
+psbt = { workspace = true }
 rgb-std = { workspace = true, features = ["serde"] }
-rgb-invoice = { version = "0.11.0-alpha.2", path = "../invoice" }
-rgb-runtime = { version = "0.11.0-alpha.2", path = "..", features = ["log", "serde"] }
+rgb-runtime = { version = "0.11.0-beta.1", path = "..", features = ["esplora", "log", "serde"] }
 log = { workspace = true }
 env_logger = "0.10.1"
 clap = { version = "4.4.8", features = ["derive", "env"] }

cli/src/args.rs

@@ -23,7 +23,7 @@
 
 use bp_util::{Config, DescriptorOpts};
 use bpstd::XpubDerivable;
-use rgb_rt::{RgbDescr, Runtime, RuntimeError, TapretKey};
+use rgb_rt::{Resolver, ResolverError, RgbDescr, Runtime, RuntimeError, TapretKey};
 
 use crate::Command;
 
@@ -75,4 +75,9 @@ impl RgbArgs {
 
         Ok(runtime)
     }
+
+    #[allow(clippy::result_large_err)]
+    pub fn resolver(&self) -> Result<Resolver, ResolverError> {
+        Resolver::new(&self.resolver.esplora)
+    }
 }