diff --git a/modules/net/dap_chain_node.c b/modules/net/dap_chain_node.c
index 143647a2284176a20825c609fb1c7707eb3af933..749937380ec332edeabf35a7b4b59ca6087787c6 100644
--- a/modules/net/dap_chain_node.c
+++ b/modules/net/dap_chain_node.c
@@ -304,10 +304,10 @@ void dap_chain_node_mempool_periodic(void *a_param)
l_mempool_auto = dap_config_get_item_bool_default(g_config, "mempool", "auto_proc", l_mempool_auto_default);
if (l_mempool_auto) {
- //dap_chain_t *l_chain;
- //DL_FOREACH(l_net_list[i]->pub.chains, l_chain) {
- // dap_chain_node_mempool_process(l_chain, l_role);
- //}
+ dap_chain_t *l_chain;
+ DL_FOREACH(l_net_list[i]->pub.chains, l_chain) {
+ dap_chain_node_mempool_process(l_chain, l_role);
+ }
}
}
DAP_DELETE(l_net_list);
diff --git a/modules/net/dap_chain_node_cli_cmd_tx.c b/modules/net/dap_chain_node_cli_cmd_tx.c
index 714bfe89c91dea18ef8cf2ba4e1e0c3de78ac511..c34c4e7e817e7b5ea945fdadd717d4e4b9c8a01a 100644
--- a/modules/net/dap_chain_node_cli_cmd_tx.c
+++ b/modules/net/dap_chain_node_cli_cmd_tx.c
@@ -447,12 +447,16 @@ char* dap_db_history_addr(dap_chain_addr_t * a_addr, dap_chain_t * a_chain, cons
if(l_tx_data && !memcmp(&l_tx_data->addr, a_addr, sizeof(dap_chain_addr_t))) {
dap_list_t *l_records_tmp = l_records_out;
while(l_records_tmp) {
- char *tx_hash_base58_str = dap_enc_base58_from_hex_str_to_str( l_tx_data->tx_hash_str);
+ char *tx_hash_str;
+ if(!dap_strcmp(a_hash_out_type,"hex"))
+ tx_hash_str = dap_strdup( l_tx_data->tx_hash_str);
+ else
+ tx_hash_str = dap_enc_base58_from_hex_str_to_str( l_tx_data->tx_hash_str);
const dap_chain_tx_out_t *l_tx_out = (const dap_chain_tx_out_t*) l_records_tmp->data;
if(!dap_strcmp(a_hash_out_type,"hex")){
dap_string_append_printf(l_str_out, "tx hash %s \n emit %lu %s\n",
- tx_hash_base58_str,//l_tx_data->tx_hash_str,
+ tx_hash_str,//l_tx_data->tx_hash_str,
l_tx_out->header.value,
l_tx_data->token_ticker);
}
@@ -462,7 +466,7 @@ char* dap_db_history_addr(dap_chain_addr_t * a_addr, dap_chain_t * a_chain, cons
l_tx_out->header.value,
l_tx_data->token_ticker);
}
- DAP_DELETE(tx_hash_base58_str);
+ DAP_DELETE(tx_hash_str);
l_records_tmp = dap_list_next(l_records_tmp);
}
}
@@ -556,11 +560,15 @@ char* dap_db_history_addr(dap_chain_addr_t * a_addr, dap_chain_t * a_chain, cons
bool l_is_use_dst_addr = false;
if(!memcmp(&l_tx_prev_out->addr, a_addr, sizeof(dap_chain_addr_t)))
l_is_use_dst_addr = true;
- char *tx_hash_base58_str = dap_enc_base58_from_hex_str_to_str( l_tx_data->tx_hash_str);
+ char *tx_hash_str;
+ if(!dap_strcmp(a_hash_out_type, "hex"))
+ tx_hash_str = dap_strdup(l_tx_data->tx_hash_str);
+ else
+ tx_hash_str = dap_enc_base58_from_hex_str_to_str(l_tx_data->tx_hash_str);
if(l_is_use_src_addr && !l_is_use_dst_addr) {
dap_string_append_printf(l_str_out,
"tx hash %s \n %s in send %lu %s from %s\n to %s\n",
- tx_hash_base58_str,//l_tx_data->tx_hash_str,
+ tx_hash_str,//l_tx_data->tx_hash_str,
l_time_str ? l_time_str : "",
l_tx_prev_out->header.value,
l_tx_data->token_ticker,
@@ -570,13 +578,13 @@ char* dap_db_history_addr(dap_chain_addr_t * a_addr, dap_chain_t * a_chain, cons
if(!l_src_str_is_cur)
dap_string_append_printf(l_str_out,
"tx hash %s \n %s in recv %lu %s from %s\n",
- tx_hash_base58_str,//l_tx_data->tx_hash_str,
+ tx_hash_str,//l_tx_data->tx_hash_str,
l_time_str ? l_time_str : "",
l_tx_prev_out->header.value,
l_tx_data->token_ticker,
l_src_str ? l_src_str : "");
}
- DAP_DELETE(tx_hash_base58_str);
+ DAP_DELETE(tx_hash_str);
DAP_DELETE(l_dst_to_str);
}
dap_list_free(l_list_out_prev_items);
@@ -593,12 +601,16 @@ char* dap_db_history_addr(dap_chain_addr_t * a_addr, dap_chain_t * a_chain, cons
char *l_addr_str = (l_tx_out) ? dap_chain_addr_to_str(&l_tx_out->addr) : NULL;
- char *tx_hash_base58_str = dap_enc_base58_from_hex_str_to_str( l_tx_data->tx_hash_str);
+ char *tx_hash_str;
+ if(!dap_strcmp(a_hash_out_type, "hex"))
+ tx_hash_str = dap_strdup(l_tx_data->tx_hash_str);
+ else
+ tx_hash_str = dap_enc_base58_from_hex_str_to_str(l_tx_data->tx_hash_str);
if(!memcmp(&l_tx_out->addr, a_addr, sizeof(dap_chain_addr_t))) {
if(!l_src_str_is_cur)
dap_string_append_printf(l_str_out,
"tx hash %s \n %s recv %lu %s from %s\n",
- tx_hash_base58_str,//l_tx_data->tx_hash_str,
+ tx_hash_str,//l_tx_data->tx_hash_str,
l_time_str ? l_time_str : "",
l_tx_out->header.value,
l_tx_data_prev->token_ticker,
@@ -609,14 +621,14 @@ char* dap_db_history_addr(dap_chain_addr_t * a_addr, dap_chain_t * a_chain, cons
else {
dap_string_append_printf(l_str_out,
"tx hash %s \n %s send %lu %s to %s\n",
- tx_hash_base58_str,//l_tx_data->tx_hash_str,
+ tx_hash_str,//l_tx_data->tx_hash_str,
l_time_str ? l_time_str : "",
l_tx_out->header.value,
l_tx_data_prev->token_ticker,
l_addr_str ? l_addr_str : "");
l_list_in_items2_tmp = NULL;
}
- DAP_DELETE(tx_hash_base58_str);
+ DAP_DELETE(tx_hash_str);
DAP_DELETE(l_addr_str);
}