@dhedge/v2-sdk 1.10.5 → 1.10.7

package/dist/v2-sdk.esm.js

@@ -5,9 +5,9 @@ import { Token, Price } from '@uniswap/sdk-core';
 import { nearestUsableTick, TICK_SPACINGS, encodeSqrtRatioX96, TickMath, priceToClosestTick } from '@uniswap/v3-sdk';
 import JSBI from 'jsbi';
 import BigNumber from 'bignumber.js';
+import axios from 'axios';
 import 'lodash-es/set';
 import '@ethersproject/abi';
-import axios from 'axios';
 import { Token as Token$1, Pair, TokenAmount, Route, Trade, TradeType, Percent } from '@sushiswap/sdk';
 import { SwapTypes, SOR } from '@balancer-labs/sor';
 
@@ -146,6 +146,44 @@ function _assertThisInitialized(self) {
   return self;
 }
 
+function _unsupportedIterableToArray(o, minLen) {
+  if (!o) return;
+  if (typeof o === "string") return _arrayLikeToArray(o, minLen);
+  var n = Object.prototype.toString.call(o).slice(8, -1);
+  if (n === "Object" && o.constructor) n = o.constructor.name;
+  if (n === "Map" || n === "Set") return Array.from(o);
+  if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen);
+}
+
+function _arrayLikeToArray(arr, len) {
+  if (len == null || len > arr.length) len = arr.length;
+
+  for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i];
+
+  return arr2;
+}
+
+function _createForOfIteratorHelperLoose(o, allowArrayLike) {
+  var it = typeof Symbol !== "undefined" && o[Symbol.iterator] || o["@@iterator"];
+  if (it) return (it = it.call(o)).next.bind(it);
+
+  if (Array.isArray(o) || (it = _unsupportedIterableToArray(o)) || allowArrayLike && o && typeof o.length === "number") {
+    if (it) o = it;
+    var i = 0;
+    return function () {
+      if (i >= o.length) return {
+        done: true
+      };
+      return {
+        done: false,
+        value: o[i++]
+      };
+    };
+  }
+
+  throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method.");
+}
+
 function createCommonjsModule(fn, module) {
 	return module = { exports: {} }, fn(module, module.exports), module.exports;
 }
@@ -4218,6 +4256,7 @@ var Dapp;
   Dapp["AERODROME"] = "aerodrome";
   Dapp["AERODROMECL"] = "aerodromeCL";
   Dapp["RAMSESCL"] = "ramsesCL";
+  Dapp["COMPOUNDV3"] = "compoundV3";
 })(Dapp || (Dapp = {}));
 
 var Transaction;
@@ -4244,16 +4283,16 @@ var Transaction;
   Transaction["REMOVE_LIQUIDITY_UNSTAKE"] = "removeLiquidityAndUnstake";
 })(Transaction || (Transaction = {}));
 
-var _factoryAddress, _Network$POLYGON, _Network$OPTIMISM, _Network$ARBITRUM, _Network$BASE, _routerAddress, _Network$POLYGON2, _dappFactoryAddress, _Network$POLYGON3, _Network$OPTIMISM2, _stakingAddress, _Network$POLYGON4, _Network$OPTIMISM3, _Network$ARBITRUM2, _Network$BASE2, _aaveAddressProvider, _Network$POLYGON5, _Network$OPTIMISM4, _Network$ARBITRUM3, _Network$BASE3, _nonfungiblePositionM, _networkChainIdMap, _balancerSubgraph, _multiCallAddress, _lyraNetworkMap, _flatMoneyContractAdd;
+var _factoryAddress, _Network$POLYGON, _Network$OPTIMISM, _Network$ARBITRUM, _Network$BASE, _routerAddress, _Network$POLYGON2, _dappFactoryAddress, _Network$POLYGON3, _Network$OPTIMISM2, _Network$ARBITRUM2, _stakingAddress, _Network$POLYGON4, _Network$OPTIMISM3, _Network$ARBITRUM3, _Network$BASE2, _aaveAddressProvider, _Network$POLYGON5, _Network$OPTIMISM4, _Network$ARBITRUM4, _Network$BASE3, _nonfungiblePositionM, _networkChainIdMap, _balancerSubgraph, _multiCallAddress, _lyraNetworkMap, _flatMoneyContractAdd;
 
 require("dotenv").config();
 
 var factoryAddress = (_factoryAddress = {}, _factoryAddress[Network.POLYGON] = process.env.STAGING_CONTRACTS ? "0xDd87eCdB10cFF7004276AAbAbd30e7a08F69bb53" : "0xfdc7b8bFe0DD3513Cc669bB8d601Cb83e2F69cB0", _factoryAddress[Network.OPTIMISM] = "0x5e61a079A178f0E5784107a4963baAe0c5a680c6", _factoryAddress[Network.ARBITRUM] = "0xfffb5fb14606eb3a548c113026355020ddf27535", _factoryAddress[Network.BASE] = "0x49Afe3abCf66CF09Fab86cb1139D8811C8afe56F", _factoryAddress);
-var routerAddress = (_routerAddress = {}, _routerAddress[Network.POLYGON] = (_Network$POLYGON = {}, _Network$POLYGON[Dapp.SUSHISWAP] = "0x1b02dA8Cb0d097eB8D57A175b88c7D8b47997506", _Network$POLYGON[Dapp.AAVE] = "0x8dFf5E27EA6b7AC08EbFdf9eB090F32ee9a30fcf", _Network$POLYGON[Dapp.AAVEV3] = "0x794a61358D6845594F94dc1DB02A252b5b4814aD", _Network$POLYGON[Dapp.ONEINCH] = "0x111111125421ca6dc452d289314280a0f8842a65", _Network$POLYGON[Dapp.QUICKSWAP] = "0xa5E0829CaCEd8fFDD4De3c43696c57F7D7A678ff", _Network$POLYGON[Dapp.BALANCER] = "0xBA12222222228d8Ba445958a75a0704d566BF2C8", _Network$POLYGON[Dapp.UNISWAPV3] = "0x68b3465833fb72A70ecDF485E0e4C7bD8665Fc45", _Network$POLYGON[Dapp.ARRAKIS] = "0xc73fb100a995b33f9fa181d420f4c8d74506df66", _Network$POLYGON[Dapp.TOROS] = "0xB2F1498983bf9c9442c35F772e6C1AdE66a8DeDE", _Network$POLYGON[Dapp.ZEROEX] = "0xdef1c0ded9bec7f1a1670819833240f027b25eff", _Network$POLYGON), _routerAddress[Network.OPTIMISM] = (_Network$OPTIMISM = {}, _Network$OPTIMISM[Dapp.UNISWAPV3] = "0x68b3465833fb72A70ecDF485E0e4C7bD8665Fc45", _Network$OPTIMISM[Dapp.SYNTHETIX] = "0x8700dAec35aF8Ff88c16BdF0418774CB3D7599B4", _Network$OPTIMISM[Dapp.AAVEV3] = "0x794a61358D6845594F94dc1DB02A252b5b4814aD", _Network$OPTIMISM[Dapp.ONEINCH] = "0x111111125421ca6dc452d289314280a0f8842a65", _Network$OPTIMISM[Dapp.TOROS] = "0x3988513793bCE39f0167064A9F7fC3617FaF35AB", _Network$OPTIMISM[Dapp.VELODROME] = "0x9c12939390052919aF3155f41Bf4160Fd3666A6f", _Network$OPTIMISM[Dapp.VELODROMEV2] = "0xa062ae8a9c5e11aaa026fc2670b0d65ccc8b2858", _Network$OPTIMISM[Dapp.LYRA] = "0xCCE7819d65f348c64B7Beb205BA367b3fE33763B", _Network$OPTIMISM[Dapp.ARRAKIS] = "0x9ce88a56d120300061593eF7AD074A1B710094d5", _Network$OPTIMISM[Dapp.ZEROEX] = "0xdef1abe32c034e558cdd535791643c58a13acc10", _Network$OPTIMISM), _routerAddress[Network.ARBITRUM] = (_Network$ARBITRUM = {}, _Network$ARBITRUM[Dapp.ONEINCH] = "0x111111125421ca6dc452d289314280a0f8842a65", _Network$ARBITRUM[Dapp.UNISWAPV3] = "0x68b3465833fb72A70ecDF485E0e4C7bD8665Fc45", _Network$ARBITRUM[Dapp.AAVEV3] = "0x794a61358D6845594F94dc1DB02A252b5b4814aD", _Network$ARBITRUM[Dapp.BALANCER] = "0xBA12222222228d8Ba445958a75a0704d566BF2C8", _Network$ARBITRUM[Dapp.RAMSES] = "0xaaa87963efeb6f7e0a2711f397663105acb1805e", _Network$ARBITRUM[Dapp.ZEROEX] = "0xdef1c0ded9bec7f1a1670819833240f027b25eff", _Network$ARBITRUM), _routerAddress[Network.BASE] = (_Network$BASE = {}, _Network$BASE[Dapp.ONEINCH] = "0x111111125421ca6dc452d289314280a0f8842a65", _Network$BASE[Dapp.ZEROEX] = "0xdef1c0ded9bec7f1a1670819833240f027b25eff", _Network$BASE[Dapp.AERODROME] = "0xcF77a3Ba9A5CA399B7c97c74d54e5b1Beb874E43", _Network$BASE[Dapp.AAVEV3] = "0xA238Dd80C259a72e81d7e4664a9801593F98d1c5", _Network$BASE), _routerAddress);
+var routerAddress = (_routerAddress = {}, _routerAddress[Network.POLYGON] = (_Network$POLYGON = {}, _Network$POLYGON[Dapp.SUSHISWAP] = "0x1b02dA8Cb0d097eB8D57A175b88c7D8b47997506", _Network$POLYGON[Dapp.AAVE] = "0x8dFf5E27EA6b7AC08EbFdf9eB090F32ee9a30fcf", _Network$POLYGON[Dapp.AAVEV3] = "0x794a61358D6845594F94dc1DB02A252b5b4814aD", _Network$POLYGON[Dapp.ONEINCH] = "0x111111125421ca6dc452d289314280a0f8842a65", _Network$POLYGON[Dapp.QUICKSWAP] = "0xa5E0829CaCEd8fFDD4De3c43696c57F7D7A678ff", _Network$POLYGON[Dapp.BALANCER] = "0xBA12222222228d8Ba445958a75a0704d566BF2C8", _Network$POLYGON[Dapp.UNISWAPV3] = "0x68b3465833fb72A70ecDF485E0e4C7bD8665Fc45", _Network$POLYGON[Dapp.ARRAKIS] = "0xc73fb100a995b33f9fa181d420f4c8d74506df66", _Network$POLYGON[Dapp.TOROS] = "0x45b90480D6F643dE2f128db091A357C3c90399f2", _Network$POLYGON[Dapp.ZEROEX] = "0xdef1c0ded9bec7f1a1670819833240f027b25eff", _Network$POLYGON), _routerAddress[Network.OPTIMISM] = (_Network$OPTIMISM = {}, _Network$OPTIMISM[Dapp.UNISWAPV3] = "0x68b3465833fb72A70ecDF485E0e4C7bD8665Fc45", _Network$OPTIMISM[Dapp.SYNTHETIX] = "0x8700dAec35aF8Ff88c16BdF0418774CB3D7599B4", _Network$OPTIMISM[Dapp.AAVEV3] = "0x794a61358D6845594F94dc1DB02A252b5b4814aD", _Network$OPTIMISM[Dapp.ONEINCH] = "0x111111125421ca6dc452d289314280a0f8842a65", _Network$OPTIMISM[Dapp.TOROS] = "0x2Ed1bd7f66e47113672f3870308b5E867C5bb743", _Network$OPTIMISM[Dapp.VELODROME] = "0x9c12939390052919aF3155f41Bf4160Fd3666A6f", _Network$OPTIMISM[Dapp.VELODROMEV2] = "0xa062ae8a9c5e11aaa026fc2670b0d65ccc8b2858", _Network$OPTIMISM[Dapp.LYRA] = "0xCCE7819d65f348c64B7Beb205BA367b3fE33763B", _Network$OPTIMISM[Dapp.ARRAKIS] = "0x9ce88a56d120300061593eF7AD074A1B710094d5", _Network$OPTIMISM[Dapp.ZEROEX] = "0xdef1abe32c034e558cdd535791643c58a13acc10", _Network$OPTIMISM), _routerAddress[Network.ARBITRUM] = (_Network$ARBITRUM = {}, _Network$ARBITRUM[Dapp.ONEINCH] = "0x111111125421ca6dc452d289314280a0f8842a65", _Network$ARBITRUM[Dapp.UNISWAPV3] = "0x68b3465833fb72A70ecDF485E0e4C7bD8665Fc45", _Network$ARBITRUM[Dapp.AAVEV3] = "0x794a61358D6845594F94dc1DB02A252b5b4814aD", _Network$ARBITRUM[Dapp.BALANCER] = "0xBA12222222228d8Ba445958a75a0704d566BF2C8", _Network$ARBITRUM[Dapp.RAMSES] = "0xaaa87963efeb6f7e0a2711f397663105acb1805e", _Network$ARBITRUM[Dapp.ZEROEX] = "0xdef1c0ded9bec7f1a1670819833240f027b25eff", _Network$ARBITRUM[Dapp.TOROS] = "0xA5679C4272A056Bb83f039961fae7D99C48529F5", _Network$ARBITRUM), _routerAddress[Network.BASE] = (_Network$BASE = {}, _Network$BASE[Dapp.ONEINCH] = "0x111111125421ca6dc452d289314280a0f8842a65", _Network$BASE[Dapp.ZEROEX] = "0xdef1c0ded9bec7f1a1670819833240f027b25eff", _Network$BASE[Dapp.AERODROME] = "0xcF77a3Ba9A5CA399B7c97c74d54e5b1Beb874E43", _Network$BASE[Dapp.AAVEV3] = "0xA238Dd80C259a72e81d7e4664a9801593F98d1c5", _Network$BASE[Dapp.TOROS] = "0xf067575Eb60c7587C11e867907AA7284833704d1", _Network$BASE), _routerAddress);
 var dappFactoryAddress = (_dappFactoryAddress = {}, _dappFactoryAddress[Network.POLYGON] = (_Network$POLYGON2 = {}, _Network$POLYGON2[Dapp.SUSHISWAP] = "0xc35DADB65012eC5796536bD9864eD8773aBc74C4", _Network$POLYGON2[Dapp.QUICKSWAP] = "0x5757371414417b8C6CAad45bAeF941aBc7d3Ab32", _Network$POLYGON2), _dappFactoryAddress[Network.OPTIMISM] = {}, _dappFactoryAddress[Network.ARBITRUM] = {}, _dappFactoryAddress[Network.BASE] = {}, _dappFactoryAddress);
-var stakingAddress = (_stakingAddress = {}, _stakingAddress[Network.POLYGON] = (_Network$POLYGON3 = {}, _Network$POLYGON3[Dapp.SUSHISWAP] = "0x0769fd68dFb93167989C6f7254cd0D766Fb2841F", _Network$POLYGON3[Dapp.BALANCER] = "0x0F3e0c4218b7b0108a3643cFe9D3ec0d4F57c54e", _Network$POLYGON3[Dapp.AAVE] = "0x357D51124f59836DeD84c8a1730D72B749d8BC23", _Network$POLYGON3[Dapp.AAVEV3] = "0x929EC64c34a17401F460460D4B9390518E5B473e", _Network$POLYGON3), _stakingAddress[Network.OPTIMISM] = (_Network$OPTIMISM2 = {}, _Network$OPTIMISM2[Dapp.AAVEV3] = "0x929EC64c34a17401F460460D4B9390518E5B473e", _Network$OPTIMISM2), _stakingAddress[Network.ARBITRUM] = {}, _stakingAddress[Network.BASE] = {}, _stakingAddress);
-var aaveAddressProvider = (_aaveAddressProvider = {}, _aaveAddressProvider[Network.POLYGON] = (_Network$POLYGON4 = {}, _Network$POLYGON4[Dapp.AAVE] = "0xd05e3E715d945B59290df0ae8eF85c1BdB684744", _Network$POLYGON4[Dapp.AAVEV3] = "0xa97684ead0e402dC232d5A977953DF7ECBaB3CDb", _Network$POLYGON4), _aaveAddressProvider[Network.OPTIMISM] = (_Network$OPTIMISM3 = {}, _Network$OPTIMISM3[Dapp.AAVEV3] = "0xa97684ead0e402dC232d5A977953DF7ECBaB3CDb", _Network$OPTIMISM3), _aaveAddressProvider[Network.ARBITRUM] = (_Network$ARBITRUM2 = {}, _Network$ARBITRUM2[Dapp.AAVEV3] = "0xa97684ead0e402dc232d5a977953df7ecbab3cdb", _Network$ARBITRUM2), _aaveAddressProvider[Network.BASE] = (_Network$BASE2 = {}, _Network$BASE2[Dapp.AAVEV3] = "0xe20fCBdBfFC4Dd138cE8b2E6FBb6CB49777ad64D", _Network$BASE2), _aaveAddressProvider);
-var nonfungiblePositionManagerAddress = (_nonfungiblePositionM = {}, _nonfungiblePositionM[Network.POLYGON] = (_Network$POLYGON5 = {}, _Network$POLYGON5[Dapp.UNISWAPV3] = "0xC36442b4a4522E871399CD717aBDD847Ab11FE88", _Network$POLYGON5), _nonfungiblePositionM[Network.OPTIMISM] = (_Network$OPTIMISM4 = {}, _Network$OPTIMISM4[Dapp.UNISWAPV3] = "0xC36442b4a4522E871399CD717aBDD847Ab11FE88", _Network$OPTIMISM4[Dapp.VELODROMECL] = "0x416b433906b1B72FA758e166e239c43d68dC6F29", _Network$OPTIMISM4), _nonfungiblePositionM[Network.ARBITRUM] = (_Network$ARBITRUM3 = {}, _Network$ARBITRUM3[Dapp.UNISWAPV3] = "0xC36442b4a4522E871399CD717aBDD847Ab11FE88", _Network$ARBITRUM3[Dapp.RAMSESCL] = "0xAA277CB7914b7e5514946Da92cb9De332Ce610EF", _Network$ARBITRUM3), _nonfungiblePositionM[Network.BASE] = (_Network$BASE3 = {}, _Network$BASE3[Dapp.UNISWAPV3] = "0x03a520b32C04BF3bEEf7BEb72E919cf822Ed34f1", _Network$BASE3[Dapp.AERODROMECL] = "0x827922686190790b37229fd06084350e74485b72", _Network$BASE3), _nonfungiblePositionM);
+var stakingAddress = (_stakingAddress = {}, _stakingAddress[Network.POLYGON] = (_Network$POLYGON3 = {}, _Network$POLYGON3[Dapp.SUSHISWAP] = "0x0769fd68dFb93167989C6f7254cd0D766Fb2841F", _Network$POLYGON3[Dapp.BALANCER] = "0x0F3e0c4218b7b0108a3643cFe9D3ec0d4F57c54e", _Network$POLYGON3[Dapp.AAVE] = "0x357D51124f59836DeD84c8a1730D72B749d8BC23", _Network$POLYGON3[Dapp.AAVEV3] = "0x929EC64c34a17401F460460D4B9390518E5B473e", _Network$POLYGON3), _stakingAddress[Network.OPTIMISM] = (_Network$OPTIMISM2 = {}, _Network$OPTIMISM2[Dapp.AAVEV3] = "0x929EC64c34a17401F460460D4B9390518E5B473e", _Network$OPTIMISM2[Dapp.COMPOUNDV3] = "0x443ea0340cb75a160f31a440722dec7b5bc3c2e9", _Network$OPTIMISM2), _stakingAddress[Network.ARBITRUM] = (_Network$ARBITRUM2 = {}, _Network$ARBITRUM2[Dapp.COMPOUNDV3] = "0x88730d254a2f7e6ac8388c3198afd694ba9f7fae", _Network$ARBITRUM2), _stakingAddress[Network.BASE] = {}, _stakingAddress);
+var aaveAddressProvider = (_aaveAddressProvider = {}, _aaveAddressProvider[Network.POLYGON] = (_Network$POLYGON4 = {}, _Network$POLYGON4[Dapp.AAVE] = "0xd05e3E715d945B59290df0ae8eF85c1BdB684744", _Network$POLYGON4[Dapp.AAVEV3] = "0xa97684ead0e402dC232d5A977953DF7ECBaB3CDb", _Network$POLYGON4), _aaveAddressProvider[Network.OPTIMISM] = (_Network$OPTIMISM3 = {}, _Network$OPTIMISM3[Dapp.AAVEV3] = "0xa97684ead0e402dC232d5A977953DF7ECBaB3CDb", _Network$OPTIMISM3), _aaveAddressProvider[Network.ARBITRUM] = (_Network$ARBITRUM3 = {}, _Network$ARBITRUM3[Dapp.AAVEV3] = "0xa97684ead0e402dc232d5a977953df7ecbab3cdb", _Network$ARBITRUM3), _aaveAddressProvider[Network.BASE] = (_Network$BASE2 = {}, _Network$BASE2[Dapp.AAVEV3] = "0xe20fCBdBfFC4Dd138cE8b2E6FBb6CB49777ad64D", _Network$BASE2), _aaveAddressProvider);
+var nonfungiblePositionManagerAddress = (_nonfungiblePositionM = {}, _nonfungiblePositionM[Network.POLYGON] = (_Network$POLYGON5 = {}, _Network$POLYGON5[Dapp.UNISWAPV3] = "0xC36442b4a4522E871399CD717aBDD847Ab11FE88", _Network$POLYGON5), _nonfungiblePositionM[Network.OPTIMISM] = (_Network$OPTIMISM4 = {}, _Network$OPTIMISM4[Dapp.UNISWAPV3] = "0xC36442b4a4522E871399CD717aBDD847Ab11FE88", _Network$OPTIMISM4[Dapp.VELODROMECL] = "0x416b433906b1B72FA758e166e239c43d68dC6F29", _Network$OPTIMISM4), _nonfungiblePositionM[Network.ARBITRUM] = (_Network$ARBITRUM4 = {}, _Network$ARBITRUM4[Dapp.UNISWAPV3] = "0xC36442b4a4522E871399CD717aBDD847Ab11FE88", _Network$ARBITRUM4[Dapp.RAMSESCL] = "0xAA277CB7914b7e5514946Da92cb9De332Ce610EF", _Network$ARBITRUM4), _nonfungiblePositionM[Network.BASE] = (_Network$BASE3 = {}, _Network$BASE3[Dapp.UNISWAPV3] = "0x03a520b32C04BF3bEEf7BEb72E919cf822Ed34f1", _Network$BASE3[Dapp.AERODROMECL] = "0x827922686190790b37229fd06084350e74485b72", _Network$BASE3), _nonfungiblePositionM);
 var networkChainIdMap = (_networkChainIdMap = {}, _networkChainIdMap[Network.POLYGON] = 137, _networkChainIdMap[Network.OPTIMISM] = 10, _networkChainIdMap[Network.ARBITRUM] = 42161, _networkChainIdMap[Network.BASE] = 8453, _networkChainIdMap);
 var balancerSubgraph = (_balancerSubgraph = {}, _balancerSubgraph[Network.POLYGON] = "https://api.thegraph.com/subgraphs/name/balancer-labs/balancer-polygon-v2", _balancerSubgraph[Network.OPTIMISM] = "", _balancerSubgraph[Network.ARBITRUM] = "", _balancerSubgraph[Network.BASE] = "", _balancerSubgraph);
 var multiCallAddress = (_multiCallAddress = {}, _multiCallAddress[Network.POLYGON] = "0x275617327c958bD06b5D6b871E7f491D76113dd8", _multiCallAddress[Network.OPTIMISM] = "", _multiCallAddress[Network.ARBITRUM] = "", _multiCallAddress[Network.BASE] = "", _multiCallAddress);
@@ -10011,100 +10050,75 @@ function _getUniswapV3SwapTxData() {
   return _getUniswapV3SwapTxData.apply(this, arguments);
 }
 
-var abi$h = [
-	{
-		inputs: [
-			{
-				internalType: "address",
-				name: "",
-				type: "address"
-			}
-		],
-		name: "allowedPools",
-		outputs: [
-			{
-				internalType: "bool",
-				name: "",
-				type: "bool"
-			}
-		],
-		stateMutability: "view",
-		type: "function"
-	},
-	{
-		inputs: [
-			{
-				internalType: "address",
-				name: "pool",
-				type: "address"
-			},
-			{
-				internalType: "contract IERC20Extended",
-				name: "depositAsset",
-				type: "address"
-			},
-			{
-				internalType: "uint256",
-				name: "amount",
-				type: "uint256"
-			},
-			{
-				internalType: "contract IERC20Extended",
-				name: "poolDepositAsset",
-				type: "address"
-			},
-			{
-				internalType: "uint256",
-				name: "expectedLiquidityMinted",
-				type: "uint256"
-			}
-		],
-		name: "deposit",
-		outputs: [
-			{
-				internalType: "uint256",
-				name: "liquidityMinted",
-				type: "uint256"
-			}
-		],
-		stateMutability: "nonpayable",
-		type: "function"
-	},
+var IDhedgeEasySwapper = [
 	{
 		inputs: [
 			{
-				internalType: "address",
-				name: "pool",
-				type: "address"
-			},
-			{
-				internalType: "contract IERC20Extended",
-				name: "depositAsset",
-				type: "address"
-			},
-			{
-				internalType: "uint256",
-				name: "amount",
-				type: "uint256"
-			},
-			{
-				internalType: "contract IERC20Extended",
-				name: "poolDepositAsset",
-				type: "address"
+				components: [
+					{
+						components: [
+							{
+								internalType: "contract IERC20",
+								name: "token",
+								type: "address"
+							},
+							{
+								internalType: "uint256",
+								name: "amount",
+								type: "uint256"
+							},
+							{
+								components: [
+									{
+										internalType: "bytes32",
+										name: "routerKey",
+										type: "bytes32"
+									},
+									{
+										internalType: "bytes",
+										name: "swapData",
+										type: "bytes"
+									}
+								],
+								internalType: "struct ISwapper.AggregatorData",
+								name: "aggregatorData",
+								type: "tuple"
+							}
+						],
+						internalType: "struct ISwapper.SrcTokenSwapDetails[]",
+						name: "srcData",
+						type: "tuple[]"
+					},
+					{
+						components: [
+							{
+								internalType: "contract IERC20",
+								name: "destToken",
+								type: "address"
+							},
+							{
+								internalType: "uint256",
+								name: "minDestAmount",
+								type: "uint256"
+							}
+						],
+						internalType: "struct ISwapper.DestData",
+						name: "destData",
+						type: "tuple"
+					}
+				],
+				internalType: "struct IWithdrawalVault.MultiInSingleOutData",
+				name: "_swapData",
+				type: "tuple"
 			},
 			{
 				internalType: "uint256",
-				name: "expectedLiquidityMinted",
+				name: "_expectedDestTokenAmount",
 				type: "uint256"
 			}
 		],
-		name: "depositWithCustomCooldown",
+		name: "completeWithdrawal",
 		outputs: [
-			{
-				internalType: "uint256",
-				name: "liquidityMinted",
-				type: "uint256"
-			}
 		],
 		stateMutability: "nonpayable",
 		type: "function"
@@ -10113,1095 +10127,116 @@ var abi$h = [
 		inputs: [
 			{
 				internalType: "address",
-				name: "pool",
+				name: "_dHedgeVault",
 				type: "address"
 			},
-			{
-				internalType: "contract IERC20Extended",
-				name: "poolDepositAsset",
-				type: "address"
-			},
-			{
-				internalType: "uint256",
-				name: "expectedLiquidityMinted",
-				type: "uint256"
-			}
-		],
-		name: "depositNative",
-		outputs: [
-			{
-				internalType: "uint256",
-				name: "liquidityMinted",
-				type: "uint256"
-			}
-		],
-		stateMutability: "payable",
-		type: "function"
-	},
-	{
-		inputs: [
 			{
 				internalType: "address",
-				name: "pool",
-				type: "address"
-			},
-			{
-				internalType: "contract IERC20Extended",
-				name: "poolDepositAsset",
+				name: "_vaultDepositToken",
 				type: "address"
 			},
 			{
 				internalType: "uint256",
-				name: "expectedLiquidityMinted",
+				name: "_depositAmount",
 				type: "uint256"
 			}
 		],
-		name: "depositNativeWithCustomCooldown",
+		name: "depositQuote",
 		outputs: [
 			{
 				internalType: "uint256",
-				name: "liquidityMinted",
+				name: "expectedAmountReceived",
 				type: "uint256"
 			}
 		],
-		stateMutability: "payable",
+		stateMutability: "view",
 		type: "function"
 	},
 	{
 		inputs: [
 			{
 				internalType: "address",
-				name: "pool",
+				name: "_dHedgeVault",
 				type: "address"
 			},
 			{
-				internalType: "contract IERC20Extended",
-				name: "depositAsset",
+				internalType: "contract IERC20",
+				name: "_vaultDepositToken",
 				type: "address"
 			},
 			{
 				internalType: "uint256",
-				name: "amount",
+				name: "_depositAmount",
 				type: "uint256"
 			},
-			{
-				internalType: "contract IERC20Extended",
-				name: "poolDepositAsset",
-				type: "address"
-			},
-			{
-				internalType: "bool",
-				name: "customCooldown",
-				type: "bool"
-			}
-		],
-		name: "depositQuote",
-		outputs: [
-			{
-				internalType: "uint256",
-				name: "expectedLiquidityMinted",
-				type: "uint256"
-			}
-		],
-		stateMutability: "view",
-		type: "function"
-	},
-	{
-		inputs: [
-		],
-		name: "feeDenominator",
-		outputs: [
 			{
 				internalType: "uint256",
-				name: "",
+				name: "_expectedAmountReceived",
 				type: "uint256"
 			}
 		],
-		stateMutability: "view",
-		type: "function"
-	},
-	{
-		inputs: [
-		],
-		name: "feeNumerator",
+		name: "depositWithCustomCooldown",
 		outputs: [
-			{
-				internalType: "uint256",
-				name: "",
-				type: "uint256"
-			}
 		],
-		stateMutability: "view",
+		stateMutability: "nonpayable",
 		type: "function"
 	},
 	{
 		inputs: [
 			{
 				internalType: "address",
-				name: "pool",
-				type: "address"
-			},
-			{
-				internalType: "uint256",
-				name: "fundTokenAmount",
-				type: "uint256"
-			},
-			{
-				internalType: "contract IERC20Extended",
-				name: "withdrawalAsset",
+				name: "_depositor",
 				type: "address"
-			},
-			{
-				internalType: "uint256",
-				name: "expectedAmountOut",
-				type: "uint256"
 			}
 		],
-		name: "withdraw",
+		name: "getTrackedAssets",
 		outputs: [
-		],
-		stateMutability: "nonpayable",
-		type: "function"
-	},
-	{
-		inputs: [
-			{
-				internalType: "address",
-				name: "pool",
-				type: "address"
-			},
-			{
-				internalType: "uint256",
-				name: "fundTokenAmount",
-				type: "uint256"
-			},
 			{
-				internalType: "uint256",
-				name: "expectedAmountOut",
-				type: "uint256"
+				components: [
+					{
+						internalType: "address",
+						name: "token",
+						type: "address"
+					},
+					{
+						internalType: "uint256",
+						name: "balance",
+						type: "uint256"
+					}
+				],
+				internalType: "struct IWithdrawalVault.TrackedAsset[]",
+				name: "trackedAssets_",
+				type: "tuple[]"
 			}
 		],
-		name: "withdrawNative",
-		outputs: [
-		],
-		stateMutability: "nonpayable",
+		stateMutability: "view",
 		type: "function"
 	},
 	{
 		inputs: [
 			{
 				internalType: "address",
-				name: "pool",
+				name: "_dHedgeVault",
 				type: "address"
 			},
 			{
 				internalType: "uint256",
-				name: "fundTokenAmount",
+				name: "_amountIn",
 				type: "uint256"
 			},
-			{
-				internalType: "contract IERC20Extended",
-				name: "intermediateAsset",
-				type: "address"
-			},
 			{
 				internalType: "uint256",
-				name: "expectedAmountSUSD",
+				name: "_slippageTolerance",
 				type: "uint256"
 			}
 		],
-		name: "withdrawSUSD",
+		name: "initWithdrawal",
 		outputs: [
 		],
 		stateMutability: "nonpayable",
 		type: "function"
 	}
 ];
-var IDhedgeEasySwapper = {
-	abi: abi$h
-};
-
-var abi$i = [
-	{
-		inputs: [
-			{
-				internalType: "string",
-				name: "marketId",
-				type: "string"
-			},
-			{
-				internalType: "address",
-				name: "owner",
-				type: "address"
-			}
-		],
-		stateMutability: "nonpayable",
-		type: "constructor"
-	},
-	{
-		anonymous: false,
-		inputs: [
-			{
-				indexed: true,
-				internalType: "address",
-				name: "oldAddress",
-				type: "address"
-			},
-			{
-				indexed: true,
-				internalType: "address",
-				name: "newAddress",
-				type: "address"
-			}
-		],
-		name: "ACLAdminUpdated",
-		type: "event"
-	},
-	{
-		anonymous: false,
-		inputs: [
-			{
-				indexed: true,
-				internalType: "address",
-				name: "oldAddress",
-				type: "address"
-			},
-			{
-				indexed: true,
-				internalType: "address",
-				name: "newAddress",
-				type: "address"
-			}
-		],
-		name: "ACLManagerUpdated",
-		type: "event"
-	},
-	{
-		anonymous: false,
-		inputs: [
-			{
-				indexed: true,
-				internalType: "bytes32",
-				name: "id",
-				type: "bytes32"
-			},
-			{
-				indexed: true,
-				internalType: "address",
-				name: "oldAddress",
-				type: "address"
-			},
-			{
-				indexed: true,
-				internalType: "address",
-				name: "newAddress",
-				type: "address"
-			}
-		],
-		name: "AddressSet",
-		type: "event"
-	},
-	{
-		anonymous: false,
-		inputs: [
-			{
-				indexed: true,
-				internalType: "bytes32",
-				name: "id",
-				type: "bytes32"
-			},
-			{
-				indexed: true,
-				internalType: "address",
-				name: "proxyAddress",
-				type: "address"
-			},
-			{
-				indexed: false,
-				internalType: "address",
-				name: "oldImplementationAddress",
-				type: "address"
-			},
-			{
-				indexed: true,
-				internalType: "address",
-				name: "newImplementationAddress",
-				type: "address"
-			}
-		],
-		name: "AddressSetAsProxy",
-		type: "event"
-	},
-	{
-		anonymous: false,
-		inputs: [
-			{
-				indexed: true,
-				internalType: "string",
-				name: "oldMarketId",
-				type: "string"
-			},
-			{
-				indexed: true,
-				internalType: "string",
-				name: "newMarketId",
-				type: "string"
-			}
-		],
-		name: "MarketIdSet",
-		type: "event"
-	},
-	{
-		anonymous: false,
-		inputs: [
-			{
-				indexed: true,
-				internalType: "address",
-				name: "previousOwner",
-				type: "address"
-			},
-			{
-				indexed: true,
-				internalType: "address",
-				name: "newOwner",
-				type: "address"
-			}
-		],
-		name: "OwnershipTransferred",
-		type: "event"
-	},
-	{
-		anonymous: false,
-		inputs: [
-			{
-				indexed: true,
-				internalType: "address",
-				name: "oldAddress",
-				type: "address"
-			},
-			{
-				indexed: true,
-				internalType: "address",
-				name: "newAddress",
-				type: "address"
-			}
-		],
-		name: "PoolConfiguratorUpdated",
-		type: "event"
-	},
-	{
-		anonymous: false,
-		inputs: [
-			{
-				indexed: true,
-				internalType: "address",
-				name: "oldAddress",
-				type: "address"
-			},
-			{
-				indexed: true,
-				internalType: "address",
-				name: "newAddress",
-				type: "address"
-			}
-		],
-		name: "PoolDataProviderUpdated",
-		type: "event"
-	},
-	{
-		anonymous: false,
-		inputs: [
-			{
-				indexed: true,
-				internalType: "address",
-				name: "oldAddress",
-				type: "address"
-			},
-			{
-				indexed: true,
-				internalType: "address",
-				name: "newAddress",
-				type: "address"
-			}
-		],
-		name: "PoolUpdated",
-		type: "event"
-	},
-	{
-		anonymous: false,
-		inputs: [
-			{
-				indexed: true,
-				internalType: "address",
-				name: "oldAddress",
-				type: "address"
-			},
-			{
-				indexed: true,
-				internalType: "address",
-				name: "newAddress",
-				type: "address"
-			}
-		],
-		name: "PriceOracleSentinelUpdated",
-		type: "event"
-	},
-	{
-		anonymous: false,
-		inputs: [
-			{
-				indexed: true,
-				internalType: "address",
-				name: "oldAddress",
-				type: "address"
-			},
-			{
-				indexed: true,
-				internalType: "address",
-				name: "newAddress",
-				type: "address"
-			}
-		],
-		name: "PriceOracleUpdated",
-		type: "event"
-	},
-	{
-		anonymous: false,
-		inputs: [
-			{
-				indexed: true,
-				internalType: "bytes32",
-				name: "id",
-				type: "bytes32"
-			},
-			{
-				indexed: true,
-				internalType: "address",
-				name: "proxyAddress",
-				type: "address"
-			},
-			{
-				indexed: true,
-				internalType: "address",
-				name: "implementationAddress",
-				type: "address"
-			}
-		],
-		name: "ProxyCreated",
-		type: "event"
-	},
-	{
-		inputs: [
-		],
-		name: "getACLAdmin",
-		outputs: [
-			{
-				internalType: "address",
-				name: "",
-				type: "address"
-			}
-		],
-		stateMutability: "view",
-		type: "function"
-	},
-	{
-		inputs: [
-		],
-		name: "getACLManager",
-		outputs: [
-			{
-				internalType: "address",
-				name: "",
-				type: "address"
-			}
-		],
-		stateMutability: "view",
-		type: "function"
-	},
-	{
-		inputs: [
-			{
-				internalType: "bytes32",
-				name: "id",
-				type: "bytes32"
-			}
-		],
-		name: "getAddress",
-		outputs: [
-			{
-				internalType: "address",
-				name: "",
-				type: "address"
-			}
-		],
-		stateMutability: "view",
-		type: "function"
-	},
-	{
-		inputs: [
-		],
-		name: "getMarketId",
-		outputs: [
-			{
-				internalType: "string",
-				name: "",
-				type: "string"
-			}
-		],
-		stateMutability: "view",
-		type: "function"
-	},
-	{
-		inputs: [
-		],
-		name: "getPool",
-		outputs: [
-			{
-				internalType: "address",
-				name: "",
-				type: "address"
-			}
-		],
-		stateMutability: "view",
-		type: "function"
-	},
-	{
-		inputs: [
-		],
-		name: "getPoolConfigurator",
-		outputs: [
-			{
-				internalType: "address",
-				name: "",
-				type: "address"
-			}
-		],
-		stateMutability: "view",
-		type: "function"
-	},
-	{
-		inputs: [
-		],
-		name: "getPoolDataProvider",
-		outputs: [
-			{
-				internalType: "address",
-				name: "",
-				type: "address"
-			}
-		],
-		stateMutability: "view",
-		type: "function"
-	},
-	{
-		inputs: [
-		],
-		name: "getPriceOracle",
-		outputs: [
-			{
-				internalType: "address",
-				name: "",
-				type: "address"
-			}
-		],
-		stateMutability: "view",
-		type: "function"
-	},
-	{
-		inputs: [
-		],
-		name: "getPriceOracleSentinel",
-		outputs: [
-			{
-				internalType: "address",
-				name: "",
-				type: "address"
-			}
-		],
-		stateMutability: "view",
-		type: "function"
-	},
-	{
-		inputs: [
-		],
-		name: "owner",
-		outputs: [
-			{
-				internalType: "address",
-				name: "",
-				type: "address"
-			}
-		],
-		stateMutability: "view",
-		type: "function"
-	},
-	{
-		inputs: [
-		],
-		name: "renounceOwnership",
-		outputs: [
-		],
-		stateMutability: "nonpayable",
-		type: "function"
-	},
-	{
-		inputs: [
-			{
-				internalType: "address",
-				name: "newAclAdmin",
-				type: "address"
-			}
-		],
-		name: "setACLAdmin",
-		outputs: [
-		],
-		stateMutability: "nonpayable",
-		type: "function"
-	},
-	{
-		inputs: [
-			{
-				internalType: "address",
-				name: "newAclManager",
-				type: "address"
-			}
-		],
-		name: "setACLManager",
-		outputs: [
-		],
-		stateMutability: "nonpayable",
-		type: "function"
-	},
-	{
-		inputs: [
-			{
-				internalType: "bytes32",
-				name: "id",
-				type: "bytes32"
-			},
-			{
-				internalType: "address",
-				name: "newAddress",
-				type: "address"
-			}
-		],
-		name: "setAddress",
-		outputs: [
-		],
-		stateMutability: "nonpayable",
-		type: "function"
-	},
-	{
-		inputs: [
-			{
-				internalType: "bytes32",
-				name: "id",
-				type: "bytes32"
-			},
-			{
-				internalType: "address",
-				name: "newImplementationAddress",
-				type: "address"
-			}
-		],
-		name: "setAddressAsProxy",
-		outputs: [
-		],
-		stateMutability: "nonpayable",
-		type: "function"
-	},
-	{
-		inputs: [
-			{
-				internalType: "string",
-				name: "newMarketId",
-				type: "string"
-			}
-		],
-		name: "setMarketId",
-		outputs: [
-		],
-		stateMutability: "nonpayable",
-		type: "function"
-	},
-	{
-		inputs: [
-			{
-				internalType: "address",
-				name: "newPoolConfiguratorImpl",
-				type: "address"
-			}
-		],
-		name: "setPoolConfiguratorImpl",
-		outputs: [
-		],
-		stateMutability: "nonpayable",
-		type: "function"
-	},
-	{
-		inputs: [
-			{
-				internalType: "address",
-				name: "newDataProvider",
-				type: "address"
-			}
-		],
-		name: "setPoolDataProvider",
-		outputs: [
-		],
-		stateMutability: "nonpayable",
-		type: "function"
-	},
-	{
-		inputs: [
-			{
-				internalType: "address",
-				name: "newPoolImpl",
-				type: "address"
-			}
-		],
-		name: "setPoolImpl",
-		outputs: [
-		],
-		stateMutability: "nonpayable",
-		type: "function"
-	},
-	{
-		inputs: [
-			{
-				internalType: "address",
-				name: "newPriceOracle",
-				type: "address"
-			}
-		],
-		name: "setPriceOracle",
-		outputs: [
-		],
-		stateMutability: "nonpayable",
-		type: "function"
-	},
-	{
-		inputs: [
-			{
-				internalType: "address",
-				name: "newPriceOracleSentinel",
-				type: "address"
-			}
-		],
-		name: "setPriceOracleSentinel",
-		outputs: [
-		],
-		stateMutability: "nonpayable",
-		type: "function"
-	},
-	{
-		inputs: [
-			{
-				internalType: "address",
-				name: "newOwner",
-				type: "address"
-			}
-		],
-		name: "transferOwnership",
-		outputs: [
-		],
-		stateMutability: "nonpayable",
-		type: "function"
-	}
-];
-var IAaveV3PoolAddressProvider = {
-	abi: abi$i
-};
-
-var abi$j = [
-	{
-		inputs: [
-			{
-				internalType: "address[]",
-				name: "_assets",
-				type: "address[]"
-			},
-			{
-				internalType: "address[]",
-				name: "_sources",
-				type: "address[]"
-			},
-			{
-				internalType: "address",
-				name: "_fallbackOracle",
-				type: "address"
-			}
-		],
-		payable: false,
-		stateMutability: "nonpayable",
-		type: "constructor"
-	},
-	{
-		anonymous: false,
-		inputs: [
-			{
-				indexed: true,
-				internalType: "address",
-				name: "asset",
-				type: "address"
-			},
-			{
-				indexed: true,
-				internalType: "address",
-				name: "source",
-				type: "address"
-			}
-		],
-		name: "AssetSourceUpdated",
-		type: "event"
-	},
-	{
-		anonymous: false,
-		inputs: [
-			{
-				indexed: true,
-				internalType: "address",
-				name: "fallbackOracle",
-				type: "address"
-			}
-		],
-		name: "FallbackOracleUpdated",
-		type: "event"
-	},
-	{
-		anonymous: false,
-		inputs: [
-			{
-				indexed: true,
-				internalType: "address",
-				name: "previousOwner",
-				type: "address"
-			},
-			{
-				indexed: true,
-				internalType: "address",
-				name: "newOwner",
-				type: "address"
-			}
-		],
-		name: "OwnershipTransferred",
-		type: "event"
-	},
-	{
-		constant: true,
-		inputs: [
-		],
-		name: "isOwner",
-		outputs: [
-			{
-				internalType: "bool",
-				name: "",
-				type: "bool"
-			}
-		],
-		payable: false,
-		stateMutability: "view",
-		type: "function"
-	},
-	{
-		constant: true,
-		inputs: [
-		],
-		name: "owner",
-		outputs: [
-			{
-				internalType: "address",
-				name: "",
-				type: "address"
-			}
-		],
-		payable: false,
-		stateMutability: "view",
-		type: "function"
-	},
-	{
-		constant: false,
-		inputs: [
-		],
-		name: "renounceOwnership",
-		outputs: [
-		],
-		payable: false,
-		stateMutability: "nonpayable",
-		type: "function"
-	},
-	{
-		constant: false,
-		inputs: [
-			{
-				internalType: "address",
-				name: "newOwner",
-				type: "address"
-			}
-		],
-		name: "transferOwnership",
-		outputs: [
-		],
-		payable: false,
-		stateMutability: "nonpayable",
-		type: "function"
-	},
-	{
-		constant: false,
-		inputs: [
-			{
-				internalType: "address[]",
-				name: "_assets",
-				type: "address[]"
-			},
-			{
-				internalType: "address[]",
-				name: "_sources",
-				type: "address[]"
-			}
-		],
-		name: "setAssetSources",
-		outputs: [
-		],
-		payable: false,
-		stateMutability: "nonpayable",
-		type: "function"
-	},
-	{
-		constant: false,
-		inputs: [
-			{
-				internalType: "address",
-				name: "_fallbackOracle",
-				type: "address"
-			}
-		],
-		name: "setFallbackOracle",
-		outputs: [
-		],
-		payable: false,
-		stateMutability: "nonpayable",
-		type: "function"
-	},
-	{
-		constant: true,
-		inputs: [
-			{
-				internalType: "address",
-				name: "_asset",
-				type: "address"
-			}
-		],
-		name: "getAssetPrice",
-		outputs: [
-			{
-				internalType: "uint256",
-				name: "",
-				type: "uint256"
-			}
-		],
-		payable: false,
-		stateMutability: "view",
-		type: "function"
-	},
-	{
-		constant: true,
-		inputs: [
-			{
-				internalType: "address[]",
-				name: "_assets",
-				type: "address[]"
-			}
-		],
-		name: "getAssetsPrices",
-		outputs: [
-			{
-				internalType: "uint256[]",
-				name: "",
-				type: "uint256[]"
-			}
-		],
-		payable: false,
-		stateMutability: "view",
-		type: "function"
-	},
-	{
-		constant: true,
-		inputs: [
-			{
-				internalType: "address",
-				name: "_asset",
-				type: "address"
-			}
-		],
-		name: "getSourceOfAsset",
-		outputs: [
-			{
-				internalType: "address",
-				name: "",
-				type: "address"
-			}
-		],
-		payable: false,
-		stateMutability: "view",
-		type: "function"
-	},
-	{
-		constant: true,
-		inputs: [
-		],
-		name: "getFallbackOracle",
-		outputs: [
-			{
-				internalType: "address",
-				name: "",
-				type: "address"
-			}
-		],
-		payable: false,
-		stateMutability: "view",
-		type: "function"
-	}
-];
-var IPriceOracle = {
-	abi: abi$j
-};
-
-function getChainlinkPriceInUsd(_x, _x2) {
-  return _getChainlinkPriceInUsd.apply(this, arguments);
-}
-
-function _getChainlinkPriceInUsd() {
-  _getChainlinkPriceInUsd = _asyncToGenerator( /*#__PURE__*/runtime_1.mark(function _callee(pool, asset) {
-    var lendingPoolAddressProvider, priceOracleAddress, priceOracle;
-    return runtime_1.wrap(function _callee$(_context) {
-      while (1) {
-        switch (_context.prev = _context.next) {
-          case 0:
-            //Workaround as Chainlink doesn't have feed registry on Polygon/Optimism
-            //Use oracle from Aave which uses Chainlink
-            lendingPoolAddressProvider = new ethers.Contract(aaveAddressProvider[pool.network][Dapp.AAVEV3], IAaveV3PoolAddressProvider.abi, pool.signer);
-            _context.next = 3;
-            return lendingPoolAddressProvider.getPriceOracle();
-
-          case 3:
-            priceOracleAddress = _context.sent;
-            priceOracle = new ethers.Contract(priceOracleAddress, IPriceOracle.abi, pool.signer);
-            _context.next = 7;
-            return priceOracle.getAssetPrice(asset);
-
-          case 7:
-            return _context.abrupt("return", _context.sent);
-
-          case 8:
-          case "end":
-            return _context.stop();
-        }
-      }
-    }, _callee);
-  }));
-  return _getChainlinkPriceInUsd.apply(this, arguments);
-}
 
 function loadPool(_x, _x2) {
   return _loadPool.apply(this, arguments);
@@ -11259,6 +10294,169 @@ function _isPool() {
   return _isPool.apply(this, arguments);
 }
 
+var oneInchBaseUrl = "https://api.1inch.dev/swap/v6.0/";
+function getOneInchSwapTxData(_x, _x2, _x3, _x4, _x5, _x6) {
+  return _getOneInchSwapTxData.apply(this, arguments);
+}
+
+function _getOneInchSwapTxData() {
+  _getOneInchSwapTxData = _asyncToGenerator( /*#__PURE__*/runtime_1.mark(function _callee(pool, assetFrom, assetTo, amountIn, slippage, forEasySwapper) {
+    var chainId, apiUrl, params, response, swapTxData, dstAmount;
+    return runtime_1.wrap(function _callee$(_context) {
+      while (1) {
+        switch (_context.prev = _context.next) {
+          case 0:
+            if (forEasySwapper === void 0) {
+              forEasySwapper = false;
+            }
+
+            if (process.env.ONEINCH_API_KEY) {
+              _context.next = 3;
+              break;
+            }
+
+            throw new Error("ONEINCH_API_KEY not configured in .env file");
+
+          case 3:
+            chainId = networkChainIdMap[pool.network];
+            apiUrl = "" + oneInchBaseUrl + chainId + "/swap";
+            params = {
+              src: assetFrom,
+              dst: assetTo,
+              amount: amountIn.toString(),
+              from: forEasySwapper ? routerAddress[pool.network].toros : pool.address,
+              receiver: forEasySwapper ? routerAddress[pool.network].toros : pool.address,
+              slippage: slippage,
+              disableEstimate: true,
+              usePermit2: false
+            };
+            _context.prev = 6;
+            _context.next = 9;
+            return axios.get(apiUrl, {
+              headers: {
+                Authorization: "Bearer " + process.env.ONEINCH_API_KEY
+              },
+              params: params
+            });
+
+          case 9:
+            response = _context.sent;
+            swapTxData = response.data.tx.data;
+            dstAmount = response.data.dstAmount;
+            return _context.abrupt("return", {
+              swapTxData: swapTxData,
+              dstAmount: dstAmount
+            });
+
+          case 15:
+            _context.prev = 15;
+            _context.t0 = _context["catch"](6);
+            throw new ApiError("Swap api request of 1inch failed");
+
+          case 18:
+          case "end":
+            return _context.stop();
+        }
+      }
+    }, _callee, null, [[6, 15]]);
+  }));
+  return _getOneInchSwapTxData.apply(this, arguments);
+}
+
+var _networkPortMap;
+
+require("dotenv").config();
+
+var networkPortMap = (_networkPortMap = {}, _networkPortMap[Network.POLYGON] = 8542, _networkPortMap[Network.OPTIMISM] = 8544, _networkPortMap[Network.ARBITRUM] = 8540, _networkPortMap[Network.BASE] = 8546, _networkPortMap);
+
+var _TEST_POOL, _CONTRACT_ADDRESS, _USDC_BALANCEOF_SLOT, _WETH_BALANCEOF_SLOT;
+var TEST_POOL = (_TEST_POOL = {}, _TEST_POOL[Network.POLYGON] = "0x699fd4d6eadb216704c7e355cfa0a12f51813163", _TEST_POOL[Network.OPTIMISM] = "0x12573bfdf764ab9d52aca20e2827497a66829716", _TEST_POOL[Network.ARBITRUM] = "0x0b5f6591c8eb23e5a68102d3d39ebbb464ee5c14", _TEST_POOL[Network.BASE] = "0x4842b42F68524383F609aa46eAfc18c1459cE3cD", _TEST_POOL);
+var CONTRACT_ADDRESS = (_CONTRACT_ADDRESS = {}, _CONTRACT_ADDRESS[Network.POLYGON] = {
+  USDC: "0x2791Bca1f2de4661ED88A30C99A7a9449Aa84174",
+  USDT: "",
+  SUSD: "",
+  SWETH: "",
+  WETH: "0x7ceB23fD6bC0adD59E62ac25578270cFf1b9f619",
+  WBTC: "0x1BFD67037B42Cf73acF2047067bd4F2C47D9BfD6",
+  ARRAKIS_USDC_WETH_GAUGE: "0x33d1ad9Cd88A509397CD924C2d7613C285602C20",
+  ARRAKIS_USDC_WETH_LP: "0xa173340f1e942c2845bcbce8ebd411022e18eb13",
+  WMATIC: "0x0d500B1d8E8eF31E21C99d1Db9A6444d3ADf1270",
+  uniswapV3: {
+    nonfungiblePositionManager: "0xC36442b4a4522E871399CD717aBDD847Ab11FE88"
+  },
+  VELODROME_CL_USDC_WETH_GAUGE: "",
+  VELO: "",
+  COMPOUNDV3_WETH: "",
+  TOROS: ""
+}, _CONTRACT_ADDRESS[Network.OPTIMISM] = {
+  USDC: "0x0b2c639c533813f4aa9d7837caf62653d097ff85",
+  USDT: "",
+  SWETH: "",
+  SUSD: "0x8c6f28f2f1a3c87f0f938b96d27520d9751ec8d9",
+  WETH: "0x4200000000000000000000000000000000000006",
+  WBTC: "0x68f180fcCe6836688e9084f035309E29Bf0A2095",
+  KWENTA_ETH_PERP_V2: "0x2b3bb4c683bfc5239b029131eef3b1d214478d93",
+  uniswapV3: {
+    nonfungiblePositionManager: "0xC36442b4a4522E871399CD717aBDD847Ab11FE88"
+  },
+  WMATIC: "",
+  //
+  ARRAKIS_USDC_WETH_GAUGE: "",
+  ARRAKIS_USDC_WETH_LP: "",
+  VELODROME_CL_USDC_WETH_GAUGE: "0xa75127121d28a9BF848F3B70e7Eea26570aa7700",
+  VELO: "0x9560e827aF36c94D2Ac33a39bCE1Fe78631088Db",
+  COMPOUNDV3_WETH: "",
+  TOROS: "0x49bf093277bf4dde49c48c6aa55a3bda3eedef68" //USDmny
+
+}, _CONTRACT_ADDRESS[Network.ARBITRUM] = {
+  USDC: "0xaf88d065e77c8cC2239327C5EDb3A432268e5831",
+  USDT: "",
+  SUSD: "",
+  SWETH: "0xbc011A12Da28e8F0f528d9eE5E7039E22F91cf18",
+  WETH: "0x82af49447d8a07e3bd95bd0d56f35241523fbab1",
+  WBTC: "0x2f2a2543b76a4166549f7aab2e75bef0aefc5b0f",
+  WSTETH: "0x5979d7b546e38e414f7e9822514be443a4800529",
+  BALANCER_WSTETH_WETH_POOL: "0x36bf227d6bac96e2ab1ebb5492ecec69c691943f",
+  BALANCER_WSTETH_WETH_GAUGE: "0x251e51b25afa40f2b6b9f05aaf1bc7eaa0551771",
+  uniswapV3: {
+    nonfungiblePositionManager: "0xC36442b4a4522E871399CD717aBDD847Ab11FE88"
+  },
+  //
+  ARRAKIS_USDC_WETH_GAUGE: "",
+  ARRAKIS_USDC_WETH_LP: "",
+  WMATIC: "",
+  VELODROME_CL_USDC_WETH_GAUGE: "",
+  VELO: "",
+  COMPOUNDV3_WETH: "0x6f7D514bbD4aFf3BcD1140B7344b32f063dEe486",
+  TOROS: ""
+}, _CONTRACT_ADDRESS[Network.BASE] = {
+  USDC: "0x833589fcd6edb6e08f4c7c32d4f71b54bda02913",
+  USDT: "0xfde4c96c8593536e31f229ea8f37b2ada2699bb2",
+  SUSD: "",
+  WETH: "0x4200000000000000000000000000000000000006",
+  WBTC: "",
+  SWETH: "",
+  uniswapV3: {
+    nonfungiblePositionManager: ""
+  },
+  //
+  ARRAKIS_USDC_WETH_GAUGE: "",
+  ARRAKIS_USDC_WETH_LP: "",
+  WMATIC: "",
+  VELODROME_CL_USDC_WETH_GAUGE: "0xF33a96b5932D9E9B9A0eDA447AbD8C9d48d2e0c8",
+  VELO: "0x940181a94A35A4569E4529A3CDfB74e38FD98631",
+  COMPOUNDV3_WETH: "",
+  TOROS: ""
+}, _CONTRACT_ADDRESS);
+var USDC_BALANCEOF_SLOT = (_USDC_BALANCEOF_SLOT = {}, _USDC_BALANCEOF_SLOT[Network.OPTIMISM] = 9, _USDC_BALANCEOF_SLOT[Network.ARBITRUM] = 9, _USDC_BALANCEOF_SLOT[Network.POLYGON] = 0, _USDC_BALANCEOF_SLOT[Network.BASE] = 9, _USDC_BALANCEOF_SLOT);
+var WETH_BALANCEOF_SLOT = (_WETH_BALANCEOF_SLOT = {}, _WETH_BALANCEOF_SLOT[Network.OPTIMISM] = 3, _WETH_BALANCEOF_SLOT[Network.ARBITRUM] = 51, _WETH_BALANCEOF_SLOT[Network.POLYGON] = 0, _WETH_BALANCEOF_SLOT[Network.BASE] = 0, _WETH_BALANCEOF_SLOT);
+
+var wait = function wait(seconds) {
+  return new Promise(function (resolve) {
+    return setTimeout(resolve, seconds * 1000);
+  });
+};
+
 function getPoolDepositAsset(_x, _x2, _x3) {
   return _getPoolDepositAsset.apply(this, arguments);
 }
@@ -11307,52 +10505,20 @@ function _getPoolDepositAsset() {
   return _getPoolDepositAsset.apply(this, arguments);
 }
 
-function getTorosPoolTokenPrice(_x4, _x5) {
-  return _getTorosPoolTokenPrice.apply(this, arguments);
-}
-
-function _getTorosPoolTokenPrice() {
-  _getTorosPoolTokenPrice = _asyncToGenerator( /*#__PURE__*/runtime_1.mark(function _callee2(pool, poolAddress) {
-    var torosPool;
-    return runtime_1.wrap(function _callee2$(_context2) {
-      while (1) {
-        switch (_context2.prev = _context2.next) {
-          case 0:
-            _context2.next = 2;
-            return loadPool(pool, poolAddress);
-
-          case 2:
-            torosPool = _context2.sent;
-            _context2.next = 5;
-            return torosPool.poolLogic.tokenPrice();
-
-          case 5:
-            return _context2.abrupt("return", _context2.sent);
-
-          case 6:
-          case "end":
-            return _context2.stop();
-        }
-      }
-    }, _callee2);
-  }));
-  return _getTorosPoolTokenPrice.apply(this, arguments);
-}
-
-function getEasySwapperDepositQuote(_x6, _x7, _x8, _x9, _x10) {
+function getEasySwapperDepositQuote(_x6, _x7, _x8, _x9) {
   return _getEasySwapperDepositQuote.apply(this, arguments);
 }
 
 function _getEasySwapperDepositQuote() {
-  _getEasySwapperDepositQuote = _asyncToGenerator( /*#__PURE__*/runtime_1.mark(function _callee3(pool, torosAsset, investAsset, depositAsset, amountIn) {
+  _getEasySwapperDepositQuote = _asyncToGenerator( /*#__PURE__*/runtime_1.mark(function _callee3(pool, torosAsset, investAsset, amountIn) {
     var easySwapper;
     return runtime_1.wrap(function _callee3$(_context3) {
       while (1) {
         switch (_context3.prev = _context3.next) {
           case 0:
-            easySwapper = new ethers.Contract(routerAddress[pool.network][Dapp.TOROS], IDhedgeEasySwapper.abi, pool.signer);
+            easySwapper = new ethers.Contract(routerAddress[pool.network][Dapp.TOROS], IDhedgeEasySwapper, pool.signer);
             _context3.next = 3;
-            return easySwapper.depositQuote(torosAsset, investAsset, amountIn, depositAsset, true);
+            return easySwapper.depositQuote(torosAsset, investAsset, amountIn);
 
           case 3:
             return _context3.abrupt("return", _context3.sent);
@@ -11367,104 +10533,151 @@ function _getEasySwapperDepositQuote() {
   return _getEasySwapperDepositQuote.apply(this, arguments);
 }
 
-function getEasySwapperWithdrawalQuote(_x11, _x12, _x13, _x14) {
-  return _getEasySwapperWithdrawalQuote.apply(this, arguments);
+function getEasySwapperTxData(_x14, _x15, _x16, _x17, _x18) {
+  return _getEasySwapperTxData.apply(this, arguments);
 }
 
-function _getEasySwapperWithdrawalQuote() {
-  _getEasySwapperWithdrawalQuote = _asyncToGenerator( /*#__PURE__*/runtime_1.mark(function _callee4(pool, torosAsset, investAsset, amountIn) {
-    var _yield$Promise$all, torosTokenPrice, assetPrice, assetDecimals;
+function _getEasySwapperTxData() {
+  _getEasySwapperTxData = _asyncToGenerator( /*#__PURE__*/runtime_1.mark(function _callee5(pool, assetFrom, assetTo, amountIn, slippage // eslint-disable-next-line @typescript-eslint/no-explicit-any
+  ) {
+    var isWithdrawal, _ref, torosAsset, investAsset, iDhedgeEasySwapper, depositAsset, minAmountOut;
 
-    return runtime_1.wrap(function _callee4$(_context4) {
+    return runtime_1.wrap(function _callee5$(_context5) {
       while (1) {
-        switch (_context4.prev = _context4.next) {
+        switch (_context5.prev = _context5.next) {
           case 0:
-            _context4.next = 2;
-            return Promise.all([getTorosPoolTokenPrice(pool, torosAsset), getChainlinkPriceInUsd(pool, investAsset), pool.utils.getDecimals(investAsset)]);
+            _context5.next = 2;
+            return isPool(pool, assetFrom);
 
           case 2:
-            _yield$Promise$all = _context4.sent;
-            torosTokenPrice = _yield$Promise$all[0];
-            assetPrice = _yield$Promise$all[1];
-            assetDecimals = _yield$Promise$all[2];
-            return _context4.abrupt("return", amountIn.mul(torosTokenPrice).div(assetPrice).div(1e10).div(Math.pow(10, 18 - assetDecimals)));
+            isWithdrawal = _context5.sent;
+            _ref = isWithdrawal ? [assetFrom, assetTo] : [assetTo, assetFrom], torosAsset = _ref[0], investAsset = _ref[1];
+            iDhedgeEasySwapper = new ethers.utils.Interface(IDhedgeEasySwapper);
+
+            if (!isWithdrawal) {
+              _context5.next = 9;
+              break;
+            }
+
+            return _context5.abrupt("return", iDhedgeEasySwapper.encodeFunctionData("initWithdrawal", [torosAsset, amountIn, slippage * 100]));
+
+          case 9:
+            _context5.next = 11;
+            return getPoolDepositAsset(pool, torosAsset, investAsset);
+
+          case 11:
+            depositAsset = _context5.sent;
+
+            if (depositAsset) {
+              _context5.next = 14;
+              break;
+            }
+
+            throw new Error("no deposit assets");
+
+          case 14:
+            if (!(depositAsset.toLowerCase() !== investAsset.toLowerCase())) {
+              _context5.next = 16;
+              break;
+            }
+
+            throw new Error("can only trade deposit asset");
+
+          case 16:
+            _context5.next = 18;
+            return getEasySwapperDepositQuote(pool, torosAsset, investAsset, amountIn);
+
+          case 18:
+            minAmountOut = _context5.sent;
+            return _context5.abrupt("return", iDhedgeEasySwapper.encodeFunctionData("depositWithCustomCooldown", [torosAsset, depositAsset, amountIn, minAmountOut.mul(10000 - slippage * 100).div(10000)]));
 
-          case 7:
+          case 20:
           case "end":
-            return _context4.stop();
+            return _context5.stop();
         }
       }
-    }, _callee4);
+    }, _callee5);
   }));
-  return _getEasySwapperWithdrawalQuote.apply(this, arguments);
+  return _getEasySwapperTxData.apply(this, arguments);
 }
 
-function getEasySwapperTxData(_x15, _x16, _x17, _x18, _x19) {
-  return _getEasySwapperTxData.apply(this, arguments);
+function getCompleteWithdrawalTxData(_x19, _x20, _x21) {
+  return _getCompleteWithdrawalTxData.apply(this, arguments);
 }
 
-function _getEasySwapperTxData() {
-  _getEasySwapperTxData = _asyncToGenerator( /*#__PURE__*/runtime_1.mark(function _callee5(pool, assetFrom, assetTo, amountIn, slippage // eslint-disable-next-line @typescript-eslint/no-explicit-any
+function _getCompleteWithdrawalTxData() {
+  _getCompleteWithdrawalTxData = _asyncToGenerator( /*#__PURE__*/runtime_1.mark(function _callee6(pool, destToken, slippage // eslint-disable-next-line @typescript-eslint/no-explicit-any
   ) {
-    var isWithdrawal, _ref, torosAsset, investAsset, iDhedgeEasySwapper, minAmountOut, depositAsset, _minAmountOut;
+    var easySwapper, trackedAssets, trackedAssetsExcludingDestToken, srcData, minDestAmount, _iterator, _step, _step$value, token, balance, _yield$getOneInchSwap, swapTxData, dstAmount;
 
-    return runtime_1.wrap(function _callee5$(_context5) {
+    return runtime_1.wrap(function _callee6$(_context6) {
       while (1) {
-        switch (_context5.prev = _context5.next) {
+        switch (_context6.prev = _context6.next) {
           case 0:
-            _context5.next = 2;
-            return isPool(pool, assetFrom);
-
-          case 2:
-            isWithdrawal = _context5.sent;
-            _ref = isWithdrawal ? [assetFrom, assetTo] : [assetTo, assetFrom], torosAsset = _ref[0], investAsset = _ref[1];
-            iDhedgeEasySwapper = new ethers.utils.Interface(IDhedgeEasySwapper.abi);
-
-            if (!isWithdrawal) {
-              _context5.next = 12;
-              break;
-            }
+            easySwapper = new ethers.Contract(routerAddress[pool.network][Dapp.TOROS], IDhedgeEasySwapper, pool.signer);
+            _context6.next = 3;
+            return easySwapper.getTrackedAssets(pool.address);
 
-            _context5.next = 8;
-            return getEasySwapperWithdrawalQuote(pool, torosAsset, investAsset, amountIn);
+          case 3:
+            trackedAssets = _context6.sent;
+            trackedAssetsExcludingDestToken = trackedAssets.filter(function (_ref2) {
+              var token = _ref2.token;
+              return token.toLowerCase() !== destToken.toLowerCase();
+            });
+            srcData = [];
+            minDestAmount = ethers.BigNumber.from(0);
+            _iterator = _createForOfIteratorHelperLoose(trackedAssetsExcludingDestToken);
 
           case 8:
-            minAmountOut = _context5.sent;
-            return _context5.abrupt("return", iDhedgeEasySwapper.encodeFunctionData("withdraw", [torosAsset, amountIn, investAsset, minAmountOut.mul(10000 - slippage * 100).div(10000)]));
-
-          case 12:
-            _context5.next = 14;
-            return getPoolDepositAsset(pool, torosAsset, investAsset);
-
-          case 14:
-            depositAsset = _context5.sent;
-
-            if (depositAsset) {
-              _context5.next = 17;
+            if ((_step = _iterator()).done) {
+              _context6.next = 21;
               break;
             }
 
-            throw new Error("no deposit assets");
+            _step$value = _step.value, token = _step$value.token, balance = _step$value.balance;
+            _context6.next = 12;
+            return getOneInchSwapTxData(pool, token, destToken, balance, slippage, true);
 
-          case 17:
-            _context5.next = 19;
-            return getEasySwapperDepositQuote(pool, torosAsset, investAsset, depositAsset, amountIn);
+          case 12:
+            _yield$getOneInchSwap = _context6.sent;
+            swapTxData = _yield$getOneInchSwap.swapTxData;
+            dstAmount = _yield$getOneInchSwap.dstAmount;
+            srcData.push({
+              token: token,
+              amount: balance,
+              aggregatorData: {
+                routerKey: ethers.utils.formatBytes32String("ONE_INCH"),
+                swapData: swapTxData
+              }
+            });
+            minDestAmount = minDestAmount.add(dstAmount);
+            _context6.next = 19;
+            return wait(2);
 
           case 19:
-            _minAmountOut = _context5.sent;
-            return _context5.abrupt("return", iDhedgeEasySwapper.encodeFunctionData("depositWithCustomCooldown", [torosAsset, investAsset, amountIn, depositAsset, _minAmountOut.mul(10000 - slippage * 100).div(10000)]));
+            _context6.next = 8;
+            break;
 
           case 21:
+            return _context6.abrupt("return", easySwapper["interface"].encodeFunctionData("completeWithdrawal", [{
+              srcData: srcData,
+              destData: {
+                destToken: destToken,
+                minDestAmount: minDestAmount
+              }
+            }, minDestAmount.mul(10000 - slippage * 100).div(10000)]));
+
+          case 22:
           case "end":
-            return _context5.stop();
+            return _context6.stop();
         }
       }
-    }, _callee5);
+    }, _callee6);
   }));
-  return _getEasySwapperTxData.apply(this, arguments);
+  return _getCompleteWithdrawalTxData.apply(this, arguments);
 }
 
-var abi$k = [
+var abi$h = [
 	{
 		inputs: [
 			{
@@ -12391,10 +11604,10 @@ var abi$k = [
 	}
 ];
 var IAaveV3Incentives = {
-	abi: abi$k
+	abi: abi$h
 };
 
-var abi$l = [
+var abi$i = [
 	{
 		inputs: [
 			{
@@ -14143,7 +13356,7 @@ var abi$l = [
 	}
 ];
 var ILendingPoolV3 = {
-	abi: abi$l
+	abi: abi$i
 };
 
 function getAaveAssetsForUnderlying(_x, _x2, _x3) {
@@ -14214,7 +13427,7 @@ function _getAaveV3ClaimTxData() {
   return _getAaveV3ClaimTxData.apply(this, arguments);
 }
 
-var abi$m = [
+var abi$j = [
 	{
 		inputs: [
 			{
@@ -15196,7 +14409,7 @@ var abi$m = [
 	}
 ];
 var IVelodromeRouter = {
-	abi: abi$m
+	abi: abi$j
 };
 
 function getVelodromeAddLiquidityTxData(_x, _x2, _x3, _x4, _x5, _x6) {
@@ -15303,7 +14516,7 @@ function _getVelodromeClOwner() {
   return _getVelodromeClOwner.apply(this, arguments);
 }
 
-var abi$n = [
+var abi$k = [
 	{
 		inputs: [
 			{
@@ -16345,10 +15558,10 @@ var abi$n = [
 	}
 ];
 var IVelodromeGaugeV1 = {
-	abi: abi$n
+	abi: abi$k
 };
 
-var abi$o = [
+var abi$l = [
 	{
 		inputs: [
 			{
@@ -16548,10 +15761,10 @@ var abi$o = [
 	}
 ];
 var IVelodromeGaugeV2 = {
-	abi: abi$o
+	abi: abi$l
 };
 
-var abi$p = [
+var abi$m = [
 	{
 		inputs: [
 			{
@@ -16722,7 +15935,7 @@ var abi$p = [
 	}
 ];
 var IVelodromeCLGauge = {
-	abi: abi$p
+	abi: abi$m
 };
 
 function call(_x, _x2, _x3, _x4) {
@@ -17008,7 +16221,7 @@ function _getStrike() {
   return _getStrike.apply(this, arguments);
 }
 
-var abi$q = [
+var abi$n = [
 	{
 		inputs: [
 			{
@@ -18360,7 +17573,7 @@ var abi$q = [
 	}
 ];
 var IOptionMarketWrapper = {
-	abi: abi$q
+	abi: abi$n
 };
 
 function getLyraTradeOptionType(isCall, isLong, isCoveredCall) {
@@ -18377,7 +17590,7 @@ function isLong(optionType) {
   return optionType === 0 || optionType === 1;
 }
 
-var abi$r = [
+var abi$o = [
 	{
 		inputs: [
 			{
@@ -20711,7 +19924,7 @@ var abi$r = [
 	}
 ];
 var IOptionToken = {
-	abi: abi$r
+	abi: abi$o
 };
 
 function getOptionPositions(_x, _x2) {
@@ -20849,7 +20062,7 @@ function _getLyraOptionTxData() {
   return _getLyraOptionTxData.apply(this, arguments);
 }
 
-var abi$s = [
+var abi$p = [
 	{
 		inputs: [
 			{
@@ -21394,7 +20607,7 @@ var abi$s = [
 	}
 ];
 var ISynthetixFuturesMarketV2 = {
-	abi: abi$s
+	abi: abi$p
 };
 
 function getFuturesChangeMarginTxData(amount) {
@@ -21545,67 +20758,7 @@ var getZeroExTradeTxData = /*#__PURE__*/function () {
   };
 }();
 
-var oneInchBaseUrl = "https://api.1inch.dev/swap/v6.0/";
-function getOneInchSwapTxData(_x, _x2, _x3, _x4, _x5) {
-  return _getOneInchSwapTxData.apply(this, arguments);
-}
-
-function _getOneInchSwapTxData() {
-  _getOneInchSwapTxData = _asyncToGenerator( /*#__PURE__*/runtime_1.mark(function _callee(pool, assetFrom, assetTo, amountIn, slippage) {
-    var chainId, apiUrl, params, response;
-    return runtime_1.wrap(function _callee$(_context) {
-      while (1) {
-        switch (_context.prev = _context.next) {
-          case 0:
-            if (process.env.ONEINCH_API_KEY) {
-              _context.next = 2;
-              break;
-            }
-
-            throw new Error("ONEINCH_API_KEY not configured in .env file");
-
-          case 2:
-            chainId = networkChainIdMap[pool.network];
-            apiUrl = "" + oneInchBaseUrl + chainId + "/swap";
-            params = {
-              src: assetFrom,
-              dst: assetTo,
-              amount: amountIn.toString(),
-              from: pool.address,
-              origin: pool.signer.address,
-              slippage: slippage,
-              disableEstimate: true,
-              usePermit2: false
-            };
-            _context.prev = 5;
-            _context.next = 8;
-            return axios.get(apiUrl, {
-              headers: {
-                Authorization: "Bearer " + process.env.ONEINCH_API_KEY
-              },
-              params: params
-            });
-
-          case 8:
-            response = _context.sent;
-            return _context.abrupt("return", response.data.tx.data);
-
-          case 12:
-            _context.prev = 12;
-            _context.t0 = _context["catch"](5);
-            throw new ApiError("Swap api request of 1inch failed");
-
-          case 15:
-          case "end":
-            return _context.stop();
-        }
-      }
-    }, _callee, null, [[5, 12]]);
-  }));
-  return _getOneInchSwapTxData.apply(this, arguments);
-}
-
-var abi$t = [
+var abi$q = [
 	{
 		inputs: [
 			{
@@ -21706,7 +20859,7 @@ var abi$t = [
 	}
 ];
 var IXRam = {
-	abi: abi$t
+	abi: abi$q
 };
 
 /* eslint-disable @typescript-eslint/no-explicit-any */
@@ -24470,31 +23623,454 @@ var ICompoundV3Comet = [
 	{
 		inputs: [
 		],
-		name: "baseToken",
+		name: "baseToken",
+		outputs: [
+			{
+				internalType: "address",
+				name: "",
+				type: "address"
+			}
+		],
+		stateMutability: "view",
+		type: "function"
+	},
+	{
+		inputs: [
+			{
+				internalType: "address",
+				name: "asset",
+				type: "address"
+			},
+			{
+				internalType: "uint256",
+				name: "amount",
+				type: "uint256"
+			}
+		],
+		name: "supply",
+		outputs: [
+		],
+		stateMutability: "nonpayable",
+		type: "function"
+	},
+	{
+		inputs: [
+			{
+				internalType: "address",
+				name: "asset",
+				type: "address"
+			},
+			{
+				internalType: "uint256",
+				name: "amount",
+				type: "uint256"
+			}
+		],
+		name: "withdraw",
+		outputs: [
+		],
+		stateMutability: "nonpayable",
+		type: "function"
+	}
+];
+
+function getCompoundV3LendTxData(asset, amount) {
+  return new ethers.utils.Interface(ICompoundV3Comet).encodeFunctionData("supply", [asset, amount]);
+}
+function getCompoundV3WithdrawTxData(asset, amount) {
+  return new ethers.utils.Interface(ICompoundV3Comet).encodeFunctionData("withdraw", [asset, amount]);
+}
+
+var ICometRewards = [
+	{
+		inputs: [
+			{
+				internalType: "address",
+				name: "governor_",
+				type: "address"
+			}
+		],
+		stateMutability: "nonpayable",
+		type: "constructor"
+	},
+	{
+		inputs: [
+			{
+				internalType: "address",
+				name: "",
+				type: "address"
+			}
+		],
+		name: "AlreadyConfigured",
+		type: "error"
+	},
+	{
+		inputs: [
+		],
+		name: "BadData",
+		type: "error"
+	},
+	{
+		inputs: [
+			{
+				internalType: "uint256",
+				name: "",
+				type: "uint256"
+			}
+		],
+		name: "InvalidUInt64",
+		type: "error"
+	},
+	{
+		inputs: [
+			{
+				internalType: "address",
+				name: "",
+				type: "address"
+			}
+		],
+		name: "NotPermitted",
+		type: "error"
+	},
+	{
+		inputs: [
+			{
+				internalType: "address",
+				name: "",
+				type: "address"
+			}
+		],
+		name: "NotSupported",
+		type: "error"
+	},
+	{
+		inputs: [
+			{
+				internalType: "address",
+				name: "",
+				type: "address"
+			},
+			{
+				internalType: "uint256",
+				name: "",
+				type: "uint256"
+			}
+		],
+		name: "TransferOutFailed",
+		type: "error"
+	},
+	{
+		anonymous: false,
+		inputs: [
+			{
+				indexed: true,
+				internalType: "address",
+				name: "oldGovernor",
+				type: "address"
+			},
+			{
+				indexed: true,
+				internalType: "address",
+				name: "newGovernor",
+				type: "address"
+			}
+		],
+		name: "GovernorTransferred",
+		type: "event"
+	},
+	{
+		anonymous: false,
+		inputs: [
+			{
+				indexed: true,
+				internalType: "address",
+				name: "src",
+				type: "address"
+			},
+			{
+				indexed: true,
+				internalType: "address",
+				name: "recipient",
+				type: "address"
+			},
+			{
+				indexed: true,
+				internalType: "address",
+				name: "token",
+				type: "address"
+			},
+			{
+				indexed: false,
+				internalType: "uint256",
+				name: "amount",
+				type: "uint256"
+			}
+		],
+		name: "RewardClaimed",
+		type: "event"
+	},
+	{
+		anonymous: false,
+		inputs: [
+			{
+				indexed: true,
+				internalType: "address",
+				name: "user",
+				type: "address"
+			},
+			{
+				indexed: true,
+				internalType: "address",
+				name: "comet",
+				type: "address"
+			},
+			{
+				indexed: false,
+				internalType: "uint256",
+				name: "amount",
+				type: "uint256"
+			}
+		],
+		name: "RewardsClaimedSet",
+		type: "event"
+	},
+	{
+		inputs: [
+			{
+				internalType: "address",
+				name: "comet",
+				type: "address"
+			},
+			{
+				internalType: "address",
+				name: "src",
+				type: "address"
+			},
+			{
+				internalType: "bool",
+				name: "shouldAccrue",
+				type: "bool"
+			}
+		],
+		name: "claim",
+		outputs: [
+		],
+		stateMutability: "nonpayable",
+		type: "function"
+	},
+	{
+		inputs: [
+			{
+				internalType: "address",
+				name: "comet",
+				type: "address"
+			},
+			{
+				internalType: "address",
+				name: "src",
+				type: "address"
+			},
+			{
+				internalType: "address",
+				name: "to",
+				type: "address"
+			},
+			{
+				internalType: "bool",
+				name: "shouldAccrue",
+				type: "bool"
+			}
+		],
+		name: "claimTo",
+		outputs: [
+		],
+		stateMutability: "nonpayable",
+		type: "function"
+	},
+	{
+		inputs: [
+			{
+				internalType: "address",
+				name: "comet",
+				type: "address"
+			},
+			{
+				internalType: "address",
+				name: "account",
+				type: "address"
+			}
+		],
+		name: "getRewardOwed",
+		outputs: [
+			{
+				components: [
+					{
+						internalType: "address",
+						name: "token",
+						type: "address"
+					},
+					{
+						internalType: "uint256",
+						name: "owed",
+						type: "uint256"
+					}
+				],
+				internalType: "struct CometRewards.RewardOwed",
+				name: "",
+				type: "tuple"
+			}
+		],
+		stateMutability: "nonpayable",
+		type: "function"
+	},
+	{
+		inputs: [
+		],
+		name: "governor",
+		outputs: [
+			{
+				internalType: "address",
+				name: "",
+				type: "address"
+			}
+		],
+		stateMutability: "view",
+		type: "function"
+	},
+	{
+		inputs: [
+			{
+				internalType: "address",
+				name: "",
+				type: "address"
+			}
+		],
+		name: "rewardConfig",
+		outputs: [
+			{
+				internalType: "address",
+				name: "token",
+				type: "address"
+			},
+			{
+				internalType: "uint64",
+				name: "rescaleFactor",
+				type: "uint64"
+			},
+			{
+				internalType: "bool",
+				name: "shouldUpscale",
+				type: "bool"
+			},
+			{
+				internalType: "uint256",
+				name: "multiplier",
+				type: "uint256"
+			}
+		],
+		stateMutability: "view",
+		type: "function"
+	},
+	{
+		inputs: [
+			{
+				internalType: "address",
+				name: "",
+				type: "address"
+			},
+			{
+				internalType: "address",
+				name: "",
+				type: "address"
+			}
+		],
+		name: "rewardsClaimed",
+		outputs: [
+			{
+				internalType: "uint256",
+				name: "",
+				type: "uint256"
+			}
+		],
+		stateMutability: "view",
+		type: "function"
+	},
+	{
+		inputs: [
+			{
+				internalType: "address",
+				name: "comet",
+				type: "address"
+			},
+			{
+				internalType: "address",
+				name: "token",
+				type: "address"
+			}
+		],
+		name: "setRewardConfig",
+		outputs: [
+		],
+		stateMutability: "nonpayable",
+		type: "function"
+	},
+	{
+		inputs: [
+			{
+				internalType: "address",
+				name: "comet",
+				type: "address"
+			},
+			{
+				internalType: "address",
+				name: "token",
+				type: "address"
+			},
+			{
+				internalType: "uint256",
+				name: "multiplier",
+				type: "uint256"
+			}
+		],
+		name: "setRewardConfigWithMultiplier",
 		outputs: [
+		],
+		stateMutability: "nonpayable",
+		type: "function"
+	},
+	{
+		inputs: [
 			{
 				internalType: "address",
-				name: "",
+				name: "comet",
 				type: "address"
+			},
+			{
+				internalType: "address[]",
+				name: "users",
+				type: "address[]"
+			},
+			{
+				internalType: "uint256[]",
+				name: "claimedAmounts",
+				type: "uint256[]"
 			}
 		],
-		stateMutability: "view",
+		name: "setRewardsClaimed",
+		outputs: [
+		],
+		stateMutability: "nonpayable",
 		type: "function"
 	},
 	{
 		inputs: [
 			{
 				internalType: "address",
-				name: "asset",
+				name: "newGovernor",
 				type: "address"
-			},
-			{
-				internalType: "uint256",
-				name: "amount",
-				type: "uint256"
 			}
 		],
-		name: "supply",
+		name: "transferGovernor",
 		outputs: [
 		],
 		stateMutability: "nonpayable",
@@ -24504,7 +24080,12 @@ var ICompoundV3Comet = [
 		inputs: [
 			{
 				internalType: "address",
-				name: "asset",
+				name: "token",
+				type: "address"
+			},
+			{
+				internalType: "address",
+				name: "to",
 				type: "address"
 			},
 			{
@@ -24513,7 +24094,7 @@ var ICompoundV3Comet = [
 				type: "uint256"
 			}
 		],
-		name: "withdraw",
+		name: "withdrawToken",
 		outputs: [
 		],
 		stateMutability: "nonpayable",
@@ -24521,11 +24102,9 @@ var ICompoundV3Comet = [
 	}
 ];
 
-function getCompoundV3LendTxData(asset, amount) {
-  return new ethers.utils.Interface(ICompoundV3Comet).encodeFunctionData("supply", [asset, amount]);
-}
-function getCompoundV3WithdrawTxData(asset, amount) {
-  return new ethers.utils.Interface(ICompoundV3Comet).encodeFunctionData("withdraw", [asset, amount]);
+function getCompoundV3ClaimTxData(pool, asset) {
+  var iCometRewards = new ethers.utils.Interface(ICometRewards);
+  return iCometRewards.encodeFunctionData("claim", [asset, pool.address, true]);
 }
 
 var Pool = /*#__PURE__*/function () {
@@ -25041,7 +24620,8 @@ var Pool = /*#__PURE__*/function () {
   /*#__PURE__*/
   function () {
     var _trade = /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/runtime_1.mark(function _callee10(dapp, assetFrom, assetTo, amountIn, slippage, options, estimateGas) {
-      var swapTxData, iSynthetix, assets, daoAddress, iUniswapV2Router, minAmountOut, tx;
+      var swapTxData, _yield$getOneInchSwap, iSynthetix, assets, daoAddress, iUniswapV2Router, minAmountOut, tx;
+
       return runtime_1.wrap(function _callee10$(_context10) {
         while (1) {
           switch (_context10.prev = _context10.next) {
@@ -25059,7 +24639,7 @@ var Pool = /*#__PURE__*/function () {
               }
 
               _context10.t0 = dapp;
-              _context10.next = _context10.t0 === Dapp.ZEROEX ? 6 : _context10.t0 === Dapp.ONEINCH ? 10 : _context10.t0 === Dapp.BALANCER ? 14 : _context10.t0 === Dapp.SYNTHETIX ? 18 : _context10.t0 === Dapp.TOROS ? 25 : 29;
+              _context10.next = _context10.t0 === Dapp.ZEROEX ? 6 : _context10.t0 === Dapp.ONEINCH ? 10 : _context10.t0 === Dapp.BALANCER ? 15 : _context10.t0 === Dapp.SYNTHETIX ? 19 : _context10.t0 === Dapp.TOROS ? 26 : 30;
               break;
 
             case 6:
@@ -25068,51 +24648,52 @@ var Pool = /*#__PURE__*/function () {
 
             case 8:
               swapTxData = _context10.sent;
-              return _context10.abrupt("break", 44);
+              return _context10.abrupt("break", 45);
 
             case 10:
               _context10.next = 12;
               return getOneInchSwapTxData(this, assetFrom, assetTo, amountIn, slippage);
 
             case 12:
-              swapTxData = _context10.sent;
-              return _context10.abrupt("break", 44);
+              _yield$getOneInchSwap = _context10.sent;
+              swapTxData = _yield$getOneInchSwap.swapTxData;
+              return _context10.abrupt("break", 45);
 
-            case 14:
-              _context10.next = 16;
+            case 15:
+              _context10.next = 17;
               return this.utils.getBalancerSwapTx(this, assetFrom, assetTo, amountIn, slippage);
 
-            case 16:
+            case 17:
               swapTxData = _context10.sent;
-              return _context10.abrupt("break", 44);
+              return _context10.abrupt("break", 45);
 
-            case 18:
+            case 19:
               iSynthetix = new ethers.utils.Interface(ISynthetix.abi);
               assets = [assetFrom, assetTo].map(function (asset) {
                 return ethers.utils.formatBytes32String(asset);
               });
-              _context10.next = 22;
+              _context10.next = 23;
               return this.factory.owner();
 
-            case 22:
+            case 23:
               daoAddress = _context10.sent;
               swapTxData = iSynthetix.encodeFunctionData(Transaction.SWAP_SYNTHS, [assets[0], amountIn, assets[1], daoAddress, SYNTHETIX_TRACKING_CODE]);
-              return _context10.abrupt("break", 44);
+              return _context10.abrupt("break", 45);
 
-            case 25:
-              _context10.next = 27;
+            case 26:
+              _context10.next = 28;
               return getEasySwapperTxData(this, assetFrom, assetTo, ethers.BigNumber.from(amountIn), slippage);
 
-            case 27:
+            case 28:
               swapTxData = _context10.sent;
-              return _context10.abrupt("break", 44);
+              return _context10.abrupt("break", 45);
 
-            case 29:
+            case 30:
               iUniswapV2Router = new ethers.utils.Interface(IUniswapV2Router.abi);
-              _context10.next = 32;
+              _context10.next = 33;
               return this.utils.getMinAmountOut(dapp, assetFrom, assetTo, amountIn, slippage);
 
-            case 32:
+            case 33:
               minAmountOut = _context10.sent;
               _context10.t1 = iUniswapV2Router;
               _context10.t2 = Transaction.SWAP;
@@ -25120,23 +24701,23 @@ var Pool = /*#__PURE__*/function () {
               _context10.t4 = minAmountOut;
               _context10.t5 = [assetFrom, assetTo];
               _context10.t6 = this.address;
-              _context10.next = 41;
+              _context10.next = 42;
               return getDeadline(this);
 
-            case 41:
+            case 42:
               _context10.t7 = _context10.sent;
               _context10.t8 = [_context10.t3, _context10.t4, _context10.t5, _context10.t6, _context10.t7];
               swapTxData = _context10.t1.encodeFunctionData.call(_context10.t1, _context10.t2, _context10.t8);
 
-            case 44:
-              _context10.next = 46;
+            case 45:
+              _context10.next = 47;
               return getPoolTxOrGasEstimate(this, [routerAddress[this.network][dapp], swapTxData, options], estimateGas);
 
-            case 46:
+            case 47:
               tx = _context10.sent;
               return _context10.abrupt("return", tx);
 
-            case 48:
+            case 49:
             case "end":
               return _context10.stop();
           }
@@ -26231,6 +25812,58 @@ var Pool = /*#__PURE__*/function () {
 
     return harvestAaveV3Rewards;
   }()
+  /**
+   * Claim rewards from CompoundV3
+   * @param {string} asset Compound lending asset
+   * @param {any} options Transaction options
+   * @param {boolean} estimateGas Simulate/estimate gas
+   * @returns {Promise<any>} Transaction
+   */
+  ;
+
+  _proto.harvestCompoundV3Rewards =
+  /*#__PURE__*/
+  function () {
+    var _harvestCompoundV3Rewards = /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/runtime_1.mark(function _callee30(asset, options, estimateGas) {
+      var claimTxData, tx;
+      return runtime_1.wrap(function _callee30$(_context30) {
+        while (1) {
+          switch (_context30.prev = _context30.next) {
+            case 0:
+              if (options === void 0) {
+                options = null;
+              }
+
+              if (estimateGas === void 0) {
+                estimateGas = false;
+              }
+
+              _context30.next = 4;
+              return getCompoundV3ClaimTxData(this, asset);
+
+            case 4:
+              claimTxData = _context30.sent;
+              _context30.next = 7;
+              return getPoolTxOrGasEstimate(this, [stakingAddress[this.network][Dapp.COMPOUNDV3], claimTxData, options], estimateGas);
+
+            case 7:
+              tx = _context30.sent;
+              return _context30.abrupt("return", tx);
+
+            case 9:
+            case "end":
+              return _context30.stop();
+          }
+        }
+      }, _callee30, this);
+    }));
+
+    function harvestCompoundV3Rewards(_x135, _x136, _x137) {
+      return _harvestCompoundV3Rewards.apply(this, arguments);
+    }
+
+    return harvestCompoundV3Rewards;
+  }()
   /**
    * Create UniswapV3 liquidity pool
    * @param {dapp} Platform UniswapV3, VelodromeCL, AerodromeCL or RamesesCL
@@ -26252,11 +25885,11 @@ var Pool = /*#__PURE__*/function () {
   _proto.addLiquidityUniswapV3 =
   /*#__PURE__*/
   function () {
-    var _addLiquidityUniswapV = /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/runtime_1.mark(function _callee30(dapp, assetA, assetB, amountA, amountB, minPrice, maxPrice, minTick, maxTick, feeAmountOrTickSpacing, options, estimateGas) {
+    var _addLiquidityUniswapV = /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/runtime_1.mark(function _callee31(dapp, assetA, assetB, amountA, amountB, minPrice, maxPrice, minTick, maxTick, feeAmountOrTickSpacing, options, estimateGas) {
       var mintTxData, tx;
-      return runtime_1.wrap(function _callee30$(_context30) {
+      return runtime_1.wrap(function _callee31$(_context31) {
         while (1) {
-          switch (_context30.prev = _context30.next) {
+          switch (_context31.prev = _context31.next) {
             case 0:
               if (options === void 0) {
                 options = null;
@@ -26267,7 +25900,7 @@ var Pool = /*#__PURE__*/function () {
               }
 
               if (!((minPrice === null || maxPrice === null) && (minTick === null || maxTick === null))) {
-                _context30.next = 4;
+                _context31.next = 4;
                 break;
               }
 
@@ -26275,34 +25908,34 @@ var Pool = /*#__PURE__*/function () {
 
             case 4:
               if (!((minPrice || maxPrice) && dapp !== Dapp.UNISWAPV3)) {
-                _context30.next = 6;
+                _context31.next = 6;
                 break;
               }
 
               throw new Error("no price conversion for Aerodrome/Velodrome CL");
 
             case 6:
-              _context30.next = 8;
+              _context31.next = 8;
               return getUniswapV3MintTxData(dapp, this, assetA, assetB, amountA, amountB, minPrice, maxPrice, minTick, maxTick, feeAmountOrTickSpacing);
 
             case 8:
-              mintTxData = _context30.sent;
-              _context30.next = 11;
+              mintTxData = _context31.sent;
+              _context31.next = 11;
               return getPoolTxOrGasEstimate(this, [nonfungiblePositionManagerAddress[this.network][dapp], mintTxData, options], estimateGas);
 
             case 11:
-              tx = _context30.sent;
-              return _context30.abrupt("return", tx);
+              tx = _context31.sent;
+              return _context31.abrupt("return", tx);
 
             case 13:
             case "end":
-              return _context30.stop();
+              return _context31.stop();
           }
         }
-      }, _callee30, this);
+      }, _callee31, this);
     }));
 
-    function addLiquidityUniswapV3(_x135, _x136, _x137, _x138, _x139, _x140, _x141, _x142, _x143, _x144, _x145, _x146) {
+    function addLiquidityUniswapV3(_x138, _x139, _x140, _x141, _x142, _x143, _x144, _x145, _x146, _x147, _x148, _x149) {
       return _addLiquidityUniswapV.apply(this, arguments);
     }
 
@@ -26322,11 +25955,11 @@ var Pool = /*#__PURE__*/function () {
   _proto.decreaseLiquidity =
   /*#__PURE__*/
   function () {
-    var _decreaseLiquidity = /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/runtime_1.mark(function _callee31(dapp, tokenId, amount, options, estimateGas) {
+    var _decreaseLiquidity = /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/runtime_1.mark(function _callee32(dapp, tokenId, amount, options, estimateGas) {
       var dappAddress, isStaked, txData, tokenIdOwner, tx;
-      return runtime_1.wrap(function _callee31$(_context31) {
+      return runtime_1.wrap(function _callee32$(_context32) {
         while (1) {
-          switch (_context31.prev = _context31.next) {
+          switch (_context32.prev = _context32.next) {
             case 0:
               if (amount === void 0) {
                 amount = 100;
@@ -26341,20 +25974,20 @@ var Pool = /*#__PURE__*/function () {
               }
 
               isStaked = false;
-              _context31.t0 = dapp;
-              _context31.next = _context31.t0 === Dapp.UNISWAPV3 ? 7 : _context31.t0 === Dapp.RAMSESCL ? 7 : _context31.t0 === Dapp.VELODROMECL ? 9 : _context31.t0 === Dapp.AERODROMECL ? 9 : _context31.t0 === Dapp.ARRAKIS ? 14 : 16;
+              _context32.t0 = dapp;
+              _context32.next = _context32.t0 === Dapp.UNISWAPV3 ? 7 : _context32.t0 === Dapp.RAMSESCL ? 7 : _context32.t0 === Dapp.VELODROMECL ? 9 : _context32.t0 === Dapp.AERODROMECL ? 9 : _context32.t0 === Dapp.ARRAKIS ? 14 : 16;
               break;
 
             case 7:
               dappAddress = nonfungiblePositionManagerAddress[this.network][dapp];
-              return _context31.abrupt("break", 17);
+              return _context32.abrupt("break", 17);
 
             case 9:
-              _context31.next = 11;
+              _context32.next = 11;
               return getVelodromeClOwner(this, dapp, tokenId);
 
             case 11:
-              tokenIdOwner = _context31.sent;
+              tokenIdOwner = _context32.sent;
 
               if (tokenIdOwner.toLowerCase() === this.address.toLowerCase()) {
                 dappAddress = nonfungiblePositionManagerAddress[this.network][dapp];
@@ -26364,49 +25997,49 @@ var Pool = /*#__PURE__*/function () {
                 isStaked = true;
               }
 
-              return _context31.abrupt("break", 17);
+              return _context32.abrupt("break", 17);
 
             case 14:
               dappAddress = routerAddress[this.network][dapp];
-              return _context31.abrupt("break", 17);
+              return _context32.abrupt("break", 17);
 
             case 16:
               throw new Error("dapp not supported");
 
             case 17:
               if (isStaked) {
-                _context31.next = 23;
+                _context32.next = 23;
                 break;
               }
 
-              _context31.next = 20;
+              _context32.next = 20;
               return getDecreaseLiquidityTxData(this, dapp, tokenId, amount);
 
             case 20:
-              txData = _context31.sent;
-              _context31.next = 24;
+              txData = _context32.sent;
+              _context32.next = 24;
               break;
 
             case 23:
               throw new Error("unsupported decreaseStakedLiquidity: unstake first to decrease lp");
 
             case 24:
-              _context31.next = 26;
+              _context32.next = 26;
               return getPoolTxOrGasEstimate(this, [dappAddress, txData, options], estimateGas);
 
             case 26:
-              tx = _context31.sent;
-              return _context31.abrupt("return", tx);
+              tx = _context32.sent;
+              return _context32.abrupt("return", tx);
 
             case 28:
             case "end":
-              return _context31.stop();
+              return _context32.stop();
           }
         }
-      }, _callee31, this);
+      }, _callee32, this);
     }));
 
-    function decreaseLiquidity(_x147, _x148, _x149, _x150, _x151) {
+    function decreaseLiquidity(_x150, _x151, _x152, _x153, _x154) {
       return _decreaseLiquidity.apply(this, arguments);
     }
 
@@ -26427,11 +26060,11 @@ var Pool = /*#__PURE__*/function () {
   _proto.increaseLiquidity =
   /*#__PURE__*/
   function () {
-    var _increaseLiquidity = /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/runtime_1.mark(function _callee32(dapp, tokenId, amountA, amountB, options, estimateGas) {
+    var _increaseLiquidity = /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/runtime_1.mark(function _callee33(dapp, tokenId, amountA, amountB, options, estimateGas) {
       var dappAddress, isStaked, txData, tokenIdOwner, tx;
-      return runtime_1.wrap(function _callee32$(_context32) {
+      return runtime_1.wrap(function _callee33$(_context33) {
         while (1) {
-          switch (_context32.prev = _context32.next) {
+          switch (_context33.prev = _context33.next) {
             case 0:
               if (options === void 0) {
                 options = null;
@@ -26442,20 +26075,20 @@ var Pool = /*#__PURE__*/function () {
               }
 
               isStaked = false;
-              _context32.t0 = dapp;
-              _context32.next = _context32.t0 === Dapp.UNISWAPV3 ? 6 : _context32.t0 === Dapp.RAMSESCL ? 6 : _context32.t0 === Dapp.VELODROMECL ? 8 : _context32.t0 === Dapp.AERODROMECL ? 8 : _context32.t0 === Dapp.ARRAKIS ? 13 : 15;
+              _context33.t0 = dapp;
+              _context33.next = _context33.t0 === Dapp.UNISWAPV3 ? 6 : _context33.t0 === Dapp.RAMSESCL ? 6 : _context33.t0 === Dapp.VELODROMECL ? 8 : _context33.t0 === Dapp.AERODROMECL ? 8 : _context33.t0 === Dapp.ARRAKIS ? 13 : 15;
               break;
 
             case 6:
               dappAddress = nonfungiblePositionManagerAddress[this.network][dapp];
-              return _context32.abrupt("break", 16);
+              return _context33.abrupt("break", 16);
 
             case 8:
-              _context32.next = 10;
+              _context33.next = 10;
               return getVelodromeClOwner(this, dapp, tokenId);
 
             case 10:
-              tokenIdOwner = _context32.sent;
+              tokenIdOwner = _context33.sent;
 
               if (tokenIdOwner.toLowerCase() === this.address.toLowerCase()) {
                 dappAddress = nonfungiblePositionManagerAddress[this.network][dapp];
@@ -26465,49 +26098,49 @@ var Pool = /*#__PURE__*/function () {
                 isStaked = true;
               }
 
-              return _context32.abrupt("break", 16);
+              return _context33.abrupt("break", 16);
 
             case 13:
               dappAddress = routerAddress[this.network][dapp];
-              return _context32.abrupt("break", 16);
+              return _context33.abrupt("break", 16);
 
             case 15:
               throw new Error("dapp not supported");
 
             case 16:
               if (isStaked) {
-                _context32.next = 22;
+                _context33.next = 22;
                 break;
               }
 
-              _context32.next = 19;
+              _context33.next = 19;
               return getIncreaseLiquidityTxData(this, dapp, tokenId, amountA, amountB);
 
             case 19:
-              txData = _context32.sent;
-              _context32.next = 23;
+              txData = _context33.sent;
+              _context33.next = 23;
               break;
 
             case 22:
               throw new Error("unsupported increaseStakedLiquidity: unstake first to increase lp");
 
             case 23:
-              _context32.next = 25;
+              _context33.next = 25;
               return getPoolTxOrGasEstimate(this, [dappAddress, txData, options], estimateGas);
 
             case 25:
-              tx = _context32.sent;
-              return _context32.abrupt("return", tx);
+              tx = _context33.sent;
+              return _context33.abrupt("return", tx);
 
             case 27:
             case "end":
-              return _context32.stop();
+              return _context33.stop();
           }
         }
-      }, _callee32, this);
+      }, _callee33, this);
     }));
 
-    function increaseLiquidity(_x152, _x153, _x154, _x155, _x156, _x157) {
+    function increaseLiquidity(_x155, _x156, _x157, _x158, _x159, _x160) {
       return _increaseLiquidity.apply(this, arguments);
     }
 
@@ -26526,11 +26159,11 @@ var Pool = /*#__PURE__*/function () {
   _proto.claimFees =
   /*#__PURE__*/
   function () {
-    var _claimFees = /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/runtime_1.mark(function _callee33(dapp, tokenId, options, estimateGas) {
+    var _claimFees = /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/runtime_1.mark(function _callee34(dapp, tokenId, options, estimateGas) {
       var txData, contractAddress, iNonfungiblePositionManager, abi, tokenIdOwner, tx;
-      return runtime_1.wrap(function _callee33$(_context33) {
+      return runtime_1.wrap(function _callee34$(_context34) {
         while (1) {
-          switch (_context33.prev = _context33.next) {
+          switch (_context34.prev = _context34.next) {
             case 0:
               if (options === void 0) {
                 options = null;
@@ -26541,37 +26174,37 @@ var Pool = /*#__PURE__*/function () {
               }
 
               iNonfungiblePositionManager = new ethers.utils.Interface(INonfungiblePositionManager.abi);
-              _context33.t0 = dapp;
-              _context33.next = _context33.t0 === Dapp.UNISWAPV3 ? 6 : _context33.t0 === Dapp.RAMSESCL ? 6 : _context33.t0 === Dapp.ARRAKIS ? 9 : _context33.t0 === Dapp.BALANCER ? 9 : _context33.t0 === Dapp.VELODROME ? 13 : _context33.t0 === Dapp.RAMSES ? 13 : _context33.t0 === Dapp.VELODROMEV2 ? 16 : _context33.t0 === Dapp.AERODROME ? 16 : _context33.t0 === Dapp.VELODROMECL ? 19 : _context33.t0 === Dapp.AERODROMECL ? 19 : 24;
+              _context34.t0 = dapp;
+              _context34.next = _context34.t0 === Dapp.UNISWAPV3 ? 6 : _context34.t0 === Dapp.RAMSESCL ? 6 : _context34.t0 === Dapp.ARRAKIS ? 9 : _context34.t0 === Dapp.BALANCER ? 9 : _context34.t0 === Dapp.VELODROME ? 13 : _context34.t0 === Dapp.RAMSES ? 13 : _context34.t0 === Dapp.VELODROMEV2 ? 16 : _context34.t0 === Dapp.AERODROME ? 16 : _context34.t0 === Dapp.VELODROMECL ? 19 : _context34.t0 === Dapp.AERODROMECL ? 19 : 24;
               break;
 
             case 6:
               contractAddress = nonfungiblePositionManagerAddress[this.network][dapp];
               txData = iNonfungiblePositionManager.encodeFunctionData(Transaction.COLLECT, [[tokenId, this.address, MaxUint128, MaxUint128]]);
-              return _context33.abrupt("break", 25);
+              return _context34.abrupt("break", 25);
 
             case 9:
               contractAddress = tokenId;
               abi = new ethers.utils.Interface(ILiquidityGaugeV4.abi);
               txData = abi.encodeFunctionData("claim_rewards()", []);
-              return _context33.abrupt("break", 25);
+              return _context34.abrupt("break", 25);
 
             case 13:
               contractAddress = tokenId;
               txData = getVelodromeClaimTxData(this, tokenId, false);
-              return _context33.abrupt("break", 25);
+              return _context34.abrupt("break", 25);
 
             case 16:
               contractAddress = tokenId;
               txData = getVelodromeClaimTxData(this, tokenId, true);
-              return _context33.abrupt("break", 25);
+              return _context34.abrupt("break", 25);
 
             case 19:
-              _context33.next = 21;
+              _context34.next = 21;
               return getVelodromeClOwner(this, dapp, tokenId);
 
             case 21:
-              tokenIdOwner = _context33.sent;
+              tokenIdOwner = _context34.sent;
 
               if (tokenIdOwner.toLowerCase() === this.address.toLowerCase()) {
                 contractAddress = nonfungiblePositionManagerAddress[this.network][dapp];
@@ -26582,28 +26215,28 @@ var Pool = /*#__PURE__*/function () {
                 txData = getVelodromeCLClaimTxData(tokenId);
               }
 
-              return _context33.abrupt("break", 25);
+              return _context34.abrupt("break", 25);
 
             case 24:
               throw new Error("dapp not supported");
 
             case 25:
-              _context33.next = 27;
+              _context34.next = 27;
               return getPoolTxOrGasEstimate(this, [contractAddress, txData, options], estimateGas);
 
             case 27:
-              tx = _context33.sent;
-              return _context33.abrupt("return", tx);
+              tx = _context34.sent;
+              return _context34.abrupt("return", tx);
 
             case 29:
             case "end":
-              return _context33.stop();
+              return _context34.stop();
           }
         }
-      }, _callee33, this);
+      }, _callee34, this);
     }));
 
-    function claimFees(_x158, _x159, _x160, _x161) {
+    function claimFees(_x161, _x162, _x163, _x164) {
       return _claimFees.apply(this, arguments);
     }
 
@@ -26623,11 +26256,11 @@ var Pool = /*#__PURE__*/function () {
   _proto.getRewards =
   /*#__PURE__*/
   function () {
-    var _getRewards = /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/runtime_1.mark(function _callee34(dapp, tokenId, rewards, options, estimateGas) {
+    var _getRewards = /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/runtime_1.mark(function _callee35(dapp, tokenId, rewards, options, estimateGas) {
       var tx;
-      return runtime_1.wrap(function _callee34$(_context34) {
+      return runtime_1.wrap(function _callee35$(_context35) {
         while (1) {
-          switch (_context34.prev = _context34.next) {
+          switch (_context35.prev = _context35.next) {
             case 0:
               if (options === void 0) {
                 options = null;
@@ -26637,22 +26270,22 @@ var Pool = /*#__PURE__*/function () {
                 estimateGas = false;
               }
 
-              _context34.next = 4;
+              _context35.next = 4;
               return getPoolTxOrGasEstimate(this, [nonfungiblePositionManagerAddress[this.network][dapp], getRewardsTxDta(tokenId, rewards), options], estimateGas);
 
             case 4:
-              tx = _context34.sent;
-              return _context34.abrupt("return", tx);
+              tx = _context35.sent;
+              return _context35.abrupt("return", tx);
 
             case 6:
             case "end":
-              return _context34.stop();
+              return _context35.stop();
           }
         }
-      }, _callee34, this);
+      }, _callee35, this);
     }));
 
-    function getRewards(_x162, _x163, _x164, _x165, _x166) {
+    function getRewards(_x165, _x166, _x167, _x168, _x169) {
       return _getRewards.apply(this, arguments);
     }
 
@@ -26675,11 +26308,11 @@ var Pool = /*#__PURE__*/function () {
   _proto.tradeUniswapV3 =
   /*#__PURE__*/
   function () {
-    var _tradeUniswapV = /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/runtime_1.mark(function _callee35(assetFrom, assetTo, amountIn, feeAmount, slippage, options, estimateGas) {
+    var _tradeUniswapV = /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/runtime_1.mark(function _callee36(assetFrom, assetTo, amountIn, feeAmount, slippage, options, estimateGas) {
       var swapxData, tx;
-      return runtime_1.wrap(function _callee35$(_context35) {
+      return runtime_1.wrap(function _callee36$(_context36) {
         while (1) {
-          switch (_context35.prev = _context35.next) {
+          switch (_context36.prev = _context36.next) {
             case 0:
               if (slippage === void 0) {
                 slippage = 0.5;
@@ -26693,27 +26326,27 @@ var Pool = /*#__PURE__*/function () {
                 estimateGas = false;
               }
 
-              _context35.next = 5;
+              _context36.next = 5;
               return getUniswapV3SwapTxData(this, assetFrom, assetTo, amountIn, slippage, feeAmount);
 
             case 5:
-              swapxData = _context35.sent;
-              _context35.next = 8;
+              swapxData = _context36.sent;
+              _context36.next = 8;
               return getPoolTxOrGasEstimate(this, [routerAddress[this.network][Dapp.UNISWAPV3], swapxData, options], estimateGas);
 
             case 8:
-              tx = _context35.sent;
-              return _context35.abrupt("return", tx);
+              tx = _context36.sent;
+              return _context36.abrupt("return", tx);
 
             case 10:
             case "end":
-              return _context35.stop();
+              return _context36.stop();
           }
         }
-      }, _callee35, this);
+      }, _callee36, this);
     }));
 
-    function tradeUniswapV3(_x167, _x168, _x169, _x170, _x171, _x172, _x173) {
+    function tradeUniswapV3(_x170, _x171, _x172, _x173, _x174, _x175, _x176) {
       return _tradeUniswapV.apply(this, arguments);
     }
 
@@ -26735,68 +26368,7 @@ var Pool = /*#__PURE__*/function () {
   _proto.addLiquidityVelodrome =
   /*#__PURE__*/
   function () {
-    var _addLiquidityVelodrome = /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/runtime_1.mark(function _callee36(assetA, assetB, amountA, amountB, isStable, options, estimateGas) {
-      var tx;
-      return runtime_1.wrap(function _callee36$(_context36) {
-        while (1) {
-          switch (_context36.prev = _context36.next) {
-            case 0:
-              if (options === void 0) {
-                options = null;
-              }
-
-              if (estimateGas === void 0) {
-                estimateGas = false;
-              }
-
-              _context36.t0 = getPoolTxOrGasEstimate;
-              _context36.t1 = this;
-              _context36.t2 = routerAddress[this.network][Dapp.VELODROME];
-              _context36.next = 7;
-              return getVelodromeAddLiquidityTxData(this, assetA, assetB, amountA, amountB, isStable);
-
-            case 7:
-              _context36.t3 = _context36.sent;
-              _context36.t4 = options;
-              _context36.t5 = [_context36.t2, _context36.t3, _context36.t4];
-              _context36.t6 = estimateGas;
-              _context36.next = 13;
-              return (0, _context36.t0)(_context36.t1, _context36.t5, _context36.t6);
-
-            case 13:
-              tx = _context36.sent;
-              return _context36.abrupt("return", tx);
-
-            case 15:
-            case "end":
-              return _context36.stop();
-          }
-        }
-      }, _callee36, this);
-    }));
-
-    function addLiquidityVelodrome(_x174, _x175, _x176, _x177, _x178, _x179, _x180) {
-      return _addLiquidityVelodrome.apply(this, arguments);
-    }
-
-    return addLiquidityVelodrome;
-  }()
-  /**
-   * Remove liquidity from Velodrome pool
-   * @param {string} assetA First asset
-   * @param {string} assetB Second asset
-   * @param {BigNumber | string} amount Amount of LP tokens
-   * @param { boolean } isStable Is stable pool
-   * @param {any} options Transaction options
-   * @param {boolean} estimateGas Simulate/estimate gas
-   * @returns {Promise<any>} Transaction
-   */
-  ;
-
-  _proto.removeLiquidityVelodrome =
-  /*#__PURE__*/
-  function () {
-    var _removeLiquidityVelodrome = /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/runtime_1.mark(function _callee37(assetA, assetB, amount, isStable, options, estimateGas) {
+    var _addLiquidityVelodrome = /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/runtime_1.mark(function _callee37(assetA, assetB, amountA, amountB, isStable, options, estimateGas) {
       var tx;
       return runtime_1.wrap(function _callee37$(_context37) {
         while (1) {
@@ -26814,7 +26386,7 @@ var Pool = /*#__PURE__*/function () {
               _context37.t1 = this;
               _context37.t2 = routerAddress[this.network][Dapp.VELODROME];
               _context37.next = 7;
-              return getVelodromeRemoveLiquidityTxData(this, assetA, assetB, amount, isStable);
+              return getVelodromeAddLiquidityTxData(this, assetA, assetB, amountA, amountB, isStable);
 
             case 7:
               _context37.t3 = _context37.sent;
@@ -26836,18 +26408,17 @@ var Pool = /*#__PURE__*/function () {
       }, _callee37, this);
     }));
 
-    function removeLiquidityVelodrome(_x181, _x182, _x183, _x184, _x185, _x186) {
-      return _removeLiquidityVelodrome.apply(this, arguments);
+    function addLiquidityVelodrome(_x177, _x178, _x179, _x180, _x181, _x182, _x183) {
+      return _addLiquidityVelodrome.apply(this, arguments);
     }
 
-    return removeLiquidityVelodrome;
+    return addLiquidityVelodrome;
   }()
   /**
-   * Add liquidity to Velodrome V2 pool
+   * Remove liquidity from Velodrome pool
    * @param {string} assetA First asset
    * @param {string} assetB Second asset
-   * @param {BigNumber | string} amountA Amount first asset
-   * @param {BigNumber | string} amountB Amount second asset
+   * @param {BigNumber | string} amount Amount of LP tokens
    * @param { boolean } isStable Is stable pool
    * @param {any} options Transaction options
    * @param {boolean} estimateGas Simulate/estimate gas
@@ -26855,10 +26426,10 @@ var Pool = /*#__PURE__*/function () {
    */
   ;
 
-  _proto.addLiquidityVelodromeV2 =
+  _proto.removeLiquidityVelodrome =
   /*#__PURE__*/
   function () {
-    var _addLiquidityVelodromeV = /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/runtime_1.mark(function _callee38(assetA, assetB, amountA, amountB, isStable, options, estimateGas) {
+    var _removeLiquidityVelodrome = /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/runtime_1.mark(function _callee38(assetA, assetB, amount, isStable, options, estimateGas) {
       var tx;
       return runtime_1.wrap(function _callee38$(_context38) {
         while (1) {
@@ -26874,9 +26445,9 @@ var Pool = /*#__PURE__*/function () {
 
               _context38.t0 = getPoolTxOrGasEstimate;
               _context38.t1 = this;
-              _context38.t2 = routerAddress[this.network][Dapp.VELODROMEV2];
+              _context38.t2 = routerAddress[this.network][Dapp.VELODROME];
               _context38.next = 7;
-              return getVelodromeAddLiquidityTxData(this, assetA, assetB, amountA, amountB, isStable);
+              return getVelodromeRemoveLiquidityTxData(this, assetA, assetB, amount, isStable);
 
             case 7:
               _context38.t3 = _context38.sent;
@@ -26898,17 +26469,18 @@ var Pool = /*#__PURE__*/function () {
       }, _callee38, this);
     }));
 
-    function addLiquidityVelodromeV2(_x187, _x188, _x189, _x190, _x191, _x192, _x193) {
-      return _addLiquidityVelodromeV.apply(this, arguments);
+    function removeLiquidityVelodrome(_x184, _x185, _x186, _x187, _x188, _x189) {
+      return _removeLiquidityVelodrome.apply(this, arguments);
     }
 
-    return addLiquidityVelodromeV2;
+    return removeLiquidityVelodrome;
   }()
   /**
-   * Remove liquidity from Velodrome V2 pool
+   * Add liquidity to Velodrome V2 pool
    * @param {string} assetA First asset
    * @param {string} assetB Second asset
-   * @param {BigNumber | string} amount Amount of LP tokens
+   * @param {BigNumber | string} amountA Amount first asset
+   * @param {BigNumber | string} amountB Amount second asset
    * @param { boolean } isStable Is stable pool
    * @param {any} options Transaction options
    * @param {boolean} estimateGas Simulate/estimate gas
@@ -26916,10 +26488,10 @@ var Pool = /*#__PURE__*/function () {
    */
   ;
 
-  _proto.removeLiquidityVelodromeV2 =
+  _proto.addLiquidityVelodromeV2 =
   /*#__PURE__*/
   function () {
-    var _removeLiquidityVelodromeV = /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/runtime_1.mark(function _callee39(assetA, assetB, amount, isStable, options, estimateGas) {
+    var _addLiquidityVelodromeV = /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/runtime_1.mark(function _callee39(assetA, assetB, amountA, amountB, isStable, options, estimateGas) {
       var tx;
       return runtime_1.wrap(function _callee39$(_context39) {
         while (1) {
@@ -26937,7 +26509,7 @@ var Pool = /*#__PURE__*/function () {
               _context39.t1 = this;
               _context39.t2 = routerAddress[this.network][Dapp.VELODROMEV2];
               _context39.next = 7;
-              return getVelodromeRemoveLiquidityTxData(this, assetA, assetB, amount, isStable);
+              return getVelodromeAddLiquidityTxData(this, assetA, assetB, amountA, amountB, isStable);
 
             case 7:
               _context39.t3 = _context39.sent;
@@ -26959,19 +26531,17 @@ var Pool = /*#__PURE__*/function () {
       }, _callee39, this);
     }));
 
-    function removeLiquidityVelodromeV2(_x194, _x195, _x196, _x197, _x198, _x199) {
-      return _removeLiquidityVelodromeV.apply(this, arguments);
+    function addLiquidityVelodromeV2(_x190, _x191, _x192, _x193, _x194, _x195, _x196) {
+      return _addLiquidityVelodromeV.apply(this, arguments);
     }
 
-    return removeLiquidityVelodromeV2;
+    return addLiquidityVelodromeV2;
   }()
   /**
-   * Add liquidity to Velodrome V2 or Ramses pool
-   * @param {Dapp} dapp VelodromeV2, Ramses or Aerodrome
+   * Remove liquidity from Velodrome V2 pool
    * @param {string} assetA First asset
    * @param {string} assetB Second asset
-   * @param {BigNumber | string} amountA Amount first asset
-   * @param {BigNumber | string} amountB Amount second asset
+   * @param {BigNumber | string} amount Amount of LP tokens
    * @param { boolean } isStable Is stable pool
    * @param {any} options Transaction options
    * @param {boolean} estimateGas Simulate/estimate gas
@@ -26979,10 +26549,10 @@ var Pool = /*#__PURE__*/function () {
    */
   ;
 
-  _proto.addLiquidityV2 =
+  _proto.removeLiquidityVelodromeV2 =
   /*#__PURE__*/
   function () {
-    var _addLiquidityV = /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/runtime_1.mark(function _callee40(dapp, assetA, assetB, amountA, amountB, isStable, options, estimateGas) {
+    var _removeLiquidityVelodromeV = /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/runtime_1.mark(function _callee40(assetA, assetB, amount, isStable, options, estimateGas) {
       var tx;
       return runtime_1.wrap(function _callee40$(_context40) {
         while (1) {
@@ -26998,9 +26568,9 @@ var Pool = /*#__PURE__*/function () {
 
               _context40.t0 = getPoolTxOrGasEstimate;
               _context40.t1 = this;
-              _context40.t2 = routerAddress[this.network][dapp];
+              _context40.t2 = routerAddress[this.network][Dapp.VELODROMEV2];
               _context40.next = 7;
-              return getVelodromeAddLiquidityTxData(this, assetA, assetB, amountA, amountB, isStable);
+              return getVelodromeRemoveLiquidityTxData(this, assetA, assetB, amount, isStable);
 
             case 7:
               _context40.t3 = _context40.sent;
@@ -27022,18 +26592,19 @@ var Pool = /*#__PURE__*/function () {
       }, _callee40, this);
     }));
 
-    function addLiquidityV2(_x200, _x201, _x202, _x203, _x204, _x205, _x206, _x207) {
-      return _addLiquidityV.apply(this, arguments);
+    function removeLiquidityVelodromeV2(_x197, _x198, _x199, _x200, _x201, _x202) {
+      return _removeLiquidityVelodromeV.apply(this, arguments);
     }
 
-    return addLiquidityV2;
+    return removeLiquidityVelodromeV2;
   }()
   /**
-   * Remove liquidity from Velodrome V2 or Ramses pool
+   * Add liquidity to Velodrome V2 or Ramses pool
    * @param {Dapp} dapp VelodromeV2, Ramses or Aerodrome
    * @param {string} assetA First asset
    * @param {string} assetB Second asset
-   * @param {BigNumber | string} amount Amount of LP tokens
+   * @param {BigNumber | string} amountA Amount first asset
+   * @param {BigNumber | string} amountB Amount second asset
    * @param { boolean } isStable Is stable pool
    * @param {any} options Transaction options
    * @param {boolean} estimateGas Simulate/estimate gas
@@ -27041,10 +26612,10 @@ var Pool = /*#__PURE__*/function () {
    */
   ;
 
-  _proto.removeLiquidityV2 =
+  _proto.addLiquidityV2 =
   /*#__PURE__*/
   function () {
-    var _removeLiquidityV = /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/runtime_1.mark(function _callee41(dapp, assetA, assetB, amount, isStable, options, estimateGas) {
+    var _addLiquidityV = /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/runtime_1.mark(function _callee41(dapp, assetA, assetB, amountA, amountB, isStable, options, estimateGas) {
       var tx;
       return runtime_1.wrap(function _callee41$(_context41) {
         while (1) {
@@ -27062,7 +26633,7 @@ var Pool = /*#__PURE__*/function () {
               _context41.t1 = this;
               _context41.t2 = routerAddress[this.network][dapp];
               _context41.next = 7;
-              return getVelodromeRemoveLiquidityTxData(this, assetA, assetB, amount, isStable);
+              return getVelodromeAddLiquidityTxData(this, assetA, assetB, amountA, amountB, isStable);
 
             case 7:
               _context41.t3 = _context41.sent;
@@ -27084,7 +26655,69 @@ var Pool = /*#__PURE__*/function () {
       }, _callee41, this);
     }));
 
-    function removeLiquidityV2(_x208, _x209, _x210, _x211, _x212, _x213, _x214) {
+    function addLiquidityV2(_x203, _x204, _x205, _x206, _x207, _x208, _x209, _x210) {
+      return _addLiquidityV.apply(this, arguments);
+    }
+
+    return addLiquidityV2;
+  }()
+  /**
+   * Remove liquidity from Velodrome V2 or Ramses pool
+   * @param {Dapp} dapp VelodromeV2, Ramses or Aerodrome
+   * @param {string} assetA First asset
+   * @param {string} assetB Second asset
+   * @param {BigNumber | string} amount Amount of LP tokens
+   * @param { boolean } isStable Is stable pool
+   * @param {any} options Transaction options
+   * @param {boolean} estimateGas Simulate/estimate gas
+   * @returns {Promise<any>} Transaction
+   */
+  ;
+
+  _proto.removeLiquidityV2 =
+  /*#__PURE__*/
+  function () {
+    var _removeLiquidityV = /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/runtime_1.mark(function _callee42(dapp, assetA, assetB, amount, isStable, options, estimateGas) {
+      var tx;
+      return runtime_1.wrap(function _callee42$(_context42) {
+        while (1) {
+          switch (_context42.prev = _context42.next) {
+            case 0:
+              if (options === void 0) {
+                options = null;
+              }
+
+              if (estimateGas === void 0) {
+                estimateGas = false;
+              }
+
+              _context42.t0 = getPoolTxOrGasEstimate;
+              _context42.t1 = this;
+              _context42.t2 = routerAddress[this.network][dapp];
+              _context42.next = 7;
+              return getVelodromeRemoveLiquidityTxData(this, assetA, assetB, amount, isStable);
+
+            case 7:
+              _context42.t3 = _context42.sent;
+              _context42.t4 = options;
+              _context42.t5 = [_context42.t2, _context42.t3, _context42.t4];
+              _context42.t6 = estimateGas;
+              _context42.next = 13;
+              return (0, _context42.t0)(_context42.t1, _context42.t5, _context42.t6);
+
+            case 13:
+              tx = _context42.sent;
+              return _context42.abrupt("return", tx);
+
+            case 15:
+            case "end":
+              return _context42.stop();
+          }
+        }
+      }, _callee42, this);
+    }));
+
+    function removeLiquidityV2(_x211, _x212, _x213, _x214, _x215, _x216, _x217) {
       return _removeLiquidityV.apply(this, arguments);
     }
 
@@ -27110,11 +26743,11 @@ var Pool = /*#__PURE__*/function () {
   _proto.tradeLyraOption =
   /*#__PURE__*/
   function () {
-    var _tradeLyraOption = /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/runtime_1.mark(function _callee42(market, expiry, strike, optionType, tradeType, optionAmount, assetIn, collateralChangeAmount, isCoveredCall, options, estimateGas) {
+    var _tradeLyraOption = /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/runtime_1.mark(function _callee43(market, expiry, strike, optionType, tradeType, optionAmount, assetIn, collateralChangeAmount, isCoveredCall, options, estimateGas) {
       var swapxData, tx;
-      return runtime_1.wrap(function _callee42$(_context42) {
+      return runtime_1.wrap(function _callee43$(_context43) {
         while (1) {
-          switch (_context42.prev = _context42.next) {
+          switch (_context43.prev = _context43.next) {
             case 0:
               if (collateralChangeAmount === void 0) {
                 collateralChangeAmount = "0";
@@ -27132,27 +26765,27 @@ var Pool = /*#__PURE__*/function () {
                 estimateGas = false;
               }
 
-              _context42.next = 6;
+              _context43.next = 6;
               return getLyraOptionTxData(this, market, optionType, expiry, strike, tradeType, optionAmount, assetIn, BigNumber$1.from(collateralChangeAmount), isCoveredCall);
 
             case 6:
-              swapxData = _context42.sent;
-              _context42.next = 9;
+              swapxData = _context43.sent;
+              _context43.next = 9;
               return getPoolTxOrGasEstimate(this, [routerAddress[this.network][Dapp.LYRA], swapxData, options], estimateGas);
 
             case 9:
-              tx = _context42.sent;
-              return _context42.abrupt("return", tx);
+              tx = _context43.sent;
+              return _context43.abrupt("return", tx);
 
             case 11:
             case "end":
-              return _context42.stop();
+              return _context43.stop();
           }
         }
-      }, _callee42, this);
+      }, _callee43, this);
     }));
 
-    function tradeLyraOption(_x215, _x216, _x217, _x218, _x219, _x220, _x221, _x222, _x223, _x224, _x225) {
+    function tradeLyraOption(_x218, _x219, _x220, _x221, _x222, _x223, _x224, _x225, _x226, _x227, _x228) {
       return _tradeLyraOption.apply(this, arguments);
     }
 
@@ -27167,26 +26800,26 @@ var Pool = /*#__PURE__*/function () {
   _proto.getLyraPositions =
   /*#__PURE__*/
   function () {
-    var _getLyraPositions = /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/runtime_1.mark(function _callee43(market) {
-      return runtime_1.wrap(function _callee43$(_context43) {
+    var _getLyraPositions = /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/runtime_1.mark(function _callee44(market) {
+      return runtime_1.wrap(function _callee44$(_context44) {
         while (1) {
-          switch (_context43.prev = _context43.next) {
+          switch (_context44.prev = _context44.next) {
             case 0:
-              _context43.next = 2;
+              _context44.next = 2;
               return getOptionPositions(this, market);
 
             case 2:
-              return _context43.abrupt("return", _context43.sent);
+              return _context44.abrupt("return", _context44.sent);
 
             case 3:
             case "end":
-              return _context43.stop();
+              return _context44.stop();
           }
         }
-      }, _callee43, this);
+      }, _callee44, this);
     }));
 
-    function getLyraPositions(_x226) {
+    function getLyraPositions(_x229) {
       return _getLyraPositions.apply(this, arguments);
     }
 
@@ -27205,11 +26838,11 @@ var Pool = /*#__PURE__*/function () {
   _proto.changeFuturesMargin =
   /*#__PURE__*/
   function () {
-    var _changeFuturesMargin = /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/runtime_1.mark(function _callee44(market, changeAmount, options, estimateGas) {
+    var _changeFuturesMargin = /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/runtime_1.mark(function _callee45(market, changeAmount, options, estimateGas) {
       var tx;
-      return runtime_1.wrap(function _callee44$(_context44) {
+      return runtime_1.wrap(function _callee45$(_context45) {
         while (1) {
-          switch (_context44.prev = _context44.next) {
+          switch (_context45.prev = _context45.next) {
             case 0:
               if (options === void 0) {
                 options = null;
@@ -27219,22 +26852,22 @@ var Pool = /*#__PURE__*/function () {
                 estimateGas = false;
               }
 
-              _context44.next = 4;
+              _context45.next = 4;
               return getPoolTxOrGasEstimate(this, [market, getFuturesChangeMarginTxData(changeAmount), options], estimateGas);
 
             case 4:
-              tx = _context44.sent;
-              return _context44.abrupt("return", tx);
+              tx = _context45.sent;
+              return _context45.abrupt("return", tx);
 
             case 6:
             case "end":
-              return _context44.stop();
+              return _context45.stop();
           }
         }
-      }, _callee44, this);
+      }, _callee45, this);
     }));
 
-    function changeFuturesMargin(_x227, _x228, _x229, _x230) {
+    function changeFuturesMargin(_x230, _x231, _x232, _x233) {
       return _changeFuturesMargin.apply(this, arguments);
     }
 
@@ -27253,11 +26886,11 @@ var Pool = /*#__PURE__*/function () {
   _proto.changeFuturesPosition =
   /*#__PURE__*/
   function () {
-    var _changeFuturesPosition = /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/runtime_1.mark(function _callee45(market, changeAmount, options, estimateGas) {
+    var _changeFuturesPosition = /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/runtime_1.mark(function _callee46(market, changeAmount, options, estimateGas) {
       var txData, tx;
-      return runtime_1.wrap(function _callee45$(_context45) {
+      return runtime_1.wrap(function _callee46$(_context46) {
         while (1) {
-          switch (_context45.prev = _context45.next) {
+          switch (_context46.prev = _context46.next) {
             case 0:
               if (options === void 0) {
                 options = null;
@@ -27267,27 +26900,27 @@ var Pool = /*#__PURE__*/function () {
                 estimateGas = false;
               }
 
-              _context45.next = 4;
+              _context46.next = 4;
               return getFuturesChangePositionTxData(changeAmount, market, this);
 
             case 4:
-              txData = _context45.sent;
-              _context45.next = 7;
+              txData = _context46.sent;
+              _context46.next = 7;
               return getPoolTxOrGasEstimate(this, [market, txData, options], estimateGas);
 
             case 7:
-              tx = _context45.sent;
-              return _context45.abrupt("return", tx);
+              tx = _context46.sent;
+              return _context46.abrupt("return", tx);
 
             case 9:
             case "end":
-              return _context45.stop();
+              return _context46.stop();
           }
         }
-      }, _callee45, this);
+      }, _callee46, this);
     }));
 
-    function changeFuturesPosition(_x231, _x232, _x233, _x234) {
+    function changeFuturesPosition(_x234, _x235, _x236, _x237) {
       return _changeFuturesPosition.apply(this, arguments);
     }
 
@@ -27305,11 +26938,11 @@ var Pool = /*#__PURE__*/function () {
   _proto.cancelFuturesOrder =
   /*#__PURE__*/
   function () {
-    var _cancelFuturesOrder = /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/runtime_1.mark(function _callee46(market, options, estimateGas) {
+    var _cancelFuturesOrder = /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/runtime_1.mark(function _callee47(market, options, estimateGas) {
       var txData, tx;
-      return runtime_1.wrap(function _callee46$(_context46) {
+      return runtime_1.wrap(function _callee47$(_context47) {
         while (1) {
-          switch (_context46.prev = _context46.next) {
+          switch (_context47.prev = _context47.next) {
             case 0:
               if (options === void 0) {
                 options = null;
@@ -27319,27 +26952,27 @@ var Pool = /*#__PURE__*/function () {
                 estimateGas = false;
               }
 
-              _context46.next = 4;
+              _context47.next = 4;
               return getFuturesCancelOrderTxData(this);
 
             case 4:
-              txData = _context46.sent;
-              _context46.next = 7;
+              txData = _context47.sent;
+              _context47.next = 7;
               return getPoolTxOrGasEstimate(this, [market, txData, options], estimateGas);
 
             case 7:
-              tx = _context46.sent;
-              return _context46.abrupt("return", tx);
+              tx = _context47.sent;
+              return _context47.abrupt("return", tx);
 
             case 9:
             case "end":
-              return _context46.stop();
+              return _context47.stop();
           }
         }
-      }, _callee46, this);
+      }, _callee47, this);
     }));
 
-    function cancelFuturesOrder(_x235, _x236, _x237) {
+    function cancelFuturesOrder(_x238, _x239, _x240) {
       return _cancelFuturesOrder.apply(this, arguments);
     }
 
@@ -27356,11 +26989,11 @@ var Pool = /*#__PURE__*/function () {
   _proto.mintManagerFee =
   /*#__PURE__*/
   function () {
-    var _mintManagerFee = /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/runtime_1.mark(function _callee47(options, estimateGas) {
+    var _mintManagerFee = /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/runtime_1.mark(function _callee48(options, estimateGas) {
       var tx;
-      return runtime_1.wrap(function _callee47$(_context47) {
+      return runtime_1.wrap(function _callee48$(_context48) {
         while (1) {
-          switch (_context47.prev = _context47.next) {
+          switch (_context48.prev = _context48.next) {
             case 0:
               if (options === void 0) {
                 options = null;
@@ -27371,33 +27004,33 @@ var Pool = /*#__PURE__*/function () {
               }
 
               if (!estimateGas) {
-                _context47.next = 6;
+                _context48.next = 6;
                 break;
               }
 
-              _context47.next = 5;
+              _context48.next = 5;
               return this.poolLogic.estimateGas.mintManagerFee(options);
 
             case 5:
-              return _context47.abrupt("return", _context47.sent);
+              return _context48.abrupt("return", _context48.sent);
 
             case 6:
-              _context47.next = 8;
+              _context48.next = 8;
               return this.poolLogic.mintManagerFee(options);
 
             case 8:
-              tx = _context47.sent;
-              return _context47.abrupt("return", tx);
+              tx = _context48.sent;
+              return _context48.abrupt("return", tx);
 
             case 10:
             case "end":
-              return _context47.stop();
+              return _context48.stop();
           }
         }
-      }, _callee47, this);
+      }, _callee48, this);
     }));
 
-    function mintManagerFee(_x238, _x239) {
+    function mintManagerFee(_x241, _x242) {
       return _mintManagerFee.apply(this, arguments);
     }
 
@@ -27412,25 +27045,25 @@ var Pool = /*#__PURE__*/function () {
   _proto.getAvailableManagerFee =
   /*#__PURE__*/
   function () {
-    var _getAvailableManagerFee = /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/runtime_1.mark(function _callee48() {
+    var _getAvailableManagerFee = /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/runtime_1.mark(function _callee49() {
       var fee;
-      return runtime_1.wrap(function _callee48$(_context48) {
+      return runtime_1.wrap(function _callee49$(_context49) {
         while (1) {
-          switch (_context48.prev = _context48.next) {
+          switch (_context49.prev = _context49.next) {
             case 0:
-              _context48.next = 2;
+              _context49.next = 2;
               return this.poolLogic.availableManagerFee();
 
             case 2:
-              fee = _context48.sent;
-              return _context48.abrupt("return", BigNumber$1.from(fee));
+              fee = _context49.sent;
+              return _context49.abrupt("return", BigNumber$1.from(fee));
 
             case 4:
             case "end":
-              return _context48.stop();
+              return _context49.stop();
           }
         }
-      }, _callee48, this);
+      }, _callee49, this);
     }));
 
     function getAvailableManagerFee() {
@@ -27452,11 +27085,11 @@ var Pool = /*#__PURE__*/function () {
   _proto.vestTokens =
   /*#__PURE__*/
   function () {
-    var _vestTokens = /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/runtime_1.mark(function _callee49(tokenAddress, amount, options, estimateGas) {
+    var _vestTokens = /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/runtime_1.mark(function _callee50(tokenAddress, amount, options, estimateGas) {
       var txData, tx;
-      return runtime_1.wrap(function _callee49$(_context49) {
+      return runtime_1.wrap(function _callee50$(_context50) {
         while (1) {
-          switch (_context49.prev = _context49.next) {
+          switch (_context50.prev = _context50.next) {
             case 0:
               if (options === void 0) {
                 options = null;
@@ -27466,27 +27099,27 @@ var Pool = /*#__PURE__*/function () {
                 estimateGas = false;
               }
 
-              _context49.next = 4;
+              _context50.next = 4;
               return getCreateVestTxData(amount);
 
             case 4:
-              txData = _context49.sent;
-              _context49.next = 7;
+              txData = _context50.sent;
+              _context50.next = 7;
               return getPoolTxOrGasEstimate(this, [tokenAddress, txData, options], estimateGas);
 
             case 7:
-              tx = _context49.sent;
-              return _context49.abrupt("return", tx);
+              tx = _context50.sent;
+              return _context50.abrupt("return", tx);
 
             case 9:
             case "end":
-              return _context49.stop();
+              return _context50.stop();
           }
         }
-      }, _callee49, this);
+      }, _callee50, this);
     }));
 
-    function vestTokens(_x240, _x241, _x242, _x243) {
+    function vestTokens(_x243, _x244, _x245, _x246) {
       return _vestTokens.apply(this, arguments);
     }
 
@@ -27505,11 +27138,11 @@ var Pool = /*#__PURE__*/function () {
   _proto.exitVestedToken =
   /*#__PURE__*/
   function () {
-    var _exitVestedToken = /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/runtime_1.mark(function _callee50(tokenAddress, id, options, estimateGas) {
+    var _exitVestedToken = /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/runtime_1.mark(function _callee51(tokenAddress, id, options, estimateGas) {
       var txData, tx;
-      return runtime_1.wrap(function _callee50$(_context50) {
+      return runtime_1.wrap(function _callee51$(_context51) {
         while (1) {
-          switch (_context50.prev = _context50.next) {
+          switch (_context51.prev = _context51.next) {
             case 0:
               if (options === void 0) {
                 options = null;
@@ -27519,27 +27152,27 @@ var Pool = /*#__PURE__*/function () {
                 estimateGas = false;
               }
 
-              _context50.next = 4;
+              _context51.next = 4;
               return getExitVestTxData(id);
 
             case 4:
-              txData = _context50.sent;
-              _context50.next = 7;
+              txData = _context51.sent;
+              _context51.next = 7;
               return getPoolTxOrGasEstimate(this, [tokenAddress, txData, options], estimateGas);
 
             case 7:
-              tx = _context50.sent;
-              return _context50.abrupt("return", tx);
+              tx = _context51.sent;
+              return _context51.abrupt("return", tx);
 
             case 9:
             case "end":
-              return _context50.stop();
+              return _context51.stop();
           }
         }
-      }, _callee50, this);
+      }, _callee51, this);
     }));
 
-    function exitVestedToken(_x244, _x245, _x246, _x247) {
+    function exitVestedToken(_x247, _x248, _x249, _x250) {
       return _exitVestedToken.apply(this, arguments);
     }
 
@@ -27559,11 +27192,11 @@ var Pool = /*#__PURE__*/function () {
   _proto.mintUnitViaFlatMoney =
   /*#__PURE__*/
   function () {
-    var _mintUnitViaFlatMoney2 = /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/runtime_1.mark(function _callee51(depositAmount, slippage, maxKeeperFeeInUsd, options, estimateGas) {
+    var _mintUnitViaFlatMoney2 = /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/runtime_1.mark(function _callee52(depositAmount, slippage, maxKeeperFeeInUsd, options, estimateGas) {
       var tx;
-      return runtime_1.wrap(function _callee51$(_context51) {
+      return runtime_1.wrap(function _callee52$(_context52) {
         while (1) {
-          switch (_context51.prev = _context51.next) {
+          switch (_context52.prev = _context52.next) {
             case 0:
               if (slippage === void 0) {
                 slippage = 0.5;
@@ -27577,22 +27210,22 @@ var Pool = /*#__PURE__*/function () {
                 estimateGas = false;
               }
 
-              _context51.next = 5;
+              _context52.next = 5;
               return mintUnitViaFlatMoney(this, depositAmount, slippage, maxKeeperFeeInUsd, options, estimateGas);
 
             case 5:
-              tx = _context51.sent;
-              return _context51.abrupt("return", tx);
+              tx = _context52.sent;
+              return _context52.abrupt("return", tx);
 
             case 7:
             case "end":
-              return _context51.stop();
+              return _context52.stop();
           }
         }
-      }, _callee51, this);
+      }, _callee52, this);
     }));
 
-    function mintUnitViaFlatMoney$1(_x248, _x249, _x250, _x251, _x252) {
+    function mintUnitViaFlatMoney$1(_x251, _x252, _x253, _x254, _x255) {
       return _mintUnitViaFlatMoney2.apply(this, arguments);
     }
 
@@ -27612,11 +27245,11 @@ var Pool = /*#__PURE__*/function () {
   _proto.redeemUnitViaFlatMoney =
   /*#__PURE__*/
   function () {
-    var _redeemUnitViaFlatMoney2 = /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/runtime_1.mark(function _callee52(withdrawAmount, slippage, maxKeeperFeeInUsd, options, estimateGas) {
+    var _redeemUnitViaFlatMoney2 = /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/runtime_1.mark(function _callee53(withdrawAmount, slippage, maxKeeperFeeInUsd, options, estimateGas) {
       var tx;
-      return runtime_1.wrap(function _callee52$(_context52) {
+      return runtime_1.wrap(function _callee53$(_context53) {
         while (1) {
-          switch (_context52.prev = _context52.next) {
+          switch (_context53.prev = _context53.next) {
             case 0:
               if (slippage === void 0) {
                 slippage = 0.5;
@@ -27630,22 +27263,22 @@ var Pool = /*#__PURE__*/function () {
                 estimateGas = false;
               }
 
-              _context52.next = 5;
+              _context53.next = 5;
               return redeemUnitViaFlatMoney(this, withdrawAmount, slippage, maxKeeperFeeInUsd, options, estimateGas);
 
             case 5:
-              tx = _context52.sent;
-              return _context52.abrupt("return", tx);
+              tx = _context53.sent;
+              return _context53.abrupt("return", tx);
 
             case 7:
             case "end":
-              return _context52.stop();
+              return _context53.stop();
           }
         }
-      }, _callee52, this);
+      }, _callee53, this);
     }));
 
-    function redeemUnitViaFlatMoney$1(_x253, _x254, _x255, _x256, _x257) {
+    function redeemUnitViaFlatMoney$1(_x256, _x257, _x258, _x259, _x260) {
       return _redeemUnitViaFlatMoney2.apply(this, arguments);
     }
 
@@ -27653,11 +27286,11 @@ var Pool = /*#__PURE__*/function () {
   }();
 
   _proto.cancelOrderViaFlatMoney = /*#__PURE__*/function () {
-    var _cancelOrderViaFlatMoney2 = /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/runtime_1.mark(function _callee53(options, estimateGas) {
+    var _cancelOrderViaFlatMoney2 = /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/runtime_1.mark(function _callee54(options, estimateGas) {
       var tx;
-      return runtime_1.wrap(function _callee53$(_context53) {
+      return runtime_1.wrap(function _callee54$(_context54) {
         while (1) {
-          switch (_context53.prev = _context53.next) {
+          switch (_context54.prev = _context54.next) {
             case 0:
               if (options === void 0) {
                 options = null;
@@ -27667,32 +27300,89 @@ var Pool = /*#__PURE__*/function () {
                 estimateGas = false;
               }
 
-              _context53.next = 4;
+              _context54.next = 4;
               return cancelOrderViaFlatMoney(this, options, estimateGas);
 
             case 4:
-              tx = _context53.sent;
-              return _context53.abrupt("return", tx);
+              tx = _context54.sent;
+              return _context54.abrupt("return", tx);
 
             case 6:
             case "end":
-              return _context53.stop();
+              return _context54.stop();
           }
         }
-      }, _callee53, this);
+      }, _callee54, this);
     }));
 
-    function cancelOrderViaFlatMoney$1(_x258, _x259) {
+    function cancelOrderViaFlatMoney$1(_x261, _x262) {
       return _cancelOrderViaFlatMoney2.apply(this, arguments);
     }
 
     return cancelOrderViaFlatMoney$1;
+  }()
+  /**
+   * Complete a Toros withdrawal to a single asset
+   * @param {string} destinationToken Address of destination asset
+   * @param {number} slippage Slippage tolerance in %
+   * @param {any} options Transaction options
+   * @param {boolean} estimateGas Simulate/estimate gas
+   * @returns {Promise<any>} Transaction
+   */
+  ;
+
+  _proto.completeTorosWithdrawal =
+  /*#__PURE__*/
+  function () {
+    var _completeTorosWithdrawal = /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/runtime_1.mark(function _callee55(destinationToken, slippage, options, estimateGas) {
+      var txData, tx;
+      return runtime_1.wrap(function _callee55$(_context55) {
+        while (1) {
+          switch (_context55.prev = _context55.next) {
+            case 0:
+              if (slippage === void 0) {
+                slippage = 0.5;
+              }
+
+              if (options === void 0) {
+                options = null;
+              }
+
+              if (estimateGas === void 0) {
+                estimateGas = false;
+              }
+
+              _context55.next = 5;
+              return getCompleteWithdrawalTxData(this, destinationToken, slippage);
+
+            case 5:
+              txData = _context55.sent;
+              _context55.next = 8;
+              return getPoolTxOrGasEstimate(this, [routerAddress[this.network].toros, txData, options], estimateGas);
+
+            case 8:
+              tx = _context55.sent;
+              return _context55.abrupt("return", tx);
+
+            case 10:
+            case "end":
+              return _context55.stop();
+          }
+        }
+      }, _callee55, this);
+    }));
+
+    function completeTorosWithdrawal(_x263, _x264, _x265, _x266) {
+      return _completeTorosWithdrawal.apply(this, arguments);
+    }
+
+    return completeTorosWithdrawal;
   }();
 
   return Pool;
 }();
 
-var abi$u = [
+var abi$r = [
 	{
 		inputs: [
 			{
@@ -27916,10 +27606,10 @@ var abi$u = [
 	}
 ];
 var UniswapV2Factory = {
-	abi: abi$u
+	abi: abi$r
 };
 
-var abi$v = [
+var abi$s = [
 	{
 		anonymous: false,
 		inputs: [
@@ -28663,7 +28353,7 @@ var evm = {
 	}
 };
 var UniswapV2Pair = {
-	abi: abi$v,
+	abi: abi$s,
 	evm: evm,
 	"interface": [
 	{
@@ -29394,7 +29084,7 @@ var UniswapV2Pair = {
 ]
 };
 
-var abi$w = [
+var abi$t = [
 	{
 		inputs: [
 			{
@@ -30589,7 +30279,7 @@ var abi$w = [
 	}
 ];
 var IBalancerV2Vault = {
-	abi: abi$w
+	abi: abi$t
 };
 
 var Utils = /*#__PURE__*/function () {