pricing tests

Author: hoytech

test/ConstantProduct.t.sol

@@ -29,7 +29,7 @@ contract ConstantProductTest is MaglevTestBase {
         maglev.setDebtLimit(50e18, 50e18);
     }
 
-    function test_fee_exactIn(uint256 amount, bool dir) public {
+    function test_fee_exactIn(uint256 amount, bool dir) public monotonicHolderNAV {
         amount = bound(amount, 0.1e18, 25e18);
 
         TestERC20 t1;
@@ -53,7 +53,7 @@ contract ConstantProductTest is MaglevTestBase {
         assertEq(t2.balanceOf(address(this)), q);
     }
 
-    function test_pathIndependent(uint256 amount, bool dir) public {
+    function test_pathIndependent(uint256 amount, bool dir) public monotonicHolderNAV {
         amount = bound(amount, 0.1e18, 25e18);
 
         TestERC20 t1;

test/ConstantSum.t.sol

@@ -29,7 +29,7 @@ contract ConstantSumTest is MaglevTestBase {
         maglev.setDebtLimit(50e18, 50e18);
     }
 
-    function test_basicSwapReport() public {
+    function test_basicSwapReport() public monotonicHolderNAV {
         uint256 amount = 25e18;
         assetTST.mint(address(this), amount);
 
@@ -52,7 +52,7 @@ contract ConstantSumTest is MaglevTestBase {
         logState(address(maglev));
     }
 
-    function test_reserveLimit() public {
+    function test_reserveLimit() public monotonicHolderNAV {
         assertEq(maglev.initialReserve0(), 60e18);
         assertEq(maglev.initialReserve1(), 60e18);
         assertEq(maglev.reserve0(), 60e18);
@@ -112,7 +112,7 @@ contract ConstantSumTest is MaglevTestBase {
         assertEq(maglev.reserve1(), 0e18); // can't go below 0
     }
 
-    function test_basicSwapFuzz(uint256 amount1, uint256 amount2) public {
+    function test_basicSwapFuzz(uint256 amount1, uint256 amount2) public monotonicHolderNAV {
         amount1 = bound(amount1, 1e18, 25e18);
         amount2 = bound(amount2, 1e18, 50e18);
 
@@ -129,7 +129,7 @@ contract ConstantSumTest is MaglevTestBase {
         assertEq(assetTST2.balanceOf(address(this)), amount1);
     }
 
-    function test_quoteExactInput() public {
+    function test_quoteExactInput() public monotonicHolderNAV {
         vm.prank(owner);
         maglev.setConstantSumParams(Maglev.ConstantSumParams({fee: 0.003e18, priceA: 1, priceB: 1}));
 
@@ -142,7 +142,7 @@ contract ConstantSumTest is MaglevTestBase {
         assertEq(assetTST2.balanceOf(recipient), q);
     }
 
-    function test_quoteExactOutput() public {
+    function test_quoteExactOutput() public monotonicHolderNAV {
         vm.prank(owner);
         maglev.setConstantSumParams(Maglev.ConstantSumParams({fee: 0.003e18, priceA: 1, priceB: 1}));
 
@@ -156,7 +156,7 @@ contract ConstantSumTest is MaglevTestBase {
         assertEq(assetTST2.balanceOf(recipient), 1e18);
     }
 
-    function test_fees(uint256 fee, uint256 amount1, bool token0) public {
+    function test_fees(uint256 fee, uint256 amount1, bool token0) public monotonicHolderNAV {
         fee = bound(fee, 0, 0.02e18);
         amount1 = bound(amount1, 1e18, 25e18);
 

test/EulerSwap.t.sol

@@ -30,7 +30,7 @@ contract EulerSwapTest is MaglevTestBase {
         maglev.setDebtLimit(50e18, 50e18);
     }
 
-    function test_basicSwap() public {
+    function test_basicSwap() public monotonicHolderNAV {
         uint256 amountIn = 1e18;
         uint256 amountOut = maglev.quoteExactInput(address(assetTST), address(assetTST2), amountIn);
 
@@ -42,7 +42,36 @@ contract EulerSwapTest is MaglevTestBase {
         assertEq(assetTST2.balanceOf(address(this)), amountOut);
     }
 
-    function test_pathIndependent(uint256 amount, bool dir) public {
+    function test_price() public {
+        uint price = 0.5e18;
+        uint px = price;
+        uint py = 1e18;
+        oracle.setPrice(address(eTST), unitOfAccount, 0.5e18);
+        oracle.setPrice(address(assetTST), unitOfAccount, 0.5e18);
+
+        int256 origNAV = getHolderNAV();
+
+        vm.prank(owner);
+        maglev.setEulerSwapParams(Maglev.EulerSwapParams({
+            px: px,
+            py: py,
+            cx: 0.4e18,
+            cy: 0.85e18
+        }));
+
+        uint256 amountIn = 1e18;
+        uint256 amountOut = maglev.quoteExactInput(address(assetTST), address(assetTST2), amountIn);
+
+        assetTST.mint(address(this), amountIn);
+
+        assetTST.transfer(address(maglev), amountIn);
+        maglev.swap(0, amountOut, address(this), "");
+        assertEq(assetTST2.balanceOf(address(this)), amountOut);
+
+        assertGe(getHolderNAV(), origNAV);
+    }
+
+    function test_pathIndependent(uint256 amount, bool dir) public monotonicHolderNAV {
         amount = bound(amount, 0.1e18, 25e18);
 
         TestERC20 t1;
@@ -67,15 +96,17 @@ contract EulerSwapTest is MaglevTestBase {
         assertApproxEqAbs(q, q2, 0.00000001e18);
     }
 
-    function test_fuzzParams(uint256 amount, uint256 amount2, uint256 px, uint256 py, uint256 cx, uint256 cy, bool dir) public {
+    function test_fuzzParams(uint256 amount, uint256 amount2, uint256 price, uint256 cx, uint256 cy, bool dir) public {
         amount = bound(amount, 0.1e18, 25e18);
         amount2 = bound(amount2, 0.1e18, 25e18);
-        px = bound(px, 1e18, 1e18);
-        py = bound(py, 1e18, 1e18);
+        price = bound(price, 0.1e18, 10e18);
         cx = bound(cx, 0.01e18, 0.99e18);
         cy = bound(cy, 0.01e18, 0.99e18);
 
-        int256 origNav = getHolderNAV();
+        uint px = price;
+        uint py = 1e18;
+        oracle.setPrice(address(eTST), unitOfAccount, price);
+        oracle.setPrice(address(assetTST), unitOfAccount, price);
 
         vm.prank(owner);
         maglev.setEulerSwapParams(Maglev.EulerSwapParams({
@@ -85,6 +116,8 @@ contract EulerSwapTest is MaglevTestBase {
             cy: cy
         }));
 
+        int256 origNAV = getHolderNAV();
+
         TestERC20 t1;
         TestERC20 t2;
         if (dir) (t1, t2) = (assetTST, assetTST2);
@@ -106,6 +139,6 @@ contract EulerSwapTest is MaglevTestBase {
         else maglev.swap(0, q2, address(this), "");
         assertEq(t1.balanceOf(address(this)), q2);
 
-        assertGe(getHolderNAV(), origNav);
+        assertGe(getHolderNAV(), origNAV);
     }
 }

test/MaglevTestBase.t.sol

@@ -63,13 +63,21 @@ contract MaglevTestBase is EVaultTestBase {
         uint256 debt0 = eTST.debtOf(holder);
         uint256 balance1 = eTST2.convertToAssets(eTST2.balanceOf(holder));
         uint256 debt1 = eTST2.debtOf(holder);
+        console.log("V0",balance0,debt0);
+        console.log("V1",balance1,debt1);
 
         uint256 balValue = oracle.getQuote(balance0, address(assetTST), unitOfAccount) + oracle.getQuote(balance1, address(assetTST2), unitOfAccount);
         uint256 debtValue = oracle.getQuote(debt0, address(assetTST), unitOfAccount) + oracle.getQuote(debt1, address(assetTST2), unitOfAccount);
 
         return int(balValue) - int(debtValue);
     }
 
+    modifier monotonicHolderNAV() {
+        int256 orig = getHolderNAV();
+        _;
+        assertGe(getHolderNAV(), orig);
+    }
+
     function logState(address ml) internal view {
         console.log("--------------------");
         console.log("Account States:");