@pendle/core-v2 0.17.7-testnet → 0.18.0-testnet

package/contracts/offchain-helpers/MarketMathStatic.sol

@@ -14,6 +14,17 @@ library MarketMathStatic {
     using PYIndexLib for PYIndex;
     using PYIndexLib for IPYieldToken;
 
+    function getDefaultApproxParams() public pure returns (ApproxParams memory) {
+        return
+            ApproxParams({
+                guessMin: 0,
+                guessMax: type(uint256).max,
+                guessOffchain: 0,
+                maxIteration: 256,
+                eps: 1e14
+            });
+    }
+
     function addLiquidityDualSyAndPtStatic(
         address market,
         uint256 netSyDesired,
@@ -36,11 +47,7 @@ library MarketMathStatic {
     }
 
     /// @dev netPtToSwap is the parameter to approx
-    function addLiquiditySinglePtStatic(
-        address market,
-        uint256 netPtIn,
-        ApproxParams memory approxParams
-    )
+    function addLiquiditySinglePtStatic(address market, uint256 netPtIn)
         external
         returns (
             uint256 netLpOut,
@@ -56,7 +63,7 @@ library MarketMathStatic {
             pyIndex(market),
             netPtIn,
             block.timestamp,
-            approxParams
+            getDefaultApproxParams()
         );
 
         state = IPMarket(market).readState(address(this)); // re-read
@@ -78,11 +85,7 @@ library MarketMathStatic {
     }
 
     /// @dev netPtFromSwap is the parameter to approx
-    function addLiquiditySingleSyStatic(
-        address market,
-        uint256 netSyIn,
-        ApproxParams memory approxParams
-    )
+    function addLiquiditySingleSyStatic(address market, uint256 netSyIn)
         public
         returns (
             uint256 netLpOut,
@@ -98,7 +101,7 @@ library MarketMathStatic {
             pyIndex(market),
             netSyIn,
             block.timestamp,
-            approxParams
+            getDefaultApproxParams()
         );
 
         state = IPMarket(market).readState(address(this)); // re-read
@@ -125,11 +128,7 @@ library MarketMathStatic {
     }
 
     /// @dev netPtFromSwap is the parameter to approx
-    function removeLiquiditySinglePtStatic(
-        address market,
-        uint256 netLpToRemove,
-        ApproxParams memory approxParams
-    )
+    function removeLiquiditySinglePtStatic(address market, uint256 netLpToRemove)
         external
         returns (
             uint256 netPtOut,
@@ -146,7 +145,7 @@ library MarketMathStatic {
             pyIndex(market),
             syFromBurn,
             block.timestamp,
-            approxParams
+            getDefaultApproxParams()
         );
 
         netPtOut = ptFromBurn + netPtFromSwap;
@@ -225,11 +224,7 @@ library MarketMathStatic {
     }
 
     /// @dev netPtOut is the parameter to approx
-    function swapExactSyForPtStatic(
-        address market,
-        uint256 exactSyIn,
-        ApproxParams memory approxParams
-    )
+    function swapExactSyForPtStatic(address market, uint256 exactSyIn)
         public
         returns (
             uint256 netPtOut,
@@ -243,7 +238,7 @@ library MarketMathStatic {
             pyIndex(market),
             exactSyIn,
             block.timestamp,
-            approxParams
+            getDefaultApproxParams()
         );
         priceImpact = calcPriceImpactPt(market, netPtOut.Int());
 
@@ -253,11 +248,7 @@ library MarketMathStatic {
     }
 
     /// @dev netPtIn is the parameter to approx
-    function swapPtForExactSyStatic(
-        address market,
-        uint256 exactSyOut,
-        ApproxParams memory approxParams
-    )
+    function swapPtForExactSyStatic(address market, uint256 exactSyOut)
         public
         returns (
             uint256 netPtIn,
@@ -272,7 +263,7 @@ library MarketMathStatic {
             pyIndex(market),
             exactSyOut,
             block.timestamp,
-            approxParams
+            getDefaultApproxParams()
         );
         priceImpact = calcPriceImpactPt(market, netPtIn.neg());
 
@@ -309,11 +300,7 @@ library MarketMathStatic {
     }
 
     /// @dev netYtOut is the parameter to approx
-    function swapExactSyForYtStatic(
-        address market,
-        uint256 exactSyIn,
-        ApproxParams memory approxParams
-    )
+    function swapExactSyForYtStatic(address market, uint256 exactSyIn)
         public
         returns (
             uint256 netYtOut,
@@ -329,13 +316,13 @@ library MarketMathStatic {
             index,
             exactSyIn,
             block.timestamp,
-            approxParams
+            getDefaultApproxParams()
         );
 
         priceImpact = calcPriceImpactYt(market, netYtOut.neg());
 
         // Execute swap to calculate exchangeRateAfter
-        state.swapSyForExactPt(index, netYtOut, block.timestamp);
+        state.swapExactPtForSy(index, netYtOut, block.timestamp);
         exchangeRateAfter = _getTradeExchangeRateExcludeFee(market, state);
     }
 
@@ -365,11 +352,7 @@ library MarketMathStatic {
     }
 
     /// @dev netYtIn is the parameter to approx
-    function swapYtForExactSyStatic(
-        address market,
-        uint256 exactSyOut,
-        ApproxParams memory approxParams
-    )
+    function swapYtForExactSyStatic(address market, uint256 exactSyOut)
         external
         returns (
             uint256 netYtIn,
@@ -386,7 +369,7 @@ library MarketMathStatic {
             index,
             exactSyOut,
             block.timestamp,
-            approxParams
+            getDefaultApproxParams()
         );
         priceImpact = calcPriceImpactYt(market, netYtIn.Int());
 
@@ -396,11 +379,7 @@ library MarketMathStatic {
     }
 
     // totalPtToSwap is the param to approx
-    function swapExactPtForYt(
-        address market,
-        uint256 exactPtIn,
-        ApproxParams memory approxParams
-    )
+    function swapExactPtForYt(address market, uint256 exactPtIn)
         external
         returns (
             uint256 netYtOut,
@@ -417,7 +396,7 @@ library MarketMathStatic {
             index,
             exactPtIn,
             block.timestamp,
-            approxParams
+            getDefaultApproxParams()
         );
         priceImpact = calcPriceImpactPY(market, totalPtToSwap.neg());
 
@@ -427,11 +406,7 @@ library MarketMathStatic {
     }
 
     // totalPtSwapped is the param to approx
-    function swapExactYtForPt(
-        address market,
-        uint256 exactYtIn,
-        ApproxParams memory approxParams
-    )
+    function swapExactYtForPt(address market, uint256 exactYtIn)
         external
         returns (
             uint256 netPtOut,
@@ -448,7 +423,7 @@ library MarketMathStatic {
             index,
             exactYtIn,
             block.timestamp,
-            approxParams
+            getDefaultApproxParams()
         );
 
         priceImpact = calcPriceImpactPY(market, totalPtSwapped.Int());

package/contracts/offchain-helpers/RouterStatic.sol

@@ -14,9 +14,10 @@ import "../LiquidityMining/libraries/VeBalanceLib.sol";
 
 import "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol";
 import "@openzeppelin/contracts/proxy/utils/UUPSUpgradeable.sol";
+import "@openzeppelin/contracts/proxy/Proxy.sol";
 
 /// EXCLUDED FROM ALL AUDITS, TO BE CALLED ONLY BY PENDLE's SDK
-contract RouterStatic is Initializable, BoringOwnableUpgradeable, UUPSUpgradeable {
+contract RouterStatic is Initializable, Proxy, BoringOwnableUpgradeable, UUPSUpgradeable {
     using Math for uint256;
     using VeBalanceLib for VeBalance;
     using VeBalanceLib for LockedPosition;
@@ -62,32 +63,29 @@ contract RouterStatic is Initializable, BoringOwnableUpgradeable, UUPSUpgradeabl
     IPMarketFactory internal immutable marketFactory;
     IPVotingEscrowMainchain internal immutable vePENDLE;
     IPBulkSellerFactory internal immutable bulkFactory;
+    address internal immutable marketMathStaticLib;
 
     constructor(
         IPYieldContractFactory _yieldContractFactory,
         IPMarketFactory _marketFactory,
         IPVotingEscrowMainchain _vePENDLE,
-        IPBulkSellerFactory _bulkFactory
+        IPBulkSellerFactory _bulkFactory,
+        address _marketMathStaticLib
     ) initializer {
         yieldContractFactory = _yieldContractFactory;
         marketFactory = _marketFactory;
         vePENDLE = _vePENDLE;
         bulkFactory = _bulkFactory;
+        marketMathStaticLib = _marketMathStaticLib;
     }
 
-    function initialize() external initializer {
-        __BoringOwnable_init();
+    // all Market-related functions will go to MarketMathStaticLib
+    function _implementation() internal view override returns (address) {
+        return marketMathStaticLib;
     }
 
-    function getDefaultApproxParams() public pure returns (ApproxParams memory) {
-        return
-            ApproxParams({
-                guessMin: 0,
-                guessMax: type(uint256).max,
-                guessOffchain: 0,
-                maxIteration: 256,
-                eps: 1e14
-            });
+    function initialize() external initializer {
+        __BoringOwnable_init();
     }
 
     function _authorizeUpgrade(address newImplementation) internal override onlyOwner {}
@@ -329,8 +327,7 @@ contract RouterStatic is Initializable, BoringOwnableUpgradeable, UUPSUpgradeabl
             uint256 exchangeRateAfter
         )
     {
-        return
-            MarketMathStatic.addLiquiditySinglePtStatic(market, netPtIn, getDefaultApproxParams());
+        return MarketMathStatic.addLiquiditySinglePtStatic(market, netPtIn);
     }
 
     function addLiquiditySingleSyStatic(address market, uint256 netSyIn)
@@ -343,8 +340,7 @@ contract RouterStatic is Initializable, BoringOwnableUpgradeable, UUPSUpgradeabl
             uint256 exchangeRateAfter
         )
     {
-        return
-            MarketMathStatic.addLiquiditySingleSyStatic(market, netSyIn, getDefaultApproxParams());
+        return MarketMathStatic.addLiquiditySingleSyStatic(market, netSyIn);
     }
 
     function addLiquiditySingleBaseTokenStatic(
@@ -369,8 +365,7 @@ contract RouterStatic is Initializable, BoringOwnableUpgradeable, UUPSUpgradeabl
             bulk
         );
 
-        return
-            MarketMathStatic.addLiquiditySingleSyStatic(market, netSyIn, getDefaultApproxParams());
+        return MarketMathStatic.addLiquiditySingleSyStatic(market, netSyIn);
     }
 
     function removeLiquidityDualSyAndPtStatic(address market, uint256 netLpToRemove)
@@ -407,12 +402,7 @@ contract RouterStatic is Initializable, BoringOwnableUpgradeable, UUPSUpgradeabl
             uint256 exchangeRateAfter
         )
     {
-        return
-            MarketMathStatic.removeLiquiditySinglePtStatic(
-                market,
-                netLpToRemove,
-                getDefaultApproxParams()
-            );
+        return MarketMathStatic.removeLiquiditySinglePtStatic(market, netLpToRemove);
     }
 
     function removeLiquiditySingleSyStatic(address market, uint256 netLpToRemove)
@@ -443,10 +433,8 @@ contract RouterStatic is Initializable, BoringOwnableUpgradeable, UUPSUpgradeabl
     {
         uint256 netSyOut;
 
-        (netSyOut, netSyFee, priceImpact, exchangeRateAfter) = MarketMathStatic.removeLiquiditySingleSyStatic(
-            market,
-            netLpToRemove
-        );
+        (netSyOut, netSyFee, priceImpact, exchangeRateAfter) = MarketMathStatic
+            .removeLiquiditySingleSyStatic(market, netLpToRemove);
 
         netBaseTokenOut = previewRedeemStatic(getSyMarket(market), baseToken, netSyOut, bulk);
     }
@@ -484,8 +472,7 @@ contract RouterStatic is Initializable, BoringOwnableUpgradeable, UUPSUpgradeabl
             uint256 exchangeRateAfter
         )
     {
-        return
-            MarketMathStatic.swapExactSyForPtStatic(market, exactSyIn, getDefaultApproxParams());
+        return MarketMathStatic.swapExactSyForPtStatic(market, exactSyIn);
     }
 
     function swapPtForExactSyStatic(address market, uint256 exactSyOut)
@@ -497,8 +484,7 @@ contract RouterStatic is Initializable, BoringOwnableUpgradeable, UUPSUpgradeabl
             uint256 exchangeRateAfter
         )
     {
-        return
-            MarketMathStatic.swapPtForExactSyStatic(market, exactSyOut, getDefaultApproxParams());
+        return MarketMathStatic.swapPtForExactSyStatic(market, exactSyOut);
     }
 
     function swapExactBaseTokenForPtStatic(
@@ -521,7 +507,7 @@ contract RouterStatic is Initializable, BoringOwnableUpgradeable, UUPSUpgradeabl
             amountBaseToken,
             bulk
         );
-        return MarketMathStatic.swapExactSyForPtStatic(market, netSyIn, getDefaultApproxParams());
+        return MarketMathStatic.swapExactSyForPtStatic(market, netSyIn);
     }
 
     function swapExactPtForBaseTokenStatic(
@@ -539,10 +525,8 @@ contract RouterStatic is Initializable, BoringOwnableUpgradeable, UUPSUpgradeabl
         )
     {
         uint256 netSyOut;
-        (netSyOut, netSyFee, priceImpact, exchangeRateAfter) = MarketMathStatic.swapExactPtForSyStatic(
-            market,
-            exactPtIn
-        );
+        (netSyOut, netSyFee, priceImpact, exchangeRateAfter) = MarketMathStatic
+            .swapExactPtForSyStatic(market, exactPtIn);
 
         netBaseTokenOut = previewRedeemStatic(getSyMarket(market), baseToken, netSyOut, bulk);
     }
@@ -566,11 +550,9 @@ contract RouterStatic is Initializable, BoringOwnableUpgradeable, UUPSUpgradeabl
             uint256 netSyFee,
             uint256 priceImpact,
             uint256 exchangeRateAfter
-
         )
     {
-        return
-            MarketMathStatic.swapExactSyForYtStatic(market, exactSyIn, getDefaultApproxParams());
+        return MarketMathStatic.swapExactSyForYtStatic(market, exactSyIn);
     }
 
     function swapExactYtForSyStatic(address market, uint256 exactYtIn)
@@ -580,7 +562,6 @@ contract RouterStatic is Initializable, BoringOwnableUpgradeable, UUPSUpgradeabl
             uint256 netSyFee,
             uint256 priceImpact,
             uint256 exchangeRateAfter
-
         )
     {
         return MarketMathStatic.swapExactYtForSyStatic(market, exactYtIn);
@@ -595,8 +576,7 @@ contract RouterStatic is Initializable, BoringOwnableUpgradeable, UUPSUpgradeabl
             uint256 exchangeRateAfter
         )
     {
-        return
-            MarketMathStatic.swapYtForExactSyStatic(market, exactSyOut, getDefaultApproxParams());
+        return MarketMathStatic.swapYtForExactSyStatic(market, exactSyOut);
     }
 
     function swapExactYtForBaseTokenStatic(
@@ -614,10 +594,8 @@ contract RouterStatic is Initializable, BoringOwnableUpgradeable, UUPSUpgradeabl
         )
     {
         uint256 netSyOut;
-        (netSyOut, netSyFee, priceImpact, exchangeRateAfter) = MarketMathStatic.swapExactYtForSyStatic(
-            market,
-            exactYtIn
-        );
+        (netSyOut, netSyFee, priceImpact, exchangeRateAfter) = MarketMathStatic
+            .swapExactYtForSyStatic(market, exactYtIn);
 
         netBaseTokenOut = previewRedeemStatic(getSyMarket(market), baseToken, netSyOut, bulk);
     }
@@ -643,7 +621,7 @@ contract RouterStatic is Initializable, BoringOwnableUpgradeable, UUPSUpgradeabl
             bulk
         );
 
-        return MarketMathStatic.swapExactSyForYtStatic(market, netSyIn, getDefaultApproxParams());
+        return MarketMathStatic.swapExactSyForYtStatic(market, netSyIn);
     }
 
     function swapExactPtForYtStatic(address market, uint256 exactPtIn)
@@ -656,7 +634,7 @@ contract RouterStatic is Initializable, BoringOwnableUpgradeable, UUPSUpgradeabl
             uint256 exchangeRateAfter
         )
     {
-        return MarketMathStatic.swapExactPtForYt(market, exactPtIn, getDefaultApproxParams());
+        return MarketMathStatic.swapExactPtForYt(market, exactPtIn);
     }
 
     function swapExactYtForPtStatic(address market, uint256 exactYtIn)
@@ -669,7 +647,7 @@ contract RouterStatic is Initializable, BoringOwnableUpgradeable, UUPSUpgradeabl
             uint256 exchangeRateAfter
         )
     {
-        return MarketMathStatic.swapExactYtForPt(market, exactYtIn, getDefaultApproxParams());
+        return MarketMathStatic.swapExactYtForPt(market, exactYtIn);
     }
 
     // ============= vePENDLE =============
@@ -825,7 +803,7 @@ contract RouterStatic is Initializable, BoringOwnableUpgradeable, UUPSUpgradeabl
         address bulk,
         uint256 netSyOut
     ) public view returns (uint256 netTokenIn) {
-        uint256 pivotAmount = 10 ** IERC20Metadata(tokenIn).decimals();
+        uint256 pivotAmount = 10**IERC20Metadata(tokenIn).decimals();
 
         uint256 low = pivotAmount;
         {

package/contracts/router/kyberswap/AggregationRouterHelper.sol

@@ -1,8 +1,8 @@
-// SPDX-License-Identifier: GPL-3.0-or-later
+// SPDX-License-Identifier: MIT
 
 pragma solidity 0.8.17;
 import "@openzeppelin/contracts/token/ERC20/IERC20.sol";
-import "./IMultihopRouter.sol";
+import "./IMultihopRouterEthereum.sol";
 import "./IAggregatorRouterHelper.sol";
 import "@openzeppelin/contracts/proxy/utils/UUPSUpgradeable.sol";
 import "../../core/libraries/BoringOwnableUpgradeable.sol";
@@ -40,8 +40,7 @@ contract AggregationRouterHelper is
         BALANCERV2,
         KYBERRFQ,
         DODO,
-        VELODROME,
-        PLATYPUS
+        WSTETH
     }
 
     struct SwapDescription {
@@ -65,7 +64,7 @@ contract AggregationRouterHelper is
     }
 
     struct SwapExecutorDescription {
-        IMultihopRouter.Swap[][] swapSequences;
+        IMultihopRouterEthereum.Swap[][] swapSequences;
         address tokenIn;
         address tokenOut;
         uint256 minTotalAmountOut;
@@ -178,7 +177,7 @@ contract AggregationRouterHelper is
 
         uint256 newTotalSwapAmount;
         for (uint256 i = 0; i < swapExecutorDescription.swapSequences.length; i++) {
-            IMultihopRouter.Swap memory swap = swapExecutorDescription.swapSequences[i][0];
+            IMultihopRouterEthereum.Swap memory swap = swapExecutorDescription.swapSequences[i][0];
             uint8 dexType = uint8(swap.dexOption >> 8);
             uint256 value;
             if (i == swapExecutorDescription.swapSequences.length - 1)
@@ -200,8 +199,8 @@ contract AggregationRouterHelper is
                 revert("kyber: can't scale kyberrfq");
             } else if (dexType == uint8(DexType.DODO)) {
                 (swap.data, value) = _newDODOSwap(swap.data, value, oldAmount, newAmount);
-            } else if (dexType == uint8(DexType.VELODROME)) {
-                (swap.data, value) = _newVelodromeSwap(swap.data, value, oldAmount, newAmount);
+            } else if (dexType == uint8(DexType.WSTETH)) {
+                (swap.data, value) = _newWrappedstETHSwap(swap.data, value, oldAmount, newAmount);
             } else {
                 revert("AggregationExecutor: Dex type not supported");
             }
@@ -216,7 +215,10 @@ contract AggregationRouterHelper is
         uint256 oldAmount,
         uint256 newAmount
     ) internal pure returns (bytes memory, uint256) {
-        IMultihopRouter.UniSwap memory uniSwap = abi.decode(data, (IMultihopRouter.UniSwap));
+        IMultihopRouterEthereum.UniSwap memory uniSwap = abi.decode(
+            data,
+            (IMultihopRouterEthereum.UniSwap)
+        );
         if (value > 0) uniSwap.collectAmount = value;
         else uniSwap.collectAmount = (uniSwap.collectAmount * newAmount) / oldAmount;
         return (abi.encode(uniSwap), uniSwap.collectAmount);
@@ -228,9 +230,9 @@ contract AggregationRouterHelper is
         uint256 oldAmount,
         uint256 newAmount
     ) internal pure returns (bytes memory, uint256) {
-        IMultihopRouter.StableSwap memory stableSwap = abi.decode(
+        IMultihopRouterEthereum.StableSwap memory stableSwap = abi.decode(
             data,
-            (IMultihopRouter.StableSwap)
+            (IMultihopRouterEthereum.StableSwap)
         );
         if (value > 0) stableSwap.dx = value;
         else stableSwap.dx = (stableSwap.dx * newAmount) / oldAmount;
@@ -243,7 +245,10 @@ contract AggregationRouterHelper is
         uint256 oldAmount,
         uint256 newAmount
     ) internal pure returns (bytes memory, uint256) {
-        IMultihopRouter.CurveSwap memory curveSwap = abi.decode(data, (IMultihopRouter.CurveSwap));
+        IMultihopRouterEthereum.CurveSwap memory curveSwap = abi.decode(
+            data,
+            (IMultihopRouterEthereum.CurveSwap)
+        );
         if (value > 0) curveSwap.dx = value;
         else curveSwap.dx = (curveSwap.dx * newAmount) / oldAmount;
         return (abi.encode(curveSwap), curveSwap.dx);
@@ -255,7 +260,10 @@ contract AggregationRouterHelper is
         uint256 oldAmount,
         uint256 newAmount
     ) internal pure returns (bytes memory, uint256) {
-        IMultihopRouter.UniSwap memory kyberDMMSwap = abi.decode(data, (IMultihopRouter.UniSwap));
+        IMultihopRouterEthereum.UniSwap memory kyberDMMSwap = abi.decode(
+            data,
+            (IMultihopRouterEthereum.UniSwap)
+        );
         if (value > 0) kyberDMMSwap.collectAmount = value;
         else kyberDMMSwap.collectAmount = (kyberDMMSwap.collectAmount * newAmount) / oldAmount;
         return (abi.encode(kyberDMMSwap), kyberDMMSwap.collectAmount);
@@ -267,9 +275,9 @@ contract AggregationRouterHelper is
         uint256 oldAmount,
         uint256 newAmount
     ) internal pure returns (bytes memory, uint256) {
-        IMultihopRouter.UniSwapV3ProMM memory uniSwapV3ProMM = abi.decode(
+        IMultihopRouterEthereum.UniSwapV3ProMM memory uniSwapV3ProMM = abi.decode(
             data,
-            (IMultihopRouter.UniSwapV3ProMM)
+            (IMultihopRouterEthereum.UniSwapV3ProMM)
         );
         if (value > 0) uniSwapV3ProMM.swapAmount = value;
         else uniSwapV3ProMM.swapAmount = (uniSwapV3ProMM.swapAmount * newAmount) / oldAmount;
@@ -282,9 +290,9 @@ contract AggregationRouterHelper is
         uint256 oldAmount,
         uint256 newAmount
     ) internal pure returns (bytes memory, uint256) {
-        IMultihopRouter.BalancerV2 memory balancerV2 = abi.decode(
+        IMultihopRouterEthereum.BalancerV2 memory balancerV2 = abi.decode(
             data,
-            (IMultihopRouter.BalancerV2)
+            (IMultihopRouterEthereum.BalancerV2)
         );
         if (value > 0) balancerV2.amount = value;
         else balancerV2.amount = (balancerV2.amount * newAmount) / oldAmount;
@@ -297,21 +305,27 @@ contract AggregationRouterHelper is
         uint256 oldAmount,
         uint256 newAmount
     ) internal pure returns (bytes memory, uint256) {
-        IMultihopRouter.DODO memory dodo = abi.decode(data, (IMultihopRouter.DODO));
+        IMultihopRouterEthereum.DODO memory dodo = abi.decode(
+            data,
+            (IMultihopRouterEthereum.DODO)
+        );
         if (value > 0) dodo.amount = value;
         else dodo.amount = (dodo.amount * newAmount) / oldAmount;
         return (abi.encode(dodo), dodo.amount);
     }
 
-    function _newVelodromeSwap(
+    function _newWrappedstETHSwap(
         bytes memory data,
         uint256 value,
         uint256 oldAmount,
         uint256 newAmount
     ) internal pure returns (bytes memory, uint256) {
-        IMultihopRouter.UniSwap memory velodrome = abi.decode(data, (IMultihopRouter.UniSwap));
-        if (value > 0) velodrome.collectAmount = value;
-        else velodrome.collectAmount = (velodrome.collectAmount * newAmount) / oldAmount;
-        return (abi.encode(velodrome), velodrome.collectAmount);
+        IMultihopRouterEthereum.WSTETH memory wstEthData = abi.decode(
+            data,
+            (IMultihopRouterEthereum.WSTETH)
+        );
+        if (value > 0) wstEthData.amount = value;
+        else wstEthData.amount = (wstEthData.amount * newAmount) / oldAmount;
+        return (abi.encode(wstEthData), wstEthData.amount);
     }
 }

package/contracts/router/kyberswap/{IMultihopRouter.sol → IMultihopRouterEthereum.sol}

@@ -1,10 +1,8 @@
-// SPDX-License-Identifier: GPL-3.0-or-later
+// SPDX-License-Identifier: MIT
 
-pragma solidity >=0.7.6;
+pragma solidity 0.8.17;
 
-pragma abicoder v2;
-
-interface IMultihopRouter {
+interface IMultihopRouterEthereum {
     enum DexType {
         UNI,
         STABLESWAP,
@@ -15,8 +13,7 @@ interface IMultihopRouter {
         BALANCERV2,
         KYBERRFQ,
         DODO,
-        VELODROME,
-        PLATYPUS
+        WSTETH
     }
 
     event Exchange(address pair, uint256 amountOut, address output);
@@ -32,13 +29,18 @@ interface IMultihopRouter {
         //  6: balancerv2
         //  7: kyber RFQ
         //  8: dodo
-        //  9: velodrome
-        //  10: platypus
+        //  9: wstETH: Lido wrapped stETH
         //dexId:
         //  0: firebird
         uint16 dexOption; //dexType(8bit) + dexId(8bit)
     }
 
+    struct WSTETH {
+        address pool;
+        uint256 amount;
+        bool isWrapping;
+    }
+
     struct UniSwap {
         address pool;
         address tokenIn;

package/deployments/1-markets/APE-JUNE-29.json

@@ -0,0 +1,8 @@
+{
+    "name": "sAPE",
+    "SY": "0x47BA20283Be4d72D4AFB1862994F4203551539C5",
+    "YT": "0x9523F7e527f8AE884DFb0a38F611AA7417Fd2845",
+    "PT": "0x2CF5Eb8dB83C9752125D5d961C4C9DfaA9178d1A",
+    "market": "0x9A76925dD91A7561b58D8353f0bcE4DF1e517aBb",
+    "expiry": 1687996800
+}

package/deployments/80001-core.json

@@ -0,0 +1,28 @@
+{
+    "deployer": "0x1FcCC097db89A86Bfc474A1028F93958295b1Fb7",
+    "network": {
+        "chainId": 80001,
+        "treasury": "0x7D301Cc4F91A9eDd8EDE1801344bd6516b5FA3d2",
+        "governance": "0x1FcCC097db89A86Bfc474A1028F93958295b1Fb7",
+        "pendle": "0xa6dc67fF3b241DEdeC6aF907Ff24bB5cFC3EEeAf",
+        "lzEndpoint": "0xf69186dfBa60DdB133E91E9A4B5673624293d8F8",
+        "wrappedNative": "0x9c3C9283D3e44854697Cd22D3Faa240Cfb032889",
+        "initialRewardFee": "30000000000000000",
+        "initialInterestFee": "30000000000000000",
+        "initialFeeRateRoot": "999500333083533",
+        "initialReserveFeePercent": "80",
+        "initialPendlePerSec": "826719576719576719",
+        "safeWaitTime": 15000
+    },
+    "baseCodeSplitter": "0xc5E332F1c3123E66C0b1bf0dFb9Cb4BA86a175C9",
+    "PENDLE": "0xa6dc67fF3b241DEdeC6aF907Ff24bB5cFC3EEeAf",
+    "yieldContractFactory": "0x8091897bE27CC11d80De8F48049168C9C7A5B1aC",
+    "marketFactory": "0xeB2AEd0aE414c76e4f9D4d43cD01064Fec010dfB",
+    "bulkSellerFactory": "0x4707f0CC2Ad4211172EdBAFc453E60DBd1C9D854",
+    "bulkSellerOffchain": "0x7Fb3626D95449d69f991a37e304b8C9A0a5D0e0c",
+    "router": "0x5141Ad90AafB0D45e9F19Bd9F861362d56f2CF79",
+    "routerStatic": "0xc7F8F9F1DdE1104664b6fC8F33E49b169C12F41E",
+    "receiverEndpoint": "0x256752c851EDB92c97377C93232A9034c835F376",
+    "vePendle": "0xC0BC61112D9fD7bA5809047a86EC245593BA0e1E",
+    "gaugeController": "0x9aBcB6a79dD8de67FB41108493787533775d98d3"
+}