Peerplays_Blockchain/peerplays_migrated
1
0
Fork 0
Code Issues 35 Pull requests 4 Projects Releases 20 Packages Wiki Activity Actions

move skip_block_size_check to _apply_block for session restoring

Browse source
This commit is contained in:
Pavel Baykov 2021-12-13 10:44:44 +00:00
parent 696f99e6c9
commit f61ae7e5ba
1 changed files with 5 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
libraries/chain/db_block.cpp
View file

@ -570,12 +570,6 @@ signed_block database::_generate_block(
if( !(skip & skip_witness_signature) ) if( !(skip & skip_witness_signature) )
pending_block.sign( block_signing_private_key ); pending_block.sign( block_signing_private_key );
// TODO: Move this to _push_block() so session is restored.
if( !(skip & skip_block_size_check) )
{
FC_ASSERT( fc::raw::pack_size(pending_block) <= get_global_properties().parameters.maximum_block_size );
}
push_block( pending_block, skip | skip_transaction_signatures ); // skip authority check when pushing self-generated blocks push_block( pending_block, skip | skip_transaction_signatures ); // skip authority check when pushing self-generated blocks
return pending_block; return pending_block;
@ -664,6 +658,11 @@ void database::_apply_block( const signed_block& next_block )
uint32_t skip = get_node_properties().skip_flags; uint32_t skip = get_node_properties().skip_flags;
_applied_ops.clear(); _applied_ops.clear();
if( !(skip & skip_block_size_check) )
{
FC_ASSERT( fc::raw::pack_size(next_block) <= get_global_properties().parameters.maximum_block_size );
}
FC_ASSERT( (skip & skip_merkle_check) || next_block.transaction_merkle_root == next_block.calculate_merkle_root(), "", ("next_block.transaction_merkle_root",next_block.transaction_merkle_root)("calc",next_block.calculate_merkle_root())("next_block",next_block)("id",next_block.id()) ); FC_ASSERT( (skip & skip_merkle_check) || next_block.transaction_merkle_root == next_block.calculate_merkle_root(), "", ("next_block.transaction_merkle_root",next_block.transaction_merkle_root)("calc",next_block.calculate_merkle_root())("next_block",next_block)("id",next_block.id()) );
const witness_object& signing_witness = validate_block_header(skip, next_block); const witness_object& signing_witness = validate_block_header(skip, next_block);