Merge pull request #222 from lista-dao/chore/increase-max-supply-queue-length

chore(moolah-vault): increase MAX_QUEUE_LENGTH from 100 to 1000

Author: qingyang-lista

src/moolah-vault/libraries/ConstantsLib.sol

@@ -12,7 +12,9 @@ library ConstantsLib {
   uint256 internal constant MIN_TIMELOCK = 1 days;
 
   /// @dev The maximum number of markets in the supply/withdraw queue.
-  uint256 internal constant MAX_QUEUE_LENGTH = 100;
+  /// @dev Capped at 600 so a full-length setSupplyQueue (one cold SSTORE plus a validation SLOAD
+  /// per element, ~24.9k gas) stays under the BEP-652 per-transaction gas limit (16,777,216).
+  uint256 internal constant MAX_QUEUE_LENGTH = 600;
 
   /// @dev The maximum fee the vault can have (50%).
   uint256 internal constant MAX_FEE = 0.5e18;

test/moolah-vault/MarketTest.sol

@@ -121,15 +121,38 @@ contract MarketTest is IntegrationTest {
   }
 
   function testAcceptCapMaxQueueLengthExceeded() public {
-    for (uint256 i = 3; i < ConstantsLib.MAX_QUEUE_LENGTH - 1; ++i) {
-      _setCap(allMarkets[i], CAP);
+    // Fill the withdraw queue up to MAX_QUEUE_LENGTH by enabling fresh markets.
+    // setUp already enabled some markets (idle + markets 0..2), so top up the remainder.
+    uint256 toFill = ConstantsLib.MAX_QUEUE_LENGTH - vault.withdrawQueueLength();
+    for (uint256 i; i < toFill; ++i) {
+      MarketParams memory mp = _createFreshMarket(i);
+      vm.prank(CURATOR_ADDR);
+      vault.setCap(mp, CAP);
     }
+    assertEq(vault.withdrawQueueLength(), ConstantsLib.MAX_QUEUE_LENGTH);
 
-    MarketParams memory marketParams = allMarkets[ConstantsLib.MAX_QUEUE_LENGTH];
-
-    vm.startPrank(CURATOR_ADDR);
+    // Enabling one more market pushes the withdraw queue past the max.
+    MarketParams memory extra = _createFreshMarket(toFill);
+    vm.prank(CURATOR_ADDR);
     vm.expectRevert(ErrorsLib.MaxQueueLengthExceeded.selector);
-    vault.setCap(marketParams, CAP);
+    vault.setCap(extra, CAP);
+  }
+
+  /// @dev Creates and enables a fresh Moolah market with a unique, low lltv that cannot
+  /// collide with the markets created in setUp (lltv = 0.8e18 / (i + 1)).
+  function _createFreshMarket(uint256 salt) internal returns (MarketParams memory mp) {
+    uint256 lltv = salt + 1;
+    mp = MarketParams({
+      loanToken: address(loanToken),
+      collateralToken: address(collateralToken),
+      oracle: address(oracle),
+      irm: address(irm),
+      lltv: lltv
+    });
+
+    vm.startPrank(MOOLAH_OWNER);
+    moolah.enableLltv(lltv);
+    moolah.createMarket(mp);
     vm.stopPrank();
   }
 

test/moolah-vault/helpers/BaseTest.sol

@@ -31,7 +31,10 @@ uint256 constant BLOCK_TIME = 1;
 uint256 constant MIN_TEST_ASSETS = 1e8;
 uint256 constant MAX_TEST_ASSETS = 1e28;
 uint184 constant CAP = type(uint128).max;
-uint256 constant NB_MARKETS = ConstantsLib.MAX_QUEUE_LENGTH + 1;
+// Number of markets created in setUp. Kept fixed (and independent of
+// ConstantsLib.MAX_QUEUE_LENGTH) so the shared setUp stays cheap; the max-queue-length
+// boundary is exercised by dedicated tests that create markets on demand.
+uint256 constant NB_MARKETS = 100;
 
 contract BaseTest is Test {
   using MathLib for uint256;