From 2e64fe3144bd27082acf9dec0ff6d50621548808 Mon Sep 17 00:00:00 2001
From: "roman.khlopkov" <roman.khlopkov@demlabs.net>
Date: Wed, 19 Mar 2025 18:19:21 +0300
Subject: [PATCH] [*] History correction
---
modules/node-cli/dap_chain_node_cli_cmd_tx.c | 6 ++----
1 file changed, 2 insertions(+), 4 deletions(-)
diff --git a/modules/node-cli/dap_chain_node_cli_cmd_tx.c b/modules/node-cli/dap_chain_node_cli_cmd_tx.c
index c10e932cf7..bf6d854565 100644
--- a/modules/node-cli/dap_chain_node_cli_cmd_tx.c
+++ b/modules/node-cli/dap_chain_node_cli_cmd_tx.c
@@ -591,7 +591,7 @@ json_object* dap_db_history_addr(json_object* a_json_arr_reply, dap_chain_addr_t
if (l_src_addr && l_dst_addr &&
dap_chain_addr_compare(l_dst_addr, l_src_addr) &&
- dap_strcmp(l_noaddr_token, l_dst_token))
+ (!l_recv_from_cond || (l_noaddr_token && dap_strcmp(l_noaddr_token, l_dst_token))))
continue; // sent to self (coinback)
if (l_dst_addr && l_net_fee_used && dap_chain_addr_compare(&l_net_fee_addr, l_dst_addr))
@@ -727,9 +727,7 @@ json_object* dap_db_history_addr(json_object* a_json_arr_reply, dap_chain_addr_t
json_object_object_add(l_corr_object, "recv_datoshi", json_object_new_string(l_value_str));
}
if (l_send_to_same_cond) {
- json_object *l_cond_recv_value_obj = json_object_object_get(l_cond_recv_object, "recv_datoshi");
- const char *l_cond_recv_value_str = json_object_get_string(l_cond_recv_value_obj);
- uint256_t l_cond_recv_value = dap_uint256_scan_uninteger(l_cond_recv_value_str);
+ uint256_t l_cond_recv_value = l_cond_value;
json_object *l_cond_send_value_obj = json_object_object_get(l_cond_send_object, "send_datoshi");
const char *l_cond_send_value_str = json_object_get_string(l_cond_send_value_obj);
uint256_t l_cond_send_value = dap_uint256_scan_uninteger(l_cond_send_value_str);
--
GitLab