feat(rfq-relayer): support FastBridgeV2 with arbitrary calls [SLT-320]

contrib/opbot/botmd/commands.go

@@ -378,7 +378,8 @@
 		return nil, fmt.Errorf("error getting chain client for chain ID %d: %w", chainID, err)
 	}
 
-	contractAddress, ok := contracts.Contracts[chainID]
+	// TODO: handle v2 contract if specified
+	contractAddress, ok := contracts.ContractsV1[chainID]
 	if !ok {
 		return nil, fmt.Errorf("no contract address for chain ID")
 	}

ethergo/backends/anvil/anvil.go

@@ -30,6 +30,7 @@
 	"github.com/synapsecns/sanguine/core/dockerutil"
 	"github.com/synapsecns/sanguine/core/mapmutex"
 	"github.com/synapsecns/sanguine/core/processlog"
+	"github.com/synapsecns/sanguine/core/retry"
 	"github.com/synapsecns/sanguine/ethergo/backends"
 	"github.com/synapsecns/sanguine/ethergo/backends/base"
 	"github.com/synapsecns/sanguine/ethergo/chain"
@@ -386,9 +387,15 @@
 	var acct *keystore.Key
 	// TODO handle storing accounts to conform to get tx context
 	if address != nil {
-		acct = f.GetAccount(*address)
-		if acct == nil {
-			f.T().Errorf("could not get account %s", address.String())
+		err := retry.WithBackoff(ctx, func(_ context.Context) error {
+			acct = f.GetAccount(*address)
+			if acct == nil {
+				return fmt.Errorf("could not get account %s", address.String())
+			}
+			return nil
+		}, retry.WithMaxTotalTime(10*time.Second))
+		if err != nil {
+			f.T().Errorf("could not get account %s: %v", address.String(), err)
 			return res
 		}
 	} else {

services/omnirpc/proxy/forward.go

@@ -5,6 +5,9 @@
 	"context"
 	"crypto/sha256"
 	"fmt"
+	goHTTP "net/http"
+	"strings"
+
 	"github.com/ImVexed/fasturl"
 	"github.com/goccy/go-json"
 	"github.com/jftuga/ellipsis"
@@ -14,8 +17,6 @@
 	"go.opentelemetry.io/otel/attribute"
 	"go.opentelemetry.io/otel/trace"
 	"golang.org/x/exp/slices"
-	goHTTP "net/http"
-	"strings"
 )
 
 type rawResponse struct {
@@ -56,7 +57,7 @@
 
 		standardizedResponse, err = standardizeResponse(ctx, &f.rpcRequest[0], rpcMessage)
 		if err != nil {
-			return nil, fmt.Errorf("could not standardize response: %w", err)
+			return nil, fmt.Errorf("could not standardize response from body %s: %w", ellipsis.Shorten(string(body), 200), err)
 		}
 	}
 

services/rfq/api/client/suite_test.go

@@ -85,7 +85,11 @@ func (c *ClientSuite) SetupTest() {
 			DSN:  filet.TmpFile(c.T(), "", "").Name(),
 		},
 		OmniRPCURL: testOmnirpc,
-		Bridges: map[uint32]string{
+		FastBridgeContractsV1: map[uint32]string{
+			1:     ethFastBridgeAddress.Hex(),
+			42161: arbFastBridgeAddress.Hex(),
+		},
+		FastBridgeContractsV2: map[uint32]string{
 			1:     ethFastBridgeAddress.Hex(),
 			42161: arbFastBridgeAddress.Hex(),
 		},

services/rfq/api/config/config.go

@@ -19,13 +19,13 @@ type DatabaseConfig struct {
 
 // Config is the configuration for the RFQ Quoter.
 type Config struct {
-	Database   DatabaseConfig `yaml:"database"`
-	OmniRPCURL string         `yaml:"omnirpc_url"`
-	// bridges is a map of chainid->address
-	Bridges         map[uint32]string `yaml:"bridges"`
-	Port            string            `yaml:"port"`
-	RelayAckTimeout time.Duration     `yaml:"relay_ack_timeout"`
-	MaxQuoteAge     time.Duration     `yaml:"max_quote_age"`
+	Database              DatabaseConfig    `yaml:"database"`
+	OmniRPCURL            string            `yaml:"omnirpc_url"`
+	FastBridgeContractsV1 map[uint32]string `yaml:"fast_bridge_contracts_v1"`
+	FastBridgeContractsV2 map[uint32]string `yaml:"fast_bridge_contracts_v2"`
+	Port                  string            `yaml:"port"`
+	RelayAckTimeout       time.Duration     `yaml:"relay_ack_timeout"`
+	MaxQuoteAge           time.Duration     `yaml:"max_quote_age"`
 }
 
 const defaultRelayAckTimeout = 30 * time.Second

services/rfq/api/model/request.go

@@ -1,6 +1,9 @@
 package model
 
-import "time"
+import (
+	"fmt"
+	"time"
+)
 
 // PutRelayerQuoteRequest contains the schema for a PUT /quote request.
 type PutRelayerQuoteRequest struct {
@@ -55,8 +58,12 @@ 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"`
 	ExpirationWindow  int64   `json:"expiration_window"`
+	ZapData           string  `json:"zap_data"`
+	ZapNative         string  `json:"zap_native"`
+	OriginAmountExact string  `json:"origin_amount_exact"`
+	OriginSender      string  `json:"origin_sender"`
+	DestRecipient     string  `json:"dest_recipient"`
 	DestAmount        *string `json:"dest_amount"`
 	RelayerAddress    *string `json:"relayer_address"`
 	QuoteID           *string `json:"quote_id"`
@@ -78,6 +85,7 @@ type SubscribeActiveRFQRequest struct {
 
 // NewWsRFQRequest creates a new WsRFQRequest.
 func NewWsRFQRequest(data QuoteData, requestID string) *WsRFQRequest {
+	fmt.Printf("NewWsRFQRequest with data: %+v\n", data)
 	return &WsRFQRequest{
 		RequestID: requestID,
 		Data:      data,

services/rfq/api/model/response.go

@@ -41,10 +41,12 @@ type PutRelayAckResponse struct {
 	RelayerAddress string `json:"relayer_address"`
 }
 
-// GetContractsResponse contains the schema for a GET /contract response.
+// GetContractsResponse contains the schema for a GET /contracts response.
 type GetContractsResponse struct {
-	// Contracts is a map of chain id to contract address
-	Contracts map[uint32]string `json:"contracts"`
+	// ContractsV1 is a map of chain id to contract address for v1 fast bridge contracts
+	ContractsV1 map[uint32]string `json:"contracts_v1"`
+	// ContractsV2 is a map of chain id to contract address for v2 fast bridge contracts
+	ContractsV2 map[uint32]string `json:"contracts_v2"`
 }
 
 // ActiveRFQMessage represents the general structure of WebSocket messages for Active RFQ.

services/rfq/api/rest/handler.go

@@ -6,6 +6,7 @@ import (
 	"strconv"
 	"time"
 
+	"github.com/ethereum/go-ethereum/common"
 	"github.com/synapsecns/sanguine/services/rfq/api/config"
 
 	"github.com/gin-gonic/gin"
@@ -69,7 +70,7 @@ func (h *Handler) ModifyQuote(c *gin.Context) {
 		return
 	}
 
-	dbQuote, err := parseDBQuote(*putRequest, relayerAddr)
+	dbQuote, err := parseDBQuote(h.cfg, *putRequest, relayerAddr)
 	if err != nil {
 		c.JSON(http.StatusBadRequest, gin.H{"error": err.Error()})
 		return
@@ -117,7 +118,7 @@ func (h *Handler) ModifyBulkQuotes(c *gin.Context) {
 
 	dbQuotes := []*db.Quote{}
 	for _, quoteReq := range putRequest.Quotes {
-		dbQuote, err := parseDBQuote(quoteReq, relayerAddr)
+		dbQuote, err := parseDBQuote(h.cfg, quoteReq, relayerAddr)
 		if err != nil {
 			c.JSON(http.StatusBadRequest, gin.H{"error": "Invalid quote request"})
 			return
@@ -134,7 +135,7 @@ func (h *Handler) ModifyBulkQuotes(c *gin.Context) {
 }
 
 //nolint:gosec
-func parseDBQuote(putRequest model.PutRelayerQuoteRequest, relayerAddr interface{}) (*db.Quote, error) {
+func parseDBQuote(cfg config.Config, putRequest model.PutRelayerQuoteRequest, relayerAddr interface{}) (*db.Quote, error) {
 	destAmount, err := decimal.NewFromString(putRequest.DestAmount)
 	if err != nil {
 		return nil, fmt.Errorf("invalid DestAmount")
@@ -147,6 +148,12 @@ func parseDBQuote(putRequest model.PutRelayerQuoteRequest, relayerAddr interface
 	if err != nil {
 		return nil, fmt.Errorf("invalid FixedFee")
 	}
+
+	err = validateFastBridgeAddresses(cfg, putRequest)
+	if err != nil {
+		return nil, fmt.Errorf("invalid fast bridge addresses: %w", err)
+	}
+
 	// nolint: forcetypeassert
 	return &db.Quote{
 		OriginChainID:   uint64(putRequest.OriginChainID),
@@ -163,6 +170,24 @@ func parseDBQuote(putRequest model.PutRelayerQuoteRequest, relayerAddr interface
 	}, nil
 }
 
+//nolint:gosec
+func validateFastBridgeAddresses(cfg config.Config, putRequest model.PutRelayerQuoteRequest) error {
+	// Check V1 contracts
+	isV1Origin := common.HexToAddress(cfg.FastBridgeContractsV1[uint32(putRequest.OriginChainID)]) == common.HexToAddress(putRequest.OriginFastBridgeAddress)
+	isV1Dest := common.HexToAddress(cfg.FastBridgeContractsV1[uint32(putRequest.DestChainID)]) == common.HexToAddress(putRequest.DestFastBridgeAddress)
+
+	// Check V2 contracts
+	isV2Origin := common.HexToAddress(cfg.FastBridgeContractsV2[uint32(putRequest.OriginChainID)]) == common.HexToAddress(putRequest.OriginFastBridgeAddress)
+	isV2Dest := common.HexToAddress(cfg.FastBridgeContractsV2[uint32(putRequest.DestChainID)]) == common.HexToAddress(putRequest.DestFastBridgeAddress)
+
+	// Valid if both addresses match either V1 or V2
+	if (isV1Origin && isV1Dest) || (isV2Origin && isV2Dest) {
+		return nil
+	}
+
+	return fmt.Errorf("origin and destination fast bridge addresses must match either V1 or V2")
+}
+
 //nolint:gosec
 func quoteResponseFromDBQuote(dbQuote *db.Quote) *model.GetQuoteResponse {
 	return &model.GetQuoteResponse{
@@ -301,12 +326,10 @@ func dbActiveQuoteRequestToModel(dbQuote *db.ActiveQuoteRequest) *model.GetOpenQ
 // @Header 200 {string} X-Api-Version "API Version Number - See docs for more info"
 // @Router /contracts [get].
 func (h *Handler) GetContracts(c *gin.Context) {
-	// Convert quotes from db model to api model
-	contracts := make(map[uint32]string)
-	for chainID, address := range h.cfg.Bridges {
-		contracts[chainID] = address
-	}
-	c.JSON(http.StatusOK, model.GetContractsResponse{Contracts: contracts})
+	c.JSON(http.StatusOK, model.GetContractsResponse{
+		ContractsV1: h.cfg.FastBridgeContractsV1,
+		ContractsV2: h.cfg.FastBridgeContractsV2,
+	})
 }
 
 func filterQuoteAge(cfg config.Config, dbQuotes []*db.Quote) []*db.Quote {

services/rfq/api/rest/rfq.go

@@ -20,6 +20,7 @@ import (
 const collectionTimeout = 1 * time.Minute
 
 func (r *QuoterAPIServer) handleActiveRFQ(ctx context.Context, request *model.PutRFQRequest, requestID string) (quote *model.QuoteData) {
+	fmt.Printf("handleActiveRFQ with request data: %+v\n", request.Data)
 	ctx, span := r.handler.Tracer().Start(ctx, "handleActiveRFQ", trace.WithAttributes(
 		attribute.String("user_address", request.UserAddress),
 		attribute.String("request_id", requestID),
@@ -30,6 +31,7 @@ func (r *QuoterAPIServer) handleActiveRFQ(ctx context.Context, request *model.Pu
 
 	// publish the quote request to all connected clients
 	relayerReq := model.NewWsRFQRequest(request.Data, requestID)
+	fmt.Printf("parsed websocket request: %+v\n", relayerReq.Data)
 	r.wsClients.Range(func(relayerAddr string, client WsClient) bool {
 		sendCtx, sendSpan := r.handler.Tracer().Start(ctx, "sendQuoteRequest", trace.WithAttributes(
 			attribute.String("relayer_address", relayerAddr),

services/rfq/api/rest/rfq_test.go

@@ -308,6 +308,9 @@ func (c *ServerSuite) TestActiveRFQFallbackToPassive() {
 	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"
 	// Submit the user quote request with a large origin amount, expect no quotes will be found
 	userQuoteReq.Data.OriginAmountExact = big.NewInt(1e18).String()
 	userQuoteResp, err = userClient.PutRFQRequest(c.GetTestContext(), userQuoteReq)