reusable aysnc ordering algo

Author: mmsaki

script/01_DeployHook.s.sol

@@ -3,6 +3,8 @@ pragma solidity ^0.8.13;
 
 import { FFIHelper } from "./FFIHelper.sol";
 import { AsyncSwap } from "@async-swap/AsyncSwap.sol";
+import { CLVR } from "@async-swap/algorithms/clvr.sol";
+import { IAlgorithm } from "@async-swap/interfaces/IAlgorithm.sol";
 import { Router } from "@async-swap/router.sol";
 import { IPoolManager } from "v4-core/interfaces/IPoolManager.sol";
 import { Hooks } from "v4-core/libraries/Hooks.sol";
@@ -14,6 +16,7 @@ contract DeployHookScript is FFIHelper {
   IPoolManager manager;
   AsyncSwap public hook;
   Router router;
+  IAlgorithm algo;
 
   function setUp() public {
     manager = IPoolManager(_getDeployedPoolManager());
@@ -33,7 +36,8 @@ contract DeployHookScript is FFIHelper {
       HookMiner.find(CREATE2_FACTORY, hookFlags, type(AsyncSwap).creationCode, abi.encode(address(manager)));
 
     /// @dev deploy hook
-    hook = new AsyncSwap{ salt: salt }(manager);
+    algo = new CLVR(hookAddress);
+    hook = new AsyncSwap{ salt: salt }(manager, algo);
     assert(address(hook) == hookAddress);
 
     router = new Router(manager, hook);

src/AsyncSwap.sol

@@ -1,7 +1,6 @@
 // SPDX-License-Identifier: GPL-2.0-or-later
 pragma solidity 0.8.26;
 
-import { CLVR } from "@async-swap/algorithms/clvr.sol";
 import { IAlgorithm } from "@async-swap/interfaces/IAlgorithm.sol";
 import { IAsyncSwapAMM } from "@async-swap/interfaces/IAsyncSwapAMM.sol";
 import { AsyncFiller } from "@async-swap/libraries/AsyncFiller.sol";
@@ -18,8 +17,7 @@ import { PoolIdLibrary, PoolKey } from "v4-core/types/PoolKey.sol";
 import { BaseHook } from "v4-periphery/src/utils/BaseHook.sol";
 
 /// @title Async Swap Contract
-/// @author Async Labs
-/// @notice Async swap AMM
+/// @author Asyncswap Labs
 contract AsyncSwap is BaseHook, IAsyncSwapAMM {
 
   using SafeCast for *;
@@ -53,16 +51,18 @@ contract AsyncSwap is BaseHook, IAsyncSwapAMM {
 
   /// Initializes the Async Swap Hook contract with the PoolManager address and sets an transaction ordering algorithm.
   /// @param poolManager The address of the PoolManager contract.
-  constructor(IPoolManager poolManager) BaseHook(poolManager) {
-    ALGORITHM = new CLVR(address(this));
+  /// @param orderingAlgorithm The address of the ordering algorithm
+  constructor(IPoolManager poolManager, IAlgorithm orderingAlgorithm) BaseHook(poolManager) {
+    ALGORITHM = orderingAlgorithm;
   }
 
   /// @inheritdoc BaseHook
   function _beforeInitialize(address, PoolKey calldata key, uint160) internal virtual override returns (bytes4) {
-    require(key.fee == LPFeeLibrary.DYNAMIC_FEE_FLAG, "Dude use dynamic fees flag");
-    /// set algorithm for the pool being initialized
+    require(key.fee == LPFeeLibrary.DYNAMIC_FEE_FLAG, "Use dynamic fees flag");
+    /// Set library state for the pool being initialized
     asyncOrders[key.toId()].algorithm = ALGORITHM;
     asyncOrders[key.toId()].poolManager = poolManager;
+    asyncOrders[key.toId()].asyncOrder;
     return this.beforeInitialize.selector;
   }
 

test/SetupHook.t.sol

@@ -2,6 +2,8 @@
 pragma solidity ^0.8.13;
 
 import { AsyncSwap } from "@async-swap/AsyncSwap.sol";
+import { CLVR } from "@async-swap/algorithms/clvr.sol";
+import { IAlgorithm } from "@async-swap/interfaces/IAlgorithm.sol";
 import { Router } from "@async-swap/router.sol";
 import { Test } from "forge-std/Test.sol";
 import { MockERC20 } from "solmate/src/test/utils/mocks/MockERC20.sol";
@@ -26,6 +28,7 @@ contract SetupHook is Test {
   Currency currency1;
   PoolId poolId;
   Router router;
+  IAlgorithm algo;
 
   function setUp() public virtual {
     deployPoolManager();
@@ -73,7 +76,9 @@ contract SetupHook is Test {
         | Hooks.BEFORE_SWAP_RETURNS_DELTA_FLAG
     );
     vm.startPrank(owner);
-    deployCodeTo("AsyncSwap.sol", abi.encode(manager), address(hookFlags));
+
+    algo = new CLVR(address(hookFlags));
+    deployCodeTo("AsyncSwap.sol", abi.encode(manager, algo), address(hookFlags));
     hook = AsyncSwap(address(hookFlags));
   }