@pendle/core-v2 0.16.3-testnet → 0.16.4-testnet

package/contracts/interfaces/IPActionMintRedeem.sol

@@ -138,7 +138,7 @@ interface IPActionMintRedeem {
         // key-value pair
         address[] syAddrs;
         address[] tokenRedeemSys;
-        bool[] useBulks;
+        address[] bulks;
         //
     }
 

package/contracts/offchain-helpers/RouterStatic.sol

@@ -288,7 +288,7 @@ contract RouterStatic is Initializable, BoringOwnableUpgradeable, UUPSUpgradeabl
         address market,
         address tokenIn,
         uint256 netTokenDesired,
-        bool useBulk,
+        address bulk,
         uint256 netPtDesired
     )
         external
@@ -303,7 +303,7 @@ contract RouterStatic is Initializable, BoringOwnableUpgradeable, UUPSUpgradeabl
             getSyMarket(market),
             tokenIn,
             netTokenDesired,
-            useBulk
+            bulk
         );
 
         uint256 netSyUsed;
@@ -348,7 +348,7 @@ contract RouterStatic is Initializable, BoringOwnableUpgradeable, UUPSUpgradeabl
         address market,
         address baseToken,
         uint256 netBaseTokenIn,
-        bool useBulk
+        address bulk
     )
         external
         returns (
@@ -362,7 +362,7 @@ contract RouterStatic is Initializable, BoringOwnableUpgradeable, UUPSUpgradeabl
             getSyMarket(market),
             baseToken,
             netBaseTokenIn,
-            useBulk
+            bulk
         );
 
         return
@@ -381,7 +381,7 @@ contract RouterStatic is Initializable, BoringOwnableUpgradeable, UUPSUpgradeabl
         address market,
         uint256 netLpToRemove,
         address tokenOut,
-        bool useBulk
+        address bulk
     ) external view returns (uint256 netTokenOut, uint256 netPtOut) {
         uint256 netSyOut;
 
@@ -390,7 +390,7 @@ contract RouterStatic is Initializable, BoringOwnableUpgradeable, UUPSUpgradeabl
             netLpToRemove
         );
 
-        netTokenOut = previewRedeemStatic(getSyMarket(market), tokenOut, netSyOut, useBulk);
+        netTokenOut = previewRedeemStatic(getSyMarket(market), tokenOut, netSyOut, bulk);
     }
 
     function removeLiquiditySinglePtStatic(address market, uint256 netLpToRemove)
@@ -425,7 +425,7 @@ contract RouterStatic is Initializable, BoringOwnableUpgradeable, UUPSUpgradeabl
         address market,
         uint256 netLpToRemove,
         address baseToken,
-        bool useBulk
+        address bulk
     )
         external
         returns (
@@ -441,7 +441,7 @@ contract RouterStatic is Initializable, BoringOwnableUpgradeable, UUPSUpgradeabl
             netLpToRemove
         );
 
-        netBaseTokenOut = previewRedeemStatic(getSyMarket(market), baseToken, netSyOut, useBulk);
+        netBaseTokenOut = previewRedeemStatic(getSyMarket(market), baseToken, netSyOut, bulk);
     }
 
     function swapExactPtForSyStatic(address market, uint256 exactPtIn)
@@ -494,7 +494,7 @@ contract RouterStatic is Initializable, BoringOwnableUpgradeable, UUPSUpgradeabl
         address market,
         address baseToken,
         uint256 amountBaseToken,
-        bool useBulk
+        address bulk
     )
         external
         returns (
@@ -507,7 +507,7 @@ contract RouterStatic is Initializable, BoringOwnableUpgradeable, UUPSUpgradeabl
             getSyMarket(market),
             baseToken,
             amountBaseToken,
-            useBulk
+            bulk
         );
         return MarketMathStatic.swapExactSyForPtStatic(market, netSyIn, getDefaultApproxParams());
     }
@@ -516,7 +516,7 @@ contract RouterStatic is Initializable, BoringOwnableUpgradeable, UUPSUpgradeabl
         address market,
         uint256 exactPtIn,
         address baseToken,
-        bool useBulk
+        address bulk
     )
         external
         returns (
@@ -531,7 +531,7 @@ contract RouterStatic is Initializable, BoringOwnableUpgradeable, UUPSUpgradeabl
             exactPtIn
         );
 
-        netBaseTokenOut = previewRedeemStatic(getSyMarket(market), baseToken, netSyOut, useBulk);
+        netBaseTokenOut = previewRedeemStatic(getSyMarket(market), baseToken, netSyOut, bulk);
     }
 
     function swapSyForExactYtStatic(address market, uint256 exactYtOut)
@@ -584,7 +584,7 @@ contract RouterStatic is Initializable, BoringOwnableUpgradeable, UUPSUpgradeabl
         address market,
         uint256 exactYtIn,
         address baseToken,
-        bool useBulk
+        address bulk
     )
         external
         returns (
@@ -599,14 +599,14 @@ contract RouterStatic is Initializable, BoringOwnableUpgradeable, UUPSUpgradeabl
             exactYtIn
         );
 
-        netBaseTokenOut = previewRedeemStatic(getSyMarket(market), baseToken, netSyOut, useBulk);
+        netBaseTokenOut = previewRedeemStatic(getSyMarket(market), baseToken, netSyOut, bulk);
     }
 
     function swapExactBaseTokenForYtStatic(
         address market,
         address baseToken,
         uint256 amountBaseToken,
-        bool useBulk
+        address bulk
     )
         external
         returns (
@@ -619,7 +619,7 @@ contract RouterStatic is Initializable, BoringOwnableUpgradeable, UUPSUpgradeabl
             getSyMarket(market),
             baseToken,
             amountBaseToken,
-            useBulk
+            bulk
         );
 
         return MarketMathStatic.swapExactSyForYtStatic(market, netSyIn, getDefaultApproxParams());
@@ -708,10 +708,10 @@ contract RouterStatic is Initializable, BoringOwnableUpgradeable, UUPSUpgradeabl
         address YT,
         address baseToken,
         uint256 amountBaseToken,
-        bool useBulk
+        address bulk
     ) external returns (uint256 amountPY) {
         IStandardizedYield SY = IStandardizedYield(IPYieldToken(YT).SY());
-        uint256 amountSy = previewDepositStatic(SY, baseToken, amountBaseToken, useBulk);
+        uint256 amountSy = previewDepositStatic(SY, baseToken, amountBaseToken, bulk);
         return mintPYFromSyStatic(YT, amountSy);
     }
 
@@ -719,21 +719,20 @@ contract RouterStatic is Initializable, BoringOwnableUpgradeable, UUPSUpgradeabl
         address YT,
         uint256 amountPYToRedeem,
         address baseToken,
-        bool useBulk
+        address bulk
     ) external returns (uint256 amountBaseToken) {
         IStandardizedYield SY = IStandardizedYield(IPYieldToken(YT).SY());
         uint256 amountSy = redeemPYToSyStatic(YT, amountPYToRedeem);
-        return previewRedeemStatic(SY, baseToken, amountSy, useBulk);
+        return previewRedeemStatic(SY, baseToken, amountSy, bulk);
     }
 
     function previewDepositStatic(
         IStandardizedYield SY,
         address baseToken,
         uint256 amountToken,
-        bool useBulk
+        address bulk
     ) public view returns (uint256 amountSy) {
-        if (useBulk) {
-            address bulk = bulkFactory.get(baseToken, address(SY));
+        if (bulk != address(0)) {
             return IPBulkSeller(bulk).calcSwapExactTokenForSy(amountToken);
         } else {
             return SY.previewDeposit(baseToken, amountToken);
@@ -744,10 +743,9 @@ contract RouterStatic is Initializable, BoringOwnableUpgradeable, UUPSUpgradeabl
         IStandardizedYield SY,
         address baseToken,
         uint256 amountSy,
-        bool useBulk
+        address bulk
     ) public view returns (uint256 amountBaseToken) {
-        if (useBulk) {
-            address bulk = bulkFactory.get(baseToken, address(SY));
+        if (bulk != address(0)) {
             return IPBulkSeller(bulk).calcSwapExactSyForToken(amountSy);
         } else {
             return SY.previewRedeem(baseToken, amountSy);
@@ -799,7 +797,7 @@ contract RouterStatic is Initializable, BoringOwnableUpgradeable, UUPSUpgradeabl
     function getAmountTokenToMintSy(
         IStandardizedYield SY,
         address tokenIn,
-        bool useBulk,
+        address bulk,
         uint256 netSyOut
     ) public view returns (uint256 netTokenIn) {
         uint256 pivotAmount = netSyOut;
@@ -807,7 +805,7 @@ contract RouterStatic is Initializable, BoringOwnableUpgradeable, UUPSUpgradeabl
         uint256 low = pivotAmount;
         {
             while (true) {
-                uint256 lowSyOut = previewDepositStatic(SY, tokenIn, low, useBulk);
+                uint256 lowSyOut = previewDepositStatic(SY, tokenIn, low, bulk);
                 if (lowSyOut >= netSyOut) low /= 10;
                 else break;
             }
@@ -816,7 +814,7 @@ contract RouterStatic is Initializable, BoringOwnableUpgradeable, UUPSUpgradeabl
         uint256 high = pivotAmount;
         {
             while (true) {
-                uint256 highSyOut = previewDepositStatic(SY, tokenIn, high, useBulk);
+                uint256 highSyOut = previewDepositStatic(SY, tokenIn, high, bulk);
                 if (highSyOut < netSyOut) high *= 10;
                 else break;
             }
@@ -824,7 +822,7 @@ contract RouterStatic is Initializable, BoringOwnableUpgradeable, UUPSUpgradeabl
 
         while (low <= high) {
             uint256 mid = (low + high) / 2;
-            uint256 syOut = previewDepositStatic(SY, tokenIn, mid, useBulk);
+            uint256 syOut = previewDepositStatic(SY, tokenIn, mid, bulk);
 
             if (syOut >= netSyOut) {
                 netTokenIn = mid;
@@ -841,4 +839,21 @@ contract RouterStatic is Initializable, BoringOwnableUpgradeable, UUPSUpgradeabl
         (IStandardizedYield SY, , ) = IPMarket(market).readTokens();
         return SY;
     }
+
+    function getBulkSellerInfo(address token, address SY)
+        external
+        view
+        returns (
+            address bulk,
+            uint256 totalToken,
+            uint256 totalSy
+        )
+    {
+        bulk = IPBulkSellerFactory(bulkFactory).get(token, SY);
+        if (bulk != address(0)) {
+            BulkSellerState memory state = IPBulkSeller(bulk).readState();
+            totalToken = state.totalToken;
+            totalSy = state.totalSy;
+        }
+    }
 }

package/contracts/router/ActionAddRemoveLiq.sol

@@ -12,13 +12,12 @@ contract ActionAddRemoveLiq is IPActionAddRemoveLiq, ActionBaseMintRedeem {
     using MarketMathCore for MarketState;
     using MarketApproxPtInLib for MarketState;
     using MarketApproxPtOutLib for MarketState;
-    using SafeERC20 for IERC20;
     using PYIndexLib for IPYieldToken;
     using BulkSellerMathCore for BulkSellerState;
 
     /// @dev since this contract will be proxied, it must not contains non-immutable variables
-    constructor(address _kyberScalingLib, address _bulkSellerDirectory)
-        ActionBaseMintRedeem(_kyberScalingLib, _bulkSellerDirectory) //solhint-disable-next-line no-empty-blocks
+    constructor(address _kyberScalingLib)
+        ActionBaseMintRedeem(_kyberScalingLib) //solhint-disable-next-line no-empty-blocks
     {}
 
     function addLiquidityDualSyAndPt(
@@ -49,8 +48,8 @@ contract ActionAddRemoveLiq is IPActionAddRemoveLiq, ActionBaseMintRedeem {
         if (netLpOut < minLpOut) revert Errors.RouterInsufficientLpOut(netLpOut, minLpOut);
 
         // execute the addLiquidity
-        IERC20(SY).safeTransferFrom(msg.sender, market, netSyUsed);
-        IERC20(PT).safeTransferFrom(msg.sender, market, netPtUsed);
+        _transferFrom(IERC20(SY), msg.sender, market, netSyUsed);
+        _transferFrom(IERC20(PT), msg.sender, market, netPtUsed);
 
         (netLpOut, , ) = IPMarket(market).mint(receiver, netSyUsed, netPtUsed);
 
@@ -100,7 +99,7 @@ contract ActionAddRemoveLiq is IPActionAddRemoveLiq, ActionBaseMintRedeem {
         }
 
         // SY has been minted and transferred to the market
-        IERC20(PT).safeTransferFrom(msg.sender, market, netPtUsed);
+        _transferFrom(IERC20(PT), msg.sender, market, netPtUsed);
         (netLpOut, , ) = IPMarket(market).mint(receiver, netSyUsed, netPtUsed);
 
         // fail-safe
@@ -137,7 +136,7 @@ contract ActionAddRemoveLiq is IPActionAddRemoveLiq, ActionBaseMintRedeem {
         );
 
         // execute the swap
-        IERC20(PT).safeTransferFrom(msg.sender, market, netPtIn);
+        _transferFrom(IERC20(PT), msg.sender, market, netPtIn);
 
         uint256 netSyReceived;
         (netSyReceived, netSyFee) = IPMarket(market).swapExactPtForSy(
@@ -164,7 +163,7 @@ contract ActionAddRemoveLiq is IPActionAddRemoveLiq, ActionBaseMintRedeem {
         (IStandardizedYield SY, , IPYieldToken YT) = IPMarket(market).readTokens();
 
         // transfer SY to market
-        IERC20(SY).safeTransferFrom(msg.sender, market, netSyIn);
+        _transferFrom(IERC20(SY), msg.sender, market, netSyIn);
 
         // mint LP
         (netLpOut, netSyFee) = _addLiquiditySingleSy(
@@ -218,7 +217,7 @@ contract ActionAddRemoveLiq is IPActionAddRemoveLiq, ActionBaseMintRedeem {
         uint256 minSyOut,
         uint256 minPtOut
     ) external returns (uint256 netSyOut, uint256 netPtOut) {
-        IERC20(market).safeTransferFrom(msg.sender, market, netLpToRemove);
+        _transferFrom(IERC20(market), msg.sender, market, netLpToRemove);
 
         (netSyOut, netPtOut) = IPMarket(market).burn(receiver, receiver, netLpToRemove);
 
@@ -245,7 +244,7 @@ contract ActionAddRemoveLiq is IPActionAddRemoveLiq, ActionBaseMintRedeem {
         (IStandardizedYield SY, , ) = IPMarket(market).readTokens();
 
         // burn LP, SY sent to either SY or bulk, PT sent to receiver
-        IERC20(market).safeTransferFrom(msg.sender, market, netLpToRemove);
+        _transferFrom(IERC20(market), msg.sender, market, netLpToRemove);
 
         uint256 netSyOut;
         (netSyOut, netPtOut) = IPMarket(market).burn(
@@ -293,7 +292,7 @@ contract ActionAddRemoveLiq is IPActionAddRemoveLiq, ActionBaseMintRedeem {
             revert Errors.RouterInsufficientPtOut(ptFromBurn + ptFromSwap, minPtOut);
 
         // execute the burn & the swap
-        IERC20(market).safeTransferFrom(msg.sender, market, netLpToRemove);
+        _transferFrom(IERC20(market), msg.sender, market, netLpToRemove);
 
         (, ptFromBurn) = IPMarket(market).burn(market, receiver, netLpToRemove);
         (, netSyFee) = IPMarket(market).swapSyForExactPt(receiver, ptFromSwap, EMPTY_BYTES);
@@ -313,7 +312,7 @@ contract ActionAddRemoveLiq is IPActionAddRemoveLiq, ActionBaseMintRedeem {
         uint256 minSyOut
     ) external returns (uint256 netSyOut, uint256 netSyFee) {
         // transfer LP to market
-        IERC20(market).safeTransferFrom(msg.sender, market, netLpToRemove);
+        _transferFrom(IERC20(market), msg.sender, market, netLpToRemove);
 
         // burn LP, SY sent to receiver
         (netSyOut, netSyFee) = _removeLiquiditySingleSy(receiver, market, netLpToRemove, minSyOut);
@@ -330,7 +329,7 @@ contract ActionAddRemoveLiq is IPActionAddRemoveLiq, ActionBaseMintRedeem {
         (IStandardizedYield SY, , ) = IPMarket(market).readTokens();
 
         // transfer LP to market, burn LP, SY sent to either SY or bulk
-        IERC20(market).safeTransferFrom(msg.sender, market, netLpToRemove);
+        _transferFrom(IERC20(market), msg.sender, market, netLpToRemove);
 
         uint256 netSyReceived;
 

package/contracts/router/ActionCallback.sol

@@ -12,13 +12,9 @@ import "./base/CallbackHelper.sol";
 
 import "@openzeppelin/contracts/token/ERC20/utils/SafeERC20.sol";
 
-contract ActionCallback is IPMarketSwapCallback, CallbackHelper {
+contract ActionCallback is IPMarketSwapCallback, CallbackHelper, TokenHelper {
     using Math for int256;
     using Math for uint256;
-    using SafeERC20 for IStandardizedYield;
-    using SafeERC20 for IPYieldToken;
-    using SafeERC20 for IPPrincipalToken;
-    using SafeERC20 for IERC20;
     using PYIndexLib for PYIndex;
     using PYIndexLib for IPYieldToken;
 
@@ -114,7 +110,7 @@ contract ActionCallback is IPMarketSwapCallback, CallbackHelper {
         /// mint & transfer
         /// ------------------------------------------------------------
         if (netSyToPull > 0) {
-            SY.safeTransferFrom(vars.payer, address(YT), netSyToPull);
+            _transferFrom(IERC20(SY), vars.payer, address(YT), netSyToPull);
         }
 
         uint256 netPyOut = YT.mintPY(market, vars.receiver);
@@ -175,7 +171,7 @@ contract ActionCallback is IPMarketSwapCallback, CallbackHelper {
 
         uint256 netSyOwed = syToAccount.abs();
 
-        PT.safeTransfer(address(YT), exactYtIn);
+        _transferOut(address(PT), address(YT), exactYtIn);
         uint256 netSyToMarket = YT.redeemPY(market);
 
         if (netSyToMarket < netSyOwed)
@@ -184,6 +180,6 @@ contract ActionCallback is IPMarketSwapCallback, CallbackHelper {
         uint256 netPtOut = ptToAccount.Uint() - exactYtIn;
         if (netPtOut < minPtOut) revert Errors.RouterInsufficientPtOut(netPtOut, minPtOut);
 
-        PT.safeTransfer(receiver, netPtOut);
+        _transferOut(address(PT), receiver, netPtOut);
     }
 }

package/contracts/router/ActionMintRedeem.sol

@@ -10,11 +10,10 @@ contract ActionMintRedeem is IPActionMintRedeem, ActionBaseMintRedeem {
     using MarketMathCore for MarketState;
     using Math for uint256;
     using Math for int256;
-    using SafeERC20 for IERC20;
 
     /// @dev since this contract will be proxied, it must not contains non-immutable variables
-    constructor(address _kyberScalingLib, address _bulkSellerDirectory)
-        ActionBaseMintRedeem(_kyberScalingLib, _bulkSellerDirectory) //solhint-disable-next-line no-empty-blocks
+    constructor(address _kyberScalingLib)
+        ActionBaseMintRedeem(_kyberScalingLib) //solhint-disable-next-line no-empty-blocks
     {}
 
     function mintSyFromToken(
@@ -46,7 +45,7 @@ contract ActionMintRedeem is IPActionMintRedeem, ActionBaseMintRedeem {
         address SY = IPYieldToken(YT).SY();
 
         uint256 netSyToMint = _mintSyFromToken(YT, SY, 0, input);
-        netPyOut = _mintPyFromSy(receiver, YT, minPyOut, netSyToMint, false);
+        netPyOut = _mintPyFromSy(receiver, YT, netSyToMint, minPyOut, false);
 
         emit MintPyFromToken(msg.sender, receiver, YT, input.tokenIn, input.netTokenIn, netPyOut);
     }
@@ -59,7 +58,7 @@ contract ActionMintRedeem is IPActionMintRedeem, ActionBaseMintRedeem {
     ) external returns (uint256 netTokenOut) {
         address SY = IPYieldToken(YT).SY();
 
-        uint256 netSyToRedeem = _redeemPyToSy(_syOrBulk(SY, output), YT, netPyIn, 1, true);
+        uint256 netSyToRedeem = _redeemPyToSy(_syOrBulk(SY, output), YT, netPyIn, 1);
         netTokenOut = _redeemSyToToken(receiver, SY, netSyToRedeem, output, false);
 
         emit RedeemPyToToken(msg.sender, receiver, YT, netPyIn, output.tokenOut, netTokenOut);
@@ -81,7 +80,7 @@ contract ActionMintRedeem is IPActionMintRedeem, ActionBaseMintRedeem {
         uint256 netPyIn,
         uint256 minSyOut
     ) external returns (uint256 netSyOut) {
-        netSyOut = _redeemPyToSy(receiver, YT, netPyIn, minSyOut, true);
+        netSyOut = _redeemPyToSy(receiver, YT, netPyIn, minSyOut);
         emit RedeemPyToSy(msg.sender, receiver, YT, netPyIn, netSyOut);
     }
 
@@ -184,13 +183,14 @@ contract ActionMintRedeem is IPActionMintRedeem, ActionBaseMintRedeem {
 
         // guaranteed no ETH, all rewards are ERC20
         for (uint256 i = 0; i < tokensOut.tokens.length; ++i) {
-            IERC20(tokensOut.tokens[i]).safeTransferFrom(
+            _transferFrom(
+                IERC20(tokensOut.tokens[i]),
                 msg.sender,
                 address(this),
                 tokensOut.amounts[i]
             );
         }
-        _redeemAllSys(sysOut, dataYT.useBulks, dataYT.tokenRedeemSys, tokensOut);
+        _redeemAllSys(sysOut, dataYT.bulks, dataYT.tokenRedeemSys, tokensOut);
 
         // now swap all to outputToken
         netTokenOut = _swapAllToOutputToken(tokensOut, dataSwap);
@@ -221,14 +221,14 @@ contract ActionMintRedeem is IPActionMintRedeem, ActionBaseMintRedeem {
     /// @dev pull SYs from users & redeem them, then add to tokensOut
     function _redeemAllSys(
         RouterTokenAmounts memory sys,
-        bool[] calldata useBulks,
+        address[] calldata bulks,
         address[] calldata tokenRedeemSys,
         RouterTokenAmounts memory tokensOut
     ) internal {
         for (uint256 i = 0; i < sys.tokens.length; ++i) {
             if (sys.amounts[i] == 0) continue;
 
-            TokenOutput memory output = _wrapTokenOutput(tokenRedeemSys[i], 1, useBulks[i]);
+            TokenOutput memory output = _wrapTokenOutput(tokenRedeemSys[i], 1, bulks[i]);
             uint256 amountOut = _redeemSyToToken(
                 address(this),
                 sys.tokens[i],
@@ -247,7 +247,12 @@ contract ActionMintRedeem is IPActionMintRedeem, ActionBaseMintRedeem {
     ) internal returns (uint256 netTokenOut) {
         for (uint256 i = 0; i < tokens.tokens.length; ++i) {
             if (tokens.amounts[i] == 0) continue;
-            _kyberswap(tokens.tokens[i], tokens.amounts[i], dataSwap.kyberRouter, dataSwap.kybercalls[i]);
+            _kyberswap(
+                tokens.tokens[i],
+                tokens.amounts[i],
+                dataSwap.kyberRouter,
+                dataSwap.kybercalls[i]
+            );
         }
         netTokenOut = _selfBalance(dataSwap.outputToken);
         _transferOut(dataSwap.outputToken, msg.sender, netTokenOut);

package/contracts/router/ActionSwapPT.sol

@@ -12,12 +12,11 @@ contract ActionSwapPT is IPActionSwapPT, ActionBaseMintRedeem {
     using MarketApproxPtOutLib for MarketState;
     using Math for uint256;
     using Math for int256;
-    using SafeERC20 for IERC20;
     using PYIndexLib for IPYieldToken;
 
     /// @dev since this contract will be proxied, it must not contains non-immutable variables
-    constructor(address _kyberScalingLib, address _bulkSellerDirectory)
-        ActionBaseMintRedeem(_kyberScalingLib, _bulkSellerDirectory) //solhint-disable-next-line no-empty-blocks
+    constructor(address _kyberScalingLib)
+        ActionBaseMintRedeem(_kyberScalingLib) //solhint-disable-next-line no-empty-blocks
     {}
 
     function swapExactPtForSy(
@@ -27,7 +26,7 @@ contract ActionSwapPT is IPActionSwapPT, ActionBaseMintRedeem {
         uint256 minSyOut
     ) external returns (uint256 netSyOut, uint256 netSyFee) {
         (, IPPrincipalToken PT, ) = IPMarket(market).readTokens();
-        IERC20(address(PT)).safeTransferFrom(msg.sender, market, exactPtIn);
+        _transferFrom(IERC20(PT), msg.sender, market, exactPtIn);
 
         (netSyOut, netSyFee) = IPMarket(market).swapExactPtForSy(receiver, exactPtIn, EMPTY_BYTES);
 
@@ -59,7 +58,7 @@ contract ActionSwapPT is IPActionSwapPT, ActionBaseMintRedeem {
 
         if (netPtIn > maxPtIn) revert Errors.RouterExceededLimitPtIn(netPtIn, maxPtIn);
 
-        IERC20(PT).safeTransferFrom(msg.sender, market, netPtIn);
+        _transferFrom(IERC20(PT), msg.sender, market, netPtIn);
 
         uint256 netSyOut;
         (netSyOut, netSyFee) = IPMarket(market).swapExactPtForSy(receiver, netPtIn, EMPTY_BYTES);
@@ -83,7 +82,7 @@ contract ActionSwapPT is IPActionSwapPT, ActionBaseMintRedeem {
 
         if (netSyIn > maxSyIn) revert Errors.RouterExceededLimitSyIn(netSyIn, maxSyIn);
 
-        IERC20(SY).safeTransferFrom(msg.sender, market, netSyIn);
+        _transferFrom(IERC20(SY), msg.sender, market, netSyIn);
 
         (, netSyFee) = IPMarket(market).swapSyForExactPt(receiver, exactPtOut, EMPTY_BYTES); // ignore return
 
@@ -100,7 +99,7 @@ contract ActionSwapPT is IPActionSwapPT, ActionBaseMintRedeem {
     ) external returns (uint256 netPtOut, uint256 netSyFee) {
         (IStandardizedYield SY, , IPYieldToken YT) = IPMarket(market).readTokens();
 
-        IERC20(SY).safeTransferFrom(msg.sender, market, exactSyIn);
+        _transferFrom(IERC20(SY), msg.sender, market, exactSyIn);
 
         (netPtOut, netSyFee) = _swapExactSyForPt(
             receiver,
@@ -163,7 +162,7 @@ contract ActionSwapPT is IPActionSwapPT, ActionBaseMintRedeem {
     ) external returns (uint256 netTokenOut, uint256 netSyFee) {
         (IStandardizedYield SY, IPPrincipalToken PT, ) = IPMarket(market).readTokens();
 
-        IERC20(address(PT)).safeTransferFrom(msg.sender, market, exactPtIn);
+        _transferFrom(IERC20(PT), msg.sender, market, exactPtIn);
 
         // all output SY is directly transferred to the SY contract
         uint256 netSyReceived;

package/contracts/router/ActionSwapPTYT.sol

@@ -5,17 +5,13 @@ import "../interfaces/IPActionSwapPTYT.sol";
 import "../interfaces/IPMarket.sol";
 import "./base/CallbackHelper.sol";
 
-contract ActionSwapPTYT is IPActionSwapPTYT, CallbackHelper {
+contract ActionSwapPTYT is IPActionSwapPTYT, CallbackHelper, TokenHelper {
     using MarketMathCore for MarketState;
     using MarketApproxPtInLib for MarketState;
     using MarketApproxPtOutLib for MarketState;
     using Math for uint256;
     using Math for int256;
-    using SafeERC20 for IERC20;
     using PYIndexLib for IPYieldToken;
-    using SafeERC20 for IStandardizedYield;
-    using SafeERC20 for IPYieldToken;
-    using SafeERC20 for IPPrincipalToken;
 
     /// @dev since this contract will be proxied, it must not contains non-immutable variables
     constructor() //solhint-disable-next-line no-empty-blocks
@@ -33,7 +29,7 @@ contract ActionSwapPTYT is IPActionSwapPTYT, CallbackHelper {
         (, IPPrincipalToken PT, IPYieldToken YT) = IPMarket(market).readTokens();
         MarketState memory state = IPMarket(market).readState();
 
-        PT.safeTransferFrom(msg.sender, market, exactPtIn);
+        _transferFrom(IERC20(PT), msg.sender, market, exactPtIn);
 
         uint256 totalPtToSwap;
         (netYtOut, totalPtToSwap, netSyFee) = state.approxSwapExactPtForYt(
@@ -64,7 +60,7 @@ contract ActionSwapPTYT is IPActionSwapPTYT, CallbackHelper {
         (, , IPYieldToken YT) = IPMarket(market).readTokens();
         MarketState memory state = IPMarket(market).readState();
 
-        YT.safeTransferFrom(msg.sender, address(YT), exactYtIn);
+        _transferFrom(IERC20(YT), msg.sender, address(YT), exactYtIn);
 
         uint256 totalPtSwapped;
         (netPtOut, totalPtSwapped, netSyFee) = state.approxSwapExactYtForPt(

package/contracts/router/ActionSwapYT.sol

@@ -13,13 +13,11 @@ contract ActionSwapYT is IPActionSwapYT, ActionBaseMintRedeem, CallbackHelper {
     using MarketMathCore for MarketState;
     using MarketApproxPtInLib for MarketState;
     using MarketApproxPtOutLib for MarketState;
-    using SafeERC20 for IStandardizedYield;
-    using SafeERC20 for IPYieldToken;
     using PYIndexLib for IPYieldToken;
 
     /// @dev since this contract will be proxied, it must not contains non-immutable variables
-    constructor(address _kyberScalingLib, address _bulkSellerDirectory)
-        ActionBaseMintRedeem(_kyberScalingLib, _bulkSellerDirectory) //solhint-disable-next-line no-empty-blocks
+    constructor(address _kyberScalingLib)
+        ActionBaseMintRedeem(_kyberScalingLib) //solhint-disable-next-line no-empty-blocks
     {}
 
     /**
@@ -41,7 +39,7 @@ contract ActionSwapYT is IPActionSwapYT, ActionBaseMintRedeem, CallbackHelper {
     ) external returns (uint256 netYtOut, uint256 netSyFee) {
         (IStandardizedYield SY, , IPYieldToken YT) = IPMarket(market).readTokens();
 
-        SY.safeTransferFrom(msg.sender, address(YT), exactSyIn);
+        _transferFrom(IERC20(SY), msg.sender, address(YT), exactSyIn);
 
         (netYtOut, netSyFee) = _swapExactSyForYt(
             receiver,
@@ -73,7 +71,7 @@ contract ActionSwapYT is IPActionSwapYT, ActionBaseMintRedeem, CallbackHelper {
     ) external returns (uint256 netSyOut, uint256 netSyFee) {
         (IStandardizedYield SY, , IPYieldToken YT) = IPMarket(market).readTokens();
 
-        YT.safeTransferFrom(msg.sender, address(YT), exactYtIn);
+        _transferFrom(IERC20(YT), msg.sender, address(YT), exactYtIn);
 
         (netSyOut, netSyFee) = _swapExactYtForSy(receiver, market, SY, YT, exactYtIn, minSyOut);
 
@@ -139,7 +137,7 @@ contract ActionSwapYT is IPActionSwapYT, ActionBaseMintRedeem, CallbackHelper {
 
         if (netYtIn > maxYtIn) revert Errors.RouterExceededLimitYtIn(netYtIn, maxYtIn);
 
-        YT.safeTransferFrom(msg.sender, address(YT), netYtIn);
+        _transferFrom(IERC20(YT), msg.sender, address(YT), netYtIn);
 
         (, netSyFee) = IPMarket(market).swapSyForExactPt(
             address(YT),
@@ -188,7 +186,7 @@ contract ActionSwapYT is IPActionSwapYT, ActionBaseMintRedeem, CallbackHelper {
     ) external returns (uint256 netTokenOut, uint256 netSyFee) {
         (IStandardizedYield SY, , IPYieldToken YT) = IPMarket(market).readTokens();
 
-        YT.safeTransferFrom(msg.sender, address(YT), netYtIn);
+        _transferFrom(IERC20(YT), msg.sender, address(YT), netYtIn);
 
         uint256 netSyOut;
 

package/contracts/router/PendleRouter.sol

@@ -40,6 +40,9 @@ contract PendleRouter is Proxy, Initializable, UUPSUpgradeable, BoringOwnableUpg
         ACTION_MISC = _ACTION_MISC;
     }
 
+    receive() external payable virtual override {
+    }
+
     function initialize() external initializer {
         __BoringOwnable_init();
     }