From 4d03153f9cb3d7e6674ac7c28c1956c0f4b75a03 Mon Sep 17 00:00:00 2001
From: Michael Sutton <msutton@cs.huji.ac.il>
Date: Fri, 20 Sep 2024 01:58:28 +0300
Subject: [PATCH] A few CLI rpc query fixes (#563)

---
 cli/src/modules/rpc.rs   |  5 +++--
 rpc/core/src/model/tx.rs | 34 +++++++++++++++++++++++++++++++---
 2 files changed, 34 insertions(+), 5 deletions(-)

diff --git a/cli/src/modules/rpc.rs b/cli/src/modules/rpc.rs
index f96cb5b61..cf6bc6bd2 100644
--- a/cli/src/modules/rpc.rs
+++ b/cli/src/modules/rpc.rs
@@ -114,7 +114,8 @@ impl Rpc {
                 }
                 let hash = argv.remove(0);
                 let hash = RpcHash::from_hex(hash.as_str())?;
-                let result = rpc.get_block_call(None, GetBlockRequest { hash, include_transactions: true }).await?;
+                let include_transactions = argv.first().and_then(|x| x.parse::<bool>().ok()).unwrap_or(true);
+                let result = rpc.get_block_call(None, GetBlockRequest { hash, include_transactions }).await?;
                 self.println(&ctx, result);
             }
             // RpcApiOps::GetSubnetwork => {
@@ -126,7 +127,7 @@ impl Rpc {
                     return Err(Error::custom("Missing startHash argument"));
                 };
                 let start_hash = RpcHash::from_hex(argv.remove(0).as_str())?;
-                let include_accepted_transaction_ids = argv.remove(0).parse::<bool>().unwrap_or_default();
+                let include_accepted_transaction_ids = argv.first().and_then(|x| x.parse::<bool>().ok()).unwrap_or_default();
                 let result = rpc
                     .get_virtual_chain_from_block_call(
                         None,
diff --git a/rpc/core/src/model/tx.rs b/rpc/core/src/model/tx.rs
index c2b91f187..0c17e26f5 100644
--- a/rpc/core/src/model/tx.rs
+++ b/rpc/core/src/model/tx.rs
@@ -4,7 +4,7 @@ use kaspa_consensus_core::tx::{
     ScriptPublicKey, ScriptVec, TransactionId, TransactionIndexType, TransactionInput, TransactionOutpoint, TransactionOutput,
     UtxoEntry,
 };
-use kaspa_utils::serde_bytes_fixed_ref;
+use kaspa_utils::{hex::ToHex, serde_bytes_fixed_ref};
 use serde::{Deserialize, Serialize};
 use workflow_serializer::prelude::*;
 
@@ -131,7 +131,7 @@ impl Deserializer for RpcTransactionOutpoint {
 }
 
 /// Represents a Kaspa transaction input
-#[derive(Clone, Debug, Serialize, Deserialize)]
+#[derive(Clone, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
 pub struct RpcTransactionInput {
     pub previous_outpoint: RpcTransactionOutpoint,
@@ -142,6 +142,18 @@ pub struct RpcTransactionInput {
     pub verbose_data: Option<RpcTransactionInputVerboseData>,
 }
 
+impl std::fmt::Debug for RpcTransactionInput {
+    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+        f.debug_struct("RpcTransactionInput")
+            .field("previous_outpoint", &self.previous_outpoint)
+            .field("signature_script", &self.signature_script.to_hex())
+            .field("sequence", &self.sequence)
+            .field("sig_op_count", &self.sig_op_count)
+            .field("verbose_data", &self.verbose_data)
+            .finish()
+    }
+}
+
 impl From<TransactionInput> for RpcTransactionInput {
     fn from(input: TransactionInput) -> Self {
         Self {
@@ -277,7 +289,7 @@ impl Deserializer for RpcTransactionOutputVerboseData {
 }
 
 /// Represents a Kaspa transaction
-#[derive(Clone, Debug, Serialize, Deserialize)]
+#[derive(Clone, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
 pub struct RpcTransaction {
     pub version: u16,
@@ -292,6 +304,22 @@ pub struct RpcTransaction {
     pub verbose_data: Option<RpcTransactionVerboseData>,
 }
 
+impl std::fmt::Debug for RpcTransaction {
+    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+        f.debug_struct("RpcTransaction")
+            .field("version", &self.version)
+            .field("lock_time", &self.lock_time)
+            .field("subnetwork_id", &self.subnetwork_id)
+            .field("gas", &self.gas)
+            .field("payload", &self.payload.to_hex())
+            .field("mass", &self.mass)
+            .field("inputs", &self.inputs) // Inputs and outputs are placed purposely at the end for better debug visibility 
+            .field("outputs", &self.outputs)
+            .field("verbose_data", &self.verbose_data)
+            .finish()
+    }
+}
+
 impl Serializer for RpcTransaction {
     fn serialize<W: std::io::Write>(&self, writer: &mut W) -> std::io::Result<()> {
         store!(u16, &1, writer)?;