node and persistence init

Author: dr-orlovsky

Cargo.lock

@@ -34,17 +34,14 @@ native_model = "0.4.20"
 
 serde = { version = "1", features = ["derive"] }
 serde_yaml = "0.9.34"
+toml = "0.9.2"
 ciborium = "0.2.2"
 
 clap = { version = "4.4.8", features = ["derive", "env"] }
 clap_complete = "4.5.7"
 log = { version = "0.4" }
 loglevel = { version = "0.2.0" }
 shellexpand = { version = "3.1.0" }
-dotenv = { version = "0.15" }
-settings = { version = "0.14", package = "config" }
-configure_me = { version = "0.4" }
-configure_me_codegen = "0.4.4"
 
 [package]
 name = "rgb-node"
@@ -83,23 +80,22 @@ native_db.workspace = true
 native_model.workspace = true
 async-channel = { version = "2.3.1", optional = true }
 serde.workspace = true
+toml = { workspace = true, optional = true }
 log.workspace = true
 loglevel.workspace = true
 clap = { workspace = true, optional = true }
 shellexpand = { workspace = true, optional = true }
-settings = { workspace = true, optional = true }
-configure_me = { workspace = true, optional = true }
-dotenv = { workspace = true, optional = true }
 
 [build-dependencies]
 amplify.workspace = true
 bp-std.workspace = true
 rgb-rpc = { version = "0.12.0-alpha.1", path = "rpc" }
+serde.workspace = true
+toml.workspace = true
 clap.workspace = true
 clap_complete.workspace = true
 log.workspace = true
 shellexpand.workspace = true
-configure_me_codegen.workspace = true
 
 [features]
 default = []
@@ -108,7 +104,7 @@ all = ["server"]
 # Server is a standalone application that runs daemons.
 # Required for all apps that can be launched from a command-line shell as binaries
 # (i.e., both servers and cli)
-server = ["dep:dotenv", "dep:clap", "dep:settings", "dep:configure_me", "dep:shellexpand"]
+server = ["dep:clap", "dep:shellexpand", "dep:toml"]
 embedded = ["async-channel"]
 
 [package.metadata.configure_me]

Cargo.toml

@@ -27,6 +27,8 @@ compile_error!("Either `embedded` or `server` feature must be used");
 #[cfg(feature = "server")]
 #[macro_use]
 extern crate amplify;
+#[macro_use]
+extern crate serde;
 #[cfg(feature = "server")]
 #[macro_use]
 extern crate clap;
@@ -42,7 +44,7 @@ pub mod rgbnode {
 }
 
 #[cfg(feature = "server")]
-fn main() -> Result<(), configure_me_codegen::Error> {
+fn main() -> Result<(), clap::Error> {
     use std::fs;
 
     use clap::CommandFactory;
@@ -60,7 +62,6 @@ fn main() -> Result<(), configure_me_codegen::Error> {
         generate_to(Zsh, app, &name, outdir)?;
     }
 
-    // configure_me_codegen::build_script_auto()
     Ok(())
 }
 

build.rs

@@ -36,7 +36,6 @@ amplify.workspace = true
 clap.workspace = true
 clap_complete.workspace = true
 rgb-rpc = { version = "0.12.0-alpha.1", path = "../rpc" }
-configure_me_codegen.workspace = true
 
 [features]
 default = ["cli"]

client/Cargo.toml

@@ -34,7 +34,7 @@ pub mod cli {
     include!("src/args.rs");
 }
 
-fn main() -> Result<(), configure_me_codegen::Error> {
+fn main() -> Result<(), clap::Error> {
     let outdir = "../shell";
 
     fs::create_dir_all(outdir).expect("failed to create shell dir");
@@ -46,6 +46,5 @@ fn main() -> Result<(), configure_me_codegen::Error> {
         generate_to(Zsh, app, &name, outdir)?;
     }
 
-    // configure_me_codegen::build_script_auto()
     Ok(())
 }

client/build.rs

@@ -22,6 +22,7 @@
 use std::io::{Read, Write};
 
 use amplify::confinement::{SmallBlob, TinyBlob};
+use bpstd::Network;
 use netservices::Frame;
 use sonicapi::{CodexId, ContractId};
 
@@ -31,6 +32,9 @@ use crate::CiboriumError;
 #[display(UPPERCASE)]
 #[derive(Serialize, Deserialize)]
 pub enum RgbRpcReq {
+    #[display("HELLO({0})")]
+    Hello(Network),
+
     #[display("PING")]
     Ping(TinyBlob),
 

config_spec.toml

@@ -37,6 +37,9 @@ use crate::{CiboriumError, Failure, Status};
 #[derive(Clone, Debug, Display)]
 #[derive(Serialize, Deserialize)]
 pub enum RgbRpcResp {
+    #[display("MESSAGE({0})")]
+    Message(String),
+
     #[display("FAILURE({0})")]
     Failure(Failure),
 

rpc/src/request.rs

@@ -17,13 +17,14 @@ _rgb-node() {
     _arguments "${_arguments_options[@]}" : \
 '-d+[Location of the data directory]:DATA_DIR:_files -/' \
 '--data-dir=[Location of the data directory]:DATA_DIR:_files -/' \
+'-c+[]:CONFIG:_files -/' \
+'--config=[]:CONFIG:_files -/' \
 '-n+[Bitcoin network]:NETWORK:_default' \
 '--network=[Bitcoin network]:NETWORK:_default' \
 '*-l+[Address(es) to listen for client RPC connections]:LISTEN:_default' \
 '*--listen=[Address(es) to listen for client RPC connections]:LISTEN:_default' \
 '*-v[Set a verbosity level]' \
 '*--verbose[Set a verbosity level]' \
-'--no-network-prefix[Do not add network name as a prefix to the data directory]' \
 '-h[Print help (see more with '\''--help'\'')]' \
 '--help[Print help (see more with '\''--help'\'')]' \
 '-V[Print version]' \
@@ -41,11 +42,12 @@ _rgb-node() {
 _arguments "${_arguments_options[@]}" : \
 '-d+[Location of the data directory]:DATA_DIR:_files -/' \
 '--data-dir=[Location of the data directory]:DATA_DIR:_files -/' \
+'-c+[]:CONFIG:_files -/' \
+'--config=[]:CONFIG:_files -/' \
 '-n+[Bitcoin network]:NETWORK:_default' \
 '--network=[Bitcoin network]:NETWORK:_default' \
 '*-v[Set a verbosity level]' \
 '*--verbose[Set a verbosity level]' \
-'--no-network-prefix[Do not add network name as a prefix to the data directory]' \
 '-h[Print help (see more with '\''--help'\'')]' \
 '--help[Print help (see more with '\''--help'\'')]' \
 && ret=0

rpc/src/response.rs

@@ -23,13 +23,14 @@ Register-ArgumentCompleter -Native -CommandName 'rgb-node' -ScriptBlock {
         'rgb-node' {
             [CompletionResult]::new('-d', '-d', [CompletionResultType]::ParameterName, 'Location of the data directory')
             [CompletionResult]::new('--data-dir', '--data-dir', [CompletionResultType]::ParameterName, 'Location of the data directory')
+            [CompletionResult]::new('-c', '-c', [CompletionResultType]::ParameterName, 'c')
+            [CompletionResult]::new('--config', '--config', [CompletionResultType]::ParameterName, 'config')
             [CompletionResult]::new('-n', '-n', [CompletionResultType]::ParameterName, 'Bitcoin network')
             [CompletionResult]::new('--network', '--network', [CompletionResultType]::ParameterName, 'Bitcoin network')
             [CompletionResult]::new('-l', '-l', [CompletionResultType]::ParameterName, 'Address(es) to listen for client RPC connections')
             [CompletionResult]::new('--listen', '--listen', [CompletionResultType]::ParameterName, 'Address(es) to listen for client RPC connections')
             [CompletionResult]::new('-v', '-v', [CompletionResultType]::ParameterName, 'Set a verbosity level')
             [CompletionResult]::new('--verbose', '--verbose', [CompletionResultType]::ParameterName, 'Set a verbosity level')
-            [CompletionResult]::new('--no-network-prefix', '--no-network-prefix', [CompletionResultType]::ParameterName, 'Do not add network name as a prefix to the data directory')
             [CompletionResult]::new('-h', '-h', [CompletionResultType]::ParameterName, 'Print help (see more with ''--help'')')
             [CompletionResult]::new('--help', '--help', [CompletionResultType]::ParameterName, 'Print help (see more with ''--help'')')
             [CompletionResult]::new('-V', '-V ', [CompletionResultType]::ParameterName, 'Print version')
@@ -41,11 +42,12 @@ Register-ArgumentCompleter -Native -CommandName 'rgb-node' -ScriptBlock {
         'rgb-node;init' {
             [CompletionResult]::new('-d', '-d', [CompletionResultType]::ParameterName, 'Location of the data directory')
             [CompletionResult]::new('--data-dir', '--data-dir', [CompletionResultType]::ParameterName, 'Location of the data directory')
+            [CompletionResult]::new('-c', '-c', [CompletionResultType]::ParameterName, 'c')
+            [CompletionResult]::new('--config', '--config', [CompletionResultType]::ParameterName, 'config')
             [CompletionResult]::new('-n', '-n', [CompletionResultType]::ParameterName, 'Bitcoin network')
             [CompletionResult]::new('--network', '--network', [CompletionResultType]::ParameterName, 'Bitcoin network')
             [CompletionResult]::new('-v', '-v', [CompletionResultType]::ParameterName, 'Set a verbosity level')
             [CompletionResult]::new('--verbose', '--verbose', [CompletionResultType]::ParameterName, 'Set a verbosity level')
-            [CompletionResult]::new('--no-network-prefix', '--no-network-prefix', [CompletionResultType]::ParameterName, 'Do not add network name as a prefix to the data directory')
             [CompletionResult]::new('-h', '-h', [CompletionResultType]::ParameterName, 'Print help (see more with ''--help'')')
             [CompletionResult]::new('--help', '--help', [CompletionResultType]::ParameterName, 'Print help (see more with ''--help'')')
             break