Merge d14682e into bdf657c

agents/go.mod

@@ -203,7 +203,7 @@ require (
 	github.com/google/uuid v1.6.0 // indirect
 	github.com/googleapis/enterprise-certificate-proxy v0.3.2 // indirect
 	github.com/googleapis/gax-go/v2 v2.12.4 // indirect
-	github.com/gorilla/websocket v1.5.1 // indirect
+	github.com/gorilla/websocket v1.5.3 // indirect
 	github.com/grpc-ecosystem/grpc-gateway/v2 v2.20.0 // indirect
 	github.com/hashicorp/consul/sdk v0.14.0 // indirect
 	github.com/hashicorp/errwrap v1.1.0 // indirect

agents/go.sum

@@ -622,8 +622,7 @@ github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1/go.mod h1:wJfORR
 github.com/gorilla/mux v1.8.0/go.mod h1:DVbg23sWSpFRCP0SfiEN6jmj59UnW/n46BH5rLB71So=
 github.com/gorilla/websocket v1.4.1/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE=
 github.com/gorilla/websocket v1.4.2/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE=
-github.com/gorilla/websocket v1.5.1 h1:gmztn0JnHVt9JZquRuzLw3g4wouNVzKL15iLr/zn/QY=
-github.com/gorilla/websocket v1.5.1/go.mod h1:x3kM2JMyaluk02fnUJpQuwD2dCS5NDG2ZHL0uE0tcaY=
+github.com/gorilla/websocket v1.5.3 h1:saDtZ6Pbx/0u+bgYQ3q96pZgCzfhKXGPqt7kZ72aNNg=
 github.com/grafana/otel-profiling-go v0.5.1 h1:stVPKAFZSa7eGiqbYuG25VcqYksR6iWvF3YH66t4qL8=
 github.com/grafana/otel-profiling-go v0.5.1/go.mod h1:ftN/t5A/4gQI19/8MoWurBEtC6gFw8Dns1sJZ9W4Tls=
 github.com/grafana/pyroscope-go v1.1.1 h1:PQoUU9oWtO3ve/fgIiklYuGilvsm8qaGhlY4Vw6MAcQ=

contrib/opbot/botmd/botmd.go

@@ -2,10 +2,18 @@ package botmd
 
 import (
 	"context"
+	"fmt"
 	"github.com/slack-io/slacker"
 	"github.com/synapsecns/sanguine/contrib/opbot/config"
 	"github.com/synapsecns/sanguine/contrib/opbot/signoz"
+	"github.com/synapsecns/sanguine/core/dbcommon"
 	"github.com/synapsecns/sanguine/core/metrics"
+	signerConfig "github.com/synapsecns/sanguine/ethergo/signer/config"
+	"github.com/synapsecns/sanguine/ethergo/signer/signer"
+	"github.com/synapsecns/sanguine/ethergo/submitter"
+	cctpSql "github.com/synapsecns/sanguine/services/cctp-relayer/db/sql"
+	omnirpcClient "github.com/synapsecns/sanguine/services/omnirpc/client"
+	"golang.org/x/sync/errgroup"
 )
 
 // Bot represents the bot server.
@@ -15,6 +23,9 @@ type Bot struct {
 	cfg           config.Config
 	signozClient  *signoz.Client
 	signozEnabled bool
+	rpcClient     omnirpcClient.RPCClient
+	signer        signer.Signer
+	submitter     submitter.TransactionSubmitter
 }
 
 // NewBot creates a new bot server.
@@ -32,8 +43,10 @@ func NewBot(handler metrics.Handler, cfg config.Config) Bot {
 		bot.signozEnabled = true
 	}
 
+	bot.rpcClient = omnirpcClient.NewOmnirpcClient(cfg.OmniRPCURL, handler, omnirpcClient.WithCaptureReqRes())
+
 	bot.addMiddleware(bot.tracingMiddleware(), bot.metricsMiddleware())
-	bot.addCommands(bot.traceCommand(), bot.rfqLookupCommand())
+	bot.addCommands(bot.traceCommand(), bot.rfqLookupCommand(), bot.rfqRefund())
 
 	return bot
 }
@@ -53,6 +66,33 @@ func (b *Bot) addCommands(commands ...*slacker.CommandDefinition) {
 // Start starts the bot server.
 // nolint: wrapcheck
 func (b *Bot) Start(ctx context.Context) error {
+	var err error
+	b.signer, err = signerConfig.SignerFromConfig(ctx, b.cfg.Signer)
+	if err != nil {
+		return fmt.Errorf("failed to create signer: %w", err)
+	}
+
+	dbType, err := dbcommon.DBTypeFromString(b.cfg.Database.Type)
+	if err != nil {
+		return fmt.Errorf("could not get db type: %w", err)
+	}
+
+	store, err := cctpSql.Connect(ctx, dbType, b.cfg.Database.DSN, b.handler)
+	if err != nil {
+		return fmt.Errorf("could not connect to database: %w", err)
+	}
+
+	b.submitter = submitter.NewTransactionSubmitter(b.handler, b.signer, b.rpcClient, store.SubmitterDB(), &b.cfg.SubmitterConfig)
+
+	g, ctx := errgroup.WithContext(ctx)
+	g.Go(func() error {
+		return b.submitter.Start(ctx)
+	})
+
+	g.Go(func() error {
+		return b.server.Listen(ctx)
+	})
+
 	// nolint: wrapcheck
-	return b.server.Listen(ctx)
+	return g.Wait()
 }

contrib/opbot/botmd/commands.go

@@ -4,15 +4,21 @@ package botmd
 
 import (
 	"fmt"
+	"github.com/ethereum/go-ethereum/accounts/abi/bind"
 	"github.com/ethereum/go-ethereum/common"
+	"github.com/ethereum/go-ethereum/core/types"
 	"github.com/hako/durafmt"
 	"github.com/slack-go/slack"
 	"github.com/slack-io/slacker"
 	"github.com/synapsecns/sanguine/contrib/opbot/signoz"
 	"github.com/synapsecns/sanguine/ethergo/chaindata"
+	rfqClient "github.com/synapsecns/sanguine/services/rfq/api/client"
+	"github.com/synapsecns/sanguine/services/rfq/contracts/fastbridge"
 	"github.com/synapsecns/sanguine/services/rfq/relayer/relapi"
 	"log"
+	"math/big"
 	"regexp"
+	"strconv"
 	"strings"
 	"sync"
 	"time"
@@ -239,6 +245,83 @@ func (b *Bot) rfqLookupCommand() *slacker.CommandDefinition {
 		}}
 }
 
+func (b *Bot) rfqRefund() *slacker.CommandDefinition {
+	return &slacker.CommandDefinition{
+		Command:     "refund <tx> <origin_chainid>",
+		Description: "refund a quote request",
+		Examples:    []string{"refund 0x1234"},
+		Handler: func(ctx *slacker.CommandContext) {
+			client, err := rfqClient.NewUnauthenticatedClient(b.handler, b.cfg.RFQApiURL)
+			if err != nil {
+				log.Printf("error creating rfq client: %v\n", err)
+				return
+			}
+
+			contracts, err := client.GetRFQContracts(ctx.Context())
+			if err != nil {
+				log.Printf("error fetching rfq contracts: %v\n", err)
+				return
+			}
+
+			tx := stripLinks(ctx.Request().Param("tx"))
+			originChainIDStr := ctx.Request().Param("origin_chainid")
+
+			originChainID, err := strconv.Atoi(originChainIDStr)
+			if err != nil {
+				_, err := ctx.Response().Reply("origin_chainid must be a number")
+				if err != nil {
+					log.Println(err)
+				}
+				return
+			}
+
+			chainClient, err := b.rpcClient.GetChainClient(ctx.Context(), originChainID)
+			if err != nil {
+				log.Printf("error getting chain client: %v\n", err)
+				return
+			}
+
+			contractAddress, ok := contracts.Contracts[uint32(originChainID)]
+			if !ok {
+				_, err := ctx.Response().Reply("contract address not found")
+				if err != nil {
+					log.Println(err)
+				}
+				return
+			}
+
+			fastBridgeHandle, err := fastbridge.NewFastBridge(common.HexToAddress(contractAddress), chainClient)
+			if err != nil {
+				log.Printf("error creating fast bridge: %v\n", err)
+				return
+			}
+
+			for _, relayer := range b.cfg.RelayerURLS {
+				relClient := relapi.NewRelayerClient(b.handler, relayer)
+				qr, err := relClient.GetQuoteRequestByTXID(ctx.Context(), tx)
+				if err != nil {
+					log.Printf("error fetching quote request: %v\n", err)
+					continue
+				}
+
+				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))
+				})
+				if err != nil {
+					log.Printf("error submitting refund: %v\n", err)
+					continue
+				}
+
+				_, err = ctx.Response().Reply(fmt.Sprintf("refund submitted with nonce %d", nonce))
+				if err != nil {
+					log.Println(err)
+				}
+				return
+			}
+		},
+	}
+}
+
 func toExplorerSlackLink(ogHash string) string {
 	rfqHash := strings.ToUpper(ogHash)
 	// cut off 0x

contrib/opbot/botmd/middleware.go

@@ -21,12 +21,13 @@ const (
 func (b *Bot) tracingMiddleware() slacker.CommandMiddlewareHandler {
 	return func(next slacker.CommandHandler) slacker.CommandHandler {
 		return func(cmdCtx *slacker.CommandContext) {
-			// TODO: context is not inherited here.
-			_, span := b.handler.Tracer().Start(cmdCtx.Context(), fmt.Sprintf("command.%s", cmdCtx.Definition().Command), trace.WithAttributes(
+			ctx, span := b.handler.Tracer().Start(cmdCtx.Context(), fmt.Sprintf("command.%s", cmdCtx.Definition().Command), trace.WithAttributes(
 				attribute.String("user_id", cmdCtx.Event().UserID),
 				attribute.String("channel_id", cmdCtx.Event().Channel.ID),
 			))
 
+			cmdCtx.WithContext(ctx)
+
 			defer func() {
 				metrics.EndSpan(span)
 			}()

contrib/opbot/config/config.go

@@ -1,6 +1,11 @@
 // Package config provides a simple way to read and write configuration files.
 package config
 
+import (
+	"github.com/synapsecns/sanguine/ethergo/signer/config"
+	submitterConfig "github.com/synapsecns/sanguine/ethergo/submitter/config"
+)
+
 // Config represents the configuration of the application.
 type Config struct {
 	// SlackBotToken is the token of the slack bot.
@@ -18,4 +23,20 @@ type Config struct {
 	SignozBaseURL string `yaml:"signoz_base_url"`
 	// RelayerURLS is the list of RFQ relayer URLs.
 	RelayerURLS []string `yaml:"rfq_relayer_urls"`
+	// 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"`
+	// Signer is the signer config.
+	Signer config.SignerConfig `yaml:"signer"`
+	// SubmitterConfig is the submitter config.
+	SubmitterConfig submitterConfig.Config `yaml:"submitter_config"`
+	// Database is the database config.
+	Database DatabaseConfig `yaml:"database"`
+}
+
+// DatabaseConfig represents the configuration for the database.
+type DatabaseConfig struct {
+	Type string `yaml:"type"`
+	DSN  string `yaml:"dsn"` // Data Source Name
 }

contrib/opbot/go.mod

@@ -14,6 +14,7 @@ require (
 	github.com/google/uuid v1.6.0
 	github.com/hako/durafmt v0.0.0-20210608085754-5c1018a4e16b
 	github.com/hedzr/log v1.6.3
+	github.com/ipfs/go-log v1.0.5
 	github.com/joho/godotenv v1.5.1
 	github.com/keybase/go-keychain v0.0.0-20231219164618-57a3676c3af6
 	github.com/mailru/easyjson v0.7.7
@@ -23,13 +24,19 @@ require (
 	github.com/slack-io/slacker v0.1.0
 	github.com/synapsecns/sanguine/core v0.0.0-00010101000000-000000000000
 	github.com/synapsecns/sanguine/ethergo v0.1.0
+	github.com/synapsecns/sanguine/services/cctp-relayer v0.0.0-00010101000000-000000000000
+	github.com/synapsecns/sanguine/services/omnirpc v0.0.0-00010101000000-000000000000
 	github.com/synapsecns/sanguine/services/rfq v0.0.0-00010101000000-000000000000
 	github.com/urfave/cli/v2 v2.27.2
 	go.opentelemetry.io/otel v1.27.0
 	go.opentelemetry.io/otel/metric v1.27.0
 	go.opentelemetry.io/otel/trace v1.27.0
+	golang.org/x/sync v0.7.0
 	gopkg.in/yaml.v2 v2.4.0
 	gopkg.in/yaml.v3 v3.0.1
+	gorm.io/driver/mysql v1.5.6
+	gorm.io/driver/sqlite v1.5.6
+	gorm.io/gorm v1.25.10
 	k8s.io/apimachinery v0.29.3
 )
 
@@ -44,6 +51,7 @@ require (
 	dario.cat/mergo v1.0.0 // indirect
 	github.com/DataDog/zstd v1.5.2 // indirect
 	github.com/ImVexed/fasturl v0.0.0-20230304231329-4e41488060f3 // indirect
+	github.com/KyleBanks/depth v1.2.1 // indirect
 	github.com/Microsoft/go-winio v0.6.1 // indirect
 	github.com/ProtonMail/go-crypto v1.0.0 // indirect
 	github.com/VictoriaMetrics/fastcache v1.12.1 // indirect
@@ -127,9 +135,14 @@ require (
 	github.com/go-logr/logr v1.4.2 // indirect
 	github.com/go-logr/stdr v1.2.2 // indirect
 	github.com/go-ole/go-ole v1.3.0 // indirect
+	github.com/go-openapi/jsonpointer v0.20.2 // indirect
+	github.com/go-openapi/jsonreference v0.20.4 // indirect
+	github.com/go-openapi/spec v0.20.14 // indirect
+	github.com/go-openapi/swag v0.22.9 // indirect
 	github.com/go-playground/locales v0.14.1 // indirect
 	github.com/go-playground/universal-translator v0.18.1 // indirect
 	github.com/go-playground/validator/v10 v10.20.0 // indirect
+	github.com/go-sql-driver/mysql v1.7.0 // indirect
 	github.com/goccy/go-json v0.10.2 // indirect
 	github.com/gofrs/flock v0.8.1 // indirect
 	github.com/gogo/protobuf v1.3.3 // indirect
@@ -139,7 +152,7 @@ require (
 	github.com/google/s2a-go v0.1.7 // indirect
 	github.com/googleapis/enterprise-certificate-proxy v0.3.2 // indirect
 	github.com/googleapis/gax-go/v2 v2.12.4 // indirect
-	github.com/gorilla/websocket v1.5.1 // indirect
+	github.com/gorilla/websocket v1.5.3 // indirect
 	github.com/grafana/otel-profiling-go v0.5.1 // indirect
 	github.com/grafana/pyroscope-go v1.1.1 // indirect
 	github.com/grafana/pyroscope-go/godeltaprof v0.1.7 // indirect
@@ -149,11 +162,12 @@ require (
 	github.com/holiman/bloomfilter/v2 v2.0.3 // indirect
 	github.com/holiman/uint256 v1.2.4 // indirect
 	github.com/huin/goupnp v1.3.0 // indirect
+	github.com/imkira/go-interpol v1.1.0 // indirect
 	github.com/integralist/go-findroot v0.0.0-20160518114804-ac90681525dc // indirect
-	github.com/ipfs/go-log v1.0.5 // indirect
 	github.com/ipfs/go-log/v2 v2.5.1 // indirect
 	github.com/jackpal/go-nat-pmp v1.0.2 // indirect
 	github.com/jbenet/go-context v0.0.0-20150711004518-d14ea06fba99 // indirect
+	github.com/jellydator/ttlcache/v3 v3.1.1 // indirect
 	github.com/jftuga/ellipsis v1.0.0 // indirect
 	github.com/jinzhu/inflection v1.0.0 // indirect
 	github.com/jinzhu/now v1.1.5 // indirect
@@ -173,6 +187,7 @@ require (
 	github.com/mattn/go-isatty v0.0.20 // indirect
 	github.com/mattn/go-localereader v0.0.1 // indirect
 	github.com/mattn/go-runewidth v0.0.15 // indirect
+	github.com/mattn/go-sqlite3 v2.0.3+incompatible // indirect
 	github.com/mattn/go-tty v0.0.3 // indirect
 	github.com/miguelmota/go-ethereum-hdwallet v0.1.1 // indirect
 	github.com/mitchellh/go-homedir v1.1.0 // indirect
@@ -202,13 +217,15 @@ require (
 	github.com/sergi/go-diff v1.3.2-0.20230802210424-5b0b94c5c0d3 // indirect
 	github.com/shibukawa/configdir v0.0.0-20170330084843-e180dbdc8da0 // indirect
 	github.com/shirou/gopsutil v3.21.11+incompatible // indirect
-	github.com/shomali11/commander v0.0.0-20230730023802-0b64f620037d // indirect
-	github.com/shomali11/proper v0.0.0-20190608032528-6e70a05688e7 // indirect
+	github.com/shopspring/decimal v1.4.0 // indirect
 	github.com/skeema/knownhosts v1.2.2 // indirect
+	github.com/slack-io/commander v0.0.0-20231120025847-9fd78b4b2d54 // indirect
+	github.com/slack-io/proper v0.0.0-20231119200853-f78ba4fc878f // indirect
 	github.com/stretchr/testify v1.9.0 // indirect
 	github.com/supranational/blst v0.3.11 // indirect
-	github.com/synapsecns/sanguine/services/cctp-relayer v0.0.0-00010101000000-000000000000 // indirect
-	github.com/synapsecns/sanguine/services/omnirpc v0.0.0-00010101000000-000000000000 // indirect
+	github.com/swaggo/files v1.0.1 // indirect
+	github.com/swaggo/gin-swagger v1.6.0 // indirect
+	github.com/swaggo/swag v1.16.3 // indirect
 	github.com/syndtr/goleveldb v1.0.1-0.20210819022825-2ae1ddf74ef7 // indirect
 	github.com/teivah/onecontext v1.3.0 // indirect
 	github.com/tklauser/go-sysconf v0.3.12 // indirect
@@ -248,7 +265,6 @@ require (
 	golang.org/x/mod v0.18.0 // indirect
 	golang.org/x/net v0.26.0 // indirect
 	golang.org/x/oauth2 v0.21.0 // indirect
-	golang.org/x/sync v0.7.0 // indirect
 	golang.org/x/sys v0.21.0 // indirect
 	golang.org/x/text v0.16.0 // indirect
 	golang.org/x/time v0.5.0 // indirect
@@ -260,7 +276,6 @@ require (
 	google.golang.org/grpc v1.64.0 // indirect
 	google.golang.org/protobuf v1.34.1 // indirect
 	gopkg.in/warnings.v0 v0.1.2 // indirect
-	gorm.io/gorm v1.25.10 // indirect
 	k8s.io/klog/v2 v2.120.1 // indirect
 	k8s.io/utils v0.0.0-20230726121419-3b25d923346b // indirect
 	rsc.io/tmplfunc v0.0.3 // indirect
@@ -271,9 +286,7 @@ replace (
 	// later versions give errors on uint64 being too high.
 	github.com/brianvoe/gofakeit/v6 => github.com/brianvoe/gofakeit/v6 v6.9.0
 	github.com/gogo/protobuf => github.com/regen-network/protobuf v1.3.3-alpha.regen.1
-	github.com/slack-go/slack => github.com/slack-go/slack v0.12.2
-	// TODO: replace after https://github.com/slack-io/slacker/pull/14 is merged
-	github.com/slack-io/slacker => github.com/kathiouchka/slacker v0.0.0-20240629123301-04d4e71c3a96
+	github.com/slack-io/slacker => github.com/slack-io/slacker v0.1.1-0.20240701203341-bd3ee211e9d2
 	github.com/synapsecns/sanguine/core => ./../../core
 	github.com/synapsecns/sanguine/ethergo => ./../../ethergo
 	github.com/synapsecns/sanguine/services/cctp-relayer => ./../../services/cctp-relayer