Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions libraries/chain/controller.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -4108,6 +4108,10 @@ void controller::set_disable_replay_opts( bool v ) {
my->conf.disable_replay_opts = v;
}

bool controller::is_replaying() const {
return my->replaying;
}

block_handle controller::head()const {
return my->chain_head;
}
Expand Down
2 changes: 2 additions & 0 deletions libraries/chain/include/sysio/chain/controller.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -286,6 +286,8 @@ namespace sysio::chain {
void set_key_blacklist( const flat_set<public_key_type>& );

void set_disable_replay_opts( bool v );
// thread safe
bool is_replaying() const;

block_handle head()const;
block_handle fork_db_head()const;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -171,7 +171,9 @@ struct sysvmoc_tier {
// Not allowing interrupt for onblock seems rather harmless, so instead of distinguishing between onerror and
// onblock, just disallow for all implicit.
const bool allow_oc_interrupt = attempt_tierup && context.is_applying_block() &&
context.trx_context.has_undo() && !context.trx_context.is_implicit();
context.trx_context.has_undo() &&
!context.trx_context.is_implicit() &&
!context.control.is_replaying();
auto ex = fc::make_scoped_exit([&]() {
if (allow_oc_interrupt) {
sys_vm_oc_compile_interrupt = false;
Expand Down