From 5e22cc9ea0170ad21fd256c425df7588470cc6a9 Mon Sep 17 00:00:00 2001 From: "roman.padenkov" <roman.padenkov@demlabs.net> Date: Wed, 5 Jul 2023 07:55:45 +0000 Subject: [PATCH] bugs-8875 --- dap-sdk | 2 +- modules/consensus/esbocs/dap_chain_cs_esbocs.c | 3 ++- modules/consensus/esbocs/include/dap_chain_cs_esbocs.h | 1 - 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dap-sdk b/dap-sdk index 7c49451ccc..f11700de7f 160000 --- a/dap-sdk +++ b/dap-sdk @@ -1 +1 @@ -Subproject commit 7c49451ccc299d61ab8d1b15e2c6fc9336cd2d44 +Subproject commit f11700de7f924d6f09a433fa8e02bff1b5bedcc1 diff --git a/modules/consensus/esbocs/dap_chain_cs_esbocs.c b/modules/consensus/esbocs/dap_chain_cs_esbocs.c index 6fa8a5afe0..f9471f2ab1 100644 --- a/modules/consensus/esbocs/dap_chain_cs_esbocs.c +++ b/modules/consensus/esbocs/dap_chain_cs_esbocs.c @@ -1299,6 +1299,7 @@ static void s_check_db_callback_fee_collect (UNUSED_ARG dap_global_db_context_t dap_chain_block_cache_t *l_block_cache = NULL; dap_chain_cs_blocks_t *l_blocks = DAP_CHAIN_CS_BLOCKS(l_chain); dap_list_t *l_block_list = NULL; + log_it(L_MSG, "Fee collector start work"); l_block_cache = dap_chain_block_cs_cache_get_by_hash(l_blocks, &l_arg->block_hash); if(!l_block_cache) { @@ -1441,7 +1442,7 @@ static void s_session_round_finish(dap_chain_esbocs_session_t *a_session, dap_ch tmp->chain = l_chain; tmp->value_fee = PVT(a_session->esbocs)->minimum_fee; tmp->fee_need_cfg = PVT(a_session->esbocs)->fee_coll_set; - tmp->key_from = a_session->blocks_sign_key; + tmp->key_from = PVT(a_session->esbocs)->blocks_sign_key; dap_global_db_get_all(s_block_fee_group,0,s_check_db_callback_fee_collect,tmp); } diff --git a/modules/consensus/esbocs/include/dap_chain_cs_esbocs.h b/modules/consensus/esbocs/include/dap_chain_cs_esbocs.h index 61df118cea..6d99bb1b69 100644 --- a/modules/consensus/esbocs/include/dap_chain_cs_esbocs.h +++ b/modules/consensus/esbocs/include/dap_chain_cs_esbocs.h @@ -168,7 +168,6 @@ typedef struct dap_chain_esbocs_session { dap_chain_esbocs_sync_item_t *sync_items; dap_timerfd_t *sync_timer; - dap_enc_key_t *blocks_sign_key; dap_chain_addr_t my_signing_addr; dap_chain_esbocs_penalty_item_t *penalty; -- GitLab