fix(errors): Ignore requests Txs + RPC Error Handlings Fixes

consensus/cometbft/service/prepare_proposal.go

@@ -77,7 +77,7 @@ func (s *Service) prepareProposal(
 			"time", req.Time,
 			"err", err,
 		)
-		return &cmtabci.PrepareProposalResponse{Txs: req.Txs}, nil
+		return &cmtabci.PrepareProposalResponse{Txs: [][]byte{}}, nil
 	}
 
 	return &cmtabci.PrepareProposalResponse{

execution/client/client.go

@@ -23,7 +23,6 @@ package client
 import (
 	"context"
 	"math/big"
-	"strings"
 	"sync"
 	"time"
 
@@ -32,6 +31,7 @@ import (
 	ethclientrpc "github.com/berachain/beacon-kit/execution/client/ethclient/rpc"
 	"github.com/berachain/beacon-kit/log"
 	"github.com/berachain/beacon-kit/primitives/math"
+	"github.com/berachain/beacon-kit/primitives/net/http"
 	"github.com/berachain/beacon-kit/primitives/net/jwt"
 )
 
@@ -167,7 +167,7 @@ func (s *EngineClient) verifyChainIDAndConnection(
 	// After the initial dial, check to make sure the chain ID is correct.
 	chainID, err = s.Client.ChainID(ctx)
 	if err != nil {
-		if strings.Contains(err.Error(), "401 Unauthorized") {
+		if errors.Is(err, http.ErrUnauthorized) {
 			// We always log this error as it is a critical error.
 			s.logger.Error(UnauthenticatedConnectionErrorStr)
 		}

execution/client/errors.go

@@ -27,26 +27,13 @@ import (
 	jsonrpc "github.com/berachain/beacon-kit/primitives/net/json-rpc"
 )
 
-// ErrUnauthenticatedConnection indicates that the connection is not
-// authenticated.
 const (
 	UnauthenticatedConnectionErrorStr = `could not verify execution chain ID as your
 	connection is not authenticated. If connecting to your execution client via HTTP, you
 	will need to set up JWT authentication...`
-
-	AuthErrMsg = "HTTP authentication to your execution client " +
-		"is not working. Please ensure you are setting a correct " +
-		"value for the JWT secret path" +
-		"is set correctly, or use an IPC " +
-		"connection if on the same machine."
 )
 
 var (
-	// ErrNotStarted indicates that the execution client is not started.
-	ErrNotStarted = errors.New("engine client is not started")
-
-	// ErrFailedToRefreshJWT indicates that the JWT could not be refreshed.
-	ErrFailedToRefreshJWT = errors.New("failed to refresh auth token")
 
 	// ErrMismatchedEth1ChainID is returned when the chainID does not
 	// match the expected chain ID.
@@ -67,15 +54,14 @@ func (s *EngineClient) handleRPCError(
 		s.metrics.incrementHTTPTimeoutCounter()
 		return http.ErrTimeout
 	}
-
+	// Check for authorization errors
+	if errors.Is(err, http.ErrUnauthorized) {
+		return err
+	}
 	// Check for connection errors.
-	//
-	//nolint:errorlint // from prysm.
-	e, ok := err.(jsonrpc.Error)
-	if !ok {
-		if jsonrpc.IsUnauthorizedError(e) {
-			return http.ErrUnauthorized
-		}
+	var e jsonrpc.Error
+	ok := errors.As(err, &e)
+	if !ok || e == nil {
 		return errors.Wrapf(
 			err,
 			"got an unexpected server error in JSON-RPC response "+

execution/client/ethclient/rpc/client.go

@@ -23,12 +23,14 @@ package rpc
 import (
 	"bytes"
 	"context"
+	"fmt"
 	"io"
 	"net/http"
 	"sync"
 	"time"
 
 	"github.com/berachain/beacon-kit/primitives/encoding/json"
+	beaconhttp "github.com/berachain/beacon-kit/primitives/net/http"
 	"github.com/berachain/beacon-kit/primitives/net/jwt"
 )
 
@@ -182,6 +184,16 @@ func (rpc *client) callRaw(
 		return nil, err
 	}
 
+	switch response.StatusCode {
+	case http.StatusOK:
+		// OK: just proceed (no return)
+	case http.StatusUnauthorized:
+		return nil, beaconhttp.ErrUnauthorized
+	default:
+		// Return a default error
+		return nil, fmt.Errorf("unexpected status code %d: %s", response.StatusCode, string(data))
+	}
+
 	resp := new(Response)
 	if err = json.Unmarshal(data, resp); err != nil {
 		return nil, err

primitives/net/json-rpc/errors.go

@@ -21,8 +21,6 @@
 package jsonrpc
 
 import (
-	"strings"
-
 	"github.com/berachain/beacon-kit/errors"
 )
 
@@ -88,21 +86,3 @@ var (
 		"an error occurred on the server while parsing the JSON text (code: -32700)",
 	)
 )
-
-// IsUnauthorizedError defines an interface for unauthorized errors.
-func IsUnauthorizedError(err error) bool {
-	if err == nil {
-		return false
-	}
-
-	//nolint:errorlint // its'ok.
-	e, ok := err.(Error)
-	if !ok {
-		if strings.Contains(
-			e.Error(), "401 Unauthorized",
-		) {
-			return true
-		}
-	}
-	return false
-}