Uncommented and fixed another test

test/instances/aave/AaveHyperdrive.t.sol

@@ -22,6 +22,7 @@ import { Lib } from "../../utils/Lib.sol";
 
 contract AaveHyperdriveTest is InstanceTest {
     using FixedPointMath for uint256;
+    using HyperdriveUtils for *;
     using Lib for *;
     using stdStorage for StdStorage;
 
@@ -87,7 +88,8 @@ contract AaveHyperdriveTest is InstanceTest {
                 roundTripShortMaturityWithBaseTolerance: 1e5,
                 roundTripPairInstantaneousWithBaseUpperBoundTolerance: 1e3,
                 roundTripPairInstantaneousWithBaseTolerance: 1e5,
-                roundTripPairMaturityWithBaseTolerance: 0,
+                roundTripPairMaturityWithBaseUpperBoundTolerance: 1e3,
+                roundTripPairMaturityWithBaseTolerance: 1e5,
                 // The share test tolerances.
                 closeLongWithSharesTolerance: 20,
                 closeShortWithSharesTolerance: 100,
@@ -101,9 +103,10 @@ contract AaveHyperdriveTest is InstanceTest {
                 roundTripShortInstantaneousWithSharesUpperBoundTolerance: 1e3,
                 roundTripShortInstantaneousWithSharesTolerance: 1e5,
                 roundTripShortMaturityWithSharesTolerance: 1e5,
-                roundTripPairInstantaneousWithSharesUpperBoundTolerance: 0,
-                roundTripPairInstantaneousWithSharesTolerance: 0,
-                roundTripPairMaturityWithSharesTolerance: 0,
+                roundTripPairInstantaneousWithSharesUpperBoundTolerance: 1e3,
+                roundTripPairInstantaneousWithSharesTolerance: 1e5,
+                roundTripPairMaturityWithSharesUpperBoundTolerance: 1e3,
+                roundTripPairMaturityWithSharesTolerance: 1e5,
                 // The verification tolerances.
                 verifyDepositTolerance: 2,
                 verifyWithdrawalTolerance: 2
@@ -232,6 +235,9 @@ contract AaveHyperdriveTest is InstanceTest {
         uint256 timeDelta,
         int256 variableRate
     ) internal override {
+        // Get the base balance before updating the time.
+        uint256 baseBalance = WETH.balanceOf(address(AWETH));
+
         // Get the normalized income prior to updating the time.
         uint256 reserveNormalizedIncome = POOL.getReserveNormalizedIncome(
             address(WETH)
@@ -277,5 +283,14 @@ contract AaveHyperdriveTest is InstanceTest {
                     data.currentStableBorrowRate
             )
         );
+
+        // Mint more of the base token to the Aave pool to ensure that it
+        // remains solvent.
+        (baseBalance, ) = baseBalance.calculateInterest(
+            variableRate,
+            timeDelta
+        );
+        bytes32 balanceLocation = keccak256(abi.encode(address(AWETH), 3));
+        vm.store(address(WETH), balanceLocation, bytes32(baseBalance));
     }
 }

test/instances/aave/AaveL2Hyperdrive.t.sol

@@ -23,6 +23,7 @@ import { Lib } from "test/utils/Lib.sol";
 
 contract AaveL2HyperdriveTest is InstanceTest {
     using FixedPointMath for uint256;
+    using HyperdriveUtils for *;
     using Lib for *;
     using stdStorage for StdStorage;
 
@@ -97,6 +98,7 @@ contract AaveL2HyperdriveTest is InstanceTest {
                 roundTripShortMaturityWithBaseTolerance: 1e5,
                 roundTripPairInstantaneousWithBaseUpperBoundTolerance: 1e3,
                 roundTripPairInstantaneousWithBaseTolerance: 1e5,
+                roundTripPairMaturityWithBaseUpperBoundTolerance: 1e3,
                 roundTripPairMaturityWithBaseTolerance: 1e5,
                 // The share test tolerances.
                 closeLongWithSharesTolerance: 20,
@@ -113,6 +115,7 @@ contract AaveL2HyperdriveTest is InstanceTest {
                 roundTripShortMaturityWithSharesTolerance: 1e5,
                 roundTripPairInstantaneousWithSharesUpperBoundTolerance: 1e3,
                 roundTripPairInstantaneousWithSharesTolerance: 1e5,
+                roundTripPairMaturityWithSharesUpperBoundTolerance: 1e3,
                 roundTripPairMaturityWithSharesTolerance: 1e5,
                 // The verification tolerances.
                 verifyDepositTolerance: 2,
@@ -234,6 +237,9 @@ contract AaveL2HyperdriveTest is InstanceTest {
         uint256 timeDelta,
         int256 variableRate
     ) internal override {
+        // Get the base balance before updating the time.
+        uint256 baseBalance = WETH.balanceOf(address(AWETH));
+
         // Get the normalized income prior to updating the time.
         uint256 reserveNormalizedIncome = POOL.getReserveNormalizedIncome(
             address(WETH)
@@ -248,11 +254,16 @@ contract AaveL2HyperdriveTest is InstanceTest {
         // variable rate plus one. We also need to increase the
         // `lastUpdatedTimestamp` to avoid accruing interest when deposits or
         // withdrawals are processed.
-        (uint256 totalAmount, ) = HyperdriveUtils.calculateInterest(
-            reserveNormalizedIncome,
-            variableRate,
-            timeDelta
-        );
+        uint256 normalizedTime = timeDelta.divDown(365 days);
+        reserveNormalizedIncome = variableRate >= 0
+            ? reserveNormalizedIncome +
+                reserveNormalizedIncome.mulDown(uint256(variableRate)).mulDown(
+                    normalizedTime
+                )
+            : reserveNormalizedIncome -
+                reserveNormalizedIncome.mulDown(uint256(-variableRate)).mulDown(
+                    normalizedTime
+                );
         bytes32 reserveDataLocation = keccak256(abi.encode(address(WETH), 52));
         DataTypes.ReserveDataLegacy memory data = POOL.getReserveData(
             address(WETH)
@@ -262,7 +273,7 @@ contract AaveL2HyperdriveTest is InstanceTest {
             bytes32(uint256(reserveDataLocation) + 1),
             bytes32(
                 (uint256(data.currentLiquidityRate) << 128) |
-                    uint256(totalAmount)
+                    uint256(reserveNormalizedIncome)
             )
         );
         vm.store(
@@ -274,5 +285,14 @@ contract AaveL2HyperdriveTest is InstanceTest {
                     data.currentStableBorrowRate
             )
         );
+
+        // Mint more of the base token to the Aave pool to ensure that it
+        // remains solvent.
+        (baseBalance, ) = baseBalance.calculateInterest(
+            variableRate,
+            timeDelta
+        );
+        bytes32 balanceLocation = keccak256(abi.encode(address(AWETH), 5));
+        vm.store(address(WETH), balanceLocation, bytes32(baseBalance));
     }
 }

test/instances/aerodrome/AerodromeLp_AERO_USDC_Hyperdrive.t.sol

@@ -71,6 +71,7 @@ contract AerodromeLp_AERO_USDC_Hyperdrive is AerodromeLpHyperdriveInstanceTest {
                 roundTripShortMaturityWithBaseTolerance: 0,
                 roundTripPairInstantaneousWithBaseUpperBoundTolerance: 100,
                 roundTripPairInstantaneousWithBaseTolerance: 10,
+                roundTripPairMaturityWithBaseUpperBoundTolerance: 0,
                 roundTripPairMaturityWithBaseTolerance: 0,
                 // NOTE: Share deposits and withdrawals are disabled, so these are
                 // 0.
@@ -90,6 +91,7 @@ contract AerodromeLp_AERO_USDC_Hyperdrive is AerodromeLpHyperdriveInstanceTest {
                 roundTripShortMaturityWithSharesTolerance: 0,
                 roundTripPairInstantaneousWithSharesUpperBoundTolerance: 0,
                 roundTripPairInstantaneousWithSharesTolerance: 0,
+                roundTripPairMaturityWithSharesUpperBoundTolerance: 0,
                 roundTripPairMaturityWithSharesTolerance: 0,
                 // The verification tolerances.
                 verifyDepositTolerance: 2,

test/instances/chainlink/CbETHBase.t.sol

@@ -70,6 +70,7 @@ contract CbETHBaseTest is ChainlinkHyperdriveInstanceTest {
                 roundTripShortMaturityWithBaseTolerance: 0,
                 roundTripPairInstantaneousWithBaseUpperBoundTolerance: 0,
                 roundTripPairInstantaneousWithBaseTolerance: 0,
+                roundTripPairMaturityWithBaseUpperBoundTolerance: 0,
                 roundTripPairMaturityWithBaseTolerance: 0,
                 // The share test tolerances.
                 closeLongWithSharesTolerance: 20,
@@ -86,6 +87,7 @@ contract CbETHBaseTest is ChainlinkHyperdriveInstanceTest {
                 roundTripShortMaturityWithSharesTolerance: 1e3,
                 roundTripPairInstantaneousWithSharesUpperBoundTolerance: 1e3,
                 roundTripPairInstantaneousWithSharesTolerance: 1e3,
+                roundTripPairMaturityWithSharesUpperBoundTolerance: 1e3,
                 roundTripPairMaturityWithSharesTolerance: 1e3,
                 // The verification tolerances.
                 verifyDepositTolerance: 2,

test/instances/chainlink/WstETHGnosisChain.t.sol

@@ -71,6 +71,7 @@ contract WstETHGnosisChainTest is ChainlinkHyperdriveInstanceTest {
                 roundTripShortMaturityWithBaseTolerance: 0,
                 roundTripPairInstantaneousWithBaseUpperBoundTolerance: 0,
                 roundTripPairInstantaneousWithBaseTolerance: 0,
+                roundTripPairMaturityWithBaseUpperBoundTolerance: 0,
                 roundTripPairMaturityWithBaseTolerance: 0,
                 // The share test tolerances.
                 closeLongWithSharesTolerance: 20,
@@ -87,6 +88,7 @@ contract WstETHGnosisChainTest is ChainlinkHyperdriveInstanceTest {
                 roundTripShortMaturityWithSharesTolerance: 1e3,
                 roundTripPairInstantaneousWithSharesUpperBoundTolerance: 1e3,
                 roundTripPairInstantaneousWithSharesTolerance: 1e3,
+                roundTripPairMaturityWithSharesUpperBoundTolerance: 1e3,
                 roundTripPairMaturityWithSharesTolerance: 1e3,
                 // The verification tolerances.
                 verifyDepositTolerance: 2,

test/instances/corn/Corn_LBTC_Hyperdrive.sol

@@ -71,6 +71,7 @@ contract Corn_LBTC_Hyperdrive is CornHyperdriveInstanceTest {
                 roundTripShortMaturityWithBaseTolerance: 1e3,
                 roundTripPairInstantaneousWithBaseUpperBoundTolerance: 100,
                 roundTripPairInstantaneousWithBaseTolerance: 1e3,
+                roundTripPairMaturityWithBaseUpperBoundTolerance: 100,
                 roundTripPairMaturityWithBaseTolerance: 1e3,
                 // NOTE: Share deposits and withdrawals are disabled, so these are
                 // 0.
@@ -90,6 +91,7 @@ contract Corn_LBTC_Hyperdrive is CornHyperdriveInstanceTest {
                 roundTripShortMaturityWithSharesTolerance: 0,
                 roundTripPairInstantaneousWithSharesUpperBoundTolerance: 0,
                 roundTripPairInstantaneousWithSharesTolerance: 0,
+                roundTripPairMaturityWithSharesUpperBoundTolerance: 0,
                 roundTripPairMaturityWithSharesTolerance: 0,
                 // The verification tolerances.
                 verifyDepositTolerance: 2,

test/instances/corn/Corn_sDAI_Hyperdrive.t.sol

@@ -71,6 +71,7 @@ contract Corn_sDAI_Hyperdrive is CornHyperdriveInstanceTest {
                 roundTripShortMaturityWithBaseTolerance: 1e3,
                 roundTripPairInstantaneousWithBaseUpperBoundTolerance: 1e3,
                 roundTripPairInstantaneousWithBaseTolerance: 1e3,
+                roundTripPairMaturityWithBaseUpperBoundTolerance: 100,
                 roundTripPairMaturityWithBaseTolerance: 1e3,
                 // NOTE: Share deposits and withdrawals are disabled, so these are
                 // 0.
@@ -90,6 +91,7 @@ contract Corn_sDAI_Hyperdrive is CornHyperdriveInstanceTest {
                 roundTripShortMaturityWithSharesTolerance: 0,
                 roundTripPairInstantaneousWithSharesUpperBoundTolerance: 0,
                 roundTripPairInstantaneousWithSharesTolerance: 0,
+                roundTripPairMaturityWithSharesUpperBoundTolerance: 0,
                 roundTripPairMaturityWithSharesTolerance: 0,
                 // The verification tolerances.
                 verifyDepositTolerance: 2,

test/instances/eeth/EETHHyperdrive.t.sol

@@ -91,6 +91,7 @@ contract EETHHyperdriveTest is InstanceTest {
                 roundTripShortMaturityWithBaseTolerance: 0,
                 roundTripPairInstantaneousWithBaseUpperBoundTolerance: 0,
                 roundTripPairInstantaneousWithBaseTolerance: 0,
+                roundTripPairMaturityWithBaseUpperBoundTolerance: 0,
                 roundTripPairMaturityWithBaseTolerance: 0,
                 // The share test tolerances.
                 closeLongWithSharesTolerance: 20,
@@ -107,6 +108,7 @@ contract EETHHyperdriveTest is InstanceTest {
                 roundTripShortMaturityWithSharesTolerance: 1e4,
                 roundTripPairInstantaneousWithSharesUpperBoundTolerance: 1e3,
                 roundTripPairInstantaneousWithSharesTolerance: 1e5,
+                roundTripPairMaturityWithSharesUpperBoundTolerance: 1e3,
                 roundTripPairMaturityWithSharesTolerance: 1e4,
                 // The verification tolerances.
                 verifyDepositTolerance: 2,

test/instances/erc4626/MoonwellETH.t.sol

@@ -67,6 +67,7 @@ contract MoonwellETHHyperdriveTest is MetaMorphoHyperdriveInstanceTest {
                 roundTripShortMaturityWithBaseTolerance: 1e5,
                 roundTripPairInstantaneousWithBaseUpperBoundTolerance: 1e3,
                 roundTripPairInstantaneousWithBaseTolerance: 1e5,
+                roundTripPairMaturityWithBaseUpperBoundTolerance: 1e3,
                 roundTripPairMaturityWithBaseTolerance: 1e5,
                 // The share test tolerances.
                 closeLongWithSharesTolerance: 20,
@@ -83,6 +84,7 @@ contract MoonwellETHHyperdriveTest is MetaMorphoHyperdriveInstanceTest {
                 roundTripShortMaturityWithSharesTolerance: 1e5,
                 roundTripPairInstantaneousWithSharesUpperBoundTolerance: 1e3,
                 roundTripPairInstantaneousWithSharesTolerance: 1e5,
+                roundTripPairMaturityWithSharesUpperBoundTolerance: 1e3,
                 roundTripPairMaturityWithSharesTolerance: 1e5,
                 // The verification tolerances.
                 verifyDepositTolerance: 2,

test/instances/erc4626/MoonwellEURC.t.sol

@@ -74,6 +74,7 @@ contract MoonwellEURCHyperdriveTest is MetaMorphoHyperdriveInstanceTest {
                 roundTripShortMaturityWithBaseTolerance: 1e5,
                 roundTripPairInstantaneousWithBaseUpperBoundTolerance: 1e3,
                 roundTripPairInstantaneousWithBaseTolerance: 1e5,
+                roundTripPairMaturityWithBaseUpperBoundTolerance: 1e3,
                 roundTripPairMaturityWithBaseTolerance: 1e5,
                 // The share test tolerances.
                 closeLongWithSharesTolerance: 20,
@@ -90,6 +91,7 @@ contract MoonwellEURCHyperdriveTest is MetaMorphoHyperdriveInstanceTest {
                 roundTripShortMaturityWithSharesTolerance: 1e5,
                 roundTripPairInstantaneousWithSharesUpperBoundTolerance: 1e3,
                 roundTripPairInstantaneousWithSharesTolerance: 1e5,
+                roundTripPairMaturityWithSharesUpperBoundTolerance: 1e3,
                 roundTripPairMaturityWithSharesTolerance: 1e5,
                 // The verification tolerances.
                 verifyDepositTolerance: 1e12,

test/instances/erc4626/MoonwellUSDC.t.sol

@@ -74,6 +74,7 @@ contract MoonwellUSDCHyperdriveTest is MetaMorphoHyperdriveInstanceTest {
                 roundTripShortMaturityWithBaseTolerance: 1e5,
                 roundTripPairInstantaneousWithBaseUpperBoundTolerance: 1e3,
                 roundTripPairInstantaneousWithBaseTolerance: 1e5,
+                roundTripPairMaturityWithBaseUpperBoundTolerance: 1e3,
                 roundTripPairMaturityWithBaseTolerance: 1e5,
                 // The share test tolerances.
                 closeLongWithSharesTolerance: 20,
@@ -95,6 +96,7 @@ contract MoonwellUSDCHyperdriveTest is MetaMorphoHyperdriveInstanceTest {
                 roundTripShortMaturityWithSharesTolerance: 1e5,
                 roundTripPairInstantaneousWithSharesUpperBoundTolerance: 1e3,
                 roundTripPairInstantaneousWithSharesTolerance: 1e5,
+                roundTripPairMaturityWithSharesUpperBoundTolerance: 1e3,
                 roundTripPairMaturityWithSharesTolerance: 1e5,
                 // The verification tolerances.
                 verifyDepositTolerance: 1e12,

test/instances/erc4626/SUSDe.t.sol

@@ -97,6 +97,7 @@ contract SUSDeHyperdriveTest is ERC4626HyperdriveInstanceTest {
                 roundTripShortMaturityWithBaseTolerance: 0,
                 roundTripPairInstantaneousWithBaseUpperBoundTolerance: 0,
                 roundTripPairInstantaneousWithBaseTolerance: 0,
+                roundTripPairMaturityWithBaseUpperBoundTolerance: 0,
                 roundTripPairMaturityWithBaseTolerance: 0,
                 // The share test tolerances.
                 closeLongWithSharesTolerance: 20,
@@ -115,6 +116,7 @@ contract SUSDeHyperdriveTest is ERC4626HyperdriveInstanceTest {
                 // FIXME: Why is this so high? Shouldn't this be lower than the
                 // other tolerances?
                 roundTripPairInstantaneousWithSharesTolerance: 1e8,
+                roundTripPairMaturityWithSharesUpperBoundTolerance: 100,
                 roundTripPairMaturityWithSharesTolerance: 1e5,
                 // The verification tolerances.
                 verifyDepositTolerance: 2,

test/instances/erc4626/ScrvUSD.t.sol

@@ -81,6 +81,7 @@ contract scrvUSDHyperdriveTest is ERC4626HyperdriveInstanceTest {
                 roundTripShortMaturityWithBaseTolerance: 1e5,
                 roundTripPairInstantaneousWithBaseUpperBoundTolerance: 1e3,
                 roundTripPairInstantaneousWithBaseTolerance: 1e5,
+                roundTripPairMaturityWithBaseUpperBoundTolerance: 1e3,
                 roundTripPairMaturityWithBaseTolerance: 1e5,
                 // The share test tolerances.
                 closeLongWithSharesTolerance: 20,
@@ -97,6 +98,7 @@ contract scrvUSDHyperdriveTest is ERC4626HyperdriveInstanceTest {
                 roundTripShortMaturityWithSharesTolerance: 1e5,
                 roundTripPairInstantaneousWithSharesUpperBoundTolerance: 1e3,
                 roundTripPairInstantaneousWithSharesTolerance: 1e5,
+                roundTripPairMaturityWithSharesUpperBoundTolerance: 1e3,
                 roundTripPairMaturityWithSharesTolerance: 1e5,
                 // The verification tolerances.
                 verifyDepositTolerance: 2,

test/instances/erc4626/SnARS.t.sol

@@ -92,6 +92,7 @@ contract SnARSHyperdriveTest is ERC4626HyperdriveInstanceTest {
                 roundTripShortMaturityWithBaseTolerance: 0,
                 roundTripPairInstantaneousWithBaseUpperBoundTolerance: 0,
                 roundTripPairInstantaneousWithBaseTolerance: 0,
+                roundTripPairMaturityWithBaseUpperBoundTolerance: 0,
                 roundTripPairMaturityWithBaseTolerance: 0,
                 // The share test tolerances.
                 closeLongWithSharesTolerance: 20,
@@ -108,6 +109,7 @@ contract SnARSHyperdriveTest is ERC4626HyperdriveInstanceTest {
                 roundTripShortMaturityWithSharesTolerance: 1e5,
                 roundTripPairInstantaneousWithSharesUpperBoundTolerance: 1e3,
                 roundTripPairInstantaneousWithSharesTolerance: 1e5,
+                roundTripPairMaturityWithSharesUpperBoundTolerance: 1e3,
                 roundTripPairMaturityWithSharesTolerance: 1e5,
                 // The verification tolerances.
                 verifyDepositTolerance: 2,

test/instances/erc4626/StUSD.t.sol

@@ -84,6 +84,7 @@ contract stUSDHyperdriveTest is ERC4626HyperdriveInstanceTest {
                 roundTripShortMaturityWithBaseTolerance: 1e5,
                 roundTripPairInstantaneousWithBaseUpperBoundTolerance: 1e3,
                 roundTripPairInstantaneousWithBaseTolerance: 1e5,
+                roundTripPairMaturityWithBaseUpperBoundTolerance: 1e3,
                 roundTripPairMaturityWithBaseTolerance: 1e5,
                 // The share test tolerances.
                 closeLongWithSharesTolerance: 20,
@@ -100,6 +101,7 @@ contract stUSDHyperdriveTest is ERC4626HyperdriveInstanceTest {
                 roundTripShortMaturityWithSharesTolerance: 1e5,
                 roundTripPairInstantaneousWithSharesUpperBoundTolerance: 1e3,
                 roundTripPairInstantaneousWithSharesTolerance: 1e5,
+                roundTripPairMaturityWithSharesUpperBoundTolerance: 1e3,
                 roundTripPairMaturityWithSharesTolerance: 1e5,
                 // The verification tolerances.
                 verifyDepositTolerance: 2,