diff --git a/modules/chain/dap_chain.c b/modules/chain/dap_chain.c index 0c6430eec2d75b6ca95ca04ddaa720fadaa5ba25..34061302ff416cdf7af8351584c82a153673e006 100644 --- a/modules/chain/dap_chain.c +++ b/modules/chain/dap_chain.c @@ -343,7 +343,7 @@ bool s_chain_check_duplicated_chain(uint64_t l_chain_id, const char * a_chain_cf uint32_t l_cur_count = s_chain_id_array.count; for (uint32_t i = 0; i < l_cur_count; i++){ if (s_chain_id_array.ids[i] == l_chain_id){ - log_it (L_ERROR, "Chain id 0x%llx is duplicated in %s. Check chain config files for same chain ids, fix it and restart node", l_chain_id, a_chain_cfg_name); + log_it (L_ERROR, "Chain id 0x%"DAP_UINT64_FORMAT_U" is duplicated in %s. Check chain config files for same chain ids, fix it and restart node", l_chain_id, a_chain_cfg_name); s_chain_id_array.is_duplicate_detected = true; return false; } @@ -417,8 +417,8 @@ dap_chain_t * dap_chain_load_from_cfg(dap_ledger_t* a_ledger, const char * a_cha return NULL; } - if (!s_chain_check_duplicated_chain(l_chain_id_u, a_chain_cfg_name, l_chain_name)) - return NULL; + //if (!s_chain_check_duplicated_chain(l_chain_id_u, a_chain_cfg_name, l_chain_name)) + // return NULL; l_chain = dap_chain_create(a_ledger,a_chain_net_name,l_chain_name, a_chain_net_id,l_chain_id); if ( dap_chain_cs_create(l_chain, l_cfg) == 0 ) { diff --git a/modules/global-db/dap_chain_global_db.c b/modules/global-db/dap_chain_global_db.c index 74145e9793e59781a7fa5fabba0e9a9d7147bb69..c432a7f2c09e760115e5505906f1fbf3632ebc00 100644 --- a/modules/global-db/dap_chain_global_db.c +++ b/modules/global-db/dap_chain_global_db.c @@ -309,7 +309,7 @@ uint8_t * dap_chain_global_db_gr_get(const char *a_key, size_t *a_data_len_out, ? DAP_DUP_SIZE(l_store_data->value, l_store_data->value_len) : NULL; l_data_len_out = l_store_data->value_len; - dap_store_obj_free(l_store_data, *a_data_len_out); + dap_store_obj_free(l_store_data, 1); *a_data_len_out = l_data_len_out; return l_ret_value; } diff --git a/modules/net/dap_chain_node_cli_cmd.c b/modules/net/dap_chain_node_cli_cmd.c index 6f76aa69f93026fc98958c08d5ba746dde4c4933..2958787059f0fd5bd622f496c8c2168b6d6685e3 100644 --- a/modules/net/dap_chain_node_cli_cmd.c +++ b/modules/net/dap_chain_node_cli_cmd.c @@ -2278,8 +2278,8 @@ int com_mempool_delete(int argc, char ** argv, char ** a_str_reply) l_datum_hash_base58_str = dap_strdup(l_datum_hash_str); } char * l_gdb_group_mempool = dap_chain_net_get_gdb_group_mempool(l_chain); - uint8_t *l_data_tmp = l_datum_hash_hex_str ? dap_chain_global_db_gr_get(dap_strdup(l_datum_hash_hex_str), NULL, l_gdb_group_mempool) : NULL; - if(l_data_tmp && dap_chain_global_db_gr_del(dap_strdup(l_datum_hash_hex_str), l_gdb_group_mempool)) { + uint8_t *l_data_tmp = l_datum_hash_hex_str ? dap_chain_global_db_gr_get(l_datum_hash_hex_str, NULL, l_gdb_group_mempool) : NULL; + if(l_data_tmp && dap_chain_global_db_gr_del(l_datum_hash_hex_str, l_gdb_group_mempool)) { if(!dap_strcmp(l_hash_out_type,"hex")) dap_chain_node_cli_set_reply_text(a_str_reply, "Datum %s deleted", l_datum_hash_hex_str); else