diff --git a/dap-sdk b/dap-sdk index 0e4b729ab659a7fc882b6df526cf2b9f87cdaaeb..a3ff7800232b5475458ea5a061b7208508e573eb 160000 --- a/dap-sdk +++ b/dap-sdk @@ -1 +1 @@ -Subproject commit 0e4b729ab659a7fc882b6df526cf2b9f87cdaaeb +Subproject commit a3ff7800232b5475458ea5a061b7208508e573eb diff --git a/modules/chain/dap_chain.c b/modules/chain/dap_chain.c index 3026156c784213b3d6c96388839219f0e8da17ae..e80f20dfed1182517cadf95d6e558a40ec4a2009 100644 --- a/modules/chain/dap_chain.c +++ b/modules/chain/dap_chain.c @@ -419,11 +419,11 @@ dap_chain_t *dap_chain_load_from_cfg(const char *a_chain_net_name, dap_chain_net // load priority for chain l_chain->load_priority = dap_config_get_item_uint16_default(l_cfg, "chain", "load_priority", 100); - char** l_datum_types = NULL; - char** l_default_datum_types = NULL; - uint16_t l_datum_types_count = 0; - uint16_t l_default_datum_types_count = 0; - uint16_t l_count_recognized = 0; + const char **l_datum_types = NULL; + const char **l_default_datum_types = NULL; + uint16_t l_datum_types_count = 0; + uint16_t l_default_datum_types_count = 0; + uint16_t l_count_recognized = 0; // l_datum_types = (read chain datum types) // || l_default_datum_types = (read chain default datum types if datum types readed and if present default datum types) diff --git a/modules/chain/tests/dap_chain_ledger_tests.c b/modules/chain/tests/dap_chain_ledger_tests.c index 93dab1a8b94aa56e4759a8d674a4ace854ae6b3f..ac6ec1a215dfd49513b18386a5a47bc71ffa9100 100644 --- a/modules/chain/tests/dap_chain_ledger_tests.c +++ b/modules/chain/tests/dap_chain_ledger_tests.c @@ -751,7 +751,7 @@ addr_key_container_t *gen_addr(dap_chain_net_id_t a_iddn){ dap_chain_addr_fill_from_key(l_addr, l_new_key, a_iddn); l_container->enc_key = l_new_key; l_container->addr = l_addr; - l_container->str = dap_strdup(dap_chain_addr_to_str(l_container->addr)); + l_container->str = dap_strdup(dap_chain_addr_to_str_static(l_container->addr)); return l_container; } diff --git a/modules/consensus/esbocs/dap_chain_cs_esbocs.c b/modules/consensus/esbocs/dap_chain_cs_esbocs.c index 5e0a191fe1df16e21a7178254acaf919171a7cf0..4f2d2489069bc7722c9f5d47a45f04be7ce066de 100644 --- a/modules/consensus/esbocs/dap_chain_cs_esbocs.c +++ b/modules/consensus/esbocs/dap_chain_cs_esbocs.c @@ -242,7 +242,7 @@ static int s_callback_new(dap_chain_t *a_chain, dap_config_t *a_chain_cfg) const char *l_auth_certs_prefix = dap_config_get_item_str(a_chain_cfg, "esbocs", "auth_certs_prefix"); uint16_t l_node_addrs_count; - char **l_addrs = dap_config_get_array_str(a_chain_cfg, "esbocs", "validators_addrs", &l_node_addrs_count); + const char **l_addrs = dap_config_get_array_str(a_chain_cfg, "esbocs", "validators_addrs", &l_node_addrs_count); if (l_node_addrs_count < l_esbocs_pvt->min_validators_count) { l_ret = -2; goto lb_err; diff --git a/modules/net/dap_chain_net.c b/modules/net/dap_chain_net.c index 4612d62ec2624b9a1e43df8d35ab60655c065718..8d0616751683cf97f91dc97cf4809b1215cf9590 100644 --- a/modules/net/dap_chain_net.c +++ b/modules/net/dap_chain_net.c @@ -1910,7 +1910,7 @@ int s_net_init(const char *a_net_name, uint16_t a_acl_idx) l_net_pvt->acl_idx = a_acl_idx; // Bridged netwoks allowed to send transactions to uint16_t l_net_ids_count = 0; - char **l_bridged_net_ids = dap_config_get_array_str(l_cfg, "general", "bridged_network_ids", &l_net_ids_count); + const char **l_bridged_net_ids = dap_config_get_array_str(l_cfg, "general", "bridged_network_ids", &l_net_ids_count); for (uint16_t i = 0; i < l_net_ids_count; i++) { dap_chain_net_id_t l_id; if (dap_chain_net_id_parse(l_bridged_net_ids[i], &l_id) != 0) @@ -1933,7 +1933,7 @@ int s_net_init(const char *a_net_name, uint16_t a_acl_idx) HASH_ADD_STR(s_net_items, name, l_net_item); HASH_ADD(hh2, s_net_ids, net_id, sizeof(l_net_item->net_id), l_net_item); - char **l_permanent_nodes_addrs = dap_config_get_array_str(l_cfg, "general", "permanent_nodes_addrs", &l_net_pvt->permanent_links_count); + const char **l_permanent_nodes_addrs = dap_config_get_array_str(l_cfg, "general", "permanent_nodes_addrs", &l_net_pvt->permanent_links_count); if (l_net_pvt->permanent_links_count) { l_net_pvt->permanent_links = DAP_NEW_Z_COUNT(dap_link_info_t *, l_net_pvt->permanent_links_count); if (!l_net_pvt->permanent_links) { @@ -1959,7 +1959,7 @@ int s_net_init(const char *a_net_name, uint16_t a_acl_idx) } } uint16_t l_permalink_hosts_count = 0, i, e; - char **l_permanent_links_hosts = dap_config_get_array_str(l_cfg, "general", "permanent_nodes_hosts", &l_permalink_hosts_count); + const char **l_permanent_links_hosts = dap_config_get_array_str(l_cfg, "general", "permanent_nodes_hosts", &l_permalink_hosts_count); for (i = 0, e = 0; i < dap_min(l_permalink_hosts_count, l_net_pvt->permanent_links_count); ++i) { char l_host[DAP_HOSTADDR_STRLEN + 1] = { '\0' }; uint16_t l_port = 0; struct sockaddr_storage l_saddr; @@ -1984,7 +1984,7 @@ int s_net_init(const char *a_net_name, uint16_t a_acl_idx) return -16; } - char **l_authorized_nodes_addrs = dap_config_get_array_str(l_cfg, "general", "authorized_nodes_addrs", &l_net_pvt->authorized_nodes_count); + const char **l_authorized_nodes_addrs = dap_config_get_array_str(l_cfg, "general", "authorized_nodes_addrs", &l_net_pvt->authorized_nodes_count); if (!l_net_pvt->authorized_nodes_count) log_it(L_WARNING, "Can't read PoA nodes addresses"); else @@ -1999,7 +1999,7 @@ int s_net_init(const char *a_net_name, uint16_t a_acl_idx) } l_net_pvt->authorized_nodes_addrs[i].uint64 = l_addr.uint64; } - char **l_seed_nodes_hosts = dap_config_get_array_str(l_cfg, "general", "seed_nodes_hosts", &l_net_pvt->seed_nodes_count); + const char **l_seed_nodes_hosts = dap_config_get_array_str(l_cfg, "general", "seed_nodes_hosts", &l_net_pvt->seed_nodes_count); if (!l_net_pvt->seed_nodes_count) l_seed_nodes_hosts = dap_config_get_array_str(l_cfg, "general", "bootstrap_hosts", &l_net_pvt->seed_nodes_count); if (!l_net_pvt->seed_nodes_count) @@ -2256,7 +2256,7 @@ bool s_net_load(void *a_arg) case NODE_ROLE_CELL_MASTER: case NODE_ROLE_MASTER:{ uint16_t l_proc_chains_count=0; - char **l_proc_chains = dap_config_get_array_str(l_net->pub.config, "role-master", "proc_chains", &l_proc_chains_count); + const char **l_proc_chains = dap_config_get_array_str(l_net->pub.config, "role-master", "proc_chains", &l_proc_chains_count); for (size_t i = 0; i< l_proc_chains_count ; i++) { dap_chain_id_t l_chain_id = {}; if (dap_chain_id_parse(l_proc_chains[i], &l_chain_id) == 0) { @@ -2379,7 +2379,7 @@ bool s_net_load(void *a_arg) } } if ( !l_net_pvt->node_info->ext_port ) { - char **l_listening = dap_config_get_array_str(g_config, "server", DAP_CFG_PARAM_LISTEN_ADDRS, NULL); + const char **l_listening = dap_config_get_array_str(g_config, "server", DAP_CFG_PARAM_LISTEN_ADDRS, NULL); l_net_pvt->node_info->ext_port = ( l_listening && dap_net_parse_config_address(*l_listening, NULL, &l_ext_port, NULL, NULL) > 0 && l_ext_port ) ? l_ext_port @@ -3076,7 +3076,7 @@ static bool s_net_check_acl(dap_chain_net_t *a_net, dap_chain_hash_fast_t *a_pke char l_auth_hash_str[DAP_CHAIN_HASH_FAST_STR_SIZE]; dap_chain_hash_fast_to_str(a_pkey_hash, l_auth_hash_str, sizeof(l_auth_hash_str)); uint16_t l_acl_list_len = 0; - char **l_acl_list = dap_config_get_array_str(a_net->pub.config, "auth", "acl_accept_ca_list", &l_acl_list_len); + const char **l_acl_list = dap_config_get_array_str(a_net->pub.config, "auth", "acl_accept_ca_list", &l_acl_list_len); for (uint16_t i = 0; i < l_acl_list_len; i++) { if (!strcmp(l_acl_list[i], l_auth_hash_str)) { l_authorized = true; diff --git a/modules/type/blocks/dap_chain_cs_blocks.c b/modules/type/blocks/dap_chain_cs_blocks.c index 5767887c8fbe56e0ee27362820a6e96ddf9327b0..395bbb2be0fe03b953c75bf3a6599b54d9bd50c3 100644 --- a/modules/type/blocks/dap_chain_cs_blocks.c +++ b/modules/type/blocks/dap_chain_cs_blocks.c @@ -331,7 +331,7 @@ static int s_chain_cs_blocks_new(dap_chain_t *a_chain, dap_config_t *a_chain_con l_cs_blocks_pvt->blocks_count = 0; uint16_t l_list_len = 0; - char **l_hard_accept_list = dap_config_get_array_str(a_chain_config, "blocks", "hard_accept_list", &l_list_len); + const char **l_hard_accept_list = dap_config_get_array_str(a_chain_config, "blocks", "hard_accept_list", &l_list_len); log_it(L_MSG, "HAL for blocks contains %d whitelisted events", l_list_len); for (uint16_t i = 0; i < l_list_len; i++) { struct cs_blocks_hal_item *l_hal_item = DAP_NEW_Z(struct cs_blocks_hal_item); diff --git a/modules/type/dag/dap_chain_cs_dag.c b/modules/type/dag/dap_chain_cs_dag.c index 5b218035b83821aed43e8971c78dba3fc79d0d65..9b7a2de327d5d8233ab0c78d2bd58d4ebb35a9d1 100644 --- a/modules/type/dag/dap_chain_cs_dag.c +++ b/modules/type/dag/dap_chain_cs_dag.c @@ -258,7 +258,7 @@ static int s_chain_cs_dag_new(dap_chain_t * a_chain, dap_config_t * a_chain_cfg) } } uint16_t l_list_len = 0; - char **l_hard_accept_list = dap_config_get_array_str(a_chain_cfg, "dag-poa", "hard_accept_list", &l_list_len); + const char **l_hard_accept_list = dap_config_get_array_str(a_chain_cfg, "dag-poa", "hard_accept_list", &l_list_len); log_it(L_MSG, "HAL contains %d whitelisted events", l_list_len); for (uint16_t i = 0; i < l_list_len; i++) { dap_chain_cs_dag_hal_item_t *l_hal_item = DAP_NEW_Z(dap_chain_cs_dag_hal_item_t);