@pendle/core-v2 0.16.6-testnet → 0.17.0-daily

package/contracts/router/ActionSwapYT.sol

@@ -7,6 +7,7 @@ import "../interfaces/IPActionSwapYT.sol";
 import "../interfaces/IPMarket.sol";
 import "../core/libraries/Errors.sol";
 
+/// @dev All swap actions will revert if market is expired
 contract ActionSwapYT is IPActionSwapYT, ActionBaseMintRedeem, CallbackHelper {
     using Math for uint256;
     using Math for int256;
@@ -21,14 +22,16 @@ contract ActionSwapYT is IPActionSwapYT, ActionBaseMintRedeem, CallbackHelper {
     {}
 
     /**
-    * @notice swap exact SY to YT with the help of flashswaps & YT tokenization / redemption
-    * @dev inner working of this function:
+     * @notice swap exact SY to YT with the help of flashswaps & YT tokenization / redemption
+     * @dev inner working of this function:
      - `exactSyIn` SY is transferred to YT contract
-     - `market.swapExactPtForSy` is called, which will transfer SY directly to YT contract & callback is invoked.
-        Note that now we owe PT
-     - in callback, all SY in YT contract is used to mint PT + YT, with PT used to pay back the loan, and YT
-        transferred to the receiver
-    * @dev this function works in conjunction with ActionCallback
+     - `market.swapExactPtForSy` is called, which will transfer more SY directly to YT contract & 
+       callback is invoked. Note that now we owe PT
+     - in callback, all SY in YT contract is used to mint PT + YT, with all PT used to pay back the 
+       loan, and all YT transferred to the receiver
+     * @param exactSyIn will always consume this amount of SY for as much YT as possible
+     * @param guessYtOut approximation data for total YT output
+     * @dev this function works in conjunction with ActionCallback
      */
     function swapExactSyForYt(
         address receiver,
@@ -54,14 +57,15 @@ contract ActionSwapYT is IPActionSwapYT, ActionBaseMintRedeem, CallbackHelper {
     }
 
     /**
-    * @notice swap exact YT to SY with the help of flashswaps & YT tokenization / redemption
-    * @dev inner working of this function:
+     * @notice swap exact YT to SY with the help of flashswaps & YT tokenization / redemption
+     * @dev inner working of this function:
      - `exactYtIn` YT is transferred to YT contract
-     - `market.swapSyForExactPt` is called, which will transfer PT directly to YT contract & callback is invoked.
-        Note that now we owe SY
-     - in callback, all PT + YT in YT contract is used to redeem SY. A portion of SY is used to payback the loan,
-        the rest is transferred to the `receiver`
-    * @dev this function works in conjunction with ActionCallback
+     - `market.swapSyForExactPt` is called, which will transfer PT directly to YT contract & 
+       callback is invoked. Note that now we owe SY.
+     - In callback, all PT + YT in YT contract is used to redeem SY. A portion of SY is used to 
+       payback the loan, the rest is transferred to the `receiver`
+     * @param exactYtIn will consume exactly this much YT for as much SY as possible
+     * @dev this function works in conjunction with ActionCallback
      */
     function swapExactYtForSy(
         address receiver,
@@ -79,13 +83,14 @@ contract ActionSwapYT is IPActionSwapYT, ActionBaseMintRedeem, CallbackHelper {
     }
 
     /**
-    * @notice swap SY to exact YT with the help of flashswaps & YT tokenization / redemption
-    * @dev inner working of this function:
-     - `market.swapExactPtForSy` is called, which will transfer SY directly to YT contract & callback is invoked.
-        Note that now we owe PT
-     - in callback, we will pull in more SY as needed & mint all SY to PT + YT. PT is then used to payback the loan
-        while YT is transferred to the user
-    * @dev this function works in conjunction with ActionCallback
+     * @notice swap SY to exact YT with the help of flashswaps & YT tokenization / redemption
+     * @dev inner working of this function:
+     - `market.swapExactPtForSy` is called, which will transfer SY directly to YT contract & 
+       callback is invoked. Note that now we owe PT
+     - In callback, we will pull in more SY as needed from caller & mint all SY to PT + YT. PT is 
+       then used to payback the loan, while YT is transferred to `receiver`
+     * @param exactYtOut will output exactly this amount of YT, no approximation is used
+     * @dev this function works in conjunction with ActionCallback
      */
     function swapSyForExactYt(
         address receiver,
@@ -109,14 +114,15 @@ contract ActionSwapYT is IPActionSwapYT, ActionBaseMintRedeem, CallbackHelper {
     }
 
     /**
-    * @notice swap YT to exact SY with the help of flashswaps & YT tokenization / redemption
-    * @dev inner working of this function:
-     - transfer netYtIn (received from approx function) to YT contract
-     - `market.swapSyForExactPt` is called, which will transfer PT directly to YT contract & callback is invoked.
-        Note that now we owe SY
-     - in callback, we will redeem all PT + YT to get SY. A portion of it is used to payback the loan. The rest is
-        transferred to `receiver`
-    * @dev this function works in conjunction with ActionCallback
+     * @notice swap YT to exact SY with the help of flashswaps & YT tokenization / redemption
+     * @dev inner working of this function:
+     - Approximates `netYtIn` using the data from `guessYtIn`
+     - Pulls `netYtIn` amount of YT from caller
+     - `market.swapSyForExactPt` is called, which will transfer PT directly to YT contract & 
+       callback is invoked. Note that now we owe SY
+     - In callback, we will redeem all PT + YT to get SY. A portion of it is used to payback the 
+       loan. The rest is transferred to `receiver`
+     * @dev this function works in conjunction with ActionCallback
      */
     function swapYtForExactSy(
         address receiver,
@@ -125,7 +131,7 @@ contract ActionSwapYT is IPActionSwapYT, ActionBaseMintRedeem, CallbackHelper {
         uint256 maxYtIn,
         ApproxParams memory guessYtIn
     ) external returns (uint256 netYtIn, uint256 netSyFee) {
-        MarketState memory state = IPMarket(market).readState();
+        MarketState memory state = IPMarket(market).readState(address(this));
         (, , IPYieldToken YT) = IPMarket(market).readTokens();
 
         (netYtIn, , ) = state.approxSwapYtForExactSy(
@@ -148,6 +154,11 @@ contract ActionSwapYT is IPActionSwapYT, ActionBaseMintRedeem, CallbackHelper {
         emit SwapYtAndSy(msg.sender, market, receiver, netYtIn.neg(), exactSyOut.Int());
     }
 
+    /**
+     * @notice swaps any token to YT
+     * @dev this function swaps token for SY-mintable token first through Kyberswap, then mints SY
+     * from such, finally swaps SY to YT (see `swapSyForExactYt()`)
+     */
     function swapExactTokenForYt(
         address receiver,
         address market,
@@ -171,13 +182,18 @@ contract ActionSwapYT is IPActionSwapYT, ActionBaseMintRedeem, CallbackHelper {
         emit SwapYtAndToken(
             msg.sender,
             market,
-            receiver,
             input.tokenIn,
+            receiver,
             netYtOut.Int(),
             input.netTokenIn.neg()
         );
     }
 
+    /**
+     * @notice swaps YT to a given token
+     * @dev the function first swaps YT to SY (see `swapExactYtForSy()`), then redeems SY,
+     * finally swaps resulting tokens to desired output token using Kyberswap
+     */
     function swapExactYtForToken(
         address receiver,
         address market,
@@ -204,8 +220,8 @@ contract ActionSwapYT is IPActionSwapYT, ActionBaseMintRedeem, CallbackHelper {
         emit SwapYtAndToken(
             msg.sender,
             market,
-            receiver,
             output.tokenOut,
+            receiver,
             netYtIn.neg(),
             netTokenOut.Int()
         );
@@ -219,7 +235,7 @@ contract ActionSwapYT is IPActionSwapYT, ActionBaseMintRedeem, CallbackHelper {
         uint256 minYtOut,
         ApproxParams memory guessYtOut
     ) internal returns (uint256 netYtOut, uint256 netSyFee) {
-        MarketState memory state = IPMarket(market).readState();
+        MarketState memory state = IPMarket(market).readState(address(this));
 
         (netYtOut, ) = state.approxSwapExactSyForYt(
             YT.newIndex(),

package/contracts/router/PendleRouter.sol

@@ -5,7 +5,6 @@ import "@openzeppelin/contracts/proxy/utils/UUPSUpgradeable.sol";
 import "@openzeppelin/contracts/proxy/Proxy.sol";
 import "../interfaces/IPAllAction.sol";
 import "../interfaces/IPMarketSwapCallback.sol";
-import "../core/libraries/BoringOwnableUpgradeable.sol";
 import "../core/libraries/Errors.sol";
 
 /// @dev this contract will be deployed behind an ERC1967 proxy
@@ -13,7 +12,7 @@ import "../core/libraries/Errors.sol";
 /// corresponding implementation contracts
 
 // solhint-disable no-empty-blocks
-contract PendleRouter is Proxy, Initializable, UUPSUpgradeable, BoringOwnableUpgradeable {
+contract PendleRouter is Proxy {
     address public immutable ACTION_MINT_REDEEM;
     address public immutable ACTION_ADD_REMOVE_LIQ;
     address public immutable ACTION_SWAP_PT;
@@ -30,7 +29,7 @@ contract PendleRouter is Proxy, Initializable, UUPSUpgradeable, BoringOwnableUpg
         address _ACTION_SWAP_PTYT,
         address _ACTION_CALLBACK,
         address _ACTION_MISC
-    ) initializer {
+    ) {
         ACTION_MINT_REDEEM = _ACTION_MINT_REDEEM;
         ACTION_ADD_REMOVE_LIQ = _ACTION_ADD_REMOVE_LIQ;
         ACTION_SWAP_PT = _ACTION_SWAP_PT;
@@ -40,12 +39,7 @@ contract PendleRouter is Proxy, Initializable, UUPSUpgradeable, BoringOwnableUpg
         ACTION_MISC = _ACTION_MISC;
     }
 
-    receive() external payable virtual override {
-    }
-
-    function initialize() external initializer {
-        __BoringOwnable_init();
-    }
+    receive() external payable virtual override {}
 
     function getRouterImplementation(bytes4 sig) public view returns (address) {
         if (
@@ -103,8 +97,6 @@ contract PendleRouter is Proxy, Initializable, UUPSUpgradeable, BoringOwnableUpg
         revert Errors.RouterInvalidAction(sig);
     }
 
-    function _authorizeUpgrade(address newImplementation) internal override onlyOwner {}
-
     function _implementation() internal view override returns (address) {
         return getRouterImplementation(msg.sig);
     }

package/contracts/router/base/MarketApproxLib.sol

@@ -24,7 +24,8 @@ struct ApproxParams {
 
     /// for guessOffchain, this is to provide a shortcut to guessing. The offchain SDK can precalculate the exact result
     /// before the tx is sent. When the tx reaches the contract, the guessOffchain will be checked first, and if it satisfies the
-    /// approximation, it will be used (and save all the guessing).
+    /// approximation, it will be used (and save all the guessing). It's expected that this shortcut will be used in most cases
+    /// except in cases that there is a trade in the same market right before the tx
 }
 
 library MarketApproxPtInLib {
@@ -84,7 +85,7 @@ library MarketApproxPtInLib {
                 continue;
             }
 
-            (uint256 netSyOut, uint256 netSyFee) = calcSyOut(a.market, comp, a.index, guess);
+            (uint256 netSyOut, uint256 netSyFee, ) = calcSyOut(a.market, comp, a.index, guess);
 
             if (netSyOut >= a.minSyOut) {
                 p.guessMax = guess;
@@ -146,7 +147,7 @@ library MarketApproxPtInLib {
                 continue;
             }
 
-            (uint256 netSyOut, uint256 netSyFee) = calcSyOut(a.market, comp, a.index, guess);
+            (uint256 netSyOut, uint256 netSyFee, ) = calcSyOut(a.market, comp, a.index, guess);
 
             uint256 maxPtPayable = a.index.syToAsset(netSyOut + a.exactSyIn);
 
@@ -155,7 +156,7 @@ library MarketApproxPtInLib {
                 bool isAnswerAccepted = Math.isASmallerApproxB(guess, maxPtPayable, p.eps);
                 if (isAnswerAccepted) return (guess, netSyFee);
             } else {
-                p.guessMax = guess;
+                p.guessMax = guess - 1;
             }
         }
         revert Errors.ApproxFail();
@@ -211,14 +212,18 @@ library MarketApproxPtInLib {
                 continue;
             }
 
-            (uint256 netSyOut, uint256 netSyFee) = calcSyOut(a.market, comp, a.index, guess);
+            (uint256 netSyOut, uint256 netSyFee, uint256 netSyToReserve) = calcSyOut(
+                a.market,
+                comp,
+                a.index,
+                guess
+            );
 
             uint256 syNumerator;
             uint256 ptNumerator;
             {
                 uint256 newTotalPt = a.market.totalPt.Uint() + guess;
-                uint256 netPtRemaining = a.totalPtIn - guess;
-                uint256 newTotalSy = (a.market.totalSy.Uint() - netSyOut - netSyFee);
+                uint256 newTotalSy = (a.market.totalSy.Uint() - netSyOut - netSyToReserve);
 
                 // it is desired that
                 // netSyOut / newTotalSy = netPtRemaining / newTotalPt
@@ -226,7 +231,7 @@ library MarketApproxPtInLib {
                 // netSyOut * newTotalPt = netPtRemaining * newTotalSy
 
                 syNumerator = netSyOut * newTotalPt;
-                ptNumerator = netPtRemaining * newTotalSy;
+                ptNumerator = (a.totalPtIn - guess) * newTotalSy;
             }
 
             if (Math.isAApproxB(syNumerator, ptNumerator, p.eps)) {
@@ -292,7 +297,7 @@ library MarketApproxPtInLib {
                 continue;
             }
 
-            (uint256 netSyOut, uint256 netSyFee) = calcSyOut(a.market, comp, a.index, guess);
+            (uint256 netSyOut, uint256 netSyFee, ) = calcSyOut(a.market, comp, a.index, guess);
 
             uint256 netAssetOut = a.index.syToAsset(netSyOut);
 
@@ -316,10 +321,23 @@ library MarketApproxPtInLib {
         MarketPreCompute memory comp,
         PYIndex index,
         uint256 netPtIn
-    ) internal pure returns (uint256 netSyOut, uint256 netSyFee) {
-        (int256 _netSyOut, int256 _netSyFee) = market.calcTrade(comp, index, netPtIn.neg());
+    )
+        internal
+        pure
+        returns (
+            uint256 netSyOut,
+            uint256 netSyFee,
+            uint256 netSyToReserve
+        )
+    {
+        (int256 _netSyOut, int256 _netSyFee, int256 _netSyToReserve) = market.calcTrade(
+            comp,
+            index,
+            netPtIn.neg()
+        );
         netSyOut = _netSyOut.Uint();
         netSyFee = _netSyFee.Uint();
+        netSyToReserve = _netSyToReserve.Uint();
     }
 
     function newApproxParamsPtIn(
@@ -447,7 +465,7 @@ library MarketApproxPtOutLib {
         for (uint256 iter = 0; iter < p.maxIteration; ++iter) {
             uint256 guess = nextGuess(p, iter);
 
-            (uint256 netSyIn, uint256 netSyFee) = calcSyIn(a.market, comp, a.index, guess);
+            (uint256 netSyIn, uint256 netSyFee, ) = calcSyIn(a.market, comp, a.index, guess);
 
             if (netSyIn <= a.exactSyIn) {
                 p.guessMin = guess;
@@ -502,7 +520,7 @@ library MarketApproxPtOutLib {
         for (uint256 iter = 0; iter < p.maxIteration; ++iter) {
             uint256 guess = nextGuess(p, iter);
 
-            (uint256 netSyOwed, uint256 netSyFee) = calcSyIn(a.market, comp, a.index, guess);
+            (uint256 netSyOwed, uint256 netSyFee, ) = calcSyIn(a.market, comp, a.index, guess);
 
             uint256 netAssetToRepay = a.index.syToAssetUp(netSyOwed);
             uint256 netSyOut = a.index.assetToSy(guess - netAssetToRepay);
@@ -562,7 +580,12 @@ library MarketApproxPtOutLib {
         for (uint256 iter = 0; iter < p.maxIteration; ++iter) {
             uint256 guess = nextGuess(p, iter);
 
-            (uint256 netSyIn, uint256 netSyFee) = calcSyIn(a.market, comp, a.index, guess);
+            (uint256 netSyIn, uint256 netSyFee, uint256 netSyToReserve) = calcSyIn(
+                a.market,
+                comp,
+                a.index,
+                guess
+            );
 
             if (netSyIn > a.totalSyIn) {
                 p.guessMax = guess - 1;
@@ -573,9 +596,8 @@ library MarketApproxPtOutLib {
             uint256 ptNumerator;
 
             {
-                uint256 netSyRemaining = a.totalSyIn - netSyIn;
                 uint256 newTotalPt = a.market.totalPt.Uint() - guess;
-                uint256 netTotalSy = a.market.totalSy.Uint() + netSyIn - netSyFee;
+                uint256 netTotalSy = a.market.totalSy.Uint() + netSyIn - netSyToReserve;
 
                 // it is desired that
                 // netPtFromSwap / newTotalPt = netSyRemaining / netTotalSy
@@ -583,7 +605,7 @@ library MarketApproxPtOutLib {
                 // netPtFromSwap * netTotalSy = netSyRemaining * newTotalPt
 
                 ptNumerator = guess * netTotalSy;
-                syNumerator = netSyRemaining * newTotalPt;
+                syNumerator = (a.totalSyIn - netSyIn) * newTotalPt;
             }
 
             if (Math.isAApproxB(ptNumerator, syNumerator, p.eps)) {
@@ -650,7 +672,7 @@ library MarketApproxPtOutLib {
         for (uint256 iter = 0; iter < p.maxIteration; ++iter) {
             uint256 guess = nextGuess(p, iter);
 
-            (uint256 netSyOwed, uint256 netSyFee) = calcSyIn(a.market, comp, a.index, guess);
+            (uint256 netSyOwed, uint256 netSyFee, ) = calcSyIn(a.market, comp, a.index, guess);
 
             if (netSyOwed <= a.maxSyPayable) {
                 p.guessMin = guess;
@@ -671,11 +693,24 @@ library MarketApproxPtOutLib {
         MarketPreCompute memory comp,
         PYIndex index,
         uint256 netPtOut
-    ) internal pure returns (uint256 netSyIn, uint256 netSyFee) {
-        (int256 _netSyIn, int256 _netSyFee) = market.calcTrade(comp, index, netPtOut.Int());
+    )
+        internal
+        pure
+        returns (
+            uint256 netSyIn,
+            uint256 netSyFee,
+            uint256 netSyToReserve
+        )
+    {
+        (int256 _netSyIn, int256 _netSyFee, int256 _netSyToReserve) = market.calcTrade(
+            comp,
+            index,
+            netPtOut.Int()
+        );
 
         netSyIn = _netSyIn.abs();
         netSyFee = _netSyFee.Uint();
+        netSyToReserve = _netSyToReserve.Uint();
     }
 
     function newApproxParamsPtOut(
@@ -690,7 +725,12 @@ library MarketApproxPtOutLib {
         res.guessMax = Math.min(_approx.guessMax, maxGuessMax);
 
         if (res.guessMin > res.guessMax)
-            revert Errors.ApproxBinarySearchInputInvalid(_approx.guessMin, _approx.guessMax, minGuessMin, maxGuessMax);
+            revert Errors.ApproxBinarySearchInputInvalid(
+                _approx.guessMin,
+                _approx.guessMax,
+                minGuessMin,
+                maxGuessMax
+            );
 
         res.guessOffchain = _approx.guessOffchain;
         res.maxIteration = _approx.maxIteration;

package/deployments/43113-core.json

@@ -1,17 +1,22 @@
 {
     "deployer": "0x1FcCC097db89A86Bfc474A1028F93958295b1Fb7",
-    "network": 43113,
-    "splitter": "0x81357A3D4F023745a518E4F07b8714e141f84E0a",
-    "lzEndpoint": "0x93f54D755A063cE7bB9e6Ac47Eccc8e33411d706",
-    "treasury": "0x243b7CFD29AcAF9cDe98C1958902FAA3B1F095D5",
-    "PENDLE": "0xB7609dec1C926204c3B67345cbCd54bc4aa7a940",
-    "yieldContractFactory": "0xC39Efc7bb273B75B75471167Cb0EB4D3D41398a8",
-    "marketFactory": "0xa28B2445C8e1751733e75e6794971AEEA4806F45",
-    "bulkSellerFactory": "0x9f45D5A34CC9Bcb3AB4ee464bE768E30B5e627f8",
-    "router": "0x129be7922B733b0F06cb4f0f47B6b4a12710a312",
-    "routerStatic": "0x699665c3fA37FF59cACd913EAaB56CEFA66C339E",
-    "vePendle": "0x74E578b27aD53f23387b9Dcb7902F7Def6D4dB7c",
-    "senderEndpoint": "0xa87c479d77040d1c5433b9cD3b88b2B562A7cb10",
-    "votingController": "0x0b24c845feF83f8403EEF3922F3B53a05182512A",
-    "gaugeController": "0xf0cFb8781F17d51523922Ace5eB69a4b42e35a15"
+    "network": {
+        "chainId": 43113,
+        "treasury": "0x243b7CFD29AcAF9cDe98C1958902FAA3B1F095D5",
+        "governance": "0x1FcCC097db89A86Bfc474A1028F93958295b1Fb7",
+        "pendle": "0x808507121b80c02388fad14726482e061b8da827",
+        "lzEndpoint": "0x93f54D755A063cE7bB9e6Ac47Eccc8e33411d706",
+        "wrappedNative": "0xe43a7aD7C09d8fAE3ADe7361f0b847b23adD5094"
+    },
+    "splitter": "0x4B3B9f8f65E1c3fde4073874c2C93a1760F11035",
+    "PENDLE": "0x808507121b80c02388fad14726482e061b8da827",
+    "yieldContractFactory": "0xD3DC187247539380C3AAbFdb2D09c341910fFE83",
+    "marketFactory": "0x74D8b7eC36C0ff4157bD359B6D3Ab82a5d741B8E",
+    "bulkSellerFactory": "0x640bDc3daF9cFDb33CC67e46180A4E6c0495D0f4",
+    "router": "0x5334471de92CDBeB4245d3a3B1aF93b4DfDa8cC9",
+    "routerStatic": "0xd1dCaC6f75361A7C734863BC17B126EcB873192C",
+    "vePendle": "0x2d7e1Ab594E218eBd473bBE3aF57fAD5541F10f9",
+    "senderEndpoint": "0x33D7a94070A697E5CAe134A409ef42cfDba4F3b1",
+    "votingController": "0xdc8D6a5Db65287af491199244459e5C57d62f3f8",
+    "gaugeController": "0xd7D67E0b7DcF4665222809868512cAf6ac99C736"
 }

package/deployments/43113-markets/WETH-FEB-2ND.json

@@ -0,0 +1,10 @@
+{
+    "name": "SY Benqi WETH",
+    "SY": "0x5C90c945C0f7Ad4D8C3d1746185262bB9499eCF0",
+    "YT": "0xe85DFab309ED388d75E4C3665a77C73C6C0BA630",
+    "PT": "0x27DaeA7A12A9499F8065631756FEE5A9ACbd105a",
+    "market": "0x096206b71CA3610724F780B9af6c2D47938A345C",
+    "expiry": 1675382400,
+    "scalarRoot": "62000000000000000000",
+    "initAnchor": "1012600000000000000"
+}

package/deployments/43113-testenv.json

@@ -10,8 +10,7 @@
         "WETH": "0x1e2e40697603CA5b5ffc102c9D7A3310EA3f2Aa3",
         "qiUSDC": "0xEE3a174F1478198fBc669132B1e2cc13B5686F94",
         "qiWETH": "0xE5710EC5e4CeB255fb14d2c2BFC93E64d0c30A2c",
-        "qiAVAX": "0xf9aEd3b927dce44C6d53B334Cb759f4D230D9b9c",
-        "qiWBTC": "0xb847E93A481E50E6C289ff9559A8405aD225210B"
+        "qiAVAX": "0xf9aEd3b927dce44C6d53B334Cb759f4D230D9b9c"
     },
     "benqi": {
         "comptroller": "0x4Af3e9CA6f86E655C01f03C13519BcAF867286EE",

package/package.json

@@ -2,7 +2,7 @@
   "name": "@pendle/core-v2",
   "description": "Core smart contracts of Pendle Protocol.",
   "license": "BUSL-1.1",
-  "version": "0.16.6-testnet",
+  "version": "0.17.0-daily",
   "homepage": "https://pendle.finance",
   "keywords": [
     "pendle",
@@ -25,16 +25,16 @@
   "devDependencies": {
     "@typechain/ethers-v5": "^9.0.0",
     "@typechain/hardhat": "^4.0.0",
-    "hardhat": "^2.12.0",
+    "hardhat": "^2.12.2",
     "hardhat-contract-sizer": "^2.6.1",
     "hardhat-storage-layout-diff": "^0.0.4",
     "prettier": "^2.7.1",
-    "prettier-plugin-solidity": "^1.0.0-beta.24",
+    "prettier-plugin-solidity": "^1.0.0-rc.1",
     "solc": "^0.8.17",
     "solhint": "^3.3.7",
     "ts-node": "^10.9.1",
-    "typechain": "^8.1.0",
-    "typescript": "^4.8.4"
+    "typechain": "^8.1.1",
+    "typescript": "^4.9.3"
   },
   "scripts": {
     "compile": "yarn hardhat compile",
@@ -44,7 +44,7 @@
   },
   "packageManager": "yarn@3.2.2",
   "dependencies": {
-    "@openzeppelin/contracts": "^4.7.3",
-    "@openzeppelin/contracts-upgradeable": "^4.7.3"
+    "@openzeppelin/contracts": "4.7.3",
+    "@openzeppelin/contracts-upgradeable": "4.7.3"
   }
 }

package/typechain-types/ActionAddRemoveLiq.ts

@@ -208,7 +208,7 @@ export interface ActionAddRemoveLiqInterface extends utils.Interface {
     "AddLiquiditySingleSy(address,address,address,uint256,uint256)": EventFragment;
     "AddLiquiditySingleToken(address,address,address,address,uint256,uint256)": EventFragment;
     "RemoveLiquidityDualSyAndPt(address,address,address,uint256,uint256,uint256)": EventFragment;
-    "RemoveLiquidityDualTokenAndPt(address,address,address,uint256,uint256,address,uint256)": EventFragment;
+    "RemoveLiquidityDualTokenAndPt(address,address,address,address,uint256,uint256,uint256)": EventFragment;
     "RemoveLiquiditySinglePt(address,address,address,uint256,uint256)": EventFragment;
     "RemoveLiquiditySingleSy(address,address,address,uint256,uint256)": EventFragment;
     "RemoveLiquiditySingleToken(address,address,address,address,uint256,uint256)": EventFragment;
@@ -248,8 +248,8 @@ export type AddLiquidityDualTokenAndPtEvent = TypedEvent<
   {
     caller: string;
     market: string;
-    receiver: string;
     tokenIn: string;
+    receiver: string;
     netTokenUsed: BigNumber;
     netPtUsed: BigNumber;
     netLpOut: BigNumber;
@@ -318,14 +318,14 @@ export type RemoveLiquidityDualSyAndPtEventFilter =
   TypedEventFilter<RemoveLiquidityDualSyAndPtEvent>;
 
 export type RemoveLiquidityDualTokenAndPtEvent = TypedEvent<
-  [string, string, string, BigNumber, BigNumber, string, BigNumber],
+  [string, string, string, string, BigNumber, BigNumber, BigNumber],
   {
     caller: string;
     market: string;
+    tokenOut: string;
     receiver: string;
     netLpToRemove: BigNumber;
     netPtOut: BigNumber;
-    tokenOut: string;
     netTokenOut: BigNumber;
   }
 >;
@@ -474,7 +474,7 @@ export interface ActionAddRemoveLiq extends BaseContract {
       market: string,
       netLpToRemove: BigNumberish,
       minPtOut: BigNumberish,
-      guessPtOut: ApproxParamsStruct,
+      guessPtReceivedFromSy: ApproxParamsStruct,
       overrides?: Overrides & { from?: string | Promise<string> }
     ): Promise<ContractTransaction>;
 
@@ -565,7 +565,7 @@ export interface ActionAddRemoveLiq extends BaseContract {
     market: string,
     netLpToRemove: BigNumberish,
     minPtOut: BigNumberish,
-    guessPtOut: ApproxParamsStruct,
+    guessPtReceivedFromSy: ApproxParamsStruct,
     overrides?: Overrides & { from?: string | Promise<string> }
   ): Promise<ContractTransaction>;
 
@@ -678,7 +678,7 @@ export interface ActionAddRemoveLiq extends BaseContract {
       market: string,
       netLpToRemove: BigNumberish,
       minPtOut: BigNumberish,
-      guessPtOut: ApproxParamsStruct,
+      guessPtReceivedFromSy: ApproxParamsStruct,
       overrides?: CallOverrides
     ): Promise<
       [BigNumber, BigNumber] & { netPtOut: BigNumber; netSyFee: BigNumber }
@@ -726,8 +726,8 @@ export interface ActionAddRemoveLiq extends BaseContract {
     "AddLiquidityDualTokenAndPt(address,address,address,address,uint256,uint256,uint256)"(
       caller?: string | null,
       market?: string | null,
-      receiver?: string | null,
-      tokenIn?: null,
+      tokenIn?: string | null,
+      receiver?: null,
       netTokenUsed?: null,
       netPtUsed?: null,
       netLpOut?: null
@@ -735,8 +735,8 @@ export interface ActionAddRemoveLiq extends BaseContract {
     AddLiquidityDualTokenAndPt(
       caller?: string | null,
       market?: string | null,
-      receiver?: string | null,
-      tokenIn?: null,
+      tokenIn?: string | null,
+      receiver?: null,
       netTokenUsed?: null,
       netPtUsed?: null,
       netLpOut?: null
@@ -806,22 +806,22 @@ export interface ActionAddRemoveLiq extends BaseContract {
       netSyOut?: null
     ): RemoveLiquidityDualSyAndPtEventFilter;
 
-    "RemoveLiquidityDualTokenAndPt(address,address,address,uint256,uint256,address,uint256)"(
+    "RemoveLiquidityDualTokenAndPt(address,address,address,address,uint256,uint256,uint256)"(
       caller?: string | null,
       market?: string | null,
-      receiver?: string | null,
+      tokenOut?: string | null,
+      receiver?: null,
       netLpToRemove?: null,
       netPtOut?: null,
-      tokenOut?: null,
       netTokenOut?: null
     ): RemoveLiquidityDualTokenAndPtEventFilter;
     RemoveLiquidityDualTokenAndPt(
       caller?: string | null,
       market?: string | null,
-      receiver?: string | null,
+      tokenOut?: string | null,
+      receiver?: null,
       netLpToRemove?: null,
       netPtOut?: null,
-      tokenOut?: null,
       netTokenOut?: null
     ): RemoveLiquidityDualTokenAndPtEventFilter;
 
@@ -944,7 +944,7 @@ export interface ActionAddRemoveLiq extends BaseContract {
       market: string,
       netLpToRemove: BigNumberish,
       minPtOut: BigNumberish,
-      guessPtOut: ApproxParamsStruct,
+      guessPtReceivedFromSy: ApproxParamsStruct,
       overrides?: Overrides & { from?: string | Promise<string> }
     ): Promise<BigNumber>;
 
@@ -1036,7 +1036,7 @@ export interface ActionAddRemoveLiq extends BaseContract {
       market: string,
       netLpToRemove: BigNumberish,
       minPtOut: BigNumberish,
-      guessPtOut: ApproxParamsStruct,
+      guessPtReceivedFromSy: ApproxParamsStruct,
       overrides?: Overrides & { from?: string | Promise<string> }
     ): Promise<PopulatedTransaction>;