diff --git a/modules/consensus/esbocs/dap_chain_cs_esbocs.c b/modules/consensus/esbocs/dap_chain_cs_esbocs.c index a4a682dae1acbdf4927e772366acfac01dbc5a47..0dd7a21bcab8312b1625463a2caced1f6da08298 100644 --- a/modules/consensus/esbocs/dap_chain_cs_esbocs.c +++ b/modules/consensus/esbocs/dap_chain_cs_esbocs.c @@ -237,7 +237,7 @@ static int s_callback_created(dap_chain_t *a_chain, dap_config_t *a_chain_net_cf // l_esbocs_pvt->minimum_fee = dap_chain_coins_to_balance(dap_config_get_item_str_default(a_chain_net_cfg, "esbocs", "minimum_fee", "0.05")); l_esbocs_pvt->fee_addr = dap_chain_addr_from_str(dap_config_get_item_str(a_chain_net_cfg, "esbocs", "fee_addr")); - l_esbocs_pvt->fee_coll_set = dap_chain_coins_to_balance(dap_config_get_item_str_default(a_chain_net_cfg, "esbocs", "set_collect_fee", "10.05")); + l_esbocs_pvt->fee_coll_set = dap_chain_coins_to_balance(dap_config_get_item_str_default(a_chain_net_cfg, "esbocs", "set_collect_fee", "10.0")); const char *l_sign_cert_str = NULL; if ((l_sign_cert_str = dap_config_get_item_str(a_chain_net_cfg, "esbocs", "blocks-sign-cert")) != NULL) { @@ -1115,6 +1115,7 @@ static void s_check_db_callback_fee_collect (dap_global_db_context_t *a_global_d 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; + char * l_hash_tx; l_block_cache = dap_chain_block_cs_cache_get_by_hash(l_blocks, &l_arg->block_hash); if(!l_block_cache) { @@ -1133,10 +1134,11 @@ static void s_check_db_callback_fee_collect (dap_global_db_context_t *a_global_d { if(compare256(l_value_out_block,l_arg->fee_need_cfg) == 1) { - dap_chain_mempool_tx_coll_fee_create(l_arg->key_from, l_arg->a_addr_to, + l_hash_tx = dap_chain_mempool_tx_coll_fee_create(l_arg->key_from, l_arg->a_addr_to, l_block_list, l_arg->value_fee, "hex"); - log_it(L_NOTICE, "Fee collect transaction successfully created"); - dap_global_db_del(block_fee_group, NULL, NULL, NULL); + log_it(L_NOTICE, "Fee collect transaction successfully created, hash=%s\n",l_hash_tx); + dap_global_db_del(block_fee_group, NULL, NULL, NULL); + DAP_DELETE(l_hash_tx); } else { @@ -1164,10 +1166,11 @@ static void s_check_db_callback_fee_collect (dap_global_db_context_t *a_global_d SUM_256_256(l_value_out_block,l_value_gdb,&l_value_total); if(compare256(l_value_total,l_arg->fee_need_cfg) == 1) { - dap_chain_mempool_tx_coll_fee_create(l_arg->key_from, l_arg->a_addr_to, + l_hash_tx = dap_chain_mempool_tx_coll_fee_create(l_arg->key_from, l_arg->a_addr_to, l_block_list, l_arg->value_fee, "hex"); dap_global_db_del(block_fee_group, NULL, NULL, NULL); - log_it(L_NOTICE, "Fee collect transaction successfully created"); + log_it(L_NOTICE, "Fee collect transaction successfully created, hash=%s\n",l_hash_tx); + DAP_DELETE(l_hash_tx); } else { 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 8efae77b3b4ffda46bda72692dd1c81edd56ce50..f94e497aa4bb03003fe1725ecbe4224cbb53128a 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 @@ -1264,7 +1264,7 @@ bool dap_chain_net_srv_stake_check_validator(dap_chain_net_t * a_net, dap_hash_f dap_sign_get_pkey_hash(l_sign, &l_sign_pkey_hash); l_sign_correct = dap_hash_fast_compare(&l_tx_out_cond->subtype.srv_stake_pos_delegate.signing_addr.data.hash_fast, &l_sign_pkey_hash); if (l_sign_correct) - l_sign_correct = dap_sign_verify_all(l_sign, validators_data->header.sign_size, l_test_data, sizeof(l_test_data)); + l_sign_correct = !dap_sign_verify_all(l_sign, validators_data->header.sign_size, l_test_data, sizeof(l_test_data)); } l_overall_correct = l_sign_correct && validators_data->header.flags == 0xCF; *out_data = *validators_data;