diff --git a/modules/consensus/dag-poa/dap_chain_cs_dag_poa.c b/modules/consensus/dag-poa/dap_chain_cs_dag_poa.c index ec6fe8d01abf6e735838ad477c11af79c71dce47..4331391841c4d3397321096aaf0cb9b0c910f4c1 100644 --- a/modules/consensus/dag-poa/dap_chain_cs_dag_poa.c +++ b/modules/consensus/dag-poa/dap_chain_cs_dag_poa.c @@ -211,7 +211,7 @@ static int s_cli_dag_poa(int argc, char ** argv, char **a_str_reply) bool l_event_is_ready = false; if ( l_event_new->header.signs_count >= l_event_round_cfg.confirmations_minimum ) { - log_it(L_NOTICE,"Event %s minimum confirmations completed", l_event_new_hash_base58_str); + log_it(L_NOTICE,"Event %s minimum confirmations completed", l_event_new_hash_hex_str); int l_ret_event_verify; l_dag->callback_cs_set_event_round_cfg(l_dag, &l_event_round_cfg); if ( ( l_ret_event_verify = l_dag->callback_cs_verify(l_dag, l_event_new, l_event_size_new)) == 0 ) { @@ -241,7 +241,7 @@ static int s_cli_dag_poa(int argc, char ** argv, char **a_str_reply) l_poa_pvt->events_sign_cert->name, l_event_new_hash_base58_str); } ret = 0; - dap_chain_net_sync_gdb(l_chain_net); // Propagate changes in pool + // dap_chain_net_sync_gdb(l_chain_net); // Propagate changes in pool if (l_event_is_ready) { dap_chain_cs_dag_poa_callback_timer_arg_t * l_callback_arg = DAP_NEW_Z(dap_chain_cs_dag_poa_callback_timer_arg_t); @@ -249,7 +249,8 @@ static int s_cli_dag_poa(int argc, char ** argv, char **a_str_reply) l_callback_arg->l_event_hash_hex_str = dap_strdup(l_event_new_hash_hex_str); memcpy(&l_callback_arg->event_round_cfg, &l_event_round_cfg, sizeof(dap_chain_cs_dag_event_round_cfg_t)); uint32_t l_timeout = l_event_round_cfg.confirmations_timeout; - if ( l_timeout <= ((uint64_t)time(NULL) - l_event_round_cfg.ts_confirmations_minimum_completed) ) { + // if ( l_timeout <= ((uint64_t)time(NULL) - l_event_round_cfg.ts_confirmations_minimum_completed) ) { + if ( l_event_new->header.signs_count >= l_poa_pvt->auth_certs_count) { s_callback_round_event_to_chain(l_callback_arg); } else { @@ -394,7 +395,7 @@ static bool s_callback_round_event_to_chain(dap_chain_cs_dag_poa_callback_timer_ dap_chain_global_db_gr_del(dap_strdup(a_callback_arg->l_event_hash_hex_str), l_dag->gdb_group_events_round_new); } dap_chain_cell_close(l_dag->chain->cells); - dap_chain_net_sync_all(l_net); + // dap_chain_net_sync_all(l_net); } } diff --git a/modules/type/dag/dap_chain_cs_dag.c b/modules/type/dag/dap_chain_cs_dag.c index 04134c4e04fd4cf4d8ae5b376c620d8a6d780f0c..8d81a7e50ad12638cb31c4215a9f356d47ac6548 100644 --- a/modules/type/dag/dap_chain_cs_dag.c +++ b/modules/type/dag/dap_chain_cs_dag.c @@ -1461,7 +1461,7 @@ static int s_cli_dag(int argc, char ** argv, char **a_str_reply) dap_string_free(l_str_ret_tmp,false); // Spread new mempool changes and dag events in network - going to SYNC_ALL - dap_chain_net_sync_all(l_net); + // dap_chain_net_sync_all(l_net); } }else if ( l_event_cmd_str ) { char *l_datum_hash_hex_str = NULL; @@ -1556,7 +1556,7 @@ static int s_cli_dag(int argc, char ** argv, char **a_str_reply) DAP_DELETE(l_gdb_group_mempool); DAP_DELETE(l_datum_hash_hex_str); DAP_DELETE(l_datum_hash_base58_str); - dap_chain_net_sync_all(l_net); + // dap_chain_net_sync_all(l_net); }break; case SUBCMD_EVENT_CANCEL:{ char * l_gdb_group_events = DAP_CHAIN_CS_DAG(l_chain)->gdb_group_events_round_new; @@ -1612,8 +1612,8 @@ static int s_cli_dag(int argc, char ** argv, char **a_str_reply) } DAP_DELETE(l_event_hash_hex_str); DAP_DELETE(l_event_hash_base58_str); - DAP_DELETE( l_gdb_group_events ); - dap_chain_net_sync_gdb(l_net); + // DAP_DELETE( l_gdb_group_events ); + // dap_chain_net_sync_gdb(l_net); }break; case SUBCMD_EVENT_DUMP:{ dap_chain_cs_dag_event_t * l_event = NULL; @@ -1630,7 +1630,6 @@ static int s_cli_dag(int argc, char ** argv, char **a_str_reply) }else if ( strcmp(l_from_events_str,"events_lasts") == 0){ dap_chain_cs_dag_event_item_t * l_event_item = NULL; - dap_chain_cs_dag_event_round_cfg_t l_event_round_cfg; pthread_rwlock_rdlock(&PVT(l_dag)->events_rwlock); HASH_FIND(hh,PVT(l_dag)->events_lasts_unlinked,&l_event_hash,sizeof(l_event_hash),l_event_item); pthread_rwlock_unlock(&PVT(l_dag)->events_rwlock); diff --git a/modules/type/dag/dap_chain_cs_dag_event.c b/modules/type/dag/dap_chain_cs_dag_event.c index a9d1c3776fd361b148ea6ddf52dd5405b27b3625..bcdb5ce1e101de818a5964e4f35298b1e32fe55e 100644 --- a/modules/type/dag/dap_chain_cs_dag_event.c +++ b/modules/type/dag/dap_chain_cs_dag_event.c @@ -146,9 +146,10 @@ dap_chain_cs_dag_event_t * dap_chain_cs_dag_event_copy_with_sign_add( dap_chain_ l_offset += l_sign_size; } DAP_DELETE(l_addr_str); - dap_chain_cs_dag_event_t * l_event_new = DAP_NEW_Z_SIZE(dap_chain_cs_dag_event_t, l_event_size+l_sign_size); - memcpy(l_event_new, a_event, l_event_size); + + dap_chain_cs_dag_event_t * l_event_new = DAP_REALLOC(a_event, l_event_size+l_sign_size); memcpy(l_event_new->hashes_n_datum_n_signs+l_offset, l_sign, l_sign_size); + *a_event_size_new = l_event_size+l_sign_size; l_event_new->header.signs_count++; return l_event_new; }