@pendle/core-v2 0.8.0-beta → 0.8.0-beta-3

package/typechain-types/ActionSCYAndYTBase.ts

@@ -10,7 +10,7 @@ import {
   Signer,
   utils,
 } from "ethers";
-import { FunctionFragment, Result, EventFragment } from "@ethersproject/abi";
+import { FunctionFragment, Result } from "@ethersproject/abi";
 import { Listener, Provider } from "@ethersproject/providers";
 import type {
   TypedEventFilter,
@@ -32,84 +32,9 @@ export interface ActionSCYAndYTBaseInterface extends utils.Interface {
 
   decodeFunctionResult(functionFragment: "joeFactory", data: BytesLike): Result;
 
-  events: {
-    "MintPyFromRawToken(address,address,uint256,address,uint256)": EventFragment;
-    "MintScyFromRawToken(address,address,uint256,address,uint256)": EventFragment;
-    "RedeemPyToRawToken(address,address,uint256,address,uint256)": EventFragment;
-    "RedeemScyToRawToken(address,address,uint256,address,uint256)": EventFragment;
-    "SwapYTAndSCY(address,int256,int256)": EventFragment;
-  };
-
-  getEvent(nameOrSignatureOrTopic: "MintPyFromRawToken"): EventFragment;
-  getEvent(nameOrSignatureOrTopic: "MintScyFromRawToken"): EventFragment;
-  getEvent(nameOrSignatureOrTopic: "RedeemPyToRawToken"): EventFragment;
-  getEvent(nameOrSignatureOrTopic: "RedeemScyToRawToken"): EventFragment;
-  getEvent(nameOrSignatureOrTopic: "SwapYTAndSCY"): EventFragment;
+  events: {};
 }
 
-export type MintPyFromRawTokenEvent = TypedEvent<
-  [string, string, BigNumber, string, BigNumber],
-  {
-    user: string;
-    rawTokenIn: string;
-    netRawTokenIn: BigNumber;
-    YT: string;
-    netPyOut: BigNumber;
-  }
->;
-
-export type MintPyFromRawTokenEventFilter =
-  TypedEventFilter<MintPyFromRawTokenEvent>;
-
-export type MintScyFromRawTokenEvent = TypedEvent<
-  [string, string, BigNumber, string, BigNumber],
-  {
-    user: string;
-    rawTokenIn: string;
-    netRawTokenIn: BigNumber;
-    SCY: string;
-    netScyOut: BigNumber;
-  }
->;
-
-export type MintScyFromRawTokenEventFilter =
-  TypedEventFilter<MintScyFromRawTokenEvent>;
-
-export type RedeemPyToRawTokenEvent = TypedEvent<
-  [string, string, BigNumber, string, BigNumber],
-  {
-    user: string;
-    YT: string;
-    netPyIn: BigNumber;
-    rawTokenOut: string;
-    netRawTokenOut: BigNumber;
-  }
->;
-
-export type RedeemPyToRawTokenEventFilter =
-  TypedEventFilter<RedeemPyToRawTokenEvent>;
-
-export type RedeemScyToRawTokenEvent = TypedEvent<
-  [string, string, BigNumber, string, BigNumber],
-  {
-    user: string;
-    SCY: string;
-    netScyIn: BigNumber;
-    rawTokenOut: string;
-    netRawTokenOut: BigNumber;
-  }
->;
-
-export type RedeemScyToRawTokenEventFilter =
-  TypedEventFilter<RedeemScyToRawTokenEvent>;
-
-export type SwapYTAndSCYEvent = TypedEvent<
-  [string, BigNumber, BigNumber],
-  { user: string; ytToAccount: BigNumber; scyToAccount: BigNumber }
->;
-
-export type SwapYTAndSCYEventFilter = TypedEventFilter<SwapYTAndSCYEvent>;
-
 export interface ActionSCYAndYTBase extends BaseContract {
   contractName: "ActionSCYAndYTBase";
   connect(signerOrProvider: Signer | Provider | string): this;
@@ -147,78 +72,7 @@ export interface ActionSCYAndYTBase extends BaseContract {
     joeFactory(overrides?: CallOverrides): Promise<string>;
   };
 
-  filters: {
-    "MintPyFromRawToken(address,address,uint256,address,uint256)"(
-      user?: string | null,
-      rawTokenIn?: string | null,
-      netRawTokenIn?: null,
-      YT?: string | null,
-      netPyOut?: null
-    ): MintPyFromRawTokenEventFilter;
-    MintPyFromRawToken(
-      user?: string | null,
-      rawTokenIn?: string | null,
-      netRawTokenIn?: null,
-      YT?: string | null,
-      netPyOut?: null
-    ): MintPyFromRawTokenEventFilter;
-
-    "MintScyFromRawToken(address,address,uint256,address,uint256)"(
-      user?: string | null,
-      rawTokenIn?: string | null,
-      netRawTokenIn?: null,
-      SCY?: string | null,
-      netScyOut?: null
-    ): MintScyFromRawTokenEventFilter;
-    MintScyFromRawToken(
-      user?: string | null,
-      rawTokenIn?: string | null,
-      netRawTokenIn?: null,
-      SCY?: string | null,
-      netScyOut?: null
-    ): MintScyFromRawTokenEventFilter;
-
-    "RedeemPyToRawToken(address,address,uint256,address,uint256)"(
-      user?: string | null,
-      YT?: string | null,
-      netPyIn?: null,
-      rawTokenOut?: string | null,
-      netRawTokenOut?: null
-    ): RedeemPyToRawTokenEventFilter;
-    RedeemPyToRawToken(
-      user?: string | null,
-      YT?: string | null,
-      netPyIn?: null,
-      rawTokenOut?: string | null,
-      netRawTokenOut?: null
-    ): RedeemPyToRawTokenEventFilter;
-
-    "RedeemScyToRawToken(address,address,uint256,address,uint256)"(
-      user?: string | null,
-      SCY?: string | null,
-      netScyIn?: null,
-      rawTokenOut?: string | null,
-      netRawTokenOut?: null
-    ): RedeemScyToRawTokenEventFilter;
-    RedeemScyToRawToken(
-      user?: string | null,
-      SCY?: string | null,
-      netScyIn?: null,
-      rawTokenOut?: string | null,
-      netRawTokenOut?: null
-    ): RedeemScyToRawTokenEventFilter;
-
-    "SwapYTAndSCY(address,int256,int256)"(
-      user?: string | null,
-      ytToAccount?: null,
-      scyToAccount?: null
-    ): SwapYTAndSCYEventFilter;
-    SwapYTAndSCY(
-      user?: string | null,
-      ytToAccount?: null,
-      scyToAccount?: null
-    ): SwapYTAndSCYEventFilter;
-  };
+  filters: {};
 
   estimateGas: {
     joeFactory(overrides?: CallOverrides): Promise<BigNumber>;

package/typechain-types/ActionYT.ts

@@ -119,81 +119,38 @@ export interface ActionYTInterface extends utils.Interface {
   ): Result;
 
   events: {
-    "MintPyFromRawToken(address,address,uint256,address,uint256)": EventFragment;
-    "MintScyFromRawToken(address,address,uint256,address,uint256)": EventFragment;
-    "RedeemPyToRawToken(address,address,uint256,address,uint256)": EventFragment;
-    "RedeemScyToRawToken(address,address,uint256,address,uint256)": EventFragment;
-    "SwapYTAndSCY(address,int256,int256)": EventFragment;
+    "SwapYTAndRawToken(address,address,address,int256,int256)": EventFragment;
+    "SwapYTAndSCY(address,address,int256,int256)": EventFragment;
   };
 
-  getEvent(nameOrSignatureOrTopic: "MintPyFromRawToken"): EventFragment;
-  getEvent(nameOrSignatureOrTopic: "MintScyFromRawToken"): EventFragment;
-  getEvent(nameOrSignatureOrTopic: "RedeemPyToRawToken"): EventFragment;
-  getEvent(nameOrSignatureOrTopic: "RedeemScyToRawToken"): EventFragment;
+  getEvent(nameOrSignatureOrTopic: "SwapYTAndRawToken"): EventFragment;
   getEvent(nameOrSignatureOrTopic: "SwapYTAndSCY"): EventFragment;
 }
 
-export type MintPyFromRawTokenEvent = TypedEvent<
-  [string, string, BigNumber, string, BigNumber],
+export type SwapYTAndRawTokenEvent = TypedEvent<
+  [string, string, string, BigNumber, BigNumber],
   {
     user: string;
-    rawTokenIn: string;
-    netRawTokenIn: BigNumber;
-    YT: string;
-    netPyOut: BigNumber;
+    market: string;
+    rawToken: string;
+    ytToAccount: BigNumber;
+    rawTokenToAccount: BigNumber;
   }
 >;
 
-export type MintPyFromRawTokenEventFilter =
-  TypedEventFilter<MintPyFromRawTokenEvent>;
+export type SwapYTAndRawTokenEventFilter =
+  TypedEventFilter<SwapYTAndRawTokenEvent>;
 
-export type MintScyFromRawTokenEvent = TypedEvent<
-  [string, string, BigNumber, string, BigNumber],
-  {
-    user: string;
-    rawTokenIn: string;
-    netRawTokenIn: BigNumber;
-    SCY: string;
-    netScyOut: BigNumber;
-  }
->;
-
-export type MintScyFromRawTokenEventFilter =
-  TypedEventFilter<MintScyFromRawTokenEvent>;
-
-export type RedeemPyToRawTokenEvent = TypedEvent<
-  [string, string, BigNumber, string, BigNumber],
-  {
-    user: string;
-    YT: string;
-    netPyIn: BigNumber;
-    rawTokenOut: string;
-    netRawTokenOut: BigNumber;
-  }
->;
-
-export type RedeemPyToRawTokenEventFilter =
-  TypedEventFilter<RedeemPyToRawTokenEvent>;
-
-export type RedeemScyToRawTokenEvent = TypedEvent<
-  [string, string, BigNumber, string, BigNumber],
+export type SwapYTAndSCYEvent = TypedEvent<
+  [string, string, BigNumber, BigNumber],
   {
     user: string;
-    SCY: string;
-    netScyIn: BigNumber;
-    rawTokenOut: string;
-    netRawTokenOut: BigNumber;
+    market: string;
+    ytToAccount: BigNumber;
+    scyToAccount: BigNumber;
   }
 >;
 
-export type RedeemScyToRawTokenEventFilter =
-  TypedEventFilter<RedeemScyToRawTokenEvent>;
-
-export type SwapYTAndSCYEvent = TypedEvent<
-  [string, BigNumber, BigNumber],
-  { user: string; ytToAccount: BigNumber; scyToAccount: BigNumber }
->;
-
 export type SwapYTAndSCYEventFilter = TypedEventFilter<SwapYTAndSCYEvent>;
 
 export interface ActionYT extends BaseContract {
@@ -393,73 +350,30 @@ export interface ActionYT extends BaseContract {
   };
 
   filters: {
-    "MintPyFromRawToken(address,address,uint256,address,uint256)"(
-      user?: string | null,
-      rawTokenIn?: string | null,
-      netRawTokenIn?: null,
-      YT?: string | null,
-      netPyOut?: null
-    ): MintPyFromRawTokenEventFilter;
-    MintPyFromRawToken(
-      user?: string | null,
-      rawTokenIn?: string | null,
-      netRawTokenIn?: null,
-      YT?: string | null,
-      netPyOut?: null
-    ): MintPyFromRawTokenEventFilter;
-
-    "MintScyFromRawToken(address,address,uint256,address,uint256)"(
-      user?: string | null,
-      rawTokenIn?: string | null,
-      netRawTokenIn?: null,
-      SCY?: string | null,
-      netScyOut?: null
-    ): MintScyFromRawTokenEventFilter;
-    MintScyFromRawToken(
+    "SwapYTAndRawToken(address,address,address,int256,int256)"(
       user?: string | null,
-      rawTokenIn?: string | null,
-      netRawTokenIn?: null,
-      SCY?: string | null,
-      netScyOut?: null
-    ): MintScyFromRawTokenEventFilter;
-
-    "RedeemPyToRawToken(address,address,uint256,address,uint256)"(
-      user?: string | null,
-      YT?: string | null,
-      netPyIn?: null,
-      rawTokenOut?: string | null,
-      netRawTokenOut?: null
-    ): RedeemPyToRawTokenEventFilter;
-    RedeemPyToRawToken(
-      user?: string | null,
-      YT?: string | null,
-      netPyIn?: null,
-      rawTokenOut?: string | null,
-      netRawTokenOut?: null
-    ): RedeemPyToRawTokenEventFilter;
-
-    "RedeemScyToRawToken(address,address,uint256,address,uint256)"(
-      user?: string | null,
-      SCY?: string | null,
-      netScyIn?: null,
-      rawTokenOut?: string | null,
-      netRawTokenOut?: null
-    ): RedeemScyToRawTokenEventFilter;
-    RedeemScyToRawToken(
+      market?: string | null,
+      rawToken?: string | null,
+      ytToAccount?: null,
+      rawTokenToAccount?: null
+    ): SwapYTAndRawTokenEventFilter;
+    SwapYTAndRawToken(
       user?: string | null,
-      SCY?: string | null,
-      netScyIn?: null,
-      rawTokenOut?: string | null,
-      netRawTokenOut?: null
-    ): RedeemScyToRawTokenEventFilter;
+      market?: string | null,
+      rawToken?: string | null,
+      ytToAccount?: null,
+      rawTokenToAccount?: null
+    ): SwapYTAndRawTokenEventFilter;
 
-    "SwapYTAndSCY(address,int256,int256)"(
+    "SwapYTAndSCY(address,address,int256,int256)"(
       user?: string | null,
+      market?: string | null,
       ytToAccount?: null,
       scyToAccount?: null
     ): SwapYTAndSCYEventFilter;
     SwapYTAndSCY(
       user?: string | null,
+      market?: string | null,
       ytToAccount?: null,
       scyToAccount?: null
     ): SwapYTAndSCYEventFilter;

package/typechain-types/IPActionCore.ts

@@ -13,7 +13,7 @@ import {
   Signer,
   utils,
 } from "ethers";
-import { FunctionFragment, Result } from "@ethersproject/abi";
+import { FunctionFragment, Result, EventFragment } from "@ethersproject/abi";
 import { Listener, Provider } from "@ethersproject/providers";
 import type {
   TypedEventFilter,
@@ -175,9 +175,143 @@ export interface IPActionCoreInterface extends utils.Interface {
     data: BytesLike
   ): Result;
 
-  events: {};
+  events: {
+    "AddLiquidity(address,address,address,uint256,uint256,uint256)": EventFragment;
+    "MintPyFromRawToken(address,address,address,address,uint256,uint256)": EventFragment;
+    "MintScyFromRawToken(address,address,address,address,uint256,uint256)": EventFragment;
+    "RedeemPyToRawToken(address,address,address,uint256,address,uint256)": EventFragment;
+    "RedeemScyToRawToken(address,address,address,uint256,address,uint256)": EventFragment;
+    "RemoveLiquidity(address,address,address,uint256,uint256,uint256)": EventFragment;
+    "SwapPtAndRawToken(address,address,address,address,int256,int256)": EventFragment;
+    "SwapPtAndScy(address,address,address,int256,int256)": EventFragment;
+  };
+
+  getEvent(nameOrSignatureOrTopic: "AddLiquidity"): EventFragment;
+  getEvent(nameOrSignatureOrTopic: "MintPyFromRawToken"): EventFragment;
+  getEvent(nameOrSignatureOrTopic: "MintScyFromRawToken"): EventFragment;
+  getEvent(nameOrSignatureOrTopic: "RedeemPyToRawToken"): EventFragment;
+  getEvent(nameOrSignatureOrTopic: "RedeemScyToRawToken"): EventFragment;
+  getEvent(nameOrSignatureOrTopic: "RemoveLiquidity"): EventFragment;
+  getEvent(nameOrSignatureOrTopic: "SwapPtAndRawToken"): EventFragment;
+  getEvent(nameOrSignatureOrTopic: "SwapPtAndScy"): EventFragment;
 }
 
+export type AddLiquidityEvent = TypedEvent<
+  [string, string, string, BigNumber, BigNumber, BigNumber],
+  {
+    caller: string;
+    market: string;
+    receiver: string;
+    scyUsed: BigNumber;
+    ptUsed: BigNumber;
+    lpOut: BigNumber;
+  }
+>;
+
+export type AddLiquidityEventFilter = TypedEventFilter<AddLiquidityEvent>;
+
+export type MintPyFromRawTokenEvent = TypedEvent<
+  [string, string, string, string, BigNumber, BigNumber],
+  {
+    caller: string;
+    receiver: string;
+    YT: string;
+    rawTokenIn: string;
+    netRawTokenIn: BigNumber;
+    netPyOut: BigNumber;
+  }
+>;
+
+export type MintPyFromRawTokenEventFilter =
+  TypedEventFilter<MintPyFromRawTokenEvent>;
+
+export type MintScyFromRawTokenEvent = TypedEvent<
+  [string, string, string, string, BigNumber, BigNumber],
+  {
+    caller: string;
+    receiver: string;
+    SCY: string;
+    rawTokenIn: string;
+    netRawTokenIn: BigNumber;
+    netScyOut: BigNumber;
+  }
+>;
+
+export type MintScyFromRawTokenEventFilter =
+  TypedEventFilter<MintScyFromRawTokenEvent>;
+
+export type RedeemPyToRawTokenEvent = TypedEvent<
+  [string, string, string, BigNumber, string, BigNumber],
+  {
+    caller: string;
+    receiver: string;
+    YT: string;
+    netPyIn: BigNumber;
+    rawTokenOut: string;
+    netRawTokenOut: BigNumber;
+  }
+>;
+
+export type RedeemPyToRawTokenEventFilter =
+  TypedEventFilter<RedeemPyToRawTokenEvent>;
+
+export type RedeemScyToRawTokenEvent = TypedEvent<
+  [string, string, string, BigNumber, string, BigNumber],
+  {
+    caller: string;
+    receiver: string;
+    SCY: string;
+    netScyIn: BigNumber;
+    rawTokenOut: string;
+    netRawTokenOut: BigNumber;
+  }
+>;
+
+export type RedeemScyToRawTokenEventFilter =
+  TypedEventFilter<RedeemScyToRawTokenEvent>;
+
+export type RemoveLiquidityEvent = TypedEvent<
+  [string, string, string, BigNumber, BigNumber, BigNumber],
+  {
+    caller: string;
+    market: string;
+    receiver: string;
+    lpIn: BigNumber;
+    amountPTOut: BigNumber;
+    amountSCYOut: BigNumber;
+  }
+>;
+
+export type RemoveLiquidityEventFilter = TypedEventFilter<RemoveLiquidityEvent>;
+
+export type SwapPtAndRawTokenEvent = TypedEvent<
+  [string, string, string, string, BigNumber, BigNumber],
+  {
+    caller: string;
+    market: string;
+    rawToken: string;
+    receiver: string;
+    amountPtToAccount: BigNumber;
+    amountRawTokenToAccount: BigNumber;
+  }
+>;
+
+export type SwapPtAndRawTokenEventFilter =
+  TypedEventFilter<SwapPtAndRawTokenEvent>;
+
+export type SwapPtAndScyEvent = TypedEvent<
+  [string, string, string, BigNumber, BigNumber],
+  {
+    caller: string;
+    market: string;
+    receiver: string;
+    amountPtToAccount: BigNumber;
+    amountScyToAccount: BigNumber;
+  }
+>;
+
+export type SwapPtAndScyEventFilter = TypedEventFilter<SwapPtAndScyEvent>;
+
 export interface IPActionCore extends BaseContract {
   contractName: "IPActionCore";
   connect(signerOrProvider: Signer | Provider | string): this;
@@ -569,7 +703,141 @@ export interface IPActionCore extends BaseContract {
     ): Promise<BigNumber>;
   };
 
-  filters: {};
+  filters: {
+    "AddLiquidity(address,address,address,uint256,uint256,uint256)"(
+      caller?: string | null,
+      market?: string | null,
+      receiver?: string | null,
+      scyUsed?: null,
+      ptUsed?: null,
+      lpOut?: null
+    ): AddLiquidityEventFilter;
+    AddLiquidity(
+      caller?: string | null,
+      market?: string | null,
+      receiver?: string | null,
+      scyUsed?: null,
+      ptUsed?: null,
+      lpOut?: null
+    ): AddLiquidityEventFilter;
+
+    "MintPyFromRawToken(address,address,address,address,uint256,uint256)"(
+      caller?: string | null,
+      receiver?: string | null,
+      YT?: string | null,
+      rawTokenIn?: null,
+      netRawTokenIn?: null,
+      netPyOut?: null
+    ): MintPyFromRawTokenEventFilter;
+    MintPyFromRawToken(
+      caller?: string | null,
+      receiver?: string | null,
+      YT?: string | null,
+      rawTokenIn?: null,
+      netRawTokenIn?: null,
+      netPyOut?: null
+    ): MintPyFromRawTokenEventFilter;
+
+    "MintScyFromRawToken(address,address,address,address,uint256,uint256)"(
+      caller?: string | null,
+      receiver?: string | null,
+      SCY?: string | null,
+      rawTokenIn?: null,
+      netRawTokenIn?: null,
+      netScyOut?: null
+    ): MintScyFromRawTokenEventFilter;
+    MintScyFromRawToken(
+      caller?: string | null,
+      receiver?: string | null,
+      SCY?: string | null,
+      rawTokenIn?: null,
+      netRawTokenIn?: null,
+      netScyOut?: null
+    ): MintScyFromRawTokenEventFilter;
+
+    "RedeemPyToRawToken(address,address,address,uint256,address,uint256)"(
+      caller?: string | null,
+      receiver?: string | null,
+      YT?: string | null,
+      netPyIn?: null,
+      rawTokenOut?: null,
+      netRawTokenOut?: null
+    ): RedeemPyToRawTokenEventFilter;
+    RedeemPyToRawToken(
+      caller?: string | null,
+      receiver?: string | null,
+      YT?: string | null,
+      netPyIn?: null,
+      rawTokenOut?: null,
+      netRawTokenOut?: null
+    ): RedeemPyToRawTokenEventFilter;
+
+    "RedeemScyToRawToken(address,address,address,uint256,address,uint256)"(
+      caller?: string | null,
+      receiver?: string | null,
+      SCY?: string | null,
+      netScyIn?: null,
+      rawTokenOut?: null,
+      netRawTokenOut?: null
+    ): RedeemScyToRawTokenEventFilter;
+    RedeemScyToRawToken(
+      caller?: string | null,
+      receiver?: string | null,
+      SCY?: string | null,
+      netScyIn?: null,
+      rawTokenOut?: null,
+      netRawTokenOut?: null
+    ): RedeemScyToRawTokenEventFilter;
+
+    "RemoveLiquidity(address,address,address,uint256,uint256,uint256)"(
+      caller?: string | null,
+      market?: string | null,
+      receiver?: null,
+      lpIn?: null,
+      amountPTOut?: null,
+      amountSCYOut?: null
+    ): RemoveLiquidityEventFilter;
+    RemoveLiquidity(
+      caller?: string | null,
+      market?: string | null,
+      receiver?: null,
+      lpIn?: null,
+      amountPTOut?: null,
+      amountSCYOut?: null
+    ): RemoveLiquidityEventFilter;
+
+    "SwapPtAndRawToken(address,address,address,address,int256,int256)"(
+      caller?: string | null,
+      market?: string | null,
+      rawToken?: string | null,
+      receiver?: null,
+      amountPtToAccount?: null,
+      amountRawTokenToAccount?: null
+    ): SwapPtAndRawTokenEventFilter;
+    SwapPtAndRawToken(
+      caller?: string | null,
+      market?: string | null,
+      rawToken?: string | null,
+      receiver?: null,
+      amountPtToAccount?: null,
+      amountRawTokenToAccount?: null
+    ): SwapPtAndRawTokenEventFilter;
+
+    "SwapPtAndScy(address,address,address,int256,int256)"(
+      caller?: string | null,
+      market?: string | null,
+      receiver?: string | null,
+      amountPtToAccount?: null,
+      amountScyToAccount?: null
+    ): SwapPtAndScyEventFilter;
+    SwapPtAndScy(
+      caller?: string | null,
+      market?: string | null,
+      receiver?: string | null,
+      amountPtToAccount?: null,
+      amountScyToAccount?: null
+    ): SwapPtAndScyEventFilter;
+  };
 
   estimateGas: {
     addLiquidity(