From 3bad6ad42a26cf07f4fc38138925b76e1eda5ba1 Mon Sep 17 00:00:00 2001
From: "roman.padenkov" <roman.padenkov@demlabs.net>
Date: Tue, 28 Jan 2025 12:37:42 +0000
Subject: [PATCH] Hotfix 15332
---
modules/net/dap_chain_node_cli_cmd.c | 19 ++++++++++---------
1 file changed, 10 insertions(+), 9 deletions(-)
diff --git a/modules/net/dap_chain_node_cli_cmd.c b/modules/net/dap_chain_node_cli_cmd.c
index 97612190c4..62a0a69108 100644
--- a/modules/net/dap_chain_node_cli_cmd.c
+++ b/modules/net/dap_chain_node_cli_cmd.c
@@ -6269,7 +6269,8 @@ int com_tx_create(int a_argc, char **a_argv, void **a_json_arr_reply)
// int cmd_num = 1;
// const char *value_str = NULL;
const char *addr_base58_to = NULL;
- const char *str_tmp = NULL;
+ const char * l_fee_str = NULL;
+ const char * l_value_str = NULL;
const char * l_from_wallet_name = NULL;
const char * l_wallet_fee_name = NULL;
const char * l_token_ticker = NULL;
@@ -6318,14 +6319,14 @@ int com_tx_create(int a_argc, char **a_argv, void **a_json_arr_reply)
l_tx_num = strtoul(l_tx_num_str, NULL, 10);
// Validator's fee
- if (dap_cli_server_cmd_find_option_val(a_argv, arg_index, a_argc, "-fee", &str_tmp)) {
- if (!str_tmp) {
+ if (dap_cli_server_cmd_find_option_val(a_argv, arg_index, a_argc, "-fee", &l_fee_str)) {
+ if (!l_fee_str) {
dap_json_rpc_error_add(*a_json_arr_reply, DAP_CHAIN_NODE_CLI_COM_TX_CREATE_REQUIRE_FEE, "tx_create requires parameter '-fee'");
return DAP_CHAIN_NODE_CLI_COM_TX_CREATE_REQUIRE_FEE;
}
- l_value_fee = dap_chain_balance_scan(str_tmp);
+ l_value_fee = dap_chain_balance_scan(l_fee_str);
}
- if (IS_ZERO_256(l_value_fee) && (!l_emission_hash_str || (str_tmp && strcmp(str_tmp, "0")))) {
+ if (IS_ZERO_256(l_value_fee) && (!l_emission_hash_str || (l_fee_str && strcmp(l_fee_str, "0")))) {
dap_json_rpc_error_add(*a_json_arr_reply, DAP_CHAIN_NODE_CLI_COM_TX_CREATE_REQUIRE_FEE_IS_UINT256, "tx_create requires parameter '-fee' to be valid uint256");
return DAP_CHAIN_NODE_CLI_COM_TX_CREATE_REQUIRE_FEE_IS_UINT256;
}
@@ -6403,17 +6404,17 @@ int com_tx_create(int a_argc, char **a_argv, void **a_json_arr_reply)
return DAP_CHAIN_NODE_CLI_COM_TX_CREATE_TOKEN_NOT_DECLARATED_IN_NET;
}
dap_cli_server_cmd_find_option_val(a_argv, arg_index, a_argc, "-to_addr", &addr_base58_to);
- dap_cli_server_cmd_find_option_val(a_argv, arg_index, a_argc, "-value", &str_tmp);
+ dap_cli_server_cmd_find_option_val(a_argv, arg_index, a_argc, "-value", &l_value_str);
if (!addr_base58_to) {
dap_json_rpc_error_add(*a_json_arr_reply, DAP_CHAIN_NODE_CLI_COM_TX_CREATE_REQUIRE_PARAMETER_TO_ADDR, "tx_create requires parameter '-to_addr'");
return DAP_CHAIN_NODE_CLI_COM_TX_CREATE_REQUIRE_PARAMETER_TO_ADDR;
}
- if (!str_tmp) {
+ if (!l_value_str) {
dap_json_rpc_error_add(*a_json_arr_reply, DAP_CHAIN_NODE_CLI_COM_TX_CREATE_REQUIRE_PARAMETER_VALUE_OR_INVALID_FORMAT_VALUE, "tx_create requires parameter '-value' to be valid uint256 value");
return DAP_CHAIN_NODE_CLI_COM_TX_CREATE_REQUIRE_PARAMETER_VALUE_OR_INVALID_FORMAT_VALUE;
}
l_addr_el_count = dap_str_symbol_count(addr_base58_to, ',') + 1;
- l_value_el_count = dap_str_symbol_count(str_tmp, ',') + 1;
+ l_value_el_count = dap_str_symbol_count(l_value_str, ',') + 1;
if (l_addr_el_count != l_value_el_count) {
dap_json_rpc_error_add(*a_json_arr_reply, DAP_CHAIN_NODE_CLI_COM_TX_CREATE_REQUIRE_PARAMETER_VALUE_OR_INVALID_FORMAT_VALUE, "num of '-to_addr' and '-value' should be equal");
@@ -6425,7 +6426,7 @@ int com_tx_create(int a_argc, char **a_argv, void **a_json_arr_reply)
dap_json_rpc_error_add(*a_json_arr_reply, DAP_CHAIN_NODE_CLI_COM_GLOBAL_DB_MEMORY_ERR, c_error_memory_alloc);
return DAP_CHAIN_NODE_CLI_COM_GLOBAL_DB_MEMORY_ERR;
}
- char **l_value_array = dap_strsplit(str_tmp, ",", l_value_el_count);
+ char **l_value_array = dap_strsplit(l_value_str, ",", l_value_el_count);
if (!l_value_array) {
DAP_DELETE(l_value);
dap_json_rpc_error_add(*a_json_arr_reply, DAP_CHAIN_NODE_CLI_COM_GLOBAL_DB_PARAM_ERR, "Can't read '-to_addr' arg");
--
GitLab