fire new block event

mempool/v0/clist_mempool.go

@@ -259,10 +259,6 @@ func (mem *CListMempool) CheckTx(
 
 	mem.addNewTransaction(tx, txInfo.SenderID, txInfo.SenderP2PID, cb, resp)
 
-	if cb != nil {
-		cb(resp)
-	}
-
 	return nil
 }
 

rpc/client/helpers.go

@@ -69,7 +69,7 @@ func WaitForOneEvent(c EventsClient, evtTyp string, timeout time.Duration) (type
 	}
 	// make sure to unregister after the test is over
 	defer func() {
-		if deferErr := c.UnsubscribeAll(ctx, subscriber); deferErr != nil {
+		if deferErr := c.UnsubscribeAll(context.Background(), subscriber); deferErr != nil {
 			panic(deferErr)
 		}
 	}()

state/execution.go

@@ -521,6 +521,14 @@ func fireEvents(
 		logger.Error("failed publishing new block header", "err", err)
 	}
 
+	if err := eventBus.PublishEventNewBlockEvents(types.EventDataNewBlockEvents{
+		Height: block.Height,
+		Events: abciResponse.Events,
+		NumTxs: int64(len(block.Txs)),
+	}); err != nil {
+		logger.Error("failed publishing new block events", "err", err)
+	}
+
 	if len(block.Evidence.Evidence) != 0 {
 		for _, ev := range block.Evidence.Evidence {
 			if err := eventBus.PublishEventNewEvidence(types.EventDataNewEvidence{

types/event_bus.go

@@ -256,6 +256,10 @@ func (NopEventBus) PublishEventNewBlockHeader(data EventDataNewBlockHeader) erro
 	return nil
 }
 
+func (NopEventBus) PublishEventNewBlockEvents(data EventDataNewBlockEvents) error {
+	return nil
+}
+
 func (NopEventBus) PublishEventNewEvidence(evidence EventDataNewEvidence) error {
 	return nil
 }

types/events.go

@@ -177,6 +177,7 @@ func QueryForEvent(eventType string) tmpubsub.Query {
 type BlockEventPublisher interface {
 	PublishEventNewBlock(block EventDataNewBlock) error
 	PublishEventNewBlockHeader(header EventDataNewBlockHeader) error
+	PublishEventNewBlockEvents(header EventDataNewBlockEvents) error
 	PublishEventNewEvidence(evidence EventDataNewEvidence) error
 	PublishEventTx(EventDataTx) error
 	PublishEventValidatorSetUpdates(EventDataValidatorSetUpdates) error