From 58588fd2f203ed96bce1a0243dc03c03bfafaf6a Mon Sep 17 00:00:00 2001 From: Aleksandr Bezobchuk Date: Tue, 23 Jan 2024 10:58:06 -0800 Subject: [PATCH 1/2] updates --- baseapp/oe/optimistic_execution.go | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/baseapp/oe/optimistic_execution.go b/baseapp/oe/optimistic_execution.go index 2a6d34770955..c0c8e2575ac2 100644 --- a/baseapp/oe/optimistic_execution.go +++ b/baseapp/oe/optimistic_execution.go @@ -106,10 +106,13 @@ func (oe *OptimisticExecution) Execute(req *abci.RequestProcessProposal) { go func() { start := time.Now() resp, err := oe.finalizeBlockFunc(ctx, oe.request) + oe.mtx.Lock() + executionTime := time.Since(start) - oe.logger.Debug("OE finished", "duration", executionTime.String(), "height", req.Height, "hash", hex.EncodeToString(req.Hash)) + oe.logger.Debug("OE finished", "duration", executionTime.String(), "height", oe.request.Height, "hash", hex.EncodeToString(oe.request.Hash)) oe.response, oe.err = resp, err + close(oe.stopCh) oe.mtx.Unlock() }() From 9b2f810af19873f27e6dd70c3588266ade0d4751 Mon Sep 17 00:00:00 2001 From: Aleksandr Bezobchuk Date: Tue, 23 Jan 2024 10:59:26 -0800 Subject: [PATCH 2/2] updates --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 661d890e2091..ecbe80c8e344 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -80,6 +80,7 @@ Every Module contains its own CHANGELOG.md. Please refer to the module you are i ### Bug Fixes +* (baseapp) [#19198](https://github.com/cosmos/cosmos-sdk/pull/19198) Remove usage of pointers in logs in all OE goroutines. * (baseapp) [#19058](https://github.com/cosmos/cosmos-sdk/pull/19058) Fix baseapp posthandler branch would fail if the `runMsgs` had returned an error. * (baseapp) [#18609](https://github.com/cosmos/cosmos-sdk/issues/18609) Fixed accounting in the block gas meter after BeginBlock and before DeliverTx, ensuring transaction processing always starts with the expected zeroed out block gas meter. * (baseapp) [#18727](https://github.com/cosmos/cosmos-sdk/pull/18727) Ensure that `BaseApp.Init` firstly returns any errors from a nil commit multistore instead of panicking on nil dereferencing and before sealing the app.