Add relayer API

services/rfq/api/client/suite_test.go

@@ -42,7 +42,7 @@ type ClientSuite struct {
 	cfg                  config.Config
 	testWallet           wallet.Wallet
 	handler              metrics.Handler
-	APIServer            *rest.APIServer
+	QuoterAPIServer      *rest.QuoterAPIServer
 	port                 uint16
 	client               client.AuthenticatedClient
 }
@@ -84,12 +84,12 @@ func (c *ClientSuite) SetupTest() {
 	}
 	c.cfg = testConfig
 
-	APIServer, err := rest.NewAPI(c.GetTestContext(), c.cfg, c.handler, c.omniRPCClient, c.database)
+	QuoterAPIServer, err := rest.NewAPI(c.GetTestContext(), c.cfg, c.handler, c.omniRPCClient, c.database)
 	c.Require().NoError(err)
-	c.APIServer = APIServer
+	c.QuoterAPIServer = QuoterAPIServer
 
 	go func() {
-		err := c.APIServer.Run(c.GetTestContext())
+		err := c.QuoterAPIServer.Run(c.GetTestContext())
 		c.Require().NoError(err)
 	}()
 	time.Sleep(2 * time.Second) // Wait for the server to start.

services/rfq/api/rest/server.go

@@ -23,9 +23,9 @@ import (
 	"github.com/synapsecns/sanguine/services/rfq/contracts/fastbridge"
 )
 
-// APIServer is a struct that holds the configuration, database connection, gin engine, RPC client, metrics handler, and fast bridge contracts.
+// QuoterAPIServer is a struct that holds the configuration, database connection, gin engine, RPC client, metrics handler, and fast bridge contracts.
 // It is used to initialize and run the API server.
-type APIServer struct {
+type QuoterAPIServer struct {
 	cfg                 config.Config
 	db                  db.APIDB
 	engine              *gin.Engine
@@ -42,7 +42,7 @@ func NewAPI(
 	handler metrics.Handler,
 	omniRPCClient omniClient.RPCClient,
 	store db.APIDB,
-) (*APIServer, error) {
+) (*QuoterAPIServer, error) {
 	if ctx == nil {
 		return nil, fmt.Errorf("context is nil")
 	}
@@ -68,7 +68,7 @@ func NewAPI(
 		}
 	}
 
-	return &APIServer{
+	return &QuoterAPIServer{
 		cfg:                 cfg,
 		db:                  store,
 		omnirpcClient:       omniRPCClient,
@@ -84,8 +84,8 @@ const (
 
 var logger = log.Logger("rfq-api")
 
-// Run runs the rest api server.
-func (r *APIServer) Run(ctx context.Context) error {
+// Run runs the quoter api server.
+func (r *QuoterAPIServer) Run(ctx context.Context) error {
 	// TODO: Use Gin Helper
 	engine := ginhelper.New(logger)
 	h := NewHandler(r.db)
@@ -112,7 +112,7 @@ func (r *APIServer) Run(ctx context.Context) error {
 }
 
 // AuthMiddleware is the Gin authentication middleware that authenticates requests using EIP191.
-func (r *APIServer) AuthMiddleware() gin.HandlerFunc {
+func (r *QuoterAPIServer) AuthMiddleware() gin.HandlerFunc {
 	return func(c *gin.Context) {
 		var req model.PutQuoteRequest
 		if err := c.BindJSON(&req); err != nil {

services/rfq/api/rest/server_test.go

@@ -15,9 +15,9 @@ import (
 	"github.com/synapsecns/sanguine/services/rfq/api/model"
 )
 
-func (c *ServerSuite) TestNewAPIServer() {
+func (c *ServerSuite) TestNewQuoterAPIServer() {
 	// Start the API server in a separate goroutine and wait for it to initialize.
-	c.startAPIServer()
+	c.startQuoterAPIServer()
 	client := &http.Client{}
 	req, err := http.NewRequestWithContext(c.GetTestContext(), http.MethodGet, fmt.Sprintf("http://localhost:%d/quotes", c.port), nil)
 	c.Require().NoError(err)
@@ -34,7 +34,7 @@ func (c *ServerSuite) TestNewAPIServer() {
 // TestEIP191_SuccessfulSignature tests the EIP191 signature process for successful authentication.
 func (c *ServerSuite) TestEIP191_SuccessfulSignature() {
 	// Start the API server in a separate goroutine and wait for it to initialize.
-	c.startAPIServer()
+	c.startQuoterAPIServer()
 
 	// Prepare the authorization header with a signed timestamp.
 	header, err := c.prepareAuthHeader(c.testWallet)
@@ -65,7 +65,7 @@ func (c *ServerSuite) TestEIP191_SuccessfulSignature() {
 // TestEIP191_UnsuccessfulSignature tests the EIP191 signature process with an incorrect wallet signature.
 func (c *ServerSuite) TestEIP191_UnsuccessfulSignature() {
 	// Start the API server in a separate goroutine and wait for it to initialize.
-	c.startAPIServer()
+	c.startQuoterAPIServer()
 
 	// Prepare the authorization header with a signed timestamp using an incorrect wallet.
 	randomWallet, err := wallet.FromRandom()
@@ -97,7 +97,7 @@ func (c *ServerSuite) TestEIP191_UnsuccessfulSignature() {
 // TestEIP191_SuccessfulPutSubmission tests a successful PUT request submission.
 func (c *ServerSuite) TestEIP191_SuccessfulPutSubmission() {
 	// Start the API server in a separate goroutine and wait for it to initialize.
-	c.startAPIServer()
+	c.startQuoterAPIServer()
 
 	// Prepare the authorization header with a signed timestamp.
 	header, err := c.prepareAuthHeader(c.testWallet)
@@ -120,7 +120,7 @@ func (c *ServerSuite) TestEIP191_SuccessfulPutSubmission() {
 }
 
 func (c *ServerSuite) TestPutAndGetQuote() {
-	c.startAPIServer()
+	c.startQuoterAPIServer()
 
 	header, err := c.prepareAuthHeader(c.testWallet)
 	c.Require().NoError(err)
@@ -162,7 +162,7 @@ func (c *ServerSuite) TestPutAndGetQuote() {
 }
 
 func (c *ServerSuite) TestPutAndGetQuoteByRelayer() {
-	c.startAPIServer()
+	c.startQuoterAPIServer()
 
 	header, err := c.prepareAuthHeader(c.testWallet)
 	c.Require().NoError(err)
@@ -203,10 +203,10 @@ func (c *ServerSuite) TestPutAndGetQuoteByRelayer() {
 	c.Assert().True(found, "Newly added quote not found")
 }
 
-// startAPIServer starts the API server and waits for it to initialize.
-func (c *ServerSuite) startAPIServer() {
+// startQuoterAPIServer starts the API server and waits for it to initialize.
+func (c *ServerSuite) startQuoterAPIServer() {
 	go func() {
-		err := c.APIServer.Run(c.GetTestContext())
+		err := c.QuoterAPIServer.Run(c.GetTestContext())
 		c.Require().NoError(err)
 	}()
 	time.Sleep(2 * time.Second) // Wait for the server to start.

services/rfq/api/rest/suite_test.go

@@ -39,7 +39,7 @@ type ServerSuite struct {
 	cfg                  config.Config
 	testWallet           wallet.Wallet
 	handler              metrics.Handler
-	APIServer            *rest.APIServer
+	QuoterAPIServer      *rest.QuoterAPIServer
 	port                 uint16
 }
 
@@ -80,13 +80,13 @@ func (c *ServerSuite) SetupTest() {
 	}
 	c.cfg = testConfig
 
-	APIServer, err := rest.NewAPI(c.GetTestContext(), c.cfg, c.handler, c.omniRPCClient, c.database)
+	QuoterAPIServer, err := rest.NewAPI(c.GetTestContext(), c.cfg, c.handler, c.omniRPCClient, c.database)
 	c.Require().NoError(err)
 
-	c.APIServer = APIServer
+	c.QuoterAPIServer = QuoterAPIServer
 
 	// go func() {
-	// 	err := c.APIServer.Run(c.GetTestContext())
+	// 	err := c.QuoterAPIServer.Run(c.GetTestContext())
 	// 	c.Require().NoError(err)
 	// }()
 	// time.Sleep(2 * time.Second) // Wait for the server to start.

services/rfq/e2e/rfq_test.go

@@ -27,13 +27,14 @@ type IntegrationSuite struct {
 	originBackend backends.SimulatedTestBackend
 	destBackend   backends.SimulatedTestBackend
 	//omniserver is the omnirpc server address
-	omniServer    string
-	omniClient    omnirpcClient.RPCClient
-	metrics       metrics.Handler
-	apiServer     string
-	relayer       *service.Relayer
-	relayerWallet wallet.Wallet
-	userWallet    wallet.Wallet
+	omniServer       string
+	omniClient       omnirpcClient.RPCClient
+	metrics          metrics.Handler
+	apiServer        string
+	relayerApiServer string
+	relayer          *service.Relayer
+	relayerWallet    wallet.Wallet
+	userWallet       wallet.Wallet
 }
 
 func NewIntegrationSuite(tb testing.TB) *IntegrationSuite {
@@ -68,7 +69,7 @@ func (i *IntegrationSuite) SetupTest() {
 	i.setupBackends()
 
 	// setup the api server
-	i.setupAPI()
+	i.setupQuoterAPI()
 	i.setupRelayer()
 
 }

services/rfq/e2e/setup_test.go

@@ -36,7 +36,7 @@ import (
 	"github.com/synapsecns/sanguine/services/rfq/testutil"
 )
 
-func (i *IntegrationSuite) setupAPI() {
+func (i *IntegrationSuite) setupQuoterAPI() {
 	dbPath := filet.TmpDir(i.T(), "")
 	apiPort, err := freeport.GetFreePort()
 	i.NoError(err)
@@ -189,6 +189,8 @@ func (i *IntegrationSuite) setupRelayer() {
 	wg.Wait()
 
 	// construct the config
+	relayerApiPort, err := freeport.GetFreePort()
+	i.NoError(err)
 	dsn := filet.TmpDir(i.T(), "")
 	cfg := relconfig.Config{
 		// generated ex-post facto
@@ -229,6 +231,15 @@ func (i *IntegrationSuite) setupRelayer() {
 			Type: signerConfig.FileType.String(),
 			File: filet.TmpFile(i.T(), "", i.relayerWallet.PrivateKeyHex()).Name(),
 		},
+		RelayerAPIURL: fmt.Sprintf("http://localhost:%d", relayerApiPort),
+		RelayerAPIConfig: relconfig.RelayerAPIConfig{
+			Database: relconfig.DatabaseConfig{
+				Type: dbcommon.Sqlite.String(),
+				DSN:  dsn,
+			},
+			OmniRPCURL: i.omniServer,
+			Port:       strconv.Itoa(relayerApiPort),
+		},
 		FeePricer: relconfig.FeePricerConfig{
 			GasPriceCacheTTLSeconds:   60,
 			TokenPriceCacheTTLSeconds: 60,
@@ -277,7 +288,6 @@ func (i *IntegrationSuite) setupRelayer() {
 	}
 
 	// TODO: good chance we wanna leave actually starting this up to the indiividual test.
-	var err error
 	i.relayer, err = service.NewRelayer(i.GetTestContext(), i.metrics, cfg)
 	i.NoError(err)
 	go func() {

services/rfq/relayer/chain/chain.go

@@ -0,0 +1,91 @@
+// Package chain defines the interface for interacting with a blockchain.
+package chain
+
+import (
+	"context"
+	"fmt"
+	"math/big"
+
+	"github.com/ethereum/go-ethereum/accounts/abi/bind"
+	"github.com/ethereum/go-ethereum/common"
+	"github.com/ethereum/go-ethereum/core/types"
+	"github.com/synapsecns/sanguine/core"
+	"github.com/synapsecns/sanguine/ethergo/client"
+	"github.com/synapsecns/sanguine/ethergo/submitter"
+	"github.com/synapsecns/sanguine/services/rfq/contracts/fastbridge"
+	"github.com/synapsecns/sanguine/services/rfq/relayer/listener"
+	"github.com/synapsecns/sanguine/services/rfq/relayer/reldb"
+)
+
+// Chain is a chain helper for relayer.
+// lowercase fields are private, uppercase are public.
+// the plan is to move this out of relayer which is when this distinction will matter.
+type Chain struct {
+	ChainID       uint32
+	Bridge        *fastbridge.FastBridgeRef
+	Client        client.EVM
+	Confirmations uint64
+	listener      listener.ContractListener
+	submitter     submitter.TransactionSubmitter
+}
+
+// NewChain creates a new chain.
+func NewChain(ctx context.Context, chainClient client.EVM, addr common.Address, chainListener listener.ContractListener, ts submitter.TransactionSubmitter) (*Chain, error) {
+	bridge, err := fastbridge.NewFastBridgeRef(addr, chainClient)
+	if err != nil {
+		return nil, fmt.Errorf("could not create bridge contract: %w", err)
+	}
+	chainID, err := chainClient.ChainID(ctx)
+	if err != nil {
+		return nil, fmt.Errorf("could not get chain id: %w", err)
+	}
+	return &Chain{
+		ChainID: uint32(chainID.Int64()),
+		Bridge:  bridge,
+		Client:  chainClient,
+		// TODO: configure
+		Confirmations: 1,
+		listener:      chainListener,
+		submitter:     ts,
+	}, nil
+}
+
+// SubmitTransaction submits a transaction to the chain.
+func (c Chain) SubmitTransaction(ctx context.Context, call submitter.ContractCallType) (nonce uint64, _ error) {
+	//nolint: wrapcheck
+	return c.submitter.SubmitTransaction(ctx, big.NewInt(int64(c.ChainID)), call)
+}
+
+// LatestBlock returns the latest block.
+func (c Chain) LatestBlock() uint64 {
+	return c.listener.LatestBlock()
+}
+
+// SubmitRelay submits a relay transaction to the destination chain after evaluating gas amount.
+func (c Chain) SubmitRelay(ctx context.Context, request reldb.QuoteRequest) (uint64, *big.Int, error) {
+	gasAmount := big.NewInt(0)
+	var err error
+
+	if request.Transaction.SendChainGas {
+		gasAmount, err = c.Bridge.ChainGasAmount(&bind.CallOpts{Context: ctx})
+		if err != nil {
+			return 0, nil, fmt.Errorf("could not get chain gas amount: %w", err)
+		}
+	}
+
+	nonce, err := c.SubmitTransaction(ctx, func(transactor *bind.TransactOpts) (tx *types.Transaction, err error) {
+		transactor.Value = core.CopyBigInt(gasAmount)
+
+		tx, err = c.Bridge.Relay(transactor, request.RawRequest)
+		if err != nil {
+			return nil, fmt.Errorf("could not relay: %w", err)
+		}
+
+		return tx, nil
+	})
+	if err != nil {
+		return 0, nil, fmt.Errorf("could not submit transaction: %w", err)
+	}
+
+	return nonce, gasAmount, nil
+}

services/rfq/relayer/listener/listener_test.go

@@ -2,15 +2,16 @@ package listener_test
 
 import (
 	"context"
+	"math/big"
+	"sync"
+	"time"
+
 	"github.com/brianvoe/gofakeit/v6"
 	"github.com/ethereum/go-ethereum/common"
 	"github.com/ethereum/go-ethereum/core/types"
 	"github.com/ethereum/go-ethereum/crypto"
 	"github.com/synapsecns/sanguine/services/rfq/contracts/testcontracts/fastbridgemock"
 	"github.com/synapsecns/sanguine/services/rfq/relayer/listener"
-	"math/big"
-	"sync"
-	"time"
 )
 
 func (l *ListenerTestSuite) TestListenForEvents() {
@@ -40,6 +41,7 @@ func (l *ListenerTestSuite) TestListenForEvents() {
 				Deadline:     new(big.Int).SetUint64(uint64(time.Now().Add(-1 * time.Second * time.Duration(gofakeit.Uint16())).Unix())),
 			})
 			l.NoError(err)
+			l.NotNil(bridgeRequestTX)
 
 			l.backend.WaitForConfirmation(l.GetTestContext(), bridgeRequestTX)
 
@@ -63,6 +65,7 @@ func (l *ListenerTestSuite) TestListenForEvents() {
 				// gasAmount
 				new(big.Int).SetUint64(gofakeit.Uint64()))
 			l.NoError(err)
+			l.NotNil(bridgeResponseTX)
 			l.backend.WaitForConfirmation(l.GetTestContext(), bridgeResponseTX)
 		}(i)
 	}