diff --git a/dap_chain_net.c b/dap_chain_net.c index 54f6c5ecbee37ad4a0aa0458ef41274cf6f4bbef..caf511e6538b2eb63b2dd520bee360e01e8f8aa0 100644 --- a/dap_chain_net.c +++ b/dap_chain_net.c @@ -551,7 +551,6 @@ int dap_chain_net_load(const char * a_net_name) case NODE_ROLE_LIGHT: l_utxo_flags |= DAP_CHAIN_UTXO_CHECK_LOCAL_DS; } - dap_chain_utxo_init(l_utxo_flags); // Check if seed nodes are present in local db alias PVT(l_net)->seed_aliases = dap_config_get_array_str( l_cfg , "general" ,"seed_nodes_aliases" @@ -681,6 +680,9 @@ int dap_chain_net_load(const char * a_net_name) memcpy( l_net_item2,l_net_item,sizeof (*l_net_item)); HASH_ADD(hh,s_net_items_ids,net_id,sizeof ( l_net_item2->net_id),l_net_item2); + // init UTXO model + dap_chain_utxo_init(l_utxo_flags); + // Start the proc thread s_net_proc_thread_start(l_net); log_it(L_NOTICE, "Сhain network \"%s\" initialized",l_net_item->name); diff --git a/dap_chain_node_cli_cmd.c b/dap_chain_node_cli_cmd.c index b5a4557e840d9b224400a3fa57690adc8b6d17a2..8c2d2581222b6d3c87bedc39b532c05c531d2b08 100644 --- a/dap_chain_node_cli_cmd.c +++ b/dap_chain_node_cli_cmd.c @@ -1967,9 +1967,6 @@ int com_token_emit(int argc, const char ** argv, char ** str_reply) // Token ticker dap_chain_node_cli_find_option_val(argv, arg_index, argc, "-token", &l_ticker); - // Net addr - dap_chain_node_cli_find_option_val(argv, arg_index, argc, "-net", &l_net_str); - // Token emission if(dap_chain_node_cli_find_option_val(argv, arg_index, argc, "-emission_value", &str_tmp)) { l_emission_value = strtoull(str_tmp, NULL, 10); @@ -2012,6 +2009,9 @@ int com_token_emit(int argc, const char ** argv, char ** str_reply) return -4; } + // Net addr + dap_chain_node_cli_find_option_val(argv, arg_index, argc, "-net", &l_net_str); + // Select chain network if(!l_net_str) { dap_chain_node_cli_set_reply_text(str_reply, "token_create requires parameter 'net'"); @@ -2023,13 +2023,12 @@ int com_token_emit(int argc, const char ** argv, char ** str_reply) } } - - dap_chain_node_cli_find_option_val(argv, arg_index, argc, "chain_emission", &l_chain_emission_str); - dap_chain_node_cli_find_option_val(argv, arg_index, argc, "chain_base_tx", &l_chain_base_tx_str); + dap_chain_node_cli_find_option_val(argv, arg_index, argc, "-chain_emission", &l_chain_emission_str); + dap_chain_node_cli_find_option_val(argv, arg_index, argc, "-chain_base_tx", &l_chain_base_tx_str); // Select chain emission if(!l_chain_emission_str) { - dap_chain_node_cli_set_reply_text(str_reply, "token_create requires parameter 'chain_emission'"); + dap_chain_node_cli_set_reply_text(str_reply, "token_create requires parameter '-chain_emission'"); return -44; }else { if ( ( l_chain_emission = dap_chain_net_get_chain_by_name(l_net, l_chain_emission_str ) ) == NULL ){ // Can't find such chain