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

Always generate blocks linking to head_block_id()

Browse source
This commit is contained in:
theoreticalbts 2015-09-15 10:54:04 -04:00
parent 1177cfe0ed
commit c57806bb85
1 changed files with 6 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
libraries/chain/db_block.cpp
View file

@ -298,6 +298,12 @@ signed_block database::_generate_block(
_pending_block.transaction_merkle_root = _pending_block.calculate_merkle_root(); _pending_block.transaction_merkle_root = _pending_block.calculate_merkle_root();
_pending_block.witness = witness_id; _pending_block.witness = witness_id;
block_id_type head_id = head_block_id();
if( _pending_block.previous != head_id )
{
wlog( "_pending_block.previous was ${old}, setting to head_block_id ${new}", ("old", _pending_block.previous)("new", head_id) );
_pending_block.previous = head_id;
}
if( !(skip & skip_witness_signature) ) _pending_block.sign( block_signing_private_key ); if( !(skip & skip_witness_signature) ) _pending_block.sign( block_signing_private_key );
FC_ASSERT( fc::raw::pack_size(_pending_block) <= get_global_properties().parameters.maximum_block_size ); FC_ASSERT( fc::raw::pack_size(_pending_block) <= get_global_properties().parameters.maximum_block_size );