fmt

Author: hoytech

src/MaglevBase.sol

@@ -214,9 +214,7 @@ abstract contract MaglevBase is EVCUtil, Ownable {
 
     // To be implemented by sub-class
 
-    function verify(uint256 amount0In, uint256 amount1In, uint256 newReserve0, uint256 newReserve1)
-        internal
-        virtual;
+    function verify(uint256 amount0In, uint256 amount1In, uint256 newReserve0, uint256 newReserve1) internal virtual;
 
     function computeQuote(uint256 amount, bool exactIn, bool asset0IsInput) internal view virtual returns (uint256);
 }

src/MaglevConstantProduct.sol

@@ -6,19 +6,13 @@ import {MaglevBase} from "./MaglevBase.sol";
 contract MaglevConstantProduct is MaglevBase {
     error KNotSatisfied();
 
-    constructor(BaseParams memory baseParams) MaglevBase(baseParams) {
-    }
+    constructor(BaseParams memory baseParams) MaglevBase(baseParams) {}
 
     function k(uint256 r0, uint256 r1) public pure returns (uint256) {
         return r0 * r1;
     }
 
-    function verify(uint256, uint256, uint256 newReserve0, uint256 newReserve1)
-        internal
-        view
-        virtual
-        override
-    {
+    function verify(uint256, uint256, uint256 newReserve0, uint256 newReserve1) internal view virtual override {
         uint256 kBefore = k(reserve0, reserve1);
         uint256 kAfter = k(newReserve0, newReserve1);
         require(kAfter >= kBefore, KNotSatisfied());

src/MaglevConstantSum.sol

@@ -23,12 +23,7 @@ contract MaglevConstantSum is MaglevBase {
         return (r0 * priceA) + (r1 * priceB);
     }
 
-    function verify(uint256, uint256, uint256 newReserve0, uint256 newReserve1)
-        internal
-        view
-        virtual
-        override
-    {
+    function verify(uint256, uint256, uint256 newReserve0, uint256 newReserve1) internal view virtual override {
         uint256 kBefore = k(reserve0, reserve1);
         uint256 kAfter = k(newReserve0, newReserve1);
         require(kAfter >= kBefore, KNotSatisfied());

test/ConstantProduct.t.sol

@@ -40,7 +40,7 @@ contract ConstantProductTest is MaglevTestBase {
         assetTST.transfer(address(maglev), amount);
 
         vm.expectRevert(Maglev.KNotSatisfied.selector);
-        maglev.swap(0, q+1, address(this), "");
+        maglev.swap(0, q + 1, address(this), "");
 
         maglev.swap(0, q, address(this), "");
         assertEq(assetTST2.balanceOf(address(this)), q);
@@ -67,8 +67,8 @@ contract ConstantProductTest is MaglevTestBase {
         t1.transfer(address(maglev), amount);
 
         vm.expectRevert(Maglev.KNotSatisfied.selector);
-        if (dir) maglev.swap(0, q+1, address(this), "");
-        else maglev.swap(q+1, 0, address(this), "");
+        if (dir) maglev.swap(0, q + 1, address(this), "");
+        else maglev.swap(q + 1, 0, address(this), "");
 
         if (dir) maglev.swap(0, q, address(this), "");
         else maglev.swap(q, 0, address(this), "");
@@ -94,6 +94,7 @@ contract ConstantProductTest is MaglevTestBase {
 
         t2.transfer(address(maglev), q);
         if (dir) maglev.swap(amount - 2, 0, address(this), ""); // - 2 due to rounding
+
         else maglev.swap(0, amount - 2, address(this), "");
 
         uint256 q2 = maglev.quoteExactInput(address(t1), address(t2), amount);

test/ConstantSum.t.sol

@@ -19,9 +19,13 @@ contract ConstantSumTest is MaglevTestBase {
         createMaglev(50e18, 50e18, 0, 1, 1);
     }
 
-    function createMaglev(uint112 debtLimit0, uint112 debtLimit1, uint256 fee, uint256 priceA, uint256 priceB) internal {
+    function createMaglev(uint112 debtLimit0, uint112 debtLimit1, uint256 fee, uint256 priceA, uint256 priceB)
+        internal
+    {
         vm.prank(owner);
-        maglev = new Maglev(getMaglevBaseParams(debtLimit0, debtLimit1, fee), Maglev.ConstantSumParams({priceA: priceA, priceB: priceB}));
+        maglev = new Maglev(
+            getMaglevBaseParams(debtLimit0, debtLimit1, fee), Maglev.ConstantSumParams({priceA: priceA, priceB: priceB})
+        );
 
         vm.prank(holder);
         evc.setAccountOperator(holder, address(maglev), true);

test/EulerSwap.t.sol

@@ -19,9 +19,19 @@ contract EulerSwapTest is MaglevTestBase {
         createMaglev(50e18, 50e18, 0, 1e18, 1e18, 0.4e18, 0.85e18);
     }
 
-    function createMaglev(uint112 debtLimit0, uint112 debtLimit1, uint256 fee, uint256 px, uint256 py, uint256 cx, uint256 cy) internal {
+    function createMaglev(
+        uint112 debtLimit0,
+        uint112 debtLimit1,
+        uint256 fee,
+        uint256 px,
+        uint256 py,
+        uint256 cx,
+        uint256 cy
+    ) internal {
         vm.prank(owner);
-        maglev = new Maglev(getMaglevBaseParams(debtLimit0, debtLimit1, fee), Maglev.EulerSwapParams({px: px, py: py, cx: cx, cy: cy}));
+        maglev = new Maglev(
+            getMaglevBaseParams(debtLimit0, debtLimit1, fee), Maglev.EulerSwapParams({px: px, py: py, cx: cx, cy: cy})
+        );
 
         vm.prank(holder);
         evc.setAccountOperator(holder, address(maglev), true);
@@ -30,7 +40,6 @@ contract EulerSwapTest is MaglevTestBase {
         maglev.configure();
     }
 
-
     function test_basicSwap_exactIn() public monotonicHolderNAV {
         uint256 amountIn = 1e18;
         uint256 amountOut = maglev.quoteExactInput(address(assetTST), address(assetTST2), amountIn);
@@ -147,6 +156,7 @@ contract EulerSwapTest is MaglevTestBase {
         assertGe(getHolderNAV(), origNAV);
     }
 
+    // To reproduce, change roundingCompensation to 1e18
     function test_roundingFailure() public {
         uint256 amountIn = 1.4e18;
         uint256 amountOut = maglev.quoteExactInput(address(assetTST), address(assetTST2), amountIn);

test/MaglevTestBase.t.sol

@@ -42,9 +42,20 @@ contract MaglevTestBase is EVaultTestBase {
         _mintAndDeposit(holder, eTST2, 10e18);
     }
 
-    function getMaglevBaseParams(uint112 debtLimit0, uint112 debtLimit1, uint256 fee) internal view returns (MaglevBase.BaseParams memory) {
-        return
-            MaglevBase.BaseParams({evc: address(evc), vault0: address(eTST), vault1: address(eTST2), myAccount: holder, debtLimit0: debtLimit0, debtLimit1: debtLimit1, fee: fee});
+    function getMaglevBaseParams(uint112 debtLimit0, uint112 debtLimit1, uint256 fee)
+        internal
+        view
+        returns (MaglevBase.BaseParams memory)
+    {
+        return MaglevBase.BaseParams({
+            evc: address(evc),
+            vault0: address(eTST),
+            vault1: address(eTST2),
+            myAccount: holder,
+            debtLimit0: debtLimit0,
+            debtLimit1: debtLimit1,
+            fee: fee
+        });
     }
 
     function _mintAndDeposit(address who, IEVault vault, uint256 amount) internal {