From 0e1f43c8f18f80a42f4af4e1ca224bf0d3e64123 Mon Sep 17 00:00:00 2001
From: John Letey <john@noble.xyz>
Date: Thu, 4 Dec 2025 12:58:45 -0500
Subject: [PATCH] fix(baseapp): index pre-block events (#25642)

---
 CHANGELOG.md       | 1 +
 baseapp/baseapp.go | 1 +
 2 files changed, 2 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index d762834647..23f264b47b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -88,6 +88,7 @@ Ref: https://keepachangelog.com/en/1.0.0/
 * [GHSA-p22h-3m2v-cmgh](https://github.com/cosmos/cosmos-sdk/security/advisories/GHSA-p22h-3m2v-cmgh) Fix x/distribution can halt when historical rewards overflow.
 * (x/staking) [#25258](https://github.com/cosmos/cosmos-sdk/pull/25258) Add delegator address to redelegate event.
 * (cli) [#25485](https://github.com/cosmos/cosmos-sdk/pull/25485) Avoid failed to convert address field in `withdraw-validator-commission` cmd.
+* (baseapp) [#25642](https://github.com/cosmos/cosmos-sdk/pull/25642) Mark pre-block events for indexing based on local configuration.
 
 ### Deprecated
 
diff --git a/baseapp/baseapp.go b/baseapp/baseapp.go
index 31fd20b1f7..fed98a8ad6 100644
--- a/baseapp/baseapp.go
+++ b/baseapp/baseapp.go
@@ -670,6 +670,7 @@ func (app *BaseApp) preBlock(req *abci.RequestFinalizeBlock) ([]abci.Event, erro
 			finalizeState.SetContext(ctx)
 		}
 		events = ctx.EventManager().ABCIEvents()
+		events = sdk.MarkEventsToIndex(events, app.indexEvents)
 	}
 	return events, nil
 }