Merge pull request #820 from iotaledger/fix/retainer-events

Fixed Retainer.BlockRetained event not being linked to the block retainer

pkg/protocol/chains.go

@@ -176,6 +176,10 @@ func attachEngineLogs(instance *engine.Engine) func() {
 			instance.LogTrace("BlockProcessed", "block", blockID)
 		}).Unhook,
 
+		events.Retainer.BlockRetained.Hook(func(block *blocks.Block) {
+			instance.LogTrace("Retainer.BlockRetained", "block", block.ID())
+		}).Unhook,
+
 		events.Notarization.SlotCommitted.Hook(func(details *notarization.SlotCommittedDetails) {
 			instance.LogTrace("NotarizationManager.SlotCommitted", "commitment", details.Commitment.ID(), "acceptedBlocks count", details.AcceptedBlocks.Size(), "accepted transactions", len(details.Mutations))
 		}).Unhook,

pkg/requesthandler/blockissuance.go

@@ -57,6 +57,7 @@ func (r *RequestHandler) SubmitBlockAndAwaitEvent(ctx context.Context, block *mo
 		case <-exit:
 		}
 	}, event.WithWorkerPool(r.workerPool)).Unhook
+
 	postfilteredUnhook := r.protocol.Events.Engine.PostSolidFilter.BlockFiltered.Hook(func(event *postsolidfilter.BlockFilteredEvent) {
 		if blockID != event.Block.ID() {
 			return
@@ -67,8 +68,7 @@ func (r *RequestHandler) SubmitBlockAndAwaitEvent(ctx context.Context, block *mo
 		}
 	}, event.WithWorkerPool(r.workerPool)).Unhook
 
-	defer lo.Batch(evtUnhook, prefilteredUnhook)()
-	defer lo.Batch(evtUnhook, postfilteredUnhook)()
+	defer lo.BatchReverse(evtUnhook, prefilteredUnhook, postfilteredUnhook)()
 
 	if err := r.submitBlock(block); err != nil {
 		return ierrors.Wrapf(err, "failed to issue block %s", blockID)

pkg/retainer/blockretainer/block_retainer.go

@@ -81,6 +81,8 @@ func NewProvider() module.Provider[*engine.Engine, retainer.BlockRetainer] {
 			}
 		})
 
+		e.Events.Retainer.BlockRetained.LinkTo(r.events.BlockRetained)
+
 		r.TriggerInitialized()
 
 		return r