Fix Emission of Pre-Block Events

CHANGELOG.md

@@ -38,7 +38,9 @@ Ref: https://keepachangelog.com/en/1.0.0/
 
 ## [Unreleased Provenance]
 
-* nothing
+### Improvements
+
+* [#611](https://github.com/provenance-io/cosmos-sdk/pull/611) Provenance: Fix emission of pre-block events.
 
 ---
 

baseapp/abci.go

@@ -753,10 +753,13 @@ func (app *BaseApp) internalFinalizeBlock(ctx context.Context, req *abci.Request
 			WithHeaderHash(req.Hash))
 	}
 
-	if err := app.preBlock(req); err != nil {
+	preBlockEvents, err := app.preBlock(req)
+	if err != nil {
 		return nil, err
 	}
 
+	events = append(events, preBlockEvents...)
+
 	beginBlock, err := app.beginBlock(req)
 	if err != nil {
 		return nil, err

baseapp/baseapp.go

@@ -705,12 +705,13 @@ func (app *BaseApp) cacheTxContext(ctx sdk.Context, txBytes []byte) (sdk.Context
 	return ctx.WithMultiStore(msCache), msCache
 }
 
-func (app *BaseApp) preBlock(req *abci.RequestFinalizeBlock) error {
+func (app *BaseApp) preBlock(req *abci.RequestFinalizeBlock) ([]abci.Event, error) {
+	var events []abci.Event
 	if app.preBlocker != nil {
 		ctx := app.finalizeBlockState.Context()
 		rsp, err := app.preBlocker(ctx, req)
 		if err != nil {
-			return err
+			return nil, err
 		}
 		// rsp.ConsensusParamsChanged is true from preBlocker means ConsensusParams in store get changed
 		// write the consensus parameters in store to context
@@ -721,8 +722,9 @@ func (app *BaseApp) preBlock(req *abci.RequestFinalizeBlock) error {
 			ctx = ctx.WithBlockGasMeter(gasMeter)
 			app.finalizeBlockState.SetContext(ctx)
 		}
+		events = rsp.Events
 	}
-	return nil
+	return events, nil
 }
 
 func (app *BaseApp) beginBlock(_ *abci.RequestFinalizeBlock) (sdk.BeginBlock, error) {

types/abci.go

@@ -69,6 +69,7 @@ type BeginBlock struct {
 
 type ResponsePreBlock struct {
 	ConsensusParamsChanged bool
+	Events                 []abci.Event
 }
 
 func (r ResponsePreBlock) IsConsensusParamsChanged() bool {

types/module/module.go

@@ -766,6 +766,7 @@ func (m *Manager) PreBlock(ctx sdk.Context) (*sdk.ResponsePreBlock, error) {
 	}
 	return &sdk.ResponsePreBlock{
 		ConsensusParamsChanged: paramsChanged,
+		Events:                 ctx.EventManager().ABCIEvents(),
 	}, nil
 }