@pendle/core-v2 2.3.0-mainnet → 2.3.2-mainnet

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

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

package/build/artifacts/contracts/router/swap-aggregator/kyberswap/{KyberAggregationRouterHelper.sol/KyberAggregationRouterHelper.json → arbitrum/KyberHelperArbitrum.sol/KyberHelperArbitrum.json}

@@ -1,7 +1,7 @@
 {
   "_format": "hh-sol-artifact-1",
-  "contractName": "KyberAggregationRouterHelper",
-  "sourceName": "contracts/router/swap-aggregator/kyberswap/KyberAggregationRouterHelper.sol",
+  "contractName": "KyberHelperArbitrum",
+  "sourceName": "contracts/router/swap-aggregator/kyberswap/arbitrum/KyberHelperArbitrum.sol",
   "abi": [],
   "bytecode": "0x",
   "deployedBytecode": "0x",

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

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

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

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

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

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

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

@@ -0,0 +1,65 @@
+{
+  "_format": "hh-sol-artifact-1",
+  "contractName": "IAggregationExecutor",
+  "sourceName": "contracts/router/swap-aggregator/kyberswap/ethereum/IAggregationExecutor.sol",
+  "abi": [
+    {
+      "inputs": [
+        {
+          "internalType": "bytes",
+          "name": "data",
+          "type": "bytes"
+        }
+      ],
+      "name": "callBytes",
+      "outputs": [],
+      "stateMutability": "payable",
+      "type": "function"
+    },
+    {
+      "inputs": [
+        {
+          "internalType": "address",
+          "name": "tokenIn",
+          "type": "address"
+        },
+        {
+          "internalType": "address",
+          "name": "tokenOut",
+          "type": "address"
+        },
+        {
+          "internalType": "address",
+          "name": "to",
+          "type": "address"
+        },
+        {
+          "internalType": "bytes",
+          "name": "destTokenFeeData",
+          "type": "bytes"
+        }
+      ],
+      "name": "finalTransactionProcessing",
+      "outputs": [],
+      "stateMutability": "nonpayable",
+      "type": "function"
+    },
+    {
+      "inputs": [
+        {
+          "internalType": "bytes",
+          "name": "data",
+          "type": "bytes"
+        }
+      ],
+      "name": "swapSingleSequence",
+      "outputs": [],
+      "stateMutability": "nonpayable",
+      "type": "function"
+    }
+  ],
+  "bytecode": "0x",
+  "deployedBytecode": "0x",
+  "linkReferences": {},
+  "deployedLinkReferences": {}
+}

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

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

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

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

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

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

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

@@ -0,0 +1,101 @@
+{
+  "_format": "hh-sol-artifact-1",
+  "contractName": "IHashflow",
+  "sourceName": "contracts/router/swap-aggregator/kyberswap/ethereum/IHashflow.sol",
+  "abi": [
+    {
+      "inputs": [
+        {
+          "components": [
+            {
+              "internalType": "enum IHashflow.RFQType",
+              "name": "rfqType",
+              "type": "uint8"
+            },
+            {
+              "internalType": "address",
+              "name": "pool",
+              "type": "address"
+            },
+            {
+              "internalType": "address",
+              "name": "eoa",
+              "type": "address"
+            },
+            {
+              "internalType": "address",
+              "name": "trader",
+              "type": "address"
+            },
+            {
+              "internalType": "address",
+              "name": "effectiveTrader",
+              "type": "address"
+            },
+            {
+              "internalType": "address",
+              "name": "baseToken",
+              "type": "address"
+            },
+            {
+              "internalType": "address",
+              "name": "quoteToken",
+              "type": "address"
+            },
+            {
+              "internalType": "uint256",
+              "name": "effectiveBaseTokenAmount",
+              "type": "uint256"
+            },
+            {
+              "internalType": "uint256",
+              "name": "maxBaseTokenAmount",
+              "type": "uint256"
+            },
+            {
+              "internalType": "uint256",
+              "name": "maxQuoteTokenAmount",
+              "type": "uint256"
+            },
+            {
+              "internalType": "uint256",
+              "name": "fees",
+              "type": "uint256"
+            },
+            {
+              "internalType": "uint256",
+              "name": "quoteExpiry",
+              "type": "uint256"
+            },
+            {
+              "internalType": "uint256",
+              "name": "nonce",
+              "type": "uint256"
+            },
+            {
+              "internalType": "bytes32",
+              "name": "txid",
+              "type": "bytes32"
+            },
+            {
+              "internalType": "bytes",
+              "name": "signedQuote",
+              "type": "bytes"
+            }
+          ],
+          "internalType": "struct IHashflow.Quote",
+          "name": "quote",
+          "type": "tuple"
+        }
+      ],
+      "name": "tradeSingleHop",
+      "outputs": [],
+      "stateMutability": "payable",
+      "type": "function"
+    }
+  ],
+  "bytecode": "0x",
+  "deployedBytecode": "0x",
+  "linkReferences": {},
+  "deployedLinkReferences": {}
+}

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

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

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

@@ -0,0 +1,215 @@
+{
+  "_format": "hh-sol-artifact-1",
+  "contractName": "IMetaAggregationRouterV2",
+  "sourceName": "contracts/router/swap-aggregator/kyberswap/ethereum/IMetaAggregationRouterV2.sol",
+  "abi": [
+    {
+      "inputs": [
+        {
+          "components": [
+            {
+              "internalType": "address",
+              "name": "callTarget",
+              "type": "address"
+            },
+            {
+              "internalType": "address",
+              "name": "approveTarget",
+              "type": "address"
+            },
+            {
+              "internalType": "bytes",
+              "name": "targetData",
+              "type": "bytes"
+            },
+            {
+              "components": [
+                {
+                  "internalType": "contract IERC20",
+                  "name": "srcToken",
+                  "type": "address"
+                },
+                {
+                  "internalType": "contract IERC20",
+                  "name": "dstToken",
+                  "type": "address"
+                },
+                {
+                  "internalType": "address[]",
+                  "name": "srcReceivers",
+                  "type": "address[]"
+                },
+                {
+                  "internalType": "uint256[]",
+                  "name": "srcAmounts",
+                  "type": "uint256[]"
+                },
+                {
+                  "internalType": "address[]",
+                  "name": "feeReceivers",
+                  "type": "address[]"
+                },
+                {
+                  "internalType": "uint256[]",
+                  "name": "feeAmounts",
+                  "type": "uint256[]"
+                },
+                {
+                  "internalType": "address",
+                  "name": "dstReceiver",
+                  "type": "address"
+                },
+                {
+                  "internalType": "uint256",
+                  "name": "amount",
+                  "type": "uint256"
+                },
+                {
+                  "internalType": "uint256",
+                  "name": "minReturnAmount",
+                  "type": "uint256"
+                },
+                {
+                  "internalType": "uint256",
+                  "name": "flags",
+                  "type": "uint256"
+                },
+                {
+                  "internalType": "bytes",
+                  "name": "permit",
+                  "type": "bytes"
+                }
+              ],
+              "internalType": "struct IMetaAggregationRouterV2.SwapDescriptionV2",
+              "name": "desc",
+              "type": "tuple"
+            },
+            {
+              "internalType": "bytes",
+              "name": "clientData",
+              "type": "bytes"
+            }
+          ],
+          "internalType": "struct IMetaAggregationRouterV2.SwapExecutionParams",
+          "name": "execution",
+          "type": "tuple"
+        }
+      ],
+      "name": "swap",
+      "outputs": [
+        {
+          "internalType": "uint256",
+          "name": "",
+          "type": "uint256"
+        },
+        {
+          "internalType": "uint256",
+          "name": "",
+          "type": "uint256"
+        }
+      ],
+      "stateMutability": "payable",
+      "type": "function"
+    },
+    {
+      "inputs": [
+        {
+          "internalType": "contract IAggregationExecutor",
+          "name": "caller",
+          "type": "address"
+        },
+        {
+          "components": [
+            {
+              "internalType": "contract IERC20",
+              "name": "srcToken",
+              "type": "address"
+            },
+            {
+              "internalType": "contract IERC20",
+              "name": "dstToken",
+              "type": "address"
+            },
+            {
+              "internalType": "address[]",
+              "name": "srcReceivers",
+              "type": "address[]"
+            },
+            {
+              "internalType": "uint256[]",
+              "name": "srcAmounts",
+              "type": "uint256[]"
+            },
+            {
+              "internalType": "address[]",
+              "name": "feeReceivers",
+              "type": "address[]"
+            },
+            {
+              "internalType": "uint256[]",
+              "name": "feeAmounts",
+              "type": "uint256[]"
+            },
+            {
+              "internalType": "address",
+              "name": "dstReceiver",
+              "type": "address"
+            },
+            {
+              "internalType": "uint256",
+              "name": "amount",
+              "type": "uint256"
+            },
+            {
+              "internalType": "uint256",
+              "name": "minReturnAmount",
+              "type": "uint256"
+            },
+            {
+              "internalType": "uint256",
+              "name": "flags",
+              "type": "uint256"
+            },
+            {
+              "internalType": "bytes",
+              "name": "permit",
+              "type": "bytes"
+            }
+          ],
+          "internalType": "struct IMetaAggregationRouterV2.SwapDescriptionV2",
+          "name": "desc",
+          "type": "tuple"
+        },
+        {
+          "internalType": "bytes",
+          "name": "executorData",
+          "type": "bytes"
+        },
+        {
+          "internalType": "bytes",
+          "name": "clientData",
+          "type": "bytes"
+        }
+      ],
+      "name": "swapSimpleMode",
+      "outputs": [
+        {
+          "internalType": "uint256",
+          "name": "",
+          "type": "uint256"
+        },
+        {
+          "internalType": "uint256",
+          "name": "",
+          "type": "uint256"
+        }
+      ],
+      "stateMutability": "nonpayable",
+      "type": "function"
+    }
+  ],
+  "bytecode": "0x",
+  "deployedBytecode": "0x",
+  "linkReferences": {},
+  "deployedLinkReferences": {}
+}

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

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

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

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

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

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

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

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

package/contracts/router/ActionAddRemoveLiq.sol

@@ -22,7 +22,6 @@ contract ActionAddRemoveLiq is IPActionAddRemoveLiq, ActionBaseMintRedeem {
     using MarketApproxPtOutLib for MarketState;
     using PYIndexLib for IPYieldToken;
     using PYIndexLib for PYIndex;
-    using BulkSellerMathCore for BulkSellerState;
 
     /**
      * @notice Adds liquidity to the SY/PT market, granting LP tokens in return

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

@@ -0,0 +1,45 @@
+// SPDX-License-Identifier: GPL-3.0-or-later
+pragma solidity 0.8.17;
+
+import "@openzeppelin/contracts/utils/Address.sol";
+import "../../core/libraries/TokenHelper.sol";
+import "../../core/libraries/Errors.sol";
+import "./IPSwapAggregator.sol";
+import "./1inch/OneInchAggregationRouterHelper.sol";
+import "./kyberswap/arbitrum/KyberHelperArbitrum.sol";
+
+contract PendleSwapArbitrum is
+    IPSwapAggregator,
+    TokenHelper,
+    KyberHelperArbitrum,
+    OneInchAggregationRouterHelper
+{
+    using Address for address;
+
+    function swap(address tokenIn, uint256 amountIn, SwapData calldata data) external payable {
+        _safeApproveInf(tokenIn, data.extRouter);
+        data.extRouter.functionCallWithValue(
+            data.needScale
+                ? _getScaledInputData(data.swapType, data.extCalldata, amountIn)
+                : data.extCalldata,
+            tokenIn == NATIVE ? amountIn : 0
+        );
+    }
+
+    function _getScaledInputData(
+        SwapType swapType,
+        bytes calldata rawCallData,
+        uint256 amountIn
+    ) internal pure returns (bytes memory scaledCallData) {
+        if (swapType == SwapType.KYBERSWAP) {
+            scaledCallData = _getKyberScaledInputData(rawCallData, amountIn);
+        } else if (swapType == SwapType.ONE_INCH) {
+            scaledCallData = _get1inchScaledInputData(rawCallData, amountIn);
+        } else {
+            assert(false);
+        }
+    }
+
+    receive() external payable {}
+
+}

package/contracts/router/swap-aggregator/{PendleSwapAggregator.sol → PendleSwapEthereum.sol}

@@ -6,12 +6,12 @@ import "../../core/libraries/TokenHelper.sol";
 import "../../core/libraries/Errors.sol";
 import "./IPSwapAggregator.sol";
 import "./1inch/OneInchAggregationRouterHelper.sol";
-import "./kyberswap/KyberAggregationRouterHelper.sol";
+import "./kyberswap/ethereum/KyberHelperEthereum.sol";
 
-contract PendleSwapAggregator is
+contract PendleSwapEthereum is
     IPSwapAggregator,
     TokenHelper,
-    KyberAggregationRouterHelper,
+    KyberHelperEthereum,
     OneInchAggregationRouterHelper
 {
     using Address for address;
@@ -39,4 +39,6 @@ contract PendleSwapAggregator is
             assert(false);
         }
     }
+
+    receive() external payable {}
 }