From 9f08238dcad38243bb9d7ba3deb9147fd59019d1 Mon Sep 17 00:00:00 2001
From: "daniil.frolov" <daniil.frolov@demlabs.net>
Date: Mon, 16 Jan 2023 18:01:51 +0700
Subject: [PATCH] [+] Added coin print in tx_history command output [+] Added
output of the hash of the block added to the chain in the TON network [*] Fix
node crash if use CLI command tx_history with -hash parameter [*] Fix
previous block hash output string
---
modules/consensus/block-ton/dap_chain_cs_block_ton.c | 5 +++++
modules/net/dap_chain_node_cli_cmd_tx.c | 10 ++++++++--
modules/type/blocks/dap_chain_cs_blocks.c | 2 +-
3 files changed, 14 insertions(+), 3 deletions(-)
diff --git a/modules/consensus/block-ton/dap_chain_cs_block_ton.c b/modules/consensus/block-ton/dap_chain_cs_block_ton.c
index 95984cb40d..4efff13824 100644
--- a/modules/consensus/block-ton/dap_chain_cs_block_ton.c
+++ b/modules/consensus/block-ton/dap_chain_cs_block_ton.c
@@ -698,6 +698,11 @@ static void s_session_candidate_to_chain(
}
else {
log_it(L_INFO, "TON: atom %s added in chain successfully", l_candidate_hash_str);
+ dap_chain_hash_fast_t l_block_hash;
+ dap_hash_fast(l_candidate, a_candidate_size, &l_block_hash);
+ char *l_block_hash_str = dap_chain_hash_fast_to_str_new(&l_block_hash);
+ log_it(L_INFO, "TON: block %s added in chain successfully", l_block_hash_str);
+
}
} break;
case ATOM_MOVE_TO_THRESHOLD: {
diff --git a/modules/net/dap_chain_node_cli_cmd_tx.c b/modules/net/dap_chain_node_cli_cmd_tx.c
index bb5b7f5ccc..398c39cbc2 100644
--- a/modules/net/dap_chain_node_cli_cmd_tx.c
+++ b/modules/net/dap_chain_node_cli_cmd_tx.c
@@ -548,7 +548,9 @@ char* dap_db_history_addr(dap_chain_addr_t *a_addr, dap_chain_t *a_chain, const
: dap_chain_tx_out_cond_subtype_to_str(
((dap_chain_tx_out_cond_t *)l_list_out->data)->header.subtype);
char *l_value_str = dap_chain_balance_print(l_value);
- dap_string_append_printf(l_str_out, "\tsend %s %s to %s\n",
+ char *l_coins_str = dap_chain_balance_to_coins(l_value);
+ dap_string_append_printf(l_str_out, "\tsend %s (%s) %s to %s\n",
+ l_coins_str,
l_value_str,
l_src_token ? l_src_token : "UNKNOWN",
l_dst_addr_str);
@@ -568,7 +570,9 @@ char* dap_db_history_addr(dap_chain_addr_t *a_addr, dap_chain_t *a_chain, const
: dap_chain_tx_out_cond_subtype_to_str(
l_src_subtype));
char *l_value_str = dap_chain_balance_print(l_value);
- dap_string_append_printf(l_str_out, "\trecv %s %s from %s\n",
+ char *l_coins_str = dap_chain_balance_to_coins(l_value);
+ dap_string_append_printf(l_str_out, "\trecv %s (%s) %s from %s\n",
+ l_coins_str,
l_value_str,
l_dst_token ? l_dst_token :
(l_src_token ? l_src_token : "UNKNOWN"),
@@ -983,6 +987,8 @@ int com_ledger(int a_argc, char ** a_argv, char **a_str_reply)
dap_cli_server_cmd_set_reply_text(a_str_reply, l_str_ret->str);
dap_string_free(l_str_ret, true);
}
+
+ return 0;
}
if (l_sub_cmd == SUB_CMD_LIST_LEDGER_BALANCE){
dap_string_t *l_str_ret = dap_chain_ledger_balance_info(l_ledger);
diff --git a/modules/type/blocks/dap_chain_cs_blocks.c b/modules/type/blocks/dap_chain_cs_blocks.c
index 7ada3a3b64..e8d19aefd4 100644
--- a/modules/type/blocks/dap_chain_cs_blocks.c
+++ b/modules/type/blocks/dap_chain_cs_blocks.c
@@ -307,7 +307,7 @@ static void s_cli_meta_hash_print( dap_string_t * a_str_tmp, const char * a_met
{
if(a_meta->hdr.data_size == sizeof (dap_chain_hash_fast_t) ){
char * l_hash_str = dap_chain_hash_fast_to_str_new( (dap_chain_hash_fast_t *) a_meta->data);
- dap_string_append_printf(a_str_tmp,"\t\tPREV: \"%s\": 0x%s\n", a_meta_title,l_hash_str);
+ dap_string_append_printf(a_str_tmp,"\t\tPREV: \"%s\": %s\n", a_meta_title,l_hash_str);
DAP_DELETE(l_hash_str);
}else{
char * l_data_hex = DAP_NEW_Z_SIZE(char,a_meta->hdr.data_size*2+3);
--
GitLab