improve(Relayer): Don't fill exclusive deposits #2017
Merged
Conversation
This file contains 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
SpokePool's today prevent filling deposits if `exclusivityDeadline >= currentTime and msg.sender !== exclusiveRelayer` The exclusive deadline is still respected if the exclusiveRelayer = zero address so the relayer has a bad check in it currently that is causing it to try to fill deposits with an exclusivity deadline > current time but the exclusiveRelayer == 0 This PR should greatly reduce the simulation errors in the relayer
nicholaspai
requested review from
mrice32,
pxrl,
james-a-morris and
dohaki
as code owners
nicholaspai
commented
Jan 26, 2025
| @@ -292,11 +291,7 @@ export class Relayer { | |||
| return false; | |||
| } | |||
|
|
|||
| if ( | |||
| deposit.exclusiveRelayer !== ZERO_ADDRESS && | |||
| deposit.exclusivityDeadline > currentTime && | |||
There was a problem hiding this comment.
I also think this should be a >= instead of a > because the deposit is exclusive up until the exclusive timestamp exactly
mrice32
previously approved these changes
Jan 26, 2025
|
Let's wait on merging this until all spoke pools are upgraded such that the exclusive relayer being 0 is impossible on the deposit side if an exclusivity deadline is sent and the exclusive relayer being 0 on the fill side is not a special case. We can live with the extra noise for now |
|
Can merge this after spoke pool upgrade, otherwise we'll ignore filling deposits that have |
nicholaspai
dismissed stale reviews from mrice32 and james-a-morris
via
a8f61e0
mrice32
approved these changes
Feb 7, 2025
bmzig
added a commit
that referenced
this pull request
Feb 7, 2025
* feat: support updated spoke pool functions Signed-off-by: bennett <[email protected]> * fix Signed-off-by: bennett <[email protected]> * missing toBytes32 Signed-off-by: bennett <[email protected]> * feat: support contract upgrade Signed-off-by: bennett <[email protected]> * test Signed-off-by: bennett <[email protected]> * Get relayer tests to pass - skipped all tests that have relayer call fillV3RelayWithUpdatedDeposit and requetV3SlowFill * add new events Signed-off-by: bennett <[email protected]> * fix Signed-off-by: bennett <[email protected]> * Fix tests with speedUpDeposit, requestSlowFill, executeSlowRelayLeaf * undefined Signed-off-by: bennett <[email protected]> * monitor tests Signed-off-by: bennett <[email protected]> * Partial fix * fix relayer change Signed-off-by: bennett <[email protected]> * fix: add old spoke ABIs Signed-off-by: Matt Rice <[email protected]> * fix Dataworker.buildRoots.ts * Update Dataworker.executeSlowRelay.ts * Update Dataworker.loadData.prefill.ts * fix build Signed-off-by: Matt Rice <[email protected]> * add new events Signed-off-by: bennett <[email protected]> * fix Signed-off-by: bennett <[email protected]> * undefined Signed-off-by: bennett <[email protected]> * monitor tests Signed-off-by: bennett <[email protected]> * Partial fix * fix relayer change Signed-off-by: bennett <[email protected]> * fix Dataworker.buildRoots.ts * Update Dataworker.executeSlowRelay.ts * Update Dataworker.loadData.prefill.ts * Update Dataworker.executeSlowRelay.ts * Add backwards compatibility * Add flags to tests * lint * fix * Fix test * Update Dataworker.executePoolRebalances.ts * feat: support updated spoke pool functions (#2043) * feat: support updated spoke pool functions Signed-off-by: bennett <[email protected]> * fix Signed-off-by: bennett <[email protected]> * missing toBytes32 Signed-off-by: bennett <[email protected]> * Fix tests with speedUpDeposit, requestSlowFill, executeSlowRelayLeaf * fix: add old spoke ABIs Signed-off-by: Matt Rice <[email protected]> * fix build Signed-off-by: Matt Rice <[email protected]> * add new events Signed-off-by: bennett <[email protected]> * fix Signed-off-by: bennett <[email protected]> * undefined Signed-off-by: bennett <[email protected]> * monitor tests Signed-off-by: bennett <[email protected]> * Partial fix * fix relayer change Signed-off-by: bennett <[email protected]> * fix Dataworker.buildRoots.ts * Update Dataworker.executeSlowRelay.ts * Update Dataworker.loadData.prefill.ts * Update Dataworker.executeSlowRelay.ts * Add backwards compatibility * Add flags to tests * lint * fix * Fix test * Update Dataworker.executePoolRebalances.ts --------- Signed-off-by: bennett <[email protected]> Signed-off-by: Matt Rice <[email protected]> Co-authored-by: nicholaspai <[email protected]> Co-authored-by: Matt Rice <[email protected]> Co-authored-by: nicholaspai <[email protected]> * Update MerkleTreeUtils.ts * improve(Relayer): Don't fill exclusive deposits (#2017) * improve(Relayer): Don't fill exclusive deposits SpokePool's today prevent filling deposits if `exclusivityDeadline >= currentTime and msg.sender !== exclusiveRelayer` The exclusive deadline is still respected if the exclusiveRelayer = zero address so the relayer has a bad check in it currently that is causing it to try to fill deposits with an exclusivity deadline > current time but the exclusiveRelayer == 0 This PR should greatly reduce the simulation errors in the relayer * Update Relayer.ts * cannot request slow fills in exclusivity window * Update Relayer.ts * bump sdk Signed-off-by: bennett <[email protected]> --------- Signed-off-by: bennett <[email protected]> Signed-off-by: Matt Rice <[email protected]> Co-authored-by: nicholaspai <[email protected]> Co-authored-by: Matt Rice <[email protected]> Co-authored-by: nicholaspai <[email protected]>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
SpokePool's today prevent filling deposits if
exclusivityDeadline >= currentTime and msg.sender !== exclusiveRelayerThe exclusive deadline is still respected even if the exclusiveRelayer = zero address so the relayer has a bad check in it currently that is causing it to try to fill deposits with an exclusivity deadline > current time but the exclusiveRelayer == 0
This PR should greatly reduce the simulation errors in the relayer
This is the existing contract code
Soneium and Ink SpokePool
These two contracts actually allow ignore the exclusivityDeadline upon filling if the exclusiveRelayer == 0 but rather than adding special cases for these chains I propose using this fix unilaterally as it will be forwards compatible with the changes to exclusivity soon to be deployed