@pendle/core-v2 0.14.0-testnet → 0.15.1-mainnet

package/build/artifacts/contracts/router/base/MarketApproxLib.sol/MarketApproxPtInLib.dbg.json

@@ -1,4 +1,4 @@
 {
   "_format": "hh-sol-dbg-1",
-  "buildInfo": "../../../../build-info/113f77676959ccee9b3b2d7923006792.json"
+  "buildInfo": "../../../../build-info/51b5fae402f9fdbbcea890d46698c8cd.json"
 }

package/build/artifacts/contracts/router/base/MarketApproxLib.sol/MarketApproxPtInLib.json

@@ -3,8 +3,8 @@
   "contractName": "MarketApproxPtInLib",
   "sourceName": "contracts/router/base/MarketApproxLib.sol",
   "abi": [],
-  "bytecode": "0x60566037600b82828239805160001a607314602a57634e487b7160e01b600052600060045260246000fd5b30600052607381538281f3fe73000000000000000000000000000000000000000030146080604052600080fdfea2646970667358221220f0b52007cb2bd7e63b6a3bc80df332ad8bf3ee7ce154d07eef5285cec143649864736f6c63430008110033",
-  "deployedBytecode": "0x73000000000000000000000000000000000000000030146080604052600080fdfea2646970667358221220f0b52007cb2bd7e63b6a3bc80df332ad8bf3ee7ce154d07eef5285cec143649864736f6c63430008110033",
+  "bytecode": "0x60566037600b82828239805160001a607314602a57634e487b7160e01b600052600060045260246000fd5b30600052607381538281f3fe73000000000000000000000000000000000000000030146080604052600080fdfea26469706673582212200ec9023e9e5bc817833322ec20c8b0cc3b233a48f8c77b06e34b34cc857bf94964736f6c63430008110033",
+  "deployedBytecode": "0x73000000000000000000000000000000000000000030146080604052600080fdfea26469706673582212200ec9023e9e5bc817833322ec20c8b0cc3b233a48f8c77b06e34b34cc857bf94964736f6c63430008110033",
   "linkReferences": {},
   "deployedLinkReferences": {}
 }

package/build/artifacts/contracts/router/base/MarketApproxLib.sol/MarketApproxPtOutLib.dbg.json

@@ -1,4 +1,4 @@
 {
   "_format": "hh-sol-dbg-1",
-  "buildInfo": "../../../../build-info/113f77676959ccee9b3b2d7923006792.json"
+  "buildInfo": "../../../../build-info/51b5fae402f9fdbbcea890d46698c8cd.json"
 }

package/build/artifacts/contracts/router/base/MarketApproxLib.sol/MarketApproxPtOutLib.json

@@ -3,8 +3,8 @@
   "contractName": "MarketApproxPtOutLib",
   "sourceName": "contracts/router/base/MarketApproxLib.sol",
   "abi": [],
-  "bytecode": "0x60566037600b82828239805160001a607314602a57634e487b7160e01b600052600060045260246000fd5b30600052607381538281f3fe73000000000000000000000000000000000000000030146080604052600080fdfea26469706673582212205911d4945f5b7f2adc81353fd2a47c7adf2672e7e522d5010e1988b2945851e064736f6c63430008110033",
-  "deployedBytecode": "0x73000000000000000000000000000000000000000030146080604052600080fdfea26469706673582212205911d4945f5b7f2adc81353fd2a47c7adf2672e7e522d5010e1988b2945851e064736f6c63430008110033",
+  "bytecode": "0x60566037600b82828239805160001a607314602a57634e487b7160e01b600052600060045260246000fd5b30600052607381538281f3fe73000000000000000000000000000000000000000030146080604052600080fdfea2646970667358221220f2dbc495ddc16936e9bdf0b263d35ddbdf803ba1f7c610cd2e3d1bded1a8ba5764736f6c63430008110033",
+  "deployedBytecode": "0x73000000000000000000000000000000000000000030146080604052600080fdfea2646970667358221220f2dbc495ddc16936e9bdf0b263d35ddbdf803ba1f7c610cd2e3d1bded1a8ba5764736f6c63430008110033",
   "linkReferences": {},
   "deployedLinkReferences": {}
 }

package/build/artifacts/contracts/router/kyberswap/KyberSwapHelper.sol/KyberSwapHelper.dbg.json

@@ -1,4 +1,4 @@
 {
   "_format": "hh-sol-dbg-1",
-  "buildInfo": "../../../../build-info/113f77676959ccee9b3b2d7923006792.json"
+  "buildInfo": "../../../../build-info/6e2fa376947f263878f56f0d5b265ee3.json"
 }

package/contracts/LiquidityMining/CrossChainMsg/PendleMsgReceiveEndpointUpg.sol

@@ -1,72 +1,40 @@
 // SPDX-License-Identifier: GPL-3.0-or-later
 pragma solidity 0.8.17;
 
-import "../../interfaces/ILayerZeroEndpoint.sol";
+import "../../interfaces/ICelerMessageReceiverApp.sol";
 import "../../interfaces/IPMsgReceiverApp.sol";
-import "../../interfaces/ILayerZeroReceiver.sol";
+import "../../interfaces/ICelerMessageBus.sol";
 import "../../core/libraries/BoringOwnableUpgradeable.sol";
 import "../../core/libraries/Errors.sol";
-import "./libraries/LayerZeroHelper.sol";
-import "./libraries/ExcessivelySafeCall.sol";
 import "@openzeppelin/contracts/proxy/utils/UUPSUpgradeable.sol";
 
-/**
- * @dev Initially, currently we will use layer zero's default send and receive version (which is most updated)
- * So we can leave the configuration unset.
- */
-
 contract PendleMsgReceiveEndpointUpg is
-    ILayerZeroReceiver,
+    ICelerMessageReceiverApp,
     Initializable,
     UUPSUpgradeable,
     BoringOwnableUpgradeable
 {
-    using ExcessivelySafeCall for address;
-
-    address public immutable lzEndpoint;
+    ICelerMessageBus public immutable celerMessageBus;
     address public immutable sendEndpointAddr;
     uint64 public immutable sendEndpointChainId;
 
-    mapping(uint16 => mapping(bytes => mapping(uint64 => bytes32))) public failedMessages;
-
-    event MessageFailed(
-        uint16 _srcChainId,
-        bytes _path,
-        uint64 _nonce,
-        bytes _payload,
-        bytes _reason
-    );
-    event RetryMessageSuccess(
-        uint16 _srcChainId,
-        bytes _path,
-        uint64 _nonce,
-        bytes32 _payloadHash
-    );
-
-    modifier onlyLzEndpoint() {
-        if (msg.sender != address(lzEndpoint)) revert Errors.OnlyLayerZeroEndpoint();
+    modifier onlyCelerMessageBus() {
+        if (msg.sender != address(celerMessageBus)) revert Errors.OnlyCelerBus();
         _;
     }
 
-    /**
-     * @dev Lz has a built-in feature for trusted receive and send endpoint
-     * But in order to aim for flexibility in switching to other crosschain messaging protocol, there
-     * is no harm to keep our current whitelisting mechanism.
-     */
-    modifier mustOriginateFromSendEndpoint(uint16 srcChainId, bytes memory path) {
-        if (
-            sendEndpointAddr != LayerZeroHelper._getSrcAdrressFromPath(path) ||
-            sendEndpointChainId != LayerZeroHelper._getOriginalChainIds(srcChainId)
-        ) revert Errors.MsgNotFromSendEndpoint(msg.sender);
+    modifier mustOriginateFromSendEndpoint(address srcAddress, uint64 srcChainId) {
+        if (srcAddress != sendEndpointAddr || srcChainId != sendEndpointChainId)
+            revert Errors.MsgNotFromSendEndpoint(msg.sender);
         _;
     }
 
     constructor(
-        address _lzEndpoint,
+        ICelerMessageBus _celerMessageBus,
         address _sendEndpointAddr,
         uint64 _sendEndpointChainId
     ) initializer {
-        lzEndpoint = _lzEndpoint;
+        celerMessageBus = _celerMessageBus;
         sendEndpointAddr = _sendEndpointAddr;
         sendEndpointChainId = _sendEndpointChainId;
     }
@@ -75,55 +43,22 @@ contract PendleMsgReceiveEndpointUpg is
         __BoringOwnable_init();
     }
 
-    function lzReceive(
-        uint16 _srcChainId,
-        bytes calldata _path,
-        uint64 _nonce,
-        bytes calldata _payload
-    ) external onlyLzEndpoint mustOriginateFromSendEndpoint(_srcChainId, _path) {
-        (bool success, bytes memory reason) = address(this).excessivelySafeCall(
-            gasleft(),
-            150,
-            abi.encodeWithSelector(this.nonBlockingReceive.selector, _payload)
-        );
-
-        if (!success) {
-            failedMessages[_srcChainId][_path][_nonce] = keccak256(_payload);
-            emit MessageFailed(_srcChainId, _path, _nonce, _payload, reason);
-        }
-    }
-
-    function retryMessage(
-        uint16 _srcChainId,
-        bytes calldata _path,
-        uint64 _nonce,
-        bytes calldata _payload
-    ) public payable virtual {
-        bytes32 payloadHash = failedMessages[_srcChainId][_path][_nonce];
-
-        if (payloadHash == bytes32(0) || keccak256(_payload) != payloadHash)
-            revert Errors.InvalidRetryData();
-
-        failedMessages[_srcChainId][_path][_nonce] = bytes32(0);
-        nonBlockingReceive(_payload);
-        emit RetryMessageSuccess(_srcChainId, _path, _nonce, payloadHash);
-    }
-
-    /**
-     * @dev LayerZero by default will stop all the incoming messages once some message failed to execute
-     * In the very extreme case that it fails to deliver some message to Pendle, we still want the crosschain
-     * messaging feature to keep functioning. 
-     * 
-     * @dev As the nature of all type of messages we have:
-     * - Update vePendle totalSupply
-     * - Update vePendle user balance
-     * - Send voting result to GaugeController
-     * 
-     * There is not a need to ensure the index order of messages
-     */
-    function nonBlockingReceive(bytes memory payload) public {
-        (address receiver, bytes memory message) = abi.decode(payload, (address, bytes));
-        IPMsgReceiverApp(receiver).executeMessage(message);
+    // @notice for Celer
+    function executeMessage(
+        address srcAddress,
+        uint64 srcChainId,
+        bytes calldata message,
+        address /*_executor*/
+    )
+        external
+        payable
+        onlyCelerMessageBus
+        mustOriginateFromSendEndpoint(srcAddress, srcChainId)
+        returns (ExecutionStatus)
+    {
+        (address receiver, bytes memory actualMessage) = abi.decode(message, (address, bytes));
+        IPMsgReceiverApp(receiver).executeMessage(actualMessage);
+        return ExecutionStatus.Success;
     }
 
     function govExecuteMessage(address receiver, bytes calldata message)
@@ -134,10 +69,6 @@ contract PendleMsgReceiveEndpointUpg is
         IPMsgReceiverApp(receiver).executeMessage(message);
     }
 
-    function setReceiveVersion(uint16 _newVersion) external {
-        ILayerZeroEndpoint(lzEndpoint).setReceiveVersion(_newVersion);
-    }
-
     //solhint-disable-next-line
     function _authorizeUpgrade(address newImplementation) internal override onlyOwner {}
 }

package/contracts/LiquidityMining/CrossChainMsg/PendleMsgSendEndpointUpg.sol

@@ -2,18 +2,12 @@
 pragma solidity 0.8.17;
 
 import "../../interfaces/IPMsgSendEndpoint.sol";
-import "../../interfaces/ILayerZeroEndpoint.sol";
+import "../../interfaces/ICelerMessageBus.sol";
 import "../../core/libraries/BoringOwnableUpgradeable.sol";
 import "../../core/libraries/Errors.sol";
-import "./libraries/LayerZeroHelper.sol";
 import "@openzeppelin/contracts/utils/structs/EnumerableMap.sol";
 import "@openzeppelin/contracts/proxy/utils/UUPSUpgradeable.sol";
 
-/**
- * @dev Initially, currently we will use layer zero's default send and receive version (which is most updated)
- * So we can leave the configuration unset.
- */
-
 contract PendleMsgSendEndpointUpg is
     IPMsgSendEndpoint,
     Initializable,
@@ -22,9 +16,7 @@ contract PendleMsgSendEndpointUpg is
 {
     using EnumerableMap for EnumerableMap.UintToAddressMap;
 
-    address payable public immutable refundAddress;
-    ILayerZeroEndpoint public immutable lzEndpoint;
-
+    ICelerMessageBus public immutable celerMessageBus;
     EnumerableMap.UintToAddressMap internal receiveEndpoints;
     mapping(address => bool) public isWhitelisted;
 
@@ -33,9 +25,8 @@ contract PendleMsgSendEndpointUpg is
         _;
     }
 
-    constructor(address _refundAddress, ILayerZeroEndpoint _lzEndpoint) initializer {
-        refundAddress = payable(_refundAddress);
-        lzEndpoint = _lzEndpoint;
+    constructor(ICelerMessageBus _celerMessageBus) initializer {
+        celerMessageBus = _celerMessageBus;
     }
 
     function initialize() external initializer {
@@ -44,36 +35,21 @@ contract PendleMsgSendEndpointUpg is
 
     function calcFee(
         address dstAddress,
-        uint256 dstChainId,
-        bytes memory payload,
-        bytes memory adapterParams
-    ) external view returns (uint256 fee) {
-        (fee, ) = lzEndpoint.estimateFees(
-            LayerZeroHelper._getLayerZeroChainIds(dstChainId),
-            receiveEndpoints.get(dstChainId),
-            abi.encode(dstAddress, payload),
-            false,
-            adapterParams
-        );
+        uint256, /*dstChainId*/
+        bytes memory message
+    ) external view returns (uint256) {
+        return celerMessageBus.calcFee(abi.encode(dstAddress, message));
     }
 
     function sendMessage(
         address dstAddress,
         uint256 dstChainId,
-        bytes calldata payload,
-        bytes calldata adapterParams
+        bytes calldata message
     ) external payable onlyWhitelisted {
-        bytes memory path = abi.encodePacked(
+        celerMessageBus.sendMessage{ value: msg.value }(
             receiveEndpoints.get(dstChainId),
-            address(this)
-        );
-        lzEndpoint.send{ value: msg.value }(
-            LayerZeroHelper._getLayerZeroChainIds(dstChainId),
-            path,
-            abi.encode(dstAddress, payload),
-            refundAddress,
-            address(0),
-            adapterParams
+            dstChainId,
+            abi.encode(dstAddress, message)
         );
     }
 
@@ -89,10 +65,6 @@ contract PendleMsgSendEndpointUpg is
         isWhitelisted[addr] = status;
     }
 
-    function setLzSendVersion(uint16 _newVersion) external onlyOwner {
-        ILayerZeroEndpoint(lzEndpoint).setSendVersion(_newVersion);
-    }
-
     function getAllReceiveEndpoints()
         external
         view

package/contracts/LiquidityMining/CrossChainMsg/PendleMsgSenderAppUpg.sol

@@ -8,14 +8,12 @@ import "@openzeppelin/contracts/utils/structs/EnumerableMap.sol";
 
 // solhint-disable no-empty-blocks
 /// This contract is upgradable because
-/// - its constructor only sets immutable varia\bles
+/// - its constructor only sets immutable variables
 /// - it has storage gaps for safe addition of future variables
 /// - it inherits only upgradable contract
 abstract contract PendleMsgSenderAppUpg is BoringOwnableUpgradeable {
     using EnumerableMap for EnumerableMap.UintToAddressMap;
 
-    uint256 public approxDstExecutionGas;
-
     IPMsgSendEndpoint public immutable pendleMsgSendEndpoint;
 
     // destinationContracts mapping contains one address for each chainId only
@@ -37,12 +35,11 @@ abstract contract PendleMsgSenderAppUpg is BoringOwnableUpgradeable {
     function _sendMessage(uint256 chainId, bytes memory message) internal {
         assert(destinationContracts.contains(chainId));
         address toAddr = destinationContracts.get(chainId);
-        bytes memory adapterParams = _getAdapterParams();
-        uint256 fee = pendleMsgSendEndpoint.calcFee(toAddr, chainId, message, adapterParams);
+        uint256 fee = pendleMsgSendEndpoint.calcFee(toAddr, chainId, message);
         // LM contracts won't hold ETH on its own so this is fine
         if (address(this).balance < fee)
             revert Errors.InsufficientFeeToSendMsg(address(this).balance, fee);
-        pendleMsgSendEndpoint.sendMessage{ value: fee }(toAddr, chainId, message, adapterParams);
+        pendleMsgSendEndpoint.sendMessage{ value: fee }(toAddr, chainId, message);
     }
 
     function addDestinationContract(address _address, uint256 _chainId)
@@ -51,10 +48,7 @@ abstract contract PendleMsgSenderAppUpg is BoringOwnableUpgradeable {
         onlyOwner
     {
         destinationContracts.set(_chainId, _address);
-    }
-
-    function setApproxDstExecutionGas(uint256 gas) external onlyOwner {
-        approxDstExecutionGas = gas;
+        _afterAddDestinationContract(_address, _chainId);
     }
 
     function getAllDestinationContracts()
@@ -71,18 +65,5 @@ abstract contract PendleMsgSenderAppUpg is BoringOwnableUpgradeable {
         }
     }
 
-    function _getAdapterParams() internal view returns (bytes memory) {
-        uint256 gas = approxDstExecutionGas;
-        if (gas == 0) revert Errors.ApproxDstExecutionGasNotSet();
-        // (version, gas consumption)
-        return abi.encodePacked(uint16(1), gas);
-    }
-
-    function _getSendMessageFee(
-        address dstContract,
-        uint256 chainId,
-        bytes memory message
-    ) internal view returns (uint256) {
-        return pendleMsgSendEndpoint.calcFee(dstContract, chainId, message, _getAdapterParams());
-    }
+    function _afterAddDestinationContract(address addr, uint256 chainId) internal virtual {}
 }

package/contracts/LiquidityMining/VotingController/PendleVotingControllerUpg.sol

@@ -21,7 +21,7 @@ Voting accounting:
     will receive both of the reward pack
     - Each pack of money will has it own id as timestamp, a gauge controller does not
     receive a pack of money with the same id twice, this allow governance to rebroadcast
-    in case the last message was corrupted by LayerZero
+    in case the last message was corrupted by Celer
 
 Pros:
     - If governance does not forget broadcasting the reward on the early of the week,
@@ -196,7 +196,7 @@ contract PendleVotingControllerUpg is
     }
 
     /**
-     * @notice use the gov-privilege to force broadcast a message in case there are issues with LayerZero
+     * @notice use the gov-privilege to force broadcast a message in case there are issues with Celer
      * @dev it's intentional for this function to have minimal checks since we assume gov has done the
         due diligence
      * @dev gov should always call finalizeEpoch beforehand
@@ -233,7 +233,7 @@ contract PendleVotingControllerUpg is
         uint256[] memory totalPendleAmounts = new uint256[](length);
 
         return
-            _getSendMessageFee(
+            pendleMsgSendEndpoint.calcFee(
                 destinationContracts.get(chainId),
                 chainId,
                 abi.encode(uint128(0), pools, totalPendleAmounts)

package/contracts/LiquidityMining/VotingEscrow/VotingEscrowPendleMainchain.sol

@@ -181,7 +181,7 @@ contract VotingEscrowPendleMainchain is
     {
         fees = new uint256[](chainIds.length);
         for (uint256 i = 0; i < chainIds.length; i++) {
-            fees[i] = _getSendMessageFee(
+            fees[i] = pendleMsgSendEndpoint.calcFee(
                 destinationContracts.get(chainIds[i]),
                 chainIds[i],
                 SAMPLE_SUPPLY_UPDATE_MESSAGE
@@ -196,7 +196,7 @@ contract VotingEscrowPendleMainchain is
     {
         fees = new uint256[](chainIds.length);
         for (uint256 i = 0; i < chainIds.length; i++) {
-            fees[i] = _getSendMessageFee(
+            fees[i] = pendleMsgSendEndpoint.calcFee(
                 destinationContracts.get(chainIds[i]),
                 chainIds[i],
                 SAMPLE_POSITION_UPDATE_MESSAGE
@@ -295,6 +295,11 @@ contract VotingEscrowPendleMainchain is
         emit BroadcastTotalSupply(supply, chainIds);
     }
 
+    function _afterAddDestinationContract(address, uint256 chainId) internal virtual override {
+        (VeBalance memory supply, uint128 wTime) = _applySlopeChange();
+        _broadcast(chainId, wTime, supply, EMPTY_BYTES);
+    }
+
     function _broadcast(
         uint256 chainId,
         uint128 wTime,

package/contracts/core/Market/MarketMathCore.sol

@@ -171,7 +171,7 @@ library MarketMathCore {
             }
         }
 
-        if (lpToAccount == 0) revert Errors.MarketZeroAmountsOutput();
+        if (lpToAccount <= 0) revert Errors.MarketZeroAmountsOutput();
 
         /// ------------------------------------------------------------
         /// WRITE

package/contracts/core/StandardizedYield/SYBase.sol

@@ -1,17 +1,12 @@
 // SPDX-License-Identifier: GPL-3.0-or-later
 pragma solidity 0.8.17;
-import "@openzeppelin/contracts/token/ERC20/ERC20.sol";
-import "@openzeppelin/contracts/security/ReentrancyGuard.sol";
-
 import "../../interfaces/IStandardizedYield.sol";
 
 import "../erc20/PendleERC20Permit.sol";
 
-import "../RewardManager/RewardManager.sol";
 import "../libraries/math/Math.sol";
 import "../libraries/TokenHelper.sol";
 import "../libraries/Errors.sol";
-import "./SYUtils.sol";
 
 abstract contract SYBase is IStandardizedYield, PendleERC20Permit, TokenHelper {
     using Math for uint256;

package/contracts/core/StandardizedYield/SYBaseWithRewards.sol

@@ -1,10 +1,7 @@
 // SPDX-License-Identifier: GPL-3.0-or-later
 pragma solidity 0.8.17;
-import "@openzeppelin/contracts/token/ERC20/ERC20.sol";
 
-import "../../interfaces/IStandardizedYield.sol";
-
-import "../libraries/math/Math.sol";
+import "../RewardManager/RewardManager.sol";
 import "./SYBase.sol";
 
 /// NOTE: yieldToken MUST NEVER BE a rewardToken, else the rewardManager will behave erroneously

package/contracts/core/StandardizedYield/implementations/PendleWstEthSY.sol

@@ -49,7 +49,10 @@ contract PendleWstEthSY is SYBase {
                 amountStETH = amountDeposited;
             } else {
                 if (tokenIn == wETH) IWETH(wETH).withdraw(amountDeposited);
-                amountStETH = IStETH(stETH).submit{ value: amountDeposited }(address(0));
+
+                uint256 preBalanceStEth = _selfBalance(stETH);
+                IStETH(stETH).submit{ value: amountDeposited }(address(0));
+                amountStETH = _selfBalance(stETH) - preBalanceStEth;
             }
             amountSharesOut = IWstETH(wstETH).wrap(amountStETH);
         }
@@ -82,8 +85,8 @@ contract PendleWstEthSY is SYBase {
      * @notice Calculates and updates the exchange rate of shares to underlying asset token
      * @dev It is the exchange rate of wstETH to stETH
      */
-    function exchangeRate() public view virtual override returns (uint256 currentRate) {
-        return IWstETH(wstETH).stEthPerToken();
+    function exchangeRate() public view virtual override returns (uint256) {
+        return IStETH(stETH).getPooledEthByShares(1 ether);
     }
 
     /*///////////////////////////////////////////////////////////////
@@ -104,7 +107,7 @@ contract PendleWstEthSY is SYBase {
             } else {
                 amountStETH = IStETH(stETH).getSharesByPooledEth(amountTokenToDeposit);
             }
-            amountSharesOut = (amountTokenToDeposit * 1e18) / exchangeRate();
+            amountSharesOut = IStETH(stETH).getSharesByPooledEth(amountStETH);
         }
     }
 
@@ -115,7 +118,7 @@ contract PendleWstEthSY is SYBase {
         returns (uint256 amountTokenOut)
     {
         if (tokenOut == wstETH) amountTokenOut = amountSharesToRedeem;
-        else amountTokenOut = (amountSharesToRedeem * exchangeRate()) / 1e18;
+        else amountTokenOut = IStETH(stETH).getPooledEthByShares(amountSharesToRedeem);
     }
 
     function getTokensIn() public view virtual override returns (address[] memory res) {

package/contracts/core/YieldContracts/PendleYieldToken.sol

@@ -105,9 +105,9 @@ contract PendleYieldToken is
     ) external nonReentrant notExpired updateData returns (uint256[] memory amountPYOuts) {
         uint256 length = receiverPTs.length;
 
-        if (receiverYTs.length != length && amountSyToMints.length == length)
-            revert Errors.ArrayLengthMismatch();
         if (length == 0) revert Errors.ArrayEmpty();
+        if (receiverYTs.length != length || amountSyToMints.length != length)
+            revert Errors.ArrayLengthMismatch();
 
         uint256 totalSyToMint = amountSyToMints.sum();
         if (totalSyToMint > _getFloatingSyAmount())

package/contracts/core/erc20/PendleERC20Permit.sol

@@ -19,7 +19,7 @@ contract PendleERC20Permit is PendleERC20, IERC20Permit, EIP712 {
     mapping(address => Counters.Counter) private _nonces;
 
     // solhint-disable-next-line var-name-mixedcase
-    bytes32 private immutable _PERMIT_TYPEHASH =
+    bytes32 private constant _PERMIT_TYPEHASH =
         keccak256(
             "Permit(address owner,address spender,uint256 value,uint256 nonce,uint256 deadline)"
         );

package/contracts/core/libraries/Errors.sol

@@ -111,8 +111,6 @@ library Errors {
     error MsgNotFromSendEndpoint(address sender);
     error MsgNotFromReceiveEndpoint(address sender);
     error InsufficientFeeToSendMsg(uint256 currentFee, uint256 requiredFee);
-    error ApproxDstExecutionGasNotSet();
-    error InvalidRetryData();
 
     // GENERIC MSG
     error ArrayLengthMismatch();
@@ -120,7 +118,7 @@ library Errors {
     error ArrayOutOfBounds();
     error ZeroAddress();
 
-    error OnlyLayerZeroEndpoint();
+    error OnlyCelerBus();
     error OnlyYT();
     error OnlyYCFactory();
     error OnlyWhitelisted();

package/contracts/interfaces/ICelerMessageBus.sol

@@ -0,0 +1,28 @@
+// SPDX-License-Identifier: GPL-3.0-only
+
+pragma solidity >=0.8.0;
+
+interface ICelerMessageBus {
+    /**
+     * @notice Calculates the required fee for the message.
+     * @param _message Arbitrary message bytes to be decoded by the destination app contract.
+     @ @return The required fee.
+     */
+    function calcFee(bytes calldata _message) external view returns (uint256);
+
+    /**
+     * @notice Sends a message to a contract on another chain.
+     * Sender needs to make sure the uniqueness of the message Id, which is computed as
+     * hash(type.MessageOnly, sender, receiver, srcChainId, srcTxHash, dstChainId, message).
+     * If messages with the same Id are sent, only one of them will succeed at dst chain..
+     * A fee is charged in the native gas token.
+     * @param _receiver The address of the destination app contract.
+     * @param _dstChainId The destination chain ID.
+     * @param _message Arbitrary message bytes to be decoded by the destination app contract.
+     */
+    function sendMessage(
+        address _receiver,
+        uint256 _dstChainId,
+        bytes calldata _message
+    ) external payable;
+}

package/contracts/interfaces/ICelerMessageReceiverApp.sol

@@ -0,0 +1,25 @@
+// SPDX-License-Identifier: GPL-3.0-only
+
+pragma solidity >=0.8.0;
+
+interface ICelerMessageReceiverApp {
+    enum ExecutionStatus {
+        Fail, // execution failed, finalized
+        Success, // execution succeeded, finalized
+        Retry // execution rejected, can retry later
+    }
+
+    /**
+     * @notice Called by MessageBus (MessageBusReceiver)
+     * @param _sender The address of the source app contract
+     * @param _srcChainId The source chain ID where the transfer is originated from
+     * @param _message Arbitrary message bytes originated from and encoded by the source app contract
+     * @param _executor Address who called the MessageBus execution function
+     */
+    function executeMessage(
+        address _sender,
+        uint64 _srcChainId,
+        bytes calldata _message,
+        address _executor
+    ) external payable returns (ExecutionStatus);
+}

package/contracts/interfaces/IPMsgSendEndpoint.sol

@@ -6,14 +6,12 @@ interface IPMsgSendEndpoint {
     function calcFee(
         address dstAddress,
         uint256 dstChainId,
-        bytes memory payload,
-        bytes memory adapterParams
+        bytes calldata message
     ) external view returns (uint256);
 
     function sendMessage(
         address dstAddress,
         uint256 dstChainId,
-        bytes calldata payload,
-        bytes calldata adapterParams
+        bytes calldata message
     ) external payable;
 }

package/deployments/1-core.json

@@ -0,0 +1,16 @@
+{
+    "deployer": "0x1FcCC097db89A86Bfc474A1028F93958295b1Fb7",
+    "network": 1,
+    "splitter": "0x1e56299EbC8A1010cEc26005d12e3e5c5cC2db00",
+    "celerBus": "0x4066D196A423b2b3B8B054f4F40efB47a74E200C",
+    "treasury": "0x8D407705b0a3d78167E979f71e009F5820f51C5E",
+    "PENDLE": "0x59968008a703dC13E6beaECed644bdCe4ee45d13",
+    "yieldContractFactory": "0xaD511b12F73c145Cf158EB92E4fa256937d952A4",
+    "marketFactory": "0x4d717868F4Bd14ac8B29Bb6361901e30Ae05e340",
+    "router": "0xB4205a645c7e920BD8504181B1D7f2c5C955C3e7",
+    "routerStatic": "0x96F77F24b3d17166FcaF3a9E3B8330fF38B966F9",
+    "vePendle": "0x6875e4a945e498fe1b90bbb13cfbaf0b68658c9c",
+    "senderEndpoint": "0xd5C47D2383Fddc19596489280C0A33AC42b2bB18",
+    "votingController": "0xC33B62D73cf92970e71Ce2A6162C63D4bd7AeB26",
+    "gaugeController": "0x998CF52b2585e05494BF9F2bF502351a9C7FdA8f"
+}

package/deployments/1-markets/STETH_MARCH_30.json

@@ -0,0 +1,8 @@
+{
+    "symbol": "SY-testETH",
+    "SY": "0xaA7495dcbe99A8dbd0cfA8b27b95f77565a077c8",
+    "expiry": 1680134400,
+    "PT": "0xc7fCFEfB2055ba61118C93722feECDD4A72E160D",
+    "YT": "0xc4a38a6236B2BcF4f4B25690B4B5f770aD8B1195",
+    "market": "0x8967Eff7FD95491573576534ed24bD9F5E89fEB2"
+}