[API-3583] Track tx costs

.mockery.yml

@@ -6,7 +6,9 @@ packages:
     interfaces:
       EVMRPCClientManager:
       EVMChainRPC:
-      IOracle:
+  github.com/skip-mev/go-fast-solver/shared/oracle:
+    interfaces:
+      TxPriceOracle:
   github.com/skip-mev/go-fast-solver/shared/http:
     interfaces:
       Client:

cmd/solver/main.go

@@ -10,6 +10,7 @@ import (
 
 	"github.com/skip-mev/go-fast-solver/gasmonitor"
 
+	"github.com/skip-mev/go-fast-solver/shared/oracle"
 	"github.com/skip-mev/go-fast-solver/shared/txexecutor/cosmos"
 	"github.com/skip-mev/go-fast-solver/shared/txexecutor/evm"
 
@@ -97,9 +98,9 @@ func main() {
 	rateLimitedClient := utils.DefaultRateLimitedHTTPClient(3)
 	coingeckoClient := coingecko.NewCoingeckoClient(rateLimitedClient, "https://api.coingecko.com/api/v3/", "")
 	cachedCoinGeckoClient := coingecko.NewCachedPriceClient(coingeckoClient, 15*time.Minute)
-	evmTxPriceOracle := evmrpc.NewOracle(cachedCoinGeckoClient)
+	txPriceOracle := oracle.NewOracle(cachedCoinGeckoClient)
 
-	hype, err := hyperlane.NewMultiClientFromConfig(ctx, evmManager, keyStore, evmTxPriceOracle, evmTxExecutor)
+	hype, err := hyperlane.NewMultiClientFromConfig(ctx, evmManager, keyStore, txPriceOracle, evmTxExecutor)
 	if err != nil {
 		lmt.Logger(ctx).Fatal("creating hyperlane multi client from config", zap.Error(err))
 	}
@@ -144,7 +145,7 @@ func main() {
 	})
 
 	eg.Go(func() error {
-		r, err := fundrebalancer.NewFundRebalancer(ctx, keyStore, skipgo, evmManager, db.New(dbConn), evmTxPriceOracle, evmTxExecutor)
+		r, err := fundrebalancer.NewFundRebalancer(ctx, keyStore, skipgo, evmManager, db.New(dbConn), txPriceOracle, evmTxExecutor)
 		if err != nil {
 			return fmt.Errorf("creating fund rebalancer: %w", err)
 		}
@@ -153,7 +154,7 @@ func main() {
 	})
 
 	eg.Go(func() error {
-		r, err := txverifier.NewTxVerifier(ctx, db.New(dbConn), clientManager)
+		r, err := txverifier.NewTxVerifier(ctx, db.New(dbConn), clientManager, txPriceOracle)
 		if err != nil {
 			return err
 		}

cmd/solvercli/cmd/relay.go

@@ -7,6 +7,7 @@ import (
 	"encoding/json"
 	"time"
 
+	"github.com/skip-mev/go-fast-solver/shared/oracle"
 	"github.com/skip-mev/go-fast-solver/shared/txexecutor/evm"
 
 	"os/signal"
@@ -97,9 +98,9 @@ var relayCmd = &cobra.Command{
 		rateLimitedClient := utils.DefaultRateLimitedHTTPClient(3)
 		coingeckoClient := coingecko.NewCoingeckoClient(rateLimitedClient, "https://api.coingecko.com/api/v3/", "")
 		cachedCoinGeckoClient := coingecko.NewCachedPriceClient(coingeckoClient, 15*time.Minute)
-		evmTxPriceOracle := evmrpc.NewOracle(cachedCoinGeckoClient)
+		txPriceOracle := oracle.NewOracle(cachedCoinGeckoClient)
 		evmTxExecutor := evm.DefaultEVMTxExecutor()
-		hype, err := hyperlane.NewMultiClientFromConfig(ctx, evmrpc.NewEVMRPCClientManager(), keyStore, evmTxPriceOracle, evmTxExecutor)
+		hype, err := hyperlane.NewMultiClientFromConfig(ctx, evmrpc.NewEVMRPCClientManager(), keyStore, txPriceOracle, evmTxExecutor)
 		if err != nil {
 			lmt.Logger(ctx).Error("Error creating hyperlane multi client from config", zap.Error(err))
 		}

db/migrations/000004_add_submitted_tx_table.up.sql

@@ -25,4 +25,4 @@ WHERE order_settlement_id IS NOT NULL;
 
 CREATE UNIQUE INDEX submitted_txs_chain_tx_key
 ON submitted_txs(chain_id, tx_hash)
-WHERE order_settlement_id IS NULL;
+WHERE order_settlement_id IS NULL;

db/migrations/000007_add_tx_price_cost_column_to_submitted_tx.down.sql

@@ -0,0 +1 @@
+ALTER TABLE submitted_txs DROP COLUMN tx_cost_uusdc;

db/migrations/000007_add_tx_price_cost_column_to_submitted_tx.up.sql

@@ -0,0 +1 @@
+ALTER TABLE submitted_txs ADD tx_cost_uusdc TEXT;

db/migrations/000008_add_rebalance_transfer_id_column_to_submitted_tx.down.sql

@@ -0,0 +1 @@
+ALTER TABLE submitted_txs DROP COLUMN rebalance_transfer_id;

db/migrations/000008_add_rebalance_transfer_id_column_to_submitted_tx.up.sql

@@ -0,0 +1 @@
+ALTER TABLE submitted_txs ADD rebalance_transfer_id INT;

db/queries/transactions.sql

@@ -1,5 +1,5 @@
 -- name: InsertSubmittedTx :one
-INSERT INTO submitted_txs (order_id, order_settlement_id, hyperlane_transfer_id, chain_id, tx_hash, raw_tx, tx_type, tx_status) VALUES (?, ?, ?, ?, ?, ?, ?, ?) RETURNING *;
+INSERT INTO submitted_txs (order_id, order_settlement_id, hyperlane_transfer_id, rebalance_transfer_id, chain_id, tx_hash, raw_tx, tx_type, tx_status) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?) RETURNING *;
 
 -- name: GetSubmittedTxsByOrderIdAndType :many
 SELECT * FROM submitted_txs WHERE order_id = ? AND tx_type = ?;
@@ -11,7 +11,9 @@ SELECT * FROM submitted_txs WHERE hyperlane_transfer_id = ?;
 SELECT * FROM submitted_txs WHERE tx_status = ?;
 
 -- name: SetSubmittedTxStatus :one
-UPDATE submitted_txs SET tx_status = ?, tx_status_message = ?, updated_at = CURRENT_TIMESTAMP WHERE tx_hash = ? AND chain_id = ? RETURNING *;
+UPDATE submitted_txs SET 
+    tx_status = ?, tx_status_message = ?, tx_cost_uusdc = ?, updated_at = CURRENT_TIMESTAMP 
+WHERE tx_hash = ? AND chain_id = ? RETURNING *;
 
 -- name: GetSubmittedTxsByOrderStatusAndType :many
 SELECT submitted_txs.* FROM submitted_txs INNER JOIN orders on submitted_txs.order_id = orders.id WHERE orders.order_status = ? AND submitted_txs.tx_type = ?;

db/types.go

@@ -21,6 +21,8 @@ const (
 	TxTypeSettlement               string = "SETTLEMENT"
 	TxTypeHyperlaneMessageDelivery string = "HYPERLANE_MESSAGE_DELIVERY"
 	TxTypeInitiateTimeout          string = "INITIATE_TIMEOUT"
+	TxTypeERC20Approval            string = "ERC20_APPROVAL"
+	TxTypeFundRebalnance           string = "FUND_REBALANCE"
 
 	RebalanceTransferStatusAbandoned string = "ABANDONED"
 	RebalanceTransferStatusPending   string = "PENDING"