fix: determine desired amounts before LPing (#384)

* calc amount to mint * fix * fix * fix * fix * refactor
opynfinance · Apr 29, 2022 · 4394326 · 4394326
1 parent a4c7a7c
commit 4394326
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 3 deletions.
diff --git a/packages/hardhat/contracts/periphery/ControllerHelper.sol b/packages/hardhat/contracts/periphery/ControllerHelper.sol
@@ -245,7 +245,6 @@ contract ControllerHelper is UniswapControllerHelper, EulerControllerHelper, IER
         (uint256 vaultId, ) = ControllerHelperUtil.mintAndLp(
             ControllerHelperDiamondStorage.getAddressAtSlot(0),
             ControllerHelperDiamondStorage.getAddressAtSlot(6),
-            ControllerHelperDiamondStorage.getAddressAtSlot(4),
             ControllerHelperDiamondStorage.getAddressAtSlot(3),
             ControllerHelperDiamondStorage.getAddressAtSlot(5),
             _params,
@@ -484,7 +483,6 @@ contract ControllerHelper is UniswapControllerHelper, EulerControllerHelper, IER
             (uint256 vaultId, uint256 uniTokenId) = ControllerHelperUtil.mintAndLp(
                 ControllerHelperDiamondStorage.getAddressAtSlot(0),
                 ControllerHelperDiamondStorage.getAddressAtSlot(6),
-                ControllerHelperDiamondStorage.getAddressAtSlot(4),
                 ControllerHelperDiamondStorage.getAddressAtSlot(3),
                 ControllerHelperDiamondStorage.getAddressAtSlot(5),
                 ControllerHelperDataType.MintAndLpParams({

diff --git a/packages/hardhat/contracts/periphery/lib/ControllerHelperUtil.sol b/packages/hardhat/contracts/periphery/lib/ControllerHelperUtil.sol
@@ -93,7 +93,7 @@ library ControllerHelperUtil {
      * @param _isWethToken0 bool variable indicate if Weth token is token0 in Uniswap v3 weth/wPowerPerp pool
      * @return _vaultId and tokenId
      */
-    function mintAndLp(address _controller, address _nonfungiblePositionManager, address _wPowerPerp, address _wPowerPerpPool, address _weth, ControllerHelperDataType.MintAndLpParams calldata _mintAndLpParams, bool _isWethToken0) public returns (uint256, uint256) {
+    function mintAndLp(address _controller, address _nonfungiblePositionManager, address _wPowerPerpPool, address _weth, ControllerHelperDataType.MintAndLpParams calldata _mintAndLpParams, bool _isWethToken0) public returns (uint256, uint256) {
         IWETH9(_weth).withdraw(_mintAndLpParams.collateralToDeposit);
 
         (uint256 amount0Desired, uint256 amount1Desired) = getAmountsToLp(_wPowerPerpPool, _mintAndLpParams.collateralToLp, _mintAndLpParams.wPowerPerpAmount, _mintAndLpParams.lowerTick, _mintAndLpParams.upperTick, _isWethToken0);