[Bug]: ABCIListeners not receiving FinalizeBlock request and response

[MSalopek]

Is there an existing issue for this?

• I have searched the existing issues

What happened?

While we upgrading ICS to v0.50.1 we noticed that our ABCIListener hooks were not getting any FinalizeBlock updates even though ListenFinalizeBlock was implemented. ListenCommit is working correctly.

Upon further inspection, we found that the issue lies in baseapp/abci.go.
The issue likely arose when Begin/EndBlock operations got superseded by FinalizeBlock.

Previosly, in v0.47.x we can see that BeginBlock and EndBlock calls would pass the abci req/res to registered ABCI listeners.

// BeginBlock implements the ABCI application interface.
func (app *BaseApp) BeginBlock(req abci.RequestBeginBlock) (res abci.ResponseBeginBlock) {
	// ...

	// call the hooks with the BeginBlock messages
	for _, streamingListener := range app.abciListeners {
		if err := streamingListener.ListenBeginBlock(app.deliverState.ctx, req, res); err != nil {
			panic(fmt.Errorf("BeginBlock listening hook failed, height: %d, err: %w", req.Header.Height, err))
		}
	}

	return res
}

// EndBlock implements the ABCI interface.
func (app *BaseApp) EndBlock(req abci.RequestEndBlock) (res abci.ResponseEndBlock) {
	// ...

	// call the streaming service hooks with the EndBlock messages
	for _, streamingListener := range app.abciListeners {
		if err := streamingListener.ListenEndBlock(app.deliverState.ctx, req, res); err != nil {
			panic(fmt.Errorf("EndBlock listening hook failed, height: %d, err: %w", req.Height, err))
		}
	}

	return res
}

In FinalizeBlock this does not happen.

Credits for finding the issue: @tbruyelle

Cosmos SDK Version

0.50.1

How to reproduce?

Register an ABCIListener and check if ListenFinalizeBlock is ever executed.
ListenCommit works without issues.