Initial work on v0.11

Cargo.toml

@@ -1,12 +1,14 @@
 [workspace]
 members = [
     "std",
-    ".",
+    "invoice",
+    "stl"
 ]
 default-members = [
     "std",
-    "."
+    "invoice"
 ]
+resolver = "2"
 
 [workspace.package]
 authors = ["Dr Maxim Orlovsky <orlovsky@lnp-bp.org>"]
@@ -17,62 +19,17 @@ edition = "2021"
 license = "Apache-2.0"
 
 [workspace.dependencies]
-amplify = "4.0.1"
+amplify = "4.5.0"
 baid58 = "0.4.4"
-strict_encoding = "2.5.0"
-strict_types = "1.6.0"
-commit_verify = { version = "0.10.5", features = ["stl"] }
-bp-core = { version = "0.10.8", features = ["stl"] }
-rgb-core = { version = "0.10.7", features = ["stl"] }
-
-[package]
-name = "rgb-wallet"
-version = "0.10.7"
-description = "RGB wallet library for smart contracts on Bitcoin & Lightning network"
-keywords = ["bitcoin", "lightning", "rgb", "smart-contracts", "lnp-bp"]
-categories = ["cryptography::cryptocurrencies"]
-authors = { workspace = true }
-repository = { workspace = true }
-homepage = { workspace = true }
-edition = { workspace = true }
-license = { workspace = true }
-rust-version = { workspace = true }
-readme = "README.md"
-exclude = [".github", "std"]
-
-[lib]
-name = "rgbwallet"
-crate-type = ["cdylib", "rlib"] # We need this for WASM
-
-[dependencies]
-amplify = { workspace = true }
-baid58 = { workspace = true }
-commit_verify = { workspace = true }
-strict_encoding = { workspace = true }
-# descriptor-wallet = "0.10.0-alpha.1"
-bp-core = { workspace = true }
-rgb-core = { workspace = true }
-rgb-std = { version = "0.10.7", path = "std" }
-fluent-uri = "0.1.4"
-indexmap = "1.9.2"
-# TODO: This dependencies should be replaced with psbt package
-bitcoin = "0.30.0"
-chrono = "0.4.24"
-percent-encoding = "2.2.0"
-
-[features]
-default = []
-all = ["fs", "serde"]
-serde = ["rgb-std/serde", "rgb-core/serde"]
-fs = ["rgb-std/fs"]
-
-[target.'cfg(target_arch = "wasm32")'.dependencies]
-wasm-bindgen = "0.2"
-rand = { version = "0.8.4", optional = true }
-getrandom = { version = "0.2", features = ["js"] }
-
-[target.'cfg(target_arch = "wasm32")'.dev-dependencies]
-wasm-bindgen-test = "0.3"
-
-[package.metadata.docs.rs]
-features = [ "all" ]
+strict_encoding = "2.6.1"
+strict_types = "1.6.3"
+commit_verify = { version = "0.10.6", features = ["stl"] }
+bp-core = { version = "0.10.11", features = ["stl"] }
+bp-std = "0.10.0-beta.1"
+rgb-core = { version = "0.10.8", features = ["stl"] }
+cfg_eval = "0.1.2"
+serde_crate = { package = "serde", version = "1" }
+serde_with = "3.1.0"
+
+[patch.crates-io]
+rgb-core = { git = "https://github.com/RGB-WG/rgb-core", branch = "v0.10" }

invoice/Cargo.toml

@@ -0,0 +1,39 @@
+[package]
+name = "rgb-invoice"
+version = "0.11.0-alpha"
+description = "RGB smart contract invoicing library"
+keywords = ["bitcoin", "invoices", "rgb", "smart-contracts", "lnp-bp"]
+categories = ["cryptography::cryptocurrencies"]
+authors = { workspace = true }
+repository = { workspace = true }
+homepage = { workspace = true }
+edition = { workspace = true }
+license = { workspace = true }
+rust-version = { workspace = true }
+readme = "../README.md"
+
+[lib]
+name = "rgbinvoice"
+crate-type = ["cdylib", "rlib"] # We need this for WASM
+
+[dependencies]
+amplify = { workspace = true }
+baid58 = { workspace = true }
+strict_encoding = { workspace = true }
+bp-std = { workspace = true }
+rgb-std = { version = "0.11.0-alpha", path = "../std" }
+indexmap = "2.0.0"
+fluent-uri = "0.1.4"
+chrono = "0.4.24"
+percent-encoding = "2.2.0"
+
+[target.'cfg(target_arch = "wasm32")'.dependencies]
+wasm-bindgen = "0.2"
+rand = { version = "0.8.4", optional = true }
+getrandom = { version = "0.2", features = ["js"] }
+
+[target.'cfg(target_arch = "wasm32")'.dev-dependencies]
+wasm-bindgen-test = "0.3"
+
+[package.metadata.docs.rs]
+features = [ "all" ]

src/invoice/builder.rs → invoice/src/builder.rs

@@ -1,4 +1,4 @@
-// RGB wallet library for smart contracts on Bitcoin & Lightning network
+// RGB smart contract invoicing library
 //
 // SPDX-License-Identifier: Apache-2.0
 //
@@ -21,10 +21,9 @@
 
 use std::str::FromStr;
 
-use rgb::ContractId;
-use rgbstd::interface::TypedState;
-use rgbstd::stl::Precision;
-use rgbstd::Chain;
+use rgb::interface::TypedState;
+use rgb::stl::Precision;
+use rgb::{Chain, ContractId};
 
 use super::{Beneficiary, RgbInvoice, RgbTransport, TransportParseError};
 

src/invoice/invoice.rs → invoice/src/invoice.rs

@@ -1,4 +1,4 @@
-// RGB wallet library for smart contracts on Bitcoin & Lightning network
+// RGB smart contract invoicing library
 //
 // SPDX-License-Identifier: Apache-2.0
 //
@@ -19,11 +19,10 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-use bitcoin::Address;
+use bpstd::Address;
 use indexmap::IndexMap;
-use rgb::{AttachId, ContractId, SecretSeal};
-use rgbstd::interface::TypedState;
-use rgbstd::Chain;
+use rgb::interface::TypedState;
+use rgb::{AttachId, Chain, ContractId, SecretSeal};
 use strict_encoding::{FieldName, TypeName};
 
 #[derive(Clone, Eq, PartialEq, Hash, Debug)]

src/invoice/mod.rs → invoice/src/lib.rs

@@ -1,4 +1,4 @@
-// RGB wallet library for smart contracts on Bitcoin & Lightning network
+// RGB smart contract invoicing library
 //
 // SPDX-License-Identifier: Apache-2.0
 //
@@ -19,6 +19,11 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+#[macro_use]
+extern crate amplify;
+#[macro_use]
+extern crate strict_encoding;
+
 mod invoice;
 mod parse;
 mod builder;

src/invoice/parse.rs → invoice/src/parse.rs

@@ -1,4 +1,4 @@
-// RGB wallet library for smart contracts on Bitcoin & Lightning network
+// RGB smart contract invoicing library
 //
 // SPDX-License-Identifier: Apache-2.0
 //
@@ -23,14 +23,13 @@ use std::fmt::{self, Debug, Display, Formatter};
 use std::num::ParseIntError;
 use std::str::FromStr;
 
-use bitcoin::{Address, Network};
-use bp::Chain;
+use bpstd::{Address, AddressNetwork};
 use fluent_uri::enc::EStr;
 use fluent_uri::Uri;
 use indexmap::IndexMap;
 use percent_encoding::{utf8_percent_encode, AsciiSet, CONTROLS};
-use rgb::{ContractId, SecretSeal};
-use rgbstd::interface::TypedState;
+use rgb::interface::TypedState;
+use rgb::{Chain, ContractId, SecretSeal};
 use strict_encoding::{InvalidIdent, TypeName};
 
 use super::{Beneficiary, RgbInvoice, RgbTransport};
@@ -110,8 +109,8 @@ pub enum InvoiceParseError {
     Beneficiary(String),
 
     #[display(doc_comments)]
-    /// network {0} is not supported.
-    UnsupportedNetwork(Network),
+    /// network {0:?} is not supported.
+    UnsupportedNetwork(AddressNetwork),
 
     #[from]
     Num(ParseIntError),
@@ -298,13 +297,11 @@ impl FromStr for RgbInvoice {
                 (Ok(seal), Err(_)) => Beneficiary::BlindedSeal(seal),
                 (Err(_), Ok(addr)) => {
                     chain = Some(match addr.network {
-                        Network::Bitcoin => Chain::Bitcoin,
-                        Network::Testnet => Chain::Testnet3,
-                        Network::Signet => Chain::Signet,
-                        Network::Regtest => Chain::Regtest,
-                        unknown => return Err(InvoiceParseError::UnsupportedNetwork(unknown)),
+                        AddressNetwork::Mainnet => Chain::Bitcoin,
+                        AddressNetwork::Testnet => Chain::Testnet3,
+                        AddressNetwork::Regtest => Chain::Regtest,
                     });
-                    Beneficiary::WitnessUtxo(addr.assume_checked())
+                    Beneficiary::WitnessUtxo(addr)
                 }
                 (Err(_), Err(_)) => {
                     return Err(InvoiceParseError::Beneficiary(beneficiary_str.to_owned()));

psbt/Cargo.toml

@@ -0,0 +1,35 @@
+[package]
+name = "rgb-psbt"
+version = "0.11.0-alpha"
+description = "RGB smart contract invoicing library"
+keywords = ["bitcoin", "invoices", "rgb", "smart-contracts", "lnp-bp"]
+categories = ["cryptography::cryptocurrencies"]
+authors = { workspace = true }
+repository = { workspace = true }
+homepage = { workspace = true }
+edition = { workspace = true }
+license = { workspace = true }
+rust-version = { workspace = true }
+readme = "../README.md"
+
+[lib]
+name = "rgbpsbt"
+crate-type = ["cdylib", "rlib"] # We need this for WASM
+
+[dependencies]
+amplify = { workspace = true }
+baid58 = { workspace = true }
+bp-std = { workspace = true }
+psbt = "0.11.0"
+rgb-std = { version = "0.11.0-alpha", path = "../std" }
+
+[target.'cfg(target_arch = "wasm32")'.dependencies]
+wasm-bindgen = "0.2"
+rand = { version = "0.8.4", optional = true }
+getrandom = { version = "0.2", features = ["js"] }
+
+[target.'cfg(target_arch = "wasm32")'.dev-dependencies]
+wasm-bindgen-test = "0.3"
+
+[package.metadata.docs.rs]
+features = [ "all" ]

psbt/src/lib.rs

@@ -0,0 +1,14 @@
+pub fn add(left: usize, right: usize) -> usize {
+    left + right
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    #[test]
+    fn it_works() {
+        let result = add(2, 2);
+        assert_eq!(result, 4);
+    }
+}

scripts/typelib.sh

@@ -1,5 +1,5 @@
 #!/usr/bin/env bash
 
-cargo run --bin rgb-stl -- --sty
-cargo run --bin rgb-stl -- --stl
-cargo run --bin rgb-stl -- --sta
+cargo run -p rgb-stl --bin rgb-stl -- --sty
+cargo run -p rgb-stl --bin rgb-stl -- --stl
+cargo run -p rgb-stl --bin rgb-stl -- --sta