Better debuggin output information

Author: dr-orlovsky

Cargo.lock

@@ -1,7 +1,7 @@
 [package]
 name = "rgb_node"
 description = "RGB node"
-version = "0.3.0-rc.1"
+version = "0.3.0"
 authors = ["Dr. Maxim Orlovsky <[email protected]>"]
 license = "MIT"
 keywords = ["bitcoin", "node", "layer-2", "smart-contracts", "rgb"]
@@ -42,7 +42,7 @@ internet2 = { version = "0.3.7", default-features = false, features = ["derive"]
 microservices = { version = "0.3.7", default-features = false }
 # Bitcoin
 bitcoin = "0.26"
-electrum-client = { version = "0.5.0-beta.1", optional = true, git = "https://github.com/LNP-BP/rust-electrum-client", branch = "bitcoin-0.26" }
+electrum-client = { version = "0.6", optional = true }
 # Rust language
 lazy_static = "1.4"
 nix = { version = "0.19", optional = true }
@@ -55,7 +55,7 @@ serde_with = { version = "1.5", optional = true }
 serde_json = { version = "1", optional = true }
 serde_yaml = { version = "0.8", optional = true }
 toml = { version = "0.5", optional = true }
-bech32 = { version = "0.7", optional = true }
+bech32 = "0.7"
 base64 = { version = "0.12", optional = true }
 # Congig & logging
 log = { version = "0.4", features = ["max_level_trace", "release_max_level_debug"] }

Cargo.toml

@@ -285,7 +285,7 @@ impl Command {
                     format!("{}", err),
                 )
             })?;
-        trace!("{:?}", strict_serialize(&consignment));
+        trace!("{:#?}", consignment);
 
         match &*runtime.validate(consignment)? {
             Reply::Failure(failure) => {
@@ -320,7 +320,7 @@ impl Command {
                     format!("{}", err),
                 )
             })?;
-        trace!("{:?}", strict_serialize(&consignment));
+        trace!("{:#?}", consignment);
 
         let api = if let Some((_, outpoint_hash)) = consignment.endpoints.get(0)
         {

sample/consignment.rgb

@@ -44,6 +44,7 @@ use crate::rpc::{
     stash::MergeRequest,
     Reply,
 };
+use crate::util::ToBech32Data;
 
 pub struct Runtime {
     /// Original configuration object
@@ -174,7 +175,11 @@ impl Runtime {
     }
 
     fn rpc_process(&mut self, raw: Vec<u8>) -> Result<Reply, Reply> {
-        trace!("Got {} bytes over ZMQ RPC: {:?}", raw.len(), raw);
+        trace!(
+            "Got {} bytes over ZMQ RPC: {:?}",
+            raw.len(),
+            raw.to_bech32data()
+        );
         let message = &*self.unmarshaller.unmarshall(&raw).map_err(|err| {
             error!("Error unmarshalling the data: {}", err);
             ServiceError::from_rpc(
@@ -516,6 +521,11 @@ impl Runtime {
         request: rpc::stash::Request,
     ) -> Result<Reply, ServiceErrorDomain> {
         let data = request.serialize();
+        trace!(
+            "Sending {} bytes to stashd: {}",
+            data.len(),
+            data.to_bech32data()
+        );
         self.stash_rpc.send_raw_message(data.borrow())?;
         let raw = self.stash_rpc.recv_raw_message()?;
         let reply = &*self.reply_unmarshaller.unmarshall(&raw)?.clone();

sample/dest_tx.psbt

@@ -37,6 +37,7 @@ use crate::error::{
 use crate::rpc::stash::{ConsignRequest, MergeRequest, Request};
 use crate::rpc::{reply, Reply};
 use crate::stashd::index::BTreeIndexConfig;
+use crate::util::ToBech32Data;
 
 pub struct Runtime {
     /// Original configuration object
@@ -149,15 +150,20 @@ impl Runtime {
         trace!("Preparing ZMQ RPC reply: {:?}", reply);
         let data = reply.serialize();
         trace!(
-            "Sending {} bytes back to the client over ZMQ RPC",
-            data.len()
+            "Sending {} bytes back to the client over ZMQ RPC: {}",
+            data.len(),
+            data.to_bech32data()
         );
         self.session_rpc.send_raw_message(&data)?;
         Ok(())
     }
 
     fn rpc_process(&mut self, raw: Vec<u8>) -> Result<Reply, Reply> {
-        trace!("Got {} bytes over ZMQ RPC: {:?}", raw.len(), raw);
+        trace!(
+            "Got {} bytes over ZMQ RPC: {:?}",
+            raw.len(),
+            raw.to_bech32data()
+        );
         let message = &*self.unmarshaller.unmarshall(&raw).map_err(|err| {
             ServiceError::from_rpc(ServiceErrorSource::Stash, err)
         })?;

src/cli/fungible.rs

@@ -0,0 +1,16 @@
+use bech32::ToBase32;
+
+pub trait ToBech32Data {
+    fn to_bech32data(&self) -> String;
+}
+
+pub trait FromBech32Data {
+    fn from_bech32data(data: String) -> Vec<u8>;
+}
+
+impl ToBech32Data for Vec<u8> {
+    fn to_bech32data(&self) -> String {
+        ::bech32::encode("data", self.to_base32())
+            .expect("HRP is hardcoded and can't fail")
+    }
+}

src/fungibled/runtime.rs

@@ -13,9 +13,11 @@
 
 #[macro_use]
 mod macros;
+mod bech32data;
 pub mod file;
 mod magic_numbers;
 mod seal_spec;
 
+pub use bech32data::{FromBech32Data, ToBech32Data};
 pub use magic_numbers::MagicNumber;
 pub use seal_spec::SealSpec;