rfq: mimimal viable withdrawal api

ethergo/submitter/submitter.go

@@ -39,7 +39,7 @@ import (
 
 var logger = log.Logger("ethergo-submitter")
 
-const meterName = "github.com/synapsecns/sanguine/services/rfq/api/rest"
+const meterName = "github.com/synapsecns/sanguine/ethergo/submitter"
 
 // TransactionSubmitter is the interface for submitting transactions to the chain.
 type TransactionSubmitter interface {
@@ -51,6 +51,8 @@ type TransactionSubmitter interface {
 	SubmitTransaction(ctx context.Context, chainID *big.Int, call ContractCallType) (nonce uint64, err error)
 	// GetSubmissionStatus returns the status of a transaction and any metadata associated with it if it is complete.
 	GetSubmissionStatus(ctx context.Context, chainID *big.Int, nonce uint64) (status SubmissionStatus, err error)
+	// Address returns the address of the signer.
+	Address() common.Address
 }
 
 // txSubmitterImpl is the implementation of the transaction submitter.
@@ -683,4 +685,8 @@ func (t *txSubmitterImpl) getGasEstimate(ctx context.Context, chainClient client
 	return gasEstimate, nil
 }
 
+func (t *txSubmitterImpl) Address() common.Address {
+	return t.signer.Address()
+}
+
 var _ TransactionSubmitter = &txSubmitterImpl{}

services/rfq/relayer/relapi/client.go

@@ -17,6 +17,7 @@
 	GetQuoteRequestStatusByTxHash(ctx context.Context, hash string) (*GetQuoteRequestStatusResponse, error)
 	GetQuoteRequestStatusByTxID(ctx context.Context, hash string) (*GetQuoteRequestStatusResponse, error)
 	RetryTransaction(ctx context.Context, txhash string) (*GetTxRetryResponse, error)
+	Withdraw(ctx context.Context, req *WithdrawRequest) (*WithdrawResponse, error)
 }
 
 type relayerClient struct {
@@ -100,3 +101,24 @@
 
 	return &res, nil
 }
+
+// WithdrawResponse is the response for the withdraw request.
+type WithdrawResponse struct {
+	Nonce uint64 `json:"nonce"`
+}
+
+func (r *relayerClient) Withdraw(ctx context.Context, req *WithdrawRequest) (*WithdrawResponse, error) {
+	var res WithdrawResponse
+	resp, err := r.client.R().SetContext(ctx).
+		SetResult(&res).
+		SetBody(req).
+		Post(postWithdrawRoute)
+	if err != nil {
+		return nil, fmt.Errorf("failed to withdraw transaction: %w", err)
+	}
+	if resp.StatusCode() != http.StatusOK {
+		return nil, fmt.Errorf("unexpected status code: %d", resp.StatusCode())
+	}
+
+	return &res, nil
+}

services/rfq/relayer/relapi/handler.go

@@ -1,7 +1,14 @@
 package relapi
 
 import (
+	"encoding/json"
 	"fmt"
+	"github.com/ethereum/go-ethereum/accounts/abi/bind"
+	"github.com/ethereum/go-ethereum/core/types"
+	"github.com/synapsecns/sanguine/ethergo/submitter"
+	"github.com/synapsecns/sanguine/services/rfq/contracts/ierc20"
+	"github.com/synapsecns/sanguine/services/rfq/relayer/relconfig"
+	"math/big"
 	"net/http"
 
 	"github.com/ethereum/go-ethereum/common"
@@ -13,15 +20,19 @@
 
 // Handler is the REST API handler.
 type Handler struct {
-	db     reldb.Service
-	chains map[uint32]*chain.Chain
+	db        reldb.Service
+	chains    map[uint32]*chain.Chain
+	cfg       relconfig.Config
+	submitter submitter.TransactionSubmitter
 }
 
 // NewHandler creates a new REST API handler.
-func NewHandler(db reldb.Service, chains map[uint32]*chain.Chain) *Handler {
+func NewHandler(db reldb.Service, chains map[uint32]*chain.Chain, cfg relconfig.Config, txSubmitter submitter.TransactionSubmitter) *Handler {
 	return &Handler{
-		db:     db, // Store the database connection in the handler
-		chains: chains,
+		db:        db, // Store the database connection in the handler
+		chains:    chains,
+		cfg:       cfg,
+		submitter: txSubmitter,
 	}
 }
 
@@ -107,14 +118,14 @@
 	}
 
 	chainID := quoteRequest.Transaction.DestChainId
-	chain, ok := h.chains[chainID]
+	chainHandler, ok := h.chains[chainID]
 	if !ok {
 		c.JSON(http.StatusInternalServerError, gin.H{"error": fmt.Sprintf("No contract found for chain: %d", chainID)})
 		return
 	}
 
 	// `quoteRequest == nil` case should be handled by the db query above
-	nonce, gasAmount, err := chain.SubmitRelay(c, *quoteRequest)
+	nonce, gasAmount, err := chainHandler.SubmitRelay(c, *quoteRequest)
 	if err != nil {
 		c.JSON(http.StatusInternalServerError, gin.H{"error": fmt.Sprintf("could not submit relay: %s", err.Error())})
 		return
@@ -128,3 +139,141 @@
 	}
 	c.JSON(http.StatusOK, resp)
 }
+
+// Withdraw withdraws tokens from the relayer.
+func (h *Handler) Withdraw(c *gin.Context) {
+	var req WithdrawRequest
+	if err := c.ShouldBindJSON(&req); err != nil {
+		c.JSON(http.StatusBadRequest, gin.H{"error": err.Error()})
+		return
+	}
+
+	// validate the token address
+	if !tokenIDExists(h.cfg, req.TokenAddress, int(req.ChainID)) {
+		c.JSON(http.StatusBadRequest, gin.H{"error": fmt.Sprintf("invalid token address %s for chain %d", req.TokenAddress.Hex(), req.ChainID)})
+		return
+	}
+
+	// validate the withdrawal address
+	if !toAddressIsWhitelisted(h.cfg, req.To) {
+		c.JSON(http.StatusBadRequest, gin.H{"error": fmt.Sprintf("withdrawal address %s is not whitelisted", req.To.Hex())})
+		return
+	}
+
+	var nonce uint64
+	var err error
+
+	value, ok := new(big.Int).SetString(req.Amount, 10)
+	if !ok {
+		c.JSON(http.StatusBadRequest, gin.H{"error": fmt.Sprintf("invalid amount %s", req.Amount)})
+		return
+	}
+
+	if chain.IsGasToken(req.TokenAddress) {
+		nonce, err = h.submitter.SubmitTransaction(c, big.NewInt(int64(req.ChainID)), func(transactor *bind.TransactOpts) (tx *types.Transaction, err error) {
+			tx = types.NewTx(&types.LegacyTx{
+				Nonce: transactor.Nonce.Uint64(),
+				To:    &req.To,
+				Value: value,
+			})
+
+			return transactor.Signer(h.submitter.Address(), tx)
+		})
+		if err != nil {
+			c.JSON(http.StatusInternalServerError, gin.H{"error": fmt.Sprintf("could not submit transaction: %s", err.Error())})
+			return
+		}
+	} else {
+		erc20Contract, err := ierc20.NewIERC20(req.TokenAddress, h.chains[req.ChainID].Client)
+		if err != nil {
+			c.JSON(http.StatusInternalServerError, gin.H{"error": fmt.Sprintf("could not create erc20 contract: %s", err.Error())})
+			return
+		}
+
+		nonce, err = h.submitter.SubmitTransaction(c, big.NewInt(int64(req.ChainID)), func(transactor *bind.TransactOpts) (tx *types.Transaction, err error) {
+			tx, err = erc20Contract.Transfer(transactor, req.To, value)
+			return tx, fmt.Errorf("could not create transfer transaction: %w", err)
+		})
+		if err != nil {
+			c.JSON(http.StatusInternalServerError, gin.H{"error": fmt.Sprintf("could not submit transaction: %s", err.Error())})
+			return
+		}
+	}
+
+	c.JSON(http.StatusOK, gin.H{"nonce": nonce})
+}
+
+// tokenIDExists checks if a token ID exists in the config.
+// note: this method assumes that SanitizeTokenID is a method of relconfig.Config
+func tokenIDExists(cfg relconfig.Config, tokenAddress common.Address, chainID int) bool {
+	for quotableToken := range cfg.QuotableTokens {
+		prospectiveChainID, prospectiveAddress, err := relconfig.DecodeTokenID(quotableToken)
+		if err != nil {
+			continue
+		}
+
+		if prospectiveChainID == chainID && prospectiveAddress == tokenAddress {
+			return true
+		}
+	}
+
+	return false
+}
+
+func toAddressIsWhitelisted(cfg relconfig.Config, to common.Address) bool {
+	for _, addr := range cfg.WithdrawalWhitelist {
+		if common.HexToAddress(addr) == to {
+			return true
+		}
+	}
+	return false
+}
+
+// WithdrawRequest is the request to withdraw tokens from the relayer.
+type WithdrawRequest struct {
+	// ChainID is the chain ID of the chain to withdraw from.
+	ChainID uint32 `json:"chain_id"`
+	// Amount is the amount to withdraw, in wei.
+	Amount string `json:"amount"`
+	// TokenAddress is the address of the token to withdraw.
+	TokenAddress common.Address `json:"token_address"`
+	// To is the address to withdraw to.
+	To common.Address `json:"to"`
+}
+
+// MarshalJSON handles JSON marshaling for WithdrawRequest.
+func (wr *WithdrawRequest) MarshalJSON() ([]byte, error) {
+	type Alias WithdrawRequest
+	// nolint: wrapcheck
+	return json.Marshal(&struct {
+		TokenAddress string `json:"token_address"`
+		To           string `json:"to"`
+		*Alias
+	}{
+		TokenAddress: wr.TokenAddress.Hex(),
+		To:           wr.To.Hex(),
+		Alias:        (*Alias)(wr),
+	})
+}
+
+// UnmarshalJSON has JSON unmarshalling for WithdrawRequest.
+func (wr *WithdrawRequest) UnmarshalJSON(data []byte) error {
+	type Alias WithdrawRequest
+	aux := &struct {
+		TokenAddress string `json:"token_address"`
+		To           string `json:"to"`
+		*Alias
+	}{
+		Alias: (*Alias)(wr),
+	}
+
+	if err := json.Unmarshal(data, aux); err != nil {
+		//nolint: wrapcheck
+		return err
+	}
+
+	wr.TokenAddress = common.HexToAddress(aux.TokenAddress)
+	wr.To = common.HexToAddress(aux.To)
+
+	return nil
+}

services/rfq/relayer/relapi/handler_test.go

@@ -0,0 +1,34 @@
+package relapi_test
+
+import (
+	"encoding/json"
+	"github.com/ethereum/go-ethereum/common"
+	"github.com/stretchr/testify/assert"
+	"github.com/synapsecns/sanguine/services/rfq/relayer/relapi"
+	"testing"
+)
+
+func TestWithdrawRequestJSON(t *testing.T) {
+	original := relapi.WithdrawRequest{
+		ChainID:      1,
+		Amount:       "100",
+		TokenAddress: common.HexToAddress("0xEeeeeEeeeEeEeeEeEeEeeEEEeeeeEeeeeeeeEEeE"),
+		To:           common.HexToAddress("0xDeaDbeefdEAdbeefdEadbEEFdeadbeEFdEaDbeeF"),
+	}
+
+	// Marshal to JSON
+	data, err := json.Marshal(original)
+	assert.NoError(t, err)
+
+	// Unmarshal back to struct
+	var unmarshalled relapi.WithdrawRequest
+	err = json.Unmarshal(data, &unmarshalled)
+	assert.NoError(t, err)
+
+	// Check if the original and unmarshalled structs are the same
+	assert.Equal(t, original, unmarshalled)
+
+	// Check the JSON string explicitly
+	expectedJSON := `{"chain_id":1,"amount":"100","token_address":"0xeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee","to":"0xdeadbeefdeadbeefdeadbeefdeadbeefdeadbeef"}`
+	assert.JSONEq(t, expectedJSON, string(data))
+}

services/rfq/relayer/relapi/server.go

@@ -25,11 +25,12 @@ import (
 // RelayerAPIServer 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 RelayerAPIServer struct {
-	cfg     relconfig.Config
-	db      reldb.Service
-	engine  *gin.Engine
-	handler metrics.Handler
-	chains  map[uint32]*chain.Chain
+	cfg       relconfig.Config
+	db        reldb.Service
+	engine    *gin.Engine
+	handler   metrics.Handler
+	chains    map[uint32]*chain.Chain
+	submitter submitter.TransactionSubmitter
 }
 
 // NewRelayerAPI holds the configuration, database connection, gin engine, RPC client, metrics handler, and fast bridge contracts.
@@ -86,10 +87,11 @@ func NewRelayerAPI(
 	}
 
 	return &RelayerAPIServer{
-		cfg:     cfg,
-		db:      store,
-		handler: handler,
-		chains:  chains,
+		cfg:       cfg,
+		db:        store,
+		handler:   handler,
+		chains:    chains,
+		submitter: submitter,
 	}, nil
 }
 
@@ -98,15 +100,17 @@ const (
 	getQuoteStatusByTxHashRoute = "/status"
 	getQuoteStatusByTxIDRoute   = "/status/by_tx_id"
 	getRetryRoute               = "/retry"
+	postWithdrawRoute           = "/withdraw"
 )
 
 var logger = log.Logger("relayer-api")
 
 // Run runs the rest api server.
 func (r *RelayerAPIServer) Run(ctx context.Context) error {
-	// TODO: Use Gin Helper
 	engine := ginhelper.New(logger)
-	h := NewHandler(r.db, r.chains)
+	// default tracing middleware
+	engine.Use(r.handler.Gin()...)
+	h := NewHandler(r.db, r.chains, r.cfg, r.submitter)
 
 	// Assign GET routes
 	engine.GET(getHealthRoute, h.GetHealth)
@@ -115,6 +119,10 @@ func (r *RelayerAPIServer) Run(ctx context.Context) error {
 	engine.GET(getRetryRoute, h.GetTxRetry)
 	engine.GET(metrics.MetricsPathDefault, gin.WrapH(r.handler.Handler()))
 
+	if r.cfg.EnableAPIWithdrawals {
+		engine.POST(postWithdrawRoute, h.Withdraw)
+	}
+
 	r.engine = engine
 
 	connection := baseServer.Server{}