Skip to content

feat(SpokePool): Permit historical fillDeadline on deposit #870

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.

Sign up for GitHub

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

Merged
merged 4 commits into from
Feb 4, 2025
Merged

feat(SpokePool): Permit historical fillDeadline on deposit #870

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
3b21fea
feat(SpokePool): Permit historical fillDeadline on deposit
pxrl Jan 21, 2025
a1ee230
fix test
pxrl Jan 21, 2025
784b4a8
restore test
pxrl Jan 21, 2025
98b940a
Bump approvals
pxrl Jan 22, 2025
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
15 changes: 5 additions & 10 deletions contracts/SpokePool.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -488,8 +488,8 @@ abstract contract SpokePool is
* This must be set to some time between [currentTime - depositQuoteTimeBuffer, currentTime]
* where currentTime is block.timestamp on this chain or this transaction will revert.
* @param fillDeadline The deadline for the relayer to fill the deposit. After this destination chain timestamp,
* the fill will revert on the destination chain. Must be set between [currentTime, currentTime + fillDeadlineBuffer]
* where currentTime is block.timestamp on this chain or this transaction will revert.
* the fill will revert on the destination chain. Must be set before currentTime + fillDeadlineBuffer, where
* currentTime is block.timestamp on this chain or this transaction will revert.
* @param exclusivityParameter This value is used to set the exclusivity deadline timestamp in the emitted deposit
* event. Before this destination chain timestamp, only the exclusiveRelayer (if set to a non-zero address),
* can fill this deposit. There are three ways to use this parameter:
Expand Down Expand Up @@ -566,8 +566,8 @@ abstract contract SpokePool is
* @param quoteTimestamp The HubPool timestamp that determines the system fee paid by the depositor. This must be set
* between [currentTime - depositQuoteTimeBuffer, currentTime] where currentTime is block.timestamp on this chain.
* @param fillDeadline The deadline for the relayer to fill the deposit. After this destination chain timestamp, the fill will
* revert on the destination chain. Must be set between [currentTime, currentTime + fillDeadlineBuffer] where currentTime
* is block.timestamp on this chain.
* revert on the destination chain. Must be set before currentTime + fillDeadlineBuffer, where currentTime is block.timestamp
* on this chain.
* @param exclusivityParameter This value is used to set the exclusivity deadline timestamp in the emitted deposit
* event. Before this destination chain timestamp, only the exclusiveRelayer (if set to a non-zero address),
* can fill this deposit. There are three ways to use this parameter:
Expand Down Expand Up @@ -1339,12 +1339,7 @@ abstract contract SpokePool is
// fillDeadline is relative to the destination chain.
// Don’t allow fillDeadline to be more than several bundles into the future.
// This limits the maximum required lookback for dataworker and relayer instances.
// Also, don't allow fillDeadline to be in the past. This poses a potential UX issue if the destination
// chain time keeping and this chain's time keeping are out of sync but is not really a practical hurdle
// unless they are significantly out of sync or the depositor is setting very short fill deadlines. This latter
// situation won't be a problem for honest users.
if (params.fillDeadline < currentTime || params.fillDeadline > currentTime + fillDeadlineBuffer)
revert InvalidFillDeadline();
if (params.fillDeadline > currentTime + fillDeadlineBuffer) revert InvalidFillDeadline();

// There are three cases for setting the exclusivity deadline using the exclusivity parameter:
// 1. If this parameter is 0, then there is no exclusivity period and emit 0 for the deadline. This
Expand Down
6 changes: 3 additions & 3 deletions test/evm/hardhat/SpokePool.Deposit.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,8 +49,8 @@ describe("SpokePool Depositor Logic", async function () {
await seedWallet(depositor, [erc20], weth, amountToSeedWallets);

// Approve spokepool to spend tokens
await erc20.connect(depositor).approve(spokePool.address, amountToDeposit);
await weth.connect(depositor).approve(spokePool.address, amountToDeposit);
await erc20.connect(depositor).approve(spokePool.address, amountToDeposit.mul(10));
await weth.connect(depositor).approve(spokePool.address, amountToDeposit.mul(10));

// Whitelist origin token => destination chain ID routes:
await enableRoutes(spokePool, [{ originToken: erc20.address }, { originToken: weth.address }]);
Expand Down Expand Up @@ -470,7 +470,7 @@ describe("SpokePool Depositor Logic", async function () {
// fillDeadline in past
...getDepositArgsFromRelayData({ ...relayData, fillDeadline: currentTime.sub(1) })
)
).to.be.revertedWith("InvalidFillDeadline");
).to.not.be.reverted;
await expect(
spokePool.connect(depositor)[SpokePoolFuncs.depositV3Bytes](
// fillDeadline right at the buffer is OK
Expand Down
Loading