@pendle/core-v2 2.0.1-mainnet → 2.1.0-mainnet

package/contracts/offchain-helpers/Broadcaster.sol

@@ -0,0 +1,48 @@
+// SPDX-License-Identifier: GPL-3.0-or-later
+pragma solidity 0.8.17;
+
+import "../interfaces/IPVotingController.sol";
+import "../LiquidityMining/libraries/WeekMath.sol";
+import "../core/libraries/BoringOwnableUpgradeable.sol";
+import "../core/libraries/TokenHelper.sol";
+
+import "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol";
+import "@openzeppelin/contracts/proxy/utils/UUPSUpgradeable.sol";
+import "@openzeppelin/contracts/proxy/Proxy.sol";
+
+contract Broadcaster is Initializable, BoringOwnableUpgradeable, UUPSUpgradeable, TokenHelper {
+    IPVotingController public immutable votingController;
+    uint256 public lastBroadcastedWeek;
+
+    constructor(address _votingController) initializer {
+        votingController = IPVotingController(_votingController);
+    }
+
+    function initialize() external initializer {
+        __BoringOwnable_init();
+    }
+
+    function finalizeAndBroadcast(uint64[] calldata chainIds) external {
+        uint256 currentWeek = WeekMath.getCurrentWeekStart();
+        require(lastBroadcastedWeek < currentWeek, "current week already broadcasted");
+        lastBroadcastedWeek = currentWeek;
+
+        votingController.finalizeEpoch();
+        for (uint256 i = 0; i < chainIds.length; ) {
+            uint64 chainId = chainIds[i];
+            uint256 fee = votingController.getBroadcastResultFee(chainId);
+            votingController.broadcastResults{ value: fee }(chainId);
+            unchecked {
+                i++;
+            }
+        }
+    }
+
+    function withdrawETH() external onlyOwner {
+        _transferOut(NATIVE, owner, address(this).balance);
+    }
+
+    function _authorizeUpgrade(address newImplementation) internal override onlyOwner {}
+
+    receive() external payable {}
+}

package/contracts/offchain-helpers/RouterStatic.sol

@@ -874,12 +874,14 @@ contract RouterStatic is Initializable, Proxy, BoringOwnableUpgradeable, UUPSUpg
             uint256 totalSy
         )
     {
-        bulk = IPBulkSellerFactory(bulkFactory).get(token, SY);
-        if (bulk != address(0)) {
-            BulkSellerState memory state = IPBulkSeller(bulk).readState();
-            if (state.rateTokenToSy != 0 || state.rateSyToToken != 0) {
-                totalToken = state.totalToken;
-                totalSy = state.totalSy;
+        if (address(bulkFactory) != address(0)) {
+            bulk = IPBulkSellerFactory(bulkFactory).get(token, SY);
+            if (bulk != address(0)) {
+                BulkSellerState memory state = IPBulkSeller(bulk).readState();
+                if (state.rateTokenToSy != 0 || state.rateSyToToken != 0) {
+                    totalToken = state.totalToken;
+                    totalSy = state.totalSy;
+                }
             }
         }
     }
@@ -898,28 +900,30 @@ contract RouterStatic is Initializable, Proxy, BoringOwnableUpgradeable, UUPSUpg
             uint256 totalSy
         )
     {
-        bulk = IPBulkSellerFactory(bulkFactory).get(token, SY);
-        if (bulk != address(0)) {
-            BulkSellerState memory state = IPBulkSeller(bulk).readState();
-
-            // Paused check
-            if (state.rateTokenToSy == 0 || state.rateSyToToken == 0) {
-                return (address(0), 0, 0);
-            }
-
-            // Liquidity check
-            uint256 postFeeRateTokenToSy = state.rateTokenToSy.mulDown(Math.ONE - state.feeRate);
-            uint256 postFeeRateSyToToken = state.rateSyToToken.mulDown(Math.ONE - state.feeRate);
-            if (
-                netTokenIn.mulDown(postFeeRateTokenToSy) > state.totalSy ||
-                netSyIn.mulDown(postFeeRateSyToToken) > state.totalToken
-            ) {
-                return (address(0), 0, 0);
+        if (address(bulkFactory) != address(0)) {
+            bulk = IPBulkSellerFactory(bulkFactory).get(token, SY);
+            if (bulk != address(0)) {
+                BulkSellerState memory state = IPBulkSeller(bulk).readState();
+
+                // Paused check
+                if (state.rateTokenToSy == 0 || state.rateSyToToken == 0) {
+                    return (address(0), 0, 0);
+                }
+
+                // Liquidity check
+                uint256 postFeeRateTokenToSy = state.rateTokenToSy.mulDown(Math.ONE - state.feeRate);
+                uint256 postFeeRateSyToToken = state.rateSyToToken.mulDown(Math.ONE - state.feeRate);
+                if (
+                    netTokenIn.mulDown(postFeeRateTokenToSy) > state.totalSy ||
+                    netSyIn.mulDown(postFeeRateSyToToken) > state.totalToken
+                ) {
+                    return (address(0), 0, 0);
+                }
+
+                // return...
+                totalToken = state.totalToken;
+                totalSy = state.totalSy;
             }
-
-            // return...
-            totalToken = state.totalToken;
-            totalSy = state.totalSy;
         }
     }
 }

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

@@ -2,7 +2,6 @@
 pragma solidity 0.8.17;
 
 import "@openzeppelin/contracts/utils/Address.sol";
-import "../../interfaces/IWETH.sol";
 import "../../core/libraries/TokenHelper.sol";
 import "../../core/libraries/Errors.sol";
 import "./IPSwapAggregator.sol";

package/deployments/42161-markets/GDAI-28MARCH2024.json

@@ -0,0 +1,10 @@
+{
+    "name": "SY gDAI",
+    "SY": "0x07C3dE6F0c21A52538A15d00dBF2434bB7Af7E14",
+    "YT": "0xb675f76645a19a122863EE8e865367990dc64A6E",
+    "PT": "0x5CB4E499A266a582D2fB41dE3C9F5A981A307297",
+    "market": "0xe59A37F7F5263aA8cb5155AF3498ba01CC2c394B",
+    "expiry": 1711584000,
+    "scalarRoot": "12436730000000000000",
+    "initAnchor": "1187321000000000000"
+}

package/package.json

@@ -2,7 +2,7 @@
   "name": "@pendle/core-v2",
   "description": "Core smart contracts of Pendle Protocol.",
   "license": "BUSL-1.1",
-  "version": "2.0.1-mainnet",
+  "version": "2.1.0-mainnet",
   "homepage": "https://pendle.finance",
   "keywords": [
     "pendle",
@@ -25,16 +25,15 @@
   "devDependencies": {
     "@typechain/ethers-v5": "^9.0.0",
     "@typechain/hardhat": "^4.0.0",
-    "hardhat": "^2.12.5",
-    "hardhat-contract-sizer": "^2.6.1",
-    "hardhat-storage-layout-diff": "^0.0.4",
-    "prettier": "^2.8.2",
-    "prettier-plugin-solidity": "^1.1.1",
-    "solc": "^0.8.17",
-    "solhint": "^3.3.7",
+    "hardhat": "^2.12.7",
+    "hardhat-contract-sizer": "^2.8.0",
+    "prettier": "^2.8.4",
+    "prettier-plugin-solidity": "^1.1.3",
+    "solc": "^0.8.19",
+    "solhint": "^3.4.0",
     "ts-node": "^10.9.1",
     "typechain": "^8.1.1",
-    "typescript": "^4.9.4"
+    "typescript": "^4.9.5"
   },
   "scripts": {
     "compile": "yarn hardhat compile",

package/typechain-types/ActionInfoStatic.ts

@@ -0,0 +1,310 @@
+/* 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 IPActionInfoStatic {
+  export type TokenAmountStruct = { token: string; amount: BigNumberish };
+
+  export type TokenAmountStructOutput = [string, BigNumber] & {
+    token: string;
+    amount: BigNumber;
+  };
+
+  export type UserMarketInfoStruct = {
+    lpBalance: IPActionInfoStatic.TokenAmountStruct;
+    ptBalance: IPActionInfoStatic.TokenAmountStruct;
+    syBalance: IPActionInfoStatic.TokenAmountStruct;
+    unclaimedRewards: IPActionInfoStatic.TokenAmountStruct[];
+  };
+
+  export type UserMarketInfoStructOutput = [
+    IPActionInfoStatic.TokenAmountStructOutput,
+    IPActionInfoStatic.TokenAmountStructOutput,
+    IPActionInfoStatic.TokenAmountStructOutput,
+    IPActionInfoStatic.TokenAmountStructOutput[]
+  ] & {
+    lpBalance: IPActionInfoStatic.TokenAmountStructOutput;
+    ptBalance: IPActionInfoStatic.TokenAmountStructOutput;
+    syBalance: IPActionInfoStatic.TokenAmountStructOutput;
+    unclaimedRewards: IPActionInfoStatic.TokenAmountStructOutput[];
+  };
+
+  export type UserPYInfoStruct = {
+    ptBalance: IPActionInfoStatic.TokenAmountStruct;
+    ytBalance: IPActionInfoStatic.TokenAmountStruct;
+    unclaimedInterest: IPActionInfoStatic.TokenAmountStruct;
+    unclaimedRewards: IPActionInfoStatic.TokenAmountStruct[];
+  };
+
+  export type UserPYInfoStructOutput = [
+    IPActionInfoStatic.TokenAmountStructOutput,
+    IPActionInfoStatic.TokenAmountStructOutput,
+    IPActionInfoStatic.TokenAmountStructOutput,
+    IPActionInfoStatic.TokenAmountStructOutput[]
+  ] & {
+    ptBalance: IPActionInfoStatic.TokenAmountStructOutput;
+    ytBalance: IPActionInfoStatic.TokenAmountStructOutput;
+    unclaimedInterest: IPActionInfoStatic.TokenAmountStructOutput;
+    unclaimedRewards: IPActionInfoStatic.TokenAmountStructOutput[];
+  };
+
+  export type UserSYInfoStruct = {
+    syBalance: IPActionInfoStatic.TokenAmountStruct;
+    unclaimedRewards: IPActionInfoStatic.TokenAmountStruct[];
+  };
+
+  export type UserSYInfoStructOutput = [
+    IPActionInfoStatic.TokenAmountStructOutput,
+    IPActionInfoStatic.TokenAmountStructOutput[]
+  ] & {
+    syBalance: IPActionInfoStatic.TokenAmountStructOutput;
+    unclaimedRewards: IPActionInfoStatic.TokenAmountStructOutput[];
+  };
+}
+
+export interface ActionInfoStaticInterface extends utils.Interface {
+  contractName: "ActionInfoStatic";
+  functions: {
+    "getPY(address)": FunctionFragment;
+    "getTokensInOut(address)": FunctionFragment;
+    "getUserMarketInfo(address,address)": FunctionFragment;
+    "getUserPYInfo(address,address)": FunctionFragment;
+    "getUserSYInfo(address,address)": FunctionFragment;
+  };
+
+  encodeFunctionData(functionFragment: "getPY", values: [string]): string;
+  encodeFunctionData(
+    functionFragment: "getTokensInOut",
+    values: [string]
+  ): string;
+  encodeFunctionData(
+    functionFragment: "getUserMarketInfo",
+    values: [string, string]
+  ): string;
+  encodeFunctionData(
+    functionFragment: "getUserPYInfo",
+    values: [string, string]
+  ): string;
+  encodeFunctionData(
+    functionFragment: "getUserSYInfo",
+    values: [string, string]
+  ): string;
+
+  decodeFunctionResult(functionFragment: "getPY", data: BytesLike): Result;
+  decodeFunctionResult(
+    functionFragment: "getTokensInOut",
+    data: BytesLike
+  ): Result;
+  decodeFunctionResult(
+    functionFragment: "getUserMarketInfo",
+    data: BytesLike
+  ): Result;
+  decodeFunctionResult(
+    functionFragment: "getUserPYInfo",
+    data: BytesLike
+  ): Result;
+  decodeFunctionResult(
+    functionFragment: "getUserSYInfo",
+    data: BytesLike
+  ): Result;
+
+  events: {};
+}
+
+export interface ActionInfoStatic extends BaseContract {
+  contractName: "ActionInfoStatic";
+  connect(signerOrProvider: Signer | Provider | string): this;
+  attach(addressOrName: string): this;
+  deployed(): Promise<this>;
+
+  interface: ActionInfoStaticInterface;
+
+  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: {
+    getPY(
+      py: string,
+      overrides?: CallOverrides
+    ): Promise<[string, string] & { pt: string; yt: string }>;
+
+    getTokensInOut(
+      token: string,
+      overrides?: CallOverrides
+    ): Promise<
+      [string[], string[]] & { tokensIn: string[]; tokensOut: string[] }
+    >;
+
+    getUserMarketInfo(
+      market: string,
+      user: string,
+      overrides?: Overrides & { from?: string | Promise<string> }
+    ): Promise<ContractTransaction>;
+
+    getUserPYInfo(
+      py: string,
+      user: string,
+      overrides?: Overrides & { from?: string | Promise<string> }
+    ): Promise<ContractTransaction>;
+
+    getUserSYInfo(
+      sy: string,
+      user: string,
+      overrides?: Overrides & { from?: string | Promise<string> }
+    ): Promise<ContractTransaction>;
+  };
+
+  getPY(
+    py: string,
+    overrides?: CallOverrides
+  ): Promise<[string, string] & { pt: string; yt: string }>;
+
+  getTokensInOut(
+    token: string,
+    overrides?: CallOverrides
+  ): Promise<
+    [string[], string[]] & { tokensIn: string[]; tokensOut: string[] }
+  >;
+
+  getUserMarketInfo(
+    market: string,
+    user: string,
+    overrides?: Overrides & { from?: string | Promise<string> }
+  ): Promise<ContractTransaction>;
+
+  getUserPYInfo(
+    py: string,
+    user: string,
+    overrides?: Overrides & { from?: string | Promise<string> }
+  ): Promise<ContractTransaction>;
+
+  getUserSYInfo(
+    sy: string,
+    user: string,
+    overrides?: Overrides & { from?: string | Promise<string> }
+  ): Promise<ContractTransaction>;
+
+  callStatic: {
+    getPY(
+      py: string,
+      overrides?: CallOverrides
+    ): Promise<[string, string] & { pt: string; yt: string }>;
+
+    getTokensInOut(
+      token: string,
+      overrides?: CallOverrides
+    ): Promise<
+      [string[], string[]] & { tokensIn: string[]; tokensOut: string[] }
+    >;
+
+    getUserMarketInfo(
+      market: string,
+      user: string,
+      overrides?: CallOverrides
+    ): Promise<IPActionInfoStatic.UserMarketInfoStructOutput>;
+
+    getUserPYInfo(
+      py: string,
+      user: string,
+      overrides?: CallOverrides
+    ): Promise<IPActionInfoStatic.UserPYInfoStructOutput>;
+
+    getUserSYInfo(
+      sy: string,
+      user: string,
+      overrides?: CallOverrides
+    ): Promise<IPActionInfoStatic.UserSYInfoStructOutput>;
+  };
+
+  filters: {};
+
+  estimateGas: {
+    getPY(py: string, overrides?: CallOverrides): Promise<BigNumber>;
+
+    getTokensInOut(
+      token: string,
+      overrides?: CallOverrides
+    ): Promise<BigNumber>;
+
+    getUserMarketInfo(
+      market: string,
+      user: string,
+      overrides?: Overrides & { from?: string | Promise<string> }
+    ): Promise<BigNumber>;
+
+    getUserPYInfo(
+      py: string,
+      user: string,
+      overrides?: Overrides & { from?: string | Promise<string> }
+    ): Promise<BigNumber>;
+
+    getUserSYInfo(
+      sy: string,
+      user: string,
+      overrides?: Overrides & { from?: string | Promise<string> }
+    ): Promise<BigNumber>;
+  };
+
+  populateTransaction: {
+    getPY(py: string, overrides?: CallOverrides): Promise<PopulatedTransaction>;
+
+    getTokensInOut(
+      token: string,
+      overrides?: CallOverrides
+    ): Promise<PopulatedTransaction>;
+
+    getUserMarketInfo(
+      market: string,
+      user: string,
+      overrides?: Overrides & { from?: string | Promise<string> }
+    ): Promise<PopulatedTransaction>;
+
+    getUserPYInfo(
+      py: string,
+      user: string,
+      overrides?: Overrides & { from?: string | Promise<string> }
+    ): Promise<PopulatedTransaction>;
+
+    getUserSYInfo(
+      sy: string,
+      user: string,
+      overrides?: Overrides & { from?: string | Promise<string> }
+    ): Promise<PopulatedTransaction>;
+  };
+}