@pendle/core-v2 0.9.3-beta → 0.10.1-beta

package/typechain-types/RouterStatic.ts

@@ -9,11 +9,12 @@ import {
   CallOverrides,
   ContractTransaction,
   Overrides,
+  PayableOverrides,
   PopulatedTransaction,
   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,
@@ -26,46 +27,37 @@ export type MarketStateStruct = {
   totalPt: BigNumberish;
   totalScy: BigNumberish;
   totalLp: BigNumberish;
-  oracleRate: BigNumberish;
   treasury: string;
   scalarRoot: BigNumberish;
   lnFeeRateRoot: BigNumberish;
-  rateOracleTimeWindow: BigNumberish;
   expiry: BigNumberish;
   reserveFeePercent: BigNumberish;
   lastLnImpliedRate: BigNumberish;
-  lastTradeTime: BigNumberish;
 };
 
 export type MarketStateStructOutput = [
   BigNumber,
   BigNumber,
   BigNumber,
-  BigNumber,
   string,
   BigNumber,
   BigNumber,
   BigNumber,
   BigNumber,
-  BigNumber,
-  BigNumber,
   BigNumber
 ] & {
   totalPt: BigNumber;
   totalScy: BigNumber;
   totalLp: BigNumber;
-  oracleRate: BigNumber;
   treasury: string;
   scalarRoot: BigNumber;
   lnFeeRateRoot: BigNumber;
-  rateOracleTimeWindow: BigNumber;
   expiry: BigNumber;
   reserveFeePercent: BigNumber;
   lastLnImpliedRate: BigNumber;
-  lastTradeTime: BigNumber;
 };
 
-export declare namespace IPRouterStatic {
+export declare namespace RouterStatic {
   export type RewardIndexStruct = { rewardToken: string; index: BigNumberish };
 
   export type RewardIndexStructOutput = [string, BigNumber] & {
@@ -95,23 +87,23 @@ export declare namespace IPRouterStatic {
   export type UserMarketInfoStruct = {
     market: string;
     lpBalance: BigNumberish;
-    ptBalance: IPRouterStatic.TokenAmountStruct;
-    scyBalance: IPRouterStatic.TokenAmountStruct;
-    assetBalance: IPRouterStatic.AssetAmountStruct;
+    ptBalance: RouterStatic.TokenAmountStruct;
+    scyBalance: RouterStatic.TokenAmountStruct;
+    assetBalance: RouterStatic.AssetAmountStruct;
   };
 
   export type UserMarketInfoStructOutput = [
     string,
     BigNumber,
-    IPRouterStatic.TokenAmountStructOutput,
-    IPRouterStatic.TokenAmountStructOutput,
-    IPRouterStatic.AssetAmountStructOutput
+    RouterStatic.TokenAmountStructOutput,
+    RouterStatic.TokenAmountStructOutput,
+    RouterStatic.AssetAmountStructOutput
   ] & {
     market: string;
     lpBalance: BigNumber;
-    ptBalance: IPRouterStatic.TokenAmountStructOutput;
-    scyBalance: IPRouterStatic.TokenAmountStructOutput;
-    assetBalance: IPRouterStatic.AssetAmountStructOutput;
+    ptBalance: RouterStatic.TokenAmountStructOutput;
+    scyBalance: RouterStatic.TokenAmountStructOutput;
+    assetBalance: RouterStatic.AssetAmountStructOutput;
   };
 
   export type UserPYInfoStruct = {
@@ -119,8 +111,8 @@ export declare namespace IPRouterStatic {
     pt: string;
     ytBalance: BigNumberish;
     ptBalance: BigNumberish;
-    unclaimedInterest: IPRouterStatic.TokenAmountStruct;
-    unclaimedRewards: IPRouterStatic.TokenAmountStruct[];
+    unclaimedInterest: RouterStatic.TokenAmountStruct;
+    unclaimedRewards: RouterStatic.TokenAmountStruct[];
   };
 
   export type UserPYInfoStructOutput = [
@@ -128,23 +120,23 @@ export declare namespace IPRouterStatic {
     string,
     BigNumber,
     BigNumber,
-    IPRouterStatic.TokenAmountStructOutput,
-    IPRouterStatic.TokenAmountStructOutput[]
+    RouterStatic.TokenAmountStructOutput,
+    RouterStatic.TokenAmountStructOutput[]
   ] & {
     yt: string;
     pt: string;
     ytBalance: BigNumber;
     ptBalance: BigNumber;
-    unclaimedInterest: IPRouterStatic.TokenAmountStructOutput;
-    unclaimedRewards: IPRouterStatic.TokenAmountStructOutput[];
+    unclaimedInterest: RouterStatic.TokenAmountStructOutput;
+    unclaimedRewards: RouterStatic.TokenAmountStructOutput[];
   };
 }
 
 export interface RouterStaticInterface extends utils.Interface {
   contractName: "RouterStatic";
   functions: {
-    "addLiquidityDualIbTokenAndPtStatic(address,uint256,uint256)": FunctionFragment;
     "addLiquidityDualScyAndPtStatic(address,uint256,uint256)": FunctionFragment;
+    "addLiquidityDualTokenAndPtStatic(address,address,uint256,uint256)": FunctionFragment;
     "addLiquiditySingleBaseTokenStatic(address,address,uint256)": FunctionFragment;
     "addLiquiditySinglePtStatic(address,uint256)": FunctionFragment;
     "addLiquiditySingleScyStatic(address,uint256)": FunctionFragment;
@@ -155,6 +147,7 @@ export interface RouterStaticInterface extends utils.Interface {
     "getPYInfo(address)": FunctionFragment;
     "getPendleTokenType(address)": FunctionFragment;
     "getPtImpliedYield(address)": FunctionFragment;
+    "getTokensInOut(address,address)": FunctionFragment;
     "getTradeExchangeRateIncludeFee(address,int256)": FunctionFragment;
     "getUserMarketInfo(address,address)": FunctionFragment;
     "getUserMarketPositions(address,address[])": FunctionFragment;
@@ -162,16 +155,20 @@ export interface RouterStaticInterface extends utils.Interface {
     "getUserPYPositionsByPYs(address,address[])": FunctionFragment;
     "getUserSCYInfo(address,address)": FunctionFragment;
     "hasPYPosition((address,address,uint256,uint256,(address,uint256),(address,uint256)[]))": FunctionFragment;
+    "initialize()": FunctionFragment;
     "mintPYFromBaseStatic(address,address,uint256)": FunctionFragment;
     "mintPYFromScyStatic(address,uint256)": FunctionFragment;
+    "owner()": FunctionFragment;
+    "proxiableUUID()": FunctionFragment;
     "pyIndex(address)": FunctionFragment;
     "redeemPYToBaseStatic(address,uint256,address)": FunctionFragment;
     "redeemPYToScyStatic(address,uint256)": FunctionFragment;
-    "removeLiquidityDualIbTokenAndPtStatic(address,uint256)": FunctionFragment;
     "removeLiquidityDualScyAndPtStatic(address,uint256)": FunctionFragment;
+    "removeLiquidityDualTokenAndPtStatic(address,uint256,address)": FunctionFragment;
     "removeLiquiditySingleBaseTokenStatic(address,uint256,address)": FunctionFragment;
     "removeLiquiditySinglePtStatic(address,uint256)": FunctionFragment;
     "removeLiquiditySingleScyStatic(address,uint256)": FunctionFragment;
+    "renounceOwnership()": FunctionFragment;
     "swapExactBaseTokenForPtStatic(address,address,uint256)": FunctionFragment;
     "swapExactBaseTokenForYtStatic(address,address,uint256)": FunctionFragment;
     "swapExactPtForBaseTokenStatic(address,uint256,address)": FunctionFragment;
@@ -184,15 +181,18 @@ export interface RouterStaticInterface extends utils.Interface {
     "swapScyForExactPtStatic(address,uint256)": FunctionFragment;
     "swapScyForExactYtStatic(address,uint256)": FunctionFragment;
     "swapYtForExactScyStatic(address,uint256)": FunctionFragment;
+    "transferOwnership(address)": FunctionFragment;
+    "upgradeTo(address)": FunctionFragment;
+    "upgradeToAndCall(address,bytes)": FunctionFragment;
   };
 
   encodeFunctionData(
-    functionFragment: "addLiquidityDualIbTokenAndPtStatic",
+    functionFragment: "addLiquidityDualScyAndPtStatic",
     values: [string, BigNumberish, BigNumberish]
   ): string;
   encodeFunctionData(
-    functionFragment: "addLiquidityDualScyAndPtStatic",
-    values: [string, BigNumberish, BigNumberish]
+    functionFragment: "addLiquidityDualTokenAndPtStatic",
+    values: [string, string, BigNumberish, BigNumberish]
   ): string;
   encodeFunctionData(
     functionFragment: "addLiquiditySingleBaseTokenStatic",
@@ -228,6 +228,10 @@ export interface RouterStaticInterface extends utils.Interface {
     functionFragment: "getPtImpliedYield",
     values: [string]
   ): string;
+  encodeFunctionData(
+    functionFragment: "getTokensInOut",
+    values: [string, string]
+  ): string;
   encodeFunctionData(
     functionFragment: "getTradeExchangeRateIncludeFee",
     values: [string, BigNumberish]
@@ -254,7 +258,11 @@ export interface RouterStaticInterface extends utils.Interface {
   ): string;
   encodeFunctionData(
     functionFragment: "hasPYPosition",
-    values: [IPRouterStatic.UserPYInfoStruct]
+    values: [RouterStatic.UserPYInfoStruct]
+  ): string;
+  encodeFunctionData(
+    functionFragment: "initialize",
+    values?: undefined
   ): string;
   encodeFunctionData(
     functionFragment: "mintPYFromBaseStatic",
@@ -264,6 +272,11 @@ export interface RouterStaticInterface extends utils.Interface {
     functionFragment: "mintPYFromScyStatic",
     values: [string, BigNumberish]
   ): string;
+  encodeFunctionData(functionFragment: "owner", values?: undefined): string;
+  encodeFunctionData(
+    functionFragment: "proxiableUUID",
+    values?: undefined
+  ): string;
   encodeFunctionData(functionFragment: "pyIndex", values: [string]): string;
   encodeFunctionData(
     functionFragment: "redeemPYToBaseStatic",
@@ -274,12 +287,12 @@ export interface RouterStaticInterface extends utils.Interface {
     values: [string, BigNumberish]
   ): string;
   encodeFunctionData(
-    functionFragment: "removeLiquidityDualIbTokenAndPtStatic",
+    functionFragment: "removeLiquidityDualScyAndPtStatic",
     values: [string, BigNumberish]
   ): string;
   encodeFunctionData(
-    functionFragment: "removeLiquidityDualScyAndPtStatic",
-    values: [string, BigNumberish]
+    functionFragment: "removeLiquidityDualTokenAndPtStatic",
+    values: [string, BigNumberish, string]
   ): string;
   encodeFunctionData(
     functionFragment: "removeLiquiditySingleBaseTokenStatic",
@@ -293,6 +306,10 @@ export interface RouterStaticInterface extends utils.Interface {
     functionFragment: "removeLiquiditySingleScyStatic",
     values: [string, BigNumberish]
   ): string;
+  encodeFunctionData(
+    functionFragment: "renounceOwnership",
+    values?: undefined
+  ): string;
   encodeFunctionData(
     functionFragment: "swapExactBaseTokenForPtStatic",
     values: [string, string, BigNumberish]
@@ -341,13 +358,22 @@ export interface RouterStaticInterface extends utils.Interface {
     functionFragment: "swapYtForExactScyStatic",
     values: [string, BigNumberish]
   ): string;
+  encodeFunctionData(
+    functionFragment: "transferOwnership",
+    values: [string]
+  ): string;
+  encodeFunctionData(functionFragment: "upgradeTo", values: [string]): string;
+  encodeFunctionData(
+    functionFragment: "upgradeToAndCall",
+    values: [string, BytesLike]
+  ): string;
 
   decodeFunctionResult(
-    functionFragment: "addLiquidityDualIbTokenAndPtStatic",
+    functionFragment: "addLiquidityDualScyAndPtStatic",
     data: BytesLike
   ): Result;
   decodeFunctionResult(
-    functionFragment: "addLiquidityDualScyAndPtStatic",
+    functionFragment: "addLiquidityDualTokenAndPtStatic",
     data: BytesLike
   ): Result;
   decodeFunctionResult(
@@ -384,6 +410,10 @@ export interface RouterStaticInterface extends utils.Interface {
     functionFragment: "getPtImpliedYield",
     data: BytesLike
   ): Result;
+  decodeFunctionResult(
+    functionFragment: "getTokensInOut",
+    data: BytesLike
+  ): Result;
   decodeFunctionResult(
     functionFragment: "getTradeExchangeRateIncludeFee",
     data: BytesLike
@@ -412,6 +442,7 @@ export interface RouterStaticInterface extends utils.Interface {
     functionFragment: "hasPYPosition",
     data: BytesLike
   ): Result;
+  decodeFunctionResult(functionFragment: "initialize", data: BytesLike): Result;
   decodeFunctionResult(
     functionFragment: "mintPYFromBaseStatic",
     data: BytesLike
@@ -420,6 +451,11 @@ export interface RouterStaticInterface extends utils.Interface {
     functionFragment: "mintPYFromScyStatic",
     data: BytesLike
   ): Result;
+  decodeFunctionResult(functionFragment: "owner", data: BytesLike): Result;
+  decodeFunctionResult(
+    functionFragment: "proxiableUUID",
+    data: BytesLike
+  ): Result;
   decodeFunctionResult(functionFragment: "pyIndex", data: BytesLike): Result;
   decodeFunctionResult(
     functionFragment: "redeemPYToBaseStatic",
@@ -430,11 +466,11 @@ export interface RouterStaticInterface extends utils.Interface {
     data: BytesLike
   ): Result;
   decodeFunctionResult(
-    functionFragment: "removeLiquidityDualIbTokenAndPtStatic",
+    functionFragment: "removeLiquidityDualScyAndPtStatic",
     data: BytesLike
   ): Result;
   decodeFunctionResult(
-    functionFragment: "removeLiquidityDualScyAndPtStatic",
+    functionFragment: "removeLiquidityDualTokenAndPtStatic",
     data: BytesLike
   ): Result;
   decodeFunctionResult(
@@ -449,6 +485,10 @@ export interface RouterStaticInterface extends utils.Interface {
     functionFragment: "removeLiquiditySingleScyStatic",
     data: BytesLike
   ): Result;
+  decodeFunctionResult(
+    functionFragment: "renounceOwnership",
+    data: BytesLike
+  ): Result;
   decodeFunctionResult(
     functionFragment: "swapExactBaseTokenForPtStatic",
     data: BytesLike
@@ -497,10 +537,52 @@ export interface RouterStaticInterface extends utils.Interface {
     functionFragment: "swapYtForExactScyStatic",
     data: BytesLike
   ): Result;
+  decodeFunctionResult(
+    functionFragment: "transferOwnership",
+    data: BytesLike
+  ): Result;
+  decodeFunctionResult(functionFragment: "upgradeTo", data: BytesLike): Result;
+  decodeFunctionResult(
+    functionFragment: "upgradeToAndCall",
+    data: BytesLike
+  ): Result;
+
+  events: {
+    "AdminChanged(address,address)": EventFragment;
+    "BeaconUpgraded(address)": EventFragment;
+    "OwnershipTransferred(address,address)": EventFragment;
+    "Upgraded(address)": EventFragment;
+  };
 
-  events: {};
+  getEvent(nameOrSignatureOrTopic: "AdminChanged"): EventFragment;
+  getEvent(nameOrSignatureOrTopic: "BeaconUpgraded"): EventFragment;
+  getEvent(nameOrSignatureOrTopic: "OwnershipTransferred"): EventFragment;
+  getEvent(nameOrSignatureOrTopic: "Upgraded"): EventFragment;
 }
 
+export type AdminChangedEvent = TypedEvent<
+  [string, string],
+  { previousAdmin: string; newAdmin: string }
+>;
+
+export type AdminChangedEventFilter = TypedEventFilter<AdminChangedEvent>;
+
+export type BeaconUpgradedEvent = TypedEvent<[string], { beacon: string }>;
+
+export type BeaconUpgradedEventFilter = TypedEventFilter<BeaconUpgradedEvent>;
+
+export type OwnershipTransferredEvent = TypedEvent<
+  [string, string],
+  { previousOwner: string; newOwner: string }
+>;
+
+export type OwnershipTransferredEventFilter =
+  TypedEventFilter<OwnershipTransferredEvent>;
+
+export type UpgradedEvent = TypedEvent<[string], { implementation: string }>;
+
+export type UpgradedEventFilter = TypedEventFilter<UpgradedEvent>;
+
 export interface RouterStatic extends BaseContract {
   contractName: "RouterStatic";
   connect(signerOrProvider: Signer | Provider | string): this;
@@ -529,16 +611,17 @@ export interface RouterStatic extends BaseContract {
   removeListener: OnEvent<this>;
 
   functions: {
-    addLiquidityDualIbTokenAndPtStatic(
+    addLiquidityDualScyAndPtStatic(
       market: string,
-      ibTokenDesired: BigNumberish,
+      scyDesired: BigNumberish,
       ptDesired: BigNumberish,
       overrides?: Overrides & { from?: string | Promise<string> }
     ): Promise<ContractTransaction>;
 
-    addLiquidityDualScyAndPtStatic(
+    addLiquidityDualTokenAndPtStatic(
       market: string,
-      scyDesired: BigNumberish,
+      tokenIn: string,
+      tokenDesired: BigNumberish,
       ptDesired: BigNumberish,
       overrides?: Overrides & { from?: string | Promise<string> }
     ): Promise<ContractTransaction>;
@@ -601,8 +684,16 @@ export interface RouterStatic extends BaseContract {
 
     getPtImpliedYield(
       market: string,
-      overrides?: Overrides & { from?: string | Promise<string> }
-    ): Promise<ContractTransaction>;
+      overrides?: CallOverrides
+    ): Promise<[BigNumber]>;
+
+    getTokensInOut(
+      pyToken: string,
+      market: string,
+      overrides?: CallOverrides
+    ): Promise<
+      [string[], string[]] & { tokensIn: string[]; tokensOut: string[] }
+    >;
 
     getTradeExchangeRateIncludeFee(
       market: string,
@@ -615,8 +706,8 @@ export interface RouterStatic extends BaseContract {
       user: string,
       overrides?: CallOverrides
     ): Promise<
-      [IPRouterStatic.UserMarketInfoStructOutput] & {
-        userMarketInfo: IPRouterStatic.UserMarketInfoStructOutput;
+      [RouterStatic.UserMarketInfoStructOutput] & {
+        userMarketInfo: RouterStatic.UserMarketInfoStructOutput;
       }
     >;
 
@@ -625,8 +716,8 @@ export interface RouterStatic extends BaseContract {
       markets: string[],
       overrides?: CallOverrides
     ): Promise<
-      [IPRouterStatic.UserMarketInfoStructOutput[]] & {
-        userMarketPositions: IPRouterStatic.UserMarketInfoStructOutput[];
+      [RouterStatic.UserMarketInfoStructOutput[]] & {
+        userMarketPositions: RouterStatic.UserMarketInfoStructOutput[];
       }
     >;
 
@@ -635,8 +726,8 @@ export interface RouterStatic extends BaseContract {
       user: string,
       overrides?: CallOverrides
     ): Promise<
-      [IPRouterStatic.UserPYInfoStructOutput] & {
-        userPYInfo: IPRouterStatic.UserPYInfoStructOutput;
+      [RouterStatic.UserPYInfoStructOutput] & {
+        userPYInfo: RouterStatic.UserPYInfoStructOutput;
       }
     >;
 
@@ -645,8 +736,8 @@ export interface RouterStatic extends BaseContract {
       pys: string[],
       overrides?: CallOverrides
     ): Promise<
-      [IPRouterStatic.UserPYInfoStructOutput[]] & {
-        userPYPositions: IPRouterStatic.UserPYInfoStructOutput[];
+      [RouterStatic.UserPYInfoStructOutput[]] & {
+        userPYPositions: RouterStatic.UserPYInfoStructOutput[];
       }
     >;
 
@@ -655,17 +746,21 @@ export interface RouterStatic extends BaseContract {
       user: string,
       overrides?: CallOverrides
     ): Promise<
-      [BigNumber, IPRouterStatic.TokenAmountStructOutput[]] & {
+      [BigNumber, RouterStatic.TokenAmountStructOutput[]] & {
         balance: BigNumber;
-        rewards: IPRouterStatic.TokenAmountStructOutput[];
+        rewards: RouterStatic.TokenAmountStructOutput[];
       }
     >;
 
     hasPYPosition(
-      userPYInfo: IPRouterStatic.UserPYInfoStruct,
+      userPYInfo: RouterStatic.UserPYInfoStruct,
       overrides?: CallOverrides
     ): Promise<[boolean] & { hasPosition: boolean }>;
 
+    initialize(
+      overrides?: Overrides & { from?: string | Promise<string> }
+    ): Promise<ContractTransaction>;
+
     mintPYFromBaseStatic(
       YT: string,
       baseToken: string,
@@ -679,6 +774,10 @@ export interface RouterStatic extends BaseContract {
       overrides?: Overrides & { from?: string | Promise<string> }
     ): Promise<ContractTransaction>;
 
+    owner(overrides?: CallOverrides): Promise<[string]>;
+
+    proxiableUUID(overrides?: CallOverrides): Promise<[string]>;
+
     pyIndex(
       market: string,
       overrides?: Overrides & { from?: string | Promise<string> }
@@ -697,20 +796,21 @@ export interface RouterStatic extends BaseContract {
       overrides?: Overrides & { from?: string | Promise<string> }
     ): Promise<ContractTransaction>;
 
-    removeLiquidityDualIbTokenAndPtStatic(
+    removeLiquidityDualScyAndPtStatic(
       market: string,
       lpToRemove: BigNumberish,
       overrides?: CallOverrides
     ): Promise<
-      [BigNumber, BigNumber] & { netIbTokenOut: BigNumber; netPtOut: BigNumber }
+      [BigNumber, BigNumber] & { netScyOut: BigNumber; netPtOut: BigNumber }
     >;
 
-    removeLiquidityDualScyAndPtStatic(
+    removeLiquidityDualTokenAndPtStatic(
       market: string,
       lpToRemove: BigNumberish,
+      tokenOut: string,
       overrides?: CallOverrides
     ): Promise<
-      [BigNumber, BigNumber] & { netScyOut: BigNumber; netPtOut: BigNumber }
+      [BigNumber, BigNumber] & { netTokenOut: BigNumber; netPtOut: BigNumber }
     >;
 
     removeLiquiditySingleBaseTokenStatic(
@@ -732,6 +832,10 @@ export interface RouterStatic extends BaseContract {
       overrides?: Overrides & { from?: string | Promise<string> }
     ): Promise<ContractTransaction>;
 
+    renounceOwnership(
+      overrides?: Overrides & { from?: string | Promise<string> }
+    ): Promise<ContractTransaction>;
+
     swapExactBaseTokenForPtStatic(
       market: string,
       baseToken: string,
@@ -807,18 +911,35 @@ export interface RouterStatic extends BaseContract {
       exactScyOut: BigNumberish,
       overrides?: Overrides & { from?: string | Promise<string> }
     ): Promise<ContractTransaction>;
+
+    transferOwnership(
+      newOwner: string,
+      overrides?: Overrides & { from?: string | Promise<string> }
+    ): Promise<ContractTransaction>;
+
+    upgradeTo(
+      newImplementation: string,
+      overrides?: Overrides & { from?: string | Promise<string> }
+    ): Promise<ContractTransaction>;
+
+    upgradeToAndCall(
+      newImplementation: string,
+      data: BytesLike,
+      overrides?: PayableOverrides & { from?: string | Promise<string> }
+    ): Promise<ContractTransaction>;
   };
 
-  addLiquidityDualIbTokenAndPtStatic(
+  addLiquidityDualScyAndPtStatic(
     market: string,
-    ibTokenDesired: BigNumberish,
+    scyDesired: BigNumberish,
     ptDesired: BigNumberish,
     overrides?: Overrides & { from?: string | Promise<string> }
   ): Promise<ContractTransaction>;
 
-  addLiquidityDualScyAndPtStatic(
+  addLiquidityDualTokenAndPtStatic(
     market: string,
-    scyDesired: BigNumberish,
+    tokenIn: string,
+    tokenDesired: BigNumberish,
     ptDesired: BigNumberish,
     overrides?: Overrides & { from?: string | Promise<string> }
   ): Promise<ContractTransaction>;
@@ -881,8 +1002,16 @@ export interface RouterStatic extends BaseContract {
 
   getPtImpliedYield(
     market: string,
-    overrides?: Overrides & { from?: string | Promise<string> }
-  ): Promise<ContractTransaction>;
+    overrides?: CallOverrides
+  ): Promise<BigNumber>;
+
+  getTokensInOut(
+    pyToken: string,
+    market: string,
+    overrides?: CallOverrides
+  ): Promise<
+    [string[], string[]] & { tokensIn: string[]; tokensOut: string[] }
+  >;
 
   getTradeExchangeRateIncludeFee(
     market: string,
@@ -894,42 +1023,46 @@ export interface RouterStatic extends BaseContract {
     market: string,
     user: string,
     overrides?: CallOverrides
-  ): Promise<IPRouterStatic.UserMarketInfoStructOutput>;
+  ): Promise<RouterStatic.UserMarketInfoStructOutput>;
 
   getUserMarketPositions(
     user: string,
     markets: string[],
     overrides?: CallOverrides
-  ): Promise<IPRouterStatic.UserMarketInfoStructOutput[]>;
+  ): Promise<RouterStatic.UserMarketInfoStructOutput[]>;
 
   getUserPYInfo(
     py: string,
     user: string,
     overrides?: CallOverrides
-  ): Promise<IPRouterStatic.UserPYInfoStructOutput>;
+  ): Promise<RouterStatic.UserPYInfoStructOutput>;
 
   getUserPYPositionsByPYs(
     user: string,
     pys: string[],
     overrides?: CallOverrides
-  ): Promise<IPRouterStatic.UserPYInfoStructOutput[]>;
+  ): Promise<RouterStatic.UserPYInfoStructOutput[]>;
 
   getUserSCYInfo(
     scy: string,
     user: string,
     overrides?: CallOverrides
   ): Promise<
-    [BigNumber, IPRouterStatic.TokenAmountStructOutput[]] & {
+    [BigNumber, RouterStatic.TokenAmountStructOutput[]] & {
       balance: BigNumber;
-      rewards: IPRouterStatic.TokenAmountStructOutput[];
+      rewards: RouterStatic.TokenAmountStructOutput[];
     }
   >;
 
   hasPYPosition(
-    userPYInfo: IPRouterStatic.UserPYInfoStruct,
+    userPYInfo: RouterStatic.UserPYInfoStruct,
     overrides?: CallOverrides
   ): Promise<boolean>;
 
+  initialize(
+    overrides?: Overrides & { from?: string | Promise<string> }
+  ): Promise<ContractTransaction>;
+
   mintPYFromBaseStatic(
     YT: string,
     baseToken: string,
@@ -943,6 +1076,10 @@ export interface RouterStatic extends BaseContract {
     overrides?: Overrides & { from?: string | Promise<string> }
   ): Promise<ContractTransaction>;
 
+  owner(overrides?: CallOverrides): Promise<string>;
+
+  proxiableUUID(overrides?: CallOverrides): Promise<string>;
+
   pyIndex(
     market: string,
     overrides?: Overrides & { from?: string | Promise<string> }
@@ -961,20 +1098,21 @@ export interface RouterStatic extends BaseContract {
     overrides?: Overrides & { from?: string | Promise<string> }
   ): Promise<ContractTransaction>;
 
-  removeLiquidityDualIbTokenAndPtStatic(
+  removeLiquidityDualScyAndPtStatic(
     market: string,
     lpToRemove: BigNumberish,
     overrides?: CallOverrides
   ): Promise<
-    [BigNumber, BigNumber] & { netIbTokenOut: BigNumber; netPtOut: BigNumber }
+    [BigNumber, BigNumber] & { netScyOut: BigNumber; netPtOut: BigNumber }
   >;
 
-  removeLiquidityDualScyAndPtStatic(
+  removeLiquidityDualTokenAndPtStatic(
     market: string,
     lpToRemove: BigNumberish,
+    tokenOut: string,
     overrides?: CallOverrides
   ): Promise<
-    [BigNumber, BigNumber] & { netScyOut: BigNumber; netPtOut: BigNumber }
+    [BigNumber, BigNumber] & { netTokenOut: BigNumber; netPtOut: BigNumber }
   >;
 
   removeLiquiditySingleBaseTokenStatic(
@@ -996,6 +1134,10 @@ export interface RouterStatic extends BaseContract {
     overrides?: Overrides & { from?: string | Promise<string> }
   ): Promise<ContractTransaction>;
 
+  renounceOwnership(
+    overrides?: Overrides & { from?: string | Promise<string> }
+  ): Promise<ContractTransaction>;
+
   swapExactBaseTokenForPtStatic(
     market: string,
     baseToken: string,
@@ -1072,29 +1214,46 @@ export interface RouterStatic extends BaseContract {
     overrides?: Overrides & { from?: string | Promise<string> }
   ): Promise<ContractTransaction>;
 
+  transferOwnership(
+    newOwner: string,
+    overrides?: Overrides & { from?: string | Promise<string> }
+  ): Promise<ContractTransaction>;
+
+  upgradeTo(
+    newImplementation: string,
+    overrides?: Overrides & { from?: string | Promise<string> }
+  ): Promise<ContractTransaction>;
+
+  upgradeToAndCall(
+    newImplementation: string,
+    data: BytesLike,
+    overrides?: PayableOverrides & { from?: string | Promise<string> }
+  ): Promise<ContractTransaction>;
+
   callStatic: {
-    addLiquidityDualIbTokenAndPtStatic(
+    addLiquidityDualScyAndPtStatic(
       market: string,
-      ibTokenDesired: BigNumberish,
+      scyDesired: BigNumberish,
       ptDesired: BigNumberish,
       overrides?: CallOverrides
     ): Promise<
       [BigNumber, BigNumber, BigNumber] & {
         netLpOut: BigNumber;
-        ibTokenUsed: BigNumber;
+        scyUsed: BigNumber;
         ptUsed: BigNumber;
       }
     >;
 
-    addLiquidityDualScyAndPtStatic(
+    addLiquidityDualTokenAndPtStatic(
       market: string,
-      scyDesired: BigNumberish,
+      tokenIn: string,
+      tokenDesired: BigNumberish,
       ptDesired: BigNumberish,
       overrides?: CallOverrides
     ): Promise<
       [BigNumber, BigNumber, BigNumber] & {
         netLpOut: BigNumber;
-        scyUsed: BigNumber;
+        tokenUsed: BigNumber;
         ptUsed: BigNumber;
       }
     >;
@@ -1169,10 +1328,10 @@ export interface RouterStatic extends BaseContract {
       py: string,
       overrides?: CallOverrides
     ): Promise<
-      [BigNumber, BigNumber, IPRouterStatic.RewardIndexStructOutput[]] & {
+      [BigNumber, BigNumber, RouterStatic.RewardIndexStructOutput[]] & {
         exchangeRate: BigNumber;
         totalSupply: BigNumber;
-        rewardIndexes: IPRouterStatic.RewardIndexStructOutput[];
+        rewardIndexes: RouterStatic.RewardIndexStructOutput[];
       }
     >;
 
@@ -1192,6 +1351,14 @@ export interface RouterStatic extends BaseContract {
       overrides?: CallOverrides
     ): Promise<BigNumber>;
 
+    getTokensInOut(
+      pyToken: string,
+      market: string,
+      overrides?: CallOverrides
+    ): Promise<
+      [string[], string[]] & { tokensIn: string[]; tokensOut: string[] }
+    >;
+
     getTradeExchangeRateIncludeFee(
       market: string,
       netPtOut: BigNumberish,
@@ -1202,42 +1369,44 @@ export interface RouterStatic extends BaseContract {
       market: string,
       user: string,
       overrides?: CallOverrides
-    ): Promise<IPRouterStatic.UserMarketInfoStructOutput>;
+    ): Promise<RouterStatic.UserMarketInfoStructOutput>;
 
     getUserMarketPositions(
       user: string,
       markets: string[],
       overrides?: CallOverrides
-    ): Promise<IPRouterStatic.UserMarketInfoStructOutput[]>;
+    ): Promise<RouterStatic.UserMarketInfoStructOutput[]>;
 
     getUserPYInfo(
       py: string,
       user: string,
       overrides?: CallOverrides
-    ): Promise<IPRouterStatic.UserPYInfoStructOutput>;
+    ): Promise<RouterStatic.UserPYInfoStructOutput>;
 
     getUserPYPositionsByPYs(
       user: string,
       pys: string[],
       overrides?: CallOverrides
-    ): Promise<IPRouterStatic.UserPYInfoStructOutput[]>;
+    ): Promise<RouterStatic.UserPYInfoStructOutput[]>;
 
     getUserSCYInfo(
       scy: string,
       user: string,
       overrides?: CallOverrides
     ): Promise<
-      [BigNumber, IPRouterStatic.TokenAmountStructOutput[]] & {
+      [BigNumber, RouterStatic.TokenAmountStructOutput[]] & {
         balance: BigNumber;
-        rewards: IPRouterStatic.TokenAmountStructOutput[];
+        rewards: RouterStatic.TokenAmountStructOutput[];
       }
     >;
 
     hasPYPosition(
-      userPYInfo: IPRouterStatic.UserPYInfoStruct,
+      userPYInfo: RouterStatic.UserPYInfoStruct,
       overrides?: CallOverrides
     ): Promise<boolean>;
 
+    initialize(overrides?: CallOverrides): Promise<void>;
+
     mintPYFromBaseStatic(
       YT: string,
       baseToken: string,
@@ -1251,6 +1420,10 @@ export interface RouterStatic extends BaseContract {
       overrides?: CallOverrides
     ): Promise<BigNumber>;
 
+    owner(overrides?: CallOverrides): Promise<string>;
+
+    proxiableUUID(overrides?: CallOverrides): Promise<string>;
+
     pyIndex(market: string, overrides?: CallOverrides): Promise<BigNumber>;
 
     redeemPYToBaseStatic(
@@ -1266,20 +1439,21 @@ export interface RouterStatic extends BaseContract {
       overrides?: CallOverrides
     ): Promise<BigNumber>;
 
-    removeLiquidityDualIbTokenAndPtStatic(
+    removeLiquidityDualScyAndPtStatic(
       market: string,
       lpToRemove: BigNumberish,
       overrides?: CallOverrides
     ): Promise<
-      [BigNumber, BigNumber] & { netIbTokenOut: BigNumber; netPtOut: BigNumber }
+      [BigNumber, BigNumber] & { netScyOut: BigNumber; netPtOut: BigNumber }
     >;
 
-    removeLiquidityDualScyAndPtStatic(
+    removeLiquidityDualTokenAndPtStatic(
       market: string,
       lpToRemove: BigNumberish,
+      tokenOut: string,
       overrides?: CallOverrides
     ): Promise<
-      [BigNumber, BigNumber] & { netScyOut: BigNumber; netPtOut: BigNumber }
+      [BigNumber, BigNumber] & { netTokenOut: BigNumber; netPtOut: BigNumber }
     >;
 
     removeLiquiditySingleBaseTokenStatic(
@@ -1319,6 +1493,8 @@ export interface RouterStatic extends BaseContract {
       }
     >;
 
+    renounceOwnership(overrides?: CallOverrides): Promise<void>;
+
     swapExactBaseTokenForPtStatic(
       market: string,
       baseToken: string,
@@ -1466,21 +1642,64 @@ export interface RouterStatic extends BaseContract {
         priceImpact: BigNumber;
       }
     >;
+
+    transferOwnership(
+      newOwner: string,
+      overrides?: CallOverrides
+    ): Promise<void>;
+
+    upgradeTo(
+      newImplementation: string,
+      overrides?: CallOverrides
+    ): Promise<void>;
+
+    upgradeToAndCall(
+      newImplementation: string,
+      data: BytesLike,
+      overrides?: CallOverrides
+    ): Promise<void>;
   };
 
-  filters: {};
+  filters: {
+    "AdminChanged(address,address)"(
+      previousAdmin?: null,
+      newAdmin?: null
+    ): AdminChangedEventFilter;
+    AdminChanged(
+      previousAdmin?: null,
+      newAdmin?: null
+    ): AdminChangedEventFilter;
+
+    "BeaconUpgraded(address)"(
+      beacon?: string | null
+    ): BeaconUpgradedEventFilter;
+    BeaconUpgraded(beacon?: string | null): BeaconUpgradedEventFilter;
+
+    "OwnershipTransferred(address,address)"(
+      previousOwner?: string | null,
+      newOwner?: string | null
+    ): OwnershipTransferredEventFilter;
+    OwnershipTransferred(
+      previousOwner?: string | null,
+      newOwner?: string | null
+    ): OwnershipTransferredEventFilter;
+
+    "Upgraded(address)"(implementation?: string | null): UpgradedEventFilter;
+    Upgraded(implementation?: string | null): UpgradedEventFilter;
+  };
 
   estimateGas: {
-    addLiquidityDualIbTokenAndPtStatic(
+    addLiquidityDualScyAndPtStatic(
       market: string,
-      ibTokenDesired: BigNumberish,
+      scyDesired: BigNumberish,
       ptDesired: BigNumberish,
       overrides?: Overrides & { from?: string | Promise<string> }
     ): Promise<BigNumber>;
 
-    addLiquidityDualScyAndPtStatic(
+    addLiquidityDualTokenAndPtStatic(
       market: string,
-      scyDesired: BigNumberish,
+      tokenIn: string,
+      tokenDesired: BigNumberish,
       ptDesired: BigNumberish,
       overrides?: Overrides & { from?: string | Promise<string> }
     ): Promise<BigNumber>;
@@ -1534,7 +1753,13 @@ export interface RouterStatic extends BaseContract {
 
     getPtImpliedYield(
       market: string,
-      overrides?: Overrides & { from?: string | Promise<string> }
+      overrides?: CallOverrides
+    ): Promise<BigNumber>;
+
+    getTokensInOut(
+      pyToken: string,
+      market: string,
+      overrides?: CallOverrides
     ): Promise<BigNumber>;
 
     getTradeExchangeRateIncludeFee(
@@ -1574,10 +1799,14 @@ export interface RouterStatic extends BaseContract {
     ): Promise<BigNumber>;
 
     hasPYPosition(
-      userPYInfo: IPRouterStatic.UserPYInfoStruct,
+      userPYInfo: RouterStatic.UserPYInfoStruct,
       overrides?: CallOverrides
     ): Promise<BigNumber>;
 
+    initialize(
+      overrides?: Overrides & { from?: string | Promise<string> }
+    ): Promise<BigNumber>;
+
     mintPYFromBaseStatic(
       YT: string,
       baseToken: string,
@@ -1591,6 +1820,10 @@ export interface RouterStatic extends BaseContract {
       overrides?: Overrides & { from?: string | Promise<string> }
     ): Promise<BigNumber>;
 
+    owner(overrides?: CallOverrides): Promise<BigNumber>;
+
+    proxiableUUID(overrides?: CallOverrides): Promise<BigNumber>;
+
     pyIndex(
       market: string,
       overrides?: Overrides & { from?: string | Promise<string> }
@@ -1609,15 +1842,16 @@ export interface RouterStatic extends BaseContract {
       overrides?: Overrides & { from?: string | Promise<string> }
     ): Promise<BigNumber>;
 
-    removeLiquidityDualIbTokenAndPtStatic(
+    removeLiquidityDualScyAndPtStatic(
       market: string,
       lpToRemove: BigNumberish,
       overrides?: CallOverrides
     ): Promise<BigNumber>;
 
-    removeLiquidityDualScyAndPtStatic(
+    removeLiquidityDualTokenAndPtStatic(
       market: string,
       lpToRemove: BigNumberish,
+      tokenOut: string,
       overrides?: CallOverrides
     ): Promise<BigNumber>;
 
@@ -1640,6 +1874,10 @@ export interface RouterStatic extends BaseContract {
       overrides?: Overrides & { from?: string | Promise<string> }
     ): Promise<BigNumber>;
 
+    renounceOwnership(
+      overrides?: Overrides & { from?: string | Promise<string> }
+    ): Promise<BigNumber>;
+
     swapExactBaseTokenForPtStatic(
       market: string,
       baseToken: string,
@@ -1715,19 +1953,36 @@ export interface RouterStatic extends BaseContract {
       exactScyOut: BigNumberish,
       overrides?: Overrides & { from?: string | Promise<string> }
     ): Promise<BigNumber>;
+
+    transferOwnership(
+      newOwner: string,
+      overrides?: Overrides & { from?: string | Promise<string> }
+    ): Promise<BigNumber>;
+
+    upgradeTo(
+      newImplementation: string,
+      overrides?: Overrides & { from?: string | Promise<string> }
+    ): Promise<BigNumber>;
+
+    upgradeToAndCall(
+      newImplementation: string,
+      data: BytesLike,
+      overrides?: PayableOverrides & { from?: string | Promise<string> }
+    ): Promise<BigNumber>;
   };
 
   populateTransaction: {
-    addLiquidityDualIbTokenAndPtStatic(
+    addLiquidityDualScyAndPtStatic(
       market: string,
-      ibTokenDesired: BigNumberish,
+      scyDesired: BigNumberish,
       ptDesired: BigNumberish,
       overrides?: Overrides & { from?: string | Promise<string> }
     ): Promise<PopulatedTransaction>;
 
-    addLiquidityDualScyAndPtStatic(
+    addLiquidityDualTokenAndPtStatic(
       market: string,
-      scyDesired: BigNumberish,
+      tokenIn: string,
+      tokenDesired: BigNumberish,
       ptDesired: BigNumberish,
       overrides?: Overrides & { from?: string | Promise<string> }
     ): Promise<PopulatedTransaction>;
@@ -1781,7 +2036,13 @@ export interface RouterStatic extends BaseContract {
 
     getPtImpliedYield(
       market: string,
-      overrides?: Overrides & { from?: string | Promise<string> }
+      overrides?: CallOverrides
+    ): Promise<PopulatedTransaction>;
+
+    getTokensInOut(
+      pyToken: string,
+      market: string,
+      overrides?: CallOverrides
     ): Promise<PopulatedTransaction>;
 
     getTradeExchangeRateIncludeFee(
@@ -1821,10 +2082,14 @@ export interface RouterStatic extends BaseContract {
     ): Promise<PopulatedTransaction>;
 
     hasPYPosition(
-      userPYInfo: IPRouterStatic.UserPYInfoStruct,
+      userPYInfo: RouterStatic.UserPYInfoStruct,
       overrides?: CallOverrides
     ): Promise<PopulatedTransaction>;
 
+    initialize(
+      overrides?: Overrides & { from?: string | Promise<string> }
+    ): Promise<PopulatedTransaction>;
+
     mintPYFromBaseStatic(
       YT: string,
       baseToken: string,
@@ -1838,6 +2103,10 @@ export interface RouterStatic extends BaseContract {
       overrides?: Overrides & { from?: string | Promise<string> }
     ): Promise<PopulatedTransaction>;
 
+    owner(overrides?: CallOverrides): Promise<PopulatedTransaction>;
+
+    proxiableUUID(overrides?: CallOverrides): Promise<PopulatedTransaction>;
+
     pyIndex(
       market: string,
       overrides?: Overrides & { from?: string | Promise<string> }
@@ -1856,15 +2125,16 @@ export interface RouterStatic extends BaseContract {
       overrides?: Overrides & { from?: string | Promise<string> }
     ): Promise<PopulatedTransaction>;
 
-    removeLiquidityDualIbTokenAndPtStatic(
+    removeLiquidityDualScyAndPtStatic(
       market: string,
       lpToRemove: BigNumberish,
       overrides?: CallOverrides
     ): Promise<PopulatedTransaction>;
 
-    removeLiquidityDualScyAndPtStatic(
+    removeLiquidityDualTokenAndPtStatic(
       market: string,
       lpToRemove: BigNumberish,
+      tokenOut: string,
       overrides?: CallOverrides
     ): Promise<PopulatedTransaction>;
 
@@ -1887,6 +2157,10 @@ export interface RouterStatic extends BaseContract {
       overrides?: Overrides & { from?: string | Promise<string> }
     ): Promise<PopulatedTransaction>;
 
+    renounceOwnership(
+      overrides?: Overrides & { from?: string | Promise<string> }
+    ): Promise<PopulatedTransaction>;
+
     swapExactBaseTokenForPtStatic(
       market: string,
       baseToken: string,
@@ -1962,5 +2236,21 @@ export interface RouterStatic extends BaseContract {
       exactScyOut: BigNumberish,
       overrides?: Overrides & { from?: string | Promise<string> }
     ): Promise<PopulatedTransaction>;
+
+    transferOwnership(
+      newOwner: string,
+      overrides?: Overrides & { from?: string | Promise<string> }
+    ): Promise<PopulatedTransaction>;
+
+    upgradeTo(
+      newImplementation: string,
+      overrides?: Overrides & { from?: string | Promise<string> }
+    ): Promise<PopulatedTransaction>;
+
+    upgradeToAndCall(
+      newImplementation: string,
+      data: BytesLike,
+      overrides?: PayableOverrides & { from?: string | Promise<string> }
+    ): Promise<PopulatedTransaction>;
   };
 }