Fix for L-21 issue (#2322)

* Fix for L-21 issue

* Update test

* Update test

markets/bfp-market/contracts/storage/Margin.sol

@@ -414,7 +414,11 @@ library Margin {
         uint256 liqFeeWithRewardInUsd = liqFeeInUsd +
             collateralValue.mulDecimal(marketConfig.liquidationRewardPercent);
 
-        return MathUtil.min(liqFeeWithRewardInUsd, globalConfig.maxKeeperFeeUsd);
+        uint256 boundedKeeperFeeUsd = MathUtil.min(
+            MathUtil.max(globalConfig.minKeeperFeeUsd, liqFeeWithRewardInUsd),
+            globalConfig.maxKeeperFeeUsd
+        );
+        return boundedKeeperFeeUsd;
     }
 
     /// @dev Returns whether an account in a specific market's margin can be liquidated.

markets/bfp-market/contracts/storage/Position.sol

@@ -455,7 +455,11 @@ library Position {
                 marketConfig.liquidationRewardPercent
             );
 
-        return MathUtil.min(flagFeeWithRewardInUsd, globalConfig.maxKeeperFeeUsd);
+        uint256 boundedKeeperFeeUsd = MathUtil.min(
+            MathUtil.max(globalConfig.minKeeperFeeUsd, flagFeeWithRewardInUsd),
+            globalConfig.maxKeeperFeeUsd
+        );
+        return boundedKeeperFeeUsd;
     }
 
     /**
@@ -559,7 +563,11 @@ library Position {
         );
         uint256 iterations = getLiquidationIterations(size, maxLiqCapacity);
 
-        return MathUtil.min(liquidationFeeInUsd * iterations, globalConfig.maxKeeperFeeUsd);
+        uint256 boundedKeeperFeeUsd = MathUtil.min(
+            MathUtil.max(globalConfig.minKeeperFeeUsd, liquidationFeeInUsd * iterations),
+            globalConfig.maxKeeperFeeUsd
+        );
+        return boundedKeeperFeeUsd;
     }
 
     /// @dev Returns the health data given the `marketId`, `config`, and position{...} details.

markets/bfp-market/test/integration/modules/LiquidationModule.partialLiquidation.test.ts

@@ -740,6 +740,7 @@ describe('LiquidationModule', () => {
             keeperProfitMarginUsd: bn(0), // ensure keeperProfitMarginPercent would be used instead
             keeperLiquidationGasUnits: 500_000,
             keeperFlagGasUnits: 500_000,
+            minKeeperFeeUsd: bn(0),
           });
 
         // Set baseFeePerGas to 1gwei

markets/bfp-market/test/integration/modules/PerpAccountModule.splitAccount.test.ts

@@ -168,17 +168,17 @@ describe('PerpAccountModule splitAccount', () => {
     const trader1 = traders()[1];
 
     await setMarketConfiguration(bs, {
-      minKeeperFeeUsd: bn(100),
+      minKeeperFeeUsd: bn(10),
       maxKeeperFeeUsd: bn(100),
     });
 
-    // We want to split such that the from account is left with:
+    // We want to split such that from account is left with:
     // - 0 size
     // - nonzero collateral
-    // - nonzer0 debt
-    // Where the debt is nearly as much as the the collateral
+    // - nonzero debt
+    // Where the debt is nearly as much as the collateral
 
-    // If we allow this, the account would left in a margin liquidatable state
+    // If we allow this, the account would be left in a margin liquidatable state
     // and the user can profit from the liquidation reward.
 
     // Even if this action were not profitable for the user, it
@@ -198,13 +198,13 @@ describe('PerpAccountModule splitAccount', () => {
         desiredMarginUsdDepositAmount: depositUsdAmount,
       })
     );
-    const iniitialOrder = await genOrder(bs, market, collateral, collateralDepositAmount, {
+    const initialOrder = await genOrder(bs, market, collateral, collateralDepositAmount, {
       desiredSize: wei(0.99).toBN(),
       desiredKeeperFeeBufferUsd: 10,
       desiredPriceImpactPercentage: 0.5,
     });
 
-    await commitAndSettle(bs, marketId, trader0, iniitialOrder);
+    await commitAndSettle(bs, marketId, trader0, initialOrder);
     // Pay debt from the order fee so we can withdraw a bit
     await payDebt(bs, marketId, trader0);