GUniPool to ArrakisVaultV1

Author: zishansami102

contracts/interfaces/external/IGUniPool.sol renamed to contracts/interfaces/external/IArrakisVaultV1.sol

@@ -22,7 +22,7 @@ import {
     IUniswapV3Pool
 } from "@uniswap/v3-core/contracts/interfaces/IUniswapV3Pool.sol";
 
-interface IGUniPool {
+interface IArrakisVaultV1 {
     function mint(uint256 mintAmount, address receiver)
         external
         returns (
@@ -52,6 +52,11 @@ interface IGUniPool {
         external
         view
         returns (uint256 amount0, uint256 amount1);
+    
+    function getUnderlyingBalancesAtPrice(uint160 sqrtRatioX96)
+        external
+        view
+        returns (uint256 amount0Current, uint256 amount1Current);
 
     function getPositionID() external view returns (bytes32 positionID);
 
@@ -68,4 +73,14 @@ interface IGUniPool {
     function totalSupply() external view returns (uint256);
 
     function balanceOf(address account) external view returns (uint256);
+
+    function executiveRebalance(
+        int24 newLowerTick,
+        int24 newUpperTick,
+        uint160 swapThresholdPrice,
+        uint256 swapAmountBPS,
+        bool zeroForOne
+    ) external;
+
+    function withdrawManagerBalance() external;
 }

contracts/protocol/integration/amm/ArrakisUniswapV3AmmAdapter.sol

@@ -19,7 +19,7 @@
 pragma solidity 0.6.10;
 
 import "../../../interfaces/IAmmAdapter.sol";
-import "../../../interfaces/external/IGUniPool.sol";
+import "../../../interfaces/external/IArrakisVaultV1.sol";
 import "@openzeppelin/contracts/math/SafeMath.sol";
 import { IERC20 } from "@openzeppelin/contracts/token/ERC20/IERC20.sol";
 import "@uniswap/v3-core/contracts/interfaces/IUniswapV3Pool.sol";
@@ -90,7 +90,7 @@ contract ArrakisUniswapV3AmmAdapter is IAmmAdapter {
 
         require(maxTokensIn[0] > 0 && maxTokensIn[1] > 0, "Component quantity must be nonzero");
 
-        IGUniPool arrakisVaultPool = IGUniPool(_pool);
+        IArrakisVaultV1 arrakisVaultPool = IArrakisVaultV1(_pool);
 
         (uint256 amountAMin, uint256 amountBMin, uint256 liquidityExpectedFromSuppliedTokens) = arrakisVaultPool.getMintAmounts(maxTokensIn[0], maxTokensIn[1]);
 
@@ -153,7 +153,7 @@ contract ArrakisUniswapV3AmmAdapter is IAmmAdapter {
         address setToken = _setToken;
         uint256[] memory minTokensOut = _minTokensOut;
         uint256 liquidity = _liquidity;
-        IGUniPool arrakisVaultPool = IGUniPool(_pool);
+        IArrakisVaultV1 arrakisVaultPool = IArrakisVaultV1(_pool);
 
         // Make sure that only up to the amount of liquidity tokens owned by the Set Token are redeemed
         uint256 setTokenLiquidityBalance = arrakisVaultPool.balanceOf(setToken);
@@ -218,12 +218,12 @@ contract ArrakisUniswapV3AmmAdapter is IAmmAdapter {
         // Attempt to get the tokens of the provided pool
         address token0;
         address token1;
-        try IGUniPool(_pool).token0() returns (IERC20 _token0) {
+        try IArrakisVaultV1(_pool).token0() returns (IERC20 _token0) {
             token0 = address(_token0);
         } catch {
             return false;
         }
-        try IGUniPool(_pool).token1() returns (IERC20 _token1) {
+        try IArrakisVaultV1(_pool).token1() returns (IERC20 _token1) {
             token1 = address(_token1);
         } catch {
             return false;
@@ -241,7 +241,7 @@ contract ArrakisUniswapV3AmmAdapter is IAmmAdapter {
 
         // Attempt to get the UniswapV3 pool in the provided Arrakis pool
         IUniswapV3Pool uniV3PairPool;
-        try IGUniPool(_pool).pool() returns (IUniswapV3Pool _uniV3PairPool) {
+        try IArrakisVaultV1(_pool).pool() returns (IUniswapV3Pool _uniV3PairPool) {
             uniV3PairPool = _uniV3PairPool;
         } catch {
             return false;