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

Fix #88 If pushing generated block fails, then re-push all transactions to remove the failing transaction

Browse source
This commit is contained in:
Daniel Larimer 2015-06-25 10:03:18 -04:00
parent 88aeaa5e69
commit bf0ab60ceb
1 changed files with 17 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
libraries/chain/db_block.cpp
View file

@ -181,6 +181,8 @@ bool database::_push_block(const signed_block& new_block)
*/ */
processed_transaction database::push_transaction( const signed_transaction& trx, uint32_t skip ) processed_transaction database::push_transaction( const signed_transaction& trx, uint32_t skip )
{ {
_pending_block.timestamp = head_block_time();
processed_transaction result; processed_transaction result;
with_skip_flags( skip, [&]() with_skip_flags( skip, [&]()
{ {
@ -294,7 +296,21 @@ signed_block database::_generate_block(
signed_block tmp = _pending_block; signed_block tmp = _pending_block;
tmp.transaction_merkle_root = tmp.calculate_merkle_root(); tmp.transaction_merkle_root = tmp.calculate_merkle_root();
_pending_block.transactions.clear(); _pending_block.transactions.clear();
push_block( tmp, skip );
bool failed = false;
try { push_block( tmp, skip ); } catch ( const fc::exception& e ) { failed = true; }
if( failed )
{
for( const auto& trx : tmp.transactions )
{
try {
push_transaction( trx, skip );
} catch ( const fc::exception& e ) {
wlog( "Transaction is no longer valid: ${trx}", ("trx",trx) );
}
}
return _generate_block( when, witness_id, block_signing_private_key );
}
return tmp; return tmp;
} FC_CAPTURE_AND_RETHROW( (witness_id) ) } } FC_CAPTURE_AND_RETHROW( (witness_id) ) }