Merge pull request #14 from euler-xyz/fix/order-assets

Fix: pool asset0/asset1 order

Author: hoytech

.github/workflows/test.yml

@@ -36,7 +36,7 @@ jobs:
 
       - name: Run Forge build
         run: |
-          forge build --sizes
+          forge build --force --skip test --sizes
         id: build
 
       - name: Run Forge tests

src/MaglevBase.sol

@@ -13,8 +13,6 @@ abstract contract MaglevBase is IMaglevBase, EVCUtil {
     address public immutable asset0;
     address public immutable asset1;
     address public immutable myAccount;
-    uint112 public immutable debtLimit0;
-    uint112 public immutable debtLimit1;
     uint256 public immutable feeMultiplier;
 
     uint112 internal reserve0;
@@ -38,11 +36,11 @@ abstract contract MaglevBase is IMaglevBase, EVCUtil {
 
     struct BaseParams {
         address evc;
-        address vault0;
-        address vault1;
+        address vaultA;
+        address vaultB;
         address myAccount;
-        uint112 debtLimit0;
-        uint112 debtLimit1;
+        uint112 debtLimitA;
+        uint112 debtLimitB;
         uint256 fee;
     }
 
@@ -60,20 +58,32 @@ abstract contract MaglevBase is IMaglevBase, EVCUtil {
     constructor(BaseParams memory params) EVCUtil(params.evc) {
         require(params.fee < 1e18, BadFee());
 
-        address vault0Evc = IEVault(params.vault0).EVC();
-        require(vault0Evc == IEVault(params.vault1).EVC(), DifferentEVC());
-        require(vault0Evc == params.evc, DifferentEVC());
+        address vaultAEvc = IEVault(params.vaultA).EVC();
+        require(vaultAEvc == IEVault(params.vaultB).EVC(), DifferentEVC());
+        require(vaultAEvc == params.evc, DifferentEVC());
 
-        vault0 = params.vault0;
-        vault1 = params.vault1;
-        asset0 = IEVault(vault0).asset();
-        asset1 = IEVault(vault1).asset();
-
-        require(asset0 != asset1, UnsupportedPair());
+        address assetA = IEVault(params.vaultA).asset();
+        address assetB = IEVault(params.vaultB).asset();
+        require(assetA != assetB, UnsupportedPair());
 
         myAccount = params.myAccount;
-        reserve0 = offsetReserve(params.debtLimit0, vault0);
-        reserve1 = offsetReserve(params.debtLimit1, vault1);
+        (vault0, asset0, reserve0, vault1, asset1, reserve1) = assetA < assetB
+            ? (
+                params.vaultA,
+                assetA,
+                offsetReserve(params.debtLimitA, params.vaultA),
+                params.vaultB,
+                assetB,
+                offsetReserve(params.debtLimitB, params.vaultB)
+            )
+            : (
+                params.vaultB,
+                assetB,
+                offsetReserve(params.debtLimitB, params.vaultB),
+                params.vaultA,
+                assetA,
+                offsetReserve(params.debtLimitA, params.vaultA)
+            );
         feeMultiplier = 1e18 - params.fee;
     }
 

src/interfaces/IMaglevBase.sol

@@ -12,8 +12,6 @@ interface IMaglevBase {
     function asset0() external view returns (address);
     function asset1() external view returns (address);
     function myAccount() external view returns (address);
-    function debtLimit0() external view returns (uint112);
-    function debtLimit1() external view returns (uint112);
     function feeMultiplier() external view returns (uint256);
     function getReserves() external view returns (uint112, uint112, uint32);
 }

test/ConstantProduct.t.sol

@@ -19,9 +19,9 @@ contract ConstantProductTest is MaglevTestBase {
         createMaglev(50e18, 50e18, 0);
     }
 
-    function createMaglev(uint112 debtLimit0, uint112 debtLimit1, uint256 fee) internal {
+    function createMaglev(uint112 debtLimitA, uint112 debtLimitB, uint256 fee) internal {
         vm.prank(creator);
-        maglev = new Maglev(getMaglevBaseParams(debtLimit0, debtLimit1, fee));
+        maglev = new Maglev(getMaglevBaseParams(debtLimitA, debtLimitB, fee));
 
         vm.prank(holder);
         evc.setAccountOperator(holder, address(maglev), true);

test/ConstantSum.t.sol

@@ -19,12 +19,12 @@ contract ConstantSumTest is MaglevTestBase {
         createMaglev(50e18, 50e18, 0, 1, 1);
     }
 
-    function createMaglev(uint112 debtLimit0, uint112 debtLimit1, uint256 fee, uint256 priceX, uint256 priceY)
+    function createMaglev(uint112 debtLimitA, uint112 debtLimitB, uint256 fee, uint256 priceX, uint256 priceY)
         internal
     {
         vm.prank(creator);
         maglev = new Maglev(
-            getMaglevBaseParams(debtLimit0, debtLimit1, fee), Maglev.ConstantSumParams({priceX: priceX, priceY: priceY})
+            getMaglevBaseParams(debtLimitA, debtLimitB, fee), Maglev.ConstantSumParams({priceX: priceX, priceY: priceY})
         );
 
         vm.prank(holder);

test/EulerSwap.t.sol

@@ -20,8 +20,8 @@ contract EulerSwapTest is MaglevTestBase {
     }
 
     function createMaglev(
-        uint112 debtLimit0,
-        uint112 debtLimit1,
+        uint112 debtLimitA,
+        uint112 debtLimitB,
         uint256 fee,
         uint256 px,
         uint256 py,
@@ -30,7 +30,7 @@ contract EulerSwapTest is MaglevTestBase {
     ) internal {
         vm.prank(creator);
         maglev = new Maglev(
-            getMaglevBaseParams(debtLimit0, debtLimit1, fee),
+            getMaglevBaseParams(debtLimitA, debtLimitB, fee),
             Maglev.EulerSwapParams({priceX: px, priceY: py, concentrationX: cx, concentrationY: cy})
         );
 
@@ -47,11 +47,11 @@ contract EulerSwapTest is MaglevTestBase {
         new Maglev(
             MaglevBase.BaseParams({
                 evc: address(makeAddr("RANDOM_EVC")),
-                vault0: address(eTST),
-                vault1: address(eTST2),
+                vaultA: address(eTST),
+                vaultB: address(eTST2),
                 myAccount: holder,
-                debtLimit0: 50e18,
-                debtLimit1: 50e18,
+                debtLimitA: 50e18,
+                debtLimitB: 50e18,
                 fee: 0
             }),
             Maglev.EulerSwapParams({priceX: 1e18, priceY: 1e18, concentrationX: 4e18, concentrationY: 0.85e18})

test/MaglevTestBase.t.sol

@@ -43,18 +43,18 @@ contract MaglevTestBase is EVaultTestBase {
         _mintAndDeposit(holder, eTST2, 10e18);
     }
 
-    function getMaglevBaseParams(uint112 debtLimit0, uint112 debtLimit1, uint256 fee)
+    function getMaglevBaseParams(uint112 debtLimitA, uint112 debtLimitB, uint256 fee)
         internal
         view
         returns (MaglevBase.BaseParams memory)
     {
         return MaglevBase.BaseParams({
             evc: address(evc),
-            vault0: address(eTST),
-            vault1: address(eTST2),
+            vaultA: address(eTST),
+            vaultB: address(eTST2),
             myAccount: holder,
-            debtLimit0: debtLimit0,
-            debtLimit1: debtLimit1,
+            debtLimitA: debtLimitA,
+            debtLimitB: debtLimitB,
             fee: fee
         });
     }

test/UniswapV2Call.t.sol

@@ -19,8 +19,8 @@ contract UniswapV2CallTest is MaglevTestBase {
     }
 
     function createMaglev(
-        uint112 debtLimit0,
-        uint112 debtLimit1,
+        uint112 debtLimitA,
+        uint112 debtLimitB,
         uint256 fee,
         uint256 px,
         uint256 py,
@@ -29,7 +29,7 @@ contract UniswapV2CallTest is MaglevTestBase {
     ) internal {
         vm.prank(creator);
         maglev = new Maglev(
-            getMaglevBaseParams(debtLimit0, debtLimit1, fee),
+            getMaglevBaseParams(debtLimitA, debtLimitB, fee),
             Maglev.EulerSwapParams({priceX: px, priceY: py, concentrationX: cx, concentrationY: cy})
         );