diff --git a/dap-sdk b/dap-sdk index 6433d931b917ceb7b71967817acc03c454dabb30..f2e28810dca3e5cf9575a28109e860bd19fda2be 160000 --- a/dap-sdk +++ b/dap-sdk @@ -1 +1 @@ -Subproject commit 6433d931b917ceb7b71967817acc03c454dabb30 +Subproject commit f2e28810dca3e5cf9575a28109e860bd19fda2be diff --git a/modules/chain/dap_chain.c b/modules/chain/dap_chain.c index c8080919dc9b702c7fb87364f50f6edf9d7425df..08bf39a7898effd57524bb9d52ffe0c29ff8b772 100644 --- a/modules/chain/dap_chain.c +++ b/modules/chain/dap_chain.c @@ -590,7 +590,7 @@ bool download_notify_callback(dap_chain_t* a_chain) { json_object_object_add(l_chain_info, "chain_id", json_object_new_uint64(a_chain->id.uint64)); json_object_object_add(l_chain_info, "load_progress", json_object_new_int(a_chain->load_progress)); dap_notify_server_send_mt(json_object_get_string(l_chain_info)); - log_it(L_DEBUG, "Load progress: net_name: %s; chain_id: %d; download:%d%c", a_chain->net_name, a_chain->id.uint64, a_chain->load_progress, '%'); + log_it(L_DEBUG, "Load progress: net_name: %s; chain_id: %" DAP_UINT64_FORMAT_U "; download:%d%%", a_chain->net_name, a_chain->id.uint64, a_chain->load_progress); json_object_put(l_chain_info); return true; } diff --git a/modules/type/dag/dap_chain_cs_dag.c b/modules/type/dag/dap_chain_cs_dag.c index 84dc44b8c4ecf071cd4d51321c4d1e21f6ead521..5a3555f1ddae374e0a96d947e0d325e2d318e23f 100644 --- a/modules/type/dag/dap_chain_cs_dag.c +++ b/modules/type/dag/dap_chain_cs_dag.c @@ -1392,10 +1392,12 @@ static int s_cli_dag(int argc, char ** argv, void **a_str_reply) } log_it(L_NOTICE,"Round complete command accepted, forming new events"); - size_t l_objs_size=0; + size_t l_objs_size = 0; dap_global_db_obj_t * l_objs = dap_global_db_get_all_sync(l_dag->gdb_group_events_round_new,&l_objs_size); - dap_string_t *l_str_ret_tmp= l_objs_size>0 ? json_object_object_add(json_obj_round,"round status", json_object_new_string("Completing round")): - json_object_object_add(json_obj_round,"round status", json_object_new_string("Completing round: no data")); + if (l_objs_size) + json_object_object_add(json_obj_round,"round status", json_object_new_string("Completing round")); + else + json_object_object_add(json_obj_round,"round status", json_object_new_string("Completing round: no data")); // list for verifed and added events dap_list_t *l_list_to_del = NULL; @@ -1448,7 +1450,6 @@ static int s_cli_dag(int argc, char ** argv, void **a_str_reply) // Cleaning up dap_global_db_objs_delete(l_objs, l_objs_size); json_object_array_add(*json_arr_reply, json_obj_round); - dap_string_free(l_str_ret_tmp, true); // Spread new mempool changes and dag events in network - going to SYNC_ALL // dap_chain_net_sync_all(l_net); @@ -1828,9 +1829,8 @@ static int s_cli_dag(int argc, char ** argv, void **a_str_reply) json_object_object_add(json_obj_event_count,"chain", json_object_new_string(l_chain->name)); const char * l_gdb_group_events = DAP_CHAIN_CS_DAG(l_chain)->gdb_group_events_round_new; if (l_gdb_group_events) { - size_t l_objs_count = 0; - dap_global_db_obj_t *l_objs = dap_global_db_get_all_sync(l_gdb_group_events,&l_objs_count); - json_object_object_add(json_obj_event_count,"event count in round new", json_object_new_string(l_objs_count)); + size_t l_objs_count = dap_global_db_driver_count(l_gdb_group_events, c_dap_global_db_driver_hash_blank, false); + json_object_object_add(json_obj_event_count, "event count in round new", json_object_new_int(l_objs_count)); } size_t l_event_count = HASH_COUNT(PVT(l_dag)->events); size_t l_event_treshold_count = HASH_COUNT(PVT(l_dag)->events_treshold);