cleanup

contrib/opbot/botmd/commands.go

@@ -3,6 +3,7 @@
 package botmd
 
 import (
+	"context"
 	"fmt"
 	"github.com/ethereum/go-ethereum/accounts/abi/bind"
 	"github.com/ethereum/go-ethereum/common"
@@ -260,13 +261,33 @@ func (b *Bot) rfqRefund() *slacker.CommandDefinition {
 			contracts, err := client.GetRFQContracts(ctx.Context())
 			if err != nil {
 				log.Printf("error fetching rfq contracts: %v\n", err)
+				_, err = ctx.Response().Reply("error fetching rfq contracts")
+				if err != nil {
+					return
+				}
 				return
 			}
 
 			tx := stripLinks(ctx.Request().Param("tx"))
+
+			if len(tx) == 0 {
+				_, err := ctx.Response().Reply("please provide a tx hash")
+				if err != nil {
+					log.Println(err)
+				}
+				return
+			}
+
 			originChainIDStr := ctx.Request().Param("origin_chainid")
+			if len(originChainIDStr) == 0 {
+				_, err := ctx.Response().Reply("please provide an origin chain id")
+				if err != nil {
+					log.Println(err)
+				}
+				return
+			}
 
-			originChainID, err := strconv.Atoi(originChainIDStr)
+			originChainID, err := strconv.Atoi(convertChainName(originChainIDStr))
 			if err != nil {
 				_, err := ctx.Response().Reply("origin_chainid must be a number")
 				if err != nil {
@@ -298,14 +319,18 @@ func (b *Bot) rfqRefund() *slacker.CommandDefinition {
 
 			for _, relayer := range b.cfg.RelayerURLS {
 				relClient := relapi.NewRelayerClient(b.handler, relayer)
-				qr, err := relClient.GetQuoteRequestByTXID(ctx.Context(), tx)
+
+				rawRequest, err := getQuoteRequest(ctx.Context(), relClient, tx)
 				if err != nil {
-					log.Printf("error fetching quote request: %v\n", err)
-					continue
+					_, err := ctx.Response().Reply("error fetching quote request")
+					if err != nil {
+						log.Println(err)
+					}
+					return
 				}
 
 				nonce, err := b.submitter.SubmitTransaction(ctx.Context(), big.NewInt(int64(originChainID)), func(transactor *bind.TransactOpts) (tx *types.Transaction, err error) {
-					return fastBridgeHandle.Refund(transactor, common.Hex2Bytes(qr.QuoteRequestRaw))
+					return fastBridgeHandle.Refund(transactor, rawRequest)
 				})
 				if err != nil {
 					log.Printf("error submitting refund: %v\n", err)
@@ -347,3 +372,30 @@ func stripLinks(input string) string {
 	linkRegex := regexp.MustCompile(`<https?://[^|>]+\|([^>]+)>`)
 	return linkRegex.ReplaceAllString(input, "$1")
 }
+
+// convertChainName detects if the string contains letters and if it does, tries to convert it to a chain id.
+// otherwise return the original string
+func convertChainName(input string) string {
+	res := chaindata.ChainNameToChainID(input)
+	if res != 0 {
+		return strconv.Itoa(int(res))
+	}
+	return input
+}
+
+func getQuoteRequest(ctx context.Context, client relapi.RelayerClient, tx string) ([]byte, error) {
+	// at this point tx can be a txid or a has, we try both
+	txRequest, err := client.GetQuoteRequestStatusByTxHash(ctx, tx)
+	if err == nil {
+		// override tx with txid
+		tx = txRequest.TxID
+	}
+
+	// look up quote request
+	qr, err := client.GetQuoteRequestByTXID(ctx, tx)
+	if err != nil {
+		return nil, fmt.Errorf("error fetching quote request: %w", err)
+	}
+
+	return common.Hex2Bytes(qr.QuoteRequestRaw), nil
+}

contrib/opbot/cmd/commands.go

@@ -3,6 +3,7 @@ package cmd
 import (
 	"fmt"
 	"github.com/synapsecns/sanguine/contrib/opbot/botmd"
+	"github.com/synapsecns/sanguine/core"
 	"github.com/synapsecns/sanguine/core/metrics"
 
 	// used for testing.
@@ -23,7 +24,7 @@ var slackBotCommand = &cli.Command{
 	Usage: "start the slack bot",
 	Flags: []cli.Flag{fileFlag},
 	Action: func(c *cli.Context) error {
-		configFile, err := os.ReadFile(c.String(fileFlag.Name))
+		configFile, err := os.ReadFile(core.ExpandOrReturnPath(c.String(fileFlag.Name)))
 		if err != nil {
 			return fmt.Errorf("failed to open config file: %w", err)
 		}

contrib/opbot/config/config.go

@@ -26,7 +26,7 @@ type Config struct {
 	// RFQApiURL is the URL of the RFQ API.
 	RFQApiURL string `yaml:"rfq_api_url"`
 	// OmniRPCURL is the URL of the Omni RPC.
-	OmniRPCURL string `yaml:"omni_rpc_url"`
+	OmniRPCURL string `yaml:"omnirpc_url"`
 	// Signer is the signer config.
 	Signer config.SignerConfig `yaml:"signer"`
 	// SubmitterConfig is the submitter config.

ethergo/chaindata/chaindata.go

@@ -164,6 +164,17 @@ var ChainMetadataList = []ChainMetadata{
 	},
 }
 
+// ChainNameToChainID converts the chain name to the chain id.
+// It returns 0 if the chain name is not found.
+func ChainNameToChainID(chainName string) uint64 {
+	for _, chainMetadata := range ChainMetadataList {
+		if strings.EqualFold(chainMetadata.ChainName, chainName) {
+			return uint64(chainMetadata.ChainID)
+		}
+	}
+	return 0
+}
+
 // ChainIDToChainName converts the chain id to the chain name.
 func ChainIDToChainName(chainID int64, isUpper bool) string {
 	for _, chainMetadata := range ChainMetadataList {

ethergo/signer/wallet/import.go

@@ -58,6 +58,11 @@ func FromKeyFile(keyFile string) (Wallet, error) {
 
 // FromHex gets the wallet from the private key.
 func FromHex(privateKey string) (Wallet, error) {
+	// Check for '0x' prefix and remove it if it exists
+	if len(privateKey) >= 2 && strings.EqualFold(privateKey[:2], "0x") {
+		privateKey = privateKey[2:]
+	}
+
 	privKey, err := crypto.HexToECDSA(privateKey)
 	if err != nil {
 		return nil, fmt.Errorf("could not decode key: %w", err)

services/omnirpc/client/client.go

@@ -11,6 +11,7 @@ import (
 	"io"
 	"math/big"
 	"net/http"
+	"strings"
 )
 
 // RPCClient is an interface for the omnirpc service.
@@ -55,7 +56,13 @@ func (c *rpcClient) GetClient(ctx context.Context, chainID *big.Int) (client.EVM
 	return c.GetChainClient(ctx, int(chainID.Uint64()))
 }
 
-func (c *rpcClient) GetEndpoint(chainID, confirmations int) string {
+func (c *rpcClient) GetEndpoint(chainID, confirmations int) (res string) {
+	defer func() {
+		res = strings.ReplaceAll(c.endpoint, "://", "TEMP_PROTOCOL")
+		res = strings.ReplaceAll(c.endpoint, "//", "/")
+		res = strings.ReplaceAll(c.endpoint, "TEMP_PROTOCOL", "://")
+	}()
+
 	if confirmations == 0 {
 		return fmt.Sprintf("%s/rpc/%d", c.endpoint, chainID)
 	}

services/rfq/api/client/client.go

@@ -232,5 +232,5 @@ func getStatus(resp *resty.Response) string {
 	if resp == nil {
 		return "http status unavailable"
 	}
-	return getStatus(resp)
+	return resp.Status()
 }