From a5ea75eec4ec2e115d897a6802afc78657150c5b Mon Sep 17 00:00:00 2001 From: Julien Robert Date: Tue, 7 Oct 2025 15:37:50 +0200 Subject: [PATCH] refactor(block): improve cancellation --- block/internal/executing/executor.go | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/block/internal/executing/executor.go b/block/internal/executing/executor.go index 2746ddc0ce..2876cb8c2f 100644 --- a/block/internal/executing/executor.go +++ b/block/internal/executing/executor.go @@ -381,11 +381,13 @@ func (e *Executor) produceBlock() error { return fmt.Errorf("failed to save block: %w", err) } - if err := e.store.SetHeight(e.ctx, newHeight); err != nil { + // Once the SaveBlockData has been saved we must update the height and the state. + // context.TODO() should be reverted to the real context (e.ctx) once https://github.com/evstack/ev-node/issues/2274 has been implemented, this prevents context cancellation + if err := e.store.SetHeight(context.TODO(), newHeight); err != nil { return fmt.Errorf("failed to update store height: %w", err) } - if err := e.updateState(e.ctx, newState); err != nil { + if err := e.updateState(context.TODO(), newState); err != nil { return fmt.Errorf("failed to update state: %w", err) }