fix(baseapp): index pre-block events (backport #25642) (#25644)

mergify[bot] · johnletey · aljo242 · web-flow · commit d004b2b3baba · 2025-12-08T13:20:57.000-05:00
Co-authored-by: John Letey &lt;john@noble.xyz&gt;
Co-authored-by: aljo242 &lt;alex@cosmoslabs.io&gt;
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -44,6 +44,7 @@ Ref: https://keepachangelog.com/en/1.0.0/
 
 ### Bug Fixes
 
+* (baseapp) [#25642](https://github.com/cosmos/cosmos-sdk/pull/25642) Mark pre-block events for indexing based on local configuration.
 * (baseapp) [#23879](https://github.com/cosmos/cosmos-sdk/pull/23879) Ensure finalize block response is not empty in the defer check of FinalizeBlock to avoid panic by nil pointer.
 * (query) [#23884](https://github.com/cosmos/cosmos-sdk/pull/23884) Fix NPE in query pagination.
 
diff --git a/baseapp/baseapp.go b/baseapp/baseapp.go
@@ -722,6 +722,7 @@ func (app *BaseApp) preBlock(req *abci.RequestFinalizeBlock) ([]abci.Event, erro
 			app.finalizeBlockState.SetContext(ctx)
 		}
 		events = ctx.EventManager().ABCIEvents()
+		events = sdk.MarkEventsToIndex(events, app.indexEvents)
 	}
 	return events, nil
 }

Original file line number	Diff line number	Diff line change
`@@ -722,6 +722,7 @@ func (app BaseApp) preBlock(req abci.RequestFinalizeBlock) ([]abci.Event, erro`
`722`	`722`	`app.finalizeBlockState.SetContext(ctx)`
`723`	`723`	`}`
`724`	`724`	`events = ctx.EventManager().ABCIEvents()`
	`725`	`+ events = sdk.MarkEventsToIndex(events, app.indexEvents)`
`725`	`726`	`}`
`726`	`727`	`return events, nil`
`727`	`728`	`}`