extract errors

Author: julienrbrt

block/internal/common/errors.go

@@ -20,4 +20,7 @@ var (
 
 	// ErrOversizedItem is an unrecoverable error indicating a single item exceeds DA blob size limit
 	ErrOversizedItem = errors.New("single item exceeds DA blob size limit")
+
+	// ErrForceInclusionNotConfigured is returned when the forced inclusion namespace is not configured.
+	ErrForceInclusionNotConfigured = errors.New("forced inclusion namespace not configured")
 )

block/internal/syncing/da_retriever.go

@@ -109,14 +109,6 @@ func (r *daRetriever) RetrieveFromDA(ctx context.Context, daHeight uint64) ([]co
 	return r.processBlobs(ctx, blobsResp.Data, daHeight), nil
 }
 
-var (
-	// ErrForceInclusionNotConfigured is returned when the forced inclusion namespace is not configured.
-	ErrForceInclusionNotConfigured = errors.New("forced inclusion namespace not configured")
-
-	// ErrForcedInclusionDataTooLarge is returned when forced inclusion data exceeds the maximum blob size.
-	ErrForcedInclusionDataTooLarge = errors.New("forced inclusion data exceeds maximum blob size limit")
-)
-
 // RetrieveForcedIncludedTxsFromDA retrieves forced inclusion transactions from the DA layer.
 //
 // Behavior:
@@ -132,7 +124,7 @@ var (
 //   - Error if forced inclusion is not configured or DA layer is unavailable
 func (r *daRetriever) RetrieveForcedIncludedTxsFromDA(ctx context.Context, daHeight uint64) (*common.ForcedIncludedEvent, error) {
 	if !r.hasForcedInclusionNs {
-		return nil, ErrForceInclusionNotConfigured
+		return nil, common.ErrForceInclusionNotConfigured
 	}
 
 	// Calculate deterministic epoch boundaries
@@ -306,7 +298,7 @@ func (r *daRetriever) processForcedInclusionBlobs(
 				Int("blob_size", dataSize).
 				Float64("max_size", common.DefaultMaxBlobSize).
 				Msg("forced inclusion blob exceeds maximum size - skipping")
-			return fmt.Errorf("%w: blob size %d exceeds maximum %f", ErrForcedInclusionDataTooLarge, dataSize, common.DefaultMaxBlobSize)
+			return fmt.Errorf("blob size %d exceeds maximum %f", dataSize, common.DefaultMaxBlobSize)
 		}
 
 		// Check if adding this blob would exceed the current epoch's max size

block/internal/syncing/syncer.go

@@ -689,7 +689,7 @@ func (s *Syncer) verifyForcedInclusionTxs(currentState types.State, data *types.
 	// Retrieve forced inclusion transactions from DA
 	forcedIncludedTxsEvent, err := s.daRetriever.RetrieveForcedIncludedTxsFromDA(s.ctx, currentState.DAHeight)
 	if err != nil {
-		if errors.Is(err, ErrForceInclusionNotConfigured) {
+		if errors.Is(err, common.ErrForceInclusionNotConfigured) {
 			s.logger.Debug().Msg("forced inclusion namespace not configured, skipping verification")
 			return nil
 		}

sequencers/based/based.go

@@ -3,21 +3,18 @@ package based
 import (
 	"context"
 	"errors"
-	"strings"
 	"sync"
 	"time"
 
 	"github.com/rs/zerolog"
 
+	"github.com/evstack/ev-node/block/internal/common"
 	coreda "github.com/evstack/ev-node/core/da"
 	coresequencer "github.com/evstack/ev-node/core/sequencer"
 	"github.com/evstack/ev-node/pkg/config"
 	"github.com/evstack/ev-node/pkg/genesis"
 )
 
-// ErrForceInclusionNotConfigured is returned when forced inclusion is not configured
-var ErrForceInclusionNotConfigured = errors.New("forced inclusion namespace not configured")
-
 // ForcedInclusionEvent represents forced inclusion transactions retrieved from DA
 type ForcedInclusionEvent = struct {
 	Txs           [][]byte
@@ -100,7 +97,7 @@ func (s *BasedSequencer) GetNextBatch(ctx context.Context, req coresequencer.Get
 
 	forcedTxsEvent, err := s.daRetriever.RetrieveForcedIncludedTxsFromDA(ctx, s.daHeight)
 	if err != nil {
-		if strings.Contains(err.Error(), ErrForceInclusionNotConfigured.Error()) {
+		if errors.Is(err, common.ErrForceInclusionNotConfigured) {
 			s.logger.Error().Msg("forced inclusion not configured, returning empty batch")
 			return &coresequencer.GetNextBatchResponse{
 				Batch:     &coresequencer.Batch{Transactions: nil},

sequencers/single/sequencer.go

@@ -5,7 +5,6 @@ import (
 	"context"
 	"errors"
 	"fmt"
-	"strings"
 	"sync"
 	"time"
 
@@ -20,8 +19,6 @@ import (
 var (
 	// ErrInvalidId is returned when the chain id is invalid
 	ErrInvalidId = errors.New("invalid chain id")
-	// ErrForceInclusionNotConfigured is returned when forced inclusion is not configured
-	ErrForceInclusionNotConfigured = errors.New("forced inclusion namespace not configured")
 )
 
 // ForcedInclusionEvent represents forced inclusion transactions retrieved from DA
@@ -141,7 +138,7 @@ func (c *Sequencer) GetNextBatch(ctx context.Context, req coresequencer.GetNextB
 		forcedEvent, err := c.daRetriever.RetrieveForcedIncludedTxsFromDA(ctx, currentDAHeight)
 		if err != nil {
 			// If forced inclusion is not configured, continue without forced txs
-			if !strings.Contains(err.Error(), ErrForceInclusionNotConfigured.Error()) {
+			if !errors.Is(err, common.ErrForceInclusionNotConfigured) {
 				// If we get a height from future error, keep the current DA height and return batch
 				// We'll retry the same height on the next call until DA produces that block
 				if errors.Is(err, coreda.ErrHeightFromFuture) {