feat(rfq-api): don't respond to passive quotes for requests with zap …

…params [SLT-430, SLT-432] (#3388)

* Feat: add zap params to api model

* Feat: don't consider quotes with zap data as passive quotes

* Feat: add test cases for zap quotes

* Cleanup: lint

services/rfq/api/model/request.go

@@ -55,8 +55,11 @@ type QuoteData struct {
 	DestChainID       int     `json:"dest_chain_id"`
 	OriginTokenAddr   string  `json:"origin_token_addr"`
 	DestTokenAddr     string  `json:"dest_token_addr"`
-	OriginAmountExact string  `json:"origin_amount_exact"`
+	OriginAmount      string  `json:"origin_amount"`
 	ExpirationWindow  int64   `json:"expiration_window"`
+	ZapData           string  `json:"zap_data"`
+	ZapNative         string  `json:"zap_native"`
+	OriginAmountExact string  `json:"origin_amount_exact"`
 	DestAmount        *string `json:"dest_amount"`
 	RelayerAddress    *string `json:"relayer_address"`
 	QuoteID           *string `json:"quote_id"`

services/rfq/api/rest/rfq_test.go

@@ -307,6 +307,16 @@ func (c *ServerSuite) TestActiveRFQFallbackToPassive() {
 	c.Assert().Equal("passive", userQuoteResp.QuoteType)
 	c.Assert().Equal("998000", userQuoteResp.DestAmount) // destAmount is quote destAmount minus fixed fee
 	c.Assert().Equal(c.relayerWallets[0].Address().Hex(), userQuoteResp.RelayerAddress)
+
+	// Submit a user quote request with zap data
+	userQuoteReq.Data.ZapData = "abc"
+	userQuoteReq.Data.ZapNative = "100"
+	userQuoteResp, err = userClient.PutRFQRequest(c.GetTestContext(), userQuoteReq)
+	c.Require().NoError(err)
+
+	// Assert the response
+	c.Assert().False(userQuoteResp.Success)
+	c.Assert().Equal("no quotes found", userQuoteResp.Reason)
 }
 
 func (c *ServerSuite) TestActiveRFQPassiveBestQuote() {

services/rfq/api/rest/server.go

@@ -4,6 +4,7 @@ package rest
 import (
 	"context"
 	"encoding/json"
+	"math/big"
 
 	"fmt"
 	"net/http"
@@ -532,19 +533,21 @@ func (r *QuoterAPIServer) PutRFQRequest(c *gin.Context) {
 	span.SetAttributes(attribute.Bool("is_active_rfq", isActiveRFQ))
 
 	// if specified, fetch the active quote. always consider passive quotes
-	var activeQuote *model.QuoteData
+	var activeQuote, passiveQuote *model.QuoteData
 	if isActiveRFQ {
 		activeQuote = r.handleActiveRFQ(ctx, &req, requestID)
 		if activeQuote != nil && activeQuote.DestAmount != nil {
 			span.SetAttributes(attribute.String("active_quote_dest_amount", *activeQuote.DestAmount))
 		}
 	}
-	passiveQuote, err := r.handlePassiveRFQ(ctx, &req)
-	if err != nil {
-		logger.Error("Error handling passive RFQ", "error", err)
-	}
-	if passiveQuote != nil && passiveQuote.DestAmount != nil {
-		span.SetAttributes(attribute.String("passive_quote_dest_amount", *passiveQuote.DestAmount))
+	if !isZapQuote(&req) {
+		passiveQuote, err = r.handlePassiveRFQ(ctx, &req)
+		if err != nil {
+			logger.Error("Error handling passive RFQ", "error", err)
+		}
+		if passiveQuote != nil && passiveQuote.DestAmount != nil {
+			span.SetAttributes(attribute.String("passive_quote_dest_amount", *passiveQuote.DestAmount))
+		}
 	}
 	quote := getBestQuote(activeQuote, passiveQuote)
 
@@ -576,6 +579,18 @@ func (r *QuoterAPIServer) PutRFQRequest(c *gin.Context) {
 	c.JSON(http.StatusOK, resp)
 }
 
+func isZapQuote(req *model.PutRFQRequest) bool {
+	if req.Data.ZapData != "" {
+		return true
+	}
+
+	zapNative, ok := new(big.Int).SetString(req.Data.ZapNative, 10)
+	if !ok {
+		return false
+	}
+	return zapNative.Sign() != 0
+}
+
 func (r *QuoterAPIServer) recordLatestQuoteAge(ctx context.Context, observer metric.Observer) (err error) {
 	if r.handler == nil || r.latestQuoteAgeGauge == nil {
 		return nil

services/rfq/api/rest/ws.go

@@ -198,6 +198,8 @@ func (c *wsClient) sendRelayerRequest(ctx context.Context, req *model.WsRFQReque
 
 // handleRelayerMessage handles messages from the relayer.
 // An error returned will result in the websocket connection being closed.
+//
+//nolint:cyclop
 func (c *wsClient) handleRelayerMessage(ctx context.Context, msg []byte) (err error) {
 	_, span := c.handler.Tracer().Start(ctx, "handleRelayerMessage", trace.WithAttributes(
 		attribute.String("relayer_address", c.relayerAddr),
@@ -235,7 +237,9 @@ func (c *wsClient) handleRelayerMessage(ctx context.Context, msg []byte) (err er
 		}
 	case SendQuoteOp:
 		err = c.handleSendQuote(ctx, rfqMsg.Content)
-		logger.Errorf("error handling send quote: %v", err)
+		if err != nil {
+			logger.Errorf("error handling send quote: %v", err)
+		}
 	default:
 		logger.Errorf("received unexpected operation from relayer: %s", rfqMsg.Op)
 		return nil