From d75c1e554ff468a91a786d03937f7f384835e98b Mon Sep 17 00:00:00 2001
From: "pavel.uhanov" <pavel.uhanov@demlabs.net>
Date: Thu, 27 Jun 2024 13:33:41 +0000
Subject: [PATCH] support-11005
---
dap-sdk | 2 +-
modules/common/dap_chain_datum.c | 7 +-
modules/common/dap_chain_datum_tx.c | 24 +++--
modules/mempool/dap_chain_mempool.c | 40 ++++-----
modules/net/dap_chain_ledger.c | 88 +++---------------
modules/net/dap_chain_net.c | 119 ++++++++-----------------
modules/net/dap_chain_net_balancer.c | 10 ++-
modules/net/dap_chain_node.c | 19 ++--
modules/net/dap_chain_node_cli_cmd.c | 5 +-
modules/net/include/dap_chain_ledger.h | 2 -
10 files changed, 97 insertions(+), 219 deletions(-)
diff --git a/dap-sdk b/dap-sdk
index 40146669e1..d7b44bbf0a 160000
--- a/dap-sdk
+++ b/dap-sdk
@@ -1 +1 @@
-Subproject commit 40146669e1c129c8dd3bf841ad8ab353c69a808f
+Subproject commit d7b44bbf0a05f38687dba28821502b71e5e7ba80
diff --git a/modules/common/dap_chain_datum.c b/modules/common/dap_chain_datum.c
index e21e4c20a0..f70b98db1c 100644
--- a/modules/common/dap_chain_datum.c
+++ b/modules/common/dap_chain_datum.c
@@ -47,11 +47,8 @@
*/
dap_chain_datum_t *dap_chain_datum_create(uint16_t a_type_id, const void *a_data, size_t a_data_size)
{
- dap_chain_datum_t *l_datum = DAP_NEW_Z_SIZE(dap_chain_datum_t, sizeof(l_datum->header) + a_data_size);
- if(!l_datum) {
- log_it(L_CRITICAL, "%s", g_error_memory_alloc);
- return NULL;
- }
+ dap_chain_datum_t *l_datum = NULL;
+ DAP_NEW_Z_SIZE_RET_VAL(l_datum, dap_chain_datum_t, sizeof(l_datum->header) + a_data_size, NULL, NULL);
*l_datum = (dap_chain_datum_t) {
.header = {
.version_id = DAP_CHAIN_DATUM_VERSION,
diff --git a/modules/common/dap_chain_datum_tx.c b/modules/common/dap_chain_datum_tx.c
index 01511bfd93..e8069c9cb6 100644
--- a/modules/common/dap_chain_datum_tx.c
+++ b/modules/common/dap_chain_datum_tx.c
@@ -296,40 +296,36 @@ int dap_chain_datum_tx_add_sign_item(dap_chain_datum_tx_t **a_tx, dap_enc_key_t
*
* return 1 Ok, 0 Invalid signature, -1 Not found signature or other Error
*/
-int dap_chain_datum_tx_verify_sign(dap_chain_datum_tx_t *tx)
+int dap_chain_datum_tx_verify_sign(dap_chain_datum_tx_t *a_tx)
{
- int ret = -1;
- if(!tx)
- return -2;
- uint32_t tx_items_pos = 0, tx_items_size = tx->header.tx_items_size;
+ dap_return_val_if_pass(!a_tx, -1);
+ int l_ret = 0;
+ uint32_t tx_items_pos = 0, tx_items_size = a_tx->header.tx_items_size;
while(tx_items_pos < tx_items_size) {
- uint8_t *item = tx->tx_items + tx_items_pos;
+ uint8_t *item = a_tx->tx_items + tx_items_pos;
size_t l_item_tx_size = dap_chain_datum_item_tx_get_size(item);
if(!l_item_tx_size || l_item_tx_size > tx_items_size)
- return -3;
+ return -2;
if(dap_chain_datum_tx_item_get_type(item) == TX_ITEM_TYPE_SIG) {
dap_chain_tx_sig_t *l_item_tx_sig = (dap_chain_tx_sig_t*) item;
dap_sign_t *l_sign = (dap_sign_t*) l_item_tx_sig->sig;
if ( ( l_sign->header.sign_size + l_sign->header.sign_pkey_size +sizeof (l_sign->header) )
> l_item_tx_size ){
log_it(L_WARNING,"Incorrect signature's header, possible corrupted data");
- return -4;
+ return -3;
}
- if (dap_sign_verify_all(l_sign, tx_items_size, tx->tx_items, tx_items_pos)) {
+ if ((l_ret = dap_sign_verify_all(l_sign, tx_items_size, a_tx->tx_items, tx_items_pos))) {
// invalid signature
- ret = 0;
tx_items_pos += l_item_tx_size;
break;
}
- // signature verify successfully
- ret = 1;
}
// sign item or items must be at the end, therefore ret will be changed later anyway
else
- ret = -4;
+ l_ret = -4;
// go to text item
tx_items_pos += l_item_tx_size;
}
assert(tx_items_pos == tx_items_size);
- return ret;
+ return l_ret;
}
diff --git a/modules/mempool/dap_chain_mempool.c b/modules/mempool/dap_chain_mempool.c
index 19b1f2a926..91d06c0e68 100644
--- a/modules/mempool/dap_chain_mempool.c
+++ b/modules/mempool/dap_chain_mempool.c
@@ -88,10 +88,7 @@ int dap_datum_mempool_init(void)
*/
char *dap_chain_mempool_datum_add(const dap_chain_datum_t *a_datum, dap_chain_t *a_chain, const char *a_hash_out_type)
{
- if( a_datum == NULL){
- log_it(L_ERROR, "NULL datum trying to add in mempool");
- return NULL;
- }
+ dap_return_val_if_pass(!a_datum, NULL);
dap_chain_hash_fast_t l_key_hash;
dap_hash_fast(a_datum->data, a_datum->header.data_size, &l_key_hash);
@@ -149,9 +146,8 @@ char *dap_chain_mempool_tx_create(dap_chain_t * a_chain, dap_enc_key_t *a_key_fr
uint256_t a_value, uint256_t a_value_fee, const char *a_hash_out_type)
{
// check valid param
- if(!a_chain | !a_key_from || ! a_addr_from || !a_key_from->priv_key_data || !a_key_from->priv_key_data_size ||
- dap_chain_addr_check_sum(a_addr_from) || (a_addr_to && dap_chain_addr_check_sum(a_addr_to)) || IS_ZERO_256(a_value))
- return NULL;
+ dap_return_val_if_pass(!a_chain | !a_key_from || !a_addr_from || !a_key_from->priv_key_data || !a_key_from->priv_key_data_size ||
+ dap_chain_addr_check_sum(a_addr_from) || (a_addr_to && dap_chain_addr_check_sum(a_addr_to)) || IS_ZERO_256(a_value), NULL);
const char *l_native_ticker = dap_chain_net_by_id(a_chain->net_id)->pub.native_ticker;
bool l_single_channel = !dap_strcmp(a_token_ticker, l_native_ticker);
@@ -577,7 +573,7 @@ int dap_chain_mempool_tx_create_massive( dap_chain_t * a_chain, dap_enc_key_t *a
return -2;
}
- dap_global_db_obj_t * l_objs = DAP_NEW_Z_SIZE(dap_global_db_obj_t, (a_tx_num + 1) * sizeof (dap_global_db_obj_t));
+ dap_global_db_obj_t * l_objs = DAP_NEW_Z_SIZE(dap_global_db_obj_t, a_tx_num * sizeof (dap_global_db_obj_t));
uint256_t l_net_fee = {}, l_total_fee = {};
dap_chain_addr_t l_addr_fee = {};
bool l_net_fee_used = dap_chain_net_tx_get_fee(a_chain->net_id, &l_net_fee, &l_addr_fee);
@@ -592,13 +588,13 @@ int dap_chain_mempool_tx_create_massive( dap_chain_t * a_chain, dap_enc_key_t *a
log_it(L_DEBUG, "Create %"DAP_UINT64_FORMAT_U" transactions, summary %s", a_tx_num, l_balance);
dap_ledger_t *l_ledger = dap_chain_net_by_id(a_chain->net_id)->pub.ledger;
dap_list_t *l_list_used_out = dap_ledger_get_list_tx_outs_with_val(l_ledger, a_token_ticker,
- a_addr_from, l_value_need, &l_value_transfer);
+ a_addr_from, l_value_need, &l_value_transfer);
if (!l_list_used_out) {
log_it(L_WARNING,"Not enough funds to transfer");
DAP_DELETE(l_objs);
return -2;
}
-
+
dap_chain_hash_fast_t l_tx_new_hash = {0};
for (size_t i=0; i< a_tx_num ; i++){
log_it(L_DEBUG, "Prepare tx %zu",i);
@@ -635,6 +631,7 @@ int dap_chain_mempool_tx_create_massive( dap_chain_t * a_chain, dap_enc_key_t *a
"Not enough values on output to produce enough inputs: %s when need ", l_balance);
strcat(l_log_str, dap_uint256_to_char(l_single_val, NULL));
log_it(L_ERROR, "%s", l_log_str);
+ dap_list_free_full(l_list_used_out, NULL);
DAP_DELETE(l_objs);
return -5;
}
@@ -645,6 +642,7 @@ int dap_chain_mempool_tx_create_massive( dap_chain_t * a_chain, dap_enc_key_t *a
SUM_256_256(l_value_pack, a_value, &l_value_pack);
else {
dap_chain_datum_tx_delete(l_tx_new);
+ dap_list_free_full(l_list_used_out, NULL);
DAP_DELETE(l_objs);
return -3;
}
@@ -654,6 +652,7 @@ int dap_chain_mempool_tx_create_massive( dap_chain_t * a_chain, dap_enc_key_t *a
SUM_256_256(l_value_pack, l_net_fee, &l_value_pack);
else {
dap_chain_datum_tx_delete(l_tx_new);
+ dap_list_free_full(l_list_used_out, NULL);
DAP_DELETE(l_objs);
return -3;
}
@@ -664,6 +663,7 @@ int dap_chain_mempool_tx_create_massive( dap_chain_t * a_chain, dap_enc_key_t *a
SUM_256_256(l_value_pack, a_value_fee, &l_value_pack);
else {
dap_chain_datum_tx_delete(l_tx_new);
+ dap_list_free_full(l_list_used_out, NULL);
DAP_DELETE(l_objs);
return -3;
}
@@ -673,6 +673,7 @@ int dap_chain_mempool_tx_create_massive( dap_chain_t * a_chain, dap_enc_key_t *a
if (!IS_ZERO_256(l_value_back)) {
if(dap_chain_datum_tx_add_out_item(&l_tx_new, a_addr_from, l_value_back) != 1) {
dap_chain_datum_tx_delete(l_tx_new);
+ dap_list_free_full(l_list_used_out, NULL);
DAP_DELETE(l_objs);
return -3;
}
@@ -681,6 +682,7 @@ int dap_chain_mempool_tx_create_massive( dap_chain_t * a_chain, dap_enc_key_t *a
// add 'sign' items
if(dap_chain_datum_tx_add_sign_item(&l_tx_new, a_key_from) != 1) {
dap_chain_datum_tx_delete(l_tx_new);
+ dap_list_free_full(l_list_used_out, NULL);
DAP_DELETE(l_objs);
return -4;
}
@@ -713,8 +715,8 @@ int dap_chain_mempool_tx_create_massive( dap_chain_t * a_chain, dap_enc_key_t *a
dap_chain_tx_used_out_item_t *l_item_back = DAP_NEW_Z(dap_chain_tx_used_out_item_t);
if (!l_item_back) {
log_it(L_CRITICAL, "%s", g_error_memory_alloc);
+ dap_list_free_full(l_list_used_out, NULL);
DAP_DELETE(l_objs);
- dap_list_free(l_list_out_items);
return -6;
}
*l_item_back = (dap_chain_tx_used_out_item_t) {
@@ -729,27 +731,25 @@ int dap_chain_mempool_tx_create_massive( dap_chain_t * a_chain, dap_enc_key_t *a
l_list_tmp = l_list_tmp->next;
l_out_idx_tmp++;
}
- dap_list_free(l_list_out_items);
}
SUBTRACT_256_256(l_value_transfer, l_value_pack, &l_value_transfer);
// Now produce datum
dap_chain_datum_t *l_datum = dap_chain_datum_create(DAP_CHAIN_DATUM_TX, l_tx_new, l_tx_size);
-
- dap_chain_datum_tx_delete(l_tx_new);
- //dap_ledger_tx_add( a_chain->ledger, l_tx);
-
+ //dap_global_db_set_sync(l_gdb_group, l_key_str, a_datum, dap_chain_datum_size(l_datum), false);
l_objs[i].key = dap_chain_hash_fast_to_str_new(&l_tx_new_hash);
l_objs[i].value = (uint8_t *)l_datum;
l_objs[i].value_len = dap_chain_datum_size(l_datum);
+ l_objs[i].timestamp = dap_nanotime_now();
log_it(L_DEBUG, "Prepared obj with key %s (value_len = %"DAP_UINT64_FORMAT_U")",
- l_objs[i].key? l_objs[i].key :"NULL" , l_objs[i].value_len );
+ l_objs[i].key ? l_objs[i].key :"NULL" , l_objs[i].value_len );
+ dap_chain_datum_tx_delete(l_tx_new);
+
}
dap_list_free_full(l_list_used_out, NULL);
-
char *l_gdb_group = dap_chain_net_get_gdb_group_mempool_new(a_chain);
dap_global_db_set_multiple_zc(l_gdb_group, l_objs, a_tx_num, s_tx_create_massive_gdb_save_callback, NULL);
- DAP_DELETE(l_gdb_group);
+ DAP_DEL_Z(l_gdb_group);
return 0;
}
@@ -770,7 +770,6 @@ static bool s_tx_create_massive_gdb_save_callback(dap_global_db_instance_t *a_db
const size_t a_values_total, const size_t a_values_count,
dap_global_db_obj_t *a_values, void *a_arg)
{
- DAP_DELETE(a_values);
if(!a_rc) {
log_it(L_NOTICE, "%zu transaction are placed in mempool", a_values_total);
return true;
@@ -1005,7 +1004,6 @@ char *dap_chain_mempool_tx_create_cond(dap_chain_net_t *a_net,
log_it( L_ERROR, "Can't add sign output");
return NULL;
}
-
size_t l_tx_size = dap_chain_datum_tx_get_size( l_tx );
dap_chain_datum_t *l_datum = dap_chain_datum_create( DAP_CHAIN_DATUM_TX, l_tx, l_tx_size );
dap_chain_datum_tx_delete(l_tx);
diff --git a/modules/net/dap_chain_ledger.c b/modules/net/dap_chain_ledger.c
index 40ccfc136e..3b2ce8bc10 100644
--- a/modules/net/dap_chain_ledger.c
+++ b/modules/net/dap_chain_ledger.c
@@ -336,12 +336,6 @@ typedef struct dap_ledger_private {
dap_list_t *tx_add_notifiers;
dap_ledger_cache_tx_check_callback_t cache_tx_check_callback;
- // TPS section
- dap_timerfd_t *tps_timer;
- struct timespec tps_start_time;
- struct timespec tps_current_time;
- struct timespec tps_end_time;
- size_t tps_count;
// Threshold fee
dap_interval_timer_t threshold_txs_free_timer, threshold_emissions_free_timer;
} dap_ledger_private_t;
@@ -363,7 +357,6 @@ static void s_threshold_emission_free(dap_ledger_t *a_ledger);
static int s_token_tsd_parse(dap_ledger_t * a_ledger, dap_ledger_token_item_t *a_token_item , dap_chain_datum_token_t * a_token, size_t a_token_size);
static int s_tsd_sign_apply(dap_ledger_t *a_ledger, dap_ledger_token_item_t *a_token_item , dap_chain_datum_token_t *a_token, size_t a_token_size);
static int s_ledger_permissions_check(dap_ledger_token_item_t * a_token_item, uint16_t a_permission_id, const void * a_data,size_t a_data_size );
-static bool s_ledger_tps_callback(void *a_arg);
static int s_sort_ledger_tx_item(dap_ledger_tx_item_t* a, dap_ledger_tx_item_t* b);
static size_t s_threshold_emissions_max = 1000;
@@ -3887,7 +3880,7 @@ int dap_ledger_tx_cache_check(dap_ledger_t *a_ledger,
int l_prev_tx_count = 0;
// 1. Verify signature in current transaction
- if (!a_from_threshold && dap_chain_datum_tx_verify_sign(a_tx) != 1)
+ if (!a_from_threshold && dap_chain_datum_tx_verify_sign(a_tx))
return DAP_LEDGER_TX_CHECK_INVALID_TX_SIGN;
// ----------------------------------------------------------------
@@ -4719,8 +4712,7 @@ int dap_ledger_tx_cache_check(dap_ledger_t *a_ledger,
*/
int dap_ledger_tx_add_check(dap_ledger_t *a_ledger, dap_chain_datum_tx_t *a_tx, size_t a_datum_size, dap_hash_fast_t *a_datum_hash)
{
- if (!a_tx)
- return DAP_LEDGER_TX_CHECK_NULL_TX;
+ dap_return_val_if_pass(!a_tx, DAP_LEDGER_TX_CHECK_NULL_TX);
size_t l_tx_size = dap_chain_datum_tx_get_size(a_tx);
if (l_tx_size != a_datum_size) {
@@ -4731,13 +4723,11 @@ int dap_ledger_tx_add_check(dap_ledger_t *a_ledger, dap_chain_datum_tx_t *a_tx,
int l_ret_check = dap_ledger_tx_cache_check(a_ledger, a_tx, a_datum_hash,
false, NULL, NULL, NULL, NULL, NULL, false);
if(s_debug_more) {
- char l_tx_hash_str[DAP_CHAIN_HASH_FAST_STR_SIZE];
- dap_chain_hash_fast_to_str(a_datum_hash, l_tx_hash_str, sizeof(l_tx_hash_str));
if (l_ret_check)
log_it(L_NOTICE, "Ledger TX adding check not passed for TX %s: error %s",
- l_tx_hash_str, dap_ledger_tx_check_err_str(l_ret_check));
+ dap_chain_hash_fast_to_str_static(a_datum_hash), dap_ledger_tx_check_err_str(l_ret_check));
else
- log_it(L_INFO, "Ledger TX adding check passed for TX %s", l_tx_hash_str);
+ log_it(L_INFO, "Ledger TX adding check passed for TX %s", dap_chain_hash_fast_to_str_static(a_datum_hash));
}
return l_ret_check;
@@ -4774,11 +4764,6 @@ static int s_sort_ledger_tx_item(dap_ledger_tx_item_t* a, dap_ledger_tx_item_t*
a->tx->header.ts_created < b->tx->header.ts_created ? -1 : 1;
}
-void dap_ledger_set_tps_start_time(dap_ledger_t *a_ledger)
-{
- clock_gettime(CLOCK_REALTIME, &PVT(a_ledger)->tps_start_time);
-}
-
/**
* @brief Add new transaction to the cache list
* @param a_ledger
@@ -4800,18 +4785,6 @@ int dap_ledger_tx_add(dap_ledger_t *a_ledger, dap_chain_datum_tx_t *a_tx, dap_ha
dap_ledger_tx_item_t *l_item_tmp = NULL;
char *l_main_token_ticker = NULL;
- if (!l_ledger_pvt->tps_timer) {
-#ifndef DAP_TPS_TEST
- dap_ledger_set_tps_start_time(a_ledger);
-#endif
- l_ledger_pvt->tps_current_time.tv_sec = l_ledger_pvt->tps_start_time.tv_sec;
- l_ledger_pvt->tps_current_time.tv_nsec = l_ledger_pvt->tps_start_time.tv_nsec;
- l_ledger_pvt->tps_count = 0;
- if (dap_events_workers_init_status())
- l_ledger_pvt->tps_timer = dap_timerfd_start(500, s_ledger_tps_callback, l_ledger_pvt);
- else
- l_ledger_pvt->tps_timer = NULL;
- }
bool l_from_threshold = a_from_threshold;
char l_tx_hash_str[DAP_CHAIN_HASH_FAST_STR_SIZE];
dap_chain_hash_fast_to_str(a_tx_hash, l_tx_hash_str, sizeof(l_tx_hash_str));
@@ -5142,9 +5115,6 @@ int dap_ledger_tx_add(dap_ledger_t *a_ledger, dap_chain_datum_tx_t *a_tx, dap_ha
l_notify->callback(a_ledger, a_tx, a_tx_hash, l_notify->arg, DAP_LEDGER_NOTIFY_OPCODE_ADDED);
}
}
- // Count TPS
- clock_gettime(CLOCK_REALTIME, &l_ledger_pvt->tps_end_time);
- l_ledger_pvt->tps_count++;
if (PVT(a_ledger)->cached) {
// Add it to cache
size_t l_tx_cache_sz = l_tx_size + sizeof(l_tx_item->cache_data);
@@ -5473,20 +5443,6 @@ FIN:
return l_ret;
}
-
-static bool s_ledger_tps_callback(void *a_arg)
-{
- dap_ledger_private_t *l_ledger_pvt = (dap_ledger_private_t *)a_arg;
- if (l_ledger_pvt->tps_current_time.tv_sec != l_ledger_pvt->tps_end_time.tv_sec ||
- l_ledger_pvt->tps_current_time.tv_nsec != l_ledger_pvt->tps_end_time.tv_nsec) {
- l_ledger_pvt->tps_current_time.tv_sec = l_ledger_pvt->tps_end_time.tv_sec;
- l_ledger_pvt->tps_current_time.tv_nsec = l_ledger_pvt->tps_end_time.tv_nsec;
- return true;
- }
- l_ledger_pvt->tps_timer = NULL;
- return false;
-}
-
int dap_ledger_tx_load(dap_ledger_t *a_ledger, dap_chain_datum_tx_t *a_tx, dap_chain_hash_fast_t *a_tx_hash)
{
#ifndef DAP_LEDGER_TEST
@@ -5660,44 +5616,26 @@ uint64_t dap_ledger_count_from_to(dap_ledger_t * a_ledger, dap_time_t a_ts_from,
pthread_rwlock_rdlock(&l_ledger_pvt->ledger_rwlock);
if ( a_ts_from && a_ts_to) {
HASH_ITER(hh, l_ledger_pvt->ledger_items , l_iter_current, l_item_tmp){
- if ( l_iter_current->tx->header.ts_created >= a_ts_from && l_iter_current->cache_data.ts_created <= a_ts_to )
- l_ret++;
+ if ( l_iter_current->tx->header.ts_created >= a_ts_from && l_iter_current->tx->header.ts_created <= a_ts_to )
+ l_ret++;
}
} else if ( a_ts_to ){
HASH_ITER(hh, l_ledger_pvt->ledger_items , l_iter_current, l_item_tmp){
if ( l_iter_current->tx->header.ts_created <= a_ts_to )
- l_ret++;
+ l_ret++;
}
} else if ( a_ts_from ){
HASH_ITER(hh, l_ledger_pvt->ledger_items , l_iter_current, l_item_tmp){
if ( l_iter_current->tx->header.ts_created >= a_ts_from )
- l_ret++;
- }
- }else {
- HASH_ITER(hh, l_ledger_pvt->ledger_items , l_iter_current, l_item_tmp){
- l_ret++;
+ l_ret++;
}
+ } else {
+ l_ret = HASH_COUNT(l_ledger_pvt->ledger_items);
}
-
pthread_rwlock_unlock(&l_ledger_pvt->ledger_rwlock);
return l_ret;
}
-size_t dap_ledger_count_tps(dap_ledger_t *a_ledger, struct timespec *a_ts_from, struct timespec *a_ts_to)
-{
- if (!a_ledger)
- return 0;
- dap_ledger_private_t *l_ledger_pvt = PVT(a_ledger);
- if (a_ts_from) {
- a_ts_from->tv_sec = l_ledger_pvt->tps_start_time.tv_sec;
- a_ts_from->tv_nsec = l_ledger_pvt->tps_start_time.tv_nsec;
- }
- if (a_ts_to) {
- a_ts_to->tv_sec = l_ledger_pvt->tps_end_time.tv_sec;
- a_ts_to->tv_nsec = l_ledger_pvt->tps_end_time.tv_nsec;
- }
- return l_ledger_pvt->tps_count;
-}
/**
* Check whether used 'out' items
@@ -5780,7 +5718,7 @@ uint256_t dap_ledger_calc_balance_full(dap_ledger_t *a_ledger, const dap_chain_a
if (!memcmp(a_addr, &l_tx_out->addr, sizeof(dap_chain_addr_t))) {
// if 'out' item not used & transaction is valid
if(!s_ledger_tx_hash_is_used_out_item(l_iter_current, l_out_idx_tmp, NULL) &&
- dap_chain_datum_tx_verify_sign(l_cur_tx)) {
+ !dap_chain_datum_tx_verify_sign(l_cur_tx)) {
uint256_t l_add = dap_chain_uint256_from(l_tx_out->header.value);
SUM_256_256(balance, l_add, &balance);
}
@@ -5796,7 +5734,7 @@ uint256_t dap_ledger_calc_balance_full(dap_ledger_t *a_ledger, const dap_chain_a
if (!memcmp(a_addr, &l_tx_out->addr, sizeof(dap_chain_addr_t))) {
// if 'out' item not used & transaction is valid
if(!s_ledger_tx_hash_is_used_out_item(l_iter_current, l_out_idx_tmp, NULL) &&
- dap_chain_datum_tx_verify_sign(l_cur_tx)) {
+ !dap_chain_datum_tx_verify_sign(l_cur_tx)) {
SUM_256_256(balance, l_tx_out->header.value, &balance);
}
}
@@ -5811,7 +5749,7 @@ uint256_t dap_ledger_calc_balance_full(dap_ledger_t *a_ledger, const dap_chain_a
if (!memcmp(a_addr, &l_tx_out->addr, sizeof(dap_chain_addr_t))) {
// if 'out' item not used & transaction is valid
if(!s_ledger_tx_hash_is_used_out_item(l_iter_current, l_out_idx_tmp, NULL) &&
- dap_chain_datum_tx_verify_sign(l_cur_tx)) {
+ !dap_chain_datum_tx_verify_sign(l_cur_tx)) {
SUM_256_256(balance, l_tx_out->header.value, &balance);
}
}
diff --git a/modules/net/dap_chain_net.c b/modules/net/dap_chain_net.c
index d4d21553ed..a0f31fdb38 100644
--- a/modules/net/dap_chain_net.c
+++ b/modules/net/dap_chain_net.c
@@ -383,12 +383,10 @@ int dap_chain_net_state_go_to(dap_chain_net_t *a_net, dap_chain_net_state_t a_ne
dap_link_manager_set_net_condition(a_net->pub.id.uint64, true);
for (uint16_t i = 0; i < PVT(a_net)->permanent_links_count; ++i) {
dap_link_info_t *l_permalink_info = PVT(a_net)->permanent_links[i];
- if (dap_link_manager_link_create(&l_permalink_info->node_addr, a_net->pub.id.uint64)) {
+ if (dap_chain_net_link_add(a_net, &l_permalink_info->node_addr, l_permalink_info->uplink_addr, l_permalink_info->uplink_port)) {
log_it(L_ERROR, "Can't create permanent link to addr " NODE_ADDR_FP_STR, NODE_ADDR_FP_ARGS_S(l_permalink_info->node_addr));
continue;
}
- if (l_permalink_info->uplink_port)
- dap_link_manager_link_update(&l_permalink_info->node_addr, l_permalink_info->uplink_addr, l_permalink_info->uplink_port);
}
if (a_new_state == NET_STATE_ONLINE)
dap_chain_esbocs_start_timer(a_net->pub.id);
@@ -396,10 +394,9 @@ int dap_chain_net_state_go_to(dap_chain_net_t *a_net, dap_chain_net_state_t a_ne
return dap_proc_thread_callback_add(NULL, s_net_states_proc, a_net);
}
-dap_chain_net_state_t dap_chain_net_get_target_state(dap_chain_net_t *a_net)
+DAP_INLINE dap_chain_net_state_t dap_chain_net_get_target_state(dap_chain_net_t *a_net)
{
- dap_chain_net_state_t l_ret = PVT(a_net)->state_target;
- return l_ret;
+ return PVT(a_net)->state_target;
}
static struct request_link_info *s_balancer_link_from_cfg(dap_chain_net_t *a_net)
@@ -1211,26 +1208,18 @@ static int s_cli_net(int argc, char **argv, void **reply)
dap_json_rpc_allocation_error;
return DAP_JSON_RPC_ERR_CODE_MEMORY_ALLOCATED;
}
- if (l_from_str) {
- json_object *l_jobj_from = json_object_new_string(l_from_str);
- if (!l_jobj_from) {
- json_object_put(l_jobj_return);
- json_object_put(l_jobj_stats);
- dap_json_rpc_allocation_error;
- return DAP_JSON_RPC_ERR_CODE_MEMORY_ALLOCATED;
- }
- json_object_object_add(l_jobj_stats, "from", l_jobj_from);
- }
- if (l_to_str) {
- json_object *l_jobj_to = json_object_new_string(l_to_str);
- if (!l_jobj_to) {
- json_object_put(l_jobj_return);
- json_object_put(l_jobj_stats);
- dap_json_rpc_allocation_error;
- return DAP_JSON_RPC_ERR_CODE_MEMORY_ALLOCATED;
- }
- json_object_object_add(l_jobj_stats, "to", l_jobj_to);
+ json_object *l_jobj_from = json_object_new_string(l_from_str_new);
+ json_object *l_jobj_to = json_object_new_string(l_to_str_new);
+ if (!l_jobj_from || !l_jobj_to) {
+ json_object_put(l_jobj_return);
+ json_object_put(l_jobj_stats);
+ json_object_put(l_jobj_from);
+ json_object_put(l_jobj_to);
+ dap_json_rpc_allocation_error;
+ return DAP_JSON_RPC_ERR_CODE_MEMORY_ALLOCATED;
}
+ json_object_object_add(l_jobj_stats, "from", l_jobj_from);
+ json_object_object_add(l_jobj_stats, "to", l_jobj_to);
log_it(L_INFO, "Calc TPS from %s to %s", l_from_str_new, l_to_str_new);
uint64_t l_tx_count = dap_ledger_count_from_to ( l_net->pub.ledger, l_from_ts, l_to_ts);
long double l_tpd = l_to_ts == l_from_ts ? 0 :
@@ -1239,74 +1228,38 @@ static int s_cli_net(int argc, char **argv, void **reply)
json_object *l_jobj_tpd = json_object_new_string(l_tpd_str);
DAP_DELETE(l_tpd_str);
json_object *l_jobj_total = json_object_new_uint64(l_tx_count);
+#ifdef DAP_TPS_TEST
+ long double l_tps = l_to_ts == l_from_ts ? 0 :
+ (long double) l_tx_count / (long double) (long double)(l_to_ts - l_from_ts);
+ char *l_tps_str = dap_strdup_printf("%.3Lf", l_tps);
+ json_object *l_jobj_tps = json_object_new_string(l_tps_str);
+ DAP_DELETE(l_tps_str);
+ if (!l_jobj_tpd || !l_jobj_total || !l_jobj_tps) {
+ json_object_put(l_jobj_tps);
+#else
if (!l_jobj_tpd || !l_jobj_total) {
+#endif
+
json_object_put(l_jobj_return);
json_object_put(l_jobj_stats);
+ json_object_put(l_jobj_from);
+ json_object_put(l_jobj_to);
json_object_put(l_jobj_tpd);
json_object_put(l_jobj_total);
dap_json_rpc_allocation_error;
return DAP_JSON_RPC_ERR_CODE_MEMORY_ALLOCATED;
}
+#ifdef DAP_TPS_TEST
+ json_object_object_add(l_jobj_stats, "transaction_per_sec", l_jobj_tps);
+#endif
json_object_object_add(l_jobj_stats, "transaction_per_day", l_jobj_tpd);
json_object_object_add(l_jobj_stats, "total", l_jobj_total);
json_object_object_add(l_jobj_return, "transaction_statistics", l_jobj_stats);
l_ret = DAP_CHAIN_NET_JSON_RPC_OK;
- }
-#ifdef DAP_TPS_TEST
- else if (strcmp(l_stats_str, "tps") == 0) {
- struct timespec l_from_time_acc = {}, l_to_time_acc = {};
- json_object *l_jobj_values = json_object_new_object();
- if (!l_jobj_values) {
- dap_json_rpc_allocation_error;
- return DAP_JSON_RPC_ERR_CODE_MEMORY_ALLOCATED;
- }
- size_t l_tx_num = dap_ledger_count_tps(l_net->pub.ledger, &l_from_time_acc, &l_to_time_acc);
- if (l_tx_num) {
- localtime_r(&l_from_time_acc.tv_sec, &l_from_tm);
- strftime(l_from_str_new, sizeof(l_from_str_new), c_time_fmt, &l_from_tm);
- localtime_r(&l_to_time_acc.tv_sec, &l_to_tm);
- strftime(l_to_str_new, sizeof(l_to_str_new), c_time_fmt, &l_to_tm);
- json_object *l_jobj_from = json_object_new_string(l_from_str_new);
- json_object *l_jobj_to = json_object_new_string(l_to_str_new);
- uint64_t l_diff_ns = (l_to_time_acc.tv_sec - l_from_time_acc.tv_sec) * 1000000000 +
- l_to_time_acc.tv_nsec - l_from_time_acc.tv_nsec;
- long double l_tps = (long double)(l_tx_num * 1000000000) / (long double)(l_diff_ns);
- char *l_tps_str = dap_strdup_printf("%.3Lf", l_tps);
- json_object *l_jobj_tps = json_object_new_string(l_tps_str);
- DAP_DELETE(l_tps_str);
- if (!l_jobj_from || !l_jobj_to || !l_jobj_tps) {
- json_object_put(l_jobj_return);
- json_object_put(l_jobj_values);
- json_object_put(l_jobj_from);
- json_object_put(l_jobj_to);
- json_object_put(l_jobj_tps);
- dap_json_rpc_allocation_error;
- return DAP_JSON_RPC_ERR_CODE_MEMORY_ALLOCATED;
- }
- json_object_object_add(l_jobj_values, "from", l_jobj_from);
- json_object_object_add(l_jobj_values, "to", l_jobj_to);
- json_object_object_add(l_jobj_values, "tps", l_jobj_tps);
- }
- json_object *l_jobj_total = json_object_new_uint64(l_tx_num);
- if (!l_jobj_total) {
- json_object_put(l_jobj_return);
- json_object_put(l_jobj_values);
- dap_json_rpc_allocation_error;
- return DAP_JSON_RPC_ERR_CODE_MEMORY_ALLOCATED;
- }
- json_object_object_add(l_jobj_values, "total", l_jobj_total);
- json_object_object_add(l_jobj_return, "transactions_per_second_peak", l_jobj_values);
- l_ret = DAP_CHAIN_NET_JSON_RPC_OK;
- }
-#endif
- else {
+ } else {
json_object_put(l_jobj_return);
-#ifdef DAP_TPS_TEST
- dap_json_rpc_error_add(DAP_CHAIN_NET_JSON_RPC_UNDEFINED_PARAMETER_COMMAND_STATS, "Subcommand 'stats' requires one of parameter: tx, tps");
-#else
dap_json_rpc_error_add(DAP_CHAIN_NET_JSON_RPC_UNDEFINED_PARAMETER_COMMAND_STATS, "%s",
"Subcommand 'stats' requires one of parameter: tx");
-#endif
return DAP_CHAIN_NET_JSON_RPC_UNDEFINED_PARAMETER_COMMAND_STATS;
}
} else if ( l_go_str){
@@ -1957,7 +1910,7 @@ int s_net_init(const char *a_net_name, uint16_t a_acl_idx)
return -4;
}
if (dap_stream_node_addr_from_str(&l_net_pvt->permanent_links[i]->node_addr, l_permanent_nodes_addrs[i])) {
- log_it(L_ERROR, "Incorrect format of address \"%s\", fix net config and restart node", l_permanent_nodes_addrs[i]);
+ log_it(L_ERROR, "Incorrect format of node address \"%s\", fix net config and restart node", l_permanent_nodes_addrs[i]);
dap_chain_net_delete(l_net);
dap_config_close(l_cfg);
return -16;
@@ -1969,7 +1922,7 @@ int s_net_init(const char *a_net_name, uint16_t a_acl_idx)
uint16_t l_port = 0;
char l_host[DAP_HOSTADDR_STRLEN + 1] = { '\0' };
if (dap_net_parse_hostname(l_permanent_links_hosts[i], l_host, &l_port) || !l_port) {
- log_it(L_ERROR, "Incorrect format of address \"%s\", fix net config and restart node",
+ log_it(L_ERROR, "Incorrect format of host \"%s\", fix net config or recheck internet connection, and restart node",
l_permanent_links_hosts[i]);
dap_chain_net_delete(l_net);
dap_config_close(l_cfg);
@@ -1987,7 +1940,7 @@ int s_net_init(const char *a_net_name, uint16_t a_acl_idx)
for (uint16_t i = 0; i < l_net_pvt->authorized_nodes_count; ++i) {
dap_chain_node_addr_t l_addr;
if (dap_stream_node_addr_from_str(&l_addr, l_authorized_nodes_addrs[i])) {
- log_it(L_ERROR, "Incorrect format of address \"%s\", fix net config and restart node", l_authorized_nodes_addrs[i]);
+ log_it(L_ERROR, "Incorrect format of node address \"%s\", fix net config and restart node", l_authorized_nodes_addrs[i]);
dap_chain_net_delete(l_net);
dap_config_close(l_cfg);
return -17;
@@ -2009,7 +1962,7 @@ int s_net_init(const char *a_net_name, uint16_t a_acl_idx)
uint16_t l_port = 0;
char l_host[DAP_HOSTADDR_STRLEN + 1] = { '\0' };
if (dap_net_parse_hostname(l_seed_nodes_hosts[i], l_host, &l_port) || !l_port) {
- log_it(L_ERROR, "Incorrect format of address \"%s\", fix net config and restart node",
+ log_it(L_ERROR, "Incorrect format of host \"%s\", fix net config or recheck internet connection, and restart node",
l_seed_nodes_hosts[i]);
dap_chain_net_delete(l_net);
dap_config_close(l_cfg);
@@ -3217,7 +3170,7 @@ int dap_chain_datum_add(dap_chain_t *a_chain, dap_chain_datum_t *a_datum, size_t
dap_chain_datum_tx_t *l_tx = (dap_chain_datum_tx_t *)a_datum->data;
size_t l_tx_size = dap_chain_datum_tx_get_size(l_tx);
if (l_tx_size != l_datum_data_size) {
- log_it(L_WARNING, "Corrupted trnsaction, datum size %zd is not equal to size of TX %zd", l_datum_data_size, l_tx_size);
+ log_it(L_WARNING, "Corrupted transaction, datum size %zd is not equal to size of TX %zd", l_datum_data_size, l_tx_size);
return -102;
}
return dap_ledger_tx_load(l_ledger, l_tx, a_datum_hash);
diff --git a/modules/net/dap_chain_net_balancer.c b/modules/net/dap_chain_net_balancer.c
index cbe144ca64..182a023c96 100644
--- a/modules/net/dap_chain_net_balancer.c
+++ b/modules/net/dap_chain_net_balancer.c
@@ -153,7 +153,7 @@ static void s_balancer_link_prepare_error(dap_balancer_link_request_t *a_request
struct json_object *l_json = s_balancer_states_json_collect(a_request->net, a_host_addr, a_host_port);
char l_err_str[512] = { '\0' };
snprintf(l_err_str, sizeof(l_err_str)
- , "Link from balancer %s:%u in net %s can't be prepared, errno %d"
+ , "Links from balancer %s:%u in net %s can't be prepared, connection errno %d"
, a_host_addr, a_host_port, a_request->net->pub.name, a_errno);
log_it(L_WARNING, "%s", l_err_str);
json_object_object_add(l_json, "errorMessage", json_object_new_string(l_err_str));
@@ -172,7 +172,7 @@ void s_http_balancer_link_prepare_success(void *a_response,
{
dap_balancer_link_request_t *l_balancer_request = (dap_balancer_link_request_t *)a_arg;
if (a_response_code != 200) {
- log_it(L_ERROR, "The server responded with code %d. It is not possible to install the link.", a_response_code);
+ log_it(L_ERROR, "The server responded with code %d. It is not possible to install the link to %s:%u in net %s", a_response_code, l_balancer_request->host_addr, l_balancer_request->host_port, l_balancer_request->net->pub.name);
s_balancer_link_prepare_error(l_balancer_request, l_balancer_request->host_addr, l_balancer_request->host_port, a_response_code);
l_balancer_request->request_info->request_time = dap_time_now();
DAP_DELETE(l_balancer_request);
@@ -185,6 +185,7 @@ void s_http_balancer_link_prepare_success(void *a_response,
log_it(L_ERROR, "Invalid balancer response size %zu (expected %zu) in net %s from %s:%u", a_response_size, l_response_size_need, l_balancer_request->net->pub.name, l_balancer_request->host_addr, l_balancer_request->host_port);
l_balancer_request->request_info->request_time = dap_time_now();
} else {
+ log_it(L_INFO, "Valid balancer response from %s:%u in net %s with %"DAP_UINT64_FORMAT_U" links", l_balancer_request->host_addr, l_balancer_request->host_port, l_balancer_request->net->pub.name, l_link_full_node_list->count_node);
s_balancer_link_prepare_success(l_balancer_request->net, l_link_full_node_list, l_balancer_request->host_addr, l_balancer_request->host_port);
l_balancer_request->request_info->request_time = 0;
}
@@ -220,7 +221,7 @@ static dap_chain_net_links_t *s_get_node_addrs(dap_chain_net_t *a_net, uint16_t
// preparing
dap_list_t *l_nodes_list = dap_chain_node_get_states_list_sort(a_net, a_ignored ? (dap_chain_node_addr_t *)a_ignored->nodes_info : (dap_chain_node_addr_t *)NULL, a_ignored ? a_ignored->count_node : 0);
if (!l_nodes_list) {
- log_it(L_DEBUG, "There isn't any nodes to list prepare in net %s", a_net->pub.name);
+ log_it(L_DEBUG, "There isn't any nodes to %s list prepare in net %s", a_external_call ? "external" : "local", a_net->pub.name);
if (!a_external_call)
return NULL;
}
@@ -357,7 +358,7 @@ int dap_chain_net_balancer_handshake(dap_chain_node_info_t *a_node_info, dap_cha
*/
void dap_chain_net_balancer_http_issue_link(dap_http_simple_t *a_http_simple, void *a_arg)
{
- log_it(L_DEBUG,"Proc enc http request");
+ log_it(L_DEBUG,"Proc enc http request from %s", a_http_simple->es_hostaddr);
http_status_code_t *l_return_code = (http_status_code_t *)a_arg;
if (strcmp(a_http_simple->http_client->url_path, DAP_BALANCER_URI_HASH)) {
@@ -467,6 +468,7 @@ int dap_chain_net_balancer_request(dap_chain_net_t *a_net, const char *a_host_ad
*l_links = s_get_node_addrs(a_net, l_required_links_count, l_ignored_addrs, false);
// links from local GDB
if (l_links) {
+ log_it(L_INFO, "%"DAP_UINT64_FORMAT_U" links successful prepared from global-db in net %s", l_links->count_node, a_net->pub.name);
s_balancer_link_prepare_success(a_net, l_links, NULL, 0);
if (l_links->count_node >= l_required_links_count) {
DAP_DEL_MULTY(l_ignored_addrs, l_links);
diff --git a/modules/net/dap_chain_node.c b/modules/net/dap_chain_node.c
index 30f6b15d65..829377cc71 100644
--- a/modules/net/dap_chain_node.c
+++ b/modules/net/dap_chain_node.c
@@ -411,12 +411,6 @@ dap_list_t *dap_chain_node_get_states_list_sort(dap_chain_net_t *a_net, dap_chai
log_it(L_ERROR, "Invalid record, key %s", l_objs[i].key);
continue;
}
- dap_nanotime_t l_timestamp = 0;
- dap_chain_node_net_states_info_t *l_store_obj = (dap_chain_node_net_states_info_t *)dap_global_db_get_sync(l_gdb_group, l_objs[i].key, NULL, NULL, &l_timestamp);
- if (!l_store_obj) {
- log_it(L_ERROR, "Can't find state about %s node", l_objs[i].key);
- continue;
- }
bool l_ignored = false;
for(size_t j = 0; !l_ignored && j < a_ignored_count; ++j) {
l_ignored = a_ignored[j].uint64 == ((dap_chain_node_info_t*)(l_objs + i)->value)->address.uint64;
@@ -430,14 +424,19 @@ dap_list_t *dap_chain_node_get_states_list_sort(dap_chain_net_t *a_net, dap_chai
log_it(L_ERROR, "%s", g_error_memory_alloc);
break;
}
+ dap_nanotime_t l_state_timestamp = 0;
+ dap_chain_node_net_states_info_t *l_state_store_obj = (dap_chain_node_net_states_info_t *)dap_global_db_get_sync(l_gdb_group, l_objs[i].key, NULL, NULL, &l_state_timestamp);
+ if (!l_state_store_obj) {
+ log_it(L_WARNING, "Can't find state about %s node, apply low priority", l_objs[i].key);
+ }
l_item->link_info.node_addr.uint64 = ((dap_chain_node_info_t*)(l_objs + i)->value)->address.uint64;
l_item->link_info.uplink_port = ((dap_chain_node_info_t*)(l_objs + i)->value)->ext_port;
dap_strncpy(l_item->link_info.uplink_addr, ((dap_chain_node_info_t*)(l_objs + i)->value)->ext_host, sizeof(l_item->link_info.uplink_addr) - 1);
- l_item->atoms_count = l_store_obj->atoms_count;
- l_item->downlinks_count = l_store_obj->downlinks_count;
- l_item->timestamp = l_timestamp;
+ l_item->atoms_count = l_state_store_obj ? l_state_store_obj->atoms_count : 0;
+ l_item->downlinks_count = l_state_store_obj ? l_state_store_obj->downlinks_count : (uint32_t)(-1);
+ l_item->timestamp = l_state_timestamp;
l_ret = dap_list_insert_sorted(l_ret, (void *)l_item, s_node_states_info_cmp);
- DAP_DELETE(l_store_obj);
+ DAP_DELETE(l_state_store_obj);
}
DAP_DELETE(l_gdb_group);
dap_global_db_objs_delete(l_objs, l_node_count);
diff --git a/modules/net/dap_chain_node_cli_cmd.c b/modules/net/dap_chain_node_cli_cmd.c
index d6b35ecd5b..6d3267ed48 100644
--- a/modules/net/dap_chain_node_cli_cmd.c
+++ b/modules/net/dap_chain_node_cli_cmd.c
@@ -3603,10 +3603,7 @@ int _cmd_mempool_proc_all(dap_chain_net_t *a_net, dap_chain_t *a_chain, void **a
json_object_object_add(l_ret, "warning", l_warn_obj);
}
-#ifdef DAP_TPS_TEST
- dap_chain_ledger_set_tps_start_time(a_net->pub.ledger);
-#endif
- dap_chain_node_mempool_process_all(a_chain, true);
+ dap_chain_node_mempool_process_all(a_chain, true);
char *l_str_result = dap_strdup_printf("The entire mempool has been processed in %s.%s.",
a_net->pub.name, a_chain->name);
if (!l_str_result) {
diff --git a/modules/net/include/dap_chain_ledger.h b/modules/net/include/dap_chain_ledger.h
index a9b58d5bc4..4766bae945 100644
--- a/modules/net/include/dap_chain_ledger.h
+++ b/modules/net/include/dap_chain_ledger.h
@@ -339,8 +339,6 @@ void dap_ledger_purge(dap_ledger_t *a_ledger, bool a_preserve_db);
*/
unsigned dap_ledger_count(dap_ledger_t *a_ledger);
uint64_t dap_ledger_count_from_to(dap_ledger_t * a_ledger, dap_time_t a_ts_from, dap_time_t a_ts_to);
-size_t dap_ledger_count_tps(dap_ledger_t *a_ledger, struct timespec *a_ts_from, struct timespec *a_ts_to);
-void dap_ledger_set_tps_start_time(dap_ledger_t *a_ledger);
/**
* Check whether used 'out' items
--
GitLab