diff --git a/dap-sdk b/dap-sdk
index 61bd9f38eac8773f0decc482f5488a2b520fcfb4..c2ffae04d9161d1c5fec16d0c71056f0ae2cb93c 160000
--- a/dap-sdk
+++ b/dap-sdk
@@ -1 +1 @@
-Subproject commit 61bd9f38eac8773f0decc482f5488a2b520fcfb4
+Subproject commit c2ffae04d9161d1c5fec16d0c71056f0ae2cb93c
diff --git a/modules/consensus/esbocs/dap_chain_cs_esbocs.c b/modules/consensus/esbocs/dap_chain_cs_esbocs.c
index 17eb59c3a318b92aab998c9a7afa20a39428c430..549de5d62917dc5b750ddfe4e2cd80a90c6cb4be 100644
--- a/modules/consensus/esbocs/dap_chain_cs_esbocs.c
+++ b/modules/consensus/esbocs/dap_chain_cs_esbocs.c
@@ -206,6 +206,9 @@ void dap_chain_cs_esbocs_deinit(void)
static int s_callback_new(dap_chain_t *a_chain, dap_config_t *a_chain_cfg)
{
dap_chain_cs_type_create("blocks", a_chain, a_chain_cfg);
+#ifdef DAP_LEDGER_TEST
+ return 0;
+#endif
const char *l_auth_certs_prefix = dap_config_get_item_str(a_chain_cfg, DAP_CHAIN_ESBOCS_CS_TYPE_STR, "auth_certs_prefix");
if (!l_auth_certs_prefix)
return -1;
@@ -215,13 +218,9 @@ static int s_callback_new(dap_chain_t *a_chain, dap_config_t *a_chain_cfg)
const char **l_addrs = dap_config_get_array_str(a_chain_cfg, DAP_CHAIN_ESBOCS_CS_TYPE_STR, "validators_addrs", &l_node_addrs_count);
if (!l_validators_count || l_node_addrs_count < l_validators_count)
return -2;
-
-//patch for tests
-#ifdef DAP_LEDGER_TEST
- return 0;
-#endif
+
dap_chain_cs_blocks_t *l_blocks = DAP_CHAIN_CS_BLOCKS(a_chain);
- int l_ret = 0, l_inited_cert = 0;
+ int l_ret = 0;
dap_chain_esbocs_t *l_esbocs = NULL;
DAP_NEW_Z_RET_VAL(l_esbocs, dap_chain_esbocs_t, -5, NULL);
l_esbocs->blocks = l_blocks;
@@ -249,7 +248,7 @@ static int s_callback_new(dap_chain_t *a_chain, dap_config_t *a_chain_cfg)
dap_strncpy(l_cert_name, l_auth_certs_prefix, l_dot_pos);
for (i = 0; i < l_auth_certs_count; ++i) {
dap_cert_t *l_cert_cur;
- l_pos2 = snprintf(l_cert_name + l_dot_pos, 16, ".%zu", i);
+ l_pos2 = snprintf(l_cert_name + l_dot_pos, 16, ".%u", i);
if ( !(l_cert_cur = dap_cert_find_by_name(l_cert_name)) ) {
dap_strncpy(l_cert_name + l_dot_pos + l_pos2, ".pub", l_len - l_dot_pos - l_pos2);
if ( !(l_cert_cur = dap_cert_find_by_name(l_cert_name)) ) {
diff --git a/modules/net/dap_chain_net.c b/modules/net/dap_chain_net.c
index 2511d510d2879dfd00e439e62e93cbbb533c3aa4..82f48854cdce9b33fed857bf7e3f12cec7e6dd15 100644
--- a/modules/net/dap_chain_net.c
+++ b/modules/net/dap_chain_net.c
@@ -1753,7 +1753,7 @@ void dap_chain_net_delete(dap_chain_net_t *a_net)
int dap_chain_net_test_init()
{
dap_chain_net_t *l_net = DAP_NEW_Z_SIZE( dap_chain_net_t, sizeof(dap_chain_net_t) + sizeof(dap_chain_net_pvt_t) );
- PVT(l_net)->node_info = DAP_NEW_Z_SIZE(dap_chain_net_t, sizeof(dap_chain_node_info_t) + DAP_HOSTADDR_STRLEN + 1 );
+ PVT(l_net)->node_info = DAP_NEW_Z_SIZE(dap_chain_node_info_t, sizeof(dap_chain_node_info_t) + DAP_HOSTADDR_STRLEN + 1 );
l_net->pub.id.uint64 = 0xFA0;
strcpy(l_net->pub.name, "Snet");
l_net->pub.gdb_groups_prefix = (const char*)l_net->pub.name;
@@ -1775,12 +1775,13 @@ int dap_chain_net_test_init()
*/
int s_net_init(const char *a_net_name, uint16_t a_acl_idx)
{
- char *l_cfg_path = dap_strdup_printf("network/%s", a_net_name);
- dap_config_t *l_cfg = dap_config_open(l_cfg_path);
- DAP_DELETE(l_cfg_path);
- if ( !l_cfg )
- return log_it(L_ERROR,"Can't open default network config %s", l_cfg_path), -1;
-
+ dap_config_t *l_cfg = NULL;
+ {
+ char l_cfg_path[strlen(a_net_name) + sizeof("network/")];
+ dap_stpcpy(dap_stpcpy(l_cfg_path, "network/"), a_net_name);
+ if (!( l_cfg = dap_config_open(l_cfg_path) ))
+ return log_it(L_ERROR,"Can't open default network config %s", l_cfg_path), -1;
+ }
dap_chain_net_t *l_net = s_net_new(a_net_name, l_cfg);
if ( !l_net )
return log_it(L_ERROR,"Can't create net \"%s\"", a_net_name), dap_config_close(l_cfg), -1;
@@ -2986,7 +2987,7 @@ void dap_chain_net_try_online_all() {
for (dap_chain_net_t *net = s_nets_by_name; net; net = net->hh.next) {
if (( l_ret = s_net_try_online(net) ))
- log_it(L_ERROR, "Can't try online state for net %s. Finished with (%d) error code.", net, l_ret);
+ log_it(L_ERROR, "Can't try online state for net %s. Finished with (%d) error code.", net->pub.name, l_ret);
}
}
diff --git a/modules/net/dap_chain_node.c b/modules/net/dap_chain_node.c
index 2522622171a24f884df1ea208336220d9f152a3f..352cc22b2f0f970d3c65f53e093ec557dbdd075f 100644
--- a/modules/net/dap_chain_node.c
+++ b/modules/net/dap_chain_node.c
@@ -133,7 +133,7 @@ static void s_states_info_to_str(dap_chain_net_t *a_net, const char *a_node_addr
return log_it(L_ERROR, "Can't find state of node %s in net %s", a_node_addr_str, a_net->pub.name);
if ( (l_data_size - sizeof(dap_chain_node_net_states_info_t)) % sizeof(dap_chain_node_addr_t) ) {
if ( (l_data_size - sizeof(dap_chain_node_net_states_info_v1_t)) % sizeof(dap_chain_node_addr_t) )
- return DAP_DELETE(l_node_info_data), log_it(L_ERROR, "Irrelevant size of node %s info");
+ return DAP_DELETE(l_node_info_data), log_it(L_ERROR, "Irrelevant size of node %s info", a_node_addr_str);
dap_chain_node_net_states_info_v1_t *l_info_old = (dap_chain_node_net_states_info_v1_t*)l_node_info_data;
l_node_info = DAP_NEW_Z_SIZE( dap_chain_node_net_states_info_t, sizeof(dap_chain_node_net_states_info_t)
+ (l_info_old->uplinks_count + l_info_old->downlinks_count) * sizeof(dap_chain_node_addr_t) );
@@ -513,7 +513,7 @@ dap_list_t *dap_chain_node_get_states_list_sort(dap_chain_net_t *a_net, dap_chai
} else {
if ( (l_data_size - sizeof(dap_chain_node_net_states_info_t)) % sizeof(dap_chain_node_addr_t) ) {
if ( (l_data_size - sizeof(dap_chain_node_net_states_info_v1_t)) % sizeof(dap_chain_node_addr_t) ) {
- log_it(L_ERROR, "Irrelevant size of node %s info, ignore it");
+ log_it(L_ERROR, "Irrelevant size of node %s info, ignore it", l_objs[i].key);
DAP_DEL_MULTY(l_node_info_data, l_item);
continue;
}
diff --git a/modules/net/dap_chain_node_cli_cmd.c b/modules/net/dap_chain_node_cli_cmd.c
index 726ba873f2cff3fdb4f50a6f762d1b7fe3ccd0ee..f4d5bbff06446efa04b4038a84dccf8ce57eda75 100644
--- a/modules/net/dap_chain_node_cli_cmd.c
+++ b/modules/net/dap_chain_node_cli_cmd.c
@@ -2623,7 +2623,7 @@ int com_token_decl_sign(int a_argc, char **a_argv, void **a_str_reply)
size_t l_data_size = l_tsd_size + l_signs_size;
l_datum_token = s_sign_cert_in_cycle(l_certs, l_datum_token, l_certs_count, &l_data_size,
&l_sign_counter);
- log_it(L_DEBUG, "Apply %zu signs to datum %s", l_sign_counter, l_datum_hash_hex_str);
+ log_it(L_DEBUG, "Apply %u signs to datum %s", l_sign_counter, l_datum_hash_hex_str);
if (!l_sign_counter) {
dap_cli_server_cmd_set_reply_text(a_str_reply, "Error! Used certs not valid");
DAP_DEL_MULTY(l_datum_token, l_datum_hash_hex_str, l_datum_hash_base58_str, l_gdb_group_mempool);
diff --git a/modules/net/include/dap_chain_ledger.h b/modules/net/include/dap_chain_ledger.h
index 88bde9717b40dbe9cad1153e0ca45228882317da..82ea2b02d1bf3705dd6606c602561929016a040d 100644
--- a/modules/net/include/dap_chain_ledger.h
+++ b/modules/net/include/dap_chain_ledger.h
@@ -267,7 +267,7 @@ void dap_ledger_set_local_cell_id(dap_ledger_t *a_ledger, dap_chain_cell_id_t a_
DAP_STATIC_INLINE char *dap_ledger_get_gdb_group(dap_ledger_t *a_ledger, const char *a_suffix)
{
- return a_ledger && a_ledger->net->pub.name && a_suffix
+ return a_ledger && *a_ledger->net->pub.name && a_suffix
? dap_strdup_printf("local.ledger-cache.%s.%s", a_ledger->net->pub.name, a_suffix)
: NULL;
}