Initial work on v0.11

Cargo.toml

@@ -1,74 +1,89 @@
 [workspace]
 members = [
+    "runtime",
     "fs",
-    ".",
+    "."
 ]
 default-members = [
+    "runtime",
     "fs",
     "."
 ]
 
 [workspace.package]
+version = "0.11.0-alpha"
+keywords = ["bitcoin", "lightning", "rgb", "smart-contracts", "lnp-bp"]
+categories = ["cryptography::cryptocurrencies"]
 authors = ["Dr Maxim Orlovsky <orlovsky@lnp-bp.org>"]
-homepage = "https://github.com/RGB-WG"
-repository = "https://github.com/RGB-WG/rgb"
+homepage = "https://lnp-bp.org"
+repository = "https://github.com/RGB-WG/rgb-wallet"
 rust-version = "1.67" # Due to strict encoding library
 edition = "2021"
 license = "Apache-2.0"
 
 [workspace.dependencies]
-amplify = "4.0.0"
+amplify = "4.5.0"
 baid58 = "0.4.4"
-strict_encoding = "2.5.0"
-strict_types = "1.6.0"
-rgb-std = { version = "0.10.5", features = ["fs"] }
-rgb-wallet = { version = "0.10.5", features = ["fs"] }
+strict_encoding = "2.6.1"
+strict_types = "1.6.3"
+bp-dbc = "0.10.10"
+bp-std = "0.10.0-beta.1"
+bp-wallet = "0.10.0-beta.1"
+bp-utils = "0.10.0-beta.1"
+bp-esplora = "0.10.0-beta.1"
+rgb-std = { version = "0.11.0-alpha", features = ["fs"] }
+rgb-invoice = "0.11.0-alpha"
+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"] }
 
 [package]
-name = "rgb-contracts"
-version = "0.10.0-rc.4"
-description = " RGB: scalable & confidential smart contracts for Bitcoin & Lightning network"
-keywords = ["bitcoin", "lightning", "rgb", "smart-contracts", "lnp-bp"]
-categories = ["cryptography::cryptocurrencies"]
+name = "rgb-wallet"
+version = "0.11.0-alpha"
+description = "Command-line wallet for RGB smart contracts on Bitcoin"
+keywords = { workspace = true }
+categories = { workspace = true }
 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 = "rgb"
+exclude = [".github"]
 
 [[bin]]
 name = "rgb"
-required-features = ["cli"]
+path = "src/main.rs"
 
 [dependencies]
 amplify = { workspace = true }
 baid58 = { workspace = true }
 strict_types = { workspace = true, features = ["serde"] }
-commit_verify = "0.10.5"
-bp-core = { version = "0.10.7", features = ["serde"] }
-rgb-std = { workspace = true }
-rgb-wallet = { workspace = true }
-rgb-persist-fs = { version = "0.10.0", path = "fs" }
-bitcoin = { version = "0.30.0", features = ["serde"] }
-electrum-client = { version = "0.15.1", optional = true }
-log = { version = "0.4", features = ["max_level_trace", "release_max_level_debug"], optional = true }
+commit_verify = "0.10.6"
+bp-seals = "0.10.11"
+bp-std = { workspace = true, features = ["serde"] }
+bp-wallet = { workspace = true }
+bp-esplora = { workspace = true }
+bp-util = "0.10.0-beta.1"
+rgb-std = { workspace = true, features = ["serde", "descriptor"] }
+rgb-invoice = { workspace = true }
+rgb-runtime = { version = "0.11.0-alpha", path = "runtime", features = ["log", "serde"] }
+log = { workspace = true }
 env_logger = "0.10.0"
-clap = { version = "4.1.8", features = ["derive", "env"], optional = true }
-shellexpand = { version = "3.0.0", optional = true }
-serde = "1.0.159"
-serde_yaml = "0.9.19"
+clap = { version = "4.4.6", features = ["derive", "env"] }
+shellexpand = "3.1.0"
+serde_crate = { workspace = true }
+serde_yaml = { workspace = true }
+toml = "0.8.2"
 
 [features]
-default = ["electrum", "log"]
-all = ["cli", "log"]
-electrum = ["electrum-client", "log"]
-cli = ["clap", "shellexpand", "log", "electrum"]
+default = []
 
 [package.metadata.docs.rs]
 features = [ "all" ]
+
+[patch.crates-io]
+rgb-core = { git = "https://github.com/RGB-WG/rgb-core", branch = "v0.10" }
+rgb-std = { git = "https://github.com/RGB-WG/rgb-std", branch = "v0.11" }
+rgb-invoice = { git = "https://github.com/RGB-WG/rgb-std", branch = "v0.11" }

examples/rgb20-demo.yaml

@@ -28,5 +28,5 @@ globals:
 
 assignments:
   assetOwner:
-    seal: tapret1st:c9a86c99127f1b2d1ff495c238f13069ac881ec9527905016122d11d85b19b61:1
+    seal: tapret1st:ca43e9a01782343c78fa67cc20d75d81545a8d38a031d361180c36c088639fed:0
     amount: 100000000000000

fs/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "rgb-persist-fs"
-version = "0.10.0"
+version = "0.11.0"
 description = "RGB persistence drivers for file storage"
 keywords = ["bitcoin", "lightning", "rgb", "smart-contracts", "lnp-bp"]
 categories = ["cryptography::cryptocurrencies"]

fs/src/stock.rs

@@ -22,12 +22,12 @@
 use std::path::Path;
 
 use amplify::confinement::U32;
-use rgbstd::persistence::Stock;
+use rgb::persistence::Stock;
 use strict_encoding::{DeserializeError, SerializeError, StrictDeserialize, StrictSerialize};
 
 pub trait StockFs: Sized {
-    fn load(file: impl AsRef<Path>) -> Result<Self, DeserializeError>;
-    fn store(&self, file: impl AsRef<Path>) -> Result<(), SerializeError>;
+    fn load(path: impl AsRef<Path>) -> Result<Self, DeserializeError>;
+    fn store(&self, path: impl AsRef<Path>) -> Result<(), SerializeError>;
 }
 
 impl StockFs for Stock {

runtime/Cargo.toml

@@ -0,0 +1,36 @@
+[package]
+name = "rgb-runtime"
+version.workspace = true
+description = "RGB smart contracts wallet runtime"
+keywords.workspace = true
+categories.workspace = true
+readme = "../README.md"
+authors.workspace = true
+homepage.workspace = true
+repository.workspace = true
+rust-version.workspace = true
+edition.workspace = true
+license.workspace = true
+
+[lib]
+name = "rgb_rt"
+
+[dependencies]
+amplify = { workspace = true }
+strict_types = { workspace = true }
+bp-dbc = { workspace = true }
+bp-std = { workspace = true }
+bp-wallet = { workspace = true, features = ["fs"] }
+bp-esplora = { workspace = true, optional = true }
+descriptors = "=0.10.0-BP-beta.1"
+rgb-std = { workspace = true }
+rgb-persist-fs = { version = "0.11.0-alpha", path = "../fs" }
+serde_crate = { workspace = true, optional = true }
+serde_yaml = { workspace = true, optional = true }
+log = { workspace = true, optional = true }
+
+[features]
+default = []
+all = ["esplora",  "serde", "log"]
+esplora = ["bp-esplora", "bp-wallet/esplora"]
+serde = ["serde_crate", "serde_yaml", "bp-std/serde", "bp-wallet/serde",]

src/descriptor.rs → runtime/src/descriptor.rs

@@ -1,4 +1,4 @@
-// RGB smart contracts for Bitcoin & Lightning
+// RGB smart contract wallet runtime
 //
 // SPDX-License-Identifier: Apache-2.0
 //
@@ -30,15 +30,6 @@ use bp::dbc::tapret::{TapretCommitment, TapretPathProof, TapretProof};
 use bp::{ScriptPubkey, TapNodeHash};
 use commit_verify::ConvolveCommit;
 
-#[derive(Copy, Clone, PartialEq, Eq, PartialOrd, Ord, Hash, Debug, Display)]
-#[display("*/{app}/{index}")]
-#[derive(Serialize, Deserialize)]
-#[serde(rename_all = "camelCase")]
-pub struct TerminalPath {
-    pub app: u32,
-    pub index: u32,
-}
-
 #[derive(Clone, PartialEq, Eq, PartialOrd, Ord, Hash, Debug)]
 pub struct DeriveInfo {
     pub terminal: TerminalPath,

src/lib.rs → runtime/src/lib.rs

@@ -1,4 +1,4 @@
-// RGB smart contracts for Bitcoin & Lightning
+// RGB smart contract wallet runtime
 //
 // SPDX-License-Identifier: Apache-2.0
 //
@@ -24,23 +24,9 @@ extern crate amplify;
 #[cfg(feature = "log")]
 #[macro_use]
 extern crate log;
-#[macro_use]
-extern crate serde;
+#[cfg(feature = "serde")]
+extern crate serde_crate as serde;
 
-mod descriptor;
 mod runtime;
-mod wallet;
-
-pub mod prelude {
-    pub use descriptor::{RgbDescr, SpkDescriptor, Tapret, TerminalPath};
-    pub use rgbfs::StockFs;
-    pub use rgbstd::*;
-    pub use rgbwallet::*;
-    pub use runtime::{Runtime, RuntimeError};
-    #[cfg(feature = "electrum")]
-    pub use wallet::BlockchainResolver;
-    pub use wallet::{DefaultResolver, RgbWallet};
 
-    pub use super::*;
-}
-pub use prelude::*;
+pub use runtime::{Runtime, RuntimeError};