@pendle/core-v2 6.11.0 → 6.12.0

package/contracts/pt-looping/money-market/implementations/aave/AaveMoneyMarket.sol

@@ -33,13 +33,32 @@ contract AaveMoneyMarket is BaseMoneyMarket {
     function _initialize(MarketCtx memory ctx) internal virtual override {
         IPool _pool = pool();
 
-        (uint8 eModeCategoryId,) = AaveMMPayloadLib.unwrap(ctx.mmPayload);
-        _pool.setUserEMode(eModeCategoryId);
+        uint8 eModeCategoryId = AaveMMPayloadLib.unwrap(ctx.mmPayload);
+        _forceSetEModeAtInit(_pool, eModeCategoryId);
 
         _safeApproveInf(ctx.collateral, address(_pool));
         _safeApproveInf(ctx.debtAsset, address(_pool));
     }
 
+    /// @notice Enters eMode, unset any pre-existing asset that is used as
+    /// collateral if needed.
+    /// @dev A counterfactual mm address can be funded by anyone before
+    /// deployment, which can make the asset as collateral for the mm address.
+    /// Such collateral that Aave flagged (LTV != 0 outside eMode, e.g. WETH)
+    /// makes `setUserEMode` revert with InvalidCollateralInEmode.
+    /// Therefore, we unset all collateral assets before setting EMode.
+    function _forceSetEModeAtInit(IPool _pool, uint8 eModeCategoryId) internal {
+        // https://github.com/aave-dao/aave-v3-origin/blob/cff15de6d1271b0c800fc001f4aea4c263e8a597/src/contracts/protocol/libraries/logic/ValidationLogic.sol#L448
+        // We use the similar shortcut as Aave for happy case (do nothing if no bit is set in userConfBitmap)
+        uint256 userConfBitmap = _pool.getUserConfiguration(address(this)).data;
+        for (uint16 id = 0; userConfBitmap != 0; (id, userConfBitmap) = (id + 1, userConfBitmap >> 2)) {
+            bool isUsingAsCollat = (userConfBitmap & 2) != 0;
+            if (isUsingAsCollat) _pool.setUserUseReserveAsCollateral(_pool.getReserveAddressById(id), false);
+        }
+
+        _pool.setUserEMode(eModeCategoryId);
+    }
+
     function collateralBalance(MarketCtx memory ctx) public view override returns (uint256 balance) {
         return _aToken(pool(), ctx.collateral).balanceOf(address(this));
     }
@@ -56,10 +75,7 @@ contract AaveMoneyMarket is BaseMoneyMarket {
 
         actualAmount = amount;
 
-        (, bool isolationMode) = AaveMMPayloadLib.unwrap(ctx.mmPayload);
-        if (isolationMode) {
-            _pool.setUserUseReserveAsCollateral(asset, true);
-        }
+        _pool.setUserUseReserveAsCollateral(asset, true);
     }
 
     function _borrow(MarketCtx memory ctx, uint256 amount) internal virtual override returns (uint256 actualAmount) {
@@ -97,11 +113,11 @@ contract AaveMoneyMarket is BaseMoneyMarket {
     }
 
     function _aToken(IPool _pool, address asset) internal view virtual returns (IERC20) {
-        return IERC20(_pool.getReserveData(IERC20(asset)).aTokenAddress);
+        return IERC20(_pool.getReserveAToken(asset));
     }
 
     function _vToken(IPool _pool, address asset) internal view virtual returns (IERC20) {
-        return IERC20(_pool.getReserveData(IERC20(asset)).variableDebtTokenAddress);
+        return IERC20(_pool.getReserveVariableDebtToken(asset));
     }
 
     /// @dev `mmPayload` unused: Aave's price oracle is queried directly by asset address.

package/contracts/pt-looping/money-market/implementations/aave/AaveMoneyMarketView.sol

@@ -72,7 +72,7 @@ contract AaveMoneyMarketView is BaseMoneyMarketView, TokenHelper {
         override
         returns (uint256 ltv, uint256 liquidationThreshold)
     {
-        (uint8 eModeCategoryId,) = AaveMMPayloadLib.unwrap(bd.mmPayload);
+        uint8 eModeCategoryId = AaveMMPayloadLib.unwrap(bd.mmPayload);
 
         if (eModeCategoryId == 0) {
             (, ltv, liquidationThreshold,,,,,,,) = dataProvider().getReserveConfigurationData(bd.spokePt);

package/contracts/pt-looping/money-market/implementations/aave/dependencies/IPool.sol

@@ -379,13 +379,8 @@ interface IPool {
      * @param receiveAToken True if the liquidators wants to receive the collateral aTokens, `false` if he wants
      * to receive the underlying collateral asset directly
      */
-    function liquidationCall(
-        IERC20 collateral,
-        IERC20 debtAsset,
-        address user,
-        uint256 debtToCover,
-        bool receiveAToken
-    ) external;
+    function liquidationCall(IERC20 collateral, IERC20 debtAsset, address user, uint256 debtToCover, bool receiveAToken)
+        external;
 
     /**
      * @notice Allows smartcontracts to access the liquidity of the pool within one transaction,
@@ -661,4 +656,18 @@ interface IPool {
      *   0 if the action is executed directly by the user, without any middle-man
      */
     function deposit(address asset, uint256 amount, address onBehalfOf, uint16 referralCode) external;
+
+    /**
+     * @notice Returns the aToken address of a reserve.
+     * @param asset The address of the underlying asset of the reserve
+     * @return The address of the aToken
+     */
+    function getReserveAToken(address asset) external view returns (address);
+
+    /**
+     * @notice Returns the variableDebtToken address of a reserve.
+     * @param asset The address of the underlying asset of the reserve
+     * @return The address of the variableDebtToken
+     */
+    function getReserveVariableDebtToken(address asset) external view returns (address);
 }

package/contracts/router/swap-aggregator/IPSwapAggregator.sol

@@ -18,13 +18,13 @@ struct SwapDataExtra {
 enum SwapType {
     NONE,
     KYBERSWAP,
-    ODOS,
+    RESERVE_1,
     // ETH_WETH not used in Aggregator
     ETH_WETH,
     OKX,
     ONE_INCH,
     PARASWAP,
-    RESERVE_2,
+    ZEROX,
     RESERVE_3,
     RESERVE_4,
     RESERVE_5

package/contracts/router/swap-aggregator/PendleSwap.sol

@@ -33,15 +33,37 @@ contract PendleSwap is
 
     function swap(address tokenIn, uint256 amountIn, SwapData calldata data) external payable {
         _approveForExtRouter(tokenIn, data);
-        data.extRouter
-            .functionCallWithValue(
-                data.needScale ? _getScaledInputData(data.swapType, data.extCalldata, amountIn) : data.extCalldata,
-                tokenIn == NATIVE ? amountIn : 0
-            );
+        if (data.swapType == SwapType.ZEROX) {
+            _zeroExSwap(tokenIn, amountIn, data);
+        } else {
+            data.extRouter
+                .functionCallWithValue(
+                    data.needScale ? _getScaledInputData(data.swapType, data.extCalldata, amountIn) : data.extCalldata,
+                    tokenIn == NATIVE ? amountIn : 0
+                );
+        }
 
         emit SwapSingle(data.swapType, tokenIn, amountIn);
     }
 
+    /// @dev extCalldata = abi.encode(tokenOut, quotedAmountIn, quotedMinOut, execCalldata), where execCalldata is the
+    /// 0x AllowanceHolder.exec calldata, quoted with sellEntireBalance and the taker as recipient. 0x's own minBuyAmount
+    /// is a fixed number, so it is only a backstop. The binding minimum is enforced here, scaled to the actual amountIn
+    /// if needScale. The output is forwarded to msg.sender.
+    function _zeroExSwap(address tokenIn, uint256 amountIn, SwapData calldata data) internal {
+        (address tokenOut, uint256 quotedAmountIn, uint256 quotedMinOut, bytes memory execCalldata) =
+            abi.decode(data.extCalldata, (address, uint256, uint256, bytes));
+
+        uint256 balBefore = _selfBalance(tokenOut);
+        data.extRouter.functionCallWithValue(execCalldata, tokenIn == NATIVE ? amountIn : 0);
+        uint256 netOut = _selfBalance(tokenOut) - balBefore;
+
+        uint256 minOut = data.needScale ? (quotedMinOut * amountIn) / quotedAmountIn : quotedMinOut;
+        require(netOut >= minOut, "PendleSwap: 0x insufficient out");
+
+        _transferOut(tokenOut, msg.sender, netOut);
+    }
+
     function _approveForExtRouter(address token, SwapData calldata data) internal {
         if (token == NATIVE) return;
 
@@ -69,8 +91,6 @@ contract PendleSwap is
                 IKyberScalingHelper(KYBER_SCALING_HELPER).getScaledInputData(rawCallData, amountIn);
 
             require(isSuccess, "PendleSwap: Kyber scaling failed");
-        } else if (swapType == SwapType.ODOS) {
-            scaledCallData = _odosScaling(rawCallData, amountIn);
         } else if (swapType == SwapType.PARASWAP) {
             scaledCallData = _paraswapScaling(rawCallData, amountIn);
         } else if (swapType == SwapType.OKX) {
@@ -80,29 +100,6 @@ contract PendleSwap is
         }
     }
 
-    function _odosScaling(bytes calldata rawCallData, uint256 amountIn)
-        internal
-        pure
-        returns (bytes memory scaledCallData)
-    {
-        bytes4 selector = bytes4(rawCallData[:4]);
-        bytes calldata dataToDecode = rawCallData[4:];
-
-        assert(selector == IOdosRouterV2.swap.selector);
-        (
-            IOdosRouterV2.swapTokenInfo memory tokenInfo,
-            bytes memory pathDefinition,
-            address executor,
-            uint32 referralCode
-        ) = abi.decode(dataToDecode, (IOdosRouterV2.swapTokenInfo, bytes, address, uint32));
-
-        tokenInfo.outputQuote = (tokenInfo.outputQuote * amountIn) / tokenInfo.inputAmount;
-        tokenInfo.outputMin = (tokenInfo.outputMin * amountIn) / tokenInfo.inputAmount;
-        tokenInfo.inputAmount = amountIn;
-
-        return abi.encodeWithSelector(selector, tokenInfo, pathDefinition, executor, referralCode);
-    }
-
     receive() external payable {}
 
     function _authorizeUpgrade(address) internal virtual override onlyOwner {}
@@ -114,20 +111,3 @@ interface IKyberScalingHelper {
         view
         returns (bool isSuccess, bytes memory data);
 }
-
-interface IOdosRouterV2 {
-    struct swapTokenInfo {
-        address inputToken;
-        uint256 inputAmount;
-        address inputReceiver;
-        address outputToken;
-        uint256 outputQuote;
-        uint256 outputMin;
-        address outputReceiver;
-    }
-
-    function swap(swapTokenInfo memory tokenInfo, bytes calldata pathDefinition, address executor, uint32 referralCode)
-        external
-        payable
-        returns (uint256 amountOut);
-}

package/package.json

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

package/typechain-types/IOwnable.ts

@@ -24,14 +24,17 @@ import type {
 export interface IOwnableInterface extends utils.Interface {
   contractName: "IOwnable";
   functions: {
+    "owner()": FunctionFragment;
     "transferOwnership(address,bool,bool)": FunctionFragment;
   };
 
+  encodeFunctionData(functionFragment: "owner", values?: undefined): string;
   encodeFunctionData(
     functionFragment: "transferOwnership",
     values: [string, boolean, boolean]
   ): string;
 
+  decodeFunctionResult(functionFragment: "owner", data: BytesLike): Result;
   decodeFunctionResult(
     functionFragment: "transferOwnership",
     data: BytesLike
@@ -68,6 +71,10 @@ export interface IOwnable extends BaseContract {
   removeListener: OnEvent<this>;
 
   functions: {
+    owner(
+      overrides?: Overrides & { from?: string | Promise<string> }
+    ): Promise<ContractTransaction>;
+
     transferOwnership(
       newOwner: string,
       direct: boolean,
@@ -76,6 +83,10 @@ export interface IOwnable extends BaseContract {
     ): Promise<ContractTransaction>;
   };
 
+  owner(
+    overrides?: Overrides & { from?: string | Promise<string> }
+  ): Promise<ContractTransaction>;
+
   transferOwnership(
     newOwner: string,
     direct: boolean,
@@ -84,6 +95,8 @@ export interface IOwnable extends BaseContract {
   ): Promise<ContractTransaction>;
 
   callStatic: {
+    owner(overrides?: CallOverrides): Promise<string>;
+
     transferOwnership(
       newOwner: string,
       direct: boolean,
@@ -95,6 +108,10 @@ export interface IOwnable extends BaseContract {
   filters: {};
 
   estimateGas: {
+    owner(
+      overrides?: Overrides & { from?: string | Promise<string> }
+    ): Promise<BigNumber>;
+
     transferOwnership(
       newOwner: string,
       direct: boolean,
@@ -104,6 +121,10 @@ export interface IOwnable extends BaseContract {
   };
 
   populateTransaction: {
+    owner(
+      overrides?: Overrides & { from?: string | Promise<string> }
+    ): Promise<PopulatedTransaction>;
+
     transferOwnership(
       newOwner: string,
       direct: boolean,

package/typechain-types/IPCommonPoolDeployHelperV2.ts

@@ -87,10 +87,7 @@ export interface IPCommonPoolDeployHelperV2Interface extends utils.Interface {
   contractName: "IPCommonPoolDeployHelperV2";
   functions: {
     "deploy5115MarketAndSeedLiquidity(address,(uint32,uint256,uint256,uint256,uint256),address,uint256)": FunctionFragment;
-    "deployCommonMarketById(bytes32,bytes,(uint32,uint256,uint256,uint256,uint256),address,uint256,address)": FunctionFragment;
-    "deployERC20Market(bytes,(uint32,uint256,uint256,uint256,uint256),address,uint256,address)": FunctionFragment;
-    "deployERC4626Market(bytes,(uint32,uint256,uint256,uint256,uint256),address,uint256,address)": FunctionFragment;
-    "deployERC4626NotRedeemableMarket(bytes,(uint32,uint256,uint256,uint256,uint256),address,uint256,address)": FunctionFragment;
+    "deployCommonMarketById(bytes32,bytes,bytes,(uint32,uint256,uint256,uint256,uint256),address,uint256,address)": FunctionFragment;
   };
 
   encodeFunctionData(
@@ -107,35 +104,6 @@ export interface IPCommonPoolDeployHelperV2Interface extends utils.Interface {
     values: [
       BytesLike,
       BytesLike,
-      IPPoolDeployHelperV2.PoolConfigStruct,
-      string,
-      BigNumberish,
-      string
-    ]
-  ): string;
-  encodeFunctionData(
-    functionFragment: "deployERC20Market",
-    values: [
-      BytesLike,
-      IPPoolDeployHelperV2.PoolConfigStruct,
-      string,
-      BigNumberish,
-      string
-    ]
-  ): string;
-  encodeFunctionData(
-    functionFragment: "deployERC4626Market",
-    values: [
-      BytesLike,
-      IPPoolDeployHelperV2.PoolConfigStruct,
-      string,
-      BigNumberish,
-      string
-    ]
-  ): string;
-  encodeFunctionData(
-    functionFragment: "deployERC4626NotRedeemableMarket",
-    values: [
       BytesLike,
       IPPoolDeployHelperV2.PoolConfigStruct,
       string,
@@ -152,18 +120,6 @@ export interface IPCommonPoolDeployHelperV2Interface extends utils.Interface {
     functionFragment: "deployCommonMarketById",
     data: BytesLike
   ): Result;
-  decodeFunctionResult(
-    functionFragment: "deployERC20Market",
-    data: BytesLike
-  ): Result;
-  decodeFunctionResult(
-    functionFragment: "deployERC4626Market",
-    data: BytesLike
-  ): Result;
-  decodeFunctionResult(
-    functionFragment: "deployERC4626NotRedeemableMarket",
-    data: BytesLike
-  ): Result;
 
   events: {
     "MarketDeployment(tuple,tuple)": EventFragment;
@@ -222,9 +178,10 @@ export interface IPCommonPoolDeployHelperV2 extends BaseContract {
       overrides?: PayableOverrides & { from?: string | Promise<string> }
     ): Promise<ContractTransaction>;
 
-    deployCommonMarketById(
+    "deployCommonMarketById(bytes32,bytes,bytes,(uint32,uint256,uint256,uint256,uint256),address,uint256,address)"(
       id: BytesLike,
       constructorParams: BytesLike,
+      initData: BytesLike,
       config: IPPoolDeployHelperV2.PoolConfigStruct,
       tokenToSeedLiqudity: string,
       amountToSeed: BigNumberish,
@@ -232,25 +189,8 @@ export interface IPCommonPoolDeployHelperV2 extends BaseContract {
       overrides?: Overrides & { from?: string | Promise<string> }
     ): Promise<ContractTransaction>;
 
-    deployERC20Market(
-      constructorParams: BytesLike,
-      config: IPPoolDeployHelperV2.PoolConfigStruct,
-      tokenToSeedLiqudity: string,
-      amountToSeed: BigNumberish,
-      syOwner: string,
-      overrides?: Overrides & { from?: string | Promise<string> }
-    ): Promise<ContractTransaction>;
-
-    deployERC4626Market(
-      constructorParams: BytesLike,
-      config: IPPoolDeployHelperV2.PoolConfigStruct,
-      tokenToSeedLiqudity: string,
-      amountToSeed: BigNumberish,
-      syOwner: string,
-      overrides?: Overrides & { from?: string | Promise<string> }
-    ): Promise<ContractTransaction>;
-
-    deployERC4626NotRedeemableMarket(
+    "deployCommonMarketById(bytes32,bytes,(uint32,uint256,uint256,uint256,uint256),address,uint256,address)"(
+      id: BytesLike,
       constructorParams: BytesLike,
       config: IPPoolDeployHelperV2.PoolConfigStruct,
       tokenToSeedLiqudity: string,
@@ -268,9 +208,10 @@ export interface IPCommonPoolDeployHelperV2 extends BaseContract {
     overrides?: PayableOverrides & { from?: string | Promise<string> }
   ): Promise<ContractTransaction>;
 
-  deployCommonMarketById(
+  "deployCommonMarketById(bytes32,bytes,bytes,(uint32,uint256,uint256,uint256,uint256),address,uint256,address)"(
     id: BytesLike,
     constructorParams: BytesLike,
+    initData: BytesLike,
     config: IPPoolDeployHelperV2.PoolConfigStruct,
     tokenToSeedLiqudity: string,
     amountToSeed: BigNumberish,
@@ -278,25 +219,8 @@ export interface IPCommonPoolDeployHelperV2 extends BaseContract {
     overrides?: Overrides & { from?: string | Promise<string> }
   ): Promise<ContractTransaction>;
 
-  deployERC20Market(
-    constructorParams: BytesLike,
-    config: IPPoolDeployHelperV2.PoolConfigStruct,
-    tokenToSeedLiqudity: string,
-    amountToSeed: BigNumberish,
-    syOwner: string,
-    overrides?: Overrides & { from?: string | Promise<string> }
-  ): Promise<ContractTransaction>;
-
-  deployERC4626Market(
-    constructorParams: BytesLike,
-    config: IPPoolDeployHelperV2.PoolConfigStruct,
-    tokenToSeedLiqudity: string,
-    amountToSeed: BigNumberish,
-    syOwner: string,
-    overrides?: Overrides & { from?: string | Promise<string> }
-  ): Promise<ContractTransaction>;
-
-  deployERC4626NotRedeemableMarket(
+  "deployCommonMarketById(bytes32,bytes,(uint32,uint256,uint256,uint256,uint256),address,uint256,address)"(
+    id: BytesLike,
     constructorParams: BytesLike,
     config: IPPoolDeployHelperV2.PoolConfigStruct,
     tokenToSeedLiqudity: string,
@@ -314,9 +238,10 @@ export interface IPCommonPoolDeployHelperV2 extends BaseContract {
       overrides?: CallOverrides
     ): Promise<IPPoolDeployHelperV2.PoolDeploymentAddrsStructOutput>;
 
-    deployCommonMarketById(
+    "deployCommonMarketById(bytes32,bytes,bytes,(uint32,uint256,uint256,uint256,uint256),address,uint256,address)"(
       id: BytesLike,
       constructorParams: BytesLike,
+      initData: BytesLike,
       config: IPPoolDeployHelperV2.PoolConfigStruct,
       tokenToSeedLiqudity: string,
       amountToSeed: BigNumberish,
@@ -324,25 +249,8 @@ export interface IPCommonPoolDeployHelperV2 extends BaseContract {
       overrides?: CallOverrides
     ): Promise<IPPoolDeployHelperV2.PoolDeploymentAddrsStructOutput>;
 
-    deployERC20Market(
-      constructorParams: BytesLike,
-      config: IPPoolDeployHelperV2.PoolConfigStruct,
-      tokenToSeedLiqudity: string,
-      amountToSeed: BigNumberish,
-      syOwner: string,
-      overrides?: CallOverrides
-    ): Promise<IPPoolDeployHelperV2.PoolDeploymentAddrsStructOutput>;
-
-    deployERC4626Market(
-      constructorParams: BytesLike,
-      config: IPPoolDeployHelperV2.PoolConfigStruct,
-      tokenToSeedLiqudity: string,
-      amountToSeed: BigNumberish,
-      syOwner: string,
-      overrides?: CallOverrides
-    ): Promise<IPPoolDeployHelperV2.PoolDeploymentAddrsStructOutput>;
-
-    deployERC4626NotRedeemableMarket(
+    "deployCommonMarketById(bytes32,bytes,(uint32,uint256,uint256,uint256,uint256),address,uint256,address)"(
+      id: BytesLike,
       constructorParams: BytesLike,
       config: IPPoolDeployHelperV2.PoolConfigStruct,
       tokenToSeedLiqudity: string,
@@ -369,9 +277,10 @@ export interface IPCommonPoolDeployHelperV2 extends BaseContract {
       overrides?: PayableOverrides & { from?: string | Promise<string> }
     ): Promise<BigNumber>;
 
-    deployCommonMarketById(
+    "deployCommonMarketById(bytes32,bytes,bytes,(uint32,uint256,uint256,uint256,uint256),address,uint256,address)"(
       id: BytesLike,
       constructorParams: BytesLike,
+      initData: BytesLike,
       config: IPPoolDeployHelperV2.PoolConfigStruct,
       tokenToSeedLiqudity: string,
       amountToSeed: BigNumberish,
@@ -379,25 +288,8 @@ export interface IPCommonPoolDeployHelperV2 extends BaseContract {
       overrides?: Overrides & { from?: string | Promise<string> }
     ): Promise<BigNumber>;
 
-    deployERC20Market(
-      constructorParams: BytesLike,
-      config: IPPoolDeployHelperV2.PoolConfigStruct,
-      tokenToSeedLiqudity: string,
-      amountToSeed: BigNumberish,
-      syOwner: string,
-      overrides?: Overrides & { from?: string | Promise<string> }
-    ): Promise<BigNumber>;
-
-    deployERC4626Market(
-      constructorParams: BytesLike,
-      config: IPPoolDeployHelperV2.PoolConfigStruct,
-      tokenToSeedLiqudity: string,
-      amountToSeed: BigNumberish,
-      syOwner: string,
-      overrides?: Overrides & { from?: string | Promise<string> }
-    ): Promise<BigNumber>;
-
-    deployERC4626NotRedeemableMarket(
+    "deployCommonMarketById(bytes32,bytes,(uint32,uint256,uint256,uint256,uint256),address,uint256,address)"(
+      id: BytesLike,
       constructorParams: BytesLike,
       config: IPPoolDeployHelperV2.PoolConfigStruct,
       tokenToSeedLiqudity: string,
@@ -416,9 +308,10 @@ export interface IPCommonPoolDeployHelperV2 extends BaseContract {
       overrides?: PayableOverrides & { from?: string | Promise<string> }
     ): Promise<PopulatedTransaction>;
 
-    deployCommonMarketById(
+    "deployCommonMarketById(bytes32,bytes,bytes,(uint32,uint256,uint256,uint256,uint256),address,uint256,address)"(
       id: BytesLike,
       constructorParams: BytesLike,
+      initData: BytesLike,
       config: IPPoolDeployHelperV2.PoolConfigStruct,
       tokenToSeedLiqudity: string,
       amountToSeed: BigNumberish,
@@ -426,25 +319,8 @@ export interface IPCommonPoolDeployHelperV2 extends BaseContract {
       overrides?: Overrides & { from?: string | Promise<string> }
     ): Promise<PopulatedTransaction>;
 
-    deployERC20Market(
-      constructorParams: BytesLike,
-      config: IPPoolDeployHelperV2.PoolConfigStruct,
-      tokenToSeedLiqudity: string,
-      amountToSeed: BigNumberish,
-      syOwner: string,
-      overrides?: Overrides & { from?: string | Promise<string> }
-    ): Promise<PopulatedTransaction>;
-
-    deployERC4626Market(
-      constructorParams: BytesLike,
-      config: IPPoolDeployHelperV2.PoolConfigStruct,
-      tokenToSeedLiqudity: string,
-      amountToSeed: BigNumberish,
-      syOwner: string,
-      overrides?: Overrides & { from?: string | Promise<string> }
-    ): Promise<PopulatedTransaction>;
-
-    deployERC4626NotRedeemableMarket(
+    "deployCommonMarketById(bytes32,bytes,(uint32,uint256,uint256,uint256,uint256),address,uint256,address)"(
+      id: BytesLike,
       constructorParams: BytesLike,
       config: IPPoolDeployHelperV2.PoolConfigStruct,
       tokenToSeedLiqudity: string,

package/typechain-types/IPLoopPositionBox.ts

@@ -23,26 +23,29 @@ import type {
   OnEvent,
 } from "./common";
 
-export type ApprovedCallStruct = {
-  token: string;
-  amount: BigNumberish;
-  approveTo: string;
-  callTo: string;
-  data: BytesLike;
+export type BoxCallStruct = {
+  tokens: string[];
+  amounts: BigNumberish[];
+  nativeAmount: BigNumberish;
+  approve: string;
+  extRouter: string;
+  callData: BytesLike;
 };
 
-export type ApprovedCallStructOutput = [
-  string,
+export type BoxCallStructOutput = [
+  string[],
+  BigNumber[],
   BigNumber,
   string,
   string,
   string
 ] & {
-  token: string;
-  amount: BigNumber;
-  approveTo: string;
-  callTo: string;
-  data: string;
+  tokens: string[];
+  amounts: BigNumber[];
+  nativeAmount: BigNumber;
+  approve: string;
+  extRouter: string;
+  callData: string;
 };
 
 export interface IPLoopPositionBoxInterface extends utils.Interface {
@@ -52,7 +55,7 @@ export interface IPLoopPositionBoxInterface extends utils.Interface {
     "MANAGER()": FunctionFragment;
     "OWNER()": FunctionFragment;
     "SPOKE_MONEY_MARKET()": FunctionFragment;
-    "approveAndCall((address,uint256,address,address,bytes),address)": FunctionFragment;
+    "approveAndCall((address[],uint256[],uint256,address,address,bytes),address)": FunctionFragment;
     "initialize(address,bytes32,address,address,address)": FunctionFragment;
     "withdrawTo(address,address,uint256)": FunctionFragment;
   };
@@ -66,7 +69,7 @@ export interface IPLoopPositionBoxInterface extends utils.Interface {
   ): string;
   encodeFunctionData(
     functionFragment: "approveAndCall",
-    values: [ApprovedCallStruct, string]
+    values: [BoxCallStruct, string]
   ): string;
   encodeFunctionData(
     functionFragment: "initialize",
@@ -131,7 +134,7 @@ export interface IPLoopPositionBox extends BaseContract {
     SPOKE_MONEY_MARKET(overrides?: CallOverrides): Promise<[string]>;
 
     approveAndCall(
-      call: ApprovedCallStruct,
+      call: BoxCallStruct,
       nativeRefund: string,
       overrides?: PayableOverrides & { from?: string | Promise<string> }
     ): Promise<ContractTransaction>;
@@ -162,7 +165,7 @@ export interface IPLoopPositionBox extends BaseContract {
   SPOKE_MONEY_MARKET(overrides?: CallOverrides): Promise<string>;
 
   approveAndCall(
-    call: ApprovedCallStruct,
+    call: BoxCallStruct,
     nativeRefund: string,
     overrides?: PayableOverrides & { from?: string | Promise<string> }
   ): Promise<ContractTransaction>;
@@ -193,7 +196,7 @@ export interface IPLoopPositionBox extends BaseContract {
     SPOKE_MONEY_MARKET(overrides?: CallOverrides): Promise<string>;
 
     approveAndCall(
-      call: ApprovedCallStruct,
+      call: BoxCallStruct,
       nativeRefund: string,
       overrides?: CallOverrides
     ): Promise<string>;
@@ -227,7 +230,7 @@ export interface IPLoopPositionBox extends BaseContract {
     SPOKE_MONEY_MARKET(overrides?: CallOverrides): Promise<BigNumber>;
 
     approveAndCall(
-      call: ApprovedCallStruct,
+      call: BoxCallStruct,
       nativeRefund: string,
       overrides?: PayableOverrides & { from?: string | Promise<string> }
     ): Promise<BigNumber>;
@@ -261,7 +264,7 @@ export interface IPLoopPositionBox extends BaseContract {
     ): Promise<PopulatedTransaction>;
 
     approveAndCall(
-      call: ApprovedCallStruct,
+      call: BoxCallStruct,
       nativeRefund: string,
       overrides?: PayableOverrides & { from?: string | Promise<string> }
     ): Promise<PopulatedTransaction>;