@pendle/core-v2 0.4.0 → 0.5.1-beta

package/typechain-types/hardhat.d.ts

@@ -48,6 +48,26 @@ declare module "hardhat/types/runtime" {
       name: "IERC20",
       signerOrOptions?: ethers.Signer | FactoryOptions
     ): Promise<Contracts.IERC20__factory>;
+    getContractFactory(
+      name: "ActionCallback",
+      signerOrOptions?: ethers.Signer | FactoryOptions
+    ): Promise<Contracts.ActionCallback__factory>;
+    getContractFactory(
+      name: "ActionCore",
+      signerOrOptions?: ethers.Signer | FactoryOptions
+    ): Promise<Contracts.ActionCore__factory>;
+    getContractFactory(
+      name: "ActionYT",
+      signerOrOptions?: ethers.Signer | FactoryOptions
+    ): Promise<Contracts.ActionYT__factory>;
+    getContractFactory(
+      name: "ActionSCYAndYOBase",
+      signerOrOptions?: ethers.Signer | FactoryOptions
+    ): Promise<Contracts.ActionSCYAndYOBase__factory>;
+    getContractFactory(
+      name: "ActionSCYAndYTBase",
+      signerOrOptions?: ethers.Signer | FactoryOptions
+    ): Promise<Contracts.ActionSCYAndYTBase__factory>;
     getContractFactory(
       name: "PendleBaseToken",
       signerOrOptions?: ethers.Signer | FactoryOptions
@@ -64,6 +84,10 @@ declare module "hardhat/types/runtime" {
       name: "PendleOwnershipToken",
       signerOrOptions?: ethers.Signer | FactoryOptions
     ): Promise<Contracts.PendleOwnershipToken__factory>;
+    getContractFactory(
+      name: "PendleRouter",
+      signerOrOptions?: ethers.Signer | FactoryOptions
+    ): Promise<Contracts.PendleRouter__factory>;
     getContractFactory(
       name: "PendleAaveV3SCY",
       signerOrOptions?: ethers.Signer | FactoryOptions
@@ -89,29 +113,9 @@ declare module "hardhat/types/runtime" {
       signerOrOptions?: ethers.Signer | FactoryOptions
     ): Promise<Contracts.PendleYieldToken__factory>;
     getContractFactory(
-      name: "PendleRouterSCYAndForgeBaseUpg",
-      signerOrOptions?: ethers.Signer | FactoryOptions
-    ): Promise<Contracts.PendleRouterSCYAndForgeBaseUpg__factory>;
-    getContractFactory(
-      name: "PendleRouterYTBaseUpg",
-      signerOrOptions?: ethers.Signer | FactoryOptions
-    ): Promise<Contracts.PendleRouterYTBaseUpg__factory>;
-    getContractFactory(
-      name: "PendleRouterCoreUpg",
-      signerOrOptions?: ethers.Signer | FactoryOptions
-    ): Promise<Contracts.PendleRouterCoreUpg__factory>;
-    getContractFactory(
-      name: "PendleRouterProxy",
-      signerOrOptions?: ethers.Signer | FactoryOptions
-    ): Promise<Contracts.PendleRouterProxy__factory>;
-    getContractFactory(
-      name: "PendleRouterStaticUpg",
-      signerOrOptions?: ethers.Signer | FactoryOptions
-    ): Promise<Contracts.PendleRouterStaticUpg__factory>;
-    getContractFactory(
-      name: "PendleRouterYTUpg",
+      name: "RouterStatic",
       signerOrOptions?: ethers.Signer | FactoryOptions
-    ): Promise<Contracts.PendleRouterYTUpg__factory>;
+    ): Promise<Contracts.RouterStatic__factory>;
     getContractFactory(
       name: "IAavePool",
       signerOrOptions?: ethers.Signer | FactoryOptions
@@ -137,13 +141,21 @@ declare module "hardhat/types/runtime" {
       signerOrOptions?: ethers.Signer | FactoryOptions
     ): Promise<Contracts.IJoeRouter01__factory>;
     getContractFactory(
-      name: "IPBaseToken",
+      name: "IPActionCore",
       signerOrOptions?: ethers.Signer | FactoryOptions
-    ): Promise<Contracts.IPBaseToken__factory>;
+    ): Promise<Contracts.IPActionCore__factory>;
+    getContractFactory(
+      name: "IPActionYT",
+      signerOrOptions?: ethers.Signer | FactoryOptions
+    ): Promise<Contracts.IPActionYT__factory>;
     getContractFactory(
-      name: "IPFlashCallback",
+      name: "IPAllAction",
       signerOrOptions?: ethers.Signer | FactoryOptions
-    ): Promise<Contracts.IPFlashCallback__factory>;
+    ): Promise<Contracts.IPAllAction__factory>;
+    getContractFactory(
+      name: "IPBaseToken",
+      signerOrOptions?: ethers.Signer | FactoryOptions
+    ): Promise<Contracts.IPBaseToken__factory>;
     getContractFactory(
       name: "IPGovernanceManager",
       signerOrOptions?: ethers.Signer | FactoryOptions
@@ -172,18 +184,10 @@ declare module "hardhat/types/runtime" {
       name: "IPermissionsV2Upg",
       signerOrOptions?: ethers.Signer | FactoryOptions
     ): Promise<Contracts.IPermissionsV2Upg__factory>;
-    getContractFactory(
-      name: "IPRouterCore",
-      signerOrOptions?: ethers.Signer | FactoryOptions
-    ): Promise<Contracts.IPRouterCore__factory>;
     getContractFactory(
       name: "IPRouterStatic",
       signerOrOptions?: ethers.Signer | FactoryOptions
     ): Promise<Contracts.IPRouterStatic__factory>;
-    getContractFactory(
-      name: "IPRouterYT",
-      signerOrOptions?: ethers.Signer | FactoryOptions
-    ): Promise<Contracts.IPRouterYT__factory>;
     getContractFactory(
       name: "IPYieldContractFactory",
       signerOrOptions?: ethers.Signer | FactoryOptions
@@ -228,6 +232,10 @@ declare module "hardhat/types/runtime" {
       name: "PermissionsV2Upg",
       signerOrOptions?: ethers.Signer | FactoryOptions
     ): Promise<Contracts.PermissionsV2Upg__factory>;
+    getContractFactory(
+      name: "IRewardManager",
+      signerOrOptions?: ethers.Signer | FactoryOptions
+    ): Promise<Contracts.IRewardManager__factory>;
     getContractFactory(
       name: "RewardManager",
       signerOrOptions?: ethers.Signer | FactoryOptions
@@ -290,6 +298,31 @@ declare module "hardhat/types/runtime" {
       address: string,
       signer?: ethers.Signer
     ): Promise<Contracts.IERC20>;
+    getContractAt(
+      name: "ActionCallback",
+      address: string,
+      signer?: ethers.Signer
+    ): Promise<Contracts.ActionCallback>;
+    getContractAt(
+      name: "ActionCore",
+      address: string,
+      signer?: ethers.Signer
+    ): Promise<Contracts.ActionCore>;
+    getContractAt(
+      name: "ActionYT",
+      address: string,
+      signer?: ethers.Signer
+    ): Promise<Contracts.ActionYT>;
+    getContractAt(
+      name: "ActionSCYAndYOBase",
+      address: string,
+      signer?: ethers.Signer
+    ): Promise<Contracts.ActionSCYAndYOBase>;
+    getContractAt(
+      name: "ActionSCYAndYTBase",
+      address: string,
+      signer?: ethers.Signer
+    ): Promise<Contracts.ActionSCYAndYTBase>;
     getContractAt(
       name: "PendleBaseToken",
       address: string,
@@ -310,6 +343,11 @@ declare module "hardhat/types/runtime" {
       address: string,
       signer?: ethers.Signer
     ): Promise<Contracts.PendleOwnershipToken>;
+    getContractAt(
+      name: "PendleRouter",
+      address: string,
+      signer?: ethers.Signer
+    ): Promise<Contracts.PendleRouter>;
     getContractAt(
       name: "PendleAaveV3SCY",
       address: string,
@@ -341,35 +379,10 @@ declare module "hardhat/types/runtime" {
       signer?: ethers.Signer
     ): Promise<Contracts.PendleYieldToken>;
     getContractAt(
-      name: "PendleRouterSCYAndForgeBaseUpg",
-      address: string,
-      signer?: ethers.Signer
-    ): Promise<Contracts.PendleRouterSCYAndForgeBaseUpg>;
-    getContractAt(
-      name: "PendleRouterYTBaseUpg",
-      address: string,
-      signer?: ethers.Signer
-    ): Promise<Contracts.PendleRouterYTBaseUpg>;
-    getContractAt(
-      name: "PendleRouterCoreUpg",
-      address: string,
-      signer?: ethers.Signer
-    ): Promise<Contracts.PendleRouterCoreUpg>;
-    getContractAt(
-      name: "PendleRouterProxy",
-      address: string,
-      signer?: ethers.Signer
-    ): Promise<Contracts.PendleRouterProxy>;
-    getContractAt(
-      name: "PendleRouterStaticUpg",
+      name: "RouterStatic",
       address: string,
       signer?: ethers.Signer
-    ): Promise<Contracts.PendleRouterStaticUpg>;
-    getContractAt(
-      name: "PendleRouterYTUpg",
-      address: string,
-      signer?: ethers.Signer
-    ): Promise<Contracts.PendleRouterYTUpg>;
+    ): Promise<Contracts.RouterStatic>;
     getContractAt(
       name: "IAavePool",
       address: string,
@@ -401,15 +414,25 @@ declare module "hardhat/types/runtime" {
       signer?: ethers.Signer
     ): Promise<Contracts.IJoeRouter01>;
     getContractAt(
-      name: "IPBaseToken",
+      name: "IPActionCore",
       address: string,
       signer?: ethers.Signer
-    ): Promise<Contracts.IPBaseToken>;
+    ): Promise<Contracts.IPActionCore>;
+    getContractAt(
+      name: "IPActionYT",
+      address: string,
+      signer?: ethers.Signer
+    ): Promise<Contracts.IPActionYT>;
+    getContractAt(
+      name: "IPAllAction",
+      address: string,
+      signer?: ethers.Signer
+    ): Promise<Contracts.IPAllAction>;
     getContractAt(
-      name: "IPFlashCallback",
+      name: "IPBaseToken",
       address: string,
       signer?: ethers.Signer
-    ): Promise<Contracts.IPFlashCallback>;
+    ): Promise<Contracts.IPBaseToken>;
     getContractAt(
       name: "IPGovernanceManager",
       address: string,
@@ -445,21 +468,11 @@ declare module "hardhat/types/runtime" {
       address: string,
       signer?: ethers.Signer
     ): Promise<Contracts.IPermissionsV2Upg>;
-    getContractAt(
-      name: "IPRouterCore",
-      address: string,
-      signer?: ethers.Signer
-    ): Promise<Contracts.IPRouterCore>;
     getContractAt(
       name: "IPRouterStatic",
       address: string,
       signer?: ethers.Signer
     ): Promise<Contracts.IPRouterStatic>;
-    getContractAt(
-      name: "IPRouterYT",
-      address: string,
-      signer?: ethers.Signer
-    ): Promise<Contracts.IPRouterYT>;
     getContractAt(
       name: "IPYieldContractFactory",
       address: string,
@@ -515,6 +528,11 @@ declare module "hardhat/types/runtime" {
       address: string,
       signer?: ethers.Signer
     ): Promise<Contracts.PermissionsV2Upg>;
+    getContractAt(
+      name: "IRewardManager",
+      address: string,
+      signer?: ethers.Signer
+    ): Promise<Contracts.IRewardManager>;
     getContractAt(
       name: "RewardManager",
       address: string,

package/typechain-types/index.ts

@@ -10,30 +10,33 @@ export type { Proxy } from "./Proxy";
 export type { ERC20 } from "./ERC20";
 export type { IERC20Metadata } from "./IERC20Metadata";
 export type { IERC20 } from "./IERC20";
+export type { ActionCallback } from "./ActionCallback";
+export type { ActionCore } from "./ActionCore";
+export type { ActionYT } from "./ActionYT";
+export type { ActionSCYAndYOBase } from "./ActionSCYAndYOBase";
+export type { ActionSCYAndYTBase } from "./ActionSCYAndYTBase";
 export type { PendleBaseToken } from "./PendleBaseToken";
 export type { PendleMarket } from "./PendleMarket";
 export type { PendleMarketFactory } from "./PendleMarketFactory";
 export type { PendleOwnershipToken } from "./PendleOwnershipToken";
+export type { PendleRouter } from "./PendleRouter";
 export type { PendleAaveV3SCY } from "./PendleAaveV3SCY";
 export type { PendleBenQiErc20SCY } from "./PendleBenQiErc20SCY";
 export type { PendleBtrflyScy } from "./PendleBtrflyScy";
 export type { PendleYearnVaultScy } from "./PendleYearnVaultScy";
 export type { PendleYieldContractFactory } from "./PendleYieldContractFactory";
 export type { PendleYieldToken } from "./PendleYieldToken";
-export type { PendleRouterSCYAndForgeBaseUpg } from "./PendleRouterSCYAndForgeBaseUpg";
-export type { PendleRouterYTBaseUpg } from "./PendleRouterYTBaseUpg";
-export type { PendleRouterCoreUpg } from "./PendleRouterCoreUpg";
-export type { PendleRouterProxy } from "./PendleRouterProxy";
-export type { PendleRouterStaticUpg } from "./PendleRouterStaticUpg";
-export type { PendleRouterYTUpg } from "./PendleRouterYTUpg";
+export type { RouterStatic } from "./RouterStatic";
 export type { IAavePool } from "./IAavePool";
 export type { IAaveRewardsController } from "./IAaveRewardsController";
 export type { IAToken } from "./IAToken";
 export type { IBenQiComptroller } from "./IBenQiComptroller";
 export type { IJoePair } from "./IJoePair";
 export type { IJoeRouter01 } from "./IJoeRouter01";
+export type { IPActionCore } from "./IPActionCore";
+export type { IPActionYT } from "./IPActionYT";
+export type { IPAllAction } from "./IPAllAction";
 export type { IPBaseToken } from "./IPBaseToken";
-export type { IPFlashCallback } from "./IPFlashCallback";
 export type { IPGovernanceManager } from "./IPGovernanceManager";
 export type { IPMarket } from "./IPMarket";
 export type { IPMarketAddRemoveCallback } from "./IPMarketAddRemoveCallback";
@@ -41,9 +44,7 @@ export type { IPMarketFactory } from "./IPMarketFactory";
 export type { IPMarketSwapCallback } from "./IPMarketSwapCallback";
 export type { IPOwnershipToken } from "./IPOwnershipToken";
 export type { IPermissionsV2Upg } from "./IPermissionsV2Upg";
-export type { IPRouterCore } from "./IPRouterCore";
 export type { IPRouterStatic } from "./IPRouterStatic";
-export type { IPRouterYT } from "./IPRouterYT";
 export type { IPYieldContractFactory } from "./IPYieldContractFactory";
 export type { IPYieldToken } from "./IPYieldToken";
 export type { IQiErc20 } from "./IQiErc20";
@@ -55,6 +56,7 @@ export type { IYearnVault } from "./IYearnVault";
 export type { PendleGovernanceManager } from "./PendleGovernanceManager";
 export type { PendleJoeSwapHelperUpg } from "./PendleJoeSwapHelperUpg";
 export type { PermissionsV2Upg } from "./PermissionsV2Upg";
+export type { IRewardManager } from "./IRewardManager";
 export type { RewardManager } from "./RewardManager";
 export type { SCYBase } from "./SCYBase";
 export type { SCYBaseWithRewards } from "./SCYBaseWithRewards";
@@ -69,30 +71,33 @@ export { Proxy__factory } from "./factories/Proxy__factory";
 export { ERC20__factory } from "./factories/ERC20__factory";
 export { IERC20Metadata__factory } from "./factories/IERC20Metadata__factory";
 export { IERC20__factory } from "./factories/IERC20__factory";
+export { ActionCallback__factory } from "./factories/ActionCallback__factory";
+export { ActionCore__factory } from "./factories/ActionCore__factory";
+export { ActionYT__factory } from "./factories/ActionYT__factory";
+export { ActionSCYAndYOBase__factory } from "./factories/ActionSCYAndYOBase__factory";
+export { ActionSCYAndYTBase__factory } from "./factories/ActionSCYAndYTBase__factory";
 export { PendleBaseToken__factory } from "./factories/PendleBaseToken__factory";
 export { PendleMarket__factory } from "./factories/PendleMarket__factory";
 export { PendleMarketFactory__factory } from "./factories/PendleMarketFactory__factory";
 export { PendleOwnershipToken__factory } from "./factories/PendleOwnershipToken__factory";
+export { PendleRouter__factory } from "./factories/PendleRouter__factory";
 export { PendleAaveV3SCY__factory } from "./factories/PendleAaveV3SCY__factory";
 export { PendleBenQiErc20SCY__factory } from "./factories/PendleBenQiErc20SCY__factory";
 export { PendleBtrflyScy__factory } from "./factories/PendleBtrflyScy__factory";
 export { PendleYearnVaultScy__factory } from "./factories/PendleYearnVaultScy__factory";
 export { PendleYieldContractFactory__factory } from "./factories/PendleYieldContractFactory__factory";
 export { PendleYieldToken__factory } from "./factories/PendleYieldToken__factory";
-export { PendleRouterSCYAndForgeBaseUpg__factory } from "./factories/PendleRouterSCYAndForgeBaseUpg__factory";
-export { PendleRouterYTBaseUpg__factory } from "./factories/PendleRouterYTBaseUpg__factory";
-export { PendleRouterCoreUpg__factory } from "./factories/PendleRouterCoreUpg__factory";
-export { PendleRouterProxy__factory } from "./factories/PendleRouterProxy__factory";
-export { PendleRouterStaticUpg__factory } from "./factories/PendleRouterStaticUpg__factory";
-export { PendleRouterYTUpg__factory } from "./factories/PendleRouterYTUpg__factory";
+export { RouterStatic__factory } from "./factories/RouterStatic__factory";
 export { IAavePool__factory } from "./factories/IAavePool__factory";
 export { IAaveRewardsController__factory } from "./factories/IAaveRewardsController__factory";
 export { IAToken__factory } from "./factories/IAToken__factory";
 export { IBenQiComptroller__factory } from "./factories/IBenQiComptroller__factory";
 export { IJoePair__factory } from "./factories/IJoePair__factory";
 export { IJoeRouter01__factory } from "./factories/IJoeRouter01__factory";
+export { IPActionCore__factory } from "./factories/IPActionCore__factory";
+export { IPActionYT__factory } from "./factories/IPActionYT__factory";
+export { IPAllAction__factory } from "./factories/IPAllAction__factory";
 export { IPBaseToken__factory } from "./factories/IPBaseToken__factory";
-export { IPFlashCallback__factory } from "./factories/IPFlashCallback__factory";
 export { IPGovernanceManager__factory } from "./factories/IPGovernanceManager__factory";
 export { IPMarket__factory } from "./factories/IPMarket__factory";
 export { IPMarketAddRemoveCallback__factory } from "./factories/IPMarketAddRemoveCallback__factory";
@@ -100,9 +105,7 @@ export { IPMarketFactory__factory } from "./factories/IPMarketFactory__factory";
 export { IPMarketSwapCallback__factory } from "./factories/IPMarketSwapCallback__factory";
 export { IPOwnershipToken__factory } from "./factories/IPOwnershipToken__factory";
 export { IPermissionsV2Upg__factory } from "./factories/IPermissionsV2Upg__factory";
-export { IPRouterCore__factory } from "./factories/IPRouterCore__factory";
 export { IPRouterStatic__factory } from "./factories/IPRouterStatic__factory";
-export { IPRouterYT__factory } from "./factories/IPRouterYT__factory";
 export { IPYieldContractFactory__factory } from "./factories/IPYieldContractFactory__factory";
 export { IPYieldToken__factory } from "./factories/IPYieldToken__factory";
 export { IQiErc20__factory } from "./factories/IQiErc20__factory";
@@ -114,6 +117,7 @@ export { IYearnVault__factory } from "./factories/IYearnVault__factory";
 export { PendleGovernanceManager__factory } from "./factories/PendleGovernanceManager__factory";
 export { PendleJoeSwapHelperUpg__factory } from "./factories/PendleJoeSwapHelperUpg__factory";
 export { PermissionsV2Upg__factory } from "./factories/PermissionsV2Upg__factory";
+export { IRewardManager__factory } from "./factories/IRewardManager__factory";
 export { RewardManager__factory } from "./factories/RewardManager__factory";
 export { SCYBase__factory } from "./factories/SCYBase__factory";
 export { SCYBaseWithRewards__factory } from "./factories/SCYBaseWithRewards__factory";

package/contracts/core/router/PendleRouterProxy.sol

@@ -1,84 +0,0 @@
-// SPDX-License-Identifier: GPL-3.0-or-later
-pragma solidity 0.8.9;
-
-import "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol";
-import "@openzeppelin/contracts-upgradeable/proxy/utils/UUPSUpgradeable.sol";
-import "@openzeppelin/contracts/proxy/Proxy.sol";
-import "../../interfaces/IPRouterCore.sol";
-import "../../interfaces/IPRouterYT.sol";
-import "../../interfaces/IPRouterStatic.sol";
-import "../../periphery/PermissionsV2Upg.sol";
-
-/// @dev this contract will be deployed behind an ERC1967 proxy
-/// calls to the ERC1967 proxy will be resolved at this contract, and proxied again to the
-/// corresponding implementation contracts
-contract PendleRouterProxy is Proxy, Initializable, UUPSUpgradeable, PermissionsV2Upg {
-    address public immutable PENDLE_ROUTER_CORE;
-    address public immutable PENDLE_ROUTER_YT;
-    address public immutable PENDLE_ROUTER_STATIC;
-
-    constructor(
-        address _PENDLE_ROUTER_CORE,
-        address _PENDLE_ROUTER_YT,
-        address _PENDLE_ROUTER_STATIC,
-        address _governanceManager
-    ) PermissionsV2Upg(_governanceManager) initializer {
-        PENDLE_ROUTER_CORE = _PENDLE_ROUTER_CORE;
-        PENDLE_ROUTER_YT = _PENDLE_ROUTER_YT;
-        PENDLE_ROUTER_STATIC = _PENDLE_ROUTER_STATIC;
-    }
-
-    function initialize() external initializer {
-        __UUPSUpgradeable_init();
-        // no need to initialize PermissionsV2Upg
-    }
-
-    function getRouterImplementation(bytes4 sig) public view returns (address) {
-        if (
-            sig == IPRouterCore.mintScyFromRawToken.selector ||
-            sig == IPRouterCore.redeemScyToRawToken.selector ||
-            sig == IPRouterCore.mintYoFromRawToken.selector ||
-            sig == IPRouterCore.redeemYoToRawToken.selector ||
-            sig == IPRouterCore.addLiquidity.selector ||
-            sig == IPRouterCore.removeLiquidity.selector ||
-            sig == IPRouterCore.swapExactOtForScy.selector ||
-            sig == IPRouterCore.swapOtForExactScy.selector ||
-            sig == IPRouterCore.swapScyForExactOt.selector ||
-            sig == IPRouterCore.swapExactScyForOt.selector ||
-            sig == IPRouterCore.swapExactRawTokenForOt.selector ||
-            sig == IPRouterCore.swapExactOtForRawToken.selector
-        ) {
-            return PENDLE_ROUTER_CORE;
-        } else if (
-            sig == IPRouterYT.swapExactYtForScy.selector ||
-            sig == IPRouterYT.swapScyForExactYt.selector ||
-            sig == IPRouterYT.swapExactScyForYt.selector ||
-            sig == IPRouterYT.swapExactRawTokenForYt.selector ||
-            sig == IPRouterYT.swapExactYtForRawToken.selector
-        ) {
-            return PENDLE_ROUTER_YT;
-        } else if (sig == IPMarketSwapCallback.swapCallback.selector) {
-            // only ROUTER_YT is doing callback
-            return PENDLE_ROUTER_YT;
-        }
-        /// FROM HERE ONWARDS, ONLY HAVE STATIC & VIEW FUNCTIONS
-        else if (
-            sig == IPRouterStatic.addLiquidityStatic.selector ||
-            sig == IPRouterStatic.removeLiquidityStatic.selector ||
-            sig == IPRouterStatic.swapOtForScyStatic.selector ||
-            sig == IPRouterStatic.swapScyForOtStatic.selector ||
-            sig == IPRouterStatic.scyIndex.selector ||
-            sig == IPRouterStatic.getOtImpliedYield.selector ||
-            sig == IPRouterStatic.getPendleTokenType.selector
-        ) {
-            return PENDLE_ROUTER_STATIC;
-        }
-        require(false, "invalid market sig");
-    }
-
-    function _implementation() internal view override returns (address) {
-        return getRouterImplementation(msg.sig);
-    }
-
-    function _authorizeUpgrade(address newImplementation) internal override onlyGovernance {}
-}

package/contracts/core/router/PendleRouterStaticUpg.sol

@@ -1,107 +0,0 @@
-// SPDX-License-Identifier: GPL-3.0-or-later
-pragma solidity 0.8.9;
-
-import "../../interfaces/IPRouterStatic.sol";
-import "../../interfaces/IPMarket.sol";
-import "../../interfaces/IPYieldContractFactory.sol";
-import "../../interfaces/IPMarketFactory.sol";
-import "../../libraries/math/MarketMathAux.sol";
-import "@openzeppelin/contracts-upgradeable/proxy/utils/UUPSUpgradeable.sol";
-import "@openzeppelin/contracts-upgradeable/access/OwnableUpgradeable.sol";
-
-contract PendleRouterStaticUpg is IPRouterStatic {
-    using MarketMathCore for MarketState;
-    using MarketMathAux for MarketState;
-    using Math for uint256;
-    using Math for int256;
-    using LogExpMath for int256;
-
-    IPYieldContractFactory public immutable yieldContractFactory;
-    IPMarketFactory public immutable marketFactory;
-
-    constructor(IPYieldContractFactory _yieldContractFactory, IPMarketFactory _marketFactory) {
-        yieldContractFactory = _yieldContractFactory;
-        marketFactory = _marketFactory;
-    }
-
-    function addLiquidityStatic(
-        address market,
-        uint256 scyDesired,
-        uint256 otDesired
-    )
-        external
-        returns (
-            uint256 netLpOut,
-            uint256 scyUsed,
-            uint256 otUsed
-        )
-    {
-        MarketState memory state = IPMarket(market).readState(false);
-        (, netLpOut, scyUsed, otUsed) = state.addLiquidity(
-            scyIndex(market),
-            scyDesired,
-            otDesired,
-            false
-        );
-    }
-
-    function removeLiquidityStatic(address market, uint256 lpToRemove)
-        external
-        view
-        returns (uint256 netScyOut, uint256 netOtOut)
-    {
-        MarketState memory state = IPMarket(market).readState(false);
-        (netScyOut, netOtOut) = state.removeLiquidity(lpToRemove, false);
-    }
-
-    function swapOtForScyStatic(address market, uint256 exactOtIn)
-        external
-        returns (uint256 netScyOut, uint256 netScyFee)
-    {
-        MarketState memory state = IPMarket(market).readState(false);
-        (netScyOut, netScyFee) = state.swapExactOtForScy(
-            scyIndex(market),
-            exactOtIn,
-            block.timestamp,
-            false
-        );
-    }
-
-    function swapScyForOtStatic(address market, uint256 exactOtOut)
-        external
-        returns (uint256 netScyIn, uint256 netScyFee)
-    {
-        MarketState memory state = IPMarket(market).readState(false);
-        (netScyIn, netScyFee) = state.swapScyForExactOt(
-            scyIndex(market),
-            exactOtOut,
-            block.timestamp,
-            false
-        );
-    }
-
-    function scyIndex(address market) public returns (SCYIndex index) {
-        return SCYIndexLib.newIndex(IPMarket(market).SCY());
-    }
-
-    function getOtImpliedYield(address market) external view returns (int256) {
-        MarketState memory state = IPMarket(market).readState(false);
-
-        int256 lnImpliedRate = (state.lastImpliedRate).Int();
-        return lnImpliedRate.exp();
-    }
-
-    function getPendleTokenType(address token)
-        external
-        view
-        returns (
-            bool isOT,
-            bool isYT,
-            bool isMarket
-        )
-    {
-        if (yieldContractFactory.isOT(token)) isOT = true;
-        else if (yieldContractFactory.isYT(token)) isYT = true;
-        else if (marketFactory.isValidMarket(token)) isMarket = true;
-    }
-}

package/contracts/interfaces/IPFlashCallBack.sol

@@ -1,10 +0,0 @@
-// SPDX-License-Identifier: GPL-3.0-or-later
-pragma solidity 0.8.9;
-
-interface IPFlashCallback {
-    function pendleFlashCallback(
-        address[] calldata tokens,
-        uint256[] calldata amountsToPay,
-        bytes calldata data
-    ) external;
-}