chore: refactor directory structure

RGB-WG · Nov 14, 2023 · 2cc9d53 · 2cc9d53
1 parent f3ccfeb
commit 2cc9d53
Show file tree

Hide file tree

Showing 12 changed files with 266 additions and 259 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -1,11 +1,11 @@
 [workspace]
 members = [
-    "runtime",
+    "cli",
     "fs",
     "."
 ]
 default-members = [
-    "runtime",
+    "cli",
     "fs",
     "."
 ]
@@ -39,47 +39,42 @@ serde_yaml = "0.9.19"
 log = { version = "0.4", features = ["max_level_trace", "release_max_level_debug"] }
 
 [package]
-name = "rgb-contracts"
-version = "0.10.1"
-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 }
+name = "rgb-runtime"
+version.workspace = true
+description = "RGB smart contracts wallet runtime"
+keywords.workspace = true
+categories.workspace = true
 readme = "README.md"
-exclude = [".github"]
+authors.workspace = true
+homepage.workspace = true
+repository.workspace = true
+rust-version.workspace = true
+edition.workspace = true
+license.workspace = true
 
-[[bin]]
-name = "rgb"
-path = "src/main.rs"
+[lib]
+name = "rgb_rt"
 
 [dependencies]
 amplify = { workspace = true }
-baid58 = { workspace = true }
-strict_types = { workspace = true, features = ["serde"] }
-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"] }
-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.4.6", features = ["derive", "env"] }
-shellexpand = "3.1.0"
-serde_crate = { workspace = true }
-serde_yaml = { workspace = true }
-toml = "0.8.2"
+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" }
+indexmap = { workspace = true }
+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",]
 
 [package.metadata.docs.rs]
 features = [ "all" ]

diff --git a/cli/Cargo.toml b/cli/Cargo.toml
@@ -0,0 +1,41 @@
+[package]
+name = "rgb-contracts"
+version = { workspace = true }
+description = "Command-line wallet for RGB smart contracts on Bitcoin"
+keywords = { workspace = true }
+categories = { workspace = true }
+readme = "../README.md"
+authors = { workspace = true }
+repository = { workspace = true }
+homepage = { workspace = true }
+rust-version = { workspace = true }
+edition = { workspace = true }
+license = { workspace = true }
+
+[[bin]]
+name = "rgb"
+path = "src/main.rs"
+
+[dependencies]
+amplify = { workspace = true }
+baid58 = { workspace = true }
+strict_types = { workspace = true, features = ["serde"] }
+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"] }
+rgb-invoice = { workspace = true }
+rgb-runtime = { version = "0.11.0-alpha", path = "..", features = ["log", "serde"] }
+log = { workspace = true }
+env_logger = "0.10.0"
+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 = []
diff --git a/src/args.rs → cli/src/args.rs b/src/args.rs → cli/src/args.rs
diff --git a/src/command.rs → cli/src/command.rs b/src/command.rs → cli/src/command.rs
diff --git a/src/main.rs → cli/src/main.rs b/src/main.rs → cli/src/main.rs
diff --git a/src/resolver.rs → cli/src/resolver.rs b/src/resolver.rs → cli/src/resolver.rs
diff --git a/runtime/Cargo.toml b/runtime/Cargo.toml
diff --git a/runtime/src/descriptor.rs → src/descriptor.rs b/runtime/src/descriptor.rs → src/descriptor.rs
diff --git a/runtime/src/descriptor_old.rs → src/descriptor_old.rs b/runtime/src/descriptor_old.rs → src/descriptor_old.rs
diff --git a/runtime/src/lib.rs → src/lib.rs b/runtime/src/lib.rs → src/lib.rs
diff --git a/runtime/src/runtime.rs → src/runtime.rs b/runtime/src/runtime.rs → src/runtime.rs