@pendle/core-v2 4.4.1 → 4.4.2

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

@@ -282,6 +282,34 @@ library InputScalingHelper {
                 swap.data = ScalingDataLib.newRocketPool(swap.data, oldAmount, newAmount);
             } else if (functionSelector == IExecutorHelper.executeMakersDAI.selector) {
                 swap.data = ScalingDataLib.newMakersDAI(swap.data, oldAmount, newAmount);
+            } else if (functionSelector == IExecutorHelper.executeRenzo.selector) {
+                swap.data = ScalingDataLib.newRenzo(swap.data, oldAmount, newAmount);
+            } else if (functionSelector == IExecutorHelper.executeWBETH.selector) {
+                swap.data = ScalingDataLib.newEtherFieETH(swap.data, oldAmount, newAmount); // same etherfi eETH
+            } else if (functionSelector == IExecutorHelper.executeMantleETH.selector) {
+                swap.data = ScalingDataLib.newEtherFieETH(swap.data, oldAmount, newAmount); // same etherfi eETH
+            } else if (functionSelector == IExecutorHelper.executeFrxETH.selector) {
+                swap.data = ScalingDataLib.newFrxETH(swap.data, oldAmount, newAmount);
+            } else if (functionSelector == IExecutorHelper.executeSfrxETH.selector) {
+                swap.data = ScalingDataLib.newSfrxETH(swap.data, oldAmount, newAmount);
+            } else if (functionSelector == IExecutorHelper.executeSfrxETHConvertor.selector) {
+                swap.data = ScalingDataLib.newSfrxETHConvertor(swap.data, oldAmount, newAmount);
+            } else if (functionSelector == IExecutorHelper.executeSwellETH.selector) {
+                swap.data = ScalingDataLib.newEtherFieETH(swap.data, oldAmount, newAmount); // same etherfi eETH
+            } else if (functionSelector == IExecutorHelper.executeRswETH.selector) {
+                swap.data = ScalingDataLib.newEtherFieETH(swap.data, oldAmount, newAmount); // same etherfi eETH
+            } else if (functionSelector == IExecutorHelper.executeStaderETHx.selector) {
+                swap.data = ScalingDataLib.newEthenaSusde(swap.data, oldAmount, newAmount); // same ethena susde
+            } else if (functionSelector == IExecutorHelper.executeOriginETH.selector) {
+                swap.data = ScalingDataLib.newOriginETH(swap.data, oldAmount, newAmount);
+            } else if (functionSelector == IExecutorHelper.executePrimeETH.selector) {
+                swap.data = ScalingDataLib.newOriginETH(swap.data, oldAmount, newAmount); // same originETH
+            } else if (functionSelector == IExecutorHelper.executeMantleUsd.selector) {
+                swap.data = ScalingDataLib.newMantleUsd(swap.data, oldAmount, newAmount);
+            } else if (functionSelector == IExecutorHelper.executeBedrockUniETH.selector) {
+                swap.data = ScalingDataLib.newEtherFieETH(swap.data, oldAmount, newAmount); // same etherfi eETH
+            } else if (functionSelector == IExecutorHelper.executeMaiPSM.selector) {
+                swap.data = ScalingDataLib.newFrxETH(swap.data, oldAmount, newAmount); // same frxeth
             } else {
                 revert("AggregationExecutor: Dex type not supported");
             }

package/contracts/router/swap-aggregator/kyberswap/l1-contracts/ScalingDataLib.sol

@@ -332,8 +332,16 @@ library ScalingDataLib {
         uint256 newAmount
     ) internal pure returns (bytes memory) {
         IExecutorHelper.RocketPool memory structData = abi.decode(data, (IExecutorHelper.RocketPool));
+
         uint128 _amount = uint128((uint256(uint128(structData.isDepositAndAmount)) * newAmount) / oldAmount);
-        structData.isDepositAndAmount |= uint256(_amount);
+
+        bool _isDeposit = (structData.isDepositAndAmount >> 255) == 1;
+
+        // reset and create new variable for isDeposit and amount
+        structData.isDepositAndAmount = 0;
+        structData.isDepositAndAmount |= uint256(uint128(_amount));
+        structData.isDepositAndAmount |= uint256(_isDeposit ? 1 : 0) << 255;
+
         return abi.encode(structData);
     }
 
@@ -344,7 +352,80 @@ library ScalingDataLib {
     ) internal pure returns (bytes memory) {
         IExecutorHelper.MakersDAI memory structData = abi.decode(data, (IExecutorHelper.MakersDAI));
         uint128 _amount = uint128((uint256(uint128(structData.isRedeemAndAmount)) * newAmount) / oldAmount);
-        structData.isRedeemAndAmount |= uint256(_amount);
+
+        bool _isRedeem = (structData.isRedeemAndAmount >> 255) == 1;
+
+        // reset and create new variable for isRedeem and amount
+        structData.isRedeemAndAmount = 0;
+        structData.isRedeemAndAmount |= uint256(uint128(_amount));
+        structData.isRedeemAndAmount |= uint256(_isRedeem ? 1 : 0) << 255;
+
         return abi.encode(structData);
     }
+
+    function newRenzo(bytes memory data, uint256 oldAmount, uint256 newAmount) internal pure returns (bytes memory) {
+        IExecutorHelper.Renzo memory structData = abi.decode(data, (IExecutorHelper.Renzo));
+        structData.amount = uint128((uint256(structData.amount) * newAmount) / oldAmount);
+        return abi.encode(structData);
+    }
+
+    function newFrxETH(bytes memory data, uint256 oldAmount, uint256 newAmount) internal pure returns (bytes memory) {
+        IExecutorHelper.FrxETH memory structData = abi.decode(data, (IExecutorHelper.FrxETH));
+        structData.amount = uint128((uint256(structData.amount) * newAmount) / oldAmount);
+        return abi.encode(structData);
+    }
+
+    function newSfrxETH(bytes memory data, uint256 oldAmount, uint256 newAmount) internal pure returns (bytes memory) {
+        IExecutorHelper.SfrxETH memory structData = abi.decode(data, (IExecutorHelper.SfrxETH));
+        structData.amount = uint128((uint256(structData.amount) * newAmount) / oldAmount);
+        return abi.encode(structData);
+    }
+
+    function newSfrxETHConvertor(
+        bytes memory data,
+        uint256 oldAmount,
+        uint256 newAmount
+    ) internal pure returns (bytes memory) {
+        IExecutorHelper.SfrxETHConvertor memory structData = abi.decode(data, (IExecutorHelper.SfrxETHConvertor));
+
+        uint128 _amount = uint128((uint256(uint128(structData.isDepositAndAmount)) * newAmount) / oldAmount);
+
+        bool _isDeposit = (structData.isDepositAndAmount >> 255) == 1;
+
+        // reset and create new variable for isDeposit and amount
+        structData.isDepositAndAmount = 0;
+        structData.isDepositAndAmount |= uint256(uint128(_amount));
+        structData.isDepositAndAmount |= uint256(_isDeposit ? 1 : 0) << 255;
+
+        return abi.encode(structData);
+    }
+
+    function newOriginETH(
+        bytes memory data,
+        uint256 oldAmount,
+        uint256 newAmount
+    ) internal pure returns (bytes memory) {
+        IExecutorHelper.OriginETH memory structData = abi.decode(data, (IExecutorHelper.OriginETH));
+        structData.amount = uint128((uint256(structData.amount) * newAmount) / oldAmount);
+        return abi.encode(structData);
+    }
+
+    function newMantleUsd(
+        bytes memory data,
+        uint256 oldAmount,
+        uint256 newAmount
+    ) internal pure returns (bytes memory) {
+        uint256 isWrapAndAmount = abi.decode(data, (uint256));
+
+        uint128 _amount = uint128((uint256(uint128(isWrapAndAmount)) * newAmount) / oldAmount);
+
+        bool _isWrap = (isWrapAndAmount >> 255) == 1;
+
+        // reset and create new variable for isWrap and amount
+        isWrapAndAmount = 0;
+        isWrapAndAmount |= uint256(uint128(_amount));
+        isWrapAndAmount |= uint256(_isWrap ? 1 : 0) << 255;
+
+        return abi.encode(isWrapAndAmount);
+    }
 }

package/deployments/1-core.json

@@ -22,7 +22,7 @@
     "marketFactory": "0x27b1dAcd74688aF24a64BD3C9C1B143118740784",
     "router": "0x00000000005BBB0EF59571E58418F9a4357b68A0",
     "routerStatic": "0x263833d47eA3fA4a30f269323aba6a107f9eB14C",
-    "pendleSwap": "0x694ba57ee63614b8448b465c39f505ade5e594ad",
+    "pendleSwap": "0x1e8b6Ac39f8A33f46a6Eb2D1aCD1047B99180AD1",
     "routerHelper": "0x462206b11d185ef6F64B41D344325401C37EC335",
     "ptAndLpOracle": "0x66a1096C6366b2529274dF4f5D8247827fe4CEA8",
     "yieldContractFactoryV3": "0xdF3601014686674e53d1Fa52F7602525483F9122",

package/deployments/1-markets/AAVE-USDT-SEP2024.json

@@ -1,9 +1,9 @@
 {
     "name": "SY aUSDT",
     "SY": "0x8c28D28bAd669afadC37b034A8070D6d7B9dFB74",
-    "YT": "0x0a3d962946c81096f1529f79dd66a987F2929De2",
-    "PT": "0x3850Cb4591C7A9E6dEF5d4952205704C48Be27EE",
-    "market": "0x9dF2beAF84c24212a495CC8b4aCeeacd2DB8585b",
+    "YT": "0x6cf80d52e1724437c509a9729719ac9b566ca19f",
+    "PT": "0xe6fe6e1f6ef1de6a21cd752e805f953673a7c0f0",
+    "market": "0xb8fbf5cc2826c1c9909f59dd11633b494f46fbfe",
     "expiry": 1735171200,
     "scalarRoot": "9800852549000000000",
     "initAnchor": "1201611142000000000",

package/deployments/1-markets/RSWETH-JUNE2024-NEW.json

@@ -0,0 +1,11 @@
+{
+    "name": "SY rswETH",
+    "SY": "0x7786729eEe8b9d30fE7d91fDFf23A0f1D0C615D9",
+    "YT": "0x4AfdB1B0f9A56922e398D29239453e6A06148eD0",
+    "PT": "0x5cb12D56F5346a016DBBA8CA90635d82e6D1bcEa",
+    "market": "0xA9355a5d306c67027C54De0e5a72df76Befa5694",
+    "expiry": 1719446400,
+    "scalarRoot": "1968998490000000000",
+    "initAnchor": "1279404076000000000",
+    "lnFeeRateRoot": "9950330853000000"
+}

package/deployments/1-markets/UNIETH-JUNE2024-NEW.json

@@ -0,0 +1,11 @@
+{
+    "name": "SY uniETH",
+    "SY": "0xc430dB19339A3051192233B4c49f9aB3DC6D16b7",
+    "YT": "0x5Ae176BbcB9A4461aEEeb97c90C2a80c2078006a",
+    "PT": "0xf2ce61699660f0f5800bA7D962741bA582d7346B",
+    "market": "0x38100A480dBED278B0fe57bA80a75498a7dC5bB1",
+    "expiry": 1719446400,
+    "scalarRoot": "1968989345000000000",
+    "initAnchor": "1279410789000000000",
+    "lnFeeRateRoot": "9950330853000000"
+}

package/deployments/1-markets/USDE-JUL2024.json

@@ -0,0 +1,13 @@
+{
+    "name": "USDE-JUL2024",
+    "SY": "0x42862F48eAdE25661558AFE0A630b132038553D0",
+    "YT": "0x1e3d13932C31d7355fCb3FEc680b0cD159dC1A07",
+    "PT": "0xa0021EF8970104c2d008F38D92f115ad56a9B8e1",
+    "market": "0x19588F29f9402Bb508007FeADd415c875Ee3f19F",
+    "expiry": 1721865600,
+    "lnFeeRateRoot": "9950330853000000",
+    "scalarRoot": "985792836000000000",
+    "initAnchor": "1726141835000000000",
+    "doCacheIndexSameBlock": true,
+    "deployTxHash": "0x6a5761c55cf33d1ce74ce23987126ad994fd98c9523cee1a21774dbc65953889"
+}

package/deployments/1-markets/ZIRCUIT-EETH-JUN2024.json

@@ -0,0 +1,11 @@
+{
+    "name": "SY eETH",
+    "SY": "0xD7DF7E085214743530afF339aFC420c7c720BFa7",
+    "YT": "0x7C2D26182adeEf96976035986cF56474feC03bDa",
+    "PT": "0x4AE5411F3863CdB640309e84CEDf4B08B8b33FfF",
+    "market": "0xe26D7f9409581f606242300fbFE63f56789F2169",
+    "expiry": 1719446400,
+    "scalarRoot": "3564947052000000000",
+    "initAnchor": "1165353522000000000",
+    "lnFeeRateRoot": "2995508979000000"
+}

package/deployments/1-markets/ZIRCUIT-RSETH-JUN2024.json

@@ -0,0 +1,11 @@
+{
+    "name": "SY rsETH",
+    "SY": "0x34349c5569e7B846c3558961552D2202760A9789",
+    "YT": "0x029aad400f6092Dc735A65be95102efcc2Fe64bf",
+    "PT": "0x094bE6bD31D7B860f7d2C1f280fD09F0463d7e67",
+    "market": "0x445D25a1c31445Fb29e65d12DA8E0eea38174176",
+    "expiry": 1719446400,
+    "scalarRoot": "3522956471000000000",
+    "initAnchor": "1163479129000000000",
+    "lnFeeRateRoot": "2995508979000000"
+}

package/deployments/10-core.json

@@ -21,7 +21,7 @@
     "marketFactory": "0x17F100fB4bE2707675c6439468d38249DD993d58",
     "router": "0x00000000005BBB0EF59571E58418F9a4357b68A0",
     "routerStatic": "0x704478Dd72FD7F9B83d1F1e0fc18C14B54F034d0",
-    "pendleSwap": "0xD85d2F484DF4329746325e7398f3fC3E1915a173",
+    "pendleSwap": "0x9B9f96786B1051F5c72c517e7DEB189CF66E704F",
     "routerHelper": "0x462206b11d185ef6F64B41D344325401C37EC335",
     "ptAndLpOracle": "0x15Aab5C1ab800A9e457d9f4335e8A2Dc9f6Ad707",
     "yieldContractFactoryV3": "0xfa6B22FC4c3Ad88B68c16b3061a16b1714F6Bd57",

package/deployments/42161-core.json

@@ -21,7 +21,7 @@
     "marketFactory": "0xf5a7De2D276dbda3EEf1b62A9E718EFf4d29dDC8",
     "router": "0x00000000005BBB0EF59571E58418F9a4357b68A0",
     "routerStatic": "0xAdB09F65bd90d19e3148D9ccb693F3161C6DB3E8",
-    "pendleSwap": "0xCad581ee99a06BfcA69D8880df96BcC2d0DE3F2E",
+    "pendleSwap": "0x63a45E0B2686F7be77Bb85735c35704D1046459a",
     "routerHelper": "0x462206b11d185ef6F64B41D344325401C37EC335",
     "ptAndLpOracle": "0x1Fd95db7B7C0067De8D45C0cb35D59796adfD187",
     "yieldContractFactoryV3": "0xEb38531db128EcA928aea1B1CE9E5609B15ba146",

package/deployments/42161-markets/EZETH-JUNE2024-NEW.json

@@ -0,0 +1,11 @@
+{
+    "name": "SY ezETH",
+    "SY": "0x0dE802e3D6Cc9145A150bBDc8da9F988a98c5202",
+    "YT": "0x05735B65686635F5C87AA9D2dae494Fb2E838f38",
+    "PT": "0x8EA5040d423410f1fdc363379Af88e1DB5eA1C34",
+    "market": "0x5E03C94Fc5Fb2E21882000A96Df0b63d2c4312e2",
+    "expiry": 1719446400,
+    "scalarRoot": "2248078860000000000",
+    "initAnchor": "1245320124000000000",
+    "lnFeeRateRoot": "9950330853000000"
+}

package/deployments/5000-core.json

@@ -18,13 +18,14 @@
     "PENDLE": "0xd27B18915e7acc8FD6Ac75DB6766a80f8D2f5729",
     "router": "0x00000000005BBB0EF59571E58418F9a4357b68A0",
     "routerStatic": "0xCAd502Bb55d1A3F79952F969BFF3f011CF30a94a",
-    "pendleSwap": "0x2284E9a9A45829431317dcab3aA3A24878046068",
+    "pendleSwap": "0x497B5E9071a7e30DcdE69E2dEb3B04D7Ca1d9Fe7",
     "ptAndLpOracle": "0xADC3285cFC28c21b59A1C2d177eEb9ED323178dC",
     "yieldContractFactoryV3": "0x964840644B88C583500F473E4B829Ab629aF96A8",
     "marketFactoryV3": "0xD228EC1f7D4313fe321fab511A872475D07F5bA6",
-    "receiverEndpoint": "0xf799E4c029d14f41Dc1918C9A4C67242F565710e",
+    "poolDeployHelper": "0x01D0A833C3aD951e37E6f9bf5ecE86e519fF8a0c",
     "limitRouter": "0x000000000000c9B3E2C3Ec88B1B4c0cD853f4321",
     "proxyAdmin": "0xA28c08f165116587D4F3E708743B4dEe155c5E64",
+    "receiverEndpoint": "0xf799E4c029d14f41Dc1918C9A4C67242F565710e",
     "vePendle": "0x30c6d4e892871220B5Ab66c10db577da96Fb974b",
     "gaugeController": "0x428f2f93afAc3F96B0DE59854038c585e06165C8"
 }

package/deployments/5000-markets/USD-MANTLE-JUL2024.json

@@ -0,0 +1,11 @@
+{
+    "name": "SY USDe Mantle",
+    "SY": "0x5B9e411c9E50164133DE07FE1cAC05A094000105",
+    "YT": "0xb3c0f96c4208185cC22Afd1b7CF21F1dabd9648A",
+    "PT": "0xba567Cf0d8230c0AD8D8bFc50E587E06d6F118E9",
+    "market": "0x7dc07C575A0c512422dCab82CE9Ed74dB58Be30C",
+    "expiry": 1721865600,
+    "scalarRoot": "877034712000000000",
+    "initAnchor": "1819330528000000000",
+    "lnFeeRateRoot": "9950330853000000"
+}

package/deployments/56-core.json

@@ -21,7 +21,7 @@
     "marketFactory": "0x2bEa6BfD8fbFF45aA2a893EB3B6d85D10EFcC70E",
     "router": "0x00000000005BBB0EF59571E58418F9a4357b68A0",
     "routerStatic": "0x2700ADB035F82a11899ce1D3f1BF8451c296eABb",
-    "pendleSwap": "0xc7565d2282198b4b50ec29dee7b942e2b9bbc203",
+    "pendleSwap": "0x439B4d66255eFf74e621FBacb00D7162b588Ff4b",
     "routerHelper": "0x09D65812dCD0f276e052583d41885cA5C7Dd0086",
     "ptAndLpOracle": "0x30c6d4e892871220B5Ab66c10db577da96Fb974b",
     "yieldContractFactoryV3": "0x40Ae6da2d92aa3DCb7f8d7a7209FD12BDfcb7C85",