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

Add RFQ Guard #2840

Merged
merged 40 commits into from
Jul 6, 2024
Merged
Show file tree
Hide file tree
Changes from 37 commits
Commits
Show all changes
40 commits
Select commit Hold shift + click to select a range
b69063b
WIP: guard skeleton
dwasse Jul 2, 2024
1c4ef5f
WIP: add guarddb package
dwasse Jul 2, 2024
43d10b7
WIP: db loop
dwasse Jul 2, 2024
49e9466
Feat: add BridgeRequest model
dwasse Jul 2, 2024
85cbf82
Feat: store bridge request
dwasse Jul 2, 2024
35bf205
Feat: add dispute trigger
dwasse Jul 2, 2024
ebb8847
Feat: handle disputed log
dwasse Jul 2, 2024
1aea042
Feat: implement relayMatchesBridgeRequest()
dwasse Jul 2, 2024
9c54eee
Fix: build
dwasse Jul 3, 2024
bdbaa7e
Fix: guarddb models
dwasse Jul 3, 2024
7864840
Feat: check verified status in e2e test
dwasse Jul 3, 2024
ff7d1ca
Feat: check verified status in TestETHtoETH
dwasse Jul 3, 2024
b2d25e9
Feat: add guard cmd
dwasse Jul 3, 2024
76b2e1a
Feat: add embedded guard to relayer
dwasse Jul 3, 2024
278cbb9
Feat: add guard config
dwasse Jul 3, 2024
568acce
Feat: add converter for relayer cfg -> guard cfg
dwasse Jul 3, 2024
24c551e
Feat: add UseEmbeddedGuard flag
dwasse Jul 3, 2024
99834de
Feat: add guard wallet for e2e
dwasse Jul 3, 2024
a9174c3
WIP: add TestDispute
dwasse Jul 3, 2024
11196b4
Feat: start relayer / guard within tests
dwasse Jul 3, 2024
880e044
Fix: return valid=false on 'not found' err
dwasse Jul 3, 2024
32ede77
Fix: pass in raw request
dwasse Jul 3, 2024
6ab95e1
Cleanup: logs
dwasse Jul 3, 2024
c08e4f5
Feat: add tracing
dwasse Jul 3, 2024
b344694
Cleanup: move handlers to handlers.go
dwasse Jul 3, 2024
cdd769d
Cleanup: lint
dwasse Jul 4, 2024
bb677e0
Cleanup: lint
dwasse Jul 5, 2024
ed153b7
[goreleaser]
dwasse Jul 5, 2024
3ab1ce6
Merge branch 'master' into feat/rfq-guard
dwasse Jul 5, 2024
afb427b
[goreleaser]
dwasse Jul 5, 2024
6efd100
Fix: inherit txSubmitter from relayer
dwasse Jul 5, 2024
f5a00e6
[goreleaser]
dwasse Jul 5, 2024
d3011d8
add guard
trajan0x Jul 5, 2024
6982d44
use correct transactor
trajan0x Jul 5, 2024
3544a11
merge master [goreleaser]
trajan0x Jul 6, 2024
9b22148
event parsing
trajan0x Jul 6, 2024
e576f34
Merge branch 'master' into feat/rfq-guard [goreleaser]
trajan0x Jul 6, 2024
7ceb0db
fix tests
trajan0x Jul 6, 2024
71133e6
anvil removal [goreleaser]
trajan0x Jul 6, 2024
63e553c
ci again
trajan0x Jul 6, 2024
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
2 changes: 2 additions & 0 deletions docs/bridge/docs/rfq/Relayer/Relayer.md
Original file line number Diff line number Diff line change
Expand Up @@ -193,6 +193,8 @@ The relayer is configured with a yaml file. The following is an example configur
- `rebalance_interval` - How often to rebalance, formatted as (s = seconds, m = minutes, h = hours)
- `relayer_api_port` - the relayer api is used to control the relayer. <!--TODO: more info here--> This api should be secured/not public.
- `base_chain_config`: Base chain config is the default config applied for each chain if the other chains do not override it. This is covered in the chains section.
- `enable_guard` - Run a guard on the same instance.
- `submit_single_quotes` - Wether to use the batch endpoint for posting quotes to the api. This can be useful for debugging.
- `chains` - each chain has a different config that overrides base_chain_config. Here are the parameters for each chain
- `rfq_address` - the address of the rfq contract on this chain. These addresses are available [here](../Contracts.md).

Expand Down
40 changes: 40 additions & 0 deletions ethergo/submitter/submitter.go
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,8 @@ type TransactionSubmitter interface {
GetSubmissionStatus(ctx context.Context, chainID *big.Int, nonce uint64) (status SubmissionStatus, err error)
// Address returns the address of the signer.
Address() common.Address
// Started returns whether the submitter is running.
Started() bool
}

// txSubmitterImpl is the implementation of the transaction submitter.
Expand Down Expand Up @@ -83,6 +85,10 @@ type txSubmitterImpl struct {
// distinctChainIDs is the distinct chain ids for the transaction submitter.
// note: this map should not be appended to!
distinctChainIDs []*big.Int
// started indicates whether the submitter has started.
started bool
// startMux is the mutex for started.
startMux sync.RWMutex
}

// ClientFetcher is the interface for fetching a chain client.
Expand All @@ -107,6 +113,13 @@ func NewTransactionSubmitter(metrics metrics.Handler, signer signer.Signer, fetc
}
}

// Started returns whether the submitter is running.
func (t *txSubmitterImpl) Started() bool {
t.startMux.RLock()
defer t.startMux.RUnlock()
return t.started
}

// GetRetryInterval returns the retry interval for the transaction submitter.
func (t *txSubmitterImpl) GetRetryInterval() time.Duration {
retryInterval := time.Second * 2
Expand All @@ -126,9 +139,29 @@ func (t *txSubmitterImpl) GetDistinctInterval() time.Duration {
return retryInterval
}

// attemptMarkStarted attempts to mark the submitter as started.
// if the submitter is already started, an error is returned.
func (t *txSubmitterImpl) attemptMarkStarted() error {
t.startMux.Lock()
defer t.startMux.Unlock()
if t.started {
return ErrSubmitterAlreadyStarted
}
t.started = true
return nil
}

// ErrSubmitterAlreadyStarted is the error for when the submitter is already started.
var ErrSubmitterAlreadyStarted = errors.New("submitter already started")

// Start starts the transaction submitter.
// nolint: cyclop
func (t *txSubmitterImpl) Start(parentCtx context.Context) (err error) {
err = t.attemptMarkStarted()
if err != nil {
return err
}

t.otelRecorder, err = newOtelRecorder(t.metrics, t.signer)
if err != nil {
return fmt.Errorf("could not create otel recorder: %w", err)
Expand Down Expand Up @@ -313,6 +346,9 @@ func (t *txSubmitterImpl) triggerProcessQueue(ctx context.Context) {
}
}

// ErrNotStarted is the error for when the submitter is not started.
var ErrNotStarted = errors.New("submitter is not started")

// nolint: cyclop
func (t *txSubmitterImpl) SubmitTransaction(parentCtx context.Context, chainID *big.Int, call ContractCallType) (nonce uint64, err error) {
ctx, span := t.metrics.Tracer().Start(parentCtx, "submitter.SubmitTransaction", trace.WithAttributes(
Expand All @@ -324,6 +360,10 @@ func (t *txSubmitterImpl) SubmitTransaction(parentCtx context.Context, chainID *
metrics.EndSpanWithErr(span, err)
}()

if !t.Started() {
return 0, ErrNotStarted
}

// make sure we have a client for this chain.
chainClient, err := t.fetcher.GetClient(ctx, chainID)
if err != nil {
Expand Down
9 changes: 9 additions & 0 deletions services/rfq/contracts/fastbridge/events.go
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,8 @@
BridgeProofProvidedTopic common.Hash
// BridgeDepositClaimedTopic is the topic emitted by a bridge relay.
BridgeDepositClaimedTopic common.Hash
// BridgeProofDisputedTopic is the topic emitted by a bridge dispute.
BridgeProofDisputedTopic common.Hash
)

// static checks to make sure topics actually exist.
Expand All @@ -32,6 +34,7 @@
BridgeRelayedTopic = parsedABI.Events["BridgeRelayed"].ID
BridgeProofProvidedTopic = parsedABI.Events["BridgeProofProvided"].ID
BridgeDepositClaimedTopic = parsedABI.Events["BridgeDepositClaimed"].ID
BridgeProofDisputedTopic = parsedABI.Events["BridgeProofDisputed"].ID

_, err = parsedABI.EventByID(BridgeRequestedTopic)
if err != nil {
Expand All @@ -47,6 +50,11 @@
if err != nil {
panic(err)
}

_, err = parsedABI.EventByID(BridgeProofDisputedTopic)
if err != nil {
panic(err)

Check warning on line 56 in services/rfq/contracts/fastbridge/events.go

View check run for this annotation

Codecov / codecov/patch

services/rfq/contracts/fastbridge/events.go#L56

Added line #L56 was not covered by tests
}
}

// topicMap maps events to topics.
Expand All @@ -57,6 +65,7 @@
BridgeRelayedEvent: BridgeRelayedTopic,
BridgeProofProvidedEvent: BridgeProofProvidedTopic,
BridgeDepositClaimedEvent: BridgeDepositClaimedTopic,
BridgeDisputeEvent: BridgeProofDisputedTopic,

Check warning on line 68 in services/rfq/contracts/fastbridge/events.go

View check run for this annotation

Codecov / codecov/patch

services/rfq/contracts/fastbridge/events.go#L68

Added line #L68 was not covered by tests
}
}

Expand Down
5 changes: 3 additions & 2 deletions services/rfq/contracts/fastbridge/eventtype_string.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

9 changes: 9 additions & 0 deletions services/rfq/contracts/fastbridge/parser.go
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,8 @@
BridgeProofProvidedEvent
// BridgeDepositClaimedEvent is the event type for the BridgeDepositClaimed event.
BridgeDepositClaimedEvent
// BridgeDisputeEvent is the event type for the BridgeDispute event.
BridgeDisputeEvent
)

// Parser parses events from the fastbridge contracat.
Expand Down Expand Up @@ -82,6 +84,13 @@
return noOpEvent, nil, false
}
return eventType, claimed, true
case BridgeDisputeEvent:
disputed, err := p.filterer.ParseBridgeProofDisputed(log)
if err != nil {
return noOpEvent, nil, false
}
return eventType, disputed, true

Check warning on line 92 in services/rfq/contracts/fastbridge/parser.go

View check run for this annotation

Codecov / codecov/patch

services/rfq/contracts/fastbridge/parser.go#L87-L92

Added lines #L87 - L92 were not covered by tests

Comment on lines +87 to +93
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM! But add tests for the new case.

The addition of the BridgeDisputeEvent case in the ParseEvent method is correctly implemented.

However, the new lines are not covered by tests. Do you want me to generate the unit testing code or open a GitHub issue to track this task?

Tools
GitHub Check: codecov/patch

[warning] 87-92: services/rfq/contracts/fastbridge/parser.go#L87-L92
Added lines #L87 - L92 were not covered by tests

}

return eventType, nil, true
Expand Down
139 changes: 139 additions & 0 deletions services/rfq/e2e/rfq_test.go
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
package e2e_test

import (
"fmt"
"math/big"
"testing"
"time"
Expand All @@ -19,6 +20,8 @@ import (
omnirpcClient "github.com/synapsecns/sanguine/services/omnirpc/client"
"github.com/synapsecns/sanguine/services/rfq/api/client"
"github.com/synapsecns/sanguine/services/rfq/contracts/fastbridge"
"github.com/synapsecns/sanguine/services/rfq/guard/guarddb"
guardService "github.com/synapsecns/sanguine/services/rfq/guard/service"
"github.com/synapsecns/sanguine/services/rfq/relayer/chain"
"github.com/synapsecns/sanguine/services/rfq/relayer/reldb"
"github.com/synapsecns/sanguine/services/rfq/relayer/service"
Expand All @@ -36,9 +39,12 @@ type IntegrationSuite struct {
omniClient omnirpcClient.RPCClient
metrics metrics.Handler
store reldb.Service
guardStore guarddb.Service
apiServer string
relayer *service.Relayer
guard *guardService.Guard
relayerWallet wallet.Wallet
guardWallet wallet.Wallet
userWallet wallet.Wallet
}

Expand Down Expand Up @@ -82,6 +88,7 @@ func (i *IntegrationSuite) SetupTest() {
// setup the api server
i.setupQuoterAPI()
i.setupRelayer()
i.setupGuard()
}

// getOtherBackend gets the backend that is not the current one. This is a helper
Expand All @@ -100,6 +107,14 @@ func (i *IntegrationSuite) TestUSDCtoUSDC() {
i.T().Skip("skipping until anvil issues are fixed in CI")
}

// start the relayer and guard
go func() {
_ = i.relayer.Start(i.GetTestContext())
}()
go func() {
_ = i.guard.Start(i.GetTestContext())
}()

// load token contracts
const startAmount = 1000
const rfqAmount = 900
Expand Down Expand Up @@ -240,13 +255,29 @@ func (i *IntegrationSuite) TestUSDCtoUSDC() {
i.NoError(err)
return len(originPendingRebals) > 0
})

i.Eventually(func() bool {
// verify that the guard has marked the tx as validated
results, err := i.guardStore.GetPendingProvensByStatus(i.GetTestContext(), guarddb.Validated)
i.NoError(err)
return len(results) == 1
})
}

// nolint: cyclop
func (i *IntegrationSuite) TestETHtoETH() {
if core.GetEnvBool("CI", false) {
i.T().Skip("skipping until anvil issues are fixed in CI")
}

// start the relayer and guard
go func() {
_ = i.relayer.Start(i.GetTestContext())
}()
go func() {
_ = i.guard.Start(i.GetTestContext())
}()

// Send ETH to the relayer on destination
const initialBalance = 10
i.destBackend.FundAccount(i.GetTestContext(), i.relayerWallet.Address(), *big.NewInt(initialBalance))
Expand Down Expand Up @@ -347,4 +378,112 @@ func (i *IntegrationSuite) TestETHtoETH() {
}
return false
})

i.Eventually(func() bool {
// verify that the guard has marked the tx as validated
results, err := i.guardStore.GetPendingProvensByStatus(i.GetTestContext(), guarddb.Validated)
i.NoError(err)
return len(results) == 1
})
}

func (i *IntegrationSuite) TestDispute() {
if core.GetEnvBool("CI", false) {
i.T().Skip("skipping until anvil issues are fixed in CI")
}

// start the guard
go func() {
_ = i.guard.Start(i.GetTestContext())
}()

// load token contracts
const startAmount = 1000
const rfqAmount = 900
opts := i.destBackend.GetTxContext(i.GetTestContext(), nil)
destUSDC, destUSDCHandle := i.cctpDeployManager.GetMockMintBurnTokenType(i.GetTestContext(), i.destBackend)
realStartAmount, err := testutil.AdjustAmount(i.GetTestContext(), big.NewInt(startAmount), destUSDC.ContractHandle())
i.NoError(err)
realRFQAmount, err := testutil.AdjustAmount(i.GetTestContext(), big.NewInt(rfqAmount), destUSDC.ContractHandle())
i.NoError(err)

// add initial usdc to relayer on destination
tx, err := destUSDCHandle.MintPublic(opts.TransactOpts, i.relayerWallet.Address(), realStartAmount)
i.Nil(err)
i.destBackend.WaitForConfirmation(i.GetTestContext(), tx)
i.Approve(i.destBackend, destUSDC, i.relayerWallet)

// add initial USDC to relayer on origin
optsOrigin := i.originBackend.GetTxContext(i.GetTestContext(), nil)
originUSDC, originUSDCHandle := i.cctpDeployManager.GetMockMintBurnTokenType(i.GetTestContext(), i.originBackend)
tx, err = originUSDCHandle.MintPublic(optsOrigin.TransactOpts, i.relayerWallet.Address(), realStartAmount)
i.Nil(err)
i.originBackend.WaitForConfirmation(i.GetTestContext(), tx)
i.Approve(i.originBackend, originUSDC, i.relayerWallet)

// add initial USDC to user on origin
tx, err = originUSDCHandle.MintPublic(optsOrigin.TransactOpts, i.userWallet.Address(), realRFQAmount)
i.Nil(err)
i.originBackend.WaitForConfirmation(i.GetTestContext(), tx)
i.Approve(i.originBackend, originUSDC, i.userWallet)

// now we can send the money
_, originFastBridge := i.manager.GetFastBridge(i.GetTestContext(), i.originBackend)
auth := i.originBackend.GetTxContext(i.GetTestContext(), i.userWallet.AddressPtr())
// we want 499 usdc for 500 requested within a day
tx, err = originFastBridge.Bridge(auth.TransactOpts, fastbridge.IFastBridgeBridgeParams{
DstChainId: uint32(i.destBackend.GetChainID()),
To: i.userWallet.Address(),
OriginToken: originUSDC.Address(),
SendChainGas: true,
DestToken: destUSDC.Address(),
OriginAmount: realRFQAmount,
DestAmount: new(big.Int).Sub(realRFQAmount, big.NewInt(10_000_000)),
Deadline: new(big.Int).SetInt64(time.Now().Add(time.Hour * 24).Unix()),
})
i.NoError(err)
i.originBackend.WaitForConfirmation(i.GetTestContext(), tx)

// fetch the txid and raw request
var txID [32]byte
var rawRequest []byte
parser, err := fastbridge.NewParser(originFastBridge.Address())
i.NoError(err)
i.Eventually(func() bool {
receipt, err := i.originBackend.TransactionReceipt(i.GetTestContext(), tx.Hash())
i.NoError(err)
for _, log := range receipt.Logs {
_, parsedEvent, ok := parser.ParseEvent(*log)
if !ok {
continue
}
event, ok := parsedEvent.(*fastbridge.FastBridgeBridgeRequested)
if ok {
rawRequest = event.Request
txID = event.TransactionId
return true
}
}
return false
})

// call prove() from the relayer wallet before relay actually occurred on dest
relayerAuth := i.originBackend.GetTxContext(i.GetTestContext(), i.relayerWallet.AddressPtr())
fakeHash := common.HexToHash("0xdeadbeef")
tx, err = originFastBridge.Prove(relayerAuth.TransactOpts, rawRequest, fakeHash)
i.NoError(err)
i.originBackend.WaitForConfirmation(i.GetTestContext(), tx)

// verify that the guard calls Dispute()
i.Eventually(func() bool {
results, err := i.guardStore.GetPendingProvensByStatus(i.GetTestContext(), guarddb.Disputed)
i.NoError(err)
if len(results) != 1 {
return false
}
fmt.Printf("GOT RESULTS: %v\n", results)
result, err := i.guardStore.GetPendingProvenByID(i.GetTestContext(), txID)
i.NoError(err)
return result.TxHash == fakeHash && result.Status == guarddb.Disputed && result.TransactionID == txID
})
}
Loading
Loading