Merge branch 'graphene-local/481-history-failed-proposal-ops' into bitshares
This commit is contained in:
commit
e2c7a946cb
1 changed files with 2 additions and 0 deletions
|
|
@ -257,6 +257,7 @@ processed_transaction database::push_proposal(const proposal_object& proposal)
|
||||||
eval_state.operation_results.reserve(proposal.proposed_transaction.operations.size());
|
eval_state.operation_results.reserve(proposal.proposed_transaction.operations.size());
|
||||||
processed_transaction ptrx(proposal.proposed_transaction);
|
processed_transaction ptrx(proposal.proposed_transaction);
|
||||||
eval_state._trx = &ptrx;
|
eval_state._trx = &ptrx;
|
||||||
|
size_t old_applied_ops_size = _applied_ops.size();
|
||||||
|
|
||||||
try {
|
try {
|
||||||
auto session = _undo_db.start_undo_session(true);
|
auto session = _undo_db.start_undo_session(true);
|
||||||
|
|
@ -265,6 +266,7 @@ processed_transaction database::push_proposal(const proposal_object& proposal)
|
||||||
remove(proposal);
|
remove(proposal);
|
||||||
session.merge();
|
session.merge();
|
||||||
} catch ( const fc::exception& e ) {
|
} catch ( const fc::exception& e ) {
|
||||||
|
_applied_ops.resize( old_applied_ops_size );
|
||||||
elog( "e", ("e",e.to_detail_string() ) );
|
elog( "e", ("e",e.to_detail_string() ) );
|
||||||
throw;
|
throw;
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue