[goreleaser] Adding RFQ to the Explorer [goreleaser]

services/explorer/api/resolver_test.go

@@ -3,14 +3,15 @@ package api_test
 import (
 	gosql "database/sql"
 	"fmt"
-	"github.com/ethereum/go-ethereum/crypto"
-	. "github.com/stretchr/testify/assert"
-	"github.com/synapsecns/sanguine/services/explorer/graphql/server/graph/model"
 	"math"
 	"math/big"
 	"sort"
 	"time"
 
+	"github.com/ethereum/go-ethereum/crypto"
+	. "github.com/stretchr/testify/assert"
+	"github.com/synapsecns/sanguine/services/explorer/graphql/server/graph/model"
+
 	"github.com/brianvoe/gofakeit/v6"
 	"github.com/ethereum/go-ethereum/common"
 	"github.com/synapsecns/sanguine/services/explorer/db/sql"
@@ -728,15 +729,19 @@ func (g APISuite) TestAmountStatistic() {
 func (g APISuite) TestGetBlockHeight() {
 	chainID1 := 1
 	chainID2 := 56
+	chainID3 := 10
 
 	type1 := model.ContractTypeCctp
 	type2 := model.ContractTypeBridge
+	type3 := model.ContractTypeFastBridge
 
 	contract1 := g.config.Chains[uint32(chainID1)].Contracts.CCTP
 	contract2 := g.config.Chains[uint32(chainID2)].Contracts.Bridge
+	contract3 := g.config.Chains[uint32(chainID3)].Contracts.RFQ
 
 	block1 := uint64(3)
 	block2 := uint64(4)
+	block3 := uint64(5)
 
 	contracts := []*model.ContractQuery{
 		{
@@ -747,6 +752,10 @@ func (g APISuite) TestGetBlockHeight() {
 			ChainID: chainID2,
 			Type:    type2,
 		},
+		{
+			ChainID: chainID3,
+			Type:    type3,
+		},
 	}
 
 	// Store blocks in the database.
@@ -756,10 +765,13 @@ func (g APISuite) TestGetBlockHeight() {
 	err = g.db.StoreLastBlock(g.GetTestContext(), uint32(chainID2), block2, contract2)
 	Nil(g.T(), err)
 
+	err = g.db.StoreLastBlock(g.GetTestContext(), uint32(chainID3), block3, contract3)
+	Nil(g.T(), err)
+
 	results, err := g.client.GetBlockHeight(g.GetTestContext(), contracts)
 	Nil(g.T(), err)
-	Equal(g.T(), 2, len(results.Response))
+	Equal(g.T(), 3, len(results.Response))
 	Equal(g.T(), int(block1), *results.Response[0].BlockNumber)
 	Equal(g.T(), int(block2), *results.Response[1].BlockNumber)
-
+	Equal(g.T(), int(block2), *results.Response[2].BlockNumber)
 }

services/explorer/api/server.go

@@ -4,6 +4,9 @@ import (
 	"context"
 	"encoding/json"
 	"fmt"
+	"net"
+	"time"
+
 	"github.com/ethereum/go-ethereum/common"
 	"github.com/ethereum/go-ethereum/ethclient"
 	"github.com/gin-gonic/gin"
@@ -17,13 +20,12 @@ import (
 	"github.com/synapsecns/sanguine/services/explorer/contracts/bridge"
 	"github.com/synapsecns/sanguine/services/explorer/contracts/bridgeconfig"
 	"github.com/synapsecns/sanguine/services/explorer/contracts/cctp"
+	"github.com/synapsecns/sanguine/services/explorer/contracts/fastbridge"
 	"github.com/synapsecns/sanguine/services/explorer/contracts/swap"
 	"github.com/synapsecns/sanguine/services/explorer/static"
 	"github.com/synapsecns/sanguine/services/explorer/types"
 	"go.opentelemetry.io/otel/attribute"
 	"go.opentelemetry.io/otel/metric"
-	"net"
-	"time"
 
 	"github.com/synapsecns/sanguine/core/ginhelper"
 	"github.com/synapsecns/sanguine/services/explorer/api/cache"
@@ -74,7 +76,8 @@ func createParsers(ctx context.Context, db db.ConsumerDB, fetcher fetcherpkg.Scr
 	if err != nil {
 		return nil, nil, nil, fmt.Errorf("could not create token data service: %w", err)
 	}
-
+	fastbridgeParsers := make(map[uint32]*parser.RFQParser)
+	fastbridgeRefs := make(map[uint32]*fastbridge.FastBridgeRef)
 	cctpParsers := make(map[uint32]*parser.CCTPParser)
 	bridgeParsers := make(map[uint32]*parser.BridgeParser)
 	bridgeRefs := make(map[uint32]*bridge.BridgeRef)
@@ -111,6 +114,23 @@ func createParsers(ctx context.Context, db db.ConsumerDB, fetcher fetcherpkg.Scr
 			}
 			bridgeParsers[chain.ChainID] = bridgeParser
 		}
+		if chain.Contracts.RFQ != "" {
+			rfqService, err := fetcherpkg.NewRFQFetcher(common.HexToAddress(chain.Contracts.RFQ), clients[chain.ChainID])
+			if err != nil {
+				return nil, nil, nil, fmt.Errorf("could not create fast bridge fetcher: %w", err)
+			}
+
+			fastBridgeRef, err := fastbridge.NewFastBridgeRef(common.HexToAddress(chain.Contracts.RFQ), clients[chain.ChainID])
+			if err != nil {
+				return nil, nil, nil, fmt.Errorf("could not create fast bridge ref: %w", err)
+			}
+			fastbridgeRefs[chain.ChainID] = fastBridgeRef
+			rfqParser, err := parser.NewRFQParser(db, common.HexToAddress(chain.Contracts.RFQ), fetcher, rfqService, tokenDataService, priceDataService, true)
+			if err != nil {
+				return nil, nil, nil, fmt.Errorf("could not create fast bridge parser: %w", err)
+			}
+			fastbridgeParsers[chain.ChainID] = rfqParser
+		}
 		if len(chain.Swaps) > 0 {
 			for _, swapAddr := range chain.Swaps {
 				swapFilterer, err := swap.NewSwapFlashLoanFilterer(common.HexToAddress(swapAddr), clients[chain.ChainID])
@@ -124,13 +144,15 @@ func createParsers(ctx context.Context, db db.ConsumerDB, fetcher fetcherpkg.Scr
 		}
 	}
 	serverParser := types.ServerParsers{
-		BridgeParsers: bridgeParsers,
-		CCTParsers:    cctpParsers,
+		BridgeParsers:     bridgeParsers,
+		CCTParsers:        cctpParsers,
+		FastBridgeParsers: fastbridgeParsers,
 	}
 
 	serverRefs := types.ServerRefs{
-		BridgeRefs: bridgeRefs,
-		CCTPRefs:   cctpRefs,
+		BridgeRefs:     bridgeRefs,
+		CCTPRefs:       cctpRefs,
+		FastBridgeRefs: fastbridgeRefs,
 	}
 	return &serverParser, &serverRefs, swapFilterers, nil
 }

services/explorer/api/suite_test.go

@@ -4,13 +4,14 @@ import (
 	"context"
 	gosql "database/sql"
 	"fmt"
-	serverConfig "github.com/synapsecns/sanguine/services/explorer/config/server"
-	"github.com/synapsecns/sanguine/services/explorer/graphql/server/graph"
 	"math/big"
 	"net/http"
 	"testing"
 	"time"
 
+	serverConfig "github.com/synapsecns/sanguine/services/explorer/config/server"
+	"github.com/synapsecns/sanguine/services/explorer/graphql/server/graph"
+
 	"github.com/phayes/freeport"
 	. "github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/suite"
@@ -257,6 +258,7 @@ func (g *APISuite) SetupTest() {
 				Contracts: serverConfig.ContractsConfig{
 					CCTP:   "0xfB2Bfc368a7edfD51aa2cbEC513ad50edEa74E84",
 					Bridge: "0x2796317b0fF8538F253012862c06787Adfb8cEb6",
+					RFQ:    "0x5523D3c98809DdDB82C686E152F5C58B1B0fB59E",
 				},
 			},
 			56: {
@@ -277,6 +279,7 @@ func (g *APISuite) SetupTest() {
 				Swaps:              []string{"0x9Dd329F5411466d9e0C488fF72519CA9fEf0cb40", "0xa067668661C84476aFcDc6fA5D758C4c01C34352"},
 				Contracts: serverConfig.ContractsConfig{
 					Bridge: "0x6F4e8eBa4D337f874Ab57478AcC2Cb5BACdc19c9",
+					RFQ:    "0x5523D3c98809DdDB82C686E152F5C58B1B0fB59E",
 				},
 			},
 			10: {
@@ -287,6 +290,7 @@ func (g *APISuite) SetupTest() {
 				Swaps:              []string{"0xF44938b0125A6662f9536281aD2CD6c499F22004", "0xE27BFf97CE92C3e1Ff7AA9f86781FDd6D48F5eE9"},
 				Contracts: serverConfig.ContractsConfig{
 					Bridge: "0xAf41a65F786339e7911F4acDAD6BD49426F2Dc6b",
+					RFQ:    "0x5523D3c98809DdDB82C686E152F5C58B1B0fB59E",
 				},
 			},
 		},

services/explorer/backfill/chain.go

@@ -31,6 +31,8 @@ type ChainBackfiller struct {
 	messageBusParser *parser.MessageBusParser
 	// cctpParser is the parser to use to parse cctp events.
 	cctpParser *parser.CCTPParser
+	// rfqParser is the parser to use to parse rfq events.
+	rfqParser *parser.RFQParser
 	// Fetcher is the Fetcher to use to fetch logs.
 	Fetcher fetcher.ScribeFetcher
 	// chainConfig is the chain config for the chain.
@@ -44,13 +46,14 @@ const (
 )
 
 // NewChainBackfiller creates a new backfiller for a chain.
-func NewChainBackfiller(consumerDB db.ConsumerDB, bridgeParser *parser.BridgeParser, swapParsers map[common.Address]*parser.SwapParser, messageBusParser *parser.MessageBusParser, cctpParser *parser.CCTPParser, fetcher fetcher.ScribeFetcher, chainConfig indexerconfig.ChainConfig) *ChainBackfiller {
+func NewChainBackfiller(consumerDB db.ConsumerDB, bridgeParser *parser.BridgeParser, swapParsers map[common.Address]*parser.SwapParser, messageBusParser *parser.MessageBusParser, cctpParser *parser.CCTPParser, rfqParser *parser.RFQParser, fetcher fetcher.ScribeFetcher, chainConfig indexerconfig.ChainConfig) *ChainBackfiller {
 	return &ChainBackfiller{
 		consumerDB:       consumerDB,
 		bridgeParser:     bridgeParser,
 		swapParsers:      swapParsers,
 		messageBusParser: messageBusParser,
 		cctpParser:       cctpParser,
+		rfqParser:        rfqParser,
 		Fetcher:          fetcher,
 		chainConfig:      chainConfig,
 	}
@@ -132,6 +135,8 @@ func (c *ChainBackfiller) makeEventParser(contract indexerconfig.ContractConfig)
 		eventParser = c.swapParsers[common.HexToAddress(contract.Address)]
 	case indexerconfig.CCTPContractType:
 		eventParser = c.cctpParser
+	case indexerconfig.RFQContractType:
+		eventParser = c.rfqParser
 	}
 	return eventParser, nil
 }