stack2deep

src/ConstantSum/ConstantSumSolver.sol

@@ -78,7 +78,7 @@ contract ConstantSumSolver {
             swapData = abi.encode(1, 0, amountIn, amountOut);
         }
 
-        (bool valid,,,,,,) = IStrategy(strategy).validateSwap(
+        (bool valid,,,,,,,) = IStrategy(strategy).validateSwap(
             address(this), poolId, pool, swapData
         );
         return (valid, amountOut, swapData);

src/CoveredCall/CoveredCall.sol

@@ -99,7 +99,7 @@ contract CoveredCall is PairStrategy {
         (reserves, totalLiquidity, params) =
             abi.decode(data, (uint256[], uint256, CoveredCallParams));
 
-        params.timestamp = block.timestamp;
+        params.lastTimestamp = block.timestamp;
 
         if (params.mean < MIN_WIDTH || params.mean > MAX_MEAN) {
             revert InvalidMean();

src/CoveredCall/CoveredCallMath.sol

@@ -31,10 +31,10 @@ function computeTradingFunction(
 }
 
 function computeTau(CoveredCallParams memory params) pure returns (uint256) {
-    if (params.timestamp >= params.maturity) {
+    if (params.lastTimestamp >= params.maturity) {
         return 0;
     } else {
-        return ONE * (params.maturity - params.timestamp) / YEAR;
+        return ONE * (params.maturity - params.lastTimestamp) / YEAR;
     }
 }
 

src/CoveredCall/CoveredCallSolver.sol

@@ -72,7 +72,7 @@ contract CoveredCallSolver {
         uint256 timestamp
     ) public view returns (CoveredCallParams memory) {
         CoveredCallParams memory params = getPoolParams(poolId);
-        params.timestamp = timestamp;
+        params.lastTimestamp = timestamp;
         return params;
     }
 
@@ -305,7 +305,7 @@ contract CoveredCallSolver {
         }
 
         uint256 poolId = poolId;
-        (bool valid,,,,,,) = IStrategy(strategy).validateSwap(
+        (bool valid,,,,,,,) = IStrategy(strategy).validateSwap(
             address(this), poolId, pool, swapData
         );
 

src/DFMM.sol

@@ -215,6 +215,7 @@ contract DFMM is IDFMM {
         uint256 amountIn;
         uint256 amountOut;
         uint256 deltaLiquidity;
+        bytes postSwapHookData;
     }
 
     /// @inheritdoc IDFMM
@@ -225,7 +226,6 @@ contract DFMM is IDFMM {
         bytes calldata callbackData
     ) external payable lock returns (address, address, uint256, uint256) {
         SwapState memory state;
-        bytes memory postSwapHookData;
 
         (
             state.valid,
@@ -235,7 +235,7 @@ contract DFMM is IDFMM {
             state.amountIn,
             state.amountOut,
             state.deltaLiquidity,
-            postSwapHookData
+            state.postSwapHookData
         ) = IStrategy(_pools[poolId].strategy).validateSwap(
             msg.sender, poolId, _pools[poolId], data
         );
@@ -267,7 +267,7 @@ contract DFMM is IDFMM {
         _transfer(state.tokenOut, recipient, state.amountOut);
 
         IStrategy(_pools[poolId].strategy).postSwapHook(
-            msg.sender, poolId, _pools[poolId], postSwapHookData
+            msg.sender, poolId, _pools[poolId], state.postSwapHookData
         );
 
         // If the callbackData is empty, do a regular `_transferFrom()` call, as in the other operations.

src/GeometricMean/GeometricMeanSolver.sol

@@ -214,7 +214,7 @@ contract GeometricMeanSolver {
         bytes memory swapData =
             abi.encode(tokenInIndex, tokenOutIndex, amountIn, state.amountOut);
 
-        (bool valid,,,,,,) = IStrategy(strategy).validateSwap(
+        (bool valid,,,,,,,) = IStrategy(strategy).validateSwap(
             address(this), poolId, pool, swapData
         );
 

src/LogNormal/LogNormalSolver.sol

@@ -316,7 +316,7 @@ contract LogNormalSolver {
         }
 
         uint256 poolId = poolId;
-        (bool valid,,,,,,) = IStrategy(strategy).validateSwap(
+        (bool valid,,,,,,,) = IStrategy(strategy).validateSwap(
             address(this), poolId, pool, swapData
         );
         return (

src/NTokenGeometricMean/NTokenGeometricMeanSolver.sol

@@ -120,7 +120,7 @@ contract NTokenGeometricMeanSolver {
         bytes memory swapData =
             abi.encode(tokenInIndex, tokenOutIndex, amountIn, state.amountOut);
 
-        (bool valid,,,,,,) = IStrategy(strategy).validateSwap(
+        (bool valid,,,,,,,) = IStrategy(strategy).validateSwap(
             address(this), poolId, pool, swapData
         );
 

src/PairStrategy.sol

@@ -162,7 +162,7 @@ abstract contract PairStrategy is IStrategy {
         uint256,
         Pool memory,
         bytes calldata
-    ) external onlyDFMM { }
+    ) external virtual onlyDFMM { }
 
     /// @inheritdoc IStrategy
     function getPoolParams(uint256 poolId)

test/CoveredCall/unit/Init.t.sol

@@ -25,7 +25,7 @@ contract CoveredCallInitTest is CoveredCallSetUp {
             width: 0.1 ether,
             maturity: YEAR * 2,
             swapFee: FEE,
-            timestamp: block.timestamp,
+            lastTimestamp: block.timestamp,
             controller: address(this)
         });
 

test/CoveredCall/unit/SetUp.sol

@@ -41,7 +41,7 @@ contract CoveredCallSetUp is SetUp {
             width: 0.1 ether,
             maturity: YEAR,
             swapFee: TEST_SWAP_FEE,
-            timestamp: block.timestamp,
+            lastTimestamp: block.timestamp,
             controller: address(this)
         });
 
@@ -76,7 +76,7 @@ contract CoveredCallSetUp is SetUp {
             width: 0.05 ether,
             maturity: YEAR * 2,
             swapFee: FEE,
-            timestamp: block.timestamp,
+            lastTimestamp: block.timestamp,
             controller: address(this)
         });
 
@@ -113,7 +113,7 @@ contract CoveredCallSetUp is SetUp {
             width: 0.00001 ether,
             maturity: YEAR,
             swapFee: 0,
-            timestamp: block.timestamp,
+            lastTimestamp: block.timestamp,
             controller: address(this)
         });
 
@@ -148,7 +148,7 @@ contract CoveredCallSetUp is SetUp {
             width: 0.1 ether,
             maturity: YEAR / 4,
             swapFee: TEST_SWAP_FEE,
-            timestamp: block.timestamp,
+            lastTimestamp: block.timestamp,
             controller: address(this)
         });
 
@@ -183,7 +183,7 @@ contract CoveredCallSetUp is SetUp {
             width: 0.25 ether,
             maturity: YEAR,
             swapFee: TEST_SWAP_FEE,
-            timestamp: block.timestamp,
+            lastTimestamp: block.timestamp,
             controller: address(this)
         });
 
@@ -214,7 +214,7 @@ contract CoveredCallSetUp is SetUp {
             width: 0,
             maturity: YEAR,
             swapFee: TEST_SWAP_FEE,
-            timestamp: block.timestamp,
+            lastTimestamp: block.timestamp,
             controller: address(this)
         });
 

test/SYCoveredCall/unit/Swap.t.sol

@@ -19,7 +19,7 @@ contract SYCoveredCallSwapTest is SYCoveredCallSetUp {
         bool swapXForY = true;
 
         (bool valid,,, bytes memory payload) =
-            solver.simulateSwap(POOL_ID, swapXForY, amountIn);
+            solver.simulateSwap(POOL_ID, swapXForY, amountIn, block.timestamp);
         assertEq(valid, true);
 
         (,, uint256 inputAmount, uint256 outputAmount) =
@@ -34,10 +34,7 @@ contract SYCoveredCallSwapTest is SYCoveredCallSetUp {
         );
     }
 
-    function test_SYCoveredCall_swap_SwapsXforY_WarpToMaturity()
-        public
-        init_no_fee
-    {
+    function test_SYCoveredCall_swap_SwapsXforY_WarpToMaturity() public init {
         vm.warp(370 days);
         uint256 preDfmmBalanceX = tokenX.balanceOf(address(dfmm));
         uint256 preDfmmBalanceY = tokenY.balanceOf(address(dfmm));
@@ -49,7 +46,7 @@ contract SYCoveredCallSwapTest is SYCoveredCallSetUp {
         bool swapXForY = true;
 
         (bool valid, uint256 amountOut,, bytes memory payload) =
-            solver.simulateSwap(POOL_ID, swapXForY, amountIn);
+            solver.simulateSwap(POOL_ID, swapXForY, amountIn, block.timestamp);
         assertEq(valid, true);
 
         console2.log("out", amountOut);
@@ -77,7 +74,7 @@ contract SYCoveredCallSwapTest is SYCoveredCallSetUp {
         bool swapXForY = false;
 
         (bool valid,,, bytes memory payload) =
-            solver.simulateSwap(POOL_ID, swapXForY, amountIn);
+            solver.simulateSwap(POOL_ID, swapXForY, amountIn, block.timestamp);
         assertEq(valid, true);
         (,, uint256 inputAmount, uint256 outputAmount) =
             dfmm.swap(POOL_ID, address(this), payload, "");
@@ -129,32 +126,4 @@ contract SYCoveredCallSwapTest is SYCoveredCallSetUp {
         vm.expectRevert();
         dfmm.swap(POOL_ID, address(this), payload, "");
     }
-
-    function test_SYCoveredCall_swap_ChargesCorrectFeesYIn() public deep {
-        uint256 amountIn = 1 ether;
-        bool swapXForY = false;
-
-        (bool valid,,, bytes memory payload) =
-            solver.simulateSwap(POOL_ID, swapXForY, amountIn);
-
-        (,, uint256 inputAmount, uint256 outputAmount) =
-            dfmm.swap(POOL_ID, address(this), payload, "");
-
-        console2.log(inputAmount);
-        console2.log(outputAmount);
-    }
-
-    function test_SYCoveredCall_swap_ChargesCorrectFeesXIn() public deep {
-        uint256 amountIn = 1 ether;
-        bool swapXForY = true;
-
-        (bool valid,,, bytes memory payload) =
-            solver.simulateSwap(POOL_ID, swapXForY, amountIn);
-
-        (,, uint256 inputAmount, uint256 outputAmount) =
-            dfmm.swap(POOL_ID, address(this), payload, "");
-
-        console2.log(inputAmount);
-        console2.log(outputAmount);
-    }
 }

test/utils/MockStrategy.sol

@@ -96,7 +96,8 @@ contract MockStrategy is IStrategy {
             uint256 tokenOutIndex,
             uint256 amountIn,
             uint256 amountOut,
-            uint256 deltaLiquidity
+            uint256 deltaLiquidity,
+            bytes memory params
         )
     {
         (
@@ -106,12 +107,21 @@ contract MockStrategy is IStrategy {
             tokenOutIndex,
             amountIn,
             amountOut,
-            deltaLiquidity
+            deltaLiquidity,
+            params
         ) = abi.decode(
-            data, (bool, int256, uint256, uint256, uint256, uint256, uint256)
+            data,
+            (bool, int256, uint256, uint256, uint256, uint256, uint256, bytes)
         );
     }
 
+    function postSwapHook(
+        address,
+        uint256,
+        Pool calldata,
+        bytes calldata
+    ) external pure override { }
+
     function update(
         address sender,
         uint256 poolId,