@pendle/core-v2 2.29.0 → 3.0.0-beta-1

package/contracts/offchain-helpers/router-static/base/ActionMarketCoreStatic.sol

@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: GPL-3.0-or-later
-pragma solidity 0.8.17;
+pragma solidity ^0.8.17;
 
 import "../../../interfaces/IPMarket.sol";
 import "../../../interfaces/IPRouterStatic.sol";
@@ -18,32 +18,19 @@ contract ActionMarketCoreStatic is StorageLayout, IPActionMarketCoreStatic {
 
     // ============ ADD REMOVE LIQUIDITY ============
 
-    function addLiquidityDualSyAndPtStatic(
-        address market,
-        uint256 netSyDesired,
-        uint256 netPtDesired
-    )
+    function addLiquidityDualSyAndPtStatic(address market, uint256 netSyDesired, uint256 netPtDesired)
         public
         view
-        returns (
-            uint256 netLpOut,
-            uint256 netSyUsed,
-            uint256 netPtUsed
-        )
+        returns (uint256 netLpOut, uint256 netSyUsed, uint256 netPtUsed)
     {
         MarketState memory state = _readState(market);
-        (, netLpOut, netSyUsed, netPtUsed) = state.addLiquidity(
-            netSyDesired,
-            netPtDesired,
-            block.timestamp
-        );
+        (, netLpOut, netSyUsed, netPtUsed) = state.addLiquidity(netSyDesired, netPtDesired, block.timestamp);
     }
 
     function addLiquidityDualTokenAndPtStatic(
         address market,
         address tokenIn,
         uint256 netTokenDesired,
-        address bulk,
         uint256 netPtDesired
     )
         public
@@ -57,13 +44,9 @@ contract ActionMarketCoreStatic is StorageLayout, IPActionMarketCoreStatic {
             uint256 netSyDesired
         )
     {
-        netSyDesired = _mintSyFromTokenStatic(market, tokenIn, netTokenDesired, bulk);
+        netSyDesired = _mintSyFromTokenStatic(market, tokenIn, netTokenDesired);
 
-        (netLpOut, netSyUsed, netPtUsed) = addLiquidityDualSyAndPtStatic(
-            market,
-            netSyDesired,
-            netPtDesired
-        );
+        (netLpOut, netSyUsed, netPtUsed) = addLiquidityDualSyAndPtStatic(market, netSyDesired, netPtDesired);
 
         if (netSyUsed != netSyDesired) revert Errors.RouterNotAllSyUsed(netSyDesired, netSyUsed);
 
@@ -86,25 +69,13 @@ contract ActionMarketCoreStatic is StorageLayout, IPActionMarketCoreStatic {
     {
         MarketState memory state = _readState(market);
 
-        (netPtToSwap, , ) = state.approxSwapPtToAddLiquidity(
-            _pyIndex(market),
-            netPtIn,
-            block.timestamp,
-            defaultApproxParams
-        );
+        (netPtToSwap,,) =
+            state.approxSwapPtToAddLiquidity(_pyIndex(market), netPtIn, 0, block.timestamp, defaultApproxParams);
 
         state = _readState(market); // re-read
 
-        (netSyFromSwap, netSyFee, ) = state.swapExactPtForSy(
-            _pyIndex(market),
-            netPtToSwap,
-            block.timestamp
-        );
-        (, netLpOut, , ) = state.addLiquidity(
-            netSyFromSwap,
-            netPtIn - netPtToSwap,
-            block.timestamp
-        );
+        (netSyFromSwap, netSyFee,) = state.swapExactPtForSy(_pyIndex(market), netPtToSwap, block.timestamp);
+        (, netLpOut,,) = state.addLiquidity(netSyFromSwap, netPtIn - netPtToSwap, block.timestamp);
 
         priceImpact = _calcPriceImpactPt(market, netPtToSwap.neg());
         exchangeRateAfter = _getTradeExchangeRateExcludeFee(market, state);
@@ -126,36 +97,19 @@ contract ActionMarketCoreStatic is StorageLayout, IPActionMarketCoreStatic {
     {
         MarketState memory state = _readState(market);
 
-        (netPtFromSwap, , ) = state.approxSwapSyToAddLiquidity(
-            _pyIndex(market),
-            netSyIn,
-            block.timestamp,
-            defaultApproxParams
-        );
+        (netPtFromSwap,,) =
+            state.approxSwapSyToAddLiquidity(_pyIndex(market), netSyIn, 0, block.timestamp, defaultApproxParams);
 
         state = _readState(market); // re-read
 
-        (netSyToSwap, netSyFee, ) = state.swapSyForExactPt(
-            _pyIndex(market),
-            netPtFromSwap,
-            block.timestamp
-        );
-        (, netLpOut, , ) = state.addLiquidity(
-            netSyIn - netSyToSwap,
-            netPtFromSwap,
-            block.timestamp
-        );
+        (netSyToSwap, netSyFee,) = state.swapSyForExactPt(_pyIndex(market), netPtFromSwap, block.timestamp);
+        (, netLpOut,,) = state.addLiquidity(netSyIn - netSyToSwap, netPtFromSwap, block.timestamp);
 
         priceImpact = _calcPriceImpactPt(market, netPtFromSwap.Int());
         exchangeRateAfter = _getTradeExchangeRateExcludeFee(market, state);
     }
 
-    function addLiquiditySingleTokenStatic(
-        address market,
-        address tokenIn,
-        uint256 netTokenIn,
-        address bulk
-    )
+    function addLiquiditySingleTokenStatic(address market, address tokenIn, uint256 netTokenIn)
         public
         view
         returns (
@@ -169,23 +123,12 @@ contract ActionMarketCoreStatic is StorageLayout, IPActionMarketCoreStatic {
             uint256 netSyToSwap
         )
     {
-        netSyMinted = _mintSyFromTokenStatic(market, tokenIn, netTokenIn, bulk);
-        (
-            netLpOut,
-            netPtFromSwap,
-            netSyFee,
-            priceImpact,
-            exchangeRateAfter,
-            netSyToSwap
-        ) = addLiquiditySingleSyStatic(market, netSyMinted);
-    }
-
-    function addLiquiditySingleTokenKeepYtStatic(
-        address market,
-        address tokenIn,
-        uint256 netTokenIn,
-        address bulk
-    )
+        netSyMinted = _mintSyFromTokenStatic(market, tokenIn, netTokenIn);
+        (netLpOut, netPtFromSwap, netSyFee, priceImpact, exchangeRateAfter, netSyToSwap) =
+            addLiquiditySingleSyStatic(market, netSyMinted);
+    }
+
+    function addLiquiditySingleTokenKeepYtStatic(address market, address tokenIn, uint256 netTokenIn)
         public
         view
         returns (
@@ -196,7 +139,7 @@ contract ActionMarketCoreStatic is StorageLayout, IPActionMarketCoreStatic {
             uint256 netSyToPY
         )
     {
-        netSyMinted = _mintSyFromTokenStatic(market, tokenIn, netTokenIn, bulk);
+        netSyMinted = _mintSyFromTokenStatic(market, tokenIn, netTokenIn);
         (netLpOut, netYtOut, netSyToPY) = addLiquiditySingleSyKeepYtStatic(market, netSyMinted);
     }
 
@@ -213,13 +156,11 @@ contract ActionMarketCoreStatic is StorageLayout, IPActionMarketCoreStatic {
         MarketState memory state = _readState(market);
         PYIndex index = _pyIndex(market);
 
-        netSyToPY =
-            (netSyIn * state.totalPt.Uint()) /
-            (state.totalPt.Uint() + index.syToAsset(state.totalSy.Uint()));
+        netSyToPY = (netSyIn * state.totalPt.Uint()) / (state.totalPt.Uint() + index.syToAsset(state.totalSy.Uint()));
 
         netYtOut = index.syToAsset(netSyToPY);
 
-        (, netLpOut, , ) = state.addLiquidity(netSyIn - netSyToPY, netYtOut, block.timestamp);
+        (, netLpOut,,) = state.addLiquidity(netSyIn - netSyToPY, netYtOut, block.timestamp);
     }
 
     function removeLiquidityDualSyAndPtStatic(address market, uint256 netLpToRemove)
@@ -231,22 +172,13 @@ contract ActionMarketCoreStatic is StorageLayout, IPActionMarketCoreStatic {
         (netSyOut, netPtOut) = state.removeLiquidity(netLpToRemove);
     }
 
-    function removeLiquidityDualTokenAndPtStatic(
-        address market,
-        uint256 netLpToRemove,
-        address tokenOut,
-        address bulk
-    )
+    function removeLiquidityDualTokenAndPtStatic(address market, uint256 netLpToRemove, address tokenOut)
         public
         view
-        returns (
-            uint256 netTokenOut,
-            uint256 netPtOut,
-            uint256 netSyToRedeem
-        )
+        returns (uint256 netTokenOut, uint256 netPtOut, uint256 netSyToRedeem)
     {
         (netSyToRedeem, netPtOut) = removeLiquidityDualSyAndPtStatic(market, netLpToRemove);
-        netTokenOut = _redeemSyToTokenStatic(market, tokenOut, netSyToRedeem, bulk);
+        netTokenOut = _redeemSyToTokenStatic(market, tokenOut, netSyToRedeem);
     }
 
     /// @dev netPtFromSwap is the parameter to approx
@@ -268,12 +200,8 @@ contract ActionMarketCoreStatic is StorageLayout, IPActionMarketCoreStatic {
         MarketState memory state = _readState(market);
 
         (netSyFromBurn, netPtFromBurn) = state.removeLiquidity(netLpToRemove);
-        (netPtFromSwap, netSyFee) = state.approxSwapExactSyForPt(
-            _pyIndex(market),
-            netSyFromBurn,
-            block.timestamp,
-            defaultApproxParams
-        );
+        (netPtFromSwap, netSyFee) =
+            state.approxSwapExactSyForPt(_pyIndex(market), netSyFromBurn, block.timestamp, defaultApproxParams);
 
         netPtOut = netPtFromBurn + netPtFromSwap;
         priceImpact = _calcPriceImpactPt(market, netPtFromSwap.Int());
@@ -307,11 +235,7 @@ contract ActionMarketCoreStatic is StorageLayout, IPActionMarketCoreStatic {
             priceImpact = 0;
             exchangeRateAfter = PMath.ONE;
         } else {
-            (netSyFromSwap, netSyFee, ) = state.swapExactPtForSy(
-                _pyIndex(market),
-                netPtFromBurn,
-                block.timestamp
-            );
+            (netSyFromSwap, netSyFee,) = state.swapExactPtForSy(_pyIndex(market), netPtFromBurn, block.timestamp);
 
             netSyOut = netSyFromBurn + netSyFromSwap;
             priceImpact = _calcPriceImpactPt(market, netPtFromBurn.neg());
@@ -319,12 +243,7 @@ contract ActionMarketCoreStatic is StorageLayout, IPActionMarketCoreStatic {
         }
     }
 
-    function removeLiquiditySingleTokenStatic(
-        address market,
-        uint256 netLpToRemove,
-        address tokenOut,
-        address bulk
-    )
+    function removeLiquiditySingleTokenStatic(address market, uint256 netLpToRemove, address tokenOut)
         public
         view
         returns (
@@ -339,17 +258,10 @@ contract ActionMarketCoreStatic is StorageLayout, IPActionMarketCoreStatic {
             uint256 netSyFromSwap
         )
     {
-        (
-            netSyOut,
-            netSyFee,
-            priceImpact,
-            exchangeRateAfter,
-            netSyFromBurn,
-            netPtFromBurn,
-            netSyFromSwap
-        ) = removeLiquiditySingleSyStatic(market, netLpToRemove);
+        (netSyOut, netSyFee, priceImpact, exchangeRateAfter, netSyFromBurn, netPtFromBurn, netSyFromSwap) =
+            removeLiquiditySingleSyStatic(market, netLpToRemove);
 
-        netTokenOut = _redeemSyToTokenStatic(market, tokenOut, netSyOut, bulk);
+        netTokenOut = _redeemSyToTokenStatic(market, tokenOut, netSyOut);
     }
 
     // ============ SWAP PT ============
@@ -357,19 +269,10 @@ contract ActionMarketCoreStatic is StorageLayout, IPActionMarketCoreStatic {
     function swapExactPtForSyStatic(address market, uint256 exactPtIn)
         public
         view
-        returns (
-            uint256 netSyOut,
-            uint256 netSyFee,
-            uint256 priceImpact,
-            uint256 exchangeRateAfter
-        )
+        returns (uint256 netSyOut, uint256 netSyFee, uint256 priceImpact, uint256 exchangeRateAfter)
     {
         MarketState memory state = _readState(market);
-        (netSyOut, netSyFee, ) = state.swapExactPtForSy(
-            _pyIndex(market),
-            exactPtIn,
-            block.timestamp
-        );
+        (netSyOut, netSyFee,) = state.swapExactPtForSy(_pyIndex(market), exactPtIn, block.timestamp);
         priceImpact = _calcPriceImpactPt(market, exactPtIn.neg());
         exchangeRateAfter = _getTradeExchangeRateExcludeFee(market, state);
     }
@@ -377,19 +280,10 @@ contract ActionMarketCoreStatic is StorageLayout, IPActionMarketCoreStatic {
     function swapSyForExactPtStatic(address market, uint256 exactPtOut)
         public
         view
-        returns (
-            uint256 netSyIn,
-            uint256 netSyFee,
-            uint256 priceImpact,
-            uint256 exchangeRateAfter
-        )
+        returns (uint256 netSyIn, uint256 netSyFee, uint256 priceImpact, uint256 exchangeRateAfter)
     {
         MarketState memory state = _readState(market);
-        (netSyIn, netSyFee, ) = state.swapSyForExactPt(
-            _pyIndex(market),
-            exactPtOut,
-            block.timestamp
-        );
+        (netSyIn, netSyFee,) = state.swapSyForExactPt(_pyIndex(market), exactPtOut, block.timestamp);
         priceImpact = _calcPriceImpactPt(market, exactPtOut.Int());
         exchangeRateAfter = _getTradeExchangeRateExcludeFee(market, state);
     }
@@ -398,20 +292,11 @@ contract ActionMarketCoreStatic is StorageLayout, IPActionMarketCoreStatic {
     function swapExactSyForPtStatic(address market, uint256 exactSyIn)
         public
         view
-        returns (
-            uint256 netPtOut,
-            uint256 netSyFee,
-            uint256 priceImpact,
-            uint256 exchangeRateAfter
-        )
+        returns (uint256 netPtOut, uint256 netSyFee, uint256 priceImpact, uint256 exchangeRateAfter)
     {
         MarketState memory state = _readState(market);
-        (netPtOut, netSyFee) = state.approxSwapExactSyForPt(
-            _pyIndex(market),
-            exactSyIn,
-            block.timestamp,
-            defaultApproxParams
-        );
+        (netPtOut, netSyFee) =
+            state.approxSwapExactSyForPt(_pyIndex(market), exactSyIn, block.timestamp, defaultApproxParams);
         priceImpact = _calcPriceImpactPt(market, netPtOut.Int());
 
         // Execute swap to calculate exchangeRateAfter
@@ -423,21 +308,12 @@ contract ActionMarketCoreStatic is StorageLayout, IPActionMarketCoreStatic {
     function swapPtForExactSyStatic(address market, uint256 exactSyOut)
         public
         view
-        returns (
-            uint256 netPtIn,
-            uint256 netSyFee,
-            uint256 priceImpact,
-            uint256 exchangeRateAfter
-        )
+        returns (uint256 netPtIn, uint256 netSyFee, uint256 priceImpact, uint256 exchangeRateAfter)
     {
         MarketState memory state = _readState(market);
 
-        (netPtIn, , netSyFee) = state.approxSwapPtForExactSy(
-            _pyIndex(market),
-            exactSyOut,
-            block.timestamp,
-            defaultApproxParams
-        );
+        (netPtIn,, netSyFee) =
+            state.approxSwapPtForExactSy(_pyIndex(market), exactSyOut, block.timestamp, defaultApproxParams);
         priceImpact = _calcPriceImpactPt(market, netPtIn.neg());
 
         // Execute swap to calculate exchangeRateAfter
@@ -445,12 +321,7 @@ contract ActionMarketCoreStatic is StorageLayout, IPActionMarketCoreStatic {
         exchangeRateAfter = _getTradeExchangeRateExcludeFee(market, state);
     }
 
-    function swapExactTokenForPtStatic(
-        address market,
-        address tokenIn,
-        uint256 amountTokenIn,
-        address bulk
-    )
+    function swapExactTokenForPtStatic(address market, address tokenIn, uint256 amountTokenIn)
         public
         view
         returns (
@@ -461,20 +332,12 @@ contract ActionMarketCoreStatic is StorageLayout, IPActionMarketCoreStatic {
             uint256 exchangeRateAfter
         )
     {
-        netSyMinted = _mintSyFromTokenStatic(market, tokenIn, amountTokenIn, bulk);
+        netSyMinted = _mintSyFromTokenStatic(market, tokenIn, amountTokenIn);
 
-        (netPtOut, netSyFee, priceImpact, exchangeRateAfter) = swapExactSyForPtStatic(
-            market,
-            netSyMinted
-        );
+        (netPtOut, netSyFee, priceImpact, exchangeRateAfter) = swapExactSyForPtStatic(market, netSyMinted);
     }
 
-    function swapExactPtForTokenStatic(
-        address market,
-        uint256 exactPtIn,
-        address tokenOut,
-        address bulk
-    )
+    function swapExactPtForTokenStatic(address market, uint256 exactPtIn, address tokenOut)
         public
         view
         returns (
@@ -485,12 +348,9 @@ contract ActionMarketCoreStatic is StorageLayout, IPActionMarketCoreStatic {
             uint256 exchangeRateAfter
         )
     {
-        (netSyToRedeem, netSyFee, priceImpact, exchangeRateAfter) = swapExactPtForSyStatic(
-            market,
-            exactPtIn
-        );
+        (netSyToRedeem, netSyFee, priceImpact, exchangeRateAfter) = swapExactPtForSyStatic(market, exactPtIn);
 
-        netTokenOut = _redeemSyToTokenStatic(market, tokenOut, netSyToRedeem, bulk);
+        netTokenOut = _redeemSyToTokenStatic(market, tokenOut, netSyToRedeem);
     }
 
     // ============ SWAP YT ============
@@ -513,11 +373,7 @@ contract ActionMarketCoreStatic is StorageLayout, IPActionMarketCoreStatic {
         MarketState memory state = _readState(market);
         PYIndex index = _pyIndex(market);
 
-        (netSyReceivedInt, netSyFee, ) = state.swapExactPtForSy(
-            _pyIndex(market),
-            exactYtOut,
-            block.timestamp
-        );
+        (netSyReceivedInt, netSyFee,) = state.swapExactPtForSy(_pyIndex(market), exactYtOut, block.timestamp);
 
         totalSyNeedInt = index.assetToSyUp(exactYtOut);
         netSyIn = totalSyNeedInt.subMax0(netSyReceivedInt);
@@ -529,22 +385,12 @@ contract ActionMarketCoreStatic is StorageLayout, IPActionMarketCoreStatic {
     function swapExactSyForYtStatic(address market, uint256 exactSyIn)
         public
         view
-        returns (
-            uint256 netYtOut,
-            uint256 netSyFee,
-            uint256 priceImpact,
-            uint256 exchangeRateAfter
-        )
+        returns (uint256 netYtOut, uint256 netSyFee, uint256 priceImpact, uint256 exchangeRateAfter)
     {
         MarketState memory state = _readState(market);
         PYIndex index = _pyIndex(market);
 
-        (netYtOut, netSyFee) = state.approxSwapExactSyForYt(
-            index,
-            exactSyIn,
-            block.timestamp,
-            defaultApproxParams
-        );
+        (netYtOut, netSyFee) = state.approxSwapExactSyForYt(index, exactSyIn, block.timestamp, defaultApproxParams);
 
         priceImpact = _calcPriceImpactYt(market, netYtOut.neg());
 
@@ -573,7 +419,7 @@ contract ActionMarketCoreStatic is StorageLayout, IPActionMarketCoreStatic {
 
         PYIndex index = _pyIndex(market);
 
-        (netSyOwedInt, netSyFee, ) = state.swapSyForExactPt(index, exactYtIn, block.timestamp);
+        (netSyOwedInt, netSyFee,) = state.swapSyForExactPt(index, exactYtIn, block.timestamp);
 
         netPYToRepaySyOwedInt = index.syToAssetUp(netSyOwedInt);
         netPYToRedeemSyOutInt = exactYtIn - netPYToRepaySyOwedInt;
@@ -582,12 +428,7 @@ contract ActionMarketCoreStatic is StorageLayout, IPActionMarketCoreStatic {
         exchangeRateAfter = _getTradeExchangeRateExcludeFee(market, state);
     }
 
-    function swapExactYtForTokenStatic(
-        address market,
-        uint256 exactYtIn,
-        address tokenOut,
-        address bulk
-    )
+    function swapExactYtForTokenStatic(address market, uint256 exactYtIn, address tokenOut)
         public
         view
         returns (
@@ -602,40 +443,23 @@ contract ActionMarketCoreStatic is StorageLayout, IPActionMarketCoreStatic {
             uint256 netPYToRedeemSyOutInt
         )
     {
-        (
-            netSyOut,
-            netSyFee,
-            priceImpact,
-            exchangeRateAfter,
-            netSyOwedInt,
-            netPYToRepaySyOwedInt,
-            netPYToRedeemSyOutInt
-        ) = swapExactYtForSyStatic(market, exactYtIn);
+        (netSyOut, netSyFee, priceImpact, exchangeRateAfter, netSyOwedInt, netPYToRepaySyOwedInt, netPYToRedeemSyOutInt)
+        = swapExactYtForSyStatic(market, exactYtIn);
 
-        netTokenOut = _redeemSyToTokenStatic(market, tokenOut, netSyOut, bulk);
+        netTokenOut = _redeemSyToTokenStatic(market, tokenOut, netSyOut);
     }
 
     /// @dev netYtIn is the parameter to approx
     function swapYtForExactSyStatic(address market, uint256 exactSyOut)
         public
         view
-        returns (
-            uint256 netYtIn,
-            uint256 netSyFee,
-            uint256 priceImpact,
-            uint256 exchangeRateAfter
-        )
+        returns (uint256 netYtIn, uint256 netSyFee, uint256 priceImpact, uint256 exchangeRateAfter)
     {
         MarketState memory state = _readState(market);
 
         PYIndex index = _pyIndex(market);
 
-        (netYtIn, , netSyFee) = state.approxSwapYtForExactSy(
-            index,
-            exactSyOut,
-            block.timestamp,
-            defaultApproxParams
-        );
+        (netYtIn,, netSyFee) = state.approxSwapYtForExactSy(index, exactSyOut, block.timestamp, defaultApproxParams);
         priceImpact = _calcPriceImpactYt(market, netYtIn.Int());
 
         // Execute swap to calculate exchangeRateAfter
@@ -643,12 +467,7 @@ contract ActionMarketCoreStatic is StorageLayout, IPActionMarketCoreStatic {
         exchangeRateAfter = _getTradeExchangeRateExcludeFee(market, state);
     }
 
-    function swapExactTokenForYtStatic(
-        address market,
-        address tokenIn,
-        uint256 amountTokenIn,
-        address bulk
-    )
+    function swapExactTokenForYtStatic(address market, address tokenIn, uint256 amountTokenIn)
         public
         view
         returns (
@@ -659,11 +478,8 @@ contract ActionMarketCoreStatic is StorageLayout, IPActionMarketCoreStatic {
             uint256 exchangeRateAfter
         )
     {
-        netSyMinted = _mintSyFromTokenStatic(market, tokenIn, amountTokenIn, bulk);
-        (netYtOut, netSyFee, priceImpact, exchangeRateAfter) = swapExactSyForYtStatic(
-            market,
-            netSyMinted
-        );
+        netSyMinted = _mintSyFromTokenStatic(market, tokenIn, amountTokenIn);
+        (netYtOut, netSyFee, priceImpact, exchangeRateAfter) = swapExactSyForYtStatic(market, netSyMinted);
     }
 
     // totalPtToSwap is the param to approx
@@ -681,12 +497,8 @@ contract ActionMarketCoreStatic is StorageLayout, IPActionMarketCoreStatic {
         MarketState memory state = _readState(market);
         PYIndex index = _pyIndex(market);
 
-        (netYtOut, totalPtToSwap, netSyFee) = state.approxSwapExactPtForYt(
-            index,
-            exactPtIn,
-            block.timestamp,
-            defaultApproxParams
-        );
+        (netYtOut, totalPtToSwap, netSyFee) =
+            state.approxSwapExactPtForYt(index, exactPtIn, block.timestamp, defaultApproxParams);
         priceImpact = _calcPriceImpactPY(market, totalPtToSwap.neg());
 
         // Execute swap to calculate exchangeRateAfter
@@ -709,12 +521,8 @@ contract ActionMarketCoreStatic is StorageLayout, IPActionMarketCoreStatic {
         MarketState memory state = _readState(market);
         PYIndex index = _pyIndex(market);
 
-        (netPtOut, totalPtSwapped, netSyFee) = state.approxSwapExactYtForPt(
-            index,
-            exactYtIn,
-            block.timestamp,
-            defaultApproxParams
-        );
+        (netPtOut, totalPtSwapped, netSyFee) =
+            state.approxSwapExactYtForPt(index, exactYtIn, block.timestamp, defaultApproxParams);
 
         priceImpact = _calcPriceImpactPY(market, totalPtSwapped.Int());
 
@@ -735,34 +543,20 @@ contract ActionMarketCoreStatic is StorageLayout, IPActionMarketCoreStatic {
         return IPRouterStatic(address(this)).calcPriceImpactYt(market, netPtOut);
     }
 
-    function _mintSyFromTokenStatic(
-        address market,
-        address tokenIn,
-        uint256 netTokenToDeposit,
-        address bulk
-    ) internal view returns (uint256) {
-        return
-            IPRouterStatic(address(this)).mintSyFromTokenStatic(
-                _getSyMarket(market),
-                tokenIn,
-                netTokenToDeposit,
-                bulk
-            );
-    }
-
-    function _redeemSyToTokenStatic(
-        address market,
-        address tokenOut,
-        uint256 netSyToRedeem,
-        address bulk
-    ) internal view returns (uint256) {
-        return
-            IPRouterStatic(address(this)).redeemSyToTokenStatic(
-                _getSyMarket(market),
-                tokenOut,
-                netSyToRedeem,
-                bulk
-            );
+    function _mintSyFromTokenStatic(address market, address tokenIn, uint256 netTokenToDeposit)
+        internal
+        view
+        returns (uint256)
+    {
+        return IPRouterStatic(address(this)).mintSyFromTokenStatic(_getSyMarket(market), tokenIn, netTokenToDeposit);
+    }
+
+    function _redeemSyToTokenStatic(address market, address tokenOut, uint256 netSyToRedeem)
+        internal
+        view
+        returns (uint256)
+    {
+        return IPRouterStatic(address(this)).redeemSyToTokenStatic(_getSyMarket(market), tokenOut, netSyToRedeem);
     }
 
     function _getTradeExchangeRateExcludeFee(address market, MarketState memory state)
@@ -782,7 +576,7 @@ contract ActionMarketCoreStatic is StorageLayout, IPActionMarketCoreStatic {
     }
 
     function _getSyMarket(address market) internal view returns (address) {
-        (IStandardizedYield SY, , ) = IPMarket(market).readTokens();
+        (IStandardizedYield SY,,) = IPMarket(market).readTokens();
         return address(SY);
     }
 }