withdrawal api

synapsecns · Jun 29, 2024 · 484a9a3 · 484a9a3
1 parent a17db24
commit 484a9a3
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 6 deletions.
diff --git a/services/rfq/relayer/relapi/handler.go b/services/rfq/relayer/relapi/handler.go
@@ -3,6 +3,7 @@ package relapi
 import (
 	"encoding/json"
 	"fmt"
+	"github.com/ethereum/go-ethereum/accounts/abi"
 	"github.com/ethereum/go-ethereum/accounts/abi/bind"
 	"github.com/ethereum/go-ethereum/core/types"
 	"github.com/synapsecns/sanguine/ethergo/submitter"
@@ -171,12 +172,12 @@ func (h *Handler) Withdraw(c *gin.Context) {
 
 	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{
-				// covers l2s, etc
-				Gas:   500_000,
-				To:    &req.To,
-				Value: value,
-			})
+			bc := bind.NewBoundContract(req.To, abi.ABI{}, h.chains[req.ChainID].Client, h.chains[req.ChainID].Client, h.chains[req.ChainID].Client)
+			if transactor.GasPrice != nil {
+				transactor.Value = value
+				// nolint: wrapcheck
+				return bc.Transfer(transactor)
+			}
 
 			return transactor.Signer(h.submitter.Address(), tx)
 		})

diff --git a/services/rfq/relayer/relapi/server_test.go b/services/rfq/relayer/relapi/server_test.go
@@ -236,6 +236,7 @@ func (c *RelayerClientSuite) TestEthWithdraw() {
 
 		return nil
 	})
+	c.Require().NoError(err)
 }
 
 func (c *RelayerClientSuite) TestERC20Withdraw() {
@@ -271,4 +272,5 @@ func (c *RelayerClientSuite) TestERC20Withdraw() {
 
 		return nil
 	})
+	c.Require().NoError(err)
 }