rpc: implement network check and framing

Author: dr-orlovsky

Cargo.lock

@@ -28,14 +28,15 @@ io-reactor = "0.6.0"
 cyphernet = { version = "0.5.2", features = ["tor", "dns", "ed25519", "p2p-ed25519"] }
 microservices = { version = "0.12.0" }
 netservices = { version = "0.12.0-beta.1", features = ["eidolon", "reactor"] }
+indexmap = "2.10.0"
 crossbeam-channel = "0.5.15"
 native_db = "0.8.2"
 native_model = "0.4.20"
 
 serde = { version = "1", features = ["derive"] }
+serde_cbor_2 = "0.13.0"
 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"
@@ -80,6 +81,7 @@ native_db.workspace = true
 native_model.workspace = true
 async-channel = { version = "2.3.1", optional = true }
 serde.workspace = true
+serde_cbor_2.workspace = true
 toml = { workspace = true, optional = true }
 log.workspace = true
 loglevel.workspace = true

Cargo.toml

@@ -21,7 +21,7 @@ name = "rgbclient"
 
 [dependencies]
 amplify.workspace = true
-bp-std = { workspace = true, optional = true }
+bp-std.workspace = true
 rgb-rpc = { version = "0.12.0-alpha.1", path = "../rpc" }
 io-reactor.workspace = true
 netservices.workspace = true
@@ -33,12 +33,13 @@ serde_yaml = { workspace = true, optional = true }
 
 [build-dependencies]
 amplify.workspace = true
+bp-std.workspace = true
+rgb-rpc = { version = "0.12.0-alpha.1", path = "../rpc" }
 clap.workspace = true
 clap_complete.workspace = true
-rgb-rpc = { version = "0.12.0-alpha.1", path = "../rpc" }
 
 [features]
 default = ["cli"]
 all = ["log", "cli"]
-cli = ["dep:bp-std", "log", "dep:clap", "dep:shellexpand", "dep:serde_yaml"]
+cli = ["log", "dep:clap", "dep:shellexpand", "dep:serde_yaml"]
 log = ["dep:log", "dep:loglevel", "io-reactor/log", "netservices/log"]

client/Cargo.toml

@@ -19,18 +19,25 @@
 // or implied. See the License for the specific language governing permissions and limitations under
 // the License.
 
+use bpstd::Network;
 use rgbrpc::RemoteAddr;
 
-/// Command-line tool for working with the RGB daemon
+pub const RGB_NODE_NETWORK_ENV: &str = "RGB_NODE_NETWORK";
+
+/// Command-line tool for working with the RGB Node
 #[derive(Parser, Clone, PartialEq, Eq, Debug)]
-#[command(name = "bp-cli", bin_name = "bp-cli", author, version)]
+#[command(name = "rgb-cli", bin_name = "rgb-cli", author, version)]
 pub struct Args {
     /// Set a verbosity level
     ///
     /// Can be used multiple times to increase verbosity
     #[arg(short, long, global = true, action = clap::ArgAction::Count)]
     pub verbose: u8,
 
+    /// Bitcoin network
+    #[arg(short, long, global = true, default_value = "testnet4", env = RGB_NODE_NETWORK_ENV)]
+    pub network: Network,
+
     /// Remote address of the RGB node to connect to
     #[arg(short, long, default_value = "127.0.0.1:5343")]
     pub remote: RemoteAddr,

client/src/args.rs

@@ -26,11 +26,12 @@ use std::net::TcpStream;
 use std::process::exit;
 
 use amplify::confinement::TinyBlob;
+use bpstd::Network;
 use netservices::client::{
     Client, ClientCommand, ClientDelegate, ConnectionDelegate, OnDisconnect,
 };
 use netservices::{Frame, ImpossibleResource, NetSession, NetTransport};
-use rgbrpc::{RemoteAddr, RgbRpcReq, RgbRpcResp, Session};
+use rgbrpc::{AgentInfo, RemoteAddr, RgbRpcReq, RgbRpcResp, Session};
 
 pub struct Delegate {
     cb: fn(RgbRpcResp),
@@ -41,9 +42,11 @@ pub struct RgbClient {
 }
 
 impl RgbClient {
-    pub fn new(remote: RemoteAddr, cb: fn(RgbRpcResp)) -> io::Result<Self> {
+    pub fn new(remote: RemoteAddr, network: Network, cb: fn(RgbRpcResp)) -> io::Result<Self> {
         let delegate = Delegate { cb };
         let inner = Client::new::<_, Session, _>(delegate, remote)?;
+        let info = AgentInfo::new(network, "RGBNodeCLI", 0, 12, 0);
+        inner.send(RgbRpcReq::Hello(info))?;
         Ok(Self { inner })
     }
 

client/src/client.rs

@@ -48,7 +48,7 @@ fn main() -> Result<(), ExecError> {
     LogLevel::from_verbosity_flag_count(args.verbose).apply();
     trace!("Command-line arguments: {:#?}", &args);
 
-    let client = RgbClient::new(args.remote, cb)?;
+    let client = RgbClient::new(args.remote, args.network, cb)?;
 
     args.command.exec(client)
 }
@@ -60,12 +60,18 @@ fn cb(reply: RgbRpcResp) {
         }
         RgbRpcResp::Message(msg) => {
             println!("Message from RGB Node: {msg}");
+            return;
+        }
+        RgbRpcResp::Pong(_noise) => {
+            return;
         }
-        RgbRpcResp::Pong(_noise) => {}
         RgbRpcResp::Status(status) => {
             println!("{}", serde_yaml::to_string(&status).unwrap());
         }
         RgbRpcResp::Contracts(contracts) => {
+            if contracts.is_empty() {
+                println!("No contracts found");
+            }
             for contract in contracts {
                 println!("---");
                 println!("{}", serde_yaml::to_string(&contract).expect("Unable to generate YAML"));
@@ -78,6 +84,9 @@ fn cb(reply: RgbRpcResp) {
         RgbRpcResp::Wallets(wallets) => {
             println!("Wallets:");
             println!("Id\tName\tDescriptor class");
+            if wallets.is_empty() {
+                println!("No wallets found");
+            }
             for wallet in wallets {
                 println!("{}\t{}\t{}", wallet.id, wallet.name, wallet.descriptor.class())
             }

client/src/main.rs

@@ -18,12 +18,13 @@ amplify = { workspace = true, features = ["serde"] }
 strict_types = { workspace = true, features = ["serde"] }
 sonic-api = { workspace = true, features = ["serde"] }
 bp-std = { workspace = true, features = ["serde", "client-side-validation"] }
-bp-rpc = { workspace = true, features = ["serde"] }
 rgb-std = { workspace = true, features = ["serde"] }
 rgb-runtime = { workspace = true, features = ["serde"] }
+cyphernet = { workspace = true, features = ["serde"] }
 netservices.workspace = true
+indexmap = { workspace = true, features = ["serde"] }
 serde.workspace = true
-ciborium.workspace = true
+serde_cbor_2.workspace = true
 
 [features]
 default = []