fix: kaden fixes

whetstoneresearch · Oct 18, 2024 · 4263f69 · 4263f69
1 parent 7f7178d
commit 4263f69
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 3 deletions.
diff --git a/src/Doppler.sol b/src/Doppler.sol
@@ -126,6 +126,9 @@ contract Doppler is BaseHook {
         /* Num price discovery slug checks */
         if (_numPDSlugs == 0) revert InvalidNumPDSlugs();
         if (_numPDSlugs > MAX_PRICE_DISCOVERY_SLUGS) revert InvalidNumPDSlugs();
+
+        // These can both be zero
+        if (_minimumProceeds > _maximumProceeds) revert InvalidProceedLimits();
 
         numTokensToSell = _numTokensToSell;
         minimumProceeds = _minimumProceeds;
@@ -926,6 +929,7 @@ error InvalidTickSpacing();
 error InvalidEpochLength();
 error InvalidTickDelta();
 error InvalidSwap();
+error InvalidProceedLimits();
 error InvalidNumPDSlugs();
 error InvalidSwapAfterMaturitySufficientProceeds();
 error InvalidSwapAfterMaturityInsufficientProceeds();

diff --git a/test/unit/Constructor.t.sol b/test/unit/Constructor.t.sol
@@ -10,7 +10,8 @@ import {
     InvalidEpochLength,
     InvalidTimeRange,
     InvalidTickSpacing,
-    InvalidNumPDSlugs
+    InvalidNumPDSlugs,
+    InvalidProceedLimits
 } from "src/Doppler.sol";
 import {PoolId, PoolIdLibrary} from "v4-periphery/lib/v4-core/src/types/PoolId.sol";
 import {PoolKey} from "v4-periphery/lib/v4-core/src/types/PoolKey.sol";
@@ -191,6 +192,14 @@ contract ConstructorTest is BaseTest {
         deployDoppler(InvalidNumPDSlugs.selector, config, 0, -172_800, true);
     }
 
+    function testConstructor_RevertsInvalidProceedLimits_WhenMinimumProceedsGreaterThanMaximumProceeds() public {
+        DopplerConfig memory config = DEFAULT_DOPPLER_CONFIG;
+        config.minimumProceeds = 100;
+        config.maximumProceeds = 0;
+
+        deployDoppler(InvalidProceedLimits.selector, config, 0, -172_800, true);
+    }
+
     function testConstructor_Succeeds_WithValidParameters() public {
         bool _isToken0 = true;
         int24 _startTick = 0;

diff --git a/test/unit/EarlyExit.t.sol b/test/unit/EarlyExit.t.sol
@@ -19,7 +19,7 @@ import "forge-std/console.sol";
 
 using PoolIdLibrary for PoolKey;
 
-contract ConstructorTest is BaseTest {
+contract EarlyExitTest is BaseTest {
     function setUp() public override {
         manager = new PoolManager();
         _deployTokens();
@@ -39,7 +39,7 @@ contract ConstructorTest is BaseTest {
         key = PoolKey({
             currency0: Currency.wrap(address(token0)),
             currency1: Currency.wrap(address(token1)),
-            fee: config.fee,
+            fee: 0,
             tickSpacing: config.tickSpacing,
             hooks: IHooks(address(hook))
         });