Skip to content

Conversation

@mergify
Copy link
Contributor

@mergify mergify bot commented Dec 4, 2025

Description

Closes: #25640


This is an automatic backport of pull request #25642 done by [Mergify](https://mergify.com).

(cherry picked from commit 0e1f43c)

# Conflicts:
#	CHANGELOG.md
@mergify mergify bot added the conflicts label Dec 4, 2025
@mergify
Copy link
Contributor Author

mergify bot commented Dec 4, 2025

Cherry-pick of 0e1f43c has failed:

On branch mergify/bp/release/v0.50.x/pr-25642
Your branch is up to date with 'origin/release/v0.50.x'.

You are currently cherry-picking commit 0e1f43c8f.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:
	modified:   baseapp/baseapp.go

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   CHANGELOG.md

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally

Comment on lines 722 to 728
app.finalizeBlockState.SetContext(ctx)
}
events = ctx.EventManager().ABCIEvents()
events = sdk.MarkEventsToIndex(events, app.indexEvents)
}
return events, nil
}
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Change potentially affects state.

Call sequence:

(*github.com/cosmos/cosmos-sdk/baseapp.BaseApp).preBlock (baseapp/baseapp.go:707)
(*github.com/cosmos/cosmos-sdk/baseapp.BaseApp).internalFinalizeBlock (baseapp/baseapp.go:692)
(*github.com/cosmos/cosmos-sdk/baseapp.BaseApp).FinalizeBlock (baseapp/baseapp.go:856)

@aljo242 aljo242 merged commit d004b2b into release/v0.50.x Dec 8, 2025
42 of 45 checks passed
@aljo242 aljo242 deleted the mergify/bp/release/v0.50.x/pr-25642 branch December 8, 2025 18:20
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants