fix conflicts with new fee computation method

Author: hoytech

src/EulerSwapFactory.sol

@@ -221,7 +221,7 @@ contract EulerSwapFactory is IEulerSwapFactory, EVCUtil {
     /// @param pool The address of the pool to query
     /// @return The addresses of asset0 and asset1 in the pool
     function _getAssets(address pool) internal view returns (address, address) {
-        return (EulerSwap(pool).asset0(), EulerSwap(pool).asset1());
+        return (IEulerSwap(pool).asset0(), IEulerSwap(pool).asset1());
     }
 
     /// @notice Returns a slice of an array of addresses

src/EulerSwapHook.sol

@@ -86,7 +86,7 @@ contract EulerSwapHook is EulerSwap, BaseHook {
             // 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(inputCurrency, address(this), amountIn);
-            amountInWithoutFee = depositAssets(zeroForOne ? vault0 : vault1, amountIn) * feeMultiplier / 1e18;
+            amountInWithoutFee = depositAssets(zeroForOne ? asset0 : asset1, zeroForOne ? vault0 : vault1);
 
             // pay the output token, to the PoolManager from an Euler vault
             // the credit will be forwarded to the swap router, which then forwards it to the swapper
@@ -120,8 +120,8 @@ contract EulerSwapHook is EulerSwap, BaseHook {
         require(evc.isAccountOperatorAuthorized(eulerAccount, address(this)), OperatorNotInstalled());
         require(amount <= type(uint112).max, SwapLimitExceeded());
 
-        // exactIn: decrease received amountIn, rounding down
-        if (exactIn) amount = amount * feeMultiplier / 1e18;
+        // exactIn: decrease effective amountIn
+        if (exactIn) amount = amount - (amount * fee / 1e18);
 
         (uint256 inLimit, uint256 outLimit) = calcLimits(asset0IsInput);
 
@@ -135,8 +135,8 @@ contract EulerSwapHook is EulerSwap, BaseHook {
             require(amount <= outLimit && quote <= inLimit, SwapLimitExceeded());
         }
 
-        // exactOut: increase required quote(amountIn), rounding up
-        if (!exactIn) quote = (quote * 1e18 + (feeMultiplier - 1)) / feeMultiplier;
+        // exactOut: inflate required amountIn
+        if (!exactIn) quote = (quote * 1e18) / (1e18 - fee);
 
         return quote;
     }

test/EulerSwapFactoryTest.t.sol

@@ -103,70 +103,6 @@ contract EulerSwapFactoryTest is EulerSwapTestBase {
         vm.prank(holder);
         vm.expectRevert(EulerSwapFactory.OldOperatorStillInstalled.selector);
         evc.batch(items);
-
-        // test deploying new pool for same assets pair as old one
-        address oldPool = eulerSwapFactory.poolByEulerAccount(holder);
-        salt = bytes32(uint256(123456));
-        predictedAddress = predictPoolAddress(address(eulerSwapFactory), poolParams, curveParams, salt);
-
-        items = new IEVC.BatchItem[](3);
-        items[0] = IEVC.BatchItem({
-            onBehalfOfAccount: address(0),
-            targetContract: address(evc),
-            value: 0,
-            data: abi.encodeCall(evc.setAccountOperator, (holder, oldPool, false))
-        });
-        items[1] = IEVC.BatchItem({
-            onBehalfOfAccount: address(0),
-            targetContract: address(evc),
-            value: 0,
-            data: abi.encodeCall(evc.setAccountOperator, (holder, predictedAddress, true))
-        });
-        items[2] = IEVC.BatchItem({
-            onBehalfOfAccount: holder,
-            targetContract: address(eulerSwapFactory),
-            value: 0,
-            data: abi.encodeCall(EulerSwapFactory.deployPool, (poolParams, curveParams, salt))
-        });
-
-        vm.prank(holder);
-        evc.batch(items);
-
-        address pool = eulerSwapFactory.poolByEulerAccount(holder);
-        assertEq(pool, predictedAddress);
-
-        // test deploying new pool for different assets pair as old one
-        oldPool = eulerSwapFactory.poolByEulerAccount(holder);
-        poolParams = IEulerSwap.Params(address(eTST), address(eTST3), holder, 1e18, 1e18, 1e18, 1e18, 0);
-
-        salt = bytes32(uint256(1234567));
-        predictedAddress = predictPoolAddress(address(eulerSwapFactory), poolParams, curveParams, salt);
-
-        items = new IEVC.BatchItem[](3);
-        items[0] = IEVC.BatchItem({
-            onBehalfOfAccount: address(0),
-            targetContract: address(evc),
-            value: 0,
-            data: abi.encodeCall(evc.setAccountOperator, (holder, oldPool, false))
-        });
-        items[1] = IEVC.BatchItem({
-            onBehalfOfAccount: address(0),
-            targetContract: address(evc),
-            value: 0,
-            data: abi.encodeCall(evc.setAccountOperator, (holder, predictedAddress, true))
-        });
-        items[2] = IEVC.BatchItem({
-            onBehalfOfAccount: holder,
-            targetContract: address(eulerSwapFactory),
-            value: 0,
-            data: abi.encodeCall(EulerSwapFactory.deployPool, (poolParams, curveParams, salt))
-        });
-
-        vm.prank(holder);
-        evc.batch(items);
-
-        pool = eulerSwapFactory.poolByEulerAccount(holder);
-        assertEq(pool, predictedAddress);
     }
 
     function testInvalidPoolsSliceOutOfBounds() public {

test/EulerSwapHook.fees.t.sol

@@ -47,7 +47,7 @@ contract EulerSwapHookTest is EulerSwapTestBase {
         (uint112 r0, uint112 r1,) = eulerSwap.getReserves();
 
         uint256 amountIn = 1e18;
-        uint256 amountInWithoutFee = amountIn * eulerSwap.feeMultiplier() / 1e18;
+        uint256 amountInWithoutFee = amountIn - (amountIn * eulerSwap.fee() / 1e18);
         uint256 amountOut =
             periphery.quoteExactInput(address(eulerSwap), address(assetTST), address(assetTST2), amountIn);
 
@@ -89,7 +89,7 @@ contract EulerSwapHookTest is EulerSwapTestBase {
             periphery.quoteExactOutput(address(eulerSwap), address(assetTST), address(assetTST2), amountOut);
 
         // inverse of the fee math in Periphery
-        uint256 amountInWithoutFee = (amountIn * eulerSwap.feeMultiplier() - eulerSwap.feeMultiplier()) / 1e18;
+        uint256 amountInWithoutFee = amountIn * (1e18 - eulerSwap.fee()) / 1e18;
 
         assetTST.mint(anyone, amountIn);