Merge pull request #59 from euler-xyz/sauce/hook-todo

Cleanup Hook TODOs

Author: hoytech

TODO

@@ -3,7 +3,6 @@
   ! document that periphery depends on non-malicious eulerSwap instances
   ! limitations of getLimits
 * update deploy scripts
-* TODOs in UniswapHook.sol
 * small cleanups in CurveLib
 ? tighten up getLimits bounds
 

src/UniswapHook.sol

@@ -42,7 +42,7 @@ contract UniswapHook is BaseHook {
             currency0: Currency.wrap(asset0Addr),
             currency1: Currency.wrap(asset1Addr),
             fee: fee,
-            tickSpacing: 60, // TODO: fix arbitrary tick spacing
+            tickSpacing: 1, // hard-coded tick spacing, as its unused
             hooks: IHooks(address(this))
         });
 
@@ -90,7 +90,6 @@ contract UniswapHook is BaseHook {
 
             // take the input token, from the PoolManager to the Euler vault
             // the debt will be paid by the swapper via the swap router
-            // TODO: can we optimize the transfer by pulling from PoolManager directly to Euler?
             poolManager.take(params.zeroForOne ? key.currency0 : key.currency1, address(this), amountIn);
             amountInWithoutFee = FundsLib.depositAssets(evc, p, params.zeroForOne ? p.vault0 : p.vault1);
 
@@ -117,7 +116,22 @@ contract UniswapHook is BaseHook {
         return (BaseHook.beforeSwap.selector, returnDelta, 0);
     }
 
-    // TODO: fix salt mining & verification for the hook
-    function getHookPermissions() public pure override returns (Hooks.Permissions memory) {}
-    function validateHookAddress(BaseHook) internal pure override {}
+    function getHookPermissions() public pure override returns (Hooks.Permissions memory) {
+        return Hooks.Permissions({
+            beforeInitialize: false,
+            afterInitialize: false,
+            beforeAddLiquidity: false,
+            afterAddLiquidity: false,
+            beforeRemoveLiquidity: false,
+            afterRemoveLiquidity: false,
+            beforeSwap: true,
+            afterSwap: false,
+            beforeDonate: false,
+            afterDonate: false,
+            beforeSwapReturnDelta: true,
+            afterSwapReturnDelta: false,
+            afterAddLiquidityReturnDelta: false,
+            afterRemoveLiquidityReturnDelta: false
+        });
+    }
 }

test/EulerSwapTestBase.t.sol

@@ -9,6 +9,7 @@ import {EulerSwapFactory} from "../src/EulerSwapFactory.sol";
 import {EulerSwapPeriphery} from "../src/EulerSwapPeriphery.sol";
 import {IPoolManager} from "@uniswap/v4-core/src/interfaces/IPoolManager.sol";
 import {HookMiner} from "./utils/HookMiner.sol";
+import {HookMiner as v4HookMiner} from "v4-periphery/src/utils/HookMiner.sol";
 import {Hooks} from "@uniswap/v4-core/src/libraries/Hooks.sol";
 import {MetaProxyDeployer} from "../src/MetaProxyDeployer.sol";
 
@@ -37,7 +38,15 @@ contract EulerSwapTestBase is EVaultTestBase {
     }
 
     function deployEulerSwap(address poolManager_) public {
-        eulerSwapImpl = address(new EulerSwap(address(evc), poolManager_));
+        // use the canonical miner to find a valid 'implementation' address
+        (, bytes32 salt) = v4HookMiner.find(
+            address(this),
+            uint160(Hooks.BEFORE_SWAP_FLAG | Hooks.BEFORE_SWAP_RETURNS_DELTA_FLAG),
+            type(EulerSwap).creationCode,
+            abi.encode(address(evc), poolManager_)
+        );
+
+        eulerSwapImpl = address(new EulerSwap{salt: salt}(address(evc), poolManager_));
         eulerSwapFactory = new EulerSwapFactory(address(evc), address(factory), eulerSwapImpl);
         periphery = new EulerSwapPeriphery();
     }