@pendle/core-v2 5.2.0-beta-2 → 5.2.0-beta-3

package/contracts/oracles/{factory → PtYtLpOracle/chainlink}/PendleChainlinkOracleFactory.sol

@@ -3,8 +3,8 @@ pragma solidity ^0.8.17;
 
 import "./PendleChainlinkOracle.sol";
 import "./PendleChainlinkOracleWithQuote.sol";
-import "../../interfaces/IPChainlinkOracleFactory.sol";
-import "../../interfaces/IPPYLpOracle.sol";
+import "../../../interfaces/IPChainlinkOracleFactory.sol";
+import "../../../interfaces/IPPYLpOracle.sol";
 
 contract PendleChainlinkOracleFactory is IPChainlinkOracleFactory {
     error OracleAlreadyExists();
@@ -39,20 +39,24 @@ contract PendleChainlinkOracleFactory is IPChainlinkOracleFactory {
         emit OracleCreated(market, twapDuration, baseOracleType, oracle, oracleId);
     }
 
+    /// @dev quoteOracle must has Chainlink-compatible interface
     function createOracleWithQuote(
         address market,
         uint32 twapDuration,
         PendleOracleType baseOracleType,
-        address quoteOracle
+        address quoteOracle1,
+        address quoteOracle2
     ) external returns (address oracle) {
-        bytes32 oracleId = _getOracleWithQuoteId(market, twapDuration, baseOracleType, quoteOracle);
+        bytes32 oracleId = _getOracleWithQuoteId(market, twapDuration, baseOracleType, quoteOracle1, quoteOracle2);
         if (oraclesWithQuote[oracleId] != address(0)) revert OracleAlreadyExists();
 
         _checkOracleState(market, twapDuration);
 
-        oracle = address(new PendleChainlinkOracleWithQuote(market, twapDuration, baseOracleType, quoteOracle));
+        oracle = address(
+            new PendleChainlinkOracleWithQuote(market, twapDuration, baseOracleType, quoteOracle1, quoteOracle2)
+        );
         oraclesWithQuote[oracleId] = oracle;
-        emit OracleWithQuoteCreated(market, twapDuration, baseOracleType, quoteOracle, oracle, oracleId);
+        emit OracleWithQuoteCreated(market, twapDuration, baseOracleType, quoteOracle1, quoteOracle2, oracle, oracleId);
     }
 
     function getOracle(
@@ -67,9 +71,11 @@ contract PendleChainlinkOracleFactory is IPChainlinkOracleFactory {
         address market,
         uint32 twapDuration,
         PendleOracleType baseOracleType,
-        address quoteOracle
+        address quoteOracle1,
+        address quoteOracle2
     ) public view returns (address) {
-        return oraclesWithQuote[_getOracleWithQuoteId(market, twapDuration, baseOracleType, quoteOracle)];
+        return
+            oraclesWithQuote[_getOracleWithQuoteId(market, twapDuration, baseOracleType, quoteOracle1, quoteOracle2)];
     }
 
     function _getOracleId(
@@ -84,9 +90,10 @@ contract PendleChainlinkOracleFactory is IPChainlinkOracleFactory {
         address market,
         uint32 twapDuration,
         PendleOracleType baseOracleType,
-        address quoteOracle
+        address quoteOracle1,
+        address quoteOracle2
     ) internal pure returns (bytes32) {
-        return keccak256(abi.encode(market, twapDuration, baseOracleType, quoteOracle));
+        return keccak256(abi.encode(market, twapDuration, baseOracleType, quoteOracle1, quoteOracle2));
     }
 
     function _checkOracleState(address market, uint32 twapDuration) internal view {

package/contracts/oracles/PtYtLpOracle/chainlink/PendleChainlinkOracleWithQuote.sol

@@ -0,0 +1,76 @@
+// SPDX-License-Identifier: GPL-3.0-or-later
+pragma solidity ^0.8.17;
+
+import "./PendleChainlinkOracleBase.sol";
+
+/**
+ * @dev The round data returned from this contract will follow:
+ * - There will be only one round (roundId=0)
+ * - startedAt=0, updatedAt=quoteOracle.updatedAt()
+ */
+contract PendleChainlinkOracleWithQuote is PendleChainlinkOracleBase {
+    // solhint-disable immutable-vars-naming
+    address public immutable quoteOracle1;
+    address public immutable quoteOracle2;
+    int256 public immutable quoteScale1;
+    int256 public immutable quoteScale2;
+    int256 internal immutable quoteScaleProduct;
+
+    function() internal view returns (int256, uint256) internal immutable getPriceWithQuote;
+
+    constructor(
+        address _market,
+        uint32 _twapDuration,
+        PendleOracleType _baseOracleType,
+        address _quoteOracle1,
+        address _quoteOracle2
+    ) PendleChainlinkOracleBase(_market, _twapDuration, _baseOracleType) {
+        quoteOracle1 = _quoteOracle1;
+        quoteScale1 = PMath.Int(10 ** AggregatorV3Interface(_quoteOracle1).decimals());
+
+        quoteOracle2 = _quoteOracle2;
+        quoteScale2 = quoteOracle2 == address(0)
+            ? PMath.Int(1)
+            : PMath.Int(10 ** AggregatorV3Interface(_quoteOracle2).decimals());
+
+        quoteScaleProduct = quoteScale1 * quoteScale2;
+        getPriceWithQuote = quoteOracle2 == address(0) ? _getPriceOneQuote : _getPriceTwoQuotes;
+    }
+
+    /**
+     * @notice The round data returned from this contract will follow:
+     * - answer will satisfy 1 natural unit of PendleToken = (answer/1e18) natural unit of quoteToken
+     * - In other words, 10**(PendleToken.decimals) = (answer/1e18) * 10**(quoteToken.decimals)
+     * @return roundId always 0 for this contract
+     * @return answer The answer (in 18 decimals)
+     * @return startedAt always 0 for this contract
+     * @return updatedAt will be the same as quoteOracle.updatedAt()
+     * @return answeredInRound always 0 for this contract
+     */
+    function latestRoundData()
+        public
+        view
+        virtual
+        override
+        returns (uint80 roundId, int256 answer, uint256 startedAt, uint256 updatedAt, uint80 answeredInRound)
+    {
+        (answer, updatedAt) = quoteOracle2 == address(0) ? _getPriceOneQuote() : _getPriceTwoQuotes();
+        roundId = 0;
+        startedAt = 0;
+        answeredInRound = 0;
+    }
+
+    function _getPriceOneQuote() internal view returns (int256 answer, uint256 updatedAt) {
+        (, int256 quoteAnswer1, , uint256 quoteUpdatedAt1, ) = AggregatorV3Interface(quoteOracle1).latestRoundData();
+        answer = (_getPendleTokenPrice() * quoteAnswer1) / quoteScale1;
+        updatedAt = quoteUpdatedAt1;
+    }
+
+    function _getPriceTwoQuotes() internal view returns (int256 answer, uint256 updatedAt) {
+        (, int256 quoteAnswer1, , uint256 quoteUpdatedAt1, ) = AggregatorV3Interface(quoteOracle1).latestRoundData();
+        (, int256 quoteAnswer2, , uint256 quoteUpdatedAt2, ) = AggregatorV3Interface(quoteOracle2).latestRoundData();
+
+        answer = (_getPendleTokenPrice() * quoteAnswer1 * quoteAnswer2) / quoteScaleProduct;
+        updatedAt = quoteUpdatedAt1 < quoteUpdatedAt2 ? quoteUpdatedAt1 : quoteUpdatedAt2;
+    }
+}

package/contracts/oracles/{samples → PtYtLpOracle/samples}/BoringLpGlpOracle.sol

@@ -2,9 +2,9 @@
 pragma solidity ^0.8.17;
 
 import "../PendleLpOracleLib.sol";
-import "../../interfaces/IPPYLpOracle.sol";
-import "../../interfaces/GMX/IGlpManager.sol";
-import "../../core/libraries/math/PMath.sol";
+import "../../../interfaces/IPPYLpOracle.sol";
+import "../../../interfaces/GMX/IGlpManager.sol";
+import "../../../core/libraries/math/PMath.sol";
 
 /**
  * @notice The LP/GLP price gotten from the market using the LpOracleLib is multiplied with the USD price of GLP read from

package/contracts/oracles/{samples → PtYtLpOracle/samples}/BoringLpSeller.sol

@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: GPL-3.0-or-later
 pragma solidity ^0.8.0;
-import "../../interfaces/IPMarket.sol";
+import "../../../interfaces/IPMarket.sol";
 
 abstract contract BoringLpSeller {
     bytes internal constant EMPTY_BYTES = abi.encode();

package/contracts/oracles/{samples → PtYtLpOracle/samples}/BoringPYUsdChainlinkAssetOracle.sol

@@ -1,9 +1,9 @@
 // SPDX-License-Identifier: GPL-3.0-or-later
 pragma solidity ^0.8.17;
 
-import "../../interfaces/IPPYLpOracle.sol";
-import "../../interfaces/IPMarket.sol";
-import "../../core/libraries/math/PMath.sol";
+import "../../../interfaces/IPPYLpOracle.sol";
+import "../../../interfaces/IPMarket.sol";
+import "../../../core/libraries/math/PMath.sol";
 import "../PendleLpOracleLib.sol";
 
 import {AggregatorV2V3Interface as IChainlinkAggregator} from "@chainlink/contracts/src/v0.8/interfaces/AggregatorV2V3Interface.sol";

package/contracts/oracles/{samples → PtYtLpOracle/samples}/BoringPYUsdChainlinkSYOracle.sol

@@ -1,9 +1,9 @@
 // SPDX-License-Identifier: GPL-3.0-or-later
 pragma solidity ^0.8.17;
 
-import "../../interfaces/IPPYLpOracle.sol";
-import "../../interfaces/IPMarket.sol";
-import "../../core/libraries/math/PMath.sol";
+import "../../../interfaces/IPPYLpOracle.sol";
+import "../../../interfaces/IPMarket.sol";
+import "../../../core/libraries/math/PMath.sol";
 import "../PendleLpOracleLib.sol";
 
 import {AggregatorV2V3Interface as IChainlinkAggregator} from "@chainlink/contracts/src/v0.8/interfaces/AggregatorV2V3Interface.sol";

package/contracts/oracles/{samples → PtYtLpOracle/samples}/BoringPtSeller.sol

@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: GPL-3.0-or-later
 pragma solidity ^0.8.0;
-import "../../interfaces/IPMarket.sol";
+import "../../../interfaces/IPMarket.sol";
 
 abstract contract BoringPtSeller {
     bytes internal constant EMPTY_BYTES = abi.encode();

package/contracts/oracles/{PendleBoringOneracle.sol → internal/PendleBoringOneracle.sol}

@@ -1,8 +1,8 @@
 // SPDX-License-Identifier: MIT
 pragma solidity ^0.8.17;
 
-import "../core/libraries/math/PMath.sol";
-import "../interfaces/IPExchangeRateOracle.sol";
+import "../../core/libraries/math/PMath.sol";
+import "../../interfaces/IPExchangeRateOracle.sol";
 
 contract PendleBoringOneracle is IPExchangeRateOracle {
     function getExchangeRate() external pure returns (uint256) {

package/contracts/oracles/{PendleBoringSolvBTCOneracle.sol → internal/PendleBoringSolvBTCOneracle.sol}

@@ -1,8 +1,8 @@
 // SPDX-License-Identifier: MIT
 pragma solidity ^0.8.17;
 
-import "../core/libraries/math/PMath.sol";
-import "../interfaces/IPExchangeRateOracle.sol";
+import "../../core/libraries/math/PMath.sol";
+import "../../interfaces/IPExchangeRateOracle.sol";
 
 contract PendleBoringSolvBTCOneracle is IPExchangeRateOracle {
     function getExchangeRate() external pure returns (uint256) {

package/contracts/oracles/{PendleRedStoneRateOracleAdapter.sol → internal/PendleRedStoneRateOracleAdapter.sol}

@@ -1,9 +1,9 @@
 // SPDX-License-Identifier: MIT
 pragma solidity ^0.8.17;
 
-import "../core/libraries/math/PMath.sol";
-import "../interfaces/IPExchangeRateOracle.sol";
-import "../interfaces/IRedstonePriceFeed.sol";
+import "../../core/libraries/math/PMath.sol";
+import "../../interfaces/IPExchangeRateOracle.sol";
+import "../../interfaces/IRedstonePriceFeed.sol";
 
 contract PendleRedStoneRateOracleAdapter is IPExchangeRateOracle {
     using PMath for int256;

package/package.json

@@ -2,7 +2,7 @@
   "name": "@pendle/core-v2",
   "description": "Core smart contracts of Pendle Protocol.",
   "license": "BUSL-1.1",
-  "version": "5.2.0-beta-2",
+  "version": "5.2.0-beta-3",
   "homepage": "https://pendle.finance",
   "keywords": [
     "pendle",

package/typechain-types/IPChainlinkOracleFactory.ts

@@ -1,7 +1,7 @@
 /* Autogenerated file. Do not edit manually. */
 /* tslint:disable */
 /* eslint-disable */
-import { BaseContract, Signer, utils } from "ethers";
+import { BaseContract, BigNumberish, Signer, utils } from "ethers";
 import { EventFragment } from "@ethersproject/abi";
 import { Listener, Provider } from "@ethersproject/providers";
 import type {
@@ -17,7 +17,7 @@ export interface IPChainlinkOracleFactoryInterface extends utils.Interface {
 
   events: {
     "OracleCreated(address,uint32,uint8,address,bytes32)": EventFragment;
-    "OracleWithQuoteCreated(address,uint32,uint8,address,address,bytes32)": EventFragment;
+    "OracleWithQuoteCreated(address,uint32,uint8,address,address,address,bytes32)": EventFragment;
   };
 
   getEvent(nameOrSignatureOrTopic: "OracleCreated"): EventFragment;
@@ -38,12 +38,13 @@ export type OracleCreatedEvent = TypedEvent<
 export type OracleCreatedEventFilter = TypedEventFilter<OracleCreatedEvent>;
 
 export type OracleWithQuoteCreatedEvent = TypedEvent<
-  [string, number, number, string, string, string],
+  [string, number, number, string, string, string, string],
   {
     market: string;
     twapDuration: number;
     baseOracleType: number;
-    quoteOracle: string;
+    quoteOracle1: string;
+    quoteOracle2: string;
     oracle: string;
     oracleId: string;
   }
@@ -86,33 +87,35 @@ export interface IPChainlinkOracleFactory extends BaseContract {
   filters: {
     "OracleCreated(address,uint32,uint8,address,bytes32)"(
       market?: string | null,
-      twapDuration?: null,
-      baseOracleType?: null,
-      oracle?: string | null,
+      twapDuration?: BigNumberish | null,
+      baseOracleType?: BigNumberish | null,
+      oracle?: null,
       oracleId?: null
     ): OracleCreatedEventFilter;
     OracleCreated(
       market?: string | null,
-      twapDuration?: null,
-      baseOracleType?: null,
-      oracle?: string | null,
+      twapDuration?: BigNumberish | null,
+      baseOracleType?: BigNumberish | null,
+      oracle?: null,
       oracleId?: null
     ): OracleCreatedEventFilter;
 
-    "OracleWithQuoteCreated(address,uint32,uint8,address,address,bytes32)"(
+    "OracleWithQuoteCreated(address,uint32,uint8,address,address,address,bytes32)"(
       market?: string | null,
-      twapDuration?: null,
-      baseOracleType?: null,
-      quoteOracle?: string | null,
-      oracle?: string | null,
+      twapDuration?: BigNumberish | null,
+      baseOracleType?: BigNumberish | null,
+      quoteOracle1?: null,
+      quoteOracle2?: null,
+      oracle?: null,
       oracleId?: null
     ): OracleWithQuoteCreatedEventFilter;
     OracleWithQuoteCreated(
       market?: string | null,
-      twapDuration?: null,
-      baseOracleType?: null,
-      quoteOracle?: string | null,
-      oracle?: string | null,
+      twapDuration?: BigNumberish | null,
+      baseOracleType?: BigNumberish | null,
+      quoteOracle1?: null,
+      quoteOracle2?: null,
+      oracle?: null,
       oracleId?: null
     ): OracleWithQuoteCreatedEventFilter;
   };

package/typechain-types/PendleChainlinkOracleFactory.ts

@@ -26,9 +26,9 @@ export interface PendleChainlinkOracleFactoryInterface extends utils.Interface {
   contractName: "PendleChainlinkOracleFactory";
   functions: {
     "createOracle(address,uint32,uint8)": FunctionFragment;
-    "createOracleWithQuote(address,uint32,uint8,address)": FunctionFragment;
+    "createOracleWithQuote(address,uint32,uint8,address,address)": FunctionFragment;
     "getOracle(address,uint32,uint8)": FunctionFragment;
-    "getOracleWithQuote(address,uint32,uint8,address)": FunctionFragment;
+    "getOracleWithQuote(address,uint32,uint8,address,address)": FunctionFragment;
     "oracles(bytes32)": FunctionFragment;
     "oraclesWithQuote(bytes32)": FunctionFragment;
     "pyLpOracle()": FunctionFragment;
@@ -40,7 +40,7 @@ export interface PendleChainlinkOracleFactoryInterface extends utils.Interface {
   ): string;
   encodeFunctionData(
     functionFragment: "createOracleWithQuote",
-    values: [string, BigNumberish, BigNumberish, string]
+    values: [string, BigNumberish, BigNumberish, string, string]
   ): string;
   encodeFunctionData(
     functionFragment: "getOracle",
@@ -48,7 +48,7 @@ export interface PendleChainlinkOracleFactoryInterface extends utils.Interface {
   ): string;
   encodeFunctionData(
     functionFragment: "getOracleWithQuote",
-    values: [string, BigNumberish, BigNumberish, string]
+    values: [string, BigNumberish, BigNumberish, string, string]
   ): string;
   encodeFunctionData(functionFragment: "oracles", values: [BytesLike]): string;
   encodeFunctionData(
@@ -82,7 +82,7 @@ export interface PendleChainlinkOracleFactoryInterface extends utils.Interface {
 
   events: {
     "OracleCreated(address,uint32,uint8,address,bytes32)": EventFragment;
-    "OracleWithQuoteCreated(address,uint32,uint8,address,address,bytes32)": EventFragment;
+    "OracleWithQuoteCreated(address,uint32,uint8,address,address,address,bytes32)": EventFragment;
   };
 
   getEvent(nameOrSignatureOrTopic: "OracleCreated"): EventFragment;
@@ -103,12 +103,13 @@ export type OracleCreatedEvent = TypedEvent<
 export type OracleCreatedEventFilter = TypedEventFilter<OracleCreatedEvent>;
 
 export type OracleWithQuoteCreatedEvent = TypedEvent<
-  [string, number, number, string, string, string],
+  [string, number, number, string, string, string, string],
   {
     market: string;
     twapDuration: number;
     baseOracleType: number;
-    quoteOracle: string;
+    quoteOracle1: string;
+    quoteOracle2: string;
     oracle: string;
     oracleId: string;
   }
@@ -156,7 +157,8 @@ export interface PendleChainlinkOracleFactory extends BaseContract {
       market: string,
       twapDuration: BigNumberish,
       baseOracleType: BigNumberish,
-      quoteOracle: string,
+      quoteOracle1: string,
+      quoteOracle2: string,
       overrides?: Overrides & { from?: string | Promise<string> }
     ): Promise<ContractTransaction>;
 
@@ -171,7 +173,8 @@ export interface PendleChainlinkOracleFactory extends BaseContract {
       market: string,
       twapDuration: BigNumberish,
       baseOracleType: BigNumberish,
-      quoteOracle: string,
+      quoteOracle1: string,
+      quoteOracle2: string,
       overrides?: CallOverrides
     ): Promise<[string]>;
 
@@ -199,7 +202,8 @@ export interface PendleChainlinkOracleFactory extends BaseContract {
     market: string,
     twapDuration: BigNumberish,
     baseOracleType: BigNumberish,
-    quoteOracle: string,
+    quoteOracle1: string,
+    quoteOracle2: string,
     overrides?: Overrides & { from?: string | Promise<string> }
   ): Promise<ContractTransaction>;
 
@@ -214,7 +218,8 @@ export interface PendleChainlinkOracleFactory extends BaseContract {
     market: string,
     twapDuration: BigNumberish,
     baseOracleType: BigNumberish,
-    quoteOracle: string,
+    quoteOracle1: string,
+    quoteOracle2: string,
     overrides?: CallOverrides
   ): Promise<string>;
 
@@ -239,7 +244,8 @@ export interface PendleChainlinkOracleFactory extends BaseContract {
       market: string,
       twapDuration: BigNumberish,
       baseOracleType: BigNumberish,
-      quoteOracle: string,
+      quoteOracle1: string,
+      quoteOracle2: string,
       overrides?: CallOverrides
     ): Promise<string>;
 
@@ -254,7 +260,8 @@ export interface PendleChainlinkOracleFactory extends BaseContract {
       market: string,
       twapDuration: BigNumberish,
       baseOracleType: BigNumberish,
-      quoteOracle: string,
+      quoteOracle1: string,
+      quoteOracle2: string,
       overrides?: CallOverrides
     ): Promise<string>;
 
@@ -271,33 +278,35 @@ export interface PendleChainlinkOracleFactory extends BaseContract {
   filters: {
     "OracleCreated(address,uint32,uint8,address,bytes32)"(
       market?: string | null,
-      twapDuration?: null,
-      baseOracleType?: null,
-      oracle?: string | null,
+      twapDuration?: BigNumberish | null,
+      baseOracleType?: BigNumberish | null,
+      oracle?: null,
       oracleId?: null
     ): OracleCreatedEventFilter;
     OracleCreated(
       market?: string | null,
-      twapDuration?: null,
-      baseOracleType?: null,
-      oracle?: string | null,
+      twapDuration?: BigNumberish | null,
+      baseOracleType?: BigNumberish | null,
+      oracle?: null,
       oracleId?: null
     ): OracleCreatedEventFilter;
 
-    "OracleWithQuoteCreated(address,uint32,uint8,address,address,bytes32)"(
+    "OracleWithQuoteCreated(address,uint32,uint8,address,address,address,bytes32)"(
       market?: string | null,
-      twapDuration?: null,
-      baseOracleType?: null,
-      quoteOracle?: string | null,
-      oracle?: string | null,
+      twapDuration?: BigNumberish | null,
+      baseOracleType?: BigNumberish | null,
+      quoteOracle1?: null,
+      quoteOracle2?: null,
+      oracle?: null,
       oracleId?: null
     ): OracleWithQuoteCreatedEventFilter;
     OracleWithQuoteCreated(
       market?: string | null,
-      twapDuration?: null,
-      baseOracleType?: null,
-      quoteOracle?: string | null,
-      oracle?: string | null,
+      twapDuration?: BigNumberish | null,
+      baseOracleType?: BigNumberish | null,
+      quoteOracle1?: null,
+      quoteOracle2?: null,
+      oracle?: null,
       oracleId?: null
     ): OracleWithQuoteCreatedEventFilter;
   };
@@ -314,7 +323,8 @@ export interface PendleChainlinkOracleFactory extends BaseContract {
       market: string,
       twapDuration: BigNumberish,
       baseOracleType: BigNumberish,
-      quoteOracle: string,
+      quoteOracle1: string,
+      quoteOracle2: string,
       overrides?: Overrides & { from?: string | Promise<string> }
     ): Promise<BigNumber>;
 
@@ -329,7 +339,8 @@ export interface PendleChainlinkOracleFactory extends BaseContract {
       market: string,
       twapDuration: BigNumberish,
       baseOracleType: BigNumberish,
-      quoteOracle: string,
+      quoteOracle1: string,
+      quoteOracle2: string,
       overrides?: CallOverrides
     ): Promise<BigNumber>;
 
@@ -355,7 +366,8 @@ export interface PendleChainlinkOracleFactory extends BaseContract {
       market: string,
       twapDuration: BigNumberish,
       baseOracleType: BigNumberish,
-      quoteOracle: string,
+      quoteOracle1: string,
+      quoteOracle2: string,
       overrides?: Overrides & { from?: string | Promise<string> }
     ): Promise<PopulatedTransaction>;
 
@@ -370,7 +382,8 @@ export interface PendleChainlinkOracleFactory extends BaseContract {
       market: string,
       twapDuration: BigNumberish,
       baseOracleType: BigNumberish,
-      quoteOracle: string,
+      quoteOracle1: string,
+      quoteOracle2: string,
       overrides?: CallOverrides
     ): Promise<PopulatedTransaction>;