app,cmd: slightly modify ProduceELPayload

app/abci_engine.go

@@ -14,32 +14,34 @@ import (
 	"github.com/ethereum/go-ethereum/common/hexutil"
 )
 
-func (app *HeimdallApp) ProduceELPayload(ctx context.Context) error {
+func (app *HeimdallApp) ProduceELPayload(ctx context.Context) {
+	logger := app.Logger()
 	var blockCtx nextELBlockCtx
-	select {
-	case blockCtx = <-app.nextBlockChan:
-		res, err := app.retryBuildNextPayload(blockCtx.context, blockCtx.height+1)
-		if err != nil {
-			return err
-		}
-
-		app.nextExecPayload = res
-		return nil
-
-	case blockCtx = <-app.currBlockChan:
-		res, err := app.retryBuildLatestPayload(blockCtx.context, blockCtx.height)
-		if err != nil {
-			return err
+	for {
+		select {
+		case blockCtx = <-app.nextBlockChan:
+			res, err := app.retryBuildNextPayload(blockCtx.context, blockCtx.height+1)
+			if err != nil {
+				logger.Error("error building next payload", "error", err)
+				res = nil
+			}
+
+			app.nextExecPayload = res
+
+		case blockCtx = <-app.currBlockChan:
+			res, err := app.retryBuildLatestPayload(blockCtx.context, blockCtx.height)
+			if err != nil {
+				logger.Error("error building latest payload", "error", err)
+				res = nil
+			}
+
+			app.latestExecPayload = res
+
+		case <-ctx.Done():
+			return
+
+		default:
 		}
-
-		app.latestExecPayload = res
-		return nil
-
-	case <-ctx.Done():
-		return nil
-
-	default:
-		return nil
 	}
 }
 

cmd/heimdalld/cmd/root.go

@@ -1,7 +1,6 @@
 package heimdalld
 
 import (
-	"context"
 	"os"
 	"path"
 
@@ -142,11 +141,7 @@ func NewRootCmd() *cobra.Command {
 	}
 
 	go func() {
-		for {
-			if err := tempApp.ProduceELPayload(context.Background()); err != nil {
-				logger.Error("failed to produce EL block", "err", err)
-			}
-		}
+		tempApp.ProduceELPayload(rootCmd.Context())
 	}()
 	return rootCmd
 }