Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[goreleaser] Adding RFQ to the Explorer [goreleaser] #2474

Merged
merged 21 commits into from
Apr 9, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 5 additions & 4 deletions services/explorer/api/resolver_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -758,8 +759,8 @@ func (g APISuite) TestGetBlockHeight() {

results, err := g.client.GetBlockHeight(g.GetTestContext(), contracts)
Nil(g.T(), err)

Equal(g.T(), 2, len(results.Response))
Equal(g.T(), int(block1), *results.Response[0].BlockNumber)
Equal(g.T(), int(block2), *results.Response[1].BlockNumber)

}
36 changes: 29 additions & 7 deletions services/explorer/api/server.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,9 @@
"context"
"encoding/json"
"fmt"
"net"
"time"
Defi-Moses marked this conversation as resolved.
Show resolved Hide resolved

"github.com/ethereum/go-ethereum/common"
"github.com/ethereum/go-ethereum/ethclient"
"github.com/gin-gonic/gin"
Expand All @@ -17,13 +20,12 @@
"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"
Expand Down Expand Up @@ -74,7 +76,8 @@
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)
Expand Down Expand Up @@ -111,6 +114,23 @@
}
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)
}

Check warning on line 121 in services/explorer/api/server.go

View check run for this annotation

Codecov / codecov/patch

services/explorer/api/server.go#L120-L121

Added lines #L120 - L121 were not covered by tests

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)
}

Check warning on line 126 in services/explorer/api/server.go

View check run for this annotation

Codecov / codecov/patch

services/explorer/api/server.go#L125-L126

Added lines #L125 - L126 were not covered by tests
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)
}

Check warning on line 131 in services/explorer/api/server.go

View check run for this annotation

Codecov / codecov/patch

services/explorer/api/server.go#L130-L131

Added lines #L130 - L131 were not covered by tests
fastbridgeParsers[chain.ChainID] = rfqParser
}
Defi-Moses marked this conversation as resolved.
Show resolved Hide resolved
if len(chain.Swaps) > 0 {
for _, swapAddr := range chain.Swaps {
swapFilterer, err := swap.NewSwapFlashLoanFilterer(common.HexToAddress(swapAddr), clients[chain.ChainID])
Expand All @@ -124,13 +144,15 @@
}
}
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
}
Expand Down
8 changes: 6 additions & 2 deletions services/explorer/api/suite_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -257,6 +258,7 @@ func (g *APISuite) SetupTest() {
Contracts: serverConfig.ContractsConfig{
CCTP: "0xfB2Bfc368a7edfD51aa2cbEC513ad50edEa74E84",
Bridge: "0x2796317b0fF8538F253012862c06787Adfb8cEb6",
RFQ: "0x5523D3c98809DdDB82C686E152F5C58B1B0fB59E",
},
},
56: {
Expand All @@ -277,6 +279,7 @@ func (g *APISuite) SetupTest() {
Swaps: []string{"0x9Dd329F5411466d9e0C488fF72519CA9fEf0cb40", "0xa067668661C84476aFcDc6fA5D758C4c01C34352"},
Contracts: serverConfig.ContractsConfig{
Bridge: "0x6F4e8eBa4D337f874Ab57478AcC2Cb5BACdc19c9",
RFQ: "0x5523D3c98809DdDB82C686E152F5C58B1B0fB59E",
},
},
10: {
Expand All @@ -287,6 +290,7 @@ func (g *APISuite) SetupTest() {
Swaps: []string{"0xF44938b0125A6662f9536281aD2CD6c499F22004", "0xE27BFf97CE92C3e1Ff7AA9f86781FDd6D48F5eE9"},
Contracts: serverConfig.ContractsConfig{
Bridge: "0xAf41a65F786339e7911F4acDAD6BD49426F2Dc6b",
RFQ: "0x5523D3c98809DdDB82C686E152F5C58B1B0fB59E",
},
},
},
Expand Down
7 changes: 6 additions & 1 deletion services/explorer/backfill/chain.go
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand All @@ -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,
}
Expand Down Expand Up @@ -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
}
Expand Down
Loading
Loading