From e515fe6a4375380d3072e37e17c63d9fecde5252 Mon Sep 17 00:00:00 2001 From: Teddy Ding Date: Mon, 21 Oct 2024 18:08:11 -0400 Subject: [PATCH] Always abort OE in `FinalizeBlock` --- baseapp/abci.go | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/baseapp/abci.go b/baseapp/abci.go index 112a128c0927..e3dc7baaf372 100644 --- a/baseapp/abci.go +++ b/baseapp/abci.go @@ -910,6 +910,8 @@ func (app *BaseApp) FinalizeBlock(req *abci.RequestFinalizeBlock) (res *abci.Res // Wait for the OE to finish, regardless of whether it was aborted or not res, err = app.optimisticExec.WaitResult() + app.optimisticExec.Reset() + // only return if we are not aborting if !aborted { if res != nil { @@ -921,7 +923,6 @@ func (app *BaseApp) FinalizeBlock(req *abci.RequestFinalizeBlock) (res *abci.Res // if it was aborted, we need to reset the state app.finalizeBlockState = nil - app.optimisticExec.Reset() } // if no OE is running, just run the block (this is either a block replay or a OE that got aborted)