@pendle/core-v2 2.1.2-mainnet → 2.3.0-mainnet

package/contracts/router/swap-aggregator/1inch/OneInchAggregationRouterHelper.sol

@@ -14,11 +14,10 @@ abstract contract OneInchAggregationRouterHelper {
         return (minAmount * newAmount) / oldAmount;
     }
 
-    function _get1inchScaledInputData(bytes calldata rawCallData, uint256 newAmount)
-        internal
-        pure
-        returns (bytes memory)
-    {
+    function _get1inchScaledInputData(
+        bytes calldata rawCallData,
+        uint256 newAmount
+    ) internal pure returns (bytes memory) {
         bytes4 selector = bytes4(rawCallData[:4]);
         bytes memory args = rawCallData[4:];
 

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

@@ -17,9 +17,5 @@ enum SwapType {
 }
 
 interface IPSwapAggregator {
-    function swap(
-        address tokenIn,
-        uint256 amountIn,
-        SwapData calldata swapData
-    ) external payable;
+    function swap(address tokenIn, uint256 amountIn, SwapData calldata swapData) external payable;
 }

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

@@ -16,11 +16,7 @@ contract PendleSwapAggregator is
 {
     using Address for address;
 
-    function swap(
-        address tokenIn,
-        uint256 amountIn,
-        SwapData calldata data
-    ) external payable {
+    function swap(address tokenIn, uint256 amountIn, SwapData calldata data) external payable {
         _safeApproveInf(tokenIn, data.extRouter);
         data.extRouter.functionCallWithValue(
             data.needScale

package/contracts/router/swap-aggregator/kyberswap/KyberAggregationRouterHelper.sol

@@ -37,11 +37,10 @@ abstract contract KyberAggregationRouterHelper {
         bytes destTokenFeeData;
     }
 
-    function _getKyberScaledInputData(bytes calldata kybercall, uint256 newAmount)
-        internal
-        pure
-        returns (bytes memory)
-    {
+    function _getKyberScaledInputData(
+        bytes calldata kybercall,
+        uint256 newAmount
+    ) internal pure returns (bytes memory) {
         bytes4 selector = bytes4(kybercall[:4]);
 
         if (selector == IMetaAggregationRouterV2.swap.selector) {

package/contracts/router/swap-aggregator/kyberswap/interfaces/IAggregationExecutor.sol

@@ -3,15 +3,15 @@
 pragma solidity >=0.6.12;
 
 interface IAggregationExecutor {
-  function callBytes(bytes calldata data) external payable; // 0xd9c45357
+    function callBytes(bytes calldata data) external payable; // 0xd9c45357
 
-  // callbytes per swap sequence
-  function swapSingleSequence(bytes calldata data) external;
+    // callbytes per swap sequence
+    function swapSingleSequence(bytes calldata data) external;
 
-  function finalTransactionProcessing(
-    address tokenIn,
-    address tokenOut,
-    address to,
-    bytes calldata destTokenFeeData
-  ) external;
+    function finalTransactionProcessing(
+        address tokenIn,
+        address tokenOut,
+        address to,
+        bytes calldata destTokenFeeData
+    ) external;
 }

package/contracts/router/swap-aggregator/kyberswap/interfaces/IMetaAggregationRouterV2.sol

@@ -28,10 +28,9 @@ interface IMetaAggregationRouterV2 {
         bytes clientData;
     }
 
-    function swap(SwapExecutionParams calldata execution)
-        external
-        payable
-        returns (uint256, uint256);
+    function swap(
+        SwapExecutionParams calldata execution
+    ) external payable returns (uint256, uint256);
 
     function swapSimpleMode(
         IAggregationExecutor caller,

package/deployments/1-core.json

@@ -21,7 +21,7 @@
     "bulkSellerFactory": "0x4B1da107B50529d53e5C906a79eaEcDCbC0E1dE3",
     "bulkSellerOffchain": "0x9ACc60F915dFcd190D270fc92567aE71776bd320",
     "router": "0x0000000001e4ef00d069e71d6ba041b0a16f7ea0",
-    "routerStatic": "0xcF45b92cd0B0859FC42a767fAac2354909f937e9",
+    "routerStatic": "0x263833d47eA3fA4a30f269323aba6a107f9eB14C",
     "pendleSwap": "0x9660AC0cB085F8Fb39a6F383cF2067785364f924",
     "vePendle": "0x4f30A9D41B80ecC5B94306AB4364951AE3170210",
     "senderEndpoint": "0x07b1014c88f14C9E910092526db57A20052E989F",

package/deployments/1-markets/BALANCER-LP-AURA-ANKRETH-WETH-MARCH-28-2024.json

@@ -0,0 +1,11 @@
+{
+    "name": "SY ankrETH-WETH_BalancerLP Aura",
+    "SY": "0xc0CA1e345bE44Ea2c83202222E5084ae3a01e9DC",
+    "YT": "0xF88Cf36C49f19713E2BB6FdfAD02c5e73e3019d0",
+    "PT": "0xf431a1d9b87e8e275C9B26DC9b99641c81a2b11A",
+    "market": "0xbEEf0aCD30d146F8ac4Ca6665D672727b943f105",
+    "expiry": 1711584000,
+    "bulkSeller": "0x8B9dE1a4f948474AAE072A24Ef45Fb9aC1278de4",
+    "scalarRoot": "24269700000000000000",
+    "initAnchor": "1114771000000000000"
+}

package/deployments/42161-core.json

@@ -18,7 +18,7 @@
     "yieldContractFactory": "0x28dE02Ac3c3F5ef427e55c321F73fDc7F192e8E4",
     "marketFactory": "0xf5a7De2D276dbda3EEf1b62A9E718EFf4d29dDC8",
     "router": "0x0000000001e4ef00d069e71d6ba041b0a16f7ea0",
-    "routerStatic": "0x4106FC9811a792130502Bb3A5b693894cca7bD8e",
+    "routerStatic": "0xAdB09F65bd90d19e3148D9ccb693F3161C6DB3E8",
     "pendleSwap": "0x0E669e08bd717d7F9c9DE158636BD8561295fbB5",
     "receiverEndpoint": "0xC9215ae9EC67385F38C755D862C8eE3702B5793A",
     "vePendle": "0x3209E9412cca80B18338f2a56ADA59c484c39644",

package/package.json

@@ -2,7 +2,7 @@
   "name": "@pendle/core-v2",
   "description": "Core smart contracts of Pendle Protocol.",
   "license": "BUSL-1.1",
-  "version": "2.1.2-mainnet",
+  "version": "2.3.0-mainnet",
   "homepage": "https://pendle.finance",
   "keywords": [
     "pendle",
@@ -25,12 +25,12 @@
   "devDependencies": {
     "@typechain/ethers-v5": "^9.0.0",
     "@typechain/hardhat": "^4.0.0",
-    "hardhat": "^2.12.7",
+    "hardhat": "^2.13.0",
     "hardhat-contract-sizer": "^2.8.0",
     "prettier": "^2.8.4",
     "prettier-plugin-solidity": "^1.1.3",
     "solc": "^0.8.19",
-    "solhint": "^3.4.0",
+    "solhint": "^3.4.1",
     "ts-node": "^10.9.1",
     "typechain": "^8.1.1",
     "typescript": "^4.9.5"
@@ -39,7 +39,8 @@
     "compile": "yarn hardhat compile",
     "size": "yarn hardhat size-contracts",
     "clean": "yarn hardhat clean",
-    "fcompile": "yarn clean && yarn compile"
+    "fcompile": "yarn clean && yarn compile",
+    "format": "yarn prettier -w contracts/**/*"
   },
   "packageManager": "yarn@3.3.1",
   "dependencies": {

package/typechain-types/ActionMarketCoreStatic.ts

@@ -890,11 +890,9 @@ export interface ActionMarketCoreStatic extends BaseContract {
         BigNumber,
         BigNumber,
         BigNumber,
-        BigNumber,
         BigNumber
       ] & {
         netTokenOut: BigNumber;
-        netSyToRedeem: BigNumber;
         netSyFee: BigNumber;
         priceImpact: BigNumber;
         exchangeRateAfter: BigNumber;
@@ -1059,11 +1057,9 @@ export interface ActionMarketCoreStatic extends BaseContract {
         BigNumber,
         BigNumber,
         BigNumber,
-        BigNumber,
         BigNumber
       ] & {
         netTokenOut: BigNumber;
-        netSyToRedeem: BigNumber;
         netSyFee: BigNumber;
         priceImpact: BigNumber;
         exchangeRateAfter: BigNumber;

package/typechain-types/ActionStorageStatic.ts

@@ -204,7 +204,7 @@ export interface ActionStorageStatic extends BaseContract {
 
     getOwnerAndPendingOwner(
       overrides?: CallOverrides
-    ): Promise<[string, string]>;
+    ): Promise<[string, string] & { _owner: string; _pendingOwner: string }>;
 
     setBulkSellerFactory(
       _bulkSellerFactory: string,
@@ -241,7 +241,9 @@ export interface ActionStorageStatic extends BaseContract {
     overrides?: CallOverrides
   ): Promise<ApproxParamsStructOutput>;
 
-  getOwnerAndPendingOwner(overrides?: CallOverrides): Promise<[string, string]>;
+  getOwnerAndPendingOwner(
+    overrides?: CallOverrides
+  ): Promise<[string, string] & { _owner: string; _pendingOwner: string }>;
 
   setBulkSellerFactory(
     _bulkSellerFactory: string,
@@ -281,7 +283,7 @@ export interface ActionStorageStatic extends BaseContract {
 
     getOwnerAndPendingOwner(
       overrides?: CallOverrides
-    ): Promise<[string, string]>;
+    ): Promise<[string, string] & { _owner: string; _pendingOwner: string }>;
 
     setBulkSellerFactory(
       _bulkSellerFactory: string,

package/typechain-types/IPActionMarketCoreStatic.ts

@@ -890,11 +890,9 @@ export interface IPActionMarketCoreStatic extends BaseContract {
         BigNumber,
         BigNumber,
         BigNumber,
-        BigNumber,
         BigNumber
       ] & {
         netTokenOut: BigNumber;
-        netSyToRedeem: BigNumber;
         netSyFee: BigNumber;
         priceImpact: BigNumber;
         exchangeRateAfter: BigNumber;
@@ -1059,11 +1057,9 @@ export interface IPActionMarketCoreStatic extends BaseContract {
         BigNumber,
         BigNumber,
         BigNumber,
-        BigNumber,
         BigNumber
       ] & {
         netTokenOut: BigNumber;
-        netSyToRedeem: BigNumber;
         netSyFee: BigNumber;
         priceImpact: BigNumber;
         exchangeRateAfter: BigNumber;

package/typechain-types/IPActionStorageStatic.ts

@@ -169,7 +169,7 @@ export interface IPActionStorageStatic extends BaseContract {
 
     getOwnerAndPendingOwner(
       overrides?: CallOverrides
-    ): Promise<[string, string]>;
+    ): Promise<[string, string] & { _owner: string; _pendingOwner: string }>;
 
     setBulkSellerFactory(
       _bulkSellerFactory: string,
@@ -199,7 +199,9 @@ export interface IPActionStorageStatic extends BaseContract {
     overrides?: CallOverrides
   ): Promise<ApproxParamsStructOutput>;
 
-  getOwnerAndPendingOwner(overrides?: CallOverrides): Promise<[string, string]>;
+  getOwnerAndPendingOwner(
+    overrides?: CallOverrides
+  ): Promise<[string, string] & { _owner: string; _pendingOwner: string }>;
 
   setBulkSellerFactory(
     _bulkSellerFactory: string,
@@ -229,7 +231,7 @@ export interface IPActionStorageStatic extends BaseContract {
 
     getOwnerAndPendingOwner(
       overrides?: CallOverrides
-    ): Promise<[string, string]>;
+    ): Promise<[string, string] & { _owner: string; _pendingOwner: string }>;
 
     setBulkSellerFactory(
       _bulkSellerFactory: string,

package/typechain-types/IPRouterStatic.ts

@@ -815,7 +815,7 @@ export interface IPRouterStatic extends BaseContract {
 
     getOwnerAndPendingOwner(
       overrides?: CallOverrides
-    ): Promise<[string, string]>;
+    ): Promise<[string, string] & { _owner: string; _pendingOwner: string }>;
 
     getPY(
       py: string,
@@ -1188,7 +1188,9 @@ export interface IPRouterStatic extends BaseContract {
     overrides?: Overrides & { from?: string | Promise<string> }
   ): Promise<ContractTransaction>;
 
-  getOwnerAndPendingOwner(overrides?: CallOverrides): Promise<[string, string]>;
+  getOwnerAndPendingOwner(
+    overrides?: CallOverrides
+  ): Promise<[string, string] & { _owner: string; _pendingOwner: string }>;
 
   getPY(
     py: string,
@@ -1629,7 +1631,7 @@ export interface IPRouterStatic extends BaseContract {
 
     getOwnerAndPendingOwner(
       overrides?: CallOverrides
-    ): Promise<[string, string]>;
+    ): Promise<[string, string] & { _owner: string; _pendingOwner: string }>;
 
     getPY(
       py: string,
@@ -1809,11 +1811,9 @@ export interface IPRouterStatic extends BaseContract {
         BigNumber,
         BigNumber,
         BigNumber,
-        BigNumber,
         BigNumber
       ] & {
         netTokenOut: BigNumber;
-        netSyToRedeem: BigNumber;
         netSyFee: BigNumber;
         priceImpact: BigNumber;
         exchangeRateAfter: BigNumber;
@@ -1993,11 +1993,9 @@ export interface IPRouterStatic extends BaseContract {
         BigNumber,
         BigNumber,
         BigNumber,
-        BigNumber,
         BigNumber
       ] & {
         netTokenOut: BigNumber;
-        netSyToRedeem: BigNumber;
         netSyFee: BigNumber;
         priceImpact: BigNumber;
         exchangeRateAfter: BigNumber;

package/typechain-types/IStargateLP.ts

@@ -0,0 +1,306 @@
+/* Autogenerated file. Do not edit manually. */
+/* tslint:disable */
+/* eslint-disable */
+import {
+  BaseContract,
+  BigNumber,
+  BigNumberish,
+  BytesLike,
+  CallOverrides,
+  ContractTransaction,
+  Overrides,
+  PopulatedTransaction,
+  Signer,
+  utils,
+} from "ethers";
+import { FunctionFragment, Result } from "@ethersproject/abi";
+import { Listener, Provider } from "@ethersproject/providers";
+import type {
+  TypedEventFilter,
+  TypedEvent,
+  TypedListener,
+  OnEvent,
+} from "./common";
+
+export declare namespace IStargateLP {
+  export type SwapObjStruct = {
+    amount: BigNumberish;
+    eqFee: BigNumberish;
+    eqReward: BigNumberish;
+    lpFee: BigNumberish;
+    protocolFee: BigNumberish;
+    lkbRemove: BigNumberish;
+  };
+
+  export type SwapObjStructOutput = [
+    BigNumber,
+    BigNumber,
+    BigNumber,
+    BigNumber,
+    BigNumber,
+    BigNumber
+  ] & {
+    amount: BigNumber;
+    eqFee: BigNumber;
+    eqReward: BigNumber;
+    lpFee: BigNumber;
+    protocolFee: BigNumber;
+    lkbRemove: BigNumber;
+  };
+}
+
+export interface IStargateLPInterface extends utils.Interface {
+  contractName: "IStargateLP";
+  functions: {
+    "amountLPtoLD(uint256)": FunctionFragment;
+    "convertRate()": FunctionFragment;
+    "deltaCredit()": FunctionFragment;
+    "mintFeeBP()": FunctionFragment;
+    "poolId()": FunctionFragment;
+    "router()": FunctionFragment;
+    "swapRemote(uint16,uint256,address,(uint256,uint256,uint256,uint256,uint256,uint256))": FunctionFragment;
+    "token()": FunctionFragment;
+    "totalLiquidity()": FunctionFragment;
+    "totalSupply()": FunctionFragment;
+  };
+
+  encodeFunctionData(
+    functionFragment: "amountLPtoLD",
+    values: [BigNumberish]
+  ): string;
+  encodeFunctionData(
+    functionFragment: "convertRate",
+    values?: undefined
+  ): string;
+  encodeFunctionData(
+    functionFragment: "deltaCredit",
+    values?: undefined
+  ): string;
+  encodeFunctionData(functionFragment: "mintFeeBP", values?: undefined): string;
+  encodeFunctionData(functionFragment: "poolId", values?: undefined): string;
+  encodeFunctionData(functionFragment: "router", values?: undefined): string;
+  encodeFunctionData(
+    functionFragment: "swapRemote",
+    values: [BigNumberish, BigNumberish, string, IStargateLP.SwapObjStruct]
+  ): string;
+  encodeFunctionData(functionFragment: "token", values?: undefined): string;
+  encodeFunctionData(
+    functionFragment: "totalLiquidity",
+    values?: undefined
+  ): string;
+  encodeFunctionData(
+    functionFragment: "totalSupply",
+    values?: undefined
+  ): string;
+
+  decodeFunctionResult(
+    functionFragment: "amountLPtoLD",
+    data: BytesLike
+  ): Result;
+  decodeFunctionResult(
+    functionFragment: "convertRate",
+    data: BytesLike
+  ): Result;
+  decodeFunctionResult(
+    functionFragment: "deltaCredit",
+    data: BytesLike
+  ): Result;
+  decodeFunctionResult(functionFragment: "mintFeeBP", data: BytesLike): Result;
+  decodeFunctionResult(functionFragment: "poolId", data: BytesLike): Result;
+  decodeFunctionResult(functionFragment: "router", data: BytesLike): Result;
+  decodeFunctionResult(functionFragment: "swapRemote", data: BytesLike): Result;
+  decodeFunctionResult(functionFragment: "token", data: BytesLike): Result;
+  decodeFunctionResult(
+    functionFragment: "totalLiquidity",
+    data: BytesLike
+  ): Result;
+  decodeFunctionResult(
+    functionFragment: "totalSupply",
+    data: BytesLike
+  ): Result;
+
+  events: {};
+}
+
+export interface IStargateLP extends BaseContract {
+  contractName: "IStargateLP";
+  connect(signerOrProvider: Signer | Provider | string): this;
+  attach(addressOrName: string): this;
+  deployed(): Promise<this>;
+
+  interface: IStargateLPInterface;
+
+  queryFilter<TEvent extends TypedEvent>(
+    event: TypedEventFilter<TEvent>,
+    fromBlockOrBlockhash?: string | number | undefined,
+    toBlock?: string | number | undefined
+  ): Promise<Array<TEvent>>;
+
+  listeners<TEvent extends TypedEvent>(
+    eventFilter?: TypedEventFilter<TEvent>
+  ): Array<TypedListener<TEvent>>;
+  listeners(eventName?: string): Array<Listener>;
+  removeAllListeners<TEvent extends TypedEvent>(
+    eventFilter: TypedEventFilter<TEvent>
+  ): this;
+  removeAllListeners(eventName?: string): this;
+  off: OnEvent<this>;
+  on: OnEvent<this>;
+  once: OnEvent<this>;
+  removeListener: OnEvent<this>;
+
+  functions: {
+    amountLPtoLD(
+      _amountLP: BigNumberish,
+      overrides?: CallOverrides
+    ): Promise<[BigNumber]>;
+
+    convertRate(overrides?: CallOverrides): Promise<[BigNumber]>;
+
+    deltaCredit(overrides?: CallOverrides): Promise<[BigNumber]>;
+
+    mintFeeBP(overrides?: CallOverrides): Promise<[BigNumber]>;
+
+    poolId(overrides?: CallOverrides): Promise<[BigNumber]>;
+
+    router(overrides?: CallOverrides): Promise<[string]>;
+
+    swapRemote(
+      _srcChainId: BigNumberish,
+      _srcPoolId: BigNumberish,
+      _to: string,
+      _s: IStargateLP.SwapObjStruct,
+      overrides?: Overrides & { from?: string | Promise<string> }
+    ): Promise<ContractTransaction>;
+
+    token(overrides?: CallOverrides): Promise<[string]>;
+
+    totalLiquidity(overrides?: CallOverrides): Promise<[BigNumber]>;
+
+    totalSupply(overrides?: CallOverrides): Promise<[BigNumber]>;
+  };
+
+  amountLPtoLD(
+    _amountLP: BigNumberish,
+    overrides?: CallOverrides
+  ): Promise<BigNumber>;
+
+  convertRate(overrides?: CallOverrides): Promise<BigNumber>;
+
+  deltaCredit(overrides?: CallOverrides): Promise<BigNumber>;
+
+  mintFeeBP(overrides?: CallOverrides): Promise<BigNumber>;
+
+  poolId(overrides?: CallOverrides): Promise<BigNumber>;
+
+  router(overrides?: CallOverrides): Promise<string>;
+
+  swapRemote(
+    _srcChainId: BigNumberish,
+    _srcPoolId: BigNumberish,
+    _to: string,
+    _s: IStargateLP.SwapObjStruct,
+    overrides?: Overrides & { from?: string | Promise<string> }
+  ): Promise<ContractTransaction>;
+
+  token(overrides?: CallOverrides): Promise<string>;
+
+  totalLiquidity(overrides?: CallOverrides): Promise<BigNumber>;
+
+  totalSupply(overrides?: CallOverrides): Promise<BigNumber>;
+
+  callStatic: {
+    amountLPtoLD(
+      _amountLP: BigNumberish,
+      overrides?: CallOverrides
+    ): Promise<BigNumber>;
+
+    convertRate(overrides?: CallOverrides): Promise<BigNumber>;
+
+    deltaCredit(overrides?: CallOverrides): Promise<BigNumber>;
+
+    mintFeeBP(overrides?: CallOverrides): Promise<BigNumber>;
+
+    poolId(overrides?: CallOverrides): Promise<BigNumber>;
+
+    router(overrides?: CallOverrides): Promise<string>;
+
+    swapRemote(
+      _srcChainId: BigNumberish,
+      _srcPoolId: BigNumberish,
+      _to: string,
+      _s: IStargateLP.SwapObjStruct,
+      overrides?: CallOverrides
+    ): Promise<BigNumber>;
+
+    token(overrides?: CallOverrides): Promise<string>;
+
+    totalLiquidity(overrides?: CallOverrides): Promise<BigNumber>;
+
+    totalSupply(overrides?: CallOverrides): Promise<BigNumber>;
+  };
+
+  filters: {};
+
+  estimateGas: {
+    amountLPtoLD(
+      _amountLP: BigNumberish,
+      overrides?: CallOverrides
+    ): Promise<BigNumber>;
+
+    convertRate(overrides?: CallOverrides): Promise<BigNumber>;
+
+    deltaCredit(overrides?: CallOverrides): Promise<BigNumber>;
+
+    mintFeeBP(overrides?: CallOverrides): Promise<BigNumber>;
+
+    poolId(overrides?: CallOverrides): Promise<BigNumber>;
+
+    router(overrides?: CallOverrides): Promise<BigNumber>;
+
+    swapRemote(
+      _srcChainId: BigNumberish,
+      _srcPoolId: BigNumberish,
+      _to: string,
+      _s: IStargateLP.SwapObjStruct,
+      overrides?: Overrides & { from?: string | Promise<string> }
+    ): Promise<BigNumber>;
+
+    token(overrides?: CallOverrides): Promise<BigNumber>;
+
+    totalLiquidity(overrides?: CallOverrides): Promise<BigNumber>;
+
+    totalSupply(overrides?: CallOverrides): Promise<BigNumber>;
+  };
+
+  populateTransaction: {
+    amountLPtoLD(
+      _amountLP: BigNumberish,
+      overrides?: CallOverrides
+    ): Promise<PopulatedTransaction>;
+
+    convertRate(overrides?: CallOverrides): Promise<PopulatedTransaction>;
+
+    deltaCredit(overrides?: CallOverrides): Promise<PopulatedTransaction>;
+
+    mintFeeBP(overrides?: CallOverrides): Promise<PopulatedTransaction>;
+
+    poolId(overrides?: CallOverrides): Promise<PopulatedTransaction>;
+
+    router(overrides?: CallOverrides): Promise<PopulatedTransaction>;
+
+    swapRemote(
+      _srcChainId: BigNumberish,
+      _srcPoolId: BigNumberish,
+      _to: string,
+      _s: IStargateLP.SwapObjStruct,
+      overrides?: Overrides & { from?: string | Promise<string> }
+    ): Promise<PopulatedTransaction>;
+
+    token(overrides?: CallOverrides): Promise<PopulatedTransaction>;
+
+    totalLiquidity(overrides?: CallOverrides): Promise<PopulatedTransaction>;
+
+    totalSupply(overrides?: CallOverrides): Promise<PopulatedTransaction>;
+  };
+}