@pendle/core-v2 3.0.0-beta-8 → 3.0.0-beta-10

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

@@ -1,32 +1,8 @@
 {
   "_format": "hh-sol-artifact-1",
   "contractName": "IExecutorHelper",
-  "sourceName": "contracts/router/swap-aggregator/kyberswap/interfaces/IExecutorHelper.sol",
+  "sourceName": "contracts/router/swap-aggregator/kyberswap/IExecutorHelper.sol",
   "abi": [
-    {
-      "inputs": [
-        {
-          "internalType": "bytes",
-          "name": "data",
-          "type": "bytes"
-        },
-        {
-          "internalType": "uint256",
-          "name": "flagsAndPrevAmountOut",
-          "type": "uint256"
-        }
-      ],
-      "name": "executeAlgebraV1",
-      "outputs": [
-        {
-          "internalType": "uint256",
-          "name": "",
-          "type": "uint256"
-        }
-      ],
-      "stateMutability": "payable",
-      "type": "function"
-    },
     {
       "inputs": [
         {
@@ -51,30 +27,6 @@
       "stateMutability": "payable",
       "type": "function"
     },
-    {
-      "inputs": [
-        {
-          "internalType": "bytes",
-          "name": "data",
-          "type": "bytes"
-        },
-        {
-          "internalType": "uint256",
-          "name": "flagsAndPrevAmountOut",
-          "type": "uint256"
-        }
-      ],
-      "name": "executeBalancerBatch",
-      "outputs": [
-        {
-          "internalType": "uint256",
-          "name": "",
-          "type": "uint256"
-        }
-      ],
-      "stateMutability": "payable",
-      "type": "function"
-    },
     {
       "inputs": [
         {
@@ -195,30 +147,6 @@
       "stateMutability": "payable",
       "type": "function"
     },
-    {
-      "inputs": [
-        {
-          "internalType": "bytes",
-          "name": "data",
-          "type": "bytes"
-        },
-        {
-          "internalType": "uint256",
-          "name": "flagsAndPrevAmountOut",
-          "type": "uint256"
-        }
-      ],
-      "name": "executeGMXGLP",
-      "outputs": [
-        {
-          "internalType": "uint256",
-          "name": "",
-          "type": "uint256"
-        }
-      ],
-      "stateMutability": "payable",
-      "type": "function"
-    },
     {
       "inputs": [
         {
@@ -243,30 +171,6 @@
       "stateMutability": "payable",
       "type": "function"
     },
-    {
-      "inputs": [
-        {
-          "internalType": "bytes",
-          "name": "data",
-          "type": "bytes"
-        },
-        {
-          "internalType": "uint256",
-          "name": "flagsAndPrevAmountOut",
-          "type": "uint256"
-        }
-      ],
-      "name": "executeIziSwap",
-      "outputs": [
-        {
-          "internalType": "uint256",
-          "name": "",
-          "type": "uint256"
-        }
-      ],
-      "stateMutability": "payable",
-      "type": "function"
-    },
     {
       "inputs": [
         {
@@ -291,30 +195,6 @@
       "stateMutability": "payable",
       "type": "function"
     },
-    {
-      "inputs": [
-        {
-          "internalType": "bytes",
-          "name": "data",
-          "type": "bytes"
-        },
-        {
-          "internalType": "uint256",
-          "name": "flagsAndPrevAmountOut",
-          "type": "uint256"
-        }
-      ],
-      "name": "executeKokonut",
-      "outputs": [
-        {
-          "internalType": "uint256",
-          "name": "",
-          "type": "uint256"
-        }
-      ],
-      "stateMutability": "payable",
-      "type": "function"
-    },
     {
       "inputs": [
         {
@@ -339,78 +219,6 @@
       "stateMutability": "payable",
       "type": "function"
     },
-    {
-      "inputs": [
-        {
-          "internalType": "bytes",
-          "name": "data",
-          "type": "bytes"
-        },
-        {
-          "internalType": "uint256",
-          "name": "flagsAndPrevAmountOut",
-          "type": "uint256"
-        }
-      ],
-      "name": "executeLevelFiV2",
-      "outputs": [
-        {
-          "internalType": "uint256",
-          "name": "",
-          "type": "uint256"
-        }
-      ],
-      "stateMutability": "payable",
-      "type": "function"
-    },
-    {
-      "inputs": [
-        {
-          "internalType": "bytes",
-          "name": "data",
-          "type": "bytes"
-        },
-        {
-          "internalType": "uint256",
-          "name": "flagsAndPrevAmountOut",
-          "type": "uint256"
-        }
-      ],
-      "name": "executeMantis",
-      "outputs": [
-        {
-          "internalType": "uint256",
-          "name": "",
-          "type": "uint256"
-        }
-      ],
-      "stateMutability": "payable",
-      "type": "function"
-    },
-    {
-      "inputs": [
-        {
-          "internalType": "bytes",
-          "name": "data",
-          "type": "bytes"
-        },
-        {
-          "internalType": "uint256",
-          "name": "flagsAndPrevAmountOut",
-          "type": "uint256"
-        }
-      ],
-      "name": "executeMaticMigrate",
-      "outputs": [
-        {
-          "internalType": "uint256",
-          "name": "",
-          "type": "uint256"
-        }
-      ],
-      "stateMutability": "payable",
-      "type": "function"
-    },
     {
       "inputs": [
         {
@@ -459,30 +267,6 @@
       "stateMutability": "payable",
       "type": "function"
     },
-    {
-      "inputs": [
-        {
-          "internalType": "bytes",
-          "name": "data",
-          "type": "bytes"
-        },
-        {
-          "internalType": "uint256",
-          "name": "flagsAndPrevAmountOut",
-          "type": "uint256"
-        }
-      ],
-      "name": "executePancakeStableSwap",
-      "outputs": [
-        {
-          "internalType": "uint256",
-          "name": "",
-          "type": "uint256"
-        }
-      ],
-      "stateMutability": "payable",
-      "type": "function"
-    },
     {
       "inputs": [
         {
@@ -531,54 +315,6 @@
       "stateMutability": "payable",
       "type": "function"
     },
-    {
-      "inputs": [
-        {
-          "internalType": "bytes",
-          "name": "data",
-          "type": "bytes"
-        },
-        {
-          "internalType": "uint256",
-          "name": "flagsAndPrevAmountOut",
-          "type": "uint256"
-        }
-      ],
-      "name": "executeSmardex",
-      "outputs": [
-        {
-          "internalType": "uint256",
-          "name": "",
-          "type": "uint256"
-        }
-      ],
-      "stateMutability": "payable",
-      "type": "function"
-    },
-    {
-      "inputs": [
-        {
-          "internalType": "bytes",
-          "name": "data",
-          "type": "bytes"
-        },
-        {
-          "internalType": "uint256",
-          "name": "flagsAndPrevAmountOut",
-          "type": "uint256"
-        }
-      ],
-      "name": "executeSolidlyV2",
-      "outputs": [
-        {
-          "internalType": "uint256",
-          "name": "",
-          "type": "uint256"
-        }
-      ],
-      "stateMutability": "payable",
-      "type": "function"
-    },
     {
       "inputs": [
         {
@@ -627,30 +363,6 @@
       "stateMutability": "payable",
       "type": "function"
     },
-    {
-      "inputs": [
-        {
-          "internalType": "bytes",
-          "name": "data",
-          "type": "bytes"
-        },
-        {
-          "internalType": "uint256",
-          "name": "flagsAndPrevAmountOut",
-          "type": "uint256"
-        }
-      ],
-      "name": "executeSyncSwap",
-      "outputs": [
-        {
-          "internalType": "uint256",
-          "name": "",
-          "type": "uint256"
-        }
-      ],
-      "stateMutability": "payable",
-      "type": "function"
-    },
     {
       "inputs": [
         {
@@ -675,30 +387,6 @@
       "stateMutability": "payable",
       "type": "function"
     },
-    {
-      "inputs": [
-        {
-          "internalType": "bytes",
-          "name": "data",
-          "type": "bytes"
-        },
-        {
-          "internalType": "uint256",
-          "name": "flagsAndPrevAmountOut",
-          "type": "uint256"
-        }
-      ],
-      "name": "executeTraderJoeV2",
-      "outputs": [
-        {
-          "internalType": "uint256",
-          "name": "",
-          "type": "uint256"
-        }
-      ],
-      "stateMutability": "payable",
-      "type": "function"
-    },
     {
       "inputs": [
         {
@@ -747,30 +435,6 @@
       "stateMutability": "payable",
       "type": "function"
     },
-    {
-      "inputs": [
-        {
-          "internalType": "bytes",
-          "name": "data",
-          "type": "bytes"
-        },
-        {
-          "internalType": "uint256",
-          "name": "flagsAndPrevAmountOut",
-          "type": "uint256"
-        }
-      ],
-      "name": "executeVelocoreV2",
-      "outputs": [
-        {
-          "internalType": "uint256",
-          "name": "",
-          "type": "uint256"
-        }
-      ],
-      "stateMutability": "payable",
-      "type": "function"
-    },
     {
       "inputs": [
         {
@@ -795,78 +459,6 @@
       "stateMutability": "payable",
       "type": "function"
     },
-    {
-      "inputs": [
-        {
-          "internalType": "bytes",
-          "name": "data",
-          "type": "bytes"
-        },
-        {
-          "internalType": "uint256",
-          "name": "flagsAndPrevAmountOut",
-          "type": "uint256"
-        }
-      ],
-      "name": "executeVooi",
-      "outputs": [
-        {
-          "internalType": "uint256",
-          "name": "",
-          "type": "uint256"
-        }
-      ],
-      "stateMutability": "payable",
-      "type": "function"
-    },
-    {
-      "inputs": [
-        {
-          "internalType": "bytes",
-          "name": "data",
-          "type": "bytes"
-        },
-        {
-          "internalType": "uint256",
-          "name": "flagsAndPrevAmountOut",
-          "type": "uint256"
-        }
-      ],
-      "name": "executeWombat",
-      "outputs": [
-        {
-          "internalType": "uint256",
-          "name": "",
-          "type": "uint256"
-        }
-      ],
-      "stateMutability": "payable",
-      "type": "function"
-    },
-    {
-      "inputs": [
-        {
-          "internalType": "bytes",
-          "name": "data",
-          "type": "bytes"
-        },
-        {
-          "internalType": "uint256",
-          "name": "flagsAndPrevAmountOut",
-          "type": "uint256"
-        }
-      ],
-      "name": "executeWooFiV2",
-      "outputs": [
-        {
-          "internalType": "uint256",
-          "name": "",
-          "type": "uint256"
-        }
-      ],
-      "stateMutability": "payable",
-      "type": "function"
-    },
     {
       "inputs": [
         {

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

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

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

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

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

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

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

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

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

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

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

@@ -1,10 +1,10 @@
 {
   "_format": "hh-sol-artifact-1",
   "contractName": "ScalingDataLib",
-  "sourceName": "contracts/router/swap-aggregator/kyberswap/l1-contracts/ScalingDataLib.sol",
+  "sourceName": "contracts/router/swap-aggregator/kyberswap/ScalingDataLib.sol",
   "abi": [],
-  "bytecode": "0x60566037600b82828239805160001a607314602a57634e487b7160e01b600052600060045260246000fd5b30600052607381538281f3fe73000000000000000000000000000000000000000030146080604052600080fdfea26469706673582212201bc46dd5882ce11710624af8e6ffe824e2a288821939c3844d19d1fb5ff452b164736f6c63430008170033",
-  "deployedBytecode": "0x73000000000000000000000000000000000000000030146080604052600080fdfea26469706673582212201bc46dd5882ce11710624af8e6ffe824e2a288821939c3844d19d1fb5ff452b164736f6c63430008170033",
+  "bytecode": "0x60566037600b82828239805160001a607314602a57634e487b7160e01b600052600060045260246000fd5b30600052607381538281f3fe73000000000000000000000000000000000000000030146080604052600080fdfea264697066735822122049ebfef8e1e5fd8f07667e36d8667a79238313bf226f36caf47710e746e4c86064736f6c63430008170033",
+  "deployedBytecode": "0x73000000000000000000000000000000000000000030146080604052600080fdfea264697066735822122049ebfef8e1e5fd8f07667e36d8667a79238313bf226f36caf47710e746e4c86064736f6c63430008170033",
   "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/e2ea7c19c361d1241026e79eda282113.json"
+  "buildInfo": "../../../../../build-info/3b339fe04e8bb9dee5912c4a304e1707.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/e2ea7c19c361d1241026e79eda282113.json"
+  "buildInfo": "../../../../../build-info/3b339fe04e8bb9dee5912c4a304e1707.json"
 }

package/contracts/LiquidityMining/PendleMerkleDistributor.sol

@@ -0,0 +1,95 @@
+// SPDX-License-Identifier: GPL-3.0-or-later
+pragma solidity ^0.8.17;
+
+import "@openzeppelin/contracts/token/ERC20/utils/SafeERC20.sol";
+import "@openzeppelin/contracts/proxy/utils/UUPSUpgradeable.sol";
+import "@openzeppelin/contracts/utils/cryptography/MerkleProof.sol";
+import "../core/libraries/BoringOwnableUpgradeable.sol";
+import "../core/libraries/TokenHelper.sol";
+import "../interfaces/IPMerkleDistributor.sol";
+
+contract PendleMerkleDistributor is
+    IPMerkleDistributor,
+    UUPSUpgradeable,
+    BoringOwnableUpgradeable,
+    TokenHelper
+{
+    address public immutable token;
+
+    bytes32 public merkleRoot;
+
+    mapping(address => uint256) public claimed;
+    mapping(address => uint256) public verified;
+
+    constructor(address _token) initializer {
+        token = _token;
+    }
+
+    receive() external payable {}
+
+    function initialize() external initializer {
+        __BoringOwnable_init();
+    }
+
+    function claim(
+        address receiver,
+        uint256 totalAccrued,
+        bytes32[] calldata proof
+    ) external returns (uint256 amountOut) {
+        address user = msg.sender;
+        if (!_verifyMerkleData(user, totalAccrued, proof)) revert InvalidMerkleProof();
+
+        amountOut = totalAccrued - claimed[user];
+        claimed[user] = totalAccrued;
+
+        _transferOut(token, receiver, amountOut);
+        emit Claimed(user, receiver, amountOut);
+    }
+
+    function claimVerified(address receiver) external returns (uint256 amountOut) {
+        address user = msg.sender;
+        uint256 amountVerified = verified[user];
+        uint256 amountClaimed = claimed[user];
+
+        if (amountVerified <= amountClaimed) {
+            return 0;
+        }
+
+        amountOut = amountVerified - amountClaimed;
+        claimed[user] = amountVerified;
+
+        _transferOut(token, receiver, amountOut);
+        emit Claimed(user, receiver, amountOut);
+    }
+
+    function verify(
+        address user,
+        uint256 totalAccrued,
+        bytes32[] calldata proof
+    ) external returns (uint256 amountClaimable) {
+        if (!_verifyMerkleData(user, totalAccrued, proof)) revert InvalidMerkleProof();
+        amountClaimable = totalAccrued - claimed[user];
+        verified[user] = totalAccrued;
+
+        emit Verified(user, amountClaimable);
+    }
+
+    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);
+    }
+
+    // ----------------- owner logic -----------------
+    function setMerkleRoot(bytes32 newMerkleRoot) external payable onlyOwner {
+        merkleRoot = newMerkleRoot;
+        emit SetMerkleRoot(merkleRoot);
+    }
+
+    // ----------------- upgrade-related -----------------
+
+    function _authorizeUpgrade(address) internal override onlyOwner {}
+}

package/contracts/interfaces/IPMerkleDistributor.sol

@@ -0,0 +1,24 @@
+// SPDX-License-Identifier: GPL-3.0-or-later
+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();
+
+    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/package.json

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