@pendle/core-v2 6.6.1 → 6.7.1

package/contracts/cross-chain/oftImpl/spoke/PendleBridgedPrincipalToken.sol

@@ -2,40 +2,49 @@
 pragma solidity ^0.8.19;
 
 import {IPBridgedPrincipalToken} from "../../../interfaces/IPBridgedPrincipalToken.sol";
-import {IOFT, OFT, OFTCore} from "@layerzerolabs/oft-evm/contracts/OFT.sol";
-import {ERC20} from "@openzeppelin/contracts/token/ERC20/ERC20.sol";
-import {IERC20Metadata} from "@openzeppelin/contracts/token/ERC20/extensions/IERC20Metadata.sol";
+import {
+    IOFT,
+    OFTCoreUpgradeable,
+    OFTUpgradeable
+} from "@layerzerolabs/oft-evm-upgradeable/contracts/oft/OFTUpgradeable.sol";
+import {ERC20Upgradeable} from "@openzeppelin/contracts-upgradeable/token/ERC20/ERC20Upgradeable.sol";
+import {
+    IERC20MetadataUpgradeable
+} from "@openzeppelin/contracts-upgradeable/token/ERC20/extensions/IERC20MetadataUpgradeable.sol";
 
-contract PendleBridgedPrincipalToken is IPBridgedPrincipalToken, OFT {
+/// @notice Contract deployer must be IPBridgePTFactory for additional information.
+///         This is for deterministic deployment.
+contract PendleBridgedPrincipalToken is IPBridgedPrincipalToken, OFTUpgradeable {
     uint256 public immutable expiry;
     uint8 internal immutable LOCAL_DECIMALS;
-    uint8 internal immutable SHARED_DECIMALS;
-
-    constructor(
-        string memory _name,
-        string memory _symbol,
-        address _lzEndpoint,
-        address _delegate,
-        uint256 _expiry,
-        uint8 _localDecimals,
-        uint8 _sharedDecimals,
-        address initialOwner
-    ) OFT(_name, _symbol, _lzEndpoint, _delegate) {
+
+    constructor(address _lzEndpoint, uint256 _expiry, uint8 _decimals) OFTUpgradeable(_lzEndpoint) {
         expiry = _expiry;
-        _transferOwnership(initialOwner);
 
-        LOCAL_DECIMALS = _localDecimals;
-        SHARED_DECIMALS = _sharedDecimals;
+        LOCAL_DECIMALS = _decimals;
+
+        uint8 shared = sharedDecimals();
+        require(LOCAL_DECIMALS >= shared, "InvalidLocalDecimals");
 
         // override decimalConversionRate set in OFTCore constructor
-        decimalConversionRate = 10 ** (LOCAL_DECIMALS - SHARED_DECIMALS);
+        decimalConversionRate = 10 ** (LOCAL_DECIMALS - sharedDecimals());
+
+        _disableInitializers();
     }
 
-    function decimals() public view override(ERC20, IERC20Metadata) returns (uint8) {
-        return LOCAL_DECIMALS;
+    function initialize(string memory _name, string memory _symbol, address ownerDelegate) external initializer {
+        __OFT_init(_name, _symbol, ownerDelegate);
+        _transferOwnership(ownerDelegate);
     }
 
-    function sharedDecimals() public view override(OFTCore, IOFT) returns (uint8) {
-        return SHARED_DECIMALS;
+    /// @dev This functions is used to passed in the decimals to OFTCoreUpgradeable's constructor.
+    /// Since `LOCAL_DECIMALS` was not initialized at that point, we return 18 to avoid the `InvalidLocalDecimals`
+    /// revert.
+    ///
+    /// See
+    /// https://github.com/LayerZero-Labs/devtools/blob/128b697838f4b0fd53ae748093fd66cc409ae5c4/packages/oft-evm-upgradeable/contracts/oft/OFTCoreUpgradeable.sol#L72
+    function decimals() public view override(ERC20Upgradeable, IERC20MetadataUpgradeable) returns (uint8 res) {
+        res = LOCAL_DECIMALS;
+        if (res == 0) res = 18;
     }
 }

package/contracts/cross-chain/oftImpl/spoke/PendleBridgedPrincipalTokenAlt.sol

@@ -9,6 +9,8 @@ import {
 } from "@layerzerolabs/lz-evm-protocol-v2/contracts/interfaces/ILayerZeroEndpointV2.sol";
 import {IERC20, SafeERC20} from "@openzeppelin/contracts/token/ERC20/utils/SafeERC20.sol";
 
+/// @notice Contract deployer must be IPBridgePTFactory for additional information.
+///         This is for deterministic deployment.
 contract PendleBridgedPrincipalTokenAlt is PendleBridgedPrincipalToken {
     using SafeERC20 for IERC20;
 
@@ -17,19 +19,8 @@ contract PendleBridgedPrincipalTokenAlt is PendleBridgedPrincipalToken {
 
     address public immutable nativeToken;
 
-    constructor(
-        string memory _name,
-        string memory _symbol,
-        address _lzEndpoint,
-        address _delegate,
-        uint256 _expiry,
-        uint8 _localDecimals,
-        uint8 _sharedDecimals,
-        address initialOwner
-    )
-        PendleBridgedPrincipalToken(
-            _name, _symbol, _lzEndpoint, _delegate, _expiry, _localDecimals, _sharedDecimals, initialOwner
-        )
+    constructor(address _lzEndpoint, uint256 _expiry, uint8 _decimals)
+        PendleBridgedPrincipalToken(_lzEndpoint, _expiry, _decimals)
     {
         nativeToken = endpoint.nativeToken();
     }

package/contracts/interfaces/IPBridgePTFactory.sol

@@ -0,0 +1,129 @@
+// SPDX-License-Identifier: GPL-3.0-or-later
+pragma solidity ^0.8.0;
+
+import {IPGovernanceProxy} from "./IPGovernanceProxy.sol";
+import {SetConfigParam} from "@layerzerolabs/lz-evm-protocol-v2/contracts/interfaces/IMessageLibManager.sol";
+import {MessagingFee, MessagingReceipt} from "@layerzerolabs/oapp-evm/contracts/oapp/OApp.sol";
+import {IOAppCore} from "@layerzerolabs/oapp-evm/contracts/oapp/interfaces/IOAppCore.sol";
+
+interface IPBridgePTFactory is IOAppCore {
+    event PTOFTDeployed(uint32 indexed lzEid, bytes32 indexed originalPt, address indexed oft);
+
+    event PTOFTWired(uint32 indexed hubLzEid, address indexed hubPt, uint32[] toPeerEids);
+
+    event FactoryWired(uint32 indexed peerEid, address indexed peer);
+
+    ////////////////////////////////////////////////////////////////////////////////
+    /// Getters
+    ////////////////////////////////////////////////////////////////////////////////
+
+    function LZ_EID() external view returns (uint32);
+
+    function GOV_PROXY() external view returns (IPGovernanceProxy);
+
+    function HUB_PT_OFT_ADAPTER_CREATION_CODE() external view returns (address);
+
+    function SPOKE_PT_OFT_CREATION_CODE() external view returns (address);
+
+    function SELF_CHAIN_SHORT_NAME() external view returns (string memory);
+
+    function OFT_PROXY_ADMIN() external view returns (address);
+
+    function derivePtOftAddress(uint32 peerLzEid, uint32 hubLzEid, address hubPt) external view returns (address oft);
+
+    ////////////////////////////////////////////////////////////////////////////////
+    /// Deploy hub PT OFT adapter
+    ////////////////////////////////////////////////////////////////////////////////
+
+    function deployHubPtOftAdapter(address hubPt) external returns (address oft);
+
+    ////////////////////////////////////////////////////////////////////////////////
+    /// Deploy spoke PT OFT
+    ////////////////////////////////////////////////////////////////////////////////
+
+    struct SpokePtDeploymentParams {
+        address hubPt;
+        string name;
+        string symbol;
+        uint256 expiry;
+        uint8 decimals;
+    }
+
+    function quoteDeploySpokePtOft(address hubPt, uint32 toPeerEid, bytes calldata options, bool payInLzToken)
+        external
+        view
+        returns (MessagingFee memory fee);
+
+    function deploySpokePtOft(address hubPt, uint32 toPeerEid, bytes calldata options, MessagingFee memory fee)
+        external
+        payable
+        returns (MessagingReceipt memory msgReceipt);
+
+    ////////////////////////////////////////////////////////////////////////////////
+    /// wirePtOft on the self chain
+    ////////////////////////////////////////////////////////////////////////////////
+
+    struct WirePtOftParams {
+        uint32 hubLzEid;
+        address hubPt;
+        uint32[] toPeerEids;
+        /// @notice enforcedReceiveGas[i] is the gas limit for the receive call on toPeerEids[i];
+        ///         use 0 value = use DEFAULT_PT_OFT_ENFORCED_RECEIVE_GAS
+        uint128[] enforcedReceiveGas;
+        bool setSendLib;
+        bool setReceiveLib;
+    }
+
+    function wirePtOft(WirePtOftParams memory params) external;
+
+    ////////////////////////////////////////////////////////////////////////////////
+    /// Remote wirePtOft on the other chains
+    ////////////////////////////////////////////////////////////////////////////////
+
+    function quoteRemoteWirePtOft(
+        uint32 peerEid,
+        WirePtOftParams calldata wireParams,
+        bytes calldata options,
+        bool payInLzToken
+    ) external view returns (MessagingFee memory fee);
+
+    function remoteWirePtOft(
+        uint32 peerEid,
+        WirePtOftParams calldata wireParams,
+        bytes calldata options,
+        MessagingFee memory fee
+    ) external payable returns (MessagingReceipt memory msgReceipt);
+
+    ////////////////////////////////////////////////////////////////////////////////
+    /// Self wire
+    ////////////////////////////////////////////////////////////////////////////////
+
+    struct SelfWireParams {
+        uint32 peerEid;
+        address peer;
+        SetConfigParam[] sendConfigParam;
+        SetConfigParam[] receiveConfigParam;
+        bool setSendLib;
+        bool setReceiveLib;
+    }
+
+    function selfWire(SelfWireParams memory params) external;
+
+    ////////////////////////////////////////////////////////////////////////////////
+    /// Remote self wire
+    ////////////////////////////////////////////////////////////////////////////////
+
+    function quoteRemoteSelfWire(
+        uint32 peerEid,
+        SelfWireParams calldata wireParams,
+        bytes calldata options,
+        bool payInLzToken
+    ) external view returns (MessagingFee memory fee);
+
+    function remoteSelfWire(
+        uint32 peerEid,
+        SelfWireParams calldata wireParams,
+        bytes calldata options,
+        MessagingFee memory fee
+    ) external payable returns (MessagingReceipt memory msgReceipt);
+}

package/contracts/interfaces/IPBridgedPrincipalToken.sol

@@ -4,8 +4,10 @@ pragma solidity ^0.8.0;
 import {IOAppCore} from "@layerzerolabs/oapp-evm/contracts/oapp/interfaces/IOAppCore.sol";
 import {IOAppOptionsType3} from "@layerzerolabs/oapp-evm/contracts/oapp/interfaces/IOAppOptionsType3.sol";
 import {IOFT} from "@layerzerolabs/oft-evm/contracts/interfaces/IOFT.sol";
-import {IERC20Metadata} from "@openzeppelin/contracts/token/ERC20/extensions/IERC20Metadata.sol";
+import {
+    IERC20MetadataUpgradeable
+} from "@openzeppelin/contracts-upgradeable/token/ERC20/extensions/IERC20MetadataUpgradeable.sol";
 
-interface IPBridgedPrincipalToken is IOFT, IOAppCore, IOAppOptionsType3, IERC20Metadata {
+interface IPBridgedPrincipalToken is IOFT, IOAppCore, IOAppOptionsType3, IERC20MetadataUpgradeable {
     function expiry() external view returns (uint256);
 }

package/contracts/interfaces/IPMerkleDistributor.sol

@@ -3,7 +3,6 @@ pragma solidity ^0.8.0;
 
 interface IPMerkleDistributor {
     event Claimed(address indexed user, address indexed receiver, uint256 amount);
-    event Verified(address indexed user, uint256 amountClaimable);
     event SetMerkleRoot(bytes32 indexed merkleRoot);
 
     error InvalidMerkleProof();
@@ -11,10 +10,4 @@ interface IPMerkleDistributor {
     function claim(address receiver, uint256 totalAccrued, bytes32[] calldata proof)
         external
         returns (uint256 amountOut);
-
-    function claimVerified(address receiver) external returns (uint256 amountOut);
-
-    function verify(address user, uint256 totalAccrued, bytes32[] calldata proof)
-        external
-        returns (uint256 amountVerified);
 }

package/contracts/interfaces/IPMultiTokenMerkleDistributor.sol

@@ -3,9 +3,7 @@ pragma solidity ^0.8.0;
 
 interface IPMultiTokenMerkleDistributor {
     event Claimed(address indexed token, address indexed user, address indexed receiver, uint256 amount);
-    event Verified(address indexed token, address indexed user, uint256 amountClaimable);
     event SetMerkleRoot(bytes32 indexed merkleRoot);
-    event SetDefaultTokenList(address[] defaultTokenList);
 
     error InvalidMerkleProof();
 
@@ -13,15 +11,7 @@ interface IPMultiTokenMerkleDistributor {
 
     function claimed(address token, address user) external view returns (uint256);
 
-    function verified(address token, address user) external view returns (uint256);
-
     function claim(address receiver, address[] memory tokens, uint256[] memory totalAccrueds, bytes32[][] memory proofs)
         external
         returns (uint256[] memory amountOuts);
-
-    function claimVerified(address receiver, address[] memory tokens) external returns (uint256[] memory amountOuts);
-
-    function verify(address user, address[] memory tokens, uint256[] memory totalAccrueds, bytes32[][] memory proofs)
-        external
-        returns (uint256[] memory amountClaimable);
 }

package/contracts/interfaces/{IPSwapHelper.sol → IPOFTPTSwapper.sol}

@@ -3,7 +3,7 @@ pragma solidity ^0.8.0;
 
 import {TokenOutput} from "./IPAllActionTypeV3.sol";
 
-interface IPSwapHelper {
+interface IPOFTPTSwapper {
     function swapWithFixedPricePTAMM(
         address receiver,
         address fixedPricePTAMM,

package/contracts/limit/LimitRouterBase.sol

@@ -14,8 +14,8 @@ import "@openzeppelin/contracts/utils/cryptography/SignatureChecker.sol";
 
 abstract contract LimitRouterBase is
     IPLimitRouter,
-    BoringOwnableUpgradeableV2,
     MintSyHelper,
+    BoringOwnableUpgradeableV2,
     NonceManager,
     TokenHelper
 {

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

@@ -24,7 +24,7 @@ abstract contract OKXScaleHelper {
 
     // https://web3.okx.com/build/dev-docs/dex-api/dex-smart-contract#token-approval
     function __getTokenApproveForChain(uint256 chainid) private pure returns (address) {
-        if (chainid == 1) {
+        if (chainid == 1 || chainid == 43_114) {
             return 0x40aA958dd87FC8305b97f2BA922CDdCa374bcD7f;
         }
         if (chainid == 10) {
@@ -48,6 +48,9 @@ abstract contract OKXScaleHelper {
         if (chainid == 130) {
             return 0x2e28281Cf3D58f475cebE27bec4B8a23dFC7782c;
         }
+        if (chainid == 143) {
+            return 0xf534A8a1CAD0543Cd6438f7534CA3486c01998d4;
+        }
         return address(0);
     }
 

package/deployments/1-core.json

@@ -76,5 +76,6 @@
         "votingController": "0x44087E105137a5095c008AaB6a6530182821F2F0"
     },
     "crossChainSwapHub": "0xd41c99760f4A7e27E736ED25cd6915110948Ea8a",
-    "depositBoxFactory": "0x15Ff9D268ef3300a3fcCe5DE4bc4326316c5dD6D"
+    "depositBoxFactory": "0x15Ff9D268ef3300a3fcCe5DE4bc4326316c5dD6D",
+    "oftPtSwapper": "0x8ef78aD230887E05fa3324277A5225fE93889b08"
 }

package/deployments/130-core.json

@@ -24,5 +24,6 @@
     "devProxyAdmin": "0xD37eB2E6DE40a33ba68BaD94427723b66c954EA9",
     "sparkLinearDiscountOracleFactory": "0x34C91651A070664279866E5f3d6B4d5F65cbbFFb",
     "crossChainSwapHub": "0xd41c99760f4A7e27E736ED25cd6915110948Ea8a",
-    "depositBoxFactory": "0x15Ff9D268ef3300a3fcCe5DE4bc4326316c5dD6D"
+    "depositBoxFactory": "0x15Ff9D268ef3300a3fcCe5DE4bc4326316c5dD6D",
+    "oftPtSwapper": "0x8ef78aD230887E05fa3324277A5225fE93889b08"
 }

package/deployments/143-core.json

@@ -2,8 +2,10 @@
     "deployer": "0x1FcCC097db89A86Bfc474A1028F93958295b1Fb7",
     "network": {
         "chainId": 143,
+        "treasury": "0xCbcb48e22622a3778b6F14C2f5d258Ba026b05e6",
         "governance": "0x7877AdFaDEd756f3248a0EBfe8Ac2E2eF87b75Ac",
         "devMultisig": "0xE6F0489ED91dc27f40f9dbe8f81fccbFC16b9cb1",
+        "pendle": "0x5e49e1f85813f2b65858860a3fa231b4186f2e0e",
         "wrappedNative": "0x3bd359C1119dA7Da1D913D1C4D2B7c461115433A",
         "initialRewardFee": "50000000000000000",
         "initialInterestFee": "50000000000000000",
@@ -11,9 +13,44 @@
         "safeWaitTime": 15000,
         "hardwareDeployer": "0xeea6F790F18563E91b18DF00B89d9f79b2E6761F"
     },
+    "PENDLE": "0x5e49e1f85813f2b65858860a3fa231b4186f2e0e",
+    "governanceProxy": "0x2aD631F72fB16d91c4953A7f4260A97C2fE2f31e",
     "proxyAdmin": "0xA28c08f165116587D4F3E708743B4dEe155c5E64",
     "devProxyAdmin": "0xD37eB2E6DE40a33ba68BaD94427723b66c954EA9",
+    "baseCodeSplitter": "0xed080cfaE31Ed1c4d4FdbE0A76Ed992Ec9171264",
+    "gaugeController": "0x7e500c6efBb00FD3227888256E477171a1304721",
+    "yieldContractFactoryV6": "0x4fe1B23ab695D99394Ab78c16A5bE358f31847F4",
+    "marketFactoryV6": "0xA3cb62a49b66eB2536cf6F3C7AC82293784888A3",
+    "pyYtLpOracle": "0x5542be50420E88dd7D5B4a3D488FA6ED82F6DAc2",
+    "router": "0x888888888889758F76e7103c6CbF23ABbF58F946",
+    "routerFacets": {
+        "ActionAddRemoveLiqV3": "0x2fb6d0753602Bf397fcE38Ec8Ee3a811cA07B3FD",
+        "ActionSwapPTV3": "0xbb0Dd79794e58795b08b599297ec55a6Afb6AB58",
+        "ActionSwapYTV3": "0x171B480B1A2ebc1acE52e46E0Bd73e7E08413ec2",
+        "ActionMiscV3": "0xac1700293346b0bEFC71bCB7E14Bf1c38a5c2a97",
+        "ActionSimple": "0xc66eeDCFf0eC9eACbbF721519E5A03c4d82Fe49b",
+        "ActionCallbackV3": "0x1F593511d7C670FbA0e2601315F6444C10bC9177",
+        "ActionStorageV4": "0x9815cA631062C29f80f5A29783DDd51E08A702db"
+    },
+    "routerStatic": "0x6813d43782395A1F2AAb42f39aeEDE03ac655e09",
+    "pendleSwap": "0xd4F480965D2347d421F1bEC7F545682E5Ec2151D",
+    "reflector": "0x73d5DBF81A4f3bFa7b335e6a2d4638D6017a4fA8",
+    "limitRouter": "0x000000000000c9B3E2C3Ec88B1B4c0cD853f4321",
+    "syFactory": "0x466CeD3b33045Ea986B2f306C8D0aA8067961CF8",
+    "commonDeploy": "0x2Ed473F528E5B320f850d17ADfe0e558f0298aA9",
+    "sparkLinearDiscountOracleFactory": "0x34C91651A070664279866E5f3d6B4d5F65cbbFFb",
+    "PendleChainlinkOracleFactory": "0x6502cda86f9110f3655512237C9FF2B9CE247c69",
+    "experimental": {
+        "PendleSparkLinearDiscountOracleFactoryWrapper": "0x9E80e2525c7289ebd6352B428f2beC53b5A4e579",
+        "MarketSweed": "0x9205aCD8A2fFD56917d4b9139bA423b4f2a70EE5"
+    },
+    "vePendleAirdropDistributor": "0x3942F7B55094250644cFfDa7160226Caa349A38E",
+    "externalRewardsDistributor": "0x33305665f69B4642D1275f4Ce81c23651674D21C",
+    "lpWrapperFactory": "0xA997a99af899951c6A3F218Ef65A0A448A9fF55a",
+    "decimalsFactory": "0x992ec6a490a4b7f256bd59e63746951d98b29be9",
+    "lpLinearDiscountOracleFactory": "0x44fb16D078E9C39B65d6c15E78EDe9736a9f2DF5",
+    "merkleDepositor": "0x3dAe3d1734cA3C7B3089D4DD03C9876e0A0102b4",
     "crossChainSwapHub": "0xd41c99760f4A7e27E736ED25cd6915110948Ea8a",
     "depositBoxFactory": "0x15Ff9D268ef3300a3fcCe5DE4bc4326316c5dD6D",
-    "sparkLinearDiscountOracleFactory": "0x34C91651A070664279866E5f3d6B4d5F65cbbFFb"
+    "oftPtSwapper": "0x8ef78aD230887E05fa3324277A5225fE93889b08"
 }

package/deployments/143-offchain-helper.json

@@ -0,0 +1,11 @@
+{
+    "pendleMulticallV2": "0x1ca3352a55A3D69cA8e5aB06006e08aaF2bD09f1",
+    "implicitSwapfeeContract": "0x82Fae57b2A79D893D88488A7D8BdF2AC6bd2C463",
+    "simulateHelper": "0xc23Dd2807e51dd1D317e1321CBeEb9ace98531EE",
+    "supplyCapReader": "0x251CfB4E84CefecA6c1e6a4D8a0cb9c524e7484f",
+    "balanceReader": "0x2085F50305f656f96b22ECBfe0A4f5e786Ff0438",
+    "limitBackendHelperV2": "0xf02CdbD8F6A18c73B73331FEe3C2110e74508977",
+    "checkSolvent": "0x4686b7E71571845D9598aC49131B48D698C03869",
+    "externalCapGate": "0x65E04a3b2af7716B7f0765dE62Fa2f1B3290C23F",
+    "feeSetter": "0x95e9FC738e9C94E730536C6f28c88295d3374466"
+}

package/deployments/42161-core.json

@@ -72,5 +72,6 @@
         "vePendle": "0x3209E9412cca80B18338f2a56ADA59c484c39644"
     },
     "crossChainSwapHub": "0xd41c99760f4A7e27E736ED25cd6915110948Ea8a",
-    "depositBoxFactory": "0x15Ff9D268ef3300a3fcCe5DE4bc4326316c5dD6D"
+    "depositBoxFactory": "0x15Ff9D268ef3300a3fcCe5DE4bc4326316c5dD6D",
+    "oftPtSwapper": "0x8ef78aD230887E05fa3324277A5225fE93889b08"
 }

package/deployments/4217-core.json

@@ -7,8 +7,10 @@
         "devMultisig": "0xE6F0489ED91dc27f40f9dbe8f81fccbFC16b9cb1",
         "hardwareDeployer": "0xeea6F790F18563E91b18DF00B89d9f79b2E6761F"
     },
+    "pendleSwap": "0xd4F480965D2347d421F1bEC7F545682E5Ec2151D",
     "proxyAdmin": "0xD1253ec561EE8708Bd08a77e817668B288f643b3",
     "devProxyAdmin": "0xD37eB2E6DE40a33ba68BaD94427723b66c954EA9",
     "governanceProxy": "0x2aD631F72fB16d91c4953A7f4260A97C2fE2f31e",
-    "sparkLinearDiscountOracleFactory": "0x34C91651A070664279866E5f3d6B4d5F65cbbFFb"
+    "sparkLinearDiscountOracleFactory": "0x34C91651A070664279866E5f3d6B4d5F65cbbFFb",
+    "oftPtSwapper": "0x8ef78aD230887E05fa3324277A5225fE93889b08"
 }

package/deployments/43114-core.json

@@ -13,6 +13,7 @@
         "safeWaitTime": 15000,
         "hardwareDeployer": "0xeea6F790F18563E91b18DF00B89d9f79b2E6761F"
     },
+    "pendleSwap": "0xd4F480965D2347d421F1bEC7F545682E5Ec2151D",
     "fixedPricePTAMM": "0x4d717868F4Bd14ac8B29Bb6361901e30Ae05e340",
     "sparkLinearDiscountOracleFactory": "0x1fbacedf510daa79dfd9b41227a7ba192d5d548d",
     "experimental": {
@@ -22,5 +23,6 @@
     "proxyAdmin": "0xA28c08f165116587D4F3E708743B4dEe155c5E64",
     "devProxyAdmin": "0xD37eB2E6DE40a33ba68BaD94427723b66c954EA9",
     "crossChainSwapHub": "0xd41c99760f4A7e27E736ED25cd6915110948Ea8a",
-    "depositBoxFactory": "0x15Ff9D268ef3300a3fcCe5DE4bc4326316c5dD6D"
+    "depositBoxFactory": "0x15Ff9D268ef3300a3fcCe5DE4bc4326316c5dD6D",
+    "oftPtSwapper": "0x8ef78aD230887E05fa3324277A5225fE93889b08"
 }

package/deployments/56-core.json

@@ -70,5 +70,6 @@
         "vePendle": "0x8A09574b0401A856d89d1b583eE22E8cb0C5530B"
     },
     "crossChainSwapHub": "0xd41c99760f4A7e27E736ED25cd6915110948Ea8a",
-    "depositBoxFactory": "0x15Ff9D268ef3300a3fcCe5DE4bc4326316c5dD6D"
+    "depositBoxFactory": "0x15Ff9D268ef3300a3fcCe5DE4bc4326316c5dD6D",
+    "oftPtSwapper": "0x8ef78aD230887E05fa3324277A5225fE93889b08"
 }

package/deployments/57073-core.json

@@ -11,9 +11,12 @@
         "safeWaitTime": 15000,
         "hardwareDeployer": "0xeea6F790F18563E91b18DF00B89d9f79b2E6761F"
     },
+    "governanceProxy": "0x2aD631F72fB16d91c4953A7f4260A97C2fE2f31e",
+    "pendleSwap": "0xd4F480965D2347d421F1bEC7F545682E5Ec2151D",
     "proxyAdmin": "0xA28c08f165116587D4F3E708743B4dEe155c5E64",
     "devProxyAdmin": "0xD37eB2E6DE40a33ba68BaD94427723b66c954EA9",
     "sparkLinearDiscountOracleFactory": "0x34C91651A070664279866E5f3d6B4d5F65cbbFFb",
     "crossChainSwapHub": "0xd41c99760f4A7e27E736ED25cd6915110948Ea8a",
-    "depositBoxFactory": "0x15Ff9D268ef3300a3fcCe5DE4bc4326316c5dD6D"
+    "depositBoxFactory": "0x15Ff9D268ef3300a3fcCe5DE4bc4326316c5dD6D",
+    "oftPtSwapper": "0x8ef78aD230887E05fa3324277A5225fE93889b08"
 }

package/deployments/747474-core.json

@@ -11,9 +11,12 @@
         "safeWaitTime": 15000,
         "hardwareDeployer": "0xeea6F790F18563E91b18DF00B89d9f79b2E6761F"
     },
+    "governanceProxy": "0x2aD631F72fB16d91c4953A7f4260A97C2fE2f31e",
+    "pendleSwap": "0xd4F480965D2347d421F1bEC7F545682E5Ec2151D",
     "proxyAdmin": "0xA28c08f165116587D4F3E708743B4dEe155c5E64",
     "devProxyAdmin": "0xD37eB2E6DE40a33ba68BaD94427723b66c954EA9",
     "sparkLinearDiscountOracleFactory": "0x34C91651A070664279866E5f3d6B4d5F65cbbFFb",
     "crossChainSwapHub": "0xd41c99760f4A7e27E736ED25cd6915110948Ea8a",
-    "depositBoxFactory": "0x15Ff9D268ef3300a3fcCe5DE4bc4326316c5dD6D"
+    "depositBoxFactory": "0x15Ff9D268ef3300a3fcCe5DE4bc4326316c5dD6D",
+    "oftPtSwapper": "0x8ef78aD230887E05fa3324277A5225fE93889b08"
 }

package/deployments/8453-core.json

@@ -62,5 +62,6 @@
         "vePendle": "0x051dcd6a80f11fE68F77Fb0EBdE03853FA96B1fD"
     },
     "crossChainSwapHub": "0xd41c99760f4A7e27E736ED25cd6915110948Ea8a",
-    "depositBoxFactory": "0x15Ff9D268ef3300a3fcCe5DE4bc4326316c5dD6D"
+    "depositBoxFactory": "0x15Ff9D268ef3300a3fcCe5DE4bc4326316c5dD6D",
+    "oftPtSwapper": "0x8ef78aD230887E05fa3324277A5225fE93889b08"
 }

package/deployments/9745-core.json

@@ -63,5 +63,6 @@
         "vePendle": "0x0d7432A9f5C51fdd2407332D90D9b814827982Bf"
     },
     "crossChainSwapHub": "0xd41c99760f4A7e27E736ED25cd6915110948Ea8a",
-    "depositBoxFactory": "0x15Ff9D268ef3300a3fcCe5DE4bc4326316c5dD6D"
+    "depositBoxFactory": "0x15Ff9D268ef3300a3fcCe5DE4bc4326316c5dD6D",
+    "oftPtSwapper": "0x8ef78aD230887E05fa3324277A5225fE93889b08"
 }

package/deployments/999-core.json

@@ -63,5 +63,6 @@
         "vePendle": "0x1fBaCedf510dAA79dfD9B41227A7ba192d5D548D"
     },
     "crossChainSwapHub": "0xd41c99760f4A7e27E736ED25cd6915110948Ea8a",
-    "depositBoxFactory": "0x15Ff9D268ef3300a3fcCe5DE4bc4326316c5dD6D"
+    "depositBoxFactory": "0x15Ff9D268ef3300a3fcCe5DE4bc4326316c5dD6D",
+    "oftPtSwapper": "0x8ef78aD230887E05fa3324277A5225fE93889b08"
 }

package/package.json

@@ -2,7 +2,7 @@
   "name": "@pendle/core-v2",
   "description": "Core smart contracts of Pendle Protocol.",
   "license": "BUSL-1.1",
-  "version": "6.6.1",
+  "version": "6.7.1",
   "homepage": "https://pendle.finance",
   "keywords": [
     "pendle",
@@ -41,18 +41,21 @@
     "format": "forge fmt",
     "prepack": "yarn compile"
   },
-  "packageManager": "yarn@4.9.2",
+  "packageManager": "yarn@4.12.0",
   "dependencies": {
-    "@chainlink/contracts": "^0.8.0",
-    "@layerzerolabs/lz-evm-protocol-v2": "^3.0.75",
-    "@layerzerolabs/oapp-evm": "^0.3.2",
-    "@layerzerolabs/oapp-evm-upgradeable": "^0.1.2",
-    "@layerzerolabs/oft-evm": "^3.1.4",
+    "@chainlink/contracts": "0.8.0",
+    "@layerzerolabs/lz-evm-messagelib-v2": "3.0.148",
+    "@layerzerolabs/lz-evm-protocol-v2": "3.0.148",
+    "@layerzerolabs/oapp-evm": "0.4.1",
+    "@layerzerolabs/oapp-evm-upgradeable": "0.1.3",
+    "@layerzerolabs/oft-evm": "4.0.1",
+    "@layerzerolabs/oft-evm-upgradeable": "4.0.2",
     "@openzeppelin/contracts": "4.9.3",
     "@openzeppelin/contracts-upgradeable": "4.9.3",
-    "ethers": "^5.7.2"
+    "ethers": "^5.7.2",
+    "solidity-bytes-utils": "0.8.4"
   },
   "publishConfig": {
     "access": "public"
   }
-}
+}

package/typechain-types/DVNOptions.ts

@@ -0,0 +1,57 @@
+/* Autogenerated file. Do not edit manually. */
+/* tslint:disable */
+/* eslint-disable */
+import { BaseContract, Signer, utils } from "ethers";
+
+import { Listener, Provider } from "@ethersproject/providers";
+import type {
+  TypedEventFilter,
+  TypedEvent,
+  TypedListener,
+  OnEvent,
+} from "./common";
+
+export interface DVNOptionsInterface extends utils.Interface {
+  contractName: "DVNOptions";
+  functions: {};
+
+  events: {};
+}
+
+export interface DVNOptions extends BaseContract {
+  contractName: "DVNOptions";
+  connect(signerOrProvider: Signer | Provider | string): this;
+  attach(addressOrName: string): this;
+  deployed(): Promise<this>;
+
+  interface: DVNOptionsInterface;
+
+  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: {};
+
+  callStatic: {};
+
+  filters: {};
+
+  estimateGas: {};
+
+  populateTransaction: {};
+}