From 9ea39c296c1099e20f90d7b5251e2a26042895fd Mon Sep 17 00:00:00 2001
From: "roman.khlopkov" <roman.khlopkov@demlabs.net>
Date: Tue, 16 Jan 2024 14:35:15 +0300
Subject: [PATCH] [*] tx_history adoptation fow new collect tx format
---
modules/net/dap_chain_node_cli_cmd_tx.c | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/modules/net/dap_chain_node_cli_cmd_tx.c b/modules/net/dap_chain_node_cli_cmd_tx.c
index af7f13a69b..07b4c9b059 100644
--- a/modules/net/dap_chain_node_cli_cmd_tx.c
+++ b/modules/net/dap_chain_node_cli_cmd_tx.c
@@ -344,8 +344,7 @@ json_object* dap_db_history_addr(dap_chain_addr_t *a_addr, dap_chain_t *a_chain,
bool l_base_tx = false, l_reward_collect = false;
const char *l_noaddr_token = NULL;
- dap_hash_fast_t l_tx_hash;
- dap_hash_fast(l_tx, dap_chain_datum_tx_get_size(l_tx), &l_tx_hash);
+ dap_hash_fast_t l_tx_hash = l_datum_iter->cur_hash;
const char *l_src_token = dap_ledger_tx_get_token_ticker_by_hash(l_ledger, &l_tx_hash);
int l_src_subtype = DAP_CHAIN_TX_OUT_COND_SUBTYPE_UNDEFINED;
@@ -525,6 +524,8 @@ json_object* dap_db_history_addr(dap_chain_addr_t *a_addr, dap_chain_t *a_chain,
} else if (!l_src_addr || dap_chain_addr_compare(l_src_addr, a_addr)) {
if (!l_dst_addr && ((dap_chain_tx_out_cond_t *)it->data)->header.subtype == l_src_subtype)\
continue;
+ if (!l_src_addr && l_dst_addr && !dap_chain_addr_comapre(l_dst_addr, &l_net_fee_addr))
+ continue;
if (!l_header_printed) {
s_tx_header_print(j_obj_tx, &l_tx_data_ht, l_tx, l_datum_iter->cur_atom_hash,
a_hash_out_type, l_ledger, &l_tx_hash, l_datum_iter->ret_code);
--
GitLab