diff --git a/modules/chain/dap_chain.c b/modules/chain/dap_chain.c
index 64dd868c72117a9284d00d79badfd41853404ec6..69ad2691ccb1701d2459d2be443715a3114d290d 100644
--- a/modules/chain/dap_chain.c
+++ b/modules/chain/dap_chain.c
@@ -248,7 +248,7 @@ static dap_chain_type_t s_chain_type_from_str(const char *a_type_str)
return CHAIN_TYPE_DECREE;
if (!dap_strcmp(a_type_str, "anchor"))
return CHAIN_TYPE_ANCHOR;
- return CHAIN_TYPE_LAST;
+ return CHAIN_TYPE_INVALID;
}
/**
@@ -445,7 +445,7 @@ dap_chain_t *dap_chain_load_from_cfg(const char *a_chain_net_name, dap_chain_net
for (uint16_t i = 0; i < l_datum_types_count; i++)
{
dap_chain_type_t l_chain_type = s_chain_type_from_str(l_datum_types[i]);
- if (l_chain_type != CHAIN_TYPE_LAST)
+ if (l_chain_type != CHAIN_TYPE_INVALID)
{
l_chain->datum_types[l_count_recognized] = l_chain_type;
l_count_recognized++;
@@ -470,7 +470,7 @@ dap_chain_t *dap_chain_load_from_cfg(const char *a_chain_net_name, dap_chain_net
for (uint16_t i = 0; i < l_default_datum_types_count; i++)
{
dap_chain_type_t l_chain_type = s_chain_type_from_str(l_default_datum_types[i]);
- if (l_chain_type != CHAIN_TYPE_LAST
+ if (l_chain_type != CHAIN_TYPE_INVALID
&& s_chain_in_chain_types(l_chain_type, l_chain->datum_types, l_chain->datum_types_count))// <<--- check this chain_type in readed datum_types
{
l_chain->default_datum_types[l_count_recognized] = l_chain_type;
@@ -824,3 +824,25 @@ const char* dap_chain_get_path(dap_chain_t *a_chain)
return DAP_CHAIN_PVT(a_chain)->file_storage_dir;
}
+const char *dap_chain_type_to_str(const dap_chain_type_t a_default_chain_type) {
+ switch (a_default_chain_type)
+ {
+ case CHAIN_TYPE_INVALID:
+ return "invalid";
+ case CHAIN_TYPE_TOKEN:
+ return "token";
+ case CHAIN_TYPE_EMISSION:
+ return "emission";
+ case CHAIN_TYPE_TX:
+ return "transaction";
+ case CHAIN_TYPE_CA:
+ return "ca";
+ case CHAIN_TYPE_SIGNER:
+ return "signer";
+ case CHAIN_TYPE_DECREE:
+ return "decree";
+ case CHAIN_TYPE_ANCHOR:
+ return "anchor";
+ }
+ return "invalid";
+}
diff --git a/modules/chain/include/dap_chain.h b/modules/chain/include/dap_chain.h
index 9e9fb28cd6db8939bc608305ad91b1e089d64f00..9c12d0b5a43c8b3e26bfdb0b883e8ba464e1d90b 100644
--- a/modules/chain/include/dap_chain.h
+++ b/modules/chain/include/dap_chain.h
@@ -119,15 +119,14 @@ typedef void (*dap_chain_callback_load_from_gdb)(dap_chain_t *a_chain);
typedef uint256_t (*dap_chain_callback_calc_reward)(dap_chain_t *a_chain, dap_hash_fast_t *a_block_hash, dap_pkey_t *a_block_sign_pkey);
typedef enum dap_chain_type {
- CHAIN_TYPE_FIRST,
- CHAIN_TYPE_TOKEN,
- CHAIN_TYPE_EMISSION,
- CHAIN_TYPE_TX,
- CHAIN_TYPE_CA,
- CHAIN_TYPE_SIGNER,
- CHAIN_TYPE_LAST,
- CHAIN_TYPE_DECREE,
- CHAIN_TYPE_ANCHOR
+ CHAIN_TYPE_INVALID = -1,
+ CHAIN_TYPE_TOKEN = 1,
+ CHAIN_TYPE_EMISSION = 2,
+ CHAIN_TYPE_TX = 3,
+ CHAIN_TYPE_CA = 4,
+ CHAIN_TYPE_SIGNER = 5,
+ CHAIN_TYPE_DECREE = 7,
+ CHAIN_TYPE_ANCHOR = 8
} dap_chain_type_t;
typedef struct dap_chain {
@@ -258,5 +257,7 @@ DAP_STATIC_INLINE bool dap_chain_get_atom_last_hash(dap_chain_t *a_chain, dap_ch
}
ssize_t dap_chain_atom_save(dap_chain_cell_t *a_chain_cell, const uint8_t *a_atom, size_t a_atom_size, dap_hash_fast_t *a_new_atom_hash);
int dap_cert_chain_file_save(dap_chain_datum_t *datum, char *net_name);
+
+const char *dap_chain_type_to_str(dap_chain_type_t a_chain_type);
const char *dap_chain_get_path(dap_chain_t *a_chain);
const char *dap_chain_get_cs_type(dap_chain_t *l_chain);
diff --git a/modules/consensus/block-poa/dap_chain_cs_block_poa.c b/modules/consensus/block-poa/dap_chain_cs_block_poa.c
index baf209edcedb6455281753013fb88ae757fa7950..d36958cfc24183c9e148b7a530608ba212a452ea 100644
--- a/modules/consensus/block-poa/dap_chain_cs_block_poa.c
+++ b/modules/consensus/block-poa/dap_chain_cs_block_poa.c
@@ -112,7 +112,8 @@ static int s_cli_block_poa(int argc, char ** argv, void **a_str_reply)
return -1;
}
- if (dap_chain_node_cli_cmd_values_parse_net_chain(&arg_index,argc,argv,a_str_reply,&l_chain,&l_chain_net)){
+ if (dap_chain_node_cli_cmd_values_parse_net_chain(&arg_index,argc,argv,a_str_reply,&l_chain,&l_chain_net,
+ CHAIN_TYPE_INVALID)){
return -3;
}
diff --git a/modules/consensus/dag-poa/dap_chain_cs_dag_poa.c b/modules/consensus/dag-poa/dap_chain_cs_dag_poa.c
index a848dc2a2cfdafaca67d93b03950fe80fb19b684..b724f4f9df21e5212b3232daaceb5c986fa5402c 100644
--- a/modules/consensus/dag-poa/dap_chain_cs_dag_poa.c
+++ b/modules/consensus/dag-poa/dap_chain_cs_dag_poa.c
@@ -190,7 +190,8 @@ static int s_cli_dag_poa(int argc, char ** argv, void **a_str_reply)
return -1;
}
- if (dap_chain_node_cli_cmd_values_parse_net_chain(&arg_index,argc,argv,a_str_reply,&l_chain,&l_chain_net)) {
+ if (dap_chain_node_cli_cmd_values_parse_net_chain(&arg_index,argc,argv,a_str_reply,&l_chain,&l_chain_net,
+ CHAIN_TYPE_INVALID)) {
return -3;
}
diff --git a/modules/consensus/esbocs/dap_chain_cs_esbocs.c b/modules/consensus/esbocs/dap_chain_cs_esbocs.c
index 90c25c95b5e8c80c16fe0f8b0dce52ecf5233d05..2dca7e04c401571b4b4e494dc535f52521ce9aab 100644
--- a/modules/consensus/esbocs/dap_chain_cs_esbocs.c
+++ b/modules/consensus/esbocs/dap_chain_cs_esbocs.c
@@ -2910,8 +2910,8 @@ static int s_cli_esbocs(int a_argc, char **a_argv, void **a_str_reply)
dap_chain_net_t *l_chain_net = NULL;
dap_chain_t *l_chain = NULL;
- // TODO make parse_net_chain working with default chain by dap_chain_net_get_default_chain_by_chain_type(l_chain_net, CHAIN_TYPE_ANCHOR)
- if (dap_chain_node_cli_cmd_values_parse_net_chain(&l_arg_index, a_argc, a_argv, a_str_reply, &l_chain, &l_chain_net))
+ if (dap_chain_node_cli_cmd_values_parse_net_chain(&l_arg_index, a_argc, a_argv, a_str_reply, &l_chain, &l_chain_net,
+ CHAIN_TYPE_ANCHOR))
return -3;
const char *l_chain_type = dap_chain_get_cs_type(l_chain);
if (strcmp(l_chain_type, "esbocs")) {
diff --git a/modules/net/dap_chain_net.c b/modules/net/dap_chain_net.c
index 450b724125897acca5d8fdc18cac82fa3bc0ee17..e4aa08b5205742c85915355e9063fbf129f0d3b6 100644
--- a/modules/net/dap_chain_net.c
+++ b/modules/net/dap_chain_net.c
@@ -1110,7 +1110,8 @@ static int s_cli_net(int argc, char **argv, void **reply)
return 0;
}
- int l_ret = dap_chain_node_cli_cmd_values_parse_net_chain_for_json(&arg_index, argc, argv, NULL, &l_net);
+ int l_ret = dap_chain_node_cli_cmd_values_parse_net_chain_for_json(&arg_index, argc, argv, NULL, &l_net,
+ CHAIN_TYPE_INVALID);
if ( l_net ) {
const char *l_sync_str = NULL;
diff --git a/modules/net/dap_chain_node_cli_cmd.c b/modules/net/dap_chain_node_cli_cmd.c
index 9b4c995d5789ec3f09687deb0ceed6982062ca47..c08edfcd8aa24327df6135655dd14aa96e4c9458 100644
--- a/modules/net/dap_chain_node_cli_cmd.c
+++ b/modules/net/dap_chain_node_cli_cmd.c
@@ -421,7 +421,8 @@ int com_global_db(int a_argc, char ** a_argv, void **a_str_reply)
dap_chain_t * l_chain = NULL;
dap_chain_net_t * l_net = NULL;
- if(dap_chain_node_cli_cmd_values_parse_net_chain(&arg_index, a_argc, a_argv, a_str_reply, &l_chain, &l_net) < 0)
+ if(dap_chain_node_cli_cmd_values_parse_net_chain(&arg_index, a_argc, a_argv, a_str_reply, &l_chain, &l_net,
+ CHAIN_TYPE_INVALID) < 0)
return -11;
const char *l_cell_str = NULL, *l_chain_str = NULL;
@@ -861,7 +862,7 @@ int com_node(int a_argc, char ** a_argv, void **a_str_reply)
// find net
dap_chain_net_t *l_net = NULL;
- if(dap_chain_node_cli_cmd_values_parse_net_chain(&arg_index, a_argc, a_argv, a_str_reply, NULL, &l_net) < 0) {
+ if(dap_chain_node_cli_cmd_values_parse_net_chain(&arg_index, a_argc, a_argv, a_str_reply, NULL, &l_net, CHAIN_TYPE_INVALID) < 0) {
if (cmd_num != CMD_BANLIST && cmd_num != CMD_CONNECTIONS && cmd_num != CMD_DUMP)
return -11;
}
@@ -1262,7 +1263,8 @@ int com_node(int a_argc, char ** a_argv, void **a_str_reply)
case CMD_BAN: {
dap_chain_net_t *l_netl = NULL;
dap_chain_t *l_chain = NULL;
- if(dap_chain_node_cli_cmd_values_parse_net_chain(&arg_index, a_argc, a_argv, a_str_reply, &l_chain, &l_netl) < 0)
+ if(dap_chain_node_cli_cmd_values_parse_net_chain(&arg_index, a_argc, a_argv, a_str_reply, &l_chain, &l_netl,
+ CHAIN_TYPE_DECREE) < 0)
return -11;
const char * l_hash_out_type = NULL;
dap_cli_server_cmd_find_option_val(a_argv, arg_index, a_argc, "-H", &l_hash_out_type);
@@ -1324,7 +1326,8 @@ int com_node(int a_argc, char ** a_argv, void **a_str_reply)
case CMD_UNBAN: {
dap_chain_net_t *l_netl = NULL;
dap_chain_t *l_chain = NULL;
- if(dap_chain_node_cli_cmd_values_parse_net_chain(&arg_index, a_argc, a_argv, a_str_reply, &l_chain, &l_netl) < 0)
+ if(dap_chain_node_cli_cmd_values_parse_net_chain(&arg_index, a_argc, a_argv, a_str_reply, &l_chain, &l_net,
+ CHAIN_TYPE_DECREE) < 0)
return -11;
const char * l_hash_out_type = NULL;
dap_cli_server_cmd_find_option_val(a_argv, arg_index, a_argc, "-H", &l_hash_out_type);
@@ -2170,11 +2173,13 @@ typedef enum dap_chain_node_cli_cmd_values_parse_net_chain_err_to_json {
DAP_CHAIN_NODE_CLI_CMD_VALUES_PARSE_NET_CHAIN_ERR_CHAIN_STR_IS_NULL = 105,
DAP_CHAIN_NODE_CLI_CMD_VALUES_PARSE_NET_CHAIN_ERR_CONFIG_DEFAULT_DATUM = 106,
DAP_CHAIN_NODE_CLI_CMD_VALUE_PARSE_CONVERT_BASE58_TO_ADDR_WALLET = 107,
- DAP_CHAIN_NODE_CLI_CMD_VALUE_PARSE_FAST_AND_BASE58_ADDR
+ DAP_CHAIN_NODE_CLI_CMD_VALUE_PARSE_FAST_AND_BASE58_ADDR,
+ DAP_CHAIN_NODE_CLI_CMD_VALUE_PARSE_CAN_NOT_FIND_DEFAULT_CHAIN_WITH_TYPE
} dap_chain_node_cli_cmd_values_parse_net_chain_err_to_json;
int dap_chain_node_cli_cmd_values_parse_net_chain_for_json(int *a_arg_index, int a_argc,
char **a_argv,
- dap_chain_t **a_chain, dap_chain_net_t **a_net) {
+ dap_chain_t **a_chain, dap_chain_net_t **a_net,
+ dap_chain_type_t a_default_chain_type) {
const char * l_chain_str = NULL;
const char * l_net_str = NULL;
@@ -2227,13 +2232,15 @@ int dap_chain_node_cli_cmd_values_parse_net_chain_for_json(int *a_arg_index, int
dap_json_rpc_error_add(DAP_CHAIN_NODE_CLI_CMD_VALUES_PARSE_NET_CHAIN_ERR_CHAIN_NOT_FOUND, l_str_to_reply);
return DAP_CHAIN_NODE_CLI_CMD_VALUES_PARSE_NET_CHAIN_ERR_CHAIN_NOT_FOUND;
}
- }
- else if (!strcmp(a_argv[0], "token_decl") || !strcmp(a_argv[0], "token_decl_sign")) {
- if ( (*a_chain = dap_chain_net_get_default_chain_by_chain_type(*a_net, CHAIN_TYPE_TOKEN)) == NULL )
- {
- dap_json_rpc_error_add(DAP_CHAIN_NODE_CLI_CMD_VALUES_PARSE_NET_CHAIN_ERR_CONFIG_DEFAULT_DATUM, "%s requires parameter '-chain' or set default datum "
- "type in chain configuration file");
- return DAP_CHAIN_NODE_CLI_CMD_VALUES_PARSE_NET_CHAIN_ERR_CONFIG_DEFAULT_DATUM;
+ } else if (a_default_chain_type != CHAIN_TYPE_INVALID) {
+ if ((*a_chain = dap_chain_net_get_default_chain_by_chain_type(*a_net, a_default_chain_type)) != NULL) {
+ return 0;
+ } else {
+ dap_json_rpc_error_add(
+ DAP_CHAIN_NODE_CLI_CMD_VALUE_PARSE_CAN_NOT_FIND_DEFAULT_CHAIN_WITH_TYPE,
+ "Unable to get the default chain of type %s for the network.", dap_chain_type_to_str(a_default_chain_type));
+ return DAP_CHAIN_NODE_CLI_CMD_VALUE_PARSE_CAN_NOT_FIND_DEFAULT_CHAIN_WITH_TYPE;
+
}
}
}
@@ -2251,7 +2258,7 @@ int dap_chain_node_cli_cmd_values_parse_net_chain_for_json(int *a_arg_index, int
* @return
*/
int dap_chain_node_cli_cmd_values_parse_net_chain(int *a_arg_index, int a_argc, char **a_argv, void **a_str_reply,
- dap_chain_t **a_chain, dap_chain_net_t **a_net)
+ dap_chain_t **a_chain, dap_chain_net_t **a_net, dap_chain_type_t a_default_chain_type)
{
const char * l_chain_str = NULL;
const char * l_net_str = NULL;
@@ -2303,15 +2310,13 @@ int dap_chain_node_cli_cmd_values_parse_net_chain(int *a_arg_index, int a_argc,
dap_cli_server_cmd_set_reply_text(a_str_reply, "%s", l_str_to_reply);
return -103;
}
- }
- else if ( !strcmp(a_argv[0], "token_decl")
- || !strcmp(a_argv[0], "token_decl_sign")) {
- if ( (*a_chain = dap_chain_net_get_default_chain_by_chain_type(*a_net, CHAIN_TYPE_TOKEN)) == NULL )
- {
- dap_cli_server_cmd_set_reply_text(a_str_reply,
- "%s requires parameter '-chain' or set default datum type in chain configuration file",
- a_argv[0]);
- return -105;
+ } else if (a_default_chain_type != CHAIN_TYPE_INVALID) {
+ if ((*a_chain = dap_chain_net_get_default_chain_by_chain_type(*a_net, a_default_chain_type)) != NULL) {
+ return 0;
+ } else {
+ dap_cli_server_cmd_set_reply_text(a_str_reply, "Unable to get the default chain of type %s for the network.",
+ dap_chain_type_to_str(a_default_chain_type));
+ return -104;
}
} else {
dap_cli_server_cmd_set_reply_text(a_str_reply, "%s requires parameter '-chain'", a_argv[0]);
@@ -2485,7 +2490,8 @@ int com_token_decl_sign(int a_argc, char **a_argv, void **a_str_reply)
dap_chain_t * l_chain = NULL;
dap_chain_net_t * l_net = NULL;
- dap_chain_node_cli_cmd_values_parse_net_chain(&arg_index, a_argc, a_argv, a_str_reply, &l_chain, &l_net);
+ dap_chain_node_cli_cmd_values_parse_net_chain(&arg_index, a_argc, a_argv, a_str_reply, &l_chain, &l_net,
+ CHAIN_TYPE_TOKEN);
if(!l_net)
return -1;
else {
@@ -3779,7 +3785,7 @@ int com_mempool(int a_argc, char **a_argv, void **a_str_reply)
return -2;
}
}
- dap_chain_node_cli_cmd_values_parse_net_chain_for_json(&arg_index, a_argc, a_argv, &l_chain, &l_net);
+ dap_chain_node_cli_cmd_values_parse_net_chain_for_json(&arg_index, a_argc, a_argv, &l_chain, &l_net, CHAIN_TYPE_INVALID);
const char *l_hash_out_type = "hex";
dap_cli_server_cmd_find_option_val(a_argv, arg_index, a_argc, "-H", &l_hash_out_type);
const char *l_datum_hash_in = NULL;
@@ -4042,7 +4048,8 @@ static int s_parse_common_token_decl_arg(int a_argc, char ** a_argv, void **a_st
}
int l_arg_index = 0;
- int l_res = dap_chain_node_cli_cmd_values_parse_net_chain(&l_arg_index, a_argc, a_argv, a_str_reply, &a_params->chain, &a_params->net);
+ int l_res = dap_chain_node_cli_cmd_values_parse_net_chain(&l_arg_index, a_argc, a_argv, a_str_reply,
+ &a_params->chain, &a_params->net, CHAIN_TYPE_TOKEN);
if(!a_params->net || !a_params->chain)
return l_res;
@@ -4887,7 +4894,7 @@ int com_token_emit(int a_argc, char **a_argv, void **a_str_reply)
return -1;
}
- dap_chain_node_cli_cmd_values_parse_net_chain(&arg_index,a_argc,a_argv,a_str_reply,NULL, &l_net);
+ dap_chain_node_cli_cmd_values_parse_net_chain(&arg_index,a_argc,a_argv,a_str_reply,NULL, &l_net, CHAIN_TYPE_INVALID);
if( ! l_net) { // Can't find such network
return -43;
}
@@ -5858,7 +5865,7 @@ int com_chain_ca_pub( int a_argc, char ** a_argv, void **a_str_reply)
dap_chain_t * l_chain = NULL;
dap_cli_server_cmd_find_option_val(a_argv, arg_index, a_argc, "-ca_name", &l_ca_name);
- dap_chain_node_cli_cmd_values_parse_net_chain(&arg_index,a_argc, a_argv, a_str_reply, &l_chain, &l_net);
+ dap_chain_node_cli_cmd_values_parse_net_chain(&arg_index,a_argc, a_argv, a_str_reply, &l_chain, &l_net, CHAIN_TYPE_CA);
dap_cert_t * l_cert = dap_cert_find_by_name( l_ca_name );
if( l_cert == NULL ){
@@ -7052,7 +7059,8 @@ int com_tx_verify(int a_argc, char **a_argv, void **reply)
dap_json_rpc_error_add(DAP_CHAIN_NODE_CLI_COM_TX_VERIFY_REQUIRE_PARAMETER_TX, "tx_verify requires parameter '-tx'");
return DAP_CHAIN_NODE_CLI_COM_TX_VERIFY_REQUIRE_PARAMETER_TX;
}
- dap_chain_node_cli_cmd_values_parse_net_chain_for_json(&l_arg_index, a_argc, a_argv, &l_chain, &l_net);
+ dap_chain_node_cli_cmd_values_parse_net_chain_for_json(&l_arg_index, a_argc, a_argv, &l_chain, &l_net,
+ CHAIN_TYPE_INVALID);
if (!l_net || !l_chain) {
return DAP_CHAIN_NODE_CLI_COM_TX_VERIFY_NET_CHAIN_UNDEFINED;
}
diff --git a/modules/net/include/dap_chain_node_cli_cmd.h b/modules/net/include/dap_chain_node_cli_cmd.h
index 7ce21316405d87e78439c6f92dd3ad7950c9c8e8..0ef481d581c1f56e4daf36fff555ae4bfc5ddd45 100644
--- a/modules/net/include/dap_chain_node_cli_cmd.h
+++ b/modules/net/include/dap_chain_node_cli_cmd.h
@@ -33,11 +33,12 @@
int dap_chain_node_cli_cmd_values_parse_net_chain_for_json(int *a_arg_index, int a_argc,
char **a_argv,
- dap_chain_t **a_chain, dap_chain_net_t **a_net);
+ dap_chain_t **a_chain, dap_chain_net_t **a_net,
+ dap_chain_type_t a_default_chain_type);
int dap_chain_node_cli_cmd_values_parse_net_chain(int *a_arg_index, int a_argc, char **a_argv, void **a_str_reply,
- dap_chain_t ** a_chain, dap_chain_net_t ** a_net);
+ dap_chain_t ** a_chain, dap_chain_net_t ** a_net, dap_chain_type_t a_default_chain_type);
int dap_chain_node_cli_cmd_values_parse_net_chain_json(int *a_arg_index, int a_argc, char **a_argv,
dap_chain_t **a_chain, dap_chain_net_t **a_net);
diff --git a/modules/net/srv/dap_chain_net_srv.c b/modules/net/srv/dap_chain_net_srv.c
index 48e461a3d6c250bda0cd89f8843df9df8d085baa..374696c0d3138e7e9c5fb0c950bf36b1ccbb0b3a 100644
--- a/modules/net/srv/dap_chain_net_srv.c
+++ b/modules/net/srv/dap_chain_net_srv.c
@@ -210,7 +210,8 @@ static int s_cli_net_srv( int argc, char **argv, void **a_str_reply)
return 0;
}
- int l_ret = dap_chain_node_cli_cmd_values_parse_net_chain( &arg_index, argc, argv, a_str_reply, NULL, &l_net );
+ int l_ret = dap_chain_node_cli_cmd_values_parse_net_chain( &arg_index, argc, argv, a_str_reply, NULL, &l_net,
+ CHAIN_TYPE_INVALID);
if ( l_net ) {
//char * l_orders_group = dap_chain_net_srv_order_get_gdb_group( l_net );
diff --git a/modules/service/datum/dap_chain_net_srv_datum.c b/modules/service/datum/dap_chain_net_srv_datum.c
index 9bed8a731c85201d5b35d2b99ed52fa81dce2300..83cb89b1ec6ac1fe10a797f5819b3ec22f1cd65f 100644
--- a/modules/service/datum/dap_chain_net_srv_datum.c
+++ b/modules/service/datum/dap_chain_net_srv_datum.c
@@ -110,7 +110,7 @@ static int s_srv_datum_cli(int argc, char ** argv, void **a_str_reply)
dap_chain_net_t * l_chain_net = NULL;
dap_chain_t * l_chain = NULL;
- if (dap_chain_node_cli_cmd_values_parse_net_chain(&arg_index,argc,argv,a_str_reply,&l_chain,&l_chain_net)) {
+ if (dap_chain_node_cli_cmd_values_parse_net_chain(&arg_index,argc,argv,a_str_reply,&l_chain,&l_chain_net, CHAIN_TYPE_INVALID)) {
return -3;
}
diff --git a/modules/service/vpn/dap_chain_net_srv_vpn_cmd.c b/modules/service/vpn/dap_chain_net_srv_vpn_cmd.c
index 695fb53faab302c846a7b4e92dfdd4daaed08ae1..0cb732427a964a3559b39c63f4afc5bbaa1e4ad4 100644
--- a/modules/service/vpn/dap_chain_net_srv_vpn_cmd.c
+++ b/modules/service/vpn/dap_chain_net_srv_vpn_cmd.c
@@ -110,7 +110,7 @@ int com_vpn_client(int a_argc, char ** a_argv, void **a_str_reply)
// find net
dap_chain_net_t *l_net = NULL;
- if(dap_chain_node_cli_cmd_values_parse_net_chain(&l_arg_index, a_argc, a_argv, a_str_reply, NULL, &l_net) < 0)
+ if(dap_chain_node_cli_cmd_values_parse_net_chain(&l_arg_index, a_argc, a_argv, a_str_reply, NULL, &l_net, CHAIN_TYPE_INVALID) < 0)
return -2;
int cmd_num = CMD_NONE;
diff --git a/modules/type/dag/dap_chain_cs_dag.c b/modules/type/dag/dap_chain_cs_dag.c
index bf86d7ebf619e5515507f3fafcdfc428732db8d5..013091149027c0e9f8f9505c2a6f5b1452ed3e59 100644
--- a/modules/type/dag/dap_chain_cs_dag.c
+++ b/modules/type/dag/dap_chain_cs_dag.c
@@ -1319,7 +1319,8 @@ static int s_cli_dag(int argc, char ** argv, void **a_str_reply)
return -1;
}
- dap_chain_node_cli_cmd_values_parse_net_chain(&arg_index, argc, argv, a_str_reply, &l_chain, &l_net);
+ dap_chain_node_cli_cmd_values_parse_net_chain(&arg_index, argc, argv, a_str_reply, &l_chain, &l_net,
+ CHAIN_TYPE_INVALID);
if ((l_net == NULL) || (l_chain == NULL)){
return -1;
} else if (a_str_reply && *a_str_reply) {