diff --git a/modules/ledger/dap_chain_ledger_anchor.c b/modules/ledger/dap_chain_ledger_anchor.c
index 56e073d0b4007e8546cb3402cbe6df8bc3ab4bcb..62732c28119305c94efc7b6b3a18ad84323c4da9 100644
--- a/modules/ledger/dap_chain_ledger_anchor.c
+++ b/modules/ledger/dap_chain_ledger_anchor.c
@@ -212,6 +212,8 @@ int dap_ledger_anchor_purge(dap_ledger_t *a_ledger, dap_chain_id_t a_chain_id)
if (l_decree) {
l_decree->is_applied = l_decree->wait_for_apply = false;
l_decree->anchor_hash = (dap_hash_fast_t) { };
+ if (l_decree->decree->header.sub_type == DAP_CHAIN_DATUM_DECREE_COMMON_SUBTYPE_REWARD)
+ dap_chain_net_remove_last_reward(a_ledger->net);
} else
log_it(L_ERROR, "Corrupted datum anchor, can't get decree by hash %s", dap_hash_fast_to_str_static(&l_decree_hash));
} else
diff --git a/modules/net-srv/dap_chain_net_srv_order.c b/modules/net-srv/dap_chain_net_srv_order.c
index bc45709734eddfd4afc072f7ffae5c00b6a07f39..108748a8722a4f06fe7049f7d0c0e4c15ef96a6f 100644
--- a/modules/net-srv/dap_chain_net_srv_order.c
+++ b/modules/net-srv/dap_chain_net_srv_order.c
@@ -83,11 +83,12 @@ void dap_chain_net_srv_order_deinit()
}
-int dap_chain_srv_order_pin_init() {
+int dap_chain_srv_order_pin_init()
+{
dap_list_t *l_group_list = dap_global_db_driver_get_groups_by_mask("*.service.orders");
for (dap_list_t *l_list = l_group_list; l_list; l_list = dap_list_next(l_list)) {
size_t l_ret_count;
- dap_store_obj_t * l_ret = dap_global_db_get_all_raw_sync((char*)l_list->data, &l_ret_count);
+ dap_store_obj_t *l_ret = dap_global_db_get_all_raw_sync((char*)l_list->data, &l_ret_count);
if (!l_ret) {
dap_store_obj_free(l_ret, l_ret_count);
return -2;
@@ -98,6 +99,8 @@ int dap_chain_srv_order_pin_init() {
dap_stream_node_addr_t l_addr = dap_stream_node_addr_from_cert(l_cert);
const char * l_node_addr_str = dap_stream_node_addr_to_str_static(l_addr);
for(size_t i = 0; i < l_ret_count; i++) {
+ if (dap_store_obj_get_type(l_ret + i) != DAP_GLOBAL_DB_OPTYPE_ADD)
+ continue;
const dap_chain_net_srv_order_t *l_order = dap_chain_net_srv_order_check(l_ret[i].key, l_ret[i].value, l_ret[i].value_len);
if (!l_order)
continue;
diff --git a/modules/net/dap_chain_net.c b/modules/net/dap_chain_net.c
index 1adccf4576c632a24628305a22eed3a3d83533e9..e256dee9826204303752e1037cab74aa10003a51 100644
--- a/modules/net/dap_chain_net.c
+++ b/modules/net/dap_chain_net.c
@@ -2816,7 +2816,9 @@ int dap_chain_net_add_reward(dap_chain_net_t *a_net, uint256_t a_reward, uint64_
void dap_chain_net_remove_last_reward(dap_chain_net_t *a_net)
{
- DL_DELETE(PVT(a_net)->rewards, PVT(a_net)->rewards);
+ struct block_reward *l_last_reward = PVT(a_net)->rewards;
+ DL_DELETE(PVT(a_net)->rewards, l_last_reward);
+ DAP_DELETE(l_last_reward);
}
uint256_t dap_chain_net_get_reward(dap_chain_net_t *a_net, uint64_t a_block_num)
diff --git a/modules/service/stake/dap_chain_net_srv_stake_pos_delegate.c b/modules/service/stake/dap_chain_net_srv_stake_pos_delegate.c
index 1df12d34ac10613f2c037524695ededc1a26a161..512720cc671f10f1764f580584f11b20e1679e42 100644
--- a/modules/service/stake/dap_chain_net_srv_stake_pos_delegate.c
+++ b/modules/service/stake/dap_chain_net_srv_stake_pos_delegate.c
@@ -803,7 +803,7 @@ static int s_pos_delegate_purge(dap_chain_net_id_t a_net_id, void *a_service_int
dap_global_db_erase_table(l_gdb_group, NULL, NULL);
DAP_DELETE(l_gdb_group);
char *l_approved_group = s_get_approved_group(l_net);
- dap_global_db_erase_table(l_approved_group, NULL, NULL);
+ dap_global_db_erase_table_sync(l_approved_group);
DAP_DELETE(l_approved_group);
struct srv_stake *l_srv_stake = (struct srv_stake *)a_service_internal;
@@ -1626,7 +1626,7 @@ void dap_chain_net_srv_stake_remove_approving_decree_info(dap_chain_net_t *a_net
// func work
char *l_delegated_group = s_get_approved_group(a_net);
const char *l_tx_hash_str = dap_chain_hash_fast_to_str_static(&l_stake->tx_hash);
- dap_global_db_del_sync(l_delegated_group, l_tx_hash_str);
+ dap_global_db_del(l_delegated_group, l_tx_hash_str, NULL, NULL);
DAP_DEL_Z(l_delegated_group);
}
diff --git a/modules/type/blocks/dap_chain_cs_blocks.c b/modules/type/blocks/dap_chain_cs_blocks.c
index 5be98b1c479a6cdab36f95930e7b6f2565ab6152..c0157e753626fbf6f56c7f57229007a019119057 100644
--- a/modules/type/blocks/dap_chain_cs_blocks.c
+++ b/modules/type/blocks/dap_chain_cs_blocks.c
@@ -392,7 +392,8 @@ static int s_chain_cs_blocks_new(dap_chain_t *a_chain, dap_config_t *a_chain_con
dap_chain_block_cache_t * dap_chain_block_cache_get_by_hash(dap_chain_cs_blocks_t * a_blocks, dap_chain_hash_fast_t *a_block_hash)
{
dap_chain_block_cache_t * l_ret = NULL;
- pthread_rwlock_rdlock(& PVT(a_blocks)->rwlock);
+ int err = pthread_rwlock_rdlock(& PVT(a_blocks)->rwlock);
+ assert(!err);
HASH_FIND(hh, PVT(a_blocks)->blocks,a_block_hash, sizeof (*a_block_hash), l_ret );
pthread_rwlock_unlock(& PVT(a_blocks)->rwlock);
return l_ret;
@@ -407,7 +408,8 @@ dap_chain_block_cache_t * dap_chain_block_cache_get_by_hash(dap_chain_cs_blocks_
dap_chain_block_cache_t * dap_chain_block_cache_get_by_number(dap_chain_cs_blocks_t * a_blocks, uint64_t a_block_number)
{
dap_chain_block_cache_t * l_ret = NULL;
- pthread_rwlock_rdlock(& PVT(a_blocks)->rwlock);
+ int err = pthread_rwlock_rdlock(& PVT(a_blocks)->rwlock);
+ assert(!err);
HASH_FIND_BYHASHVALUE(hh2, PVT(a_blocks)->blocks_num, &a_block_number, sizeof (a_block_number), a_block_number, l_ret);
pthread_rwlock_unlock(& PVT(a_blocks)->rwlock);
return l_ret;
@@ -1528,8 +1530,9 @@ static int s_callback_delete(dap_chain_t * a_chain)
{
s_callback_cs_blocks_purge(a_chain);
dap_chain_cs_blocks_t * l_blocks = DAP_CHAIN_CS_BLOCKS(a_chain);
- pthread_rwlock_wrlock(&PVT(l_blocks)->rwlock);
- if(l_blocks->callback_delete )
+ int err = pthread_rwlock_wrlock(&PVT(l_blocks)->rwlock);
+ assert(!err);
+ if (l_blocks->callback_delete)
l_blocks->callback_delete(l_blocks);
pthread_rwlock_unlock(&PVT(l_blocks)->rwlock);
pthread_rwlock_destroy(&PVT(l_blocks)->rwlock);
@@ -1557,7 +1560,8 @@ static int s_callback_cs_blocks_purge(dap_chain_t *a_chain)
DAP_DEL_Z(PVT(l_blocks)->forked_branches);
pthread_rwlock_unlock(&PVT(l_blocks)->forked_branches_rwlock);
- pthread_rwlock_wrlock(&PVT(l_blocks)->rwlock);
+ int err = pthread_rwlock_wrlock(&PVT(l_blocks)->rwlock);
+ assert(!err);
dap_chain_block_cache_t *l_block = NULL, *l_block_tmp = NULL;
HASH_ITER(hh, PVT(l_blocks)->blocks, l_block, l_block_tmp) {
HASH_DEL(PVT(l_blocks)->blocks, l_block);
@@ -1806,7 +1810,8 @@ static dap_chain_atom_verify_res_t s_callback_atom_add(dap_chain_t * a_chain, da
}
debug_if(s_debug_more, L_DEBUG, "... new block %s", l_block_cache->block_hash_str);
- pthread_rwlock_wrlock(& PVT(l_blocks)->rwlock);
+ int err = pthread_rwlock_wrlock(&PVT(l_blocks)->rwlock);
+ assert(!err);
if (!l_block_cache->is_genesis) {
dap_chain_block_cache_t *l_last_block = HASH_LAST(PVT(l_blocks)->blocks);
if (l_last_block && dap_hash_fast_compare(&l_last_block->block_hash, &l_block_prev_hash)){
@@ -1887,6 +1892,7 @@ static dap_chain_atom_verify_res_t s_callback_atom_add(dap_chain_t * a_chain, da
uint8_t *l_generation_meta = dap_chain_block_meta_get(l_block, a_atom_size, DAP_CHAIN_BLOCK_META_GENERATION);
uint16_t l_generation = l_generation_meta ? *(uint16_t *)l_generation_meta : 0;
if (l_generation && a_chain->generation < l_generation) {
+ pthread_rwlock_unlock(&PVT(l_blocks)->rwlock);
dap_hash_fast_t *l_hardfork_decree_hash = (dap_hash_fast_t *)dap_chain_block_meta_get(l_block, a_atom_size, DAP_CHAIN_BLOCK_META_LINK);
if (!l_hardfork_decree_hash) {
log_it(L_ERROR, "Can't find hardfork decree hash in candidate block meta");
@@ -1902,6 +1908,7 @@ static dap_chain_atom_verify_res_t s_callback_atom_add(dap_chain_t * a_chain, da
log_it(L_ERROR, "Can't accept hardfork genesis block %s: error in hardfork data restoring", dap_hash_fast_to_str_static(a_atom_hash));
return ATOM_REJECT;
}
+ pthread_rwlock_wrlock(&PVT(l_blocks)->rwlock);
}
HASH_ADD(hh, PVT(l_blocks)->blocks, block_hash, sizeof(l_block_cache->block_hash), l_block_cache);
HASH_ADD_BYHASHVALUE(hh2, PVT(l_blocks)->blocks_num, block_number, sizeof(l_block_cache->block_number), l_block_cache->block_number, l_block_cache);
@@ -1945,7 +1952,9 @@ static dap_chain_atom_verify_res_t s_callback_atom_add(dap_chain_t * a_chain, da
}
debug_if(s_debug_more, L_DEBUG, "... new block %s", l_block_cache->block_hash_str);
dap_chain_block_cache_t *l_prev_bcache = NULL, *l_tmp = NULL;
- pthread_rwlock_wrlock(& PVT(l_blocks)->rwlock); log_it(L_INFO, "New fork. Previous block hash %s, current block hash %s", dap_chain_hash_fast_to_str_static(&l_block_prev_hash),
+ int err = pthread_rwlock_wrlock(&PVT(l_blocks)->rwlock);
+ assert(!err);
+ log_it(L_INFO, "New fork. Previous block hash %s, current block hash %s", dap_chain_hash_fast_to_str_static(&l_block_prev_hash),
l_block_cache->block_hash_str);
HASH_FIND(hh, PVT(l_blocks)->blocks, &l_block_prev_hash, sizeof(dap_hash_fast_t), l_prev_bcache);
if (l_prev_bcache){
@@ -2103,8 +2112,9 @@ static dap_chain_atom_verify_res_t s_callback_atom_verify(dap_chain_t *a_chain,
if (l_bcache_last && dap_hash_fast_compare(&l_bcache_last->block_hash, &l_block_prev_hash))
ret = ATOM_ACCEPT;
else { // search block and previous block in forked branch
- pthread_rwlock_rdlock(& PVT(l_blocks)->rwlock);
- for (size_t i = 0; i < PVT(l_blocks)->forked_br_cnt; i++){
+ int err = pthread_rwlock_rdlock(&PVT(l_blocks)->rwlock);
+ assert(!err);
+ for (size_t i = 0; i < PVT(l_blocks)->forked_br_cnt; i++) {
dap_chain_block_forked_branch_t *l_cur_branch = PVT(l_blocks)->forked_branches[i];
dap_chain_block_forked_branch_atoms_table_t *l_item = NULL;
// Check block already present in forked branch
@@ -2219,7 +2229,8 @@ static dap_chain_atom_ptr_t s_callback_atom_iter_get_by_num(dap_chain_atom_iter_
assert(a_atom_iter);
dap_chain_cs_blocks_t *l_blocks = DAP_CHAIN_CS_BLOCKS(a_atom_iter->chain);
dap_chain_block_cache_t *l_block_cache = NULL;
- pthread_rwlock_rdlock(&PVT(l_blocks)->rwlock);
+ int err = pthread_rwlock_rdlock(&PVT(l_blocks)->rwlock);
+ assert(!err);
for (l_block_cache = PVT(l_blocks)->blocks; l_block_cache; l_block_cache = l_block_cache->hh.next)
if (l_block_cache->block_number == a_atom_num)
break;
@@ -2426,7 +2437,8 @@ static dap_chain_atom_ptr_t s_callback_atom_iter_get(dap_chain_atom_iter_t *a_at
log_it(L_ERROR, "l_blocks_pvt is NULL");
return NULL;
}
- pthread_rwlock_rdlock(&l_blocks_pvt->rwlock);
+ int err = pthread_rwlock_rdlock(&l_blocks_pvt->rwlock);
+ assert(!err);
switch (a_operation) {
case DAP_CHAIN_ITER_OP_FIRST:
a_atom_iter->cur_item = l_blocks_pvt->blocks;
@@ -2598,7 +2610,8 @@ static dap_chain_block_t *s_new_block_move(dap_chain_cs_blocks_t *a_blocks, size
size_t l_ret_size = 0;
dap_chain_block_t *l_ret = NULL;
dap_chain_cs_blocks_pvt_t *l_blocks_pvt = PVT(a_blocks);
- pthread_rwlock_wrlock(&l_blocks_pvt->rwlock);
+ int err = pthread_rwlock_wrlock(&l_blocks_pvt->rwlock);
+ assert(!err);
if ( a_blocks->block_new ) {
l_ret = a_blocks->block_new;
l_ret_size = a_blocks->block_new_size;
@@ -2625,7 +2638,8 @@ static size_t s_callback_add_datums(dap_chain_t *a_chain, dap_chain_datum_t **a_
// dap_chain_net_t *l_net = dap_chain_net_by_id(a_chain->net_id);
size_t l_datum_processed = 0;
- pthread_rwlock_wrlock(&l_blocks_pvt->rwlock);
+ int err = pthread_rwlock_wrlock(&l_blocks_pvt->rwlock);
+ assert(!err);
#ifdef DAP_TPS_TEST
log_it(L_TPS, "Start tps %zu datums add", a_datums_count);
#endif
@@ -2684,7 +2698,8 @@ static dap_list_t *s_callback_get_atoms(dap_chain_t *a_chain, size_t a_count, si
{
dap_chain_cs_blocks_t *l_blocks = DAP_CHAIN_CS_BLOCKS(a_chain);
dap_chain_cs_blocks_pvt_t *l_blocks_pvt = PVT(l_blocks);
- pthread_rwlock_rdlock(&PVT(l_blocks)->rwlock);
+ int err = pthread_rwlock_rdlock(&PVT(l_blocks)->rwlock);
+ assert(!err);
if (!l_blocks_pvt->blocks) {
pthread_rwlock_unlock(&PVT(l_blocks)->rwlock);
return NULL;