From 0bd119e2ba166bd10ae4759883b5c063b9821c9e Mon Sep 17 00:00:00 2001
From: Roman Khlopkov <roman.khlopkov@demlabs.net>
Date: Tue, 28 Mar 2023 20:16:29 +0300
Subject: [PATCH] [*] Anchors loading fix
---
.../consensus/esbocs/dap_chain_cs_esbocs.c | 4 +-
modules/net/dap_chain_net_anchor.c | 4 +-
modules/net/dap_chain_net_decree.c | 24 +++++----
modules/net/dap_chain_node_cli_cmd.c | 2 +-
.../stake_lock/dap_chain_net_srv_stake_lock.c | 16 +++---
.../dap_chain_net_srv_stake_pos_delegate.c | 50 +++++++++----------
.../xchange/dap_chain_net_srv_xchange.c | 44 ++++++++--------
7 files changed, 75 insertions(+), 69 deletions(-)
diff --git a/modules/consensus/esbocs/dap_chain_cs_esbocs.c b/modules/consensus/esbocs/dap_chain_cs_esbocs.c
index 682642546c..d629ee4c9e 100644
--- a/modules/consensus/esbocs/dap_chain_cs_esbocs.c
+++ b/modules/consensus/esbocs/dap_chain_cs_esbocs.c
@@ -1686,7 +1686,7 @@ static int s_cli_esbocs(int a_argc, char ** a_argv, char **a_str_reply)
dap_cli_server_cmd_find_option_val(a_argv, l_arg_index, a_argc, "-cert", &l_cert_str);
if (!l_cert_str) {
- dap_cli_server_cmd_set_reply_text(a_str_reply, "Command 'min_validators_count' required parameter -cert");
+ dap_cli_server_cmd_set_reply_text(a_str_reply, "Command 'min_validators_count' requires parameter -cert");
return -3;
}
dap_cert_t *l_poa_cert = dap_cert_find_by_name(l_cert_str);
@@ -1697,7 +1697,7 @@ static int s_cli_esbocs(int a_argc, char ** a_argv, char **a_str_reply)
dap_cli_server_cmd_find_option_val(a_argv, l_arg_index, a_argc, "-val_count", &l_value_str);
if (!l_value_str) {
- dap_cli_server_cmd_set_reply_text(a_str_reply, "Command 'min_validators_count' required parameter -val_count");
+ dap_cli_server_cmd_set_reply_text(a_str_reply, "Command 'min_validators_count' requires parameter -val_count");
return -9;
}
uint256_t l_value = dap_chain_balance_scan(l_value_str);
diff --git a/modules/net/dap_chain_net_anchor.c b/modules/net/dap_chain_net_anchor.c
index 7480663f78..fa330f1ef7 100644
--- a/modules/net/dap_chain_net_anchor.c
+++ b/modules/net/dap_chain_net_anchor.c
@@ -97,7 +97,9 @@ int dap_chain_net_anchor_verify(dap_chain_datum_anchor_t * a_anchor, size_t a_da
{
DAP_DELETE(l_signs_arr);
DAP_DELETE(l_unique_signs);
- log_it(L_WARNING,"Can't get decree by hash");
+ char *l_decree_hash_str = dap_hash_fast_to_str_new(&l_decree_hash);
+ log_it(L_WARNING,"Can't get decree by hash %s", l_decree_hash_str);
+ DAP_DELETE(l_decree_hash_str);
return DAP_CHAIN_CS_VERIFY_CODE_NO_DECREE;
}
diff --git a/modules/net/dap_chain_net_decree.c b/modules/net/dap_chain_net_decree.c
index 190fffd2d7..fb2b1239ce 100644
--- a/modules/net/dap_chain_net_decree.c
+++ b/modules/net/dap_chain_net_decree.c
@@ -283,11 +283,13 @@ int dap_chain_net_decree_apply(dap_hash_fast_t *a_decree_hash, dap_chain_datum_d
if (!a_decree) {
HASH_FIND(hh, s_decree_hh, a_decree_hash, sizeof(dap_hash_fast_t), l_decree_hh);
if (!l_decree_hh) {
- log_it(L_WARNING,"Decree is not found.");
+ char *l_decree_hash_str = dap_hash_fast_to_str_new(a_decree_hash);
+ log_it(L_WARNING, "Decree with hash %s is not found", l_decree_hash_str);
+ DAP_DELETE(l_decree_hash_str);
return -110;
}
if (l_decree_hh->is_applied) {
- log_it(L_WARNING,"Decree already applyed.");
+ log_it(L_WARNING,"Decree already applyed");
return -111;
}
} else {
@@ -295,10 +297,13 @@ int dap_chain_net_decree_apply(dap_hash_fast_t *a_decree_hash, dap_chain_datum_d
l_decree_hh->decree = DAP_DUP_SIZE(a_decree, dap_chain_datum_decree_get_size(a_decree));
l_decree_hh->key = *a_decree_hash;
HASH_ADD(hh, s_decree_hh, key, sizeof(dap_hash_fast_t), l_decree_hh);
+ if (a_decree->header.common_decree_params.chain_id.uint64 != a_chain->id.uint64)
+ // Apply it with corresponding anchor
+ return ret_val;
}
// Process decree
- switch(a_decree->header.type) {
+ switch(l_decree_hh->decree->header.type) {
case DAP_CHAIN_DATUM_DECREE_TYPE_COMMON:
ret_val = s_common_decree_handler(l_decree_hh->decree, l_net, a_chain, true);
break;
@@ -309,6 +314,11 @@ int dap_chain_net_decree_apply(dap_hash_fast_t *a_decree_hash, dap_chain_datum_d
ret_val = -100;
}
+ if (!ret_val)
+ l_decree_hh->is_applied = true;
+ else
+ log_it(L_ERROR,"Decree applying failed!");
+
return ret_val;
}
@@ -337,13 +347,7 @@ int dap_chain_net_decree_load(dap_chain_datum_decree_t * a_decree, dap_chain_t *
return ret_val;
}
- if (a_decree->header.common_decree_params.chain_id.uint64 == a_chain->id.uint64) {
- ret_val = dap_chain_net_decree_apply(&l_hash, a_decree, a_chain);
- if (ret_val)
- log_it(L_ERROR,"Decree applying failed!");
- }
-
- return ret_val;
+ return dap_chain_net_decree_apply(&l_hash, a_decree, a_chain);
}
dap_chain_datum_decree_t *dap_chain_net_decree_get_by_hash(dap_hash_fast_t *a_hash, bool *is_applied)
diff --git a/modules/net/dap_chain_node_cli_cmd.c b/modules/net/dap_chain_node_cli_cmd.c
index 38af819d4c..ff6f17506b 100644
--- a/modules/net/dap_chain_node_cli_cmd.c
+++ b/modules/net/dap_chain_node_cli_cmd.c
@@ -3082,7 +3082,7 @@ static int s_parse_common_token_decl_arg(int a_argc, char ** a_argv, char ** a_s
return -1;
}
} else if (a_update_token) {
- dap_cli_server_cmd_set_reply_text(a_str_reply,"update_token command required parameter:\n-type <CF20 or private>");
+ dap_cli_server_cmd_set_reply_text(a_str_reply,"update_token command requires parameter:\n-type <CF20 or private>");
return -1;
}
diff --git a/modules/service/stake_lock/dap_chain_net_srv_stake_lock.c b/modules/service/stake_lock/dap_chain_net_srv_stake_lock.c
index aa27af848e..9434850853 100644
--- a/modules/service/stake_lock/dap_chain_net_srv_stake_lock.c
+++ b/modules/service/stake_lock/dap_chain_net_srv_stake_lock.c
@@ -713,7 +713,7 @@ static void s_error_handler(enum error_code errorCode, dap_string_t *output_line
switch (errorCode)
{
case NET_ARG_ERROR: {
- dap_string_append_printf(output_line, "stake_lock command required parameter -net");
+ dap_string_append_printf(output_line, "stake_lock command requires parameter -net");
} break;
case NET_ERROR: {
@@ -721,7 +721,7 @@ static void s_error_handler(enum error_code errorCode, dap_string_t *output_line
} break;
case TOKEN_ARG_ERROR: {
- dap_string_append_printf(output_line, "stake_lock command required parameter -token");
+ dap_string_append_printf(output_line, "stake_lock command requires parameter -token");
} break;
case TOKEN_ERROR: {
@@ -729,7 +729,7 @@ static void s_error_handler(enum error_code errorCode, dap_string_t *output_line
} break;
case COINS_ARG_ERROR: {
- dap_string_append_printf(output_line, "stake_lock command required parameter -coins");
+ dap_string_append_printf(output_line, "stake_lock command requires parameter -coins");
} break;
case COINS_FORMAT_ERROR: {
@@ -737,7 +737,7 @@ static void s_error_handler(enum error_code errorCode, dap_string_t *output_line
} break;
case ADDR_ARG_ERROR: {
- dap_string_append_printf(output_line, "stake_lock command required parameter -addr_holder");
+ dap_string_append_printf(output_line, "stake_lock command requires parameter -addr_holder");
} break;
case ADDR_FORMAT_ERROR: {
@@ -745,7 +745,7 @@ static void s_error_handler(enum error_code errorCode, dap_string_t *output_line
} break;
case CERT_ARG_ERROR: {
- dap_string_append_printf(output_line, "stake_lock command required parameter -cert");
+ dap_string_append_printf(output_line, "stake_lock command requires parameter -cert");
} break;
case CERT_LOAD_ERROR: {
@@ -772,7 +772,7 @@ static void s_error_handler(enum error_code errorCode, dap_string_t *output_line
} break;
case WALLET_ARG_ERROR: {
- dap_string_append_printf(output_line, "stake_lock command required parameter -wallet");
+ dap_string_append_printf(output_line, "stake_lock command requires parameter -wallet");
} break;
case WALLET_OPEN_ERROR: {
@@ -788,7 +788,7 @@ static void s_error_handler(enum error_code errorCode, dap_string_t *output_line
} break;
case TX_ARG_ERROR: {
- dap_string_append_printf(output_line, "stake_lock command required parameter -tx");
+ dap_string_append_printf(output_line, "stake_lock command requires parameter -tx");
} break;
case HASH_IS_BLANK_ERROR: {
@@ -872,7 +872,7 @@ static void s_error_handler(enum error_code errorCode, dap_string_t *output_line
} break;
case FEE_ARG_ERROR: {
- dap_string_append_printf(output_line, "stake_lock command required parameter -fee");
+ dap_string_append_printf(output_line, "stake_lock command requires parameter -fee");
} break;
case FEE_FORMAT_ERROR: {
diff --git a/modules/service/stake_pos_delegate/dap_chain_net_srv_stake_pos_delegate.c b/modules/service/stake_pos_delegate/dap_chain_net_srv_stake_pos_delegate.c
index e8b73dc9d4..077026777b 100644
--- a/modules/service/stake_pos_delegate/dap_chain_net_srv_stake_pos_delegate.c
+++ b/modules/service/stake_pos_delegate/dap_chain_net_srv_stake_pos_delegate.c
@@ -403,7 +403,7 @@ static dap_chain_datum_decree_t *s_stake_decree_approve(dap_chain_net_t *a_net,
dap_chain_tx_out_cond_t *l_tx_out_cond = dap_chain_datum_tx_out_cond_get(l_cond_tx,
DAP_CHAIN_TX_OUT_COND_SUBTYPE_SRV_STAKE_POS_DELEGATE, &l_prev_cond_idx);
if (!l_tx_out_cond) {
- log_it(L_WARNING, "Requested conditional transaction has no required conditional output");
+ log_it(L_WARNING, "Requested conditional transaction has no requires conditional output");
return NULL;
}
if (dap_chain_ledger_tx_hash_is_used_out_item(l_ledger, a_stake_tx_hash, l_prev_cond_idx)) {
@@ -539,7 +539,7 @@ static dap_chain_datum_tx_t *s_stake_tx_invalidate(dap_chain_net_t *a_net, dap_h
dap_chain_tx_out_cond_t *l_tx_out_cond = dap_chain_datum_tx_out_cond_get(l_cond_tx,
DAP_CHAIN_TX_OUT_COND_SUBTYPE_SRV_STAKE_POS_DELEGATE, &l_prev_cond_idx);
if (!l_tx_out_cond) {
- log_it(L_WARNING, "Requested conditional transaction has no required conditional output");
+ log_it(L_WARNING, "Requested conditional transaction has no requires conditional output");
return NULL;
}
if (dap_chain_ledger_tx_hash_is_used_out_item(l_ledger, a_tx_hash, l_prev_cond_idx)) {
@@ -632,7 +632,7 @@ static dap_chain_datum_decree_t *s_stake_decree_invalidate(dap_chain_net_t *a_ne
dap_chain_tx_out_cond_t *l_tx_out_cond = dap_chain_datum_tx_out_cond_get(l_cond_tx,
DAP_CHAIN_TX_OUT_COND_SUBTYPE_SRV_STAKE_POS_DELEGATE, &l_prev_cond_idx);
if (!l_tx_out_cond) {
- log_it(L_WARNING, "Requested conditional transaction has no required conditional output");
+ log_it(L_WARNING, "Requested conditional transaction has no requires conditional output");
return NULL;
}
@@ -806,7 +806,7 @@ static int s_cli_srv_stake_order(int a_argc, char **a_argv, int a_arg_index, cha
dap_chain_net_t *l_net = NULL;
dap_cli_server_cmd_find_option_val(a_argv, l_arg_index, a_argc, "-net", &l_net_str);
if (!l_net_str) {
- dap_cli_server_cmd_set_reply_text(a_str_reply, "Command 'order create' required parameter -net");
+ dap_cli_server_cmd_set_reply_text(a_str_reply, "Command 'order create' requires parameter -net");
return -3;
}
l_net = dap_chain_net_by_name(l_net_str);
@@ -816,7 +816,7 @@ static int s_cli_srv_stake_order(int a_argc, char **a_argv, int a_arg_index, cha
}
dap_cli_server_cmd_find_option_val(a_argv, l_arg_index, a_argc, "-value", &l_value_str);
if (!l_value_str) {
- dap_cli_server_cmd_set_reply_text(a_str_reply, "Command 'order create' required parameter -coins");
+ dap_cli_server_cmd_set_reply_text(a_str_reply, "Command 'order create' requires parameter -coins");
return -5;
}
uint256_t l_value = dap_chain_balance_scan(l_value_str);
@@ -826,7 +826,7 @@ static int s_cli_srv_stake_order(int a_argc, char **a_argv, int a_arg_index, cha
}
dap_cli_server_cmd_find_option_val(a_argv, l_arg_index, a_argc, "-cert", &l_cert_str);
if (!l_cert_str) {
- dap_cli_server_cmd_set_reply_text(a_str_reply, "Command 'order create' required parameter -cert");
+ dap_cli_server_cmd_set_reply_text(a_str_reply, "Command 'order create' requires parameter -cert");
return -7;
}
dap_cert_t *l_cert = dap_cert_find_by_name(l_cert_str);
@@ -906,7 +906,7 @@ static int s_cli_srv_stake_order(int a_argc, char **a_argv, int a_arg_index, cha
dap_enc_key_t *l_key = NULL;
dap_cli_server_cmd_find_option_val(a_argv, l_arg_index, a_argc, "-net", &l_net_str);
if (!l_net_str) {
- dap_cli_server_cmd_set_reply_text(a_str_reply, "Command 'order update' required parameter -net");
+ dap_cli_server_cmd_set_reply_text(a_str_reply, "Command 'order update' requires parameter -net");
return -3;
}
l_net = dap_chain_net_by_name(l_net_str);
@@ -986,7 +986,7 @@ static int s_cli_srv_stake_order(int a_argc, char **a_argv, int a_arg_index, cha
const char *l_net_str = NULL;
dap_cli_server_cmd_find_option_val(a_argv, l_arg_index, a_argc, "-net", &l_net_str);
if (!l_net_str) {
- dap_cli_server_cmd_set_reply_text(a_str_reply, "Command 'order list' required parameter -net");
+ dap_cli_server_cmd_set_reply_text(a_str_reply, "Command 'order list' requires parameter -net");
return -3;
}
dap_chain_net_t *l_net = dap_chain_net_by_name(l_net_str);
@@ -1095,7 +1095,7 @@ static int s_cli_srv_stake(int a_argc, char **a_argv, char **a_str_reply)
l_arg_index++;
dap_cli_server_cmd_find_option_val(a_argv, l_arg_index, a_argc, "-net", &l_net_str);
if (!l_net_str) {
- dap_cli_server_cmd_set_reply_text(a_str_reply, "Command 'delegate' required parameter -net");
+ dap_cli_server_cmd_set_reply_text(a_str_reply, "Command 'delegate' requires parameter -net");
return -3;
}
dap_chain_net_t *l_net = dap_chain_net_by_name(l_net_str);
@@ -1105,7 +1105,7 @@ static int s_cli_srv_stake(int a_argc, char **a_argv, char **a_str_reply)
}
dap_cli_server_cmd_find_option_val(a_argv, l_arg_index, a_argc, "-wallet", &l_wallet_str);
if (!l_wallet_str) {
- dap_cli_server_cmd_set_reply_text(a_str_reply, "Command 'delegate' required parameter -wallet");
+ dap_cli_server_cmd_set_reply_text(a_str_reply, "Command 'delegate' requires parameter -wallet");
return -17;
}
dap_chain_wallet_t *l_wallet = dap_chain_wallet_open(l_wallet_str, dap_chain_wallet_get_path(g_config));
@@ -1115,7 +1115,7 @@ static int s_cli_srv_stake(int a_argc, char **a_argv, char **a_str_reply)
}
dap_cli_server_cmd_find_option_val(a_argv, l_arg_index, a_argc, "-cert", &l_cert_str);
if (!l_cert_str) {
- dap_cli_server_cmd_set_reply_text(a_str_reply, "Command 'delegate' required parameter -cert");
+ dap_cli_server_cmd_set_reply_text(a_str_reply, "Command 'delegate' requires parameter -cert");
return -13;
}
dap_cert_t *l_signing_cert = dap_cert_find_by_name(l_cert_str);
@@ -1134,7 +1134,7 @@ static int s_cli_srv_stake(int a_argc, char **a_argv, char **a_str_reply)
}
dap_cli_server_cmd_find_option_val(a_argv, l_arg_index, a_argc, "-value", &l_value_str);
if (!l_value_str) {
- dap_cli_server_cmd_set_reply_text(a_str_reply, "Command 'delegate' required parameter -value");
+ dap_cli_server_cmd_set_reply_text(a_str_reply, "Command 'delegate' requires parameter -value");
return -9;
}
uint256_t l_value = dap_chain_balance_scan(l_value_str);
@@ -1164,7 +1164,7 @@ static int s_cli_srv_stake(int a_argc, char **a_argv, char **a_str_reply)
l_node_addr.uint64 = dap_chain_net_get_cur_addr_int(l_net);
dap_cli_server_cmd_find_option_val(a_argv, l_arg_index, a_argc, "-fee", &l_fee_str);
if (!l_fee_str) {
- dap_cli_server_cmd_set_reply_text(a_str_reply, "Command 'delegate' required parameter -fee");
+ dap_cli_server_cmd_set_reply_text(a_str_reply, "Command 'delegate' requires parameter -fee");
return -15;
}
uint256_t l_fee = dap_chain_balance_scan(l_fee_str);
@@ -1192,7 +1192,7 @@ static int s_cli_srv_stake(int a_argc, char **a_argv, char **a_str_reply)
l_arg_index++;
dap_cli_server_cmd_find_option_val(a_argv, l_arg_index, a_argc, "-net", &l_net_str);
if (!l_net_str) {
- dap_cli_server_cmd_set_reply_text(a_str_reply, "Command 'approve' required parameter -net");
+ dap_cli_server_cmd_set_reply_text(a_str_reply, "Command 'approve' requires parameter -net");
return -3;
}
dap_chain_net_t *l_net = dap_chain_net_by_name(l_net_str);
@@ -1202,7 +1202,7 @@ static int s_cli_srv_stake(int a_argc, char **a_argv, char **a_str_reply)
}
dap_cli_server_cmd_find_option_val(a_argv, l_arg_index, a_argc, "-poa_cert", &l_cert_str);
if (!l_cert_str) {
- dap_cli_server_cmd_set_reply_text(a_str_reply, "Command 'approve' required parameter -poa_cert");
+ dap_cli_server_cmd_set_reply_text(a_str_reply, "Command 'approve' requires parameter -poa_cert");
return -17;
}
dap_cert_t *l_cert = dap_cert_find_by_name(l_cert_str);
@@ -1216,7 +1216,7 @@ static int s_cli_srv_stake(int a_argc, char **a_argv, char **a_str_reply)
}
dap_cli_server_cmd_find_option_val(a_argv, l_arg_index, a_argc, "-tx", &l_tx_hash_str);
if (!l_tx_hash_str) {
- dap_cli_server_cmd_set_reply_text(a_str_reply, "Command 'approve' required parameter -tx");
+ dap_cli_server_cmd_set_reply_text(a_str_reply, "Command 'approve' requires parameter -tx");
return -13;
}
dap_chain_hash_fast_t l_tx_hash = {};
@@ -1238,7 +1238,7 @@ static int s_cli_srv_stake(int a_argc, char **a_argv, char **a_str_reply)
l_arg_index++;
dap_cli_server_cmd_find_option_val(a_argv, l_arg_index, a_argc, "-net", &l_net_str);
if (!l_net_str) {
- dap_cli_server_cmd_set_reply_text(a_str_reply, "Command 'transactions' required parameter -net");
+ dap_cli_server_cmd_set_reply_text(a_str_reply, "Command 'keylist' requires parameter -net");
return -3;
}
dap_chain_net_t *l_net = dap_chain_net_by_name(l_net_str);
@@ -1292,7 +1292,7 @@ static int s_cli_srv_stake(int a_argc, char **a_argv, char **a_str_reply)
l_arg_index++;
dap_cli_server_cmd_find_option_val(a_argv, l_arg_index, a_argc, "-net", &l_net_str);
if (!l_net_str) {
- dap_cli_server_cmd_set_reply_text(a_str_reply, "Command 'invalidate' required parameter -net");
+ dap_cli_server_cmd_set_reply_text(a_str_reply, "Command 'invalidate' requires parameter -net");
return -3;
}
dap_chain_net_t *l_net = dap_chain_net_by_name(l_net_str);
@@ -1305,13 +1305,13 @@ static int s_cli_srv_stake(int a_argc, char **a_argv, char **a_str_reply)
if (!l_wallet_str) {
dap_cli_server_cmd_find_option_val(a_argv, l_arg_index, a_argc, "-poa_cert", &l_poa_cert_str);
if (!l_poa_cert_str) {
- dap_cli_server_cmd_set_reply_text(a_str_reply, "Command 'invalidate' required parameter -wallet or -poa_cert");
+ dap_cli_server_cmd_set_reply_text(a_str_reply, "Command 'invalidate' requires parameter -wallet or -poa_cert");
return -17;
}
} else {
dap_cli_server_cmd_find_option_val(a_argv, l_arg_index, a_argc, "-fee", &l_fee_str);
if (!l_fee_str) {
- dap_cli_server_cmd_set_reply_text(a_str_reply, "Command 'delegate' required parameter -fee");
+ dap_cli_server_cmd_set_reply_text(a_str_reply, "Command 'delegate' requires parameter -fee");
return -5;
}
l_fee = dap_chain_balance_scan(l_fee_str);
@@ -1326,12 +1326,12 @@ static int s_cli_srv_stake(int a_argc, char **a_argv, char **a_str_reply)
if (!l_cert_str) {
dap_cli_server_cmd_find_option_val(a_argv, l_arg_index, a_argc, "-signing_pkey_hash", &l_signing_pkey_hash_str);
if (!l_signing_pkey_hash_str) {
- dap_cli_server_cmd_set_reply_text(a_str_reply, "Command 'invalidate' required parameter -tx or -cert or -signing_pkey_hash");
+ dap_cli_server_cmd_set_reply_text(a_str_reply, "Command 'invalidate' requires parameter -tx or -cert or -signing_pkey_hash");
return -13;
}
dap_cli_server_cmd_find_option_val(a_argv, l_arg_index, a_argc, "-signing_pkey_type", &l_signing_pkey_type_str);
if (!l_signing_pkey_type_str) {
- dap_cli_server_cmd_set_reply_text(a_str_reply, "Command 'invalidate' required parameter -signing_pkey_type");
+ dap_cli_server_cmd_set_reply_text(a_str_reply, "Command 'invalidate' requires parameter -signing_pkey_type");
return -14;
}
if (dap_sign_type_from_str(l_signing_pkey_type_str).type == SIG_TYPE_NULL) {
@@ -1428,7 +1428,7 @@ static int s_cli_srv_stake(int a_argc, char **a_argv, char **a_str_reply)
l_arg_index++;
dap_cli_server_cmd_find_option_val(a_argv, l_arg_index, a_argc, "-net", &l_net_str);
if (!l_net_str) {
- dap_cli_server_cmd_set_reply_text(a_str_reply, "Command 'min_value' required parameter -net");
+ dap_cli_server_cmd_set_reply_text(a_str_reply, "Command 'min_value' requires parameter -net");
return -3;
}
dap_chain_net_t *l_net = dap_chain_net_by_name(l_net_str);
@@ -1439,7 +1439,7 @@ static int s_cli_srv_stake(int a_argc, char **a_argv, char **a_str_reply)
dap_cli_server_cmd_find_option_val(a_argv, l_arg_index, a_argc, "-cert", &l_cert_str);
if (!l_cert_str) {
- dap_cli_server_cmd_set_reply_text(a_str_reply, "Command 'min_value' required parameter -cert");
+ dap_cli_server_cmd_set_reply_text(a_str_reply, "Command 'min_value' requires parameter -cert");
return -3;
}
dap_cert_t *l_poa_cert = dap_cert_find_by_name(l_cert_str);
@@ -1454,7 +1454,7 @@ static int s_cli_srv_stake(int a_argc, char **a_argv, char **a_str_reply)
dap_cli_server_cmd_find_option_val(a_argv, l_arg_index, a_argc, "-value", &l_value_str);
if (!l_value_str) {
- dap_cli_server_cmd_set_reply_text(a_str_reply, "Command 'min_value' required parameter -value");
+ dap_cli_server_cmd_set_reply_text(a_str_reply, "Command 'min_value' requires parameter -value");
return -9;
}
uint256_t l_value = dap_chain_balance_scan(l_value_str);
diff --git a/modules/service/xchange/dap_chain_net_srv_xchange.c b/modules/service/xchange/dap_chain_net_srv_xchange.c
index 0b385b3361..e62e93e932 100644
--- a/modules/service/xchange/dap_chain_net_srv_xchange.c
+++ b/modules/service/xchange/dap_chain_net_srv_xchange.c
@@ -975,7 +975,7 @@ static int s_cli_srv_xchange_order(int a_argc, char **a_argv, int a_arg_index, c
case CMD_CREATE: {
dap_cli_server_cmd_find_option_val(a_argv, l_arg_index, a_argc, "-net", &l_net_str);
if (!l_net_str) {
- dap_cli_server_cmd_set_reply_text(a_str_reply, "Command 'order create' required parameter -net");
+ dap_cli_server_cmd_set_reply_text(a_str_reply, "Command 'order create' requires parameter -net");
return -2;
}
l_net = dap_chain_net_by_name(l_net_str);
@@ -985,7 +985,7 @@ static int s_cli_srv_xchange_order(int a_argc, char **a_argv, int a_arg_index, c
}
dap_cli_server_cmd_find_option_val(a_argv, l_arg_index, a_argc, "-token_sell", &l_token_sell_str);
if (!l_token_sell_str) {
- dap_cli_server_cmd_set_reply_text(a_str_reply, "Command 'price create' required parameter -token_sell");
+ dap_cli_server_cmd_set_reply_text(a_str_reply, "Command 'price create' requires parameter -token_sell");
return -5;
}
if (!dap_chain_ledger_token_ticker_check(l_net->pub.ledger, l_token_sell_str)) {
@@ -994,7 +994,7 @@ static int s_cli_srv_xchange_order(int a_argc, char **a_argv, int a_arg_index, c
}
dap_cli_server_cmd_find_option_val(a_argv, l_arg_index, a_argc, "-token_buy", &l_token_buy_str);
if (!l_token_buy_str) {
- dap_cli_server_cmd_set_reply_text(a_str_reply, "Command 'price create' required parameter -token_buy");
+ dap_cli_server_cmd_set_reply_text(a_str_reply, "Command 'price create' requires parameter -token_buy");
return -5;
}
if (!dap_chain_ledger_token_ticker_check(l_net->pub.ledger, l_token_buy_str)) {
@@ -1004,7 +1004,7 @@ static int s_cli_srv_xchange_order(int a_argc, char **a_argv, int a_arg_index, c
const char *l_val_sell_str = NULL, *l_val_rate_str = NULL;
dap_cli_server_cmd_find_option_val(a_argv, l_arg_index, a_argc, "-value", &l_val_sell_str);
if (!l_val_sell_str) {
- dap_cli_server_cmd_set_reply_text(a_str_reply, "Command 'price create' required parameter -value");
+ dap_cli_server_cmd_set_reply_text(a_str_reply, "Command 'price create' requires parameter -value");
return -8;
}
uint256_t l_datoshi_sell = dap_chain_balance_scan(l_val_sell_str);
@@ -1014,7 +1014,7 @@ static int s_cli_srv_xchange_order(int a_argc, char **a_argv, int a_arg_index, c
}
dap_cli_server_cmd_find_option_val(a_argv, l_arg_index, a_argc, "-rate", &l_val_rate_str);
if (!l_val_rate_str) {
- dap_cli_server_cmd_set_reply_text(a_str_reply, "Command 'price create' required parameter -rate");
+ dap_cli_server_cmd_set_reply_text(a_str_reply, "Command 'price create' requires parameter -rate");
return -8;
}
uint256_t l_rate = dap_chain_coins_to_balance(l_val_rate_str);
@@ -1025,7 +1025,7 @@ static int s_cli_srv_xchange_order(int a_argc, char **a_argv, int a_arg_index, c
const char *l_fee_str = NULL;
dap_cli_server_cmd_find_option_val(a_argv, l_arg_index, a_argc, "-fee", &l_fee_str);
if (!l_fee_str) {
- dap_cli_server_cmd_set_reply_text(a_str_reply, "Command 'price create' required parameter -fee");
+ dap_cli_server_cmd_set_reply_text(a_str_reply, "Command 'price create' requires parameter -fee");
return -20;
}
uint256_t l_fee = dap_chain_balance_scan(l_fee_str);
@@ -1035,7 +1035,7 @@ static int s_cli_srv_xchange_order(int a_argc, char **a_argv, int a_arg_index, c
}
dap_cli_server_cmd_find_option_val(a_argv, l_arg_index, a_argc, "-wallet", &l_wallet_str);
if (!l_wallet_str) {
- dap_cli_server_cmd_set_reply_text(a_str_reply, "Command 'price create' required parameter -wallet");
+ dap_cli_server_cmd_set_reply_text(a_str_reply, "Command 'price create' requires parameter -wallet");
return -10;
}
dap_chain_wallet_t *l_wallet = dap_chain_wallet_open(l_wallet_str, dap_chain_wallet_get_path(g_config));
@@ -1109,7 +1109,7 @@ static int s_cli_srv_xchange_order(int a_argc, char **a_argv, int a_arg_index, c
case CMD_HISTORY:{
dap_cli_server_cmd_find_option_val(a_argv, l_arg_index, a_argc, "-net", &l_net_str);
if (!l_net_str) {
- dap_cli_server_cmd_set_reply_text(a_str_reply, "Command 'order history' required parameter -net");
+ dap_cli_server_cmd_set_reply_text(a_str_reply, "Command 'order history' requires parameter -net");
return -2;
}
l_net = dap_chain_net_by_name(l_net_str);
@@ -1125,7 +1125,7 @@ static int s_cli_srv_xchange_order(int a_argc, char **a_argv, int a_arg_index, c
dap_cli_server_cmd_find_option_val(a_argv, l_arg_index, a_argc, "-addr", &l_addr_hash_str);
if (!l_order_hash_str && ! l_addr_hash_str) {
- dap_cli_server_cmd_set_reply_text(a_str_reply, "Command 'order history' required parameter -order or -addr" );
+ dap_cli_server_cmd_set_reply_text(a_str_reply, "Command 'order history' requires parameter -order or -addr" );
return -12;
}
if(l_addr_hash_str){
@@ -1188,7 +1188,7 @@ static int s_cli_srv_xchange_order(int a_argc, char **a_argv, int a_arg_index, c
const char * l_order_hash_str = NULL;
dap_cli_server_cmd_find_option_val(a_argv, l_arg_index, a_argc, "-net", &l_net_str);
if (!l_net_str) {
- dap_cli_server_cmd_set_reply_text(a_str_reply, "Command 'price %s' required parameter -net",
+ dap_cli_server_cmd_set_reply_text(a_str_reply, "Command 'price %s' requires parameter -net",
l_cmd_num == CMD_REMOVE ? "remove" : "update");
return -2;
}
@@ -1199,7 +1199,7 @@ static int s_cli_srv_xchange_order(int a_argc, char **a_argv, int a_arg_index, c
}
dap_cli_server_cmd_find_option_val(a_argv, l_arg_index, a_argc, "-wallet", &l_wallet_str);
if (!l_wallet_str) {
- dap_cli_server_cmd_set_reply_text(a_str_reply, "Command 'price %s' required parameter -wallet",
+ dap_cli_server_cmd_set_reply_text(a_str_reply, "Command 'price %s' requires parameter -wallet",
l_cmd_num == CMD_REMOVE ? "remove" : "update");
return -10;
}
@@ -1210,7 +1210,7 @@ static int s_cli_srv_xchange_order(int a_argc, char **a_argv, int a_arg_index, c
}
dap_cli_server_cmd_find_option_val(a_argv, l_arg_index, a_argc, "-order", &l_order_hash_str);
if (!l_order_hash_str) {
- dap_cli_server_cmd_set_reply_text(a_str_reply, "Command 'price %s' required parameter -order",
+ dap_cli_server_cmd_set_reply_text(a_str_reply, "Command 'price %s' requires parameter -order",
l_cmd_num == CMD_REMOVE ? "remove" : "update");
return -12;
}
@@ -1338,7 +1338,7 @@ static int s_cli_srv_xchange_order(int a_argc, char **a_argv, int a_arg_index, c
case CMD_STATUS: {
dap_cli_server_cmd_find_option_val(a_argv, l_arg_index, a_argc, "-net", &l_net_str);
if (!l_net_str) {
- dap_cli_server_cmd_set_reply_text(a_str_reply, "Command 'order status' required parameter -net");
+ dap_cli_server_cmd_set_reply_text(a_str_reply, "Command 'order status' requires parameter -net");
return -2;
}
l_net = dap_chain_net_by_name(l_net_str);
@@ -1349,7 +1349,7 @@ static int s_cli_srv_xchange_order(int a_argc, char **a_argv, int a_arg_index, c
const char * l_order_hash_str = NULL;
dap_cli_server_cmd_find_option_val(a_argv, l_arg_index, a_argc, "-order", &l_order_hash_str);
if (!l_order_hash_str) {
- dap_cli_server_cmd_set_reply_text(a_str_reply, "Command 'order history' required parameter -order or -addr" );
+ dap_cli_server_cmd_set_reply_text(a_str_reply, "Command 'order history' requires parameter -order or -addr" );
return -12;
}
dap_chain_net_srv_order_t *l_order = dap_chain_net_srv_order_find_by_hash_str(l_net, l_order_hash_str);
@@ -1668,7 +1668,7 @@ static int s_cli_srv_xchange(int a_argc, char **a_argv, char **a_str_reply)
l_arg_index++;
dap_cli_server_cmd_find_option_val(a_argv, l_arg_index, a_argc, "-net", &l_net_str);
if (!l_net_str) {
- dap_cli_server_cmd_set_reply_text(a_str_reply, "Command 'orders' required parameter -net");
+ dap_cli_server_cmd_set_reply_text(a_str_reply, "Command 'orders' requires parameter -net");
return -2;
}
dap_chain_net_t *l_net = dap_chain_net_by_name(l_net_str);
@@ -1735,7 +1735,7 @@ static int s_cli_srv_xchange(int a_argc, char **a_argv, char **a_str_reply)
l_arg_index++;
dap_cli_server_cmd_find_option_val(a_argv, l_arg_index, a_argc, "-net", &l_net_str);
if (!l_net_str) {
- dap_cli_server_cmd_set_reply_text(a_str_reply, "Command 'purchase' required parameter -net");
+ dap_cli_server_cmd_set_reply_text(a_str_reply, "Command 'purchase' requires parameter -net");
return -2;
}
dap_chain_net_t *l_net = dap_chain_net_by_name(l_net_str);
@@ -1745,7 +1745,7 @@ static int s_cli_srv_xchange(int a_argc, char **a_argv, char **a_str_reply)
}
dap_cli_server_cmd_find_option_val(a_argv, l_arg_index, a_argc, "-wallet", &l_wallet_str);
if (!l_wallet_str) {
- dap_cli_server_cmd_set_reply_text(a_str_reply, "Command 'purchase' required parameter -wallet");
+ dap_cli_server_cmd_set_reply_text(a_str_reply, "Command 'purchase' requires parameter -wallet");
return -10;
}
dap_chain_wallet_t *l_wallet = dap_chain_wallet_open(l_wallet_str, dap_chain_wallet_get_path(g_config));
@@ -1755,12 +1755,12 @@ static int s_cli_srv_xchange(int a_argc, char **a_argv, char **a_str_reply)
}
dap_cli_server_cmd_find_option_val(a_argv, l_arg_index, a_argc, "-order", &l_order_hash_str);
if (!l_order_hash_str) {
- dap_cli_server_cmd_set_reply_text(a_str_reply, "Command 'purchase' required parameter -order");
+ dap_cli_server_cmd_set_reply_text(a_str_reply, "Command 'purchase' requires parameter -order");
return -12;
}
dap_cli_server_cmd_find_option_val(a_argv, l_arg_index, a_argc, "-coins", &l_val_buy_str);
if (!l_val_buy_str) {
- dap_cli_server_cmd_set_reply_text(a_str_reply, "Command 'purchase' required parameter -coins");
+ dap_cli_server_cmd_set_reply_text(a_str_reply, "Command 'purchase' requires parameter -coins");
return -8;
}
uint256_t l_datoshi_buy = dap_chain_balance_scan(l_val_buy_str);
@@ -1835,7 +1835,7 @@ static int s_cli_srv_xchange(int a_argc, char **a_argv, char **a_str_reply)
if(!l_net_str) {
- dap_cli_server_cmd_set_reply_text(a_str_reply, "Command 'tx_list' required parameter -net");
+ dap_cli_server_cmd_set_reply_text(a_str_reply, "Command 'tx_list' requires parameter -net");
return -3;
}
dap_chain_net_t *l_net = dap_chain_net_by_name(l_net_str);
@@ -1949,7 +1949,7 @@ static int s_cli_srv_xchange(int a_argc, char **a_argv, char **a_str_reply)
const char *l_net_str = NULL;
dap_cli_server_cmd_find_option_val(a_argv, l_arg_index, a_argc, "-net", &l_net_str);
if(!l_net_str) {
- dap_cli_server_cmd_set_reply_text(a_str_reply, "Command 'token_pair' required parameter -net");
+ dap_cli_server_cmd_set_reply_text(a_str_reply, "Command 'token_pair' requires parameter -net");
return -3;
}
dap_chain_net_t *l_net = dap_chain_net_by_name(l_net_str);
@@ -2218,7 +2218,7 @@ static int s_cli_srv_xchange(int a_argc, char **a_argv, char **a_str_reply)
}
// No subcommand selected
- dap_cli_server_cmd_set_reply_text(a_str_reply,"Command 'token pair' required proper subcommand, please read its manual with command 'help srv_xchange'");
+ dap_cli_server_cmd_set_reply_text(a_str_reply,"Command 'token pair' requires proper subcommand, please read its manual with command 'help srv_xchange'");
} break;
--
GitLab