fix: 7683 depositor exclusivity deadline#1310
Closed
grasphoper wants to merge 2 commits intomasterfrom
Closed
Conversation
Signed-off-by: Ihor Farion <ihor@umaproject.org>
grasphoper
commented
Feb 11, 2026
Signed-off-by: Ihor Farion <ihor@umaproject.org>
grasphoper
commented
Feb 11, 2026
| V3SpokePoolInterface.V3RelayData memory relayData = abi.decode(originData, (V3SpokePoolInterface.V3RelayData)); | ||
| if (RelayDataHashLib.getRelayDataHash(relayData, chainId()) != orderId) { | ||
| revert WrongERC7683OrderId(); | ||
| } |
Collaborator
Author
There was a problem hiding this comment.
Don't love this since this involves abi.encoding relayData back into bytes just to get the hash
Member
There was a problem hiding this comment.
yeah I think we need to do this though unless we also pass in relayData as a function param?
nicholaspai
approved these changes
Feb 18, 2026
Collaborator
Author
|
Closing this as we decided removing code would be more preferable. Will recreate later |
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
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.
Fixes inconsistency between
orderIdderivation in theERC7683OrderDepositorand in theSpokePool.Problem:
SpokePoolusesexclusivityDeadlineto hash relayData (so the absolute value of the deadline in seconds), whileERC7683OrderDepositorused a thing more akin to anexclusivityParameter, which can be absolute value in seconds, or can be relative to the current timestamp. This param is being converted by the SpokePool into the absolute deadline at the time of depositFix:
RelayDataHashLibthat defines logic to convert the exclusivity param to absolute timestamporderId