@pendle/core-v2 1.0.2-mainnet → 1.1.0-testnet

package/typechain-types/IPActionMintRedeem.ts

@@ -23,13 +23,27 @@ import type {
   OnEvent,
 } from "./common";
 
+export type SwapDataStruct = {
+  swapType: BigNumberish;
+  extRouter: string;
+  extCalldata: BytesLike;
+  needScale: boolean;
+};
+
+export type SwapDataStructOutput = [number, string, string, boolean] & {
+  swapType: number;
+  extRouter: string;
+  extCalldata: string;
+  needScale: boolean;
+};
+
 export type TokenInputStruct = {
   tokenIn: string;
   netTokenIn: BigNumberish;
   tokenMintSy: string;
   bulk: string;
-  kyberRouter: string;
-  kybercall: BytesLike;
+  pendleSwap: string;
+  swapData: SwapDataStruct;
 };
 
 export type TokenInputStructOutput = [
@@ -38,14 +52,14 @@ export type TokenInputStructOutput = [
   string,
   string,
   string,
-  string
+  SwapDataStructOutput
 ] & {
   tokenIn: string;
   netTokenIn: BigNumber;
   tokenMintSy: string;
   bulk: string;
-  kyberRouter: string;
-  kybercall: string;
+  pendleSwap: string;
+  swapData: SwapDataStructOutput;
 };
 
 export type TokenOutputStruct = {
@@ -53,8 +67,8 @@ export type TokenOutputStruct = {
   minTokenOut: BigNumberish;
   tokenRedeemSy: string;
   bulk: string;
-  kyberRouter: string;
-  kybercall: BytesLike;
+  pendleSwap: string;
+  swapData: SwapDataStruct;
 };
 
 export type TokenOutputStructOutput = [
@@ -63,70 +77,26 @@ export type TokenOutputStructOutput = [
   string,
   string,
   string,
-  string
+  SwapDataStructOutput
 ] & {
   tokenOut: string;
   minTokenOut: BigNumber;
   tokenRedeemSy: string;
   bulk: string;
-  kyberRouter: string;
-  kybercall: string;
+  pendleSwap: string;
+  swapData: SwapDataStructOutput;
 };
 
-export declare namespace IPActionMintRedeem {
-  export type RouterYtRedeemStructStruct = {
-    yts: string[];
-    syAddrs: string[];
-    tokenRedeemSys: string[];
-    bulks: string[];
-  };
-
-  export type RouterYtRedeemStructStructOutput = [
-    string[],
-    string[],
-    string[],
-    string[]
-  ] & {
-    yts: string[];
-    syAddrs: string[];
-    tokenRedeemSys: string[];
-    bulks: string[];
-  };
-
-  export type RouterSwapAllStructStruct = {
-    tokens: string[];
-    kybercalls: BytesLike[];
-    kyberRouter: string;
-    outputToken: string;
-    minTokenOut: BigNumberish;
-  };
-
-  export type RouterSwapAllStructStructOutput = [
-    string[],
-    string[],
-    string,
-    string,
-    BigNumber
-  ] & {
-    tokens: string[];
-    kybercalls: string[];
-    kyberRouter: string;
-    outputToken: string;
-    minTokenOut: BigNumber;
-  };
-}
-
 export interface IPActionMintRedeemInterface extends utils.Interface {
   contractName: "IPActionMintRedeem";
   functions: {
     "mintPyFromSy(address,address,uint256,uint256)": FunctionFragment;
-    "mintPyFromToken(address,address,uint256,(address,uint256,address,address,address,bytes))": FunctionFragment;
-    "mintSyFromToken(address,address,uint256,(address,uint256,address,address,address,bytes))": FunctionFragment;
+    "mintPyFromToken(address,address,uint256,(address,uint256,address,address,address,(uint8,address,bytes,bool)))": FunctionFragment;
+    "mintSyFromToken(address,address,uint256,(address,uint256,address,address,address,(uint8,address,bytes,bool)))": FunctionFragment;
     "redeemDueInterestAndRewards(address,address[],address[],address[])": 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,address,bytes))": FunctionFragment;
-    "redeemSyToToken(address,address,uint256,(address,uint256,address,address,address,bytes))": FunctionFragment;
+    "redeemPyToToken(address,address,uint256,(address,uint256,address,address,address,(uint8,address,bytes,bool)))": FunctionFragment;
+    "redeemSyToToken(address,address,uint256,(address,uint256,address,address,address,(uint8,address,bytes,bool)))": FunctionFragment;
   };
 
   encodeFunctionData(
@@ -145,15 +115,6 @@ export interface IPActionMintRedeemInterface extends utils.Interface {
     functionFragment: "redeemDueInterestAndRewards",
     values: [string, string[], string[], string[]]
   ): string;
-  encodeFunctionData(
-    functionFragment: "redeemDueInterestAndRewardsThenSwapAll",
-    values: [
-      string[],
-      IPActionMintRedeem.RouterYtRedeemStructStruct,
-      string[],
-      IPActionMintRedeem.RouterSwapAllStructStruct
-    ]
-  ): string;
   encodeFunctionData(
     functionFragment: "redeemPyToSy",
     values: [string, string, BigNumberish, BigNumberish]
@@ -183,10 +144,6 @@ export interface IPActionMintRedeemInterface extends utils.Interface {
     functionFragment: "redeemDueInterestAndRewards",
     data: BytesLike
   ): Result;
-  decodeFunctionResult(
-    functionFragment: "redeemDueInterestAndRewardsThenSwapAll",
-    data: BytesLike
-  ): Result;
   decodeFunctionResult(
     functionFragment: "redeemPyToSy",
     data: BytesLike
@@ -204,8 +161,6 @@ export interface IPActionMintRedeemInterface extends utils.Interface {
     "MintPyFromSy(address,address,address,uint256,uint256)": EventFragment;
     "MintPyFromToken(address,address,address,address,uint256,uint256)": EventFragment;
     "MintSyFromToken(address,address,address,address,uint256,uint256)": EventFragment;
-    "RedeemDueInterestAndRewards(address,address[],address[],address[],uint256[][],uint256[],uint256[][],uint256[][])": EventFragment;
-    "RedeemDueInterestAndRewardsThenSwapAll(address,address[],address[],address[],address,uint256)": EventFragment;
     "RedeemPyToSy(address,address,address,uint256,uint256)": EventFragment;
     "RedeemPyToToken(address,address,address,address,uint256,uint256)": EventFragment;
     "RedeemSyToToken(address,address,address,address,uint256,uint256)": EventFragment;
@@ -214,12 +169,6 @@ export interface IPActionMintRedeemInterface extends utils.Interface {
   getEvent(nameOrSignatureOrTopic: "MintPyFromSy"): EventFragment;
   getEvent(nameOrSignatureOrTopic: "MintPyFromToken"): EventFragment;
   getEvent(nameOrSignatureOrTopic: "MintSyFromToken"): EventFragment;
-  getEvent(
-    nameOrSignatureOrTopic: "RedeemDueInterestAndRewards"
-  ): EventFragment;
-  getEvent(
-    nameOrSignatureOrTopic: "RedeemDueInterestAndRewardsThenSwapAll"
-  ): EventFragment;
   getEvent(nameOrSignatureOrTopic: "RedeemPyToSy"): EventFragment;
   getEvent(nameOrSignatureOrTopic: "RedeemPyToToken"): EventFragment;
   getEvent(nameOrSignatureOrTopic: "RedeemSyToToken"): EventFragment;
@@ -266,47 +215,6 @@ export type MintSyFromTokenEvent = TypedEvent<
 
 export type MintSyFromTokenEventFilter = TypedEventFilter<MintSyFromTokenEvent>;
 
-export type RedeemDueInterestAndRewardsEvent = TypedEvent<
-  [
-    string,
-    string[],
-    string[],
-    string[],
-    BigNumber[][],
-    BigNumber[],
-    BigNumber[][],
-    BigNumber[][]
-  ],
-  {
-    user: string;
-    sys: string[];
-    yts: string[];
-    markets: string[];
-    syRewards: BigNumber[][];
-    ytInterests: BigNumber[];
-    ytRewards: BigNumber[][];
-    marketRewards: BigNumber[][];
-  }
->;
-
-export type RedeemDueInterestAndRewardsEventFilter =
-  TypedEventFilter<RedeemDueInterestAndRewardsEvent>;
-
-export type RedeemDueInterestAndRewardsThenSwapAllEvent = TypedEvent<
-  [string, string[], string[], string[], string, BigNumber],
-  {
-    user: string;
-    sys: string[];
-    yts: string[];
-    markets: string[];
-    tokenOut: string;
-    netTokenOut: BigNumber;
-  }
->;
-
-export type RedeemDueInterestAndRewardsThenSwapAllEventFilter =
-  TypedEventFilter<RedeemDueInterestAndRewardsThenSwapAllEvent>;
-
 export type RedeemPyToSyEvent = TypedEvent<
   [string, string, string, BigNumber, BigNumber],
   {
@@ -408,14 +316,6 @@ export interface IPActionMintRedeem extends BaseContract {
       overrides?: Overrides & { from?: string | Promise<string> }
     ): Promise<ContractTransaction>;
 
-    redeemDueInterestAndRewardsThenSwapAll(
-      sys: string[],
-      dataYT: IPActionMintRedeem.RouterYtRedeemStructStruct,
-      markets: string[],
-      dataSwap: IPActionMintRedeem.RouterSwapAllStructStruct,
-      overrides?: Overrides & { from?: string | Promise<string> }
-    ): Promise<ContractTransaction>;
-
     redeemPyToSy(
       receiver: string,
       YT: string,
@@ -473,14 +373,6 @@ export interface IPActionMintRedeem extends BaseContract {
     overrides?: Overrides & { from?: string | Promise<string> }
   ): Promise<ContractTransaction>;
 
-  redeemDueInterestAndRewardsThenSwapAll(
-    sys: string[],
-    dataYT: IPActionMintRedeem.RouterYtRedeemStructStruct,
-    markets: string[],
-    dataSwap: IPActionMintRedeem.RouterSwapAllStructStruct,
-    overrides?: Overrides & { from?: string | Promise<string> }
-  ): Promise<ContractTransaction>;
-
   redeemPyToSy(
     receiver: string,
     YT: string,
@@ -536,27 +428,7 @@ export interface IPActionMintRedeem extends BaseContract {
       yts: string[],
       markets: string[],
       overrides?: CallOverrides
-    ): Promise<
-      [BigNumber[][], BigNumber[], BigNumber[][], BigNumber[][]] & {
-        syRewards: BigNumber[][];
-        ytInterests: BigNumber[];
-        ytRewards: BigNumber[][];
-        marketRewards: BigNumber[][];
-      }
-    >;
-
-    redeemDueInterestAndRewardsThenSwapAll(
-      sys: string[],
-      dataYT: IPActionMintRedeem.RouterYtRedeemStructStruct,
-      markets: string[],
-      dataSwap: IPActionMintRedeem.RouterSwapAllStructStruct,
-      overrides?: CallOverrides
-    ): Promise<
-      [BigNumber, BigNumber[]] & {
-        netTokenOut: BigNumber;
-        amountsSwapped: BigNumber[];
-      }
-    >;
+    ): Promise<void>;
 
     redeemPyToSy(
       receiver: string,
@@ -633,44 +505,6 @@ export interface IPActionMintRedeem extends BaseContract {
       netSyOut?: null
     ): MintSyFromTokenEventFilter;
 
-    "RedeemDueInterestAndRewards(address,address[],address[],address[],uint256[][],uint256[],uint256[][],uint256[][])"(
-      user?: string | null,
-      sys?: null,
-      yts?: null,
-      markets?: null,
-      syRewards?: null,
-      ytInterests?: null,
-      ytRewards?: null,
-      marketRewards?: null
-    ): RedeemDueInterestAndRewardsEventFilter;
-    RedeemDueInterestAndRewards(
-      user?: string | null,
-      sys?: null,
-      yts?: null,
-      markets?: null,
-      syRewards?: null,
-      ytInterests?: null,
-      ytRewards?: null,
-      marketRewards?: null
-    ): RedeemDueInterestAndRewardsEventFilter;
-
-    "RedeemDueInterestAndRewardsThenSwapAll(address,address[],address[],address[],address,uint256)"(
-      user?: string | null,
-      sys?: null,
-      yts?: null,
-      markets?: null,
-      tokenOut?: string | null,
-      netTokenOut?: null
-    ): RedeemDueInterestAndRewardsThenSwapAllEventFilter;
-    RedeemDueInterestAndRewardsThenSwapAll(
-      user?: string | null,
-      sys?: null,
-      yts?: null,
-      markets?: null,
-      tokenOut?: string | null,
-      netTokenOut?: null
-    ): RedeemDueInterestAndRewardsThenSwapAllEventFilter;
-
     "RedeemPyToSy(address,address,address,uint256,uint256)"(
       caller?: string | null,
       receiver?: string | null,
@@ -754,14 +588,6 @@ export interface IPActionMintRedeem extends BaseContract {
       overrides?: Overrides & { from?: string | Promise<string> }
     ): Promise<BigNumber>;
 
-    redeemDueInterestAndRewardsThenSwapAll(
-      sys: string[],
-      dataYT: IPActionMintRedeem.RouterYtRedeemStructStruct,
-      markets: string[],
-      dataSwap: IPActionMintRedeem.RouterSwapAllStructStruct,
-      overrides?: Overrides & { from?: string | Promise<string> }
-    ): Promise<BigNumber>;
-
     redeemPyToSy(
       receiver: string,
       YT: string,
@@ -820,14 +646,6 @@ export interface IPActionMintRedeem extends BaseContract {
       overrides?: Overrides & { from?: string | Promise<string> }
     ): Promise<PopulatedTransaction>;
 
-    redeemDueInterestAndRewardsThenSwapAll(
-      sys: string[],
-      dataYT: IPActionMintRedeem.RouterYtRedeemStructStruct,
-      markets: string[],
-      dataSwap: IPActionMintRedeem.RouterSwapAllStructStruct,
-      overrides?: Overrides & { from?: string | Promise<string> }
-    ): Promise<PopulatedTransaction>;
-
     redeemPyToSy(
       receiver: string,
       YT: string,

package/typechain-types/IPActionMisc.ts

@@ -4,9 +4,11 @@
 import {
   BaseContract,
   BigNumber,
-  BigNumberish,
   BytesLike,
   CallOverrides,
+  ContractTransaction,
+  Overrides,
+  PayableOverrides,
   PopulatedTransaction,
   Signer,
   utils,
@@ -20,18 +22,47 @@ import type {
   OnEvent,
 } from "./common";
 
+export declare namespace IPActionMisc {
+  export type MultiApprovalStruct = { tokens: string[]; spender: string };
+
+  export type MultiApprovalStructOutput = [string[], string] & {
+    tokens: string[];
+    spender: string;
+  };
+
+  export type Call3Struct = { allowFailure: boolean; callData: BytesLike };
+
+  export type Call3StructOutput = [boolean, string] & {
+    allowFailure: boolean;
+    callData: string;
+  };
+
+  export type ResultStruct = { success: boolean; returnData: BytesLike };
+
+  export type ResultStructOutput = [boolean, string] & {
+    success: boolean;
+    returnData: string;
+  };
+}
+
 export interface IPActionMiscInterface extends utils.Interface {
   contractName: "IPActionMisc";
   functions: {
-    "consult(address,uint32)": FunctionFragment;
+    "approveInf((address[],address)[])": FunctionFragment;
+    "batchExec((bool,bytes)[])": FunctionFragment;
   };
 
   encodeFunctionData(
-    functionFragment: "consult",
-    values: [string, BigNumberish]
+    functionFragment: "approveInf",
+    values: [IPActionMisc.MultiApprovalStruct[]]
+  ): string;
+  encodeFunctionData(
+    functionFragment: "batchExec",
+    values: [IPActionMisc.Call3Struct[]]
   ): string;
 
-  decodeFunctionResult(functionFragment: "consult", data: BytesLike): Result;
+  decodeFunctionResult(functionFragment: "approveInf", data: BytesLike): Result;
+  decodeFunctionResult(functionFragment: "batchExec", data: BytesLike): Result;
 
   events: {};
 }
@@ -64,42 +95,62 @@ export interface IPActionMisc extends BaseContract {
   removeListener: OnEvent<this>;
 
   functions: {
-    consult(
-      market: string,
-      secondsAgo: BigNumberish,
-      overrides?: CallOverrides
-    ): Promise<[BigNumber] & { lnImpliedRateMean: BigNumber }>;
+    approveInf(
+      arg0: IPActionMisc.MultiApprovalStruct[],
+      overrides?: Overrides & { from?: string | Promise<string> }
+    ): Promise<ContractTransaction>;
+
+    batchExec(
+      calls: IPActionMisc.Call3Struct[],
+      overrides?: PayableOverrides & { from?: string | Promise<string> }
+    ): Promise<ContractTransaction>;
   };
 
-  consult(
-    market: string,
-    secondsAgo: BigNumberish,
-    overrides?: CallOverrides
-  ): Promise<BigNumber>;
+  approveInf(
+    arg0: IPActionMisc.MultiApprovalStruct[],
+    overrides?: Overrides & { from?: string | Promise<string> }
+  ): Promise<ContractTransaction>;
+
+  batchExec(
+    calls: IPActionMisc.Call3Struct[],
+    overrides?: PayableOverrides & { from?: string | Promise<string> }
+  ): Promise<ContractTransaction>;
 
   callStatic: {
-    consult(
-      market: string,
-      secondsAgo: BigNumberish,
+    approveInf(
+      arg0: IPActionMisc.MultiApprovalStruct[],
       overrides?: CallOverrides
-    ): Promise<BigNumber>;
+    ): Promise<void>;
+
+    batchExec(
+      calls: IPActionMisc.Call3Struct[],
+      overrides?: CallOverrides
+    ): Promise<IPActionMisc.ResultStructOutput[]>;
   };
 
   filters: {};
 
   estimateGas: {
-    consult(
-      market: string,
-      secondsAgo: BigNumberish,
-      overrides?: CallOverrides
+    approveInf(
+      arg0: IPActionMisc.MultiApprovalStruct[],
+      overrides?: Overrides & { from?: string | Promise<string> }
+    ): Promise<BigNumber>;
+
+    batchExec(
+      calls: IPActionMisc.Call3Struct[],
+      overrides?: PayableOverrides & { from?: string | Promise<string> }
     ): Promise<BigNumber>;
   };
 
   populateTransaction: {
-    consult(
-      market: string,
-      secondsAgo: BigNumberish,
-      overrides?: CallOverrides
+    approveInf(
+      arg0: IPActionMisc.MultiApprovalStruct[],
+      overrides?: Overrides & { from?: string | Promise<string> }
+    ): Promise<PopulatedTransaction>;
+
+    batchExec(
+      calls: IPActionMisc.Call3Struct[],
+      overrides?: PayableOverrides & { from?: string | Promise<string> }
     ): Promise<PopulatedTransaction>;
   };
 }

package/typechain-types/IPActionSwapPT.ts

@@ -23,13 +23,27 @@ import type {
   OnEvent,
 } from "./common";
 
+export type SwapDataStruct = {
+  swapType: BigNumberish;
+  extRouter: string;
+  extCalldata: BytesLike;
+  needScale: boolean;
+};
+
+export type SwapDataStructOutput = [number, string, string, boolean] & {
+  swapType: number;
+  extRouter: string;
+  extCalldata: string;
+  needScale: boolean;
+};
+
 export type TokenOutputStruct = {
   tokenOut: string;
   minTokenOut: BigNumberish;
   tokenRedeemSy: string;
   bulk: string;
-  kyberRouter: string;
-  kybercall: BytesLike;
+  pendleSwap: string;
+  swapData: SwapDataStruct;
 };
 
 export type TokenOutputStructOutput = [
@@ -38,14 +52,14 @@ export type TokenOutputStructOutput = [
   string,
   string,
   string,
-  string
+  SwapDataStructOutput
 ] & {
   tokenOut: string;
   minTokenOut: BigNumber;
   tokenRedeemSy: string;
   bulk: string;
-  kyberRouter: string;
-  kybercall: string;
+  pendleSwap: string;
+  swapData: SwapDataStructOutput;
 };
 
 export type ApproxParamsStruct = {
@@ -75,8 +89,8 @@ export type TokenInputStruct = {
   netTokenIn: BigNumberish;
   tokenMintSy: string;
   bulk: string;
-  kyberRouter: string;
-  kybercall: BytesLike;
+  pendleSwap: string;
+  swapData: SwapDataStruct;
 };
 
 export type TokenInputStructOutput = [
@@ -85,23 +99,23 @@ export type TokenInputStructOutput = [
   string,
   string,
   string,
-  string
+  SwapDataStructOutput
 ] & {
   tokenIn: string;
   netTokenIn: BigNumber;
   tokenMintSy: string;
   bulk: string;
-  kyberRouter: string;
-  kybercall: string;
+  pendleSwap: string;
+  swapData: SwapDataStructOutput;
 };
 
 export interface IPActionSwapPTInterface extends utils.Interface {
   contractName: "IPActionSwapPT";
   functions: {
     "swapExactPtForSy(address,address,uint256,uint256)": FunctionFragment;
-    "swapExactPtForToken(address,address,uint256,(address,uint256,address,address,address,bytes))": FunctionFragment;
+    "swapExactPtForToken(address,address,uint256,(address,uint256,address,address,address,(uint8,address,bytes,bool)))": 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,address,bytes))": FunctionFragment;
+    "swapExactTokenForPt(address,address,uint256,(uint256,uint256,uint256,uint256,uint256),(address,uint256,address,address,address,(uint8,address,bytes,bool)))": FunctionFragment;
     "swapPtForExactSy(address,address,uint256,uint256,(uint256,uint256,uint256,uint256,uint256))": FunctionFragment;
     "swapSyForExactPt(address,address,uint256,uint256)": FunctionFragment;
   };