From 972ccbbe16d8f8aba56223e8ba5cbefe716e373a Mon Sep 17 00:00:00 2001
From: "alexey.stratulat" <alexey.stratulat@demlabs.net>
Date: Mon, 1 Jul 2024 08:56:59 +0000
Subject: [PATCH] Bugfix 12118
---
modules/net/dap_chain_node_cli_cmd.c | 12 +++++++++---
modules/type/blocks/dap_chain_cs_blocks.c | 2 +-
2 files changed, 10 insertions(+), 4 deletions(-)
diff --git a/modules/net/dap_chain_node_cli_cmd.c b/modules/net/dap_chain_node_cli_cmd.c
index 6d3267ed48..b914e38567 100644
--- a/modules/net/dap_chain_node_cli_cmd.c
+++ b/modules/net/dap_chain_node_cli_cmd.c
@@ -6900,14 +6900,18 @@ int com_tx_create(int a_argc, char **a_argv, void **reply)
}
dap_chain_wallet_t * l_wallet = dap_chain_wallet_open(l_from_wallet_name, c_wallets_path, NULL);
+ json_object *l_jobj_result = json_object_new_object();
if(!l_wallet) {
dap_json_rpc_error_add(DAP_CHAIN_NODE_CLI_COM_TX_CREATE_WALLET_DOES_NOT_EXIST,
"wallet %s does not exist", l_from_wallet_name);
return DAP_CHAIN_NODE_CLI_COM_TX_CREATE_WALLET_DOES_NOT_EXIST;
} else {
- json_object *l_jobj_check_wallet = json_object_new_string(dap_chain_wallet_check_sign(l_wallet));
- json_object_array_add(*reply, l_jobj_check_wallet);
+ const char *l_wallet_check_str = dap_chain_wallet_check_sign(l_wallet);
+ if (dap_strcmp(l_wallet_check_str, "") != 0) {
+ json_object *l_obj_wgn_str = json_object_new_string(l_wallet_check_str);
+ json_object_object_add(l_jobj_result, "warning", l_obj_wgn_str);
+ }
}
const dap_chain_addr_t *addr_from = (const dap_chain_addr_t *) dap_chain_wallet_get_addr(l_wallet, l_net->pub.id);
@@ -6916,6 +6920,7 @@ int com_tx_create(int a_argc, char **a_argv, void **reply)
dap_chain_wallet_close(l_wallet);
dap_enc_key_delete(l_priv_key);
dap_json_rpc_error_add(DAP_CHAIN_NODE_CLI_COM_TX_CREATE_SOURCE_ADDRESS_INVALID, "source address is invalid");
+ json_object_put(l_jobj_result);
return DAP_CHAIN_NODE_CLI_COM_TX_CREATE_SOURCE_ADDRESS_INVALID;
}
@@ -6924,6 +6929,7 @@ int com_tx_create(int a_argc, char **a_argv, void **reply)
dap_chain_wallet_close(l_wallet);
dap_enc_key_delete(l_priv_key);
dap_json_rpc_error_add(DAP_CHAIN_NODE_CLI_COM_TX_CREATE_EQ_SOURCE_DESTINATION_ADDRESS, "The transaction cannot be directed to the same address as the source.");
+ json_object_put(l_jobj_result);
return DAP_CHAIN_NODE_CLI_COM_TX_CREATE_EQ_SOURCE_DESTINATION_ADDRESS;
}
@@ -6946,13 +6952,13 @@ int com_tx_create(int a_argc, char **a_argv, void **reply)
" Please, change network name or wallet address",
l_addr_to->net_id.uint64, l_allowed_list->str);
dap_string_free(l_allowed_list, true);
+ json_object_put(l_jobj_result);
return DAP_CHAIN_NODE_CLI_COM_TX_CREATE_DESTINATION_NETWORK_IS_UNREACHEBLE;
}
}
json_object *l_jobj_transfer_status = NULL;
json_object *l_jobj_tx_hash = NULL;
- json_object *l_jobj_result = json_object_new_object();
l_priv_key = dap_chain_wallet_get_key(l_wallet, 0);
if(l_tx_num){
diff --git a/modules/type/blocks/dap_chain_cs_blocks.c b/modules/type/blocks/dap_chain_cs_blocks.c
index 99ea171cf9..cfb21ce18b 100644
--- a/modules/type/blocks/dap_chain_cs_blocks.c
+++ b/modules/type/blocks/dap_chain_cs_blocks.c
@@ -1139,7 +1139,7 @@ static int s_cli_blocks(int a_argc, char ** a_argv, void **a_str_reply)
l_hash_tx = dap_chain_mempool_tx_reward_create(l_blocks, l_cert->enc_key, l_addr, l_block_list, l_fee_value, l_hash_out_type);
if (l_hash_tx) {
json_object* json_obj_out = json_object_new_object();
- sprintf(l_tmp_buff, "TX for %s collection created succefully, hash = %s\n", l_subcmd_str, l_hash_tx);
+ sprintf(l_tmp_buff, "TX for %s collection created successfully, hash = %s\n", l_subcmd_str, l_hash_tx);
json_object_object_add(json_obj_out, "status", json_object_new_string(l_tmp_buff));
json_object_array_add(*json_arr_reply, json_obj_out);
DAP_DELETE(l_hash_tx);
--
GitLab