Add CCTP rebalancing to RFQ relayer #2073
There are no files selected for viewing
File renamed without changes.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -4,21 +4,20 @@ import ( | |
| "context" | ||
| "errors" | ||
| "fmt" | ||
| "math/big" | ||
| "time" | ||
|
|
||
| "github.com/ethereum/go-ethereum" | ||
| "github.com/ethereum/go-ethereum/common" | ||
| "github.com/ethereum/go-ethereum/core/types" | ||
| "github.com/ipfs/go-log" | ||
| "github.com/jpillora/backoff" | ||
| "github.com/synapsecns/sanguine/core/metrics" | ||
| "github.com/synapsecns/sanguine/ethergo/client" | ||
| "github.com/synapsecns/sanguine/services/rfq/relayer/reldb" | ||
| "go.opentelemetry.io/otel/attribute" | ||
| "go.opentelemetry.io/otel/trace" | ||
| "golang.org/x/sync/errgroup" | ||
| ) | ||
|
|
||
| // ContractListener listens for chain events and calls HandleLog. | ||
|
|
@@ -37,11 +36,12 @@ type ContractListener interface { | |
| type HandleLog func(ctx context.Context, log types.Log) error | ||
|
|
||
| type chainListener struct { | ||
|
dwasse marked this conversation as resolved.
|
||
| client client.EVM | ||
| address common.Address | ||
| initialBlock uint64 | ||
| store reldb.Service | ||
| handler metrics.Handler | ||
| backoff *backoff.Backoff | ||
| // IMPORTANT! These fields cannot be used until they has been set. They are NOT | ||
| // set in the constructor | ||
| startBlock, chainID, latestBlock uint64 | ||
|
|
@@ -52,18 +52,14 @@ type chainListener struct { | |
| var logger = log.Logger("chainlistener-logger") | ||
|
|
||
| // NewChainListener creates a new chain listener. | ||
| func NewChainListener(omnirpcClient client.EVM, store reldb.Service, address common.Address, initialBlock uint64, handler metrics.Handler) (ContractListener, error) { | ||
|
Contributor
There was a problem hiding this comment. let's move this/the test to ethergo and import if we can
Contributor
There was a problem hiding this comment. I mention this b/c I've recreated this exact file twice in
Collaborator
Author
There was a problem hiding this comment. Did this here: 4febe40 Now lives in |
||
| return &chainListener{ | ||
| handler: handler, | ||
| address: address, | ||
| initialBlock: initialBlock, | ||
| store: store, | ||
| client: omnirpcClient, | ||
| backoff: newBackoffConfig(), | ||
| }, nil | ||
| } | ||
|
|
||
|
|
@@ -91,13 +87,12 @@ func (c *chainListener) Listen(ctx context.Context, handler HandleLog) (err erro | |
| if err != nil { | ||
| logger.Warn(err) | ||
| } | ||
| } | ||
| } | ||
| } | ||
|
|
||
| func (c *chainListener) Address() common.Address { | ||
| return c.address | ||
| } | ||
|
|
||
| func (c *chainListener) LatestBlock() uint64 { | ||
|
|
@@ -125,9 +120,8 @@ func (c *chainListener) doPoll(parentCtx context.Context, handler HandleLog) (er | |
| } | ||
|
|
||
| // Check if latest block is the same as start block (for chains with slow block times) | ||
| if c.latestBlock == c.startBlock { | ||
| return nil | ||
| } | ||
|
|
||
| // Handle if the listener is more than one get logs range behind the head | ||
|
|
@@ -164,7 +158,7 @@ func (c *chainListener) doPoll(parentCtx context.Context, handler HandleLog) (er | |
| } | ||
|
|
||
| func (c chainListener) getMetadata(parentCtx context.Context) (startBlock, chainID uint64, err error) { | ||
| var lastIndexed uint64 | ||
| ctx, span := c.handler.Tracer().Start(parentCtx, "getMetadata") | ||
|
|
||
| defer func() { | ||
|
|
@@ -174,16 +168,6 @@ func (c chainListener) getMetadata(parentCtx context.Context) (startBlock, chain | |
| // TODO: consider some kind of backoff here in case rpcs are down at boot. | ||
| // this becomes more of an issue as we add more chains | ||
| g, ctx := errgroup.WithContext(ctx) | ||
|
dwasse marked this conversation as resolved.
|
||
| g.Go(func() error { | ||
| // TODO: one thing I've been going back and forth on is whether or not this method should be chain aware | ||
| // passing in the chain ID would allow us to pull everything directly from the config, but be less testable | ||
|
|
@@ -213,8 +197,10 @@ func (c chainListener) getMetadata(parentCtx context.Context) (startBlock, chain | |
| return 0, 0, fmt.Errorf("could not get metadata: %w", err) | ||
| } | ||
|
|
||
| if lastIndexed > c.startBlock { | ||
| startBlock = lastIndexed | ||
| } else { | ||
| startBlock = c.initialBlock | ||
| } | ||
|
|
||
| return startBlock, chainID, nil | ||
|
|
@@ -233,6 +219,6 @@ func (c chainListener) buildFilterQuery(fromBlock, toBlock uint64) ethereum.Filt | |
| return ethereum.FilterQuery{ | ||
| FromBlock: new(big.Int).SetUint64(fromBlock), | ||
| ToBlock: new(big.Int).SetUint64(toBlock), | ||
| Addresses: []common.Address{c.address}, | ||
| } | ||
| } | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Tip
Codebase Verification
The verification process revealed that while one usage of
NewTestChainListenerinsuite_test.gohas been correctly updated to include both theAddressandInitialBlockfields, another usage has been updated to include only theAddressfield, omitting theInitialBlockfield. This indicates that not all references and usages ofNewTestChainListenerthroughout the test suite have been updated accordingly to pass the correct arguments, as required by the modifications in theTestChainListenerArgsstruct.Analysis chain
The
NewTestChainListenerfunction has been updated to initialize achainListenerwith the newAddressandInitialBlockfields. This change is consistent and necessary due to the modifications in theTestChainListenerArgsstruct. It's important to ensure that all references and usages ofNewTestChainListenerthroughout the test suite are updated accordingly to pass the correct arguments.Scripts Executed
The following scripts were executed for the analysis:
Script:
Length of output: 384
Script:
Length of output: 479