include err in response

ethereum-optimism · Nov 7, 2024 · 86ab7ed · 86ab7ed
1 parent ed410c0
commit 86ab7ed
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 6 deletions.
diff --git a/op-txproxy/auth_handler.go b/op-txproxy/auth_handler.go
@@ -19,8 +19,8 @@ var (
 	DefaultAuthHeaderKey = "X-Optimism-Signature"
 
 	// errs
-	misformattedAuthErr          = errors.New("misformatted auth header")
-	invalidAuthSignatureErr      = errors.New("invalid auth signature")
+	misformattedAuthErr          = errors.New("misformatted <caller>:<signature> header")
+	invalidSignatureErr          = errors.New("invalid signature")
 	mismatchedRecoveredSignerErr = errors.New("mismatched recovered signer")
 )
 
@@ -88,7 +88,7 @@ func (h *authHandler) ServeHTTP(w http.ResponseWriter, r *http.Request) {
 	caller, signature := common.HexToAddress(authElems[0]), common.FromHex(authElems[1])
 	sigPubKey, err := crypto.SigToPub(txtHash, signature)
 	if sigPubKey == nil || err != nil {
-		newCtx := context.WithValue(r.Context(), authContextKey{}, &AuthContext{common.Address{}, invalidAuthSignatureErr})
+		newCtx := context.WithValue(r.Context(), authContextKey{}, &AuthContext{common.Address{}, invalidSignatureErr})
 		h.next.ServeHTTP(w, r.WithContext(newCtx))
 		return
 	}

diff --git a/op-txproxy/auth_handler_test.go b/op-txproxy/auth_handler_test.go
@@ -58,12 +58,12 @@ func TestAuthHandlerBadSignature(t *testing.T) {
 
 	rr := httptest.NewRecorder()
 	r, _ := http.NewRequest("GET", "/", nil)
-	r.Header.Set("auth", fmt.Sprintf("%s:%s", common.HexToAddress("a"), "foobar"))
+	r.Header.Set("auth", fmt.Sprintf("%s:%s", common.HexToAddress("a"), "0x123"))
 
 	handler.ServeHTTP(rr, r)
 	require.NotNil(t, authContext)
 	require.Zero(t, authContext.Caller)
-	require.Equal(t, invalidAuthSignatureErr, authContext.Err)
+	require.Equal(t, invalidSignatureErr, authContext.Err)
 }
 
 func TestAuthHandlerMismatchedCaller(t *testing.T) {

diff --git a/op-txproxy/conditional_txs.go b/op-txproxy/conditional_txs.go
@@ -97,7 +97,10 @@ func (s *ConditionalTxService) SendRawTransactionConditional(ctx context.Context
 	}
 	if authInfo.Err != nil {
 		s.failures.WithLabelValues("invalid auth").Inc()
-		return common.Hash{}, invalidAuthenticationErr
+		return common.Hash{}, &rpc.JsonError{
+			Message: fmt.Sprintf("invalid authentication: %s", authInfo.Err),
+			Code:    params.TransactionConditionalRejectedErrCode,
+		}
 	}
 
 	// Handle the request. For now, we do nothing with the authenticated signer