@pendle/core-v2 3.0.0-beta-11 → 3.0.0-beta-13

package/build/artifacts/contracts/router/swap-aggregator/kyberswap/interfaces/IMetaAggregationRouterV2.sol/IMetaAggregationRouterV2.dbg.json

@@ -0,0 +1,4 @@
+{
+  "_format": "hh-sol-dbg-1",
+  "buildInfo": "../../../../../../build-info/0ecf98e2b42d900c7b99f8ddad842fa1.json"
+}

package/build/artifacts/contracts/router/swap-aggregator/kyberswap/{IMetaAggregationRouterV2.sol → interfaces/IMetaAggregationRouterV2.sol}/IMetaAggregationRouterV2.json

@@ -1,7 +1,7 @@
 {
   "_format": "hh-sol-artifact-1",
   "contractName": "IMetaAggregationRouterV2",
-  "sourceName": "contracts/router/swap-aggregator/kyberswap/IMetaAggregationRouterV2.sol",
+  "sourceName": "contracts/router/swap-aggregator/kyberswap/interfaces/IMetaAggregationRouterV2.sol",
   "abi": [
     {
       "inputs": [

package/build/artifacts/contracts/router/swap-aggregator/kyberswap/l1-contracts/InputScalingHelper.sol/InputScalingHelper.dbg.json

@@ -0,0 +1,4 @@
+{
+  "_format": "hh-sol-dbg-1",
+  "buildInfo": "../../../../../../build-info/0ecf98e2b42d900c7b99f8ddad842fa1.json"
+}

package/build/artifacts/contracts/router/swap-aggregator/kyberswap/l1-contracts/InputScalingHelper.sol/InputScalingHelper.json

@@ -0,0 +1,10 @@
+{
+  "_format": "hh-sol-artifact-1",
+  "contractName": "InputScalingHelper",
+  "sourceName": "contracts/router/swap-aggregator/kyberswap/l1-contracts/InputScalingHelper.sol",
+  "abi": [],
+  "bytecode": "0x60566037600b82828239805160001a607314602a57634e487b7160e01b600052600060045260246000fd5b30600052607381538281f3fe73000000000000000000000000000000000000000030146080604052600080fdfea264697066735822122046c820a5f85a7d6fab16288b33c9d0fd7a2b31d126947801ca4780023b3b030764736f6c63430008170033",
+  "deployedBytecode": "0x73000000000000000000000000000000000000000030146080604052600080fdfea264697066735822122046c820a5f85a7d6fab16288b33c9d0fd7a2b31d126947801ca4780023b3b030764736f6c63430008170033",
+  "linkReferences": {},
+  "deployedLinkReferences": {}
+}

package/build/artifacts/contracts/router/swap-aggregator/kyberswap/l1-contracts/ScalingDataLib.sol/ScalingDataLib.dbg.json

@@ -0,0 +1,4 @@
+{
+  "_format": "hh-sol-dbg-1",
+  "buildInfo": "../../../../../../build-info/0ecf98e2b42d900c7b99f8ddad842fa1.json"
+}

package/build/artifacts/contracts/router/swap-aggregator/kyberswap/{ScalingDataLib.sol → l1-contracts/ScalingDataLib.sol}/ScalingDataLib.json

@@ -1,10 +1,10 @@
 {
   "_format": "hh-sol-artifact-1",
   "contractName": "ScalingDataLib",
-  "sourceName": "contracts/router/swap-aggregator/kyberswap/ScalingDataLib.sol",
+  "sourceName": "contracts/router/swap-aggregator/kyberswap/l1-contracts/ScalingDataLib.sol",
   "abi": [],
-  "bytecode": "0x60566037600b82828239805160001a607314602a57634e487b7160e01b600052600060045260246000fd5b30600052607381538281f3fe73000000000000000000000000000000000000000030146080604052600080fdfea264697066735822122049ebfef8e1e5fd8f07667e36d8667a79238313bf226f36caf47710e746e4c86064736f6c63430008170033",
-  "deployedBytecode": "0x73000000000000000000000000000000000000000030146080604052600080fdfea264697066735822122049ebfef8e1e5fd8f07667e36d8667a79238313bf226f36caf47710e746e4c86064736f6c63430008170033",
+  "bytecode": "0x60566037600b82828239805160001a607314602a57634e487b7160e01b600052600060045260246000fd5b30600052607381538281f3fe73000000000000000000000000000000000000000030146080604052600080fdfea26469706673582212206de296cc99282106ce72a1fbdeca1c39d9aa49c536f3a5aa4b3f86885822e19564736f6c63430008170033",
+  "deployedBytecode": "0x73000000000000000000000000000000000000000030146080604052600080fdfea26469706673582212206de296cc99282106ce72a1fbdeca1c39d9aa49c536f3a5aa4b3f86885822e19564736f6c63430008170033",
   "linkReferences": {},
   "deployedLinkReferences": {}
 }

package/build/artifacts/contracts/router/swap-aggregator/kyberswap/l2-contracts/BytesHelper.sol/BytesHelper.dbg.json

@@ -0,0 +1,4 @@
+{
+  "_format": "hh-sol-dbg-1",
+  "buildInfo": "../../../../../../build-info/0ecf98e2b42d900c7b99f8ddad842fa1.json"
+}

package/build/artifacts/contracts/router/swap-aggregator/kyberswap/l2-contracts/BytesHelper.sol/BytesHelper.json

@@ -0,0 +1,10 @@
+{
+  "_format": "hh-sol-artifact-1",
+  "contractName": "BytesHelper",
+  "sourceName": "contracts/router/swap-aggregator/kyberswap/l2-contracts/BytesHelper.sol",
+  "abi": [],
+  "bytecode": "0x60566037600b82828239805160001a607314602a57634e487b7160e01b600052600060045260246000fd5b30600052607381538281f3fe73000000000000000000000000000000000000000030146080604052600080fdfea2646970667358221220e01b0b28322f5628b1041bc5c4809b77a57120f46cbb1e2192330c5eab792c0f64736f6c63430008170033",
+  "deployedBytecode": "0x73000000000000000000000000000000000000000030146080604052600080fdfea2646970667358221220e01b0b28322f5628b1041bc5c4809b77a57120f46cbb1e2192330c5eab792c0f64736f6c63430008170033",
+  "linkReferences": {},
+  "deployedLinkReferences": {}
+}

package/build/artifacts/contracts/router/swap-aggregator/kyberswap/l2-contracts/CalldataReader.sol/CalldataReader.dbg.json

@@ -0,0 +1,4 @@
+{
+  "_format": "hh-sol-dbg-1",
+  "buildInfo": "../../../../../../build-info/0ecf98e2b42d900c7b99f8ddad842fa1.json"
+}

package/build/artifacts/contracts/router/swap-aggregator/kyberswap/l2-contracts/CalldataReader.sol/CalldataReader.json

@@ -0,0 +1,10 @@
+{
+  "_format": "hh-sol-artifact-1",
+  "contractName": "CalldataReader",
+  "sourceName": "contracts/router/swap-aggregator/kyberswap/l2-contracts/CalldataReader.sol",
+  "abi": [],
+  "bytecode": "0x60566037600b82828239805160001a607314602a57634e487b7160e01b600052600060045260246000fd5b30600052607381538281f3fe73000000000000000000000000000000000000000030146080604052600080fdfea2646970667358221220d2f939a79d5f8be773e86f9b33af5993e3d7a4b300324dbf5f5341b4e5583d4364736f6c63430008170033",
+  "deployedBytecode": "0x73000000000000000000000000000000000000000030146080604052600080fdfea2646970667358221220d2f939a79d5f8be773e86f9b33af5993e3d7a4b300324dbf5f5341b4e5583d4364736f6c63430008170033",
+  "linkReferences": {},
+  "deployedLinkReferences": {}
+}

package/build/artifacts/contracts/router/swap-aggregator/kyberswap/l2-contracts/CalldataWriter.sol/CalldataWriter.dbg.json

@@ -0,0 +1,4 @@
+{
+  "_format": "hh-sol-dbg-1",
+  "buildInfo": "../../../../../../build-info/0ecf98e2b42d900c7b99f8ddad842fa1.json"
+}

package/build/artifacts/contracts/router/swap-aggregator/kyberswap/l2-contracts/CalldataWriter.sol/CalldataWriter.json

@@ -0,0 +1,10 @@
+{
+  "_format": "hh-sol-artifact-1",
+  "contractName": "CalldataWriter",
+  "sourceName": "contracts/router/swap-aggregator/kyberswap/l2-contracts/CalldataWriter.sol",
+  "abi": [],
+  "bytecode": "0x60566037600b82828239805160001a607314602a57634e487b7160e01b600052600060045260246000fd5b30600052607381538281f3fe73000000000000000000000000000000000000000030146080604052600080fdfea26469706673582212209715da55d6e26247acd0bdb733eaa1283f890ad4b3a2d083b3a48b80c8d6c89a64736f6c63430008170033",
+  "deployedBytecode": "0x73000000000000000000000000000000000000000030146080604052600080fdfea26469706673582212209715da55d6e26247acd0bdb733eaa1283f890ad4b3a2d083b3a48b80c8d6c89a64736f6c63430008170033",
+  "linkReferences": {},
+  "deployedLinkReferences": {}
+}

package/build/artifacts/contracts/router/swap-aggregator/kyberswap/l2-contracts/Common.sol/Common.dbg.json

@@ -0,0 +1,4 @@
+{
+  "_format": "hh-sol-dbg-1",
+  "buildInfo": "../../../../../../build-info/0ecf98e2b42d900c7b99f8ddad842fa1.json"
+}

package/build/artifacts/contracts/{limit/helpers/ArgumentsDecoder.sol/ArgumentsDecoder.json → router/swap-aggregator/kyberswap/l2-contracts/Common.sol/Common.json}

@@ -1,10 +1,10 @@
 {
   "_format": "hh-sol-artifact-1",
-  "contractName": "ArgumentsDecoder",
-  "sourceName": "contracts/limit/helpers/ArgumentsDecoder.sol",
+  "contractName": "Common",
+  "sourceName": "contracts/router/swap-aggregator/kyberswap/l2-contracts/Common.sol",
   "abi": [],
-  "bytecode": "0x60566037600b82828239805160001a607314602a57634e487b7160e01b600052600060045260246000fd5b30600052607381538281f3fe73000000000000000000000000000000000000000030146080604052600080fdfea2646970667358221220457878829f21472e46dce609add1d36226a6efc579b8ac8f364c3c67bc113efc64736f6c63430008170033",
-  "deployedBytecode": "0x73000000000000000000000000000000000000000030146080604052600080fdfea2646970667358221220457878829f21472e46dce609add1d36226a6efc579b8ac8f364c3c67bc113efc64736f6c63430008170033",
+  "bytecode": "0x60566037600b82828239805160001a607314602a57634e487b7160e01b600052600060045260246000fd5b30600052607381538281f3fe73000000000000000000000000000000000000000030146080604052600080fdfea26469706673582212203a083da36a51259922511ae12640aaf49a830a85db487b1687700819bfad591464736f6c63430008170033",
+  "deployedBytecode": "0x73000000000000000000000000000000000000000030146080604052600080fdfea26469706673582212203a083da36a51259922511ae12640aaf49a830a85db487b1687700819bfad591464736f6c63430008170033",
   "linkReferences": {},
   "deployedLinkReferences": {}
 }

package/build/artifacts/contracts/router/swap-aggregator/kyberswap/l2-contracts/DexScaler.sol/DexScaler.dbg.json

@@ -0,0 +1,4 @@
+{
+  "_format": "hh-sol-dbg-1",
+  "buildInfo": "../../../../../../build-info/0ecf98e2b42d900c7b99f8ddad842fa1.json"
+}

package/build/artifacts/contracts/{limit/helpers/RevertReasonParser.sol/RevertReasonParser.json → router/swap-aggregator/kyberswap/l2-contracts/DexScaler.sol/DexScaler.json}

@@ -1,10 +1,10 @@
 {
   "_format": "hh-sol-artifact-1",
-  "contractName": "RevertReasonParser",
-  "sourceName": "contracts/limit/helpers/RevertReasonParser.sol",
+  "contractName": "DexScaler",
+  "sourceName": "contracts/router/swap-aggregator/kyberswap/l2-contracts/DexScaler.sol",
   "abi": [],
-  "bytecode": "0x60566037600b82828239805160001a607314602a57634e487b7160e01b600052600060045260246000fd5b30600052607381538281f3fe73000000000000000000000000000000000000000030146080604052600080fdfea2646970667358221220a83a3645b01cf44222e10365b2fc41bba1fefce453596e906b98121f812f85db64736f6c63430008170033",
-  "deployedBytecode": "0x73000000000000000000000000000000000000000030146080604052600080fdfea2646970667358221220a83a3645b01cf44222e10365b2fc41bba1fefce453596e906b98121f812f85db64736f6c63430008170033",
+  "bytecode": "0x60566037600b82828239805160001a607314602a57634e487b7160e01b600052600060045260246000fd5b30600052607381538281f3fe73000000000000000000000000000000000000000030146080604052600080fdfea26469706673582212206ab62f7484e7924b0c9aed23f41402369686766c71da53969e0b78854f58a7f564736f6c63430008170033",
+  "deployedBytecode": "0x73000000000000000000000000000000000000000030146080604052600080fdfea26469706673582212206ab62f7484e7924b0c9aed23f41402369686766c71da53969e0b78854f58a7f564736f6c63430008170033",
   "linkReferences": {},
   "deployedLinkReferences": {}
 }

package/build/artifacts/contracts/router/swap-aggregator/kyberswap/l2-contracts/ExecutorReader.sol/ExecutorReader.dbg.json

@@ -0,0 +1,4 @@
+{
+  "_format": "hh-sol-dbg-1",
+  "buildInfo": "../../../../../../build-info/0ecf98e2b42d900c7b99f8ddad842fa1.json"
+}

package/build/artifacts/contracts/router/swap-aggregator/kyberswap/l2-contracts/ExecutorReader.sol/ExecutorReader.json

@@ -0,0 +1,10 @@
+{
+  "_format": "hh-sol-artifact-1",
+  "contractName": "ExecutorReader",
+  "sourceName": "contracts/router/swap-aggregator/kyberswap/l2-contracts/ExecutorReader.sol",
+  "abi": [],
+  "bytecode": "0x60566037600b82828239805160001a607314602a57634e487b7160e01b600052600060045260246000fd5b30600052607381538281f3fe73000000000000000000000000000000000000000030146080604052600080fdfea2646970667358221220b209aab7ba9fb6284e1b1afbc9deee14eecaf6c033ca7b2e02d95b6cb445f46264736f6c63430008170033",
+  "deployedBytecode": "0x73000000000000000000000000000000000000000030146080604052600080fdfea2646970667358221220b209aab7ba9fb6284e1b1afbc9deee14eecaf6c033ca7b2e02d95b6cb445f46264736f6c63430008170033",
+  "linkReferences": {},
+  "deployedLinkReferences": {}
+}

package/build/artifacts/contracts/router/swap-aggregator/kyberswap/l2-contracts/InputScalingHelperL2.sol/InputScalingHelperL2.dbg.json

@@ -0,0 +1,4 @@
+{
+  "_format": "hh-sol-dbg-1",
+  "buildInfo": "../../../../../../build-info/0ecf98e2b42d900c7b99f8ddad842fa1.json"
+}

package/build/artifacts/contracts/router/swap-aggregator/kyberswap/l2-contracts/InputScalingHelperL2.sol/InputScalingHelperL2.json

@@ -0,0 +1,10 @@
+{
+  "_format": "hh-sol-artifact-1",
+  "contractName": "InputScalingHelperL2",
+  "sourceName": "contracts/router/swap-aggregator/kyberswap/l2-contracts/InputScalingHelperL2.sol",
+  "abi": [],
+  "bytecode": "0x60566037600b82828239805160001a607314602a57634e487b7160e01b600052600060045260246000fd5b30600052607381538281f3fe73000000000000000000000000000000000000000030146080604052600080fdfea264697066735822122036ec38d6968823a913b9f3104e17393fab32bdf1340ad7bf554ae9a3bcad72b464736f6c63430008170033",
+  "deployedBytecode": "0x73000000000000000000000000000000000000000030146080604052600080fdfea264697066735822122036ec38d6968823a913b9f3104e17393fab32bdf1340ad7bf554ae9a3bcad72b464736f6c63430008170033",
+  "linkReferences": {},
+  "deployedLinkReferences": {}
+}

package/build/artifacts/contracts/router/swap-aggregator/kyberswap/l2-contracts/ScalingDataL2Lib.sol/ScalingDataL2Lib.dbg.json

@@ -0,0 +1,4 @@
+{
+  "_format": "hh-sol-dbg-1",
+  "buildInfo": "../../../../../../build-info/0ecf98e2b42d900c7b99f8ddad842fa1.json"
+}

package/build/artifacts/contracts/router/swap-aggregator/kyberswap/l2-contracts/ScalingDataL2Lib.sol/ScalingDataL2Lib.json

@@ -0,0 +1,10 @@
+{
+  "_format": "hh-sol-artifact-1",
+  "contractName": "ScalingDataL2Lib",
+  "sourceName": "contracts/router/swap-aggregator/kyberswap/l2-contracts/ScalingDataL2Lib.sol",
+  "abi": [],
+  "bytecode": "0x60566037600b82828239805160001a607314602a57634e487b7160e01b600052600060045260246000fd5b30600052607381538281f3fe73000000000000000000000000000000000000000030146080604052600080fdfea2646970667358221220b47dc5f942c9cf301d157464112a21c8bae98a60966d6b934a18c3229a39502c64736f6c63430008170033",
+  "deployedBytecode": "0x73000000000000000000000000000000000000000030146080604052600080fdfea2646970667358221220b47dc5f942c9cf301d157464112a21c8bae98a60966d6b934a18c3229a39502c64736f6c63430008170033",
+  "linkReferences": {},
+  "deployedLinkReferences": {}
+}

package/build/artifacts/contracts/router/swap-aggregator/oneinch/I1inchAggregationRouterV5.sol/I1inchAggregationRouterV5.dbg.json

@@ -1,4 +1,4 @@
 {
   "_format": "hh-sol-dbg-1",
-  "buildInfo": "../../../../../build-info/1cd41ce6b731611ee0b35aa82d34d5ae.json"
+  "buildInfo": "../../../../../build-info/0ecf98e2b42d900c7b99f8ddad842fa1.json"
 }

package/build/artifacts/contracts/router/swap-aggregator/oneinch/OneInchAggregationRouterHelper.sol/OneInchAggregationRouterHelper.dbg.json

@@ -1,4 +1,4 @@
 {
   "_format": "hh-sol-dbg-1",
-  "buildInfo": "../../../../../build-info/1cd41ce6b731611ee0b35aa82d34d5ae.json"
+  "buildInfo": "../../../../../build-info/0ecf98e2b42d900c7b99f8ddad842fa1.json"
 }

package/contracts/LiquidityMining/CrossChainMsg/PendleMsgReceiveEndpointUpg.sol

@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: GPL-3.0-or-later
-pragma solidity 0.8.17;
+pragma solidity ^0.8.17;
 
 import "../../interfaces/ILayerZeroEndpoint.sol";
 import "../../interfaces/IPMsgReceiverApp.sol";
@@ -15,25 +15,14 @@ import "@openzeppelin/contracts/proxy/utils/UUPSUpgradeable.sol";
  * So we can leave the configuration unset.
  */
 
-contract PendleMsgReceiveEndpointUpg is
-    ILayerZeroReceiver,
-    Initializable,
-    UUPSUpgradeable,
-    BoringOwnableUpgradeable
-{
+contract PendleMsgReceiveEndpointUpg is ILayerZeroReceiver, Initializable, UUPSUpgradeable, BoringOwnableUpgradeable {
     using ExcessivelySafeCall for address;
 
     address public immutable lzEndpoint;
     address public immutable sendEndpointAddr;
     uint64 public immutable sendEndpointChainId;
 
-    event MessageFailed(
-        uint16 _srcChainId,
-        bytes _path,
-        uint64 _nonce,
-        bytes _payload,
-        bytes _reason
-    );
+    event MessageFailed(uint16 _srcChainId, bytes _path, uint64 _nonce, bytes _payload, bytes _reason);
 
     modifier onlyLzEndpoint() {
         if (msg.sender != address(lzEndpoint)) revert Errors.OnlyLayerZeroEndpoint();
@@ -55,11 +44,7 @@ contract PendleMsgReceiveEndpointUpg is
 
     // by default we will use LZ's default version (most updated version). Hence, it's not necessary
     // to call setLzReceiveVersion
-    constructor(
-        address _lzEndpoint,
-        address _sendEndpointAddr,
-        uint64 _sendEndpointChainId
-    ) initializer {
+    constructor(address _lzEndpoint, address _sendEndpointAddr, uint64 _sendEndpointChainId) initializer {
         lzEndpoint = _lzEndpoint;
         sendEndpointAddr = _sendEndpointAddr;
         sendEndpointChainId = _sendEndpointChainId;
@@ -88,10 +73,7 @@ contract PendleMsgReceiveEndpointUpg is
         }
     }
 
-    function govExecuteMessage(
-        address receiver,
-        bytes calldata message
-    ) external payable onlyOwner {
+    function govExecuteMessage(address receiver, bytes calldata message) external payable onlyOwner {
         IPMsgReceiverApp(receiver).executeMessage(message);
     }
 

package/contracts/LiquidityMining/CrossChainMsg/PendleMsgReceiverAppUpg.sol

@@ -13,8 +13,7 @@ abstract contract PendleMsgReceiverAppUpg is IPMsgReceiverApp {
     uint256[100] private __gap;
 
     modifier onlyFromPendleMsgReceiveEndpoint() {
-        if (msg.sender != pendleMsgReceiveEndpoint)
-            revert Errors.MsgNotFromReceiveEndpoint(msg.sender);
+        if (msg.sender != pendleMsgReceiveEndpoint) revert Errors.MsgNotFromReceiveEndpoint(msg.sender);
         _;
     }
 
@@ -22,9 +21,7 @@ abstract contract PendleMsgReceiverAppUpg is IPMsgReceiverApp {
         pendleMsgReceiveEndpoint = _pendleMsgReceiveEndpoint;
     }
 
-    function executeMessage(
-        bytes calldata message
-    ) external virtual onlyFromPendleMsgReceiveEndpoint {
+    function executeMessage(bytes calldata message) external virtual onlyFromPendleMsgReceiveEndpoint {
         _executeMessage(message);
     }
 

package/contracts/LiquidityMining/CrossChainMsg/PendleMsgSendEndpointUpg.sol

@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: GPL-3.0-or-later
-pragma solidity 0.8.17;
+pragma solidity ^0.8.17;
 
 import "../../interfaces/IPMsgSendEndpoint.sol";
 import "../../interfaces/ILayerZeroEndpoint.sol";
@@ -14,12 +14,7 @@ import "@openzeppelin/contracts/proxy/utils/UUPSUpgradeable.sol";
  * So we can leave the configuration unset.
  */
 
-contract PendleMsgSendEndpointUpg is
-    IPMsgSendEndpoint,
-    Initializable,
-    UUPSUpgradeable,
-    BoringOwnableUpgradeable
-{
+contract PendleMsgSendEndpointUpg is IPMsgSendEndpoint, Initializable, UUPSUpgradeable, BoringOwnableUpgradeable {
     using EnumerableMap for EnumerableMap.UintToAddressMap;
 
     address payable public immutable refundAddress;
@@ -64,7 +59,7 @@ contract PendleMsgSendEndpointUpg is
         uint256 estimatedGasAmount
     ) external payable onlyWhitelisted {
         bytes memory path = abi.encodePacked(receiveEndpoints.get(dstChainId), address(this));
-        lzEndpoint.send{ value: msg.value }(
+        lzEndpoint.send{value: msg.value}(
             LayerZeroHelper._getLayerZeroChainIds(dstChainId),
             path,
             abi.encode(dstAddress, payload),
@@ -74,10 +69,7 @@ contract PendleMsgSendEndpointUpg is
         );
     }
 
-    function addReceiveEndpoints(
-        address endpointAddr,
-        uint256 endpointChainId
-    ) external payable onlyOwner {
+    function addReceiveEndpoints(address endpointAddr, uint256 endpointChainId) external payable onlyOwner {
         receiveEndpoints.set(endpointChainId, endpointAddr);
     }
 
@@ -89,11 +81,7 @@ contract PendleMsgSendEndpointUpg is
         ILayerZeroEndpoint(lzEndpoint).setSendVersion(_newVersion);
     }
 
-    function getAllReceiveEndpoints()
-        external
-        view
-        returns (uint256[] memory chainIds, address[] memory addrs)
-    {
+    function getAllReceiveEndpoints() external view returns (uint256[] memory chainIds, address[] memory addrs) {
         uint256 length = receiveEndpoints.length();
         chainIds = new uint256[](length);
         addrs = new address[](length);
@@ -105,9 +93,7 @@ contract PendleMsgSendEndpointUpg is
 
     function _authorizeUpgrade(address newImplementation) internal override onlyOwner {}
 
-    function _getAdapterParams(
-        uint256 estimatedGasAmount
-    ) internal pure returns (bytes memory adapterParams) {
+    function _getAdapterParams(uint256 estimatedGasAmount) internal pure returns (bytes memory adapterParams) {
         // this is more like "type" rather than version
         // It is the type of adapter params you want to pass to relayer
         adapterParams = abi.encodePacked(uint16(1), estimatedGasAmount);

package/contracts/LiquidityMining/CrossChainMsg/PendleMsgSenderAppUpg.sol

@@ -38,20 +38,11 @@ abstract contract PendleMsgSenderAppUpg is BoringOwnableUpgradeable {
         uint256 estimatedGasAmount = approxDstExecutionGas;
         uint256 fee = pendleMsgSendEndpoint.calcFee(toAddr, chainId, message, estimatedGasAmount);
         // 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,
-            estimatedGasAmount
-        );
+        if (address(this).balance < fee) revert Errors.InsufficientFeeToSendMsg(address(this).balance, fee);
+        pendleMsgSendEndpoint.sendMessage{value: fee}(toAddr, chainId, message, estimatedGasAmount);
     }
 
-    function addDestinationContract(
-        address _address,
-        uint256 _chainId
-    ) external payable onlyOwner {
+    function addDestinationContract(address _address, uint256 _chainId) external payable onlyOwner {
         destinationContracts.set(_chainId, _address);
     }
 
@@ -59,11 +50,7 @@ abstract contract PendleMsgSenderAppUpg is BoringOwnableUpgradeable {
         approxDstExecutionGas = gas;
     }
 
-    function getAllDestinationContracts()
-        public
-        view
-        returns (uint256[] memory chainIds, address[] memory addrs)
-    {
+    function getAllDestinationContracts() public view returns (uint256[] memory chainIds, address[] memory addrs) {
         uint256 length = destinationContracts.length();
         chainIds = new uint256[](length);
         addrs = new address[](length);
@@ -73,16 +60,8 @@ abstract contract PendleMsgSenderAppUpg is BoringOwnableUpgradeable {
         }
     }
 
-    function _getSendMessageFee(
-        uint256 chainId,
-        bytes memory message
-    ) internal view returns (uint256) {
+    function _getSendMessageFee(uint256 chainId, bytes memory message) internal view returns (uint256) {
         return
-            pendleMsgSendEndpoint.calcFee(
-                destinationContracts.get(chainId),
-                chainId,
-                message,
-                approxDstExecutionGas
-            );
+            pendleMsgSendEndpoint.calcFee(destinationContracts.get(chainId), chainId, message, approxDstExecutionGas);
     }
 }

package/contracts/LiquidityMining/CrossChainMsg/libraries/ExcessivelySafeCall.sol

@@ -2,8 +2,7 @@
 pragma solidity >=0.7.6;
 
 library ExcessivelySafeCall {
-    uint256 constant LOW_28_MASK =
-        0x00000000ffffffffffffffffffffffffffffffffffffffffffffffffffffffff;
+    uint256 constant LOW_28_MASK = 0x00000000ffffffffffffffffffffffffffffffffffffffffffffffffffffffff;
 
     /// @notice Use when you _really_ really _really_ don't trust the called
     /// contract. This prevents the called contract from causing reversion of

package/contracts/LiquidityMining/CrossChainMsg/libraries/LayerZeroHelper.sol

@@ -47,4 +47,4 @@ library LayerZeroHelper {
             dst := mload(add(add(path, EVM_ADDRESS_SIZE), 0))
         }
     }
-}
+}

package/contracts/LiquidityMining/GaugeController/PendleGaugeControllerBaseUpg.sol

@@ -24,11 +24,7 @@ import "@openzeppelin/contracts/proxy/utils/UUPSUpgradeable.sol";
  * on inheriting contracts
  */
 
-abstract contract PendleGaugeControllerBaseUpg is
-    IPGaugeController,
-    BoringOwnableUpgradeable,
-    UUPSUpgradeable
-{
+abstract contract PendleGaugeControllerBaseUpg is IPGaugeController, BoringOwnableUpgradeable, UUPSUpgradeable {
     using SafeERC20 for IERC20;
     using PMath for uint256;
 
@@ -43,6 +39,7 @@ abstract contract PendleGaugeControllerBaseUpg is
 
     address public immutable pendle;
     IPMarketFactory public immutable marketFactory;
+    IPMarketFactory public immutable marketFactory2;
 
     mapping(address => MarketRewardData) public rewardData;
     mapping(uint128 => bool) public epochRewardReceived;
@@ -50,13 +47,20 @@ abstract contract PendleGaugeControllerBaseUpg is
     uint256[100] private __gap;
 
     modifier onlyPendleMarket() {
-        if (!marketFactory.isValidMarket(msg.sender)) revert Errors.GCNotPendleMarket(msg.sender);
-        _;
+        if (
+            marketFactory.isValidMarket(msg.sender) ||
+            (marketFactory2 != IPMarketFactory(address(0)) && marketFactory2.isValidMarket(msg.sender))
+        ) {
+            _;
+        } else {
+            revert Errors.GCNotPendleMarket(msg.sender);
+        }
     }
 
-    constructor(address _pendle, address _marketFactory) {
+    constructor(address _pendle, address _marketFactory, address _marketFactory2) {
         pendle = _pendle;
         marketFactory = IPMarketFactory(_marketFactory);
+        marketFactory2 = IPMarketFactory(_marketFactory2);
     }
 
     /**
@@ -88,19 +92,16 @@ abstract contract PendleGaugeControllerBaseUpg is
      * @notice receive voting results from VotingController. Only the first message for a timestamp
      * will be accepted, all subsequent messages will be ignored
      */
-    function _receiveVotingResults(
-        uint128 wTime,
-        address[] memory markets,
-        uint256[] memory pendleAmounts
-    ) internal {
+    function _receiveVotingResults(uint128 wTime, address[] memory markets, uint256[] memory pendleAmounts) internal {
         if (markets.length != pendleAmounts.length) revert Errors.ArrayLengthMismatch();
 
         if (epochRewardReceived[wTime]) return; // only accept the first message for the wTime
         epochRewardReceived[wTime] = true;
 
         for (uint256 i = 0; i < markets.length; ++i) {
-            if (!IPMarket(markets[i]).isExpired())
+            if (!IPMarket(markets[i]).isExpired()) {
                 _addRewardsToMarket(markets[i], pendleAmounts[i].Uint128());
+            }
         }
 
         emit ReceiveVotingResults(wTime, markets, pendleAmounts);
@@ -132,9 +133,7 @@ abstract contract PendleGaugeControllerBaseUpg is
      * Pendle distributed to the accumulatedPendle
      * @dev expect to update accumulatedPendle & lastUpdated in MarketRewardData
      */
-    function _getUpdatedMarketReward(
-        address market
-    ) internal view returns (MarketRewardData memory) {
+    function _getUpdatedMarketReward(address market) internal view returns (MarketRewardData memory) {
         MarketRewardData memory rwd = rewardData[market];
         uint128 newLastUpdated = uint128(PMath.min(uint128(block.timestamp), rwd.incentiveEndsAt));
         rwd.accumulatedPendle += rwd.pendlePerSec * (newLastUpdated - rwd.lastUpdated);

package/contracts/LiquidityMining/GaugeController/PendleGaugeControllerMainchainUpg.sol

@@ -1,13 +1,10 @@
 // SPDX-License-Identifier: GPL-3.0-or-later
-pragma solidity 0.8.17;
+pragma solidity ^0.8.17;
 
 import "./PendleGaugeControllerBaseUpg.sol";
 import "../../interfaces/IPGaugeControllerMainchain.sol";
 
-contract PendleGaugeControllerMainchainUpg is
-    PendleGaugeControllerBaseUpg,
-    IPGaugeControllerMainchain
-{
+contract PendleGaugeControllerMainchainUpg is PendleGaugeControllerBaseUpg, IPGaugeControllerMainchain {
     address public immutable votingController;
 
     modifier onlyVotingController() {
@@ -18,9 +15,11 @@ contract PendleGaugeControllerMainchainUpg is
     constructor(
         address _votingController,
         address _pendle,
-        address _marketFactory
-    ) PendleGaugeControllerBaseUpg(_pendle, _marketFactory) initializer {
+        address _marketFactory,
+        address _marketFactory2
+    ) PendleGaugeControllerBaseUpg(_pendle, _marketFactory, _marketFactory2) {
         votingController = _votingController;
+        _disableInitializers();
     }
 
     function initialize() external initializer {

package/contracts/LiquidityMining/GaugeController/PendleGaugeControllerSidechainUpg.sol

@@ -1,24 +1,23 @@
 // SPDX-License-Identifier: GPL-3.0-or-later
-pragma solidity 0.8.17;
+pragma solidity ^0.8.17;
 
 import "./PendleGaugeControllerBaseUpg.sol";
 import "../CrossChainMsg/PendleMsgReceiverAppUpg.sol";
 
 // solhint-disable no-empty-blocks
 
-contract PendleGaugeControllerSidechainUpg is
-    PendleGaugeControllerBaseUpg,
-    PendleMsgReceiverAppUpg
-{
+contract PendleGaugeControllerSidechainUpg is PendleGaugeControllerBaseUpg, PendleMsgReceiverAppUpg {
     constructor(
         address _pendle,
         address _marketFactory,
+        address _marketFactory2,
         address _PendleMsgReceiveEndpointUpg
     )
-        PendleGaugeControllerBaseUpg(_pendle, _marketFactory)
+        PendleGaugeControllerBaseUpg(_pendle, _marketFactory, _marketFactory2)
         PendleMsgReceiverAppUpg(_PendleMsgReceiveEndpointUpg)
-        initializer
-    {}
+    {
+        _disableInitializers();
+    }
 
     function initialize() external initializer {
         __BoringOwnable_init();

package/contracts/LiquidityMining/PendleMerkleDistributor.sol

@@ -8,12 +8,7 @@ import "../core/libraries/BoringOwnableUpgradeable.sol";
 import "../core/libraries/TokenHelper.sol";
 import "../interfaces/IPMerkleDistributor.sol";
 
-contract PendleMerkleDistributor is
-    IPMerkleDistributor,
-    UUPSUpgradeable,
-    BoringOwnableUpgradeable,
-    TokenHelper
-{
+contract PendleMerkleDistributor is IPMerkleDistributor, UUPSUpgradeable, BoringOwnableUpgradeable, TokenHelper {
     address public immutable token;
 
     bytes32 public merkleRoot;
@@ -74,11 +69,7 @@ contract PendleMerkleDistributor is
         emit Verified(user, amountClaimable);
     }
 
-    function _verifyMerkleData(
-        address user,
-        uint256 amount,
-        bytes32[] calldata proof
-    ) internal view returns (bool) {
+    function _verifyMerkleData(address user, uint256 amount, bytes32[] calldata proof) internal view returns (bool) {
         bytes32 leaf = keccak256(abi.encodePacked(user, amount));
         return MerkleProof.verify(proof, merkleRoot, leaf);
     }