add deadline

Author: mmsaki

script/04_Swap.s.sol

@@ -31,7 +31,7 @@ contract SwapScript is FFIHelper {
 
     uint256 amount = 100;
     bool zeroForOne = true;
-    order = AsyncOrder(key, OWNER, zeroForOne, amount, 2 ** 96);
+    order = AsyncOrder(key, OWNER, zeroForOne, amount, 2 ** 96, block.timestamp + 1 hours);
 
     if (zeroForOne) {
       IERC20Minimal(Currency.unwrap(order.key.currency0)).approve(address(router), uint256(amount));

script/FFIHelper.sol

@@ -117,9 +117,11 @@ contract FFIHelper is Script {
     OrderData memory orderData = abi.decode(data, (OrderData));
     bool zeroForOne = topics[1] == 0 ? false : true;
     uint256 amountIn = uint256(topics[2]);
+    uint160 sqrtPrice = uint160(uint256(topics[3]));
+    uint256 deadline = uint256(topics[4]);
     PoolKey memory key = _getPoolKey();
 
-    AsyncOrder memory order = AsyncOrder(key, orderData.owner, zeroForOne, amountIn, 2 ** 96);
+    AsyncOrder memory order = AsyncOrder(key, orderData.owner, zeroForOne, amountIn, sqrtPrice, deadline);
     return order;
   }
 

src/AsyncSwap.sol

@@ -8,7 +8,6 @@ import { AsyncFiller } from "@async-swap/libraries/AsyncFiller.sol";
 import { AsyncOrder } from "@async-swap/types/AsyncOrder.sol";
 import { CurrencySettler } from "@uniswap/v4-core/test/utils/CurrencySettler.sol";
 import { IPoolManager } from "v4-core/interfaces/IPoolManager.sol";
-import { IERC20Minimal } from "v4-core/interfaces/external/IERC20Minimal.sol";
 import { Hooks } from "v4-core/libraries/Hooks.sol";
 import { LPFeeLibrary } from "v4-core/libraries/LPFeeLibrary.sol";
 import { SafeCast } from "v4-core/libraries/SafeCast.sol";
@@ -51,6 +50,7 @@ contract AsyncSwap is BaseHook, IAsyncSwapAMM {
 
   /// @notice Error thrown when liquidity is not supported in this hook.
   error UnsupportedLiquidity();
+  error OrderExpired();
 
   /// Initializes the Async Swap Hook contract with the PoolManager address and sets an transaction ordering algorithm.
   /// @param poolManager The address of the PoolManager contract.
@@ -122,7 +122,7 @@ contract AsyncSwap is BaseHook, IAsyncSwapAMM {
     /// Sort poolIDs
     /// Order swaps by poolId
 
-    uint256 volatility = ALGORITHM.getVolatility(orders);
+    // uint256 volatility = ALGORITHM.getVolatility(orders);
     for (uint8 i = 0; i < orders.length; i++) {
       AsyncOrder calldata order = orders[i];
       // Use transaction ordering algorithm to ensure correct execution order
@@ -140,15 +140,16 @@ contract AsyncSwap is BaseHook, IAsyncSwapAMM {
     Currency currency1 = order.key.currency1;
     PoolId poolId = order.key.toId();
     address filler = abi.decode(fillerData, (address));
-
+    uint256 deadline = order.deadline;
+    if (block.timestamp > deadline) revert OrderExpired();
+    AsyncFiller.State storage state = asyncOrders[poolId];
+    require(order.isExecutor(state, msg.sender), "Caller is valid not executor");
     if (amountIn == 0) revert ZeroFillOrder();
 
     /// TODO: Document what this does
     uint256 amountToFill = uint256(amountIn);
     uint256 claimableAmount = asyncOrders[poolId].asyncOrderAmount[owner][zeroForOne];
     require(amountToFill <= claimableAmount, "Max fill order limit exceed");
-    AsyncFiller.State storage state = asyncOrders[poolId];
-    require(order.isExecutor(state, msg.sender), "Caller is valid not excutor");
 
     /// @dev Transfer currency of async order to user
     Currency currencyTake;
@@ -164,7 +165,7 @@ contract AsyncSwap is BaseHook, IAsyncSwapAMM {
     asyncOrders[poolId].asyncOrderAmount[owner][zeroForOne] -= amountToFill;
     /// we could also burn
     poolManager.transfer(filler, currencyTake.toId(), amountToFill);
-    emit AsyncOrderFilled(poolId, owner, zeroForOne, amountToFill);
+    emit AsyncOrderFilled(poolId, owner, zeroForOne, amountToFill, deadline);
 
     /// @dev Take currencyFill from filler
     /// @dev Hook may charge filler a hook fee

src/interfaces/IAsyncSwapOrder.sol

@@ -14,7 +14,8 @@ interface IAsyncSwapOrder {
   /// @param zeroForOne Whether the order is for a swap from currency0 to currency1 (true) or currency1 to currency0
   /// (false).
   /// @param amount The amount of the order.
-  event AsyncOrderFilled(PoolId poolId, address owner, bool zeroForOne, uint256 amount);
+  /// @param deadline The deadline of the order.
+  event AsyncOrderFilled(PoolId poolId, address owner, bool zeroForOne, uint256 amount, uint256 deadline);
 
   /// @notice Emitted when an async swap order is created.
   /// @param poolId The poolId of the pool where the order is placed.