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

package/contracts/router/base/ActionBaseMintRedeem.sol

@@ -5,23 +5,15 @@ import "../kyberswap/KyberSwapHelper.sol";
 import "../../core/libraries/TokenHelper.sol";
 import "../../interfaces/IStandardizedYield.sol";
 import "../../interfaces/IPYieldToken.sol";
-import "../../interfaces/IPBulkSellerFactory.sol";
 import "../../interfaces/IPBulkSeller.sol";
 import "../../core/libraries/Errors.sol";
 
 // solhint-disable no-empty-blocks
 abstract contract ActionBaseMintRedeem is TokenHelper, KyberSwapHelper {
-    using SafeERC20 for IERC20;
-
     bytes internal constant EMPTY_BYTES = abi.encode();
-    IPBulkSellerFactory public immutable bulkFactory;
 
     /// @dev since this contract will be proxied, it must not contains non-immutable variables
-    constructor(address _kyberScalingLib, address _bulkSellerDirectory)
-        KyberSwapHelper(_kyberScalingLib)
-    {
-        bulkFactory = IPBulkSellerFactory(_bulkSellerDirectory);
-    }
+    constructor(address _kyberScalingLib) KyberSwapHelper(_kyberScalingLib) {}
 
     function _mintSyFromToken(
         address receiver,
@@ -32,26 +24,33 @@ abstract contract ActionBaseMintRedeem is TokenHelper, KyberSwapHelper {
         _transferIn(input.tokenIn, msg.sender, input.netTokenIn);
 
         bool requireSwap = input.tokenIn != input.tokenMintSy;
+
+        uint256 netTokenMintSy;
+
         if (requireSwap) {
             _kyberswap(input.tokenIn, input.netTokenIn, input.kyberRouter, input.kybercall);
+            netTokenMintSy = _selfBalance(input.tokenMintSy);
+        } else {
+            netTokenMintSy = input.netTokenIn;
         }
 
-        uint256 tokenMintSyBal = _selfBalance(input.tokenMintSy);
-        if (input.useBulk) {
-            address bulk = bulkFactory.get(input.tokenMintSy, SY);
+        if (input.bulk != address(0)) {
+            _transferOut(input.tokenMintSy, input.bulk, netTokenMintSy);
 
-            _transferOut(input.tokenMintSy, bulk, tokenMintSyBal);
-
-            netSyOut = IPBulkSeller(bulk).swapExactTokenForSy(receiver, tokenMintSyBal, minSyOut);
+            netSyOut = IPBulkSeller(input.bulk).swapExactTokenForSy(
+                receiver,
+                netTokenMintSy,
+                minSyOut
+            );
         } else {
-            uint256 netNative = input.tokenMintSy == NATIVE ? tokenMintSyBal : 0;
+            uint256 netNative = input.tokenMintSy == NATIVE ? netTokenMintSy : 0;
 
             _safeApproveInf(input.tokenMintSy, SY);
 
             netSyOut = IStandardizedYield(SY).deposit{ value: netNative }(
                 receiver,
                 input.tokenMintSy,
-                tokenMintSyBal,
+                netTokenMintSy,
                 minSyOut
             );
         }
@@ -65,16 +64,15 @@ abstract contract ActionBaseMintRedeem is TokenHelper, KyberSwapHelper {
         bool doPull
     ) internal returns (uint256 netTokenOut) {
         if (doPull) {
-            IERC20(SY).safeTransferFrom(msg.sender, _syOrBulk(SY, output), netSyIn);
+            _transferFrom(IERC20(SY), msg.sender, _syOrBulk(SY, output), netSyIn);
         }
 
         bool requireSwap = output.tokenRedeemSy != output.tokenOut;
         address receiverRedeemSy = requireSwap ? address(this) : receiver;
         uint256 netTokenRedeemed;
 
-        if (output.useBulk) {
-            address bulk = bulkFactory.get(output.tokenRedeemSy, SY);
-            netTokenRedeemed = IPBulkSeller(bulk).swapExactSyForToken(
+        if (output.bulk != address(0)) {
+            netTokenRedeemed = IPBulkSeller(output.bulk).swapExactSyForToken(
                 receiverRedeemSy,
                 netSyIn,
                 0
@@ -119,7 +117,7 @@ abstract contract ActionBaseMintRedeem is TokenHelper, KyberSwapHelper {
         address SY = IPYieldToken(YT).SY();
 
         if (doPull) {
-            IERC20(SY).safeTransferFrom(msg.sender, YT, netSyIn);
+            _transferFrom(IERC20(SY), msg.sender, YT, netSyIn);
         }
 
         netPyOut = IPYieldToken(YT).mintPY(receiver, receiver);
@@ -130,16 +128,14 @@ abstract contract ActionBaseMintRedeem is TokenHelper, KyberSwapHelper {
         address receiver,
         address YT,
         uint256 netPyIn,
-        uint256 minSyOut,
-        bool doPull
+        uint256 minSyOut
     ) internal returns (uint256 netSyOut) {
         address PT = IPYieldToken(YT).PT();
 
-        if (doPull) {
-            bool needToBurnYt = (!IPYieldToken(YT).isExpired());
-            IERC20(PT).safeTransferFrom(msg.sender, YT, netPyIn);
-            if (needToBurnYt) IERC20(YT).safeTransferFrom(msg.sender, YT, netPyIn);
-        }
+        _transferFrom(IERC20(PT), msg.sender, YT, netPyIn);
+
+        bool needToBurnYt = (!IPYieldToken(YT).isExpired());
+        if (needToBurnYt) _transferFrom(IERC20(YT), msg.sender, YT, netPyIn);
 
         netSyOut = IPYieldToken(YT).redeemPY(receiver);
         if (netSyOut < minSyOut) revert Errors.RouterInsufficientSyOut(netSyOut, minSyOut);
@@ -147,17 +143,17 @@ abstract contract ActionBaseMintRedeem is TokenHelper, KyberSwapHelper {
 
     function _syOrBulk(address SY, TokenOutput memory output)
         internal
-        view
+        pure
         returns (address addr)
     {
-        return (output.useBulk ? bulkFactory.get(output.tokenRedeemSy, SY) : SY);
+        return output.bulk != address(0) ? output.bulk : SY;
     }
 
     function _wrapTokenOutput(
         address tokenOut,
         uint256 minTokenOut,
-        bool useBulk
+        address bulk
     ) internal pure returns (TokenOutput memory) {
-        return TokenOutput(tokenOut, minTokenOut, tokenOut, address(0), EMPTY_BYTES, useBulk);
+        return TokenOutput(tokenOut, minTokenOut, tokenOut, bulk, address(0), EMPTY_BYTES);
     }
 }

package/contracts/router/kyberswap/KyberSwapHelper.sol

@@ -29,21 +29,25 @@ import "./IAggregatorRouterHelper.sol";
 import "../../core/libraries/Errors.sol";
 
 struct TokenInput {
+    // Token/Sy data
     address tokenIn;
     uint256 netTokenIn;
     address tokenMintSy;
+    address bulk;
+    // Kyber data
     address kyberRouter;
     bytes kybercall;
-    bool useBulk;
 }
 
 struct TokenOutput {
+    // Token/Sy data
     address tokenOut;
     uint256 minTokenOut;
     address tokenRedeemSy;
+    address bulk;
+    // Kyber data
     address kyberRouter;
     bytes kybercall;
-    bool useBulk;
 }
 
 abstract contract KyberSwapHelper is TokenHelper {
@@ -61,9 +65,9 @@ abstract contract KyberSwapHelper is TokenHelper {
         address kyberRouter,
         bytes memory rawKybercall
     ) internal {
-        if (kyberRouter == address(0) || rawKybercall.length == 0) {
+        if (kyberRouter == address(0) || rawKybercall.length == 0)
             revert Errors.RouterKyberSwapDataZero();
-        }
+
         _safeApproveInf(tokenIn, kyberRouter);
 
         bytes memory kybercall = IAggregationRouterHelper(kyberScalingLib).getScaledInputData(

package/package.json

@@ -2,7 +2,7 @@
   "name": "@pendle/core-v2",
   "description": "Core smart contracts of Pendle Protocol.",
   "license": "BUSL-1.1",
-  "version": "0.16.3-testnet",
+  "version": "0.16.4-testnet",
   "homepage": "https://pendle.finance",
   "keywords": [
     "pendle",

package/typechain-types/ActionAddRemoveLiq.ts

@@ -27,9 +27,9 @@ export type TokenInputStruct = {
   tokenIn: string;
   netTokenIn: BigNumberish;
   tokenMintSy: string;
+  bulk: string;
   kyberRouter: string;
   kybercall: BytesLike;
-  useBulk: boolean;
 };
 
 export type TokenInputStructOutput = [
@@ -38,14 +38,14 @@ export type TokenInputStructOutput = [
   string,
   string,
   string,
-  boolean
+  string
 ] & {
   tokenIn: string;
   netTokenIn: BigNumber;
   tokenMintSy: string;
+  bulk: string;
   kyberRouter: string;
   kybercall: string;
-  useBulk: boolean;
 };
 
 export type ApproxParamsStruct = {
@@ -74,9 +74,9 @@ export type TokenOutputStruct = {
   tokenOut: string;
   minTokenOut: BigNumberish;
   tokenRedeemSy: string;
+  bulk: string;
   kyberRouter: string;
   kybercall: BytesLike;
-  useBulk: boolean;
 };
 
 export type TokenOutputStructOutput = [
@@ -85,31 +85,30 @@ export type TokenOutputStructOutput = [
   string,
   string,
   string,
-  boolean
+  string
 ] & {
   tokenOut: string;
   minTokenOut: BigNumber;
   tokenRedeemSy: string;
+  bulk: string;
   kyberRouter: string;
   kybercall: string;
-  useBulk: boolean;
 };
 
 export interface ActionAddRemoveLiqInterface extends utils.Interface {
   contractName: "ActionAddRemoveLiq";
   functions: {
     "addLiquidityDualSyAndPt(address,address,uint256,uint256,uint256)": FunctionFragment;
-    "addLiquidityDualTokenAndPt(address,address,(address,uint256,address,address,bytes,bool),uint256,uint256)": FunctionFragment;
+    "addLiquidityDualTokenAndPt(address,address,(address,uint256,address,address,address,bytes),uint256,uint256)": FunctionFragment;
     "addLiquiditySinglePt(address,address,uint256,uint256,(uint256,uint256,uint256,uint256,uint256))": FunctionFragment;
     "addLiquiditySingleSy(address,address,uint256,uint256,(uint256,uint256,uint256,uint256,uint256))": FunctionFragment;
-    "addLiquiditySingleToken(address,address,uint256,(uint256,uint256,uint256,uint256,uint256),(address,uint256,address,address,bytes,bool))": FunctionFragment;
-    "bulkFactory()": FunctionFragment;
+    "addLiquiditySingleToken(address,address,uint256,(uint256,uint256,uint256,uint256,uint256),(address,uint256,address,address,address,bytes))": FunctionFragment;
     "kyberScalingLib()": FunctionFragment;
     "removeLiquidityDualSyAndPt(address,address,uint256,uint256,uint256)": FunctionFragment;
-    "removeLiquidityDualTokenAndPt(address,address,uint256,(address,uint256,address,address,bytes,bool),uint256)": FunctionFragment;
+    "removeLiquidityDualTokenAndPt(address,address,uint256,(address,uint256,address,address,address,bytes),uint256)": FunctionFragment;
     "removeLiquiditySinglePt(address,address,uint256,uint256,(uint256,uint256,uint256,uint256,uint256))": FunctionFragment;
     "removeLiquiditySingleSy(address,address,uint256,uint256)": FunctionFragment;
-    "removeLiquiditySingleToken(address,address,uint256,(address,uint256,address,address,bytes,bool))": FunctionFragment;
+    "removeLiquiditySingleToken(address,address,uint256,(address,uint256,address,address,address,bytes))": FunctionFragment;
   };
 
   encodeFunctionData(
@@ -132,10 +131,6 @@ export interface ActionAddRemoveLiqInterface extends utils.Interface {
     functionFragment: "addLiquiditySingleToken",
     values: [string, string, BigNumberish, ApproxParamsStruct, TokenInputStruct]
   ): string;
-  encodeFunctionData(
-    functionFragment: "bulkFactory",
-    values?: undefined
-  ): string;
   encodeFunctionData(
     functionFragment: "kyberScalingLib",
     values?: undefined
@@ -181,10 +176,6 @@ export interface ActionAddRemoveLiqInterface extends utils.Interface {
     functionFragment: "addLiquiditySingleToken",
     data: BytesLike
   ): Result;
-  decodeFunctionResult(
-    functionFragment: "bulkFactory",
-    data: BytesLike
-  ): Result;
   decodeFunctionResult(
     functionFragment: "kyberScalingLib",
     data: BytesLike
@@ -458,8 +449,6 @@ export interface ActionAddRemoveLiq extends BaseContract {
       overrides?: PayableOverrides & { from?: string | Promise<string> }
     ): Promise<ContractTransaction>;
 
-    bulkFactory(overrides?: CallOverrides): Promise<[string]>;
-
     kyberScalingLib(overrides?: CallOverrides): Promise<[string]>;
 
     removeLiquidityDualSyAndPt(
@@ -551,8 +540,6 @@ export interface ActionAddRemoveLiq extends BaseContract {
     overrides?: PayableOverrides & { from?: string | Promise<string> }
   ): Promise<ContractTransaction>;
 
-  bulkFactory(overrides?: CallOverrides): Promise<string>;
-
   kyberScalingLib(overrides?: CallOverrides): Promise<string>;
 
   removeLiquidityDualSyAndPt(
@@ -662,8 +649,6 @@ export interface ActionAddRemoveLiq extends BaseContract {
       [BigNumber, BigNumber] & { netLpOut: BigNumber; netSyFee: BigNumber }
     >;
 
-    bulkFactory(overrides?: CallOverrides): Promise<string>;
-
     kyberScalingLib(overrides?: CallOverrides): Promise<string>;
 
     removeLiquidityDualSyAndPt(
@@ -934,8 +919,6 @@ export interface ActionAddRemoveLiq extends BaseContract {
       overrides?: PayableOverrides & { from?: string | Promise<string> }
     ): Promise<BigNumber>;
 
-    bulkFactory(overrides?: CallOverrides): Promise<BigNumber>;
-
     kyberScalingLib(overrides?: CallOverrides): Promise<BigNumber>;
 
     removeLiquidityDualSyAndPt(
@@ -1028,8 +1011,6 @@ export interface ActionAddRemoveLiq extends BaseContract {
       overrides?: PayableOverrides & { from?: string | Promise<string> }
     ): Promise<PopulatedTransaction>;
 
-    bulkFactory(overrides?: CallOverrides): Promise<PopulatedTransaction>;
-
     kyberScalingLib(overrides?: CallOverrides): Promise<PopulatedTransaction>;
 
     removeLiquidityDualSyAndPt(

package/typechain-types/ActionBaseMintRedeem.ts

@@ -22,23 +22,14 @@ import type {
 export interface ActionBaseMintRedeemInterface extends utils.Interface {
   contractName: "ActionBaseMintRedeem";
   functions: {
-    "bulkFactory()": FunctionFragment;
     "kyberScalingLib()": FunctionFragment;
   };
 
-  encodeFunctionData(
-    functionFragment: "bulkFactory",
-    values?: undefined
-  ): string;
   encodeFunctionData(
     functionFragment: "kyberScalingLib",
     values?: undefined
   ): string;
 
-  decodeFunctionResult(
-    functionFragment: "bulkFactory",
-    data: BytesLike
-  ): Result;
   decodeFunctionResult(
     functionFragment: "kyberScalingLib",
     data: BytesLike
@@ -75,32 +66,22 @@ export interface ActionBaseMintRedeem extends BaseContract {
   removeListener: OnEvent<this>;
 
   functions: {
-    bulkFactory(overrides?: CallOverrides): Promise<[string]>;
-
     kyberScalingLib(overrides?: CallOverrides): Promise<[string]>;
   };
 
-  bulkFactory(overrides?: CallOverrides): Promise<string>;
-
   kyberScalingLib(overrides?: CallOverrides): Promise<string>;
 
   callStatic: {
-    bulkFactory(overrides?: CallOverrides): Promise<string>;
-
     kyberScalingLib(overrides?: CallOverrides): Promise<string>;
   };
 
   filters: {};
 
   estimateGas: {
-    bulkFactory(overrides?: CallOverrides): Promise<BigNumber>;
-
     kyberScalingLib(overrides?: CallOverrides): Promise<BigNumber>;
   };
 
   populateTransaction: {
-    bulkFactory(overrides?: CallOverrides): Promise<PopulatedTransaction>;
-
     kyberScalingLib(overrides?: CallOverrides): Promise<PopulatedTransaction>;
   };
 }

package/typechain-types/ActionMintRedeem.ts

@@ -27,9 +27,9 @@ export type TokenInputStruct = {
   tokenIn: string;
   netTokenIn: BigNumberish;
   tokenMintSy: string;
+  bulk: string;
   kyberRouter: string;
   kybercall: BytesLike;
-  useBulk: boolean;
 };
 
 export type TokenInputStructOutput = [
@@ -38,23 +38,23 @@ export type TokenInputStructOutput = [
   string,
   string,
   string,
-  boolean
+  string
 ] & {
   tokenIn: string;
   netTokenIn: BigNumber;
   tokenMintSy: string;
+  bulk: string;
   kyberRouter: string;
   kybercall: string;
-  useBulk: boolean;
 };
 
 export type TokenOutputStruct = {
   tokenOut: string;
   minTokenOut: BigNumberish;
   tokenRedeemSy: string;
+  bulk: string;
   kyberRouter: string;
   kybercall: BytesLike;
-  useBulk: boolean;
 };
 
 export type TokenOutputStructOutput = [
@@ -63,14 +63,14 @@ export type TokenOutputStructOutput = [
   string,
   string,
   string,
-  boolean
+  string
 ] & {
   tokenOut: string;
   minTokenOut: BigNumber;
   tokenRedeemSy: string;
+  bulk: string;
   kyberRouter: string;
   kybercall: string;
-  useBulk: boolean;
 };
 
 export declare namespace IPActionMintRedeem {
@@ -78,19 +78,19 @@ export declare namespace IPActionMintRedeem {
     yts: string[];
     syAddrs: string[];
     tokenRedeemSys: string[];
-    useBulks: boolean[];
+    bulks: string[];
   };
 
   export type RouterYtRedeemStructStructOutput = [
     string[],
     string[],
     string[],
-    boolean[]
+    string[]
   ] & {
     yts: string[];
     syAddrs: string[];
     tokenRedeemSys: string[];
-    useBulks: boolean[];
+    bulks: string[];
   };
 
   export type RouterSwapAllStructStruct = {
@@ -119,22 +119,17 @@ export declare namespace IPActionMintRedeem {
 export interface ActionMintRedeemInterface extends utils.Interface {
   contractName: "ActionMintRedeem";
   functions: {
-    "bulkFactory()": FunctionFragment;
     "kyberScalingLib()": FunctionFragment;
     "mintPyFromSy(address,address,uint256,uint256)": FunctionFragment;
-    "mintPyFromToken(address,address,uint256,(address,uint256,address,address,bytes,bool))": FunctionFragment;
-    "mintSyFromToken(address,address,uint256,(address,uint256,address,address,bytes,bool))": FunctionFragment;
+    "mintPyFromToken(address,address,uint256,(address,uint256,address,address,address,bytes))": FunctionFragment;
+    "mintSyFromToken(address,address,uint256,(address,uint256,address,address,address,bytes))": FunctionFragment;
     "redeemDueInterestAndRewards(address,address[],address[],address[])": FunctionFragment;
-    "redeemDueInterestAndRewardsThenSwapAll(address[],(address[],address[],address[],bool[]),address[],(address[],bytes[],address,address,uint256))": FunctionFragment;
+    "redeemDueInterestAndRewardsThenSwapAll(address[],(address[],address[],address[],address[]),address[],(address[],bytes[],address,address,uint256))": FunctionFragment;
     "redeemPyToSy(address,address,uint256,uint256)": FunctionFragment;
-    "redeemPyToToken(address,address,uint256,(address,uint256,address,address,bytes,bool))": FunctionFragment;
-    "redeemSyToToken(address,address,uint256,(address,uint256,address,address,bytes,bool))": FunctionFragment;
+    "redeemPyToToken(address,address,uint256,(address,uint256,address,address,address,bytes))": FunctionFragment;
+    "redeemSyToToken(address,address,uint256,(address,uint256,address,address,address,bytes))": FunctionFragment;
   };
 
-  encodeFunctionData(
-    functionFragment: "bulkFactory",
-    values?: undefined
-  ): string;
   encodeFunctionData(
     functionFragment: "kyberScalingLib",
     values?: undefined
@@ -177,10 +172,6 @@ export interface ActionMintRedeemInterface extends utils.Interface {
     values: [string, string, BigNumberish, TokenOutputStruct]
   ): string;
 
-  decodeFunctionResult(
-    functionFragment: "bulkFactory",
-    data: BytesLike
-  ): Result;
   decodeFunctionResult(
     functionFragment: "kyberScalingLib",
     data: BytesLike
@@ -394,8 +385,6 @@ export interface ActionMintRedeem extends BaseContract {
   removeListener: OnEvent<this>;
 
   functions: {
-    bulkFactory(overrides?: CallOverrides): Promise<[string]>;
-
     kyberScalingLib(overrides?: CallOverrides): Promise<[string]>;
 
     mintPyFromSy(
@@ -463,8 +452,6 @@ export interface ActionMintRedeem extends BaseContract {
     ): Promise<ContractTransaction>;
   };
 
-  bulkFactory(overrides?: CallOverrides): Promise<string>;
-
   kyberScalingLib(overrides?: CallOverrides): Promise<string>;
 
   mintPyFromSy(
@@ -532,8 +519,6 @@ export interface ActionMintRedeem extends BaseContract {
   ): Promise<ContractTransaction>;
 
   callStatic: {
-    bulkFactory(overrides?: CallOverrides): Promise<string>;
-
     kyberScalingLib(overrides?: CallOverrides): Promise<string>;
 
     mintPyFromSy(
@@ -752,8 +737,6 @@ export interface ActionMintRedeem extends BaseContract {
   };
 
   estimateGas: {
-    bulkFactory(overrides?: CallOverrides): Promise<BigNumber>;
-
     kyberScalingLib(overrides?: CallOverrides): Promise<BigNumber>;
 
     mintPyFromSy(
@@ -822,8 +805,6 @@ export interface ActionMintRedeem extends BaseContract {
   };
 
   populateTransaction: {
-    bulkFactory(overrides?: CallOverrides): Promise<PopulatedTransaction>;
-
     kyberScalingLib(overrides?: CallOverrides): Promise<PopulatedTransaction>;
 
     mintPyFromSy(

package/typechain-types/ActionSwapPT.ts

@@ -27,9 +27,9 @@ export type TokenOutputStruct = {
   tokenOut: string;
   minTokenOut: BigNumberish;
   tokenRedeemSy: string;
+  bulk: string;
   kyberRouter: string;
   kybercall: BytesLike;
-  useBulk: boolean;
 };
 
 export type TokenOutputStructOutput = [
@@ -38,14 +38,14 @@ export type TokenOutputStructOutput = [
   string,
   string,
   string,
-  boolean
+  string
 ] & {
   tokenOut: string;
   minTokenOut: BigNumber;
   tokenRedeemSy: string;
+  bulk: string;
   kyberRouter: string;
   kybercall: string;
-  useBulk: boolean;
 };
 
 export type ApproxParamsStruct = {
@@ -74,9 +74,9 @@ export type TokenInputStruct = {
   tokenIn: string;
   netTokenIn: BigNumberish;
   tokenMintSy: string;
+  bulk: string;
   kyberRouter: string;
   kybercall: BytesLike;
-  useBulk: boolean;
 };
 
 export type TokenInputStructOutput = [
@@ -85,33 +85,28 @@ export type TokenInputStructOutput = [
   string,
   string,
   string,
-  boolean
+  string
 ] & {
   tokenIn: string;
   netTokenIn: BigNumber;
   tokenMintSy: string;
+  bulk: string;
   kyberRouter: string;
   kybercall: string;
-  useBulk: boolean;
 };
 
 export interface ActionSwapPTInterface extends utils.Interface {
   contractName: "ActionSwapPT";
   functions: {
-    "bulkFactory()": FunctionFragment;
     "kyberScalingLib()": FunctionFragment;
     "swapExactPtForSy(address,address,uint256,uint256)": FunctionFragment;
-    "swapExactPtForToken(address,address,uint256,(address,uint256,address,address,bytes,bool))": FunctionFragment;
+    "swapExactPtForToken(address,address,uint256,(address,uint256,address,address,address,bytes))": FunctionFragment;
     "swapExactSyForPt(address,address,uint256,uint256,(uint256,uint256,uint256,uint256,uint256))": FunctionFragment;
-    "swapExactTokenForPt(address,address,uint256,(uint256,uint256,uint256,uint256,uint256),(address,uint256,address,address,bytes,bool))": FunctionFragment;
+    "swapExactTokenForPt(address,address,uint256,(uint256,uint256,uint256,uint256,uint256),(address,uint256,address,address,address,bytes))": FunctionFragment;
     "swapPtForExactSy(address,address,uint256,uint256,(uint256,uint256,uint256,uint256,uint256))": FunctionFragment;
     "swapSyForExactPt(address,address,uint256,uint256)": FunctionFragment;
   };
 
-  encodeFunctionData(
-    functionFragment: "bulkFactory",
-    values?: undefined
-  ): string;
   encodeFunctionData(
     functionFragment: "kyberScalingLib",
     values?: undefined
@@ -141,10 +136,6 @@ export interface ActionSwapPTInterface extends utils.Interface {
     values: [string, string, BigNumberish, BigNumberish]
   ): string;
 
-  decodeFunctionResult(
-    functionFragment: "bulkFactory",
-    data: BytesLike
-  ): Result;
   decodeFunctionResult(
     functionFragment: "kyberScalingLib",
     data: BytesLike
@@ -238,8 +229,6 @@ export interface ActionSwapPT extends BaseContract {
   removeListener: OnEvent<this>;
 
   functions: {
-    bulkFactory(overrides?: CallOverrides): Promise<[string]>;
-
     kyberScalingLib(overrides?: CallOverrides): Promise<[string]>;
 
     swapExactPtForSy(
@@ -294,8 +283,6 @@ export interface ActionSwapPT extends BaseContract {
     ): Promise<ContractTransaction>;
   };
 
-  bulkFactory(overrides?: CallOverrides): Promise<string>;
-
   kyberScalingLib(overrides?: CallOverrides): Promise<string>;
 
   swapExactPtForSy(
@@ -350,8 +337,6 @@ export interface ActionSwapPT extends BaseContract {
   ): Promise<ContractTransaction>;
 
   callStatic: {
-    bulkFactory(overrides?: CallOverrides): Promise<string>;
-
     kyberScalingLib(overrides?: CallOverrides): Promise<string>;
 
     swapExactPtForSy(
@@ -453,8 +438,6 @@ export interface ActionSwapPT extends BaseContract {
   };
 
   estimateGas: {
-    bulkFactory(overrides?: CallOverrides): Promise<BigNumber>;
-
     kyberScalingLib(overrides?: CallOverrides): Promise<BigNumber>;
 
     swapExactPtForSy(
@@ -510,8 +493,6 @@ export interface ActionSwapPT extends BaseContract {
   };
 
   populateTransaction: {
-    bulkFactory(overrides?: CallOverrides): Promise<PopulatedTransaction>;
-
     kyberScalingLib(overrides?: CallOverrides): Promise<PopulatedTransaction>;
 
     swapExactPtForSy(