Merge branch 'main' of github.com:Layr-Labs/op-plasma-eigenda into ep…

…ociask--chore-reabstract-router

e2e/optimism_test.go

@@ -12,7 +12,6 @@ import (
 	"github.com/ethereum-optimism/optimism/op-service/testlog"
 	"github.com/ethereum/go-ethereum/common"
 	"github.com/ethereum/go-ethereum/log"
-
 	"github.com/stretchr/testify/require"
 
 	actions "github.com/ethereum-optimism/optimism/op-e2e/actions/helpers"

e2e/safety_checks_test.go

@@ -111,27 +111,24 @@ func TestProxyClientMalformedInputCases(t *testing.T) {
 		require.NoError(t, err)
 	})
 
-	t.Run("get data edge cases", func(t *testing.T) {
-		testCert := []byte("")
+	t.Run("get data edge cases - unsupported version byte 01", func(t *testing.T) {
+		testCert := []byte{1}
 		_, err := daClient.GetData(ts.Ctx, testCert)
 		require.Error(t, err)
-		assert.True(t, strings.Contains(err.Error(),
-			"commitment is too short") && !isNilPtrDerefPanic(err.Error()))
-
-		testCert = []byte{1}
-		_, err = daClient.GetData(ts.Ctx, testCert)
-		require.Error(t, err)
-		assert.True(t, strings.Contains(err.Error(),
-			"commitment is too short") && !isNilPtrDerefPanic(err.Error()))
+		assert.True(t,
+			strings.Contains(err.Error(), "unsupported version byte 01") && !isNilPtrDerefPanic(err.Error()))
+	})
 
-		testCert = e2e.Rand[[]byte](10000)
-		_, err = daClient.GetData(ts.Ctx, testCert)
+	t.Run("get data edge cases - huge cert", func(t *testing.T) {
+		// TODO: we need to add the 0 version byte at the beginning.
+		// should this not be done automatically by the simple_commitment client?
+		testCert := append([]byte{0}, e2e.Rand[[]byte](10000)...)
+		_, err := daClient.GetData(ts.Ctx, testCert)
 		require.Error(t, err)
 		assert.True(t, strings.Contains(err.Error(),
 			"failed to decode DA cert to RLP format: rlp: expected input list for verify.Certificate") &&
 			!isNilPtrDerefPanic(err.Error()))
 	})
-
 }
 
 // TestKeccak256CommitmentRequestErrorsWhenS3NotSet ensures that the proxy returns a client error in the event

server/handlers.go

@@ -96,7 +96,7 @@ func (svr *Server) handleGetOPGenericCommitment(w http.ResponseWriter, r *http.R
 
 func (svr *Server) handleGetShared(ctx context.Context, w http.ResponseWriter, comm []byte, meta commitments.CommitmentMeta) error {
 	svr.log.Info("Processing GET request", "commitment", hex.EncodeToString(comm), "commitmentMeta", meta)
-	input, err := svr.router.Get(ctx, comm, meta.Mode)
+	input, err := svr.sm.Get(ctx, comm, meta.Mode)
 	if err != nil {
 		err = MetaError{
 			Err:  fmt.Errorf("get request failed with commitment %v: %w", comm, err),
@@ -174,7 +174,7 @@ func (svr *Server) handlePostShared(w http.ResponseWriter, r *http.Request, comm
 		return err
 	}
 
-	commitment, err := svr.router.Put(r.Context(), meta.Mode, comm, input)
+	commitment, err := svr.sm.Put(r.Context(), meta.Mode, comm, input)
 	if err != nil {
 		err = MetaError{
 			Err:  fmt.Errorf("put request failed with commitment %v (commitment mode %v): %w", comm, meta.Mode, err),

server/middleware.go

@@ -33,6 +33,7 @@ func withMetrics(
 		// we assume that every route will set the status header
 		versionByte, err := parseVersionByte(w, r)
 		if err != nil {
+			recordDur(w.Header().Get("status"), string(mode), string(versionByte))
 			return fmt.Errorf("metrics middleware: error parsing version byte: %w", err)
 		}
 		recordDur(w.Header().Get("status"), string(mode), string(versionByte))