wip

Author: hoytech

src/MaglevBase.sol

@@ -1,6 +1,7 @@
 // SPDX-License-Identifier: UNLICENSED
 pragma solidity ^0.8.0;
 
+import {console} from "forge-std/Test.sol";
 import {Ownable, Context} from "openzeppelin-contracts/access/Ownable.sol";
 import {EVCUtil} from "evc/utils/EVCUtil.sol";
 import {IEVC} from "evc/interfaces/IEthereumVaultConnector.sol";
@@ -18,8 +19,8 @@ abstract contract MaglevBase is EVCUtil, Ownable {
     uint112 public reserve1;
     uint32 private locked;
 
-    uint112 public virtualReserve0;
-    uint112 public virtualReserve1;
+    uint112 public initialReserve0;
+    uint112 public initialReserve1;
 
     error Reentrancy();
     error Overflow();
@@ -64,20 +65,9 @@ abstract contract MaglevBase is EVCUtil, Ownable {
         IEVC(evc).enableCollateral(myAccount, vault1);
     }
 
-    function setVirtualReserves(uint112 vr0, uint112 vr1) external onlyOwner {
-        virtualReserve0 = vr0;
-        virtualReserve1 = vr1;
-
-        syncVirtualReserves();
-
-        virtualReserve0 = reserve0;
-        virtualReserve1 = reserve1;
-    }
-
-    /// @dev Call whenever underlying balances change externally
-    function syncVirtualReserves() public onlyOwner {
-        reserve0 = adjustReserve(virtualReserve0, vault0);
-        reserve1 = adjustReserve(virtualReserve1, vault1);
+    function setDebtLimit(uint112 debtLimit0, uint112 debtLimit1) external onlyOwner {
+        reserve0 = initialReserve0 = adjustReserve(debtLimit0, vault0);
+        reserve1 = initialReserve1 = adjustReserve(debtLimit1, vault1);
     }
 
     // Swapper interface

src/MaglevEulerSwap.sol

@@ -33,8 +33,8 @@ contract MaglevEulerSwap is MaglevBase {
         //require(_verify(49e18, 51e18, px, py, 50e18, 50e18, cx, cy), KNotSatisfied());
 
         console.log("QQ", newReserve0, newReserve1);
-        console.log("ZZ", virtualReserve0, virtualReserve1);
-        require(_verify(newReserve0, newReserve1, px, py, virtualReserve0, virtualReserve1, cx, cy), KNotSatisfied());
+        console.log("ZZ", initialReserve0, initialReserve1);
+        require(_verify(newReserve0, newReserve1, px, py, initialReserve0, initialReserve1, cx, cy), KNotSatisfied());
     }
 
     function computeQuote(uint256, bool, bool)

test/ConstantProduct.t.sol

@@ -26,7 +26,7 @@ contract ConstantProductTest is MaglevTestBase {
         maglev.configure();
 
         vm.prank(owner);
-        maglev.setVirtualReserves(50e18, 50e18);
+        maglev.setDebtLimit(50e18, 50e18);
     }
 
     function test_fee_exactIn(uint256 amount, bool dir) public {

test/ConstantSum.t.sol

@@ -26,7 +26,7 @@ contract ConstantSumTest is MaglevTestBase {
         maglev.configure();
 
         vm.prank(owner);
-        maglev.setVirtualReserves(50e18, 50e18);
+        maglev.setDebtLimit(50e18, 50e18);
     }
 
     function test_basicSwapReport() public {
@@ -53,8 +53,8 @@ contract ConstantSumTest is MaglevTestBase {
     }
 
     function test_reserveLimit() public {
-        assertEq(maglev.virtualReserve0(), 50e18);
-        assertEq(maglev.virtualReserve1(), 50e18);
+        assertEq(maglev.initialReserve0(), 60e18);
+        assertEq(maglev.initialReserve1(), 60e18);
         assertEq(maglev.reserve0(), 60e18);
         assertEq(maglev.reserve1(), 60e18);
 
@@ -77,21 +77,39 @@ contract ConstantSumTest is MaglevTestBase {
             maglev.swap(0, amount, address(this), "");
         }
 
+        assertEq(eTST.balanceOf(holder), 70e18);
         assertEq(eTST2.debtOf(holder), 50e18);
         assertEq(maglev.reserve0(), 120e18);
         assertEq(maglev.reserve1(), 0e18);
 
+        // Same debt limit means reserves not affected
+
+        vm.prank(owner);
+        maglev.setDebtLimit(50e18, 50e18);
+        assertEq(maglev.reserve0(), 120e18);
+        assertEq(maglev.reserve1(), 0e18);
+
+        // Increase debt limit on one side
+
         vm.prank(owner);
-        maglev.setVirtualReserves(60e18, 55e18);
+        maglev.setDebtLimit(50e18, 55e18);
+        assertEq(maglev.reserve0(), 120e18);
+        assertEq(maglev.reserve1(), 5e18);
+
+        // And the other
 
-        assertEq(maglev.reserve0(), 130e18);
+        vm.prank(owner);
+        maglev.setDebtLimit(55e18, 55e18);
+        assertEq(maglev.reserve0(), 125e18);
         assertEq(maglev.reserve1(), 5e18);
 
+        // Shrink debt limit
+
         vm.prank(owner);
-        maglev.setVirtualReserves(40e18, 45e18);
+        maglev.setDebtLimit(40e18, 45e18);
 
         assertEq(maglev.reserve0(), 110e18);
-        assertEq(maglev.reserve1(), 0e18);
+        assertEq(maglev.reserve1(), 0e18); // can't go below 0
     }
 
     function test_basicSwapFuzz(uint256 amount1, uint256 amount2) public {

test/EulerSwap.t.sol

@@ -26,12 +26,12 @@ contract EulerSwapTest is MaglevTestBase {
         maglev.configure();
 
         vm.prank(owner);
-        maglev.setVirtualReserves(50e18, 50e18);
+        maglev.setDebtLimit(50e18, 50e18);
     }
 
     function test_basicSwap() public {
         uint256 amountIn = 1e18;
-        uint256 amountOut = 0.9999999e18;
+        uint256 amountOut = 0.99e18;
 
         assetTST.mint(address(this), amountIn);