Merge branch 'master' into uninstall-fix

hoytech · hoytech · commit bf3e36214296 · 2025-04-29T14:28:04.000-04:00
diff --git a/src/EulerSwap.sol b/src/EulerSwap.sol
@@ -58,7 +58,7 @@ contract EulerSwap is IEulerSwap, EVCUtil, UniswapHook {
     }
 
     /// @inheritdoc IEulerSwap
-    function activate(InitialState calldata initialState) public {
+    function activate(InitialState calldata initialState) external {
         CtxLib.Storage storage s = CtxLib.getStorage();
         Params memory p = CtxLib.getParams();
 
diff --git a/src/EulerSwapFactory.sol b/src/EulerSwapFactory.sol
@@ -66,11 +66,7 @@ contract EulerSwapFactory is IEulerSwapFactory, EVCUtil, ProtocolFee {
 
         uninstall(params.eulerAccount);
 
-        EulerSwap pool = EulerSwap(
-            MetaProxyDeployer.deployMetaProxy(
-                eulerSwapImpl, abi.encode(params), keccak256(abi.encode(params.eulerAccount, salt))
-            )
-        );
+        EulerSwap pool = EulerSwap(MetaProxyDeployer.deployMetaProxy(eulerSwapImpl, abi.encode(params), salt));
 
         updateEulerAccountState(params.eulerAccount, address(pool));
 
@@ -97,7 +93,7 @@ contract EulerSwapFactory is IEulerSwapFactory, EVCUtil, ProtocolFee {
                         abi.encodePacked(
                             bytes1(0xff),
                             address(this),
-                            keccak256(abi.encode(address(poolParams.eulerAccount), salt)),
+                            salt,
                             keccak256(MetaProxyDeployer.creationCodeMetaProxy(eulerSwapImpl, abi.encode(poolParams)))
                         )
                     )
diff --git a/src/libraries/CtxLib.sol b/src/libraries/CtxLib.sol
@@ -19,22 +19,15 @@ library CtxLib {
         }
     }
 
+    error InsufficientCalldata();
+
     /// @dev Unpacks encoded Params from trailing calldata. Loosely based on
     /// the implementation from EIP-3448 (except length is hard-coded).
+    /// 384 is the size of the Params struct after ABI encoding.
     function getParams() internal pure returns (IEulerSwap.Params memory p) {
-        bytes memory data;
-
-        assembly {
-            let size := 384
-            let dataPtr := sub(calldatasize(), size)
-            data := mload(64)
-            // increment free memory pointer by metadata size + 32 bytes (length)
-            mstore(64, add(data, add(size, 32)))
-            mstore(data, size)
-            let memPtr := add(data, 32)
-            calldatacopy(memPtr, dataPtr, size)
+        require(msg.data.length >= 384, InsufficientCalldata());
+        unchecked {
+            return abi.decode(msg.data[msg.data.length - 384:], (IEulerSwap.Params));
         }
-
-        return abi.decode(data, (IEulerSwap.Params));
     }
 }
diff --git a/src/libraries/CurveLib.sol b/src/libraries/CurveLib.sol
@@ -9,7 +9,7 @@ library CurveLib {
     error Overflow();
     error CurveViolation();
 
-    /// @notice Returns true iff the specified reserve amounts would be acceptable.
+    /// @notice Returns true if the specified reserve amounts would be acceptable, false otherwise.
     /// Acceptable points are on, or above and to-the-right of the swapping curve.
     function verify(IEulerSwap.Params memory p, uint256 newReserve0, uint256 newReserve1)
         internal
@@ -55,7 +55,7 @@ library CurveLib {
             int256 term1 = int256(Math.mulDiv(py * 1e18, y - y0, px, Math.Rounding.Ceil)); // scale: 1e36
             int256 term2 = (2 * int256(c) - int256(1e18)) * int256(x0); // scale: 1e36
             B = (term1 - term2) / int256(1e18); // scale: 1e18
-            C = Math.mulDiv((1e18 - c), x0 * x0, 1e18, Math.Rounding.Ceil); // scale: 1e36
+            C = Math.mulDiv(1e18 - c, x0 * x0, 1e18, Math.Rounding.Ceil); // scale: 1e36
             fourAC = Math.mulDiv(4 * c, C, 1e18, Math.Rounding.Ceil); // scale: 1e36
         }
 
@@ -68,7 +68,7 @@ library CurveLib {
             unchecked {
                 squaredB = absB * absB; // scale: 1e36
                 discriminant = squaredB + fourAC; // scale: 1e36
-                sqrt = Math.sqrt(discriminant); // // scale: 1e18
+                sqrt = Math.sqrt(discriminant); // scale: 1e18
                 sqrt = (sqrt * sqrt < discriminant) ? sqrt + 1 : sqrt;
             }
         } else {
diff --git a/src/libraries/FundsLib.sol b/src/libraries/FundsLib.sol
@@ -79,7 +79,7 @@ library FundsLib {
             uint256 protocolFeeAmount = feeAmount * p.protocolFee / 1e18;
 
             if (protocolFeeAmount != 0) {
-                IERC20(asset).transfer(p.protocolFeeRecipient, protocolFeeAmount);
+                IERC20(asset).safeTransfer(p.protocolFeeRecipient, protocolFeeAmount);
                 amount -= protocolFeeAmount;
                 feeAmount -= protocolFeeAmount;
             }
diff --git a/src/libraries/QuoteLib.sol b/src/libraries/QuoteLib.sol
@@ -210,7 +210,7 @@ library QuoteLib {
                 xNew = reserve0 - amount;
                 if (xNew < x0) {
                     // remain on f()
-                    yNew = CurveLib.f(xNew, py, px, y0, x0, cx);
+                    yNew = CurveLib.f(xNew, px, py, x0, y0, cx);
                 } else {
                     // move to g()
                     yNew = CurveLib.fInverse(xNew, py, px, y0, x0, cy);
diff --git a/test/Basic.t.sol b/test/Basic.t.sol
@@ -2,6 +2,7 @@
 pragma solidity ^0.8.24;
 
 import {IEVault, IEulerSwap, EulerSwapTestBase, EulerSwap, TestERC20} from "./EulerSwapTestBase.t.sol";
+import {QuoteLib} from "../src/libraries/QuoteLib.sol";
 
 contract Basic is EulerSwapTestBase {
     EulerSwap public eulerSwap;
@@ -40,6 +41,14 @@ contract Basic is EulerSwapTestBase {
         assertEq(assetTST2.balanceOf(address(this)), amountOut);
     }
 
+    function test_badTokenAddrs() public {
+        vm.expectRevert(QuoteLib.UnsupportedPair.selector);
+        periphery.quoteExactInput(address(eulerSwap), address(assetTST), address(1234), 0);
+
+        vm.expectRevert(QuoteLib.UnsupportedPair.selector);
+        periphery.quoteExactInput(address(eulerSwap), address(1234), address(assetTST), 0);
+    }
+
     function test_altPrice() public {
         uint256 price = 0.5e18;
         uint256 px = price;
@@ -114,6 +123,10 @@ contract Basic is EulerSwapTestBase {
 
         t1.mint(address(this), amount);
         uint256 q = periphery.quoteExactInput(address(eulerSwap), address(t1), address(t2), amount);
+        {
+            uint256 qRev = periphery.quoteExactOutput(address(eulerSwap), address(t1), address(t2), q);
+            assertApproxEqAbs(amount, qRev, 200 + (MAX_QUOTE_ERROR + 1) * 2); // max 100:1 price differential, 2 swaps
+        }
 
         t1.transfer(address(eulerSwap), amount);
         if (dir) eulerSwap.swap(0, q, address(this), "");
@@ -122,6 +135,10 @@ contract Basic is EulerSwapTestBase {
 
         t2.mint(address(this), amount2);
         uint256 q2 = periphery.quoteExactInput(address(eulerSwap), address(t2), address(t1), amount2);
+        {
+            uint256 qRev = periphery.quoteExactOutput(address(eulerSwap), address(t2), address(t1), q2);
+            assertApproxEqAbs(amount2, qRev, 200 + (MAX_QUOTE_ERROR + 1) * 2);
+        }
 
         t2.transfer(address(eulerSwap), amount2);
         if (dir) eulerSwap.swap(q2, 0, address(this), "");
diff --git a/test/Ctx.t.sol b/test/Ctx.t.sol
@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: GPL-2.0-or-later
 pragma solidity ^0.8.24;
 
-import {EulerSwapTestBase, IEulerSwap} from "./EulerSwapTestBase.t.sol";
+import {EulerSwapTestBase, EulerSwap, IEulerSwap} from "./EulerSwapTestBase.t.sol";
 import {CtxLib} from "../src/libraries/CtxLib.sol";
 
 contract CtxTest is EulerSwapTestBase {
@@ -17,4 +17,32 @@ contract CtxTest is EulerSwapTestBase {
         IEulerSwap.Params memory params = getEulerSwapParams(1e18, 1e18, 1e18, 1e18, 0.4e18, 0.85e18, 0, 0, address(0));
         assertEq(abi.encode(params).length, 384);
     }
+
+    function test_insufficientCalldata() public {
+        // Proxy appends 384 bytes of calldata, so you can't call directly without this
+
+        vm.expectRevert(CtxLib.InsufficientCalldata.selector);
+        EulerSwap(eulerSwapImpl).getParams();
+    }
+
+    function test_callImplementationDirectly() public {
+        // Underlying implementation is locked: must call via a proxy
+
+        bool success;
+
+        vm.expectRevert(EulerSwap.AlreadyActivated.selector);
+        (success,) = eulerSwapImpl.call(
+            padCalldata(
+                abi.encodeCall(EulerSwap.activate, (IEulerSwap.InitialState({currReserve0: 1e18, currReserve1: 1e18})))
+            )
+        );
+
+        vm.expectRevert(EulerSwap.Locked.selector);
+        (success,) = eulerSwapImpl.call(padCalldata(abi.encodeCall(EulerSwap.getReserves, ())));
+    }
+
+    function padCalldata(bytes memory inp) internal pure returns (bytes memory) {
+        IEulerSwap.Params memory params;
+        return abi.encodePacked(inp, abi.encode(params));
+    }
 }
diff --git a/test/CurveLib.t.sol b/test/CurveLib.t.sol
@@ -37,7 +37,7 @@ contract CurveLibTest is EulerSwapTestBase {
         // Params
         px = 1e18;
         py = bound(py, 1, 1e36);
-        x0 = bound(x0, 1e2, 1e28);
+        x0 = bound(x0, 1, 1e28);
         y0 = bound(y0, 0, 1e28);
         cx = bound(cx, 1, 1e18);
         cy = bound(cy, 1, 1e18);
@@ -63,9 +63,7 @@ contract CurveLibTest is EulerSwapTestBase {
             protocolFeeRecipient: address(0)
         });
 
-        // Note without -2 in the max bound, f() sometimes fails when x gets too close to centre.
-        // Note small x values lead to large y-values, which causes problems for both f() and fInverse(), so we cap it here
-        x = bound(x, 1e2 - 3, x0 - 3);
+        x = bound(x, 1, x0);
 
         uint256 y = CurveLib.f(x, px, py, x0, y0, cx);
         console.log("y    ", y);
@@ -83,7 +81,9 @@ contract CurveLibTest is EulerSwapTestBase {
 
         if (x < type(uint112).max && y < type(uint112).max) {
             assert(CurveLib.verify(p, xCalc, y));
-            assert(int256(xCalc) - int256(xBin) <= 3 || int256(yCalc) - int256(yBin) <= 3); // suspect this is 2 wei error in fInverse() + 1 wei error in f()
+            console.log("Invariant passed");
+            assert(xCalc - xBin <= 3 || y - yCalc <= 3); // suspect this is 2 wei error in fInverse() + 1 wei error in f()
+            console.log("Margin error passed");
         }
     }
 
diff --git a/test/FactoryTest.t.sol b/test/FactoryTest.t.sol
@@ -53,6 +53,18 @@ contract FactoryTest is EulerSwapTestBase {
         (hookAddress, salt) = HookMiner.find(address(eulerSwapFactory), holder, flags, creationCode);
     }
 
+    function testDifferingAddressesSameSalt() public view {
+        (IEulerSwap.Params memory poolParams,) = getBasicParams();
+
+        address a1 = eulerSwapFactory.computePoolAddress(poolParams, bytes32(0));
+
+        poolParams.eulerAccount = address(123);
+
+        address a2 = eulerSwapFactory.computePoolAddress(poolParams, bytes32(0));
+
+        assert(a1 != a2);
+    }
+
     function testDeployPool() public {
         uint256 allPoolsLengthBefore = eulerSwapFactory.poolsLength();
 
@@ -238,16 +250,6 @@ contract FactoryTest is EulerSwapTestBase {
         assertEq(pools[0], hookAddress);
     }
 
-    function testCallImpl() public {
-        // Underlying implementation is locked: must call via a proxy
-
-        vm.expectRevert(EulerSwap.AlreadyActivated.selector);
-        EulerSwap(eulerSwapImpl).activate(IEulerSwap.InitialState({currReserve0: 1e18, currReserve1: 1e18}));
-
-        vm.expectRevert(EulerSwap.Locked.selector);
-        EulerSwap(eulerSwapImpl).getReserves();
-    }
-
     address alice = makeAddr("alice");
     address bob = makeAddr("bob");
 
diff --git a/test/HookSwaps.t.sol b/test/HookSwaps.t.sol
@@ -126,6 +126,26 @@ contract HookSwapsTest is EulerSwapTestBase {
         vm.stopPrank();
     }
 
+    function test_hookPermissions() public view {
+        Hooks.Permissions memory perms = eulerSwap.getHookPermissions();
+
+        assertTrue(perms.beforeInitialize);
+        assertTrue(perms.beforeAddLiquidity);
+        assertTrue(perms.beforeSwap);
+        assertTrue(perms.beforeSwapReturnDelta);
+
+        assertFalse(perms.afterInitialize);
+        assertFalse(perms.afterAddLiquidity);
+        assertFalse(perms.beforeRemoveLiquidity);
+        assertFalse(perms.afterRemoveLiquidity);
+        assertFalse(perms.afterSwap);
+        assertFalse(perms.beforeDonate);
+        assertFalse(perms.afterDonate);
+        assertFalse(perms.afterSwapReturnDelta);
+        assertFalse(perms.afterAddLiquidityReturnDelta);
+        assertFalse(perms.afterRemoveLiquidityReturnDelta);
+    }
+
     /// @dev adding liquidity as a concentrated liquidity position will revert
     function test_revertAddConcentratedLiquidity() public {
         assetTST.mint(anyone, 10000e18);
diff --git a/test/PreserveNav.t.sol b/test/PreserveNav.t.sol
@@ -42,6 +42,10 @@ contract PreserveNav is EulerSwapTestBase {
             else (t1, t2) = (assetTST2, assetTST);
 
             uint256 q = periphery.quoteExactInput(address(eulerSwap), address(t1), address(t2), amount1);
+            {
+                uint256 qRev = periphery.quoteExactOutput(address(eulerSwap), address(t1), address(t2), q);
+                assertApproxEqAbs(amount1, qRev, (MAX_QUOTE_ERROR + 1) * 2);
+            }
 
             t1.mint(address(this), amount1);
             t1.transfer(address(eulerSwap), amount1);
@@ -66,6 +70,10 @@ contract PreserveNav is EulerSwapTestBase {
             else (t1, t2) = (assetTST2, assetTST);
 
             uint256 q = periphery.quoteExactInput(address(eulerSwap), address(t1), address(t2), amount2);
+            {
+                uint256 qRev = periphery.quoteExactOutput(address(eulerSwap), address(t1), address(t2), q);
+                assertApproxEqAbs(amount2, qRev, (MAX_QUOTE_ERROR + 1) * 2);
+            }
 
             t1.mint(address(this), amount2);
             t1.transfer(address(eulerSwap), amount2);
diff --git a/test/utils/HookMiner.sol b/test/utils/HookMiner.sol
@@ -49,15 +49,7 @@ library HookMiner {
         returns (address hookAddress)
     {
         return address(
-            uint160(
-                uint256(
-                    keccak256(
-                        abi.encodePacked(
-                            bytes1(0xFF), deployer, keccak256(abi.encode(account, salt)), keccak256(creationCode)
-                        )
-                    )
-                )
-            )
+            uint160(uint256(keccak256(abi.encodePacked(bytes1(0xFF), deployer, salt, keccak256(creationCode)))))
         );
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -58,7 +58,7 @@ contract EulerSwap is IEulerSwap, EVCUtil, UniswapHook {`
`58`	`58`	`}`
`59`	`59`
`60`	`60`	`/// @inheritdoc IEulerSwap`
`61`		`- function activate(InitialState calldata initialState) public {`
	`61`	`+ function activate(InitialState calldata initialState) external {`
`62`	`62`	`CtxLib.Storage storage s = CtxLib.getStorage();`
`63`	`63`	`Params memory p = CtxLib.getParams();`
`64`	`64`
Original file line number	Diff line number	Diff line change
`@@ -19,22 +19,15 @@ library CtxLib {`
`19`	`19`	`}`
`20`	`20`	`}`
`21`	`21`
	`22`	`+ error InsufficientCalldata();`
	`23`	`+`
`22`	`24`	`/// @dev Unpacks encoded Params from trailing calldata. Loosely based on`
`23`	`25`	`/// the implementation from EIP-3448 (except length is hard-coded).`
	`26`	`+ /// 384 is the size of the Params struct after ABI encoding.`
`24`	`27`	`function getParams() internal pure returns (IEulerSwap.Params memory p) {`
`25`		`- bytes memory data;`
`26`		`-`
`27`		`- assembly {`
`28`		`- let size := 384`
`29`		`- let dataPtr := sub(calldatasize(), size)`
`30`		`- data := mload(64)`
`31`		`- // increment free memory pointer by metadata size + 32 bytes (length)`
`32`		`- mstore(64, add(data, add(size, 32)))`
`33`		`- mstore(data, size)`
`34`		`- let memPtr := add(data, 32)`
`35`		`- calldatacopy(memPtr, dataPtr, size)`
	`28`	`+ require(msg.data.length >= 384, InsufficientCalldata());`
	`29`	`+ unchecked {`
	`30`	`+ return abi.decode(msg.data[msg.data.length - 384:], (IEulerSwap.Params));`
`36`	`31`	`}`
`37`		`-`
`38`		`- return abi.decode(data, (IEulerSwap.Params));`
`39`	`32`	`}`
`40`	`33`	`}`
Original file line number	Diff line number	Diff line change
`@@ -79,7 +79,7 @@ library FundsLib {`
`79`	`79`	`uint256 protocolFeeAmount = feeAmount * p.protocolFee / 1e18;`
`80`	`80`
`81`	`81`	`if (protocolFeeAmount != 0) {`
`82`		`- IERC20(asset).transfer(p.protocolFeeRecipient, protocolFeeAmount);`
	`82`	`+ IERC20(asset).safeTransfer(p.protocolFeeRecipient, protocolFeeAmount);`
`83`	`83`	`amount -= protocolFeeAmount;`
`84`	`84`	`feeAmount -= protocolFeeAmount;`
`85`	`85`	`}`