@enzymefinance/testutils 4.0.0-next.0 → 4.0.0-next.5

package/dist/enzymefinance-testutils.cjs.prod.js

@@ -4,11 +4,10 @@ Object.defineProperty(exports, '__esModule', { value: true });
 
 var _asyncToGenerator = require('@babel/runtime/helpers/asyncToGenerator');
 var _regeneratorRuntime = require('@babel/runtime/regenerator');
-var protocol$1 = require('@enzymefinance/protocol');
+var protocol = require('@enzymefinance/protocol');
 var ethers = require('ethers');
-var src = require('@enzymefinance/protocol/src');
-var _taggedTemplateLiteral = require('@babel/runtime/helpers/taggedTemplateLiteral');
 var ethers$1 = require('@enzymefinance/ethers');
+var _taggedTemplateLiteral = require('@babel/runtime/helpers/taggedTemplateLiteral');
 var _toConsumableArray = require('@babel/runtime/helpers/toConsumableArray');
 var _defineProperty = require('@babel/runtime/helpers/defineProperty');
 
@@ -112,68 +111,81 @@ function _deployProtocolFixture() {
             config = fixture['Config'].linkedData; // prettier-ignore
 
             deployment = {
-              dispatcher: new protocol$1.Dispatcher(fixture['Dispatcher'].address, deployer),
-              vaultLib: new protocol$1.VaultLib(fixture['VaultLib'].address, deployer),
-              fundDeployer: new protocol$1.FundDeployer(fixture['FundDeployer'].address, deployer),
-              policyManager: new protocol$1.PolicyManager(fixture['PolicyManager'].address, deployer),
-              aavePriceFeed: new protocol$1.AavePriceFeed(fixture['AavePriceFeed'].address, deployer),
-              compoundDebtPositionLib: new protocol$1.CompoundDebtPositionLib(fixture['CompoundDebtPositionLib'].address, deployer),
-              compoundDebtPositionParser: new protocol$1.CompoundDebtPositionParser(fixture['CompoundDebtPositionParser'].address, deployer),
-              compoundPriceFeed: new protocol$1.CompoundPriceFeed(fixture['CompoundPriceFeed'].address, deployer),
-              curvePriceFeed: new protocol$1.CurvePriceFeed(fixture['CurvePriceFeed'].address, deployer),
-              idlePriceFeed: new protocol$1.IdlePriceFeed(fixture['IdlePriceFeed'].address, deployer),
-              lidoStethPriceFeed: new protocol$1.LidoStethPriceFeed(fixture['LidoStethPriceFeed'].address, deployer),
-              revertingPriceFeed: new protocol$1.RevertingPriceFeed(fixture['RevertingPriceFeed'].address, deployer),
-              synthetixPriceFeed: new protocol$1.SynthetixPriceFeed(fixture['SynthetixPriceFeed'].address, deployer),
-              stakehoundEthPriceFeed: new protocol$1.StakehoundEthPriceFeed(fixture['StakehoundEthPriceFeed'].address, deployer),
-              wdgldPriceFeed: new protocol$1.WdgldPriceFeed(fixture['WdgldPriceFeed'].address, deployer),
-              yearnVaultV2PriceFeed: new protocol$1.YearnVaultV2PriceFeed(fixture['YearnVaultV2PriceFeed'].address, deployer),
-              valueInterpreter: new protocol$1.ValueInterpreter(fixture['ValueInterpreter'].address, deployer),
-              uniswapV2PoolPriceFeed: new protocol$1.UniswapV2PoolPriceFeed(fixture['UniswapV2PoolPriceFeed'].address, deployer),
-              integrationManager: new protocol$1.IntegrationManager(fixture['IntegrationManager'].address, deployer),
-              externalPositionManager: new protocol$1.ExternalPositionManager(fixture['ExternalPositionManager'].address, deployer),
-              externalPositionFactory: new protocol$1.ExternalPositionFactory(fixture['ExternalPositionFactory'].address, deployer),
-              curveLiquidityAaveAdapter: new protocol$1.CurveLiquidityAaveAdapter(fixture['CurveLiquidityAaveAdapter'].address, deployer),
-              curveLiquidityEursAdapter: new protocol$1.CurveLiquidityEursAdapter(fixture['CurveLiquidityEursAdapter'].address, deployer),
-              curveLiquiditySethAdapter: new protocol$1.CurveLiquiditySethAdapter(fixture['CurveLiquiditySethAdapter'].address, deployer),
-              curveLiquidityStethAdapter: new protocol$1.CurveLiquidityStethAdapter(fixture['CurveLiquidityStethAdapter'].address, deployer),
-              aaveAdapter: new protocol$1.AaveAdapter(fixture['AaveAdapter'].address, deployer),
-              idleAdapter: new protocol$1.IdleAdapter(fixture['IdleAdapter'].address, deployer),
-              paraSwapV4Adapter: new protocol$1.ParaSwapV4Adapter(fixture['ParaSwapV4Adapter'].address, deployer),
-              synthetixAdapter: new protocol$1.SynthetixAdapter(fixture['SynthetixAdapter'].address, deployer),
-              yearnVaultV2Adapter: new protocol$1.YearnVaultV2Adapter(fixture['YearnVaultV2Adapter'].address, deployer),
-              zeroExV2Adapter: new protocol$1.ZeroExV2Adapter(fixture['ZeroExV2Adapter'].address, deployer),
-              compoundAdapter: new protocol$1.CompoundAdapter(fixture['CompoundAdapter'].address, deployer),
-              uniswapV2Adapter: new protocol$1.UniswapV2Adapter(fixture['UniswapV2Adapter'].address, deployer),
-              uniswapV3Adapter: new protocol$1.UniswapV3Adapter(fixture['UniswapV3Adapter'].address, deployer),
-              curveExchangeAdapter: new protocol$1.CurveExchangeAdapter(fixture['CurveExchangeAdapter'].address, deployer),
-              feeManager: new protocol$1.FeeManager(fixture['FeeManager'].address, deployer),
-              comptrollerLib: new protocol$1.ComptrollerLib(fixture['ComptrollerLib'].address, deployer),
-              entranceRateBurnFee: new protocol$1.EntranceRateBurnFee(fixture['EntranceRateBurnFee'].address, deployer),
-              entranceRateDirectFee: new protocol$1.EntranceRateDirectFee(fixture['EntranceRateDirectFee'].address, deployer),
-              exitRateBurnFee: new protocol$1.ExitRateBurnFee(fixture['ExitRateBurnFee'].address, deployer),
-              exitRateDirectFee: new protocol$1.ExitRateDirectFee(fixture['ExitRateDirectFee'].address, deployer),
-              managementFee: new protocol$1.ManagementFee(fixture['ManagementFee'].address, deployer),
-              performanceFee: new protocol$1.PerformanceFee(fixture['PerformanceFee'].address, deployer),
-              depositWrapper: new protocol$1.DepositWrapper(fixture['DepositWrapper'].address, deployer),
-              unpermissionedActionsWrapper: new protocol$1.UnpermissionedActionsWrapper(fixture['UnpermissionedActionsWrapper'].address, deployer),
-              allowedAdapterIncomingAssetsPolicy: new protocol$1.AllowedAdapterIncomingAssetsPolicy(fixture['AllowedAdapterIncomingAssetsPolicy'].address, deployer),
-              minMaxInvestmentPolicy: new protocol$1.MinMaxInvestmentPolicy(fixture['MinMaxInvestmentPolicy'].address, deployer),
-              allowedDepositRecipientsPolicy: new protocol$1.AllowedDepositRecipientsPolicy(fixture['AllowedDepositRecipientsPolicy'].address, deployer),
-              guaranteedRedemptionPolicy: new protocol$1.GuaranteedRedemptionPolicy(fixture['GuaranteedRedemptionPolicy'].address, deployer),
-              globalConfigLib: new protocol$1.GlobalConfigLib(fixture['GlobalConfigLib'].address, deployer),
-              globalConfigProxy: new protocol$1.GlobalConfigLib(fixture['GlobalConfigProxy'].address, deployer),
-              assetFinalityResolver: new protocol$1.AssetFinalityResolver(fixture['AssetFinalityResolver'].address, deployer),
-              protocolFeeReserveLib: new protocol$1.ProtocolFeeReserveLib(fixture['ProtocolFeeReserveLib'].address, deployer),
-              protocolFeeReserveProxy: new protocol$1.ProtocolFeeReserveLib(fixture['ProtocolFeeReserveProxy'].address, deployer),
-              protocolFeeTracker: new protocol$1.ProtocolFeeTracker(fixture['ProtocolFeeTracker'].address, deployer),
-              gasRelayPaymasterFactory: new protocol$1.GasRelayPaymasterFactory(fixture['GasRelayPaymasterFactory'].address, deployer)
+              aaveAdapter: new protocol.AaveAdapter(fixture['AaveAdapter'].address, deployer),
+              aavePriceFeed: new protocol.AavePriceFeed(fixture['AavePriceFeed'].address, deployer),
+              addressListRegistry: new protocol.AddressListRegistry(fixture['AddressListRegistry'].address, deployer),
+              allowedAdapterIncomingAssetsPolicy: new protocol.AllowedAdapterIncomingAssetsPolicy(fixture['AllowedAdapterIncomingAssetsPolicy'].address, deployer),
+              allowedAdaptersPolicy: new protocol.AllowedAdaptersPolicy(fixture['AllowedAdaptersPolicy'].address, deployer),
+              allowedAssetsForRedemptionPolicy: new protocol.AllowedAssetsForRedemptionPolicy(fixture['AllowedAssetsForRedemptionPolicy'].address, deployer),
+              allowedDepositRecipientsPolicy: new protocol.AllowedDepositRecipientsPolicy(fixture['AllowedDepositRecipientsPolicy'].address, deployer),
+              allowedExternalPositionTypesPolicy: new protocol.AllowedExternalPositionTypesPolicy(fixture['AllowedExternalPositionTypesPolicy'].address, deployer),
+              allowedSharesTransferRecipientsPolicy: new protocol.AllowedSharesTransferRecipientsPolicy(fixture['AllowedSharesTransferRecipientsPolicy'].address, deployer),
+              assetFinalityResolver: new protocol.AssetFinalityResolver(fixture['AssetFinalityResolver'].address, deployer),
+              compoundAdapter: new protocol.CompoundAdapter(fixture['CompoundAdapter'].address, deployer),
+              compoundDebtPositionLib: new protocol.CompoundDebtPositionLib(fixture['CompoundDebtPositionLib'].address, deployer),
+              compoundDebtPositionParser: new protocol.CompoundDebtPositionParser(fixture['CompoundDebtPositionParser'].address, deployer),
+              compoundPriceFeed: new protocol.CompoundPriceFeed(fixture['CompoundPriceFeed'].address, deployer),
+              comptrollerLib: new protocol.ComptrollerLib(fixture['ComptrollerLib'].address, deployer),
+              cumulativeSlippageTolerancePolicy: new protocol.CumulativeSlippageTolerancePolicy(fixture['CumulativeSlippageTolerancePolicy'].address, deployer),
+              curveExchangeAdapter: new protocol.CurveExchangeAdapter(fixture['CurveExchangeAdapter'].address, deployer),
+              curveLiquidityAaveAdapter: new protocol.CurveLiquidityAaveAdapter(fixture['CurveLiquidityAaveAdapter'].address, deployer),
+              curveLiquidityEursAdapter: new protocol.CurveLiquidityEursAdapter(fixture['CurveLiquidityEursAdapter'].address, deployer),
+              curveLiquiditySethAdapter: new protocol.CurveLiquiditySethAdapter(fixture['CurveLiquiditySethAdapter'].address, deployer),
+              curveLiquidityStethAdapter: new protocol.CurveLiquidityStethAdapter(fixture['CurveLiquidityStethAdapter'].address, deployer),
+              curvePriceFeed: new protocol.CurvePriceFeed(fixture['CurvePriceFeed'].address, deployer),
+              depositWrapper: new protocol.DepositWrapper(fixture['DepositWrapper'].address, deployer),
+              dispatcher: new protocol.Dispatcher(fixture['Dispatcher'].address, deployer),
+              entranceRateBurnFee: new protocol.EntranceRateBurnFee(fixture['EntranceRateBurnFee'].address, deployer),
+              entranceRateDirectFee: new protocol.EntranceRateDirectFee(fixture['EntranceRateDirectFee'].address, deployer),
+              exitRateBurnFee: new protocol.ExitRateBurnFee(fixture['ExitRateBurnFee'].address, deployer),
+              exitRateDirectFee: new protocol.ExitRateDirectFee(fixture['ExitRateDirectFee'].address, deployer),
+              externalPositionFactory: new protocol.ExternalPositionFactory(fixture['ExternalPositionFactory'].address, deployer),
+              externalPositionManager: new protocol.ExternalPositionManager(fixture['ExternalPositionManager'].address, deployer),
+              feeManager: new protocol.FeeManager(fixture['FeeManager'].address, deployer),
+              fundDeployer: new protocol.FundDeployer(fixture['FundDeployer'].address, deployer),
+              fundValueCalculator: new protocol.FundValueCalculator(fixture['FundValueCalculator'].address, deployer),
+              fundValueCalculatorRouter: new protocol.FundValueCalculatorRouter(fixture['FundValueCalculatorRouter'].address, deployer),
+              fundValueCalculatorUsdWrapper: new protocol.FundValueCalculatorUsdWrapper(fixture['FundValueCalculatorUsdWrapper'].address, deployer),
+              gasRelayPaymasterFactory: new protocol.GasRelayPaymasterFactory(fixture['GasRelayPaymasterFactory'].address, deployer),
+              guaranteedRedemptionPolicy: new protocol.GuaranteedRedemptionPolicy(fixture['GuaranteedRedemptionPolicy'].address, deployer),
+              idleAdapter: new protocol.IdleAdapter(fixture['IdleAdapter'].address, deployer),
+              idlePriceFeed: new protocol.IdlePriceFeed(fixture['IdlePriceFeed'].address, deployer),
+              integrationManager: new protocol.IntegrationManager(fixture['IntegrationManager'].address, deployer),
+              lidoStethPriceFeed: new protocol.LidoStethPriceFeed(fixture['LidoStethPriceFeed'].address, deployer),
+              managementFee: new protocol.ManagementFee(fixture['ManagementFee'].address, deployer),
+              minAssetBalancesPostRedemptionPolicy: new protocol.MinAssetBalancesPostRedemptionPolicy(fixture['MinAssetBalancesPostRedemptionPolicy'].address, deployer),
+              minMaxInvestmentPolicy: new protocol.MinMaxInvestmentPolicy(fixture['MinMaxInvestmentPolicy'].address, deployer),
+              onlyRemoveDustExternalPositionPolicy: new protocol.OnlyRemoveDustExternalPositionPolicy(fixture['OnlyRemoveDustExternalPositionPolicy'].address, deployer),
+              onlyUntrackDustOrPricelessAssetsPolicy: new protocol.OnlyUntrackDustOrPricelessAssetsPolicy(fixture['OnlyUntrackDustOrPricelessAssetsPolicy'].address, deployer),
+              paraSwapV4Adapter: new protocol.ParaSwapV4Adapter(fixture['ParaSwapV4Adapter'].address, deployer),
+              paraSwapV5Adapter: new protocol.ParaSwapV5Adapter(fixture['ParaSwapV5Adapter'].address, deployer),
+              performanceFee: new protocol.PerformanceFee(fixture['PerformanceFee'].address, deployer),
+              policyManager: new protocol.PolicyManager(fixture['PolicyManager'].address, deployer),
+              poolTogetherV4Adapter: new protocol.PoolTogetherV4Adapter(fixture['PoolTogetherV4Adapter'].address, deployer),
+              poolTogetherV4PriceFeed: new protocol.PoolTogetherV4PriceFeed(fixture['PoolTogetherV4PriceFeed'].address, deployer),
+              protocolFeeReserveLib: new protocol.ProtocolFeeReserveLib(fixture['ProtocolFeeReserveLib'].address, deployer),
+              protocolFeeReserveProxy: new protocol.ProtocolFeeReserveLib(fixture['ProtocolFeeReserveProxy'].address, deployer),
+              protocolFeeTracker: new protocol.ProtocolFeeTracker(fixture['ProtocolFeeTracker'].address, deployer),
+              revertingPriceFeed: new protocol.RevertingPriceFeed(fixture['RevertingPriceFeed'].address, deployer),
+              stakehoundEthPriceFeed: new protocol.StakehoundEthPriceFeed(fixture['StakehoundEthPriceFeed'].address, deployer),
+              synthetixAdapter: new protocol.SynthetixAdapter(fixture['SynthetixAdapter'].address, deployer),
+              synthetixPriceFeed: new protocol.SynthetixPriceFeed(fixture['SynthetixPriceFeed'].address, deployer),
+              uniswapV2ExchangeAdapter: new protocol.UniswapV2ExchangeAdapter(fixture['UniswapV2ExchangeAdapter'].address, deployer),
+              uniswapV2LiquidityAdapter: new protocol.UniswapV2LiquidityAdapter(fixture['UniswapV2LiquidityAdapter'].address, deployer),
+              uniswapV2PoolPriceFeed: new protocol.UniswapV2PoolPriceFeed(fixture['UniswapV2PoolPriceFeed'].address, deployer),
+              uniswapV3Adapter: new protocol.UniswapV3Adapter(fixture['UniswapV3Adapter'].address, deployer),
+              unpermissionedActionsWrapper: new protocol.UnpermissionedActionsWrapper(fixture['UnpermissionedActionsWrapper'].address, deployer),
+              valueInterpreter: new protocol.ValueInterpreter(fixture['ValueInterpreter'].address, deployer),
+              vaultLib: new protocol.VaultLib(fixture['VaultLib'].address, deployer),
+              yearnVaultV2Adapter: new protocol.YearnVaultV2Adapter(fixture['YearnVaultV2Adapter'].address, deployer),
+              yearnVaultV2PriceFeed: new protocol.YearnVaultV2PriceFeed(fixture['YearnVaultV2PriceFeed'].address, deployer),
+              zeroExV2Adapter: new protocol.ZeroExV2Adapter(fixture['ZeroExV2Adapter'].address, deployer)
             };
             return _context3.abrupt("return", {
-              deployer: deployer,
-              deployment: deployment,
               accounts: accounts,
-              config: config
+              config: config,
+              deployer: deployer,
+              deployment: deployment
             });
 
           case 12:
@@ -186,36 +198,12 @@ function _deployProtocolFixture() {
   return _deployProtocolFixture.apply(this, arguments);
 }
 
-// TODO: Remove this.
-// eslint-disable-next-line @typescript-eslint/no-unused-vars
-function defaultTestDeployment(_x2) {
-  return _defaultTestDeployment.apply(this, arguments);
-}
-
-function _defaultTestDeployment() {
-  _defaultTestDeployment = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime__default['default'].mark(function _callee4(_) {
-    return _regeneratorRuntime__default['default'].wrap(function _callee4$(_context4) {
-      while (1) {
-        switch (_context4.prev = _context4.next) {
-          case 0:
-            throw new Error('Removed');
-
-          case 1:
-          case "end":
-            return _context4.stop();
-        }
-      }
-    }, _callee4);
-  }));
-  return _defaultTestDeployment.apply(this, arguments);
-}
-
 function addTrackedAssetsToVault(_ref) {
   var signer = _ref.signer,
       comptrollerProxy = _ref.comptrollerProxy,
       integrationManager = _ref.integrationManager,
       assets = _ref.assets;
-  return comptrollerProxy.connect(signer).callOnExtension(integrationManager, protocol$1.IntegrationManagerActionId.AddTrackedAssetsToVault, protocol$1.addTrackedAssetsToVaultArgs({
+  return comptrollerProxy.connect(signer).callOnExtension(integrationManager, protocol.IntegrationManagerActionId.AddTrackedAssetsToVault, protocol.addTrackedAssetsToVaultArgs({
     assets: assets
   }));
 }
@@ -224,7 +212,7 @@ function removeTrackedAssetsFromVault(_ref2) {
       comptrollerProxy = _ref2.comptrollerProxy,
       integrationManager = _ref2.integrationManager,
       assets = _ref2.assets;
-  return comptrollerProxy.connect(signer).callOnExtension(integrationManager, protocol$1.IntegrationManagerActionId.RemoveTrackedAssetsFromVault, protocol$1.removeTrackedAssetsFromVaultArgs({
+  return comptrollerProxy.connect(signer).callOnExtension(integrationManager, protocol.IntegrationManagerActionId.RemoveTrackedAssetsFromVault, protocol.removeTrackedAssetsFromVaultArgs({
     assets: assets
   }));
 }
@@ -244,10 +232,10 @@ function _addNewAssetsToFund() {
             signer = _ref.signer, comptrollerProxy = _ref.comptrollerProxy, integrationManager = _ref.integrationManager, assets = _ref.assets, _ref$amounts = _ref.amounts, amounts = _ref$amounts === void 0 ? new Array(assets.length).fill(1) : _ref$amounts;
             // First, add tracked assets while their balances are 0
             receipt = addTrackedAssetsToVault({
-              signer: signer,
+              assets: assets,
               comptrollerProxy: comptrollerProxy,
               integrationManager: integrationManager,
-              assets: assets
+              signer: signer
             }); // Then seed the vault with balances as necessary
 
             _context.next = 4;
@@ -350,7 +338,7 @@ function _getAssetBalances() {
           case 0:
             account = _ref.account, assets = _ref.assets;
             return _context.abrupt("return", Promise.all(assets.map(function (asset) {
-              return new protocol$1.StandardToken(asset, provider).balanceOf(account);
+              return new protocol.StandardToken(asset, provider).balanceOf(account);
             })));
 
           case 2:
@@ -399,13 +387,13 @@ function createFundDeployer(_x) {
 
 function _createFundDeployer() {
   _createFundDeployer = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime__default['default'].mark(function _callee(_ref) {
-    var deployer, assetFinalityResolver, externalPositionManager, dispatcher, feeManager, gasRelayPaymasterFactory, integrationManager, policyManager, valueInterpreter, vaultLib, _ref$setOnDispatcher, setOnDispatcher, _ref$setReleaseLive, setReleaseLive, mlnToken, wethToken, protocolFeeReserve, nextFundDeployer, nextComptrollerLib, nextProtocolFeeTracker, nextVaultLib;
+    var deployer, assetFinalityResolver, externalPositionManager, dispatcher, gasRelayPaymasterFactory, valueInterpreter, vaultLib, _ref$setOnDispatcher, setOnDispatcher, _ref$setReleaseLive, setReleaseLive, mlnToken, wethToken, protocolFeeReserve, nextFundDeployer, nextPolicyManager, nextExternalPositionManager, nextFeeManager, nextIntegrationManager, nextComptrollerLib, nextProtocolFeeTracker, nextVaultLib;
 
     return _regeneratorRuntime__default['default'].wrap(function _callee$(_context) {
       while (1) {
         switch (_context.prev = _context.next) {
           case 0:
-            deployer = _ref.deployer, assetFinalityResolver = _ref.assetFinalityResolver, externalPositionManager = _ref.externalPositionManager, dispatcher = _ref.dispatcher, feeManager = _ref.feeManager, gasRelayPaymasterFactory = _ref.gasRelayPaymasterFactory, integrationManager = _ref.integrationManager, policyManager = _ref.policyManager, valueInterpreter = _ref.valueInterpreter, vaultLib = _ref.vaultLib, _ref$setOnDispatcher = _ref.setOnDispatcher, setOnDispatcher = _ref$setOnDispatcher === void 0 ? true : _ref$setOnDispatcher, _ref$setReleaseLive = _ref.setReleaseLive, setReleaseLive = _ref$setReleaseLive === void 0 ? true : _ref$setReleaseLive;
+            deployer = _ref.deployer, assetFinalityResolver = _ref.assetFinalityResolver, externalPositionManager = _ref.externalPositionManager, dispatcher = _ref.dispatcher, gasRelayPaymasterFactory = _ref.gasRelayPaymasterFactory, valueInterpreter = _ref.valueInterpreter, vaultLib = _ref.vaultLib, _ref$setOnDispatcher = _ref.setOnDispatcher, setOnDispatcher = _ref$setOnDispatcher === void 0 ? true : _ref$setOnDispatcher, _ref$setReleaseLive = _ref.setReleaseLive, setReleaseLive = _ref$setReleaseLive === void 0 ? true : _ref$setReleaseLive;
             _context.next = 3;
             return vaultLib.getMlnToken();
 
@@ -422,82 +410,111 @@ function _createFundDeployer() {
           case 9:
             protocolFeeReserve = _context.sent;
             _context.next = 12;
-            return protocol$1.FundDeployer.deploy(deployer, dispatcher, gasRelayPaymasterFactory);
+            return protocol.FundDeployer.deploy(deployer, dispatcher, gasRelayPaymasterFactory);
 
           case 12:
             nextFundDeployer = _context.sent;
             _context.next = 15;
-            return protocol$1.ComptrollerLib.deploy(deployer, dispatcher, protocolFeeReserve, nextFundDeployer, valueInterpreter, externalPositionManager, feeManager, integrationManager, policyManager, assetFinalityResolver, gasRelayPaymasterFactory, mlnToken, wethToken);
+            return protocol.PolicyManager.deploy(deployer, nextFundDeployer, gasRelayPaymasterFactory);
 
           case 15:
+            nextPolicyManager = _context.sent;
+            _context.t0 = protocol.ExternalPositionManager;
+            _context.t1 = deployer;
+            _context.t2 = nextFundDeployer;
+            _context.next = 21;
+            return externalPositionManager.getExternalPositionFactory();
+
+          case 21:
+            _context.t3 = _context.sent;
+            _context.t4 = nextPolicyManager;
+            _context.next = 25;
+            return _context.t0.deploy.call(_context.t0, _context.t1, _context.t2, _context.t3, _context.t4);
+
+          case 25:
+            nextExternalPositionManager = _context.sent;
+            _context.next = 28;
+            return protocol.FeeManager.deploy(deployer, nextFundDeployer);
+
+          case 28:
+            nextFeeManager = _context.sent;
+            _context.next = 31;
+            return protocol.IntegrationManager.deploy(deployer, nextFundDeployer, nextPolicyManager, valueInterpreter);
+
+          case 31:
+            nextIntegrationManager = _context.sent;
+            _context.next = 34;
+            return protocol.ComptrollerLib.deploy(deployer, dispatcher, protocolFeeReserve, nextFundDeployer, valueInterpreter, nextExternalPositionManager, nextFeeManager, nextIntegrationManager, nextPolicyManager, assetFinalityResolver, gasRelayPaymasterFactory, mlnToken, wethToken);
+
+          case 34:
             nextComptrollerLib = _context.sent;
-            _context.next = 18;
+            _context.next = 37;
             return nextFundDeployer.setComptrollerLib(nextComptrollerLib);
 
-          case 18:
-            _context.next = 20;
-            return protocol$1.ProtocolFeeTracker.deploy(deployer, nextFundDeployer);
+          case 37:
+            _context.next = 39;
+            return protocol.ProtocolFeeTracker.deploy(deployer, nextFundDeployer);
 
-          case 20:
+          case 39:
             nextProtocolFeeTracker = _context.sent;
-            _context.next = 23;
+            _context.next = 42;
             return nextFundDeployer.setProtocolFeeTracker(nextProtocolFeeTracker);
 
-          case 23:
-            _context.t0 = protocol$1.VaultLib;
-            _context.t1 = deployer;
-            _context.t2 = externalPositionManager;
-            _context.next = 28;
+          case 42:
+            _context.t5 = protocol.VaultLib;
+            _context.t6 = deployer;
+            _context.t7 = externalPositionManager;
+            _context.next = 47;
             return vaultLib.getGasRelayPaymasterFactory();
 
-          case 28:
-            _context.t3 = _context.sent;
-            _context.next = 31;
+          case 47:
+            _context.t8 = _context.sent;
+            _context.next = 50;
             return vaultLib.getProtocolFeeReserve();
 
-          case 31:
-            _context.t4 = _context.sent;
-            _context.t5 = nextProtocolFeeTracker;
-            _context.next = 35;
+          case 50:
+            _context.t9 = _context.sent;
+            _context.t10 = nextProtocolFeeTracker;
+            _context.next = 54;
             return vaultLib.getMlnToken();
 
-          case 35:
-            _context.t6 = _context.sent;
-            _context.next = 38;
+          case 54:
+            _context.t11 = _context.sent;
+            _context.next = 57;
             return vaultLib.getWethToken();
 
-          case 38:
-            _context.t7 = _context.sent;
-            _context.next = 41;
-            return _context.t0.deploy.call(_context.t0, _context.t1, _context.t2, _context.t3, _context.t4, _context.t5, _context.t6, _context.t7);
+          case 57:
+            _context.t12 = _context.sent;
+            _context.next = 60;
+            return _context.t5.deploy.call(_context.t5, _context.t6, _context.t7, _context.t8, _context.t9, _context.t10, _context.t11, _context.t12);
 
-          case 41:
+          case 60:
             nextVaultLib = _context.sent;
-            _context.next = 44;
+            _context.next = 63;
             return nextFundDeployer.setVaultLib(nextVaultLib);
 
-          case 44:
+          case 63:
             if (!setReleaseLive) {
-              _context.next = 47;
+              _context.next = 66;
               break;
             }
 
-            _context.next = 47;
+            _context.next = 66;
             return nextFundDeployer.setReleaseLive();
 
-          case 47:
+          case 66:
             if (!setOnDispatcher) {
-              _context.next = 50;
+              _context.next = 69;
               break;
             }
 
-            _context.next = 50;
+            _context.next = 69;
             return dispatcher.setCurrentFundDeployer(nextFundDeployer);
 
-          case 50:
+          case 69:
             return _context.abrupt("return", nextFundDeployer);
 
-          case 51:
+          case 70:
           case "end":
             return _context.stop();
         }
@@ -543,21 +560,24 @@ function _callOnExtension() {
   return _callOnExtension.apply(this, arguments);
 }
 
-var protocol = 0;
-function createExternalPosition(_x) {
-  return _createExternalPosition.apply(this, arguments);
+function callOnExternalPosition(_x) {
+  return _callOnExternalPosition.apply(this, arguments);
 }
 
-function _createExternalPosition() {
-  _createExternalPosition = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime__default['default'].mark(function _callee(_ref) {
-    var comptrollerProxy, externalPositionManager, fundOwner, createExternalPositionTx;
+function _callOnExternalPosition() {
+  _callOnExternalPosition = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime__default['default'].mark(function _callee(_ref) {
+    var signer, comptrollerProxy, externalPositionManager, externalPositionProxy, actionId, actionArgs, callArgs;
     return _regeneratorRuntime__default['default'].wrap(function _callee$(_context) {
       while (1) {
         switch (_context.prev = _context.next) {
           case 0:
-            comptrollerProxy = _ref.comptrollerProxy, externalPositionManager = _ref.externalPositionManager, fundOwner = _ref.fundOwner;
-            createExternalPositionTx = comptrollerProxy.connect(fundOwner).callOnExtension(externalPositionManager, protocol$1.ExternalPositionManagerActionId.CreateExternalPosition, protocol$1.encodeArgs(['uint256', 'bytes'], [protocol, '0x']));
-            return _context.abrupt("return", createExternalPositionTx);
+            signer = _ref.signer, comptrollerProxy = _ref.comptrollerProxy, externalPositionManager = _ref.externalPositionManager, externalPositionProxy = _ref.externalPositionProxy, actionId = _ref.actionId, actionArgs = _ref.actionArgs;
+            callArgs = protocol.callOnExternalPositionArgs({
+              actionArgs: actionArgs,
+              actionId: actionId,
+              externalPositionProxy: externalPositionProxy
+            });
+            return _context.abrupt("return", comptrollerProxy.connect(signer).callOnExtension(externalPositionManager, protocol.ExternalPositionManagerActionId.CallOnExternalPosition, callArgs));
 
           case 3:
           case "end":
@@ -566,214 +586,305 @@ function _createExternalPosition() {
       }
     }, _callee);
   }));
-  return _createExternalPosition.apply(this, arguments);
+  return _callOnExternalPosition.apply(this, arguments);
 }
 
-function addCollateral(_x2) {
-  return _addCollateral.apply(this, arguments);
+function createExternalPosition(_x2) {
+  return _createExternalPosition.apply(this, arguments);
 }
 
-function _addCollateral() {
-  _addCollateral = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime__default['default'].mark(function _callee2(_ref2) {
-    var comptrollerProxy, externalPositionManager, fundOwner, assets, amounts, externalPositionProxy, cTokens, actionArgs, callArgs, addCollateralTx;
+function _createExternalPosition() {
+  _createExternalPosition = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime__default['default'].mark(function _callee2(_ref2) {
+    var signer, comptrollerProxy, externalPositionManager, externalPositionTypeId, _ref2$initializationD, initializationData, receipt, event, externalPositionProxy;
+
     return _regeneratorRuntime__default['default'].wrap(function _callee2$(_context2) {
       while (1) {
         switch (_context2.prev = _context2.next) {
           case 0:
-            comptrollerProxy = _ref2.comptrollerProxy, externalPositionManager = _ref2.externalPositionManager, fundOwner = _ref2.fundOwner, assets = _ref2.assets, amounts = _ref2.amounts, externalPositionProxy = _ref2.externalPositionProxy, cTokens = _ref2.cTokens;
-            actionArgs = protocol$1.compoundExternalPositionActionArgs({
-              assets: assets,
-              amounts: amounts,
-              data: protocol$1.encodeArgs(['address[]'], [cTokens])
-            });
-            callArgs = protocol$1.callOnExternalPositionArgs({
+            signer = _ref2.signer, comptrollerProxy = _ref2.comptrollerProxy, externalPositionManager = _ref2.externalPositionManager, externalPositionTypeId = _ref2.externalPositionTypeId, _ref2$initializationD = _ref2.initializationData, initializationData = _ref2$initializationD === void 0 ? '0x' : _ref2$initializationD;
+            _context2.next = 3;
+            return comptrollerProxy.connect(signer).callOnExtension(externalPositionManager, protocol.ExternalPositionManagerActionId.CreateExternalPosition, protocol.encodeArgs(['uint256', 'bytes'], [externalPositionTypeId, initializationData]));
+
+          case 3:
+            receipt = _context2.sent;
+            event = ethers$1.extractEvent(receipt, externalPositionManager.abi.getEvent('ExternalPositionDeployedForFund'));
+            externalPositionProxy = new protocol.IExternalPositionProxy(event[0].args.externalPosition, signer);
+            return _context2.abrupt("return", {
               externalPositionProxy: externalPositionProxy,
-              actionId: protocol$1.CompoundDebtPositionActionId.AddCollateralAssets,
-              encodedCallArgs: actionArgs
+              receipt: receipt
             });
-            addCollateralTx = comptrollerProxy.connect(fundOwner).callOnExtension(externalPositionManager, protocol$1.ExternalPositionManagerActionId.CallOnExternalPosition, callArgs);
-            return _context2.abrupt("return", addCollateralTx);
 
-          case 5:
+          case 7:
           case "end":
             return _context2.stop();
         }
       }
     }, _callee2);
   }));
-  return _addCollateral.apply(this, arguments);
+  return _createExternalPosition.apply(this, arguments);
 }
 
-function removeCollateral(_x3) {
-  return _removeCollateral.apply(this, arguments);
+function reactivateExternalPosition(_x3) {
+  return _reactivateExternalPosition.apply(this, arguments);
 }
 
-function _removeCollateral() {
-  _removeCollateral = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime__default['default'].mark(function _callee3(_ref3) {
-    var comptrollerProxy, externalPositionManager, fundOwner, assets, amounts, externalPositionProxy, cTokens, actionArgs, callArgs, removeCollateralTx;
+function _reactivateExternalPosition() {
+  _reactivateExternalPosition = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime__default['default'].mark(function _callee3(_ref3) {
+    var signer, comptrollerProxy, externalPositionManager, externalPositionProxy, callArgs;
     return _regeneratorRuntime__default['default'].wrap(function _callee3$(_context3) {
       while (1) {
         switch (_context3.prev = _context3.next) {
           case 0:
-            comptrollerProxy = _ref3.comptrollerProxy, externalPositionManager = _ref3.externalPositionManager, fundOwner = _ref3.fundOwner, assets = _ref3.assets, amounts = _ref3.amounts, externalPositionProxy = _ref3.externalPositionProxy, cTokens = _ref3.cTokens;
-            actionArgs = protocol$1.compoundExternalPositionActionArgs({
-              assets: assets,
-              amounts: amounts,
-              data: protocol$1.encodeArgs(['address[]'], [cTokens])
-            });
-            callArgs = protocol$1.callOnExternalPositionArgs({
-              externalPositionProxy: externalPositionProxy,
-              actionId: protocol$1.CompoundDebtPositionActionId.RemoveCollateralAssets,
-              encodedCallArgs: actionArgs
+            signer = _ref3.signer, comptrollerProxy = _ref3.comptrollerProxy, externalPositionManager = _ref3.externalPositionManager, externalPositionProxy = _ref3.externalPositionProxy;
+            callArgs = protocol.externalPositionReactivateArgs({
+              externalPositionProxy: externalPositionProxy
             });
-            removeCollateralTx = comptrollerProxy.connect(fundOwner).callOnExtension(externalPositionManager, protocol$1.ExternalPositionManagerActionId.CallOnExternalPosition, callArgs);
-            return _context3.abrupt("return", removeCollateralTx);
+            return _context3.abrupt("return", comptrollerProxy.connect(signer).callOnExtension(externalPositionManager, protocol.ExternalPositionManagerActionId.ReactivateExternalPosition, callArgs));
 
-          case 5:
+          case 3:
           case "end":
             return _context3.stop();
         }
       }
     }, _callee3);
   }));
-  return _removeCollateral.apply(this, arguments);
+  return _reactivateExternalPosition.apply(this, arguments);
 }
 
-function borrow(_x4) {
-  return _borrow.apply(this, arguments);
+function removeExternalPosition(_x4) {
+  return _removeExternalPosition.apply(this, arguments);
 }
 
-function _borrow() {
-  _borrow = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime__default['default'].mark(function _callee4(_ref4) {
-    var comptrollerProxy, externalPositionManager, fundOwner, externalPositionProxy, assets, amounts, cTokens, actionArgs, callArgs, borrowTx;
+function _removeExternalPosition() {
+  _removeExternalPosition = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime__default['default'].mark(function _callee4(_ref4) {
+    var signer, comptrollerProxy, externalPositionManager, externalPositionProxy, callArgs;
     return _regeneratorRuntime__default['default'].wrap(function _callee4$(_context4) {
       while (1) {
         switch (_context4.prev = _context4.next) {
           case 0:
-            comptrollerProxy = _ref4.comptrollerProxy, externalPositionManager = _ref4.externalPositionManager, fundOwner = _ref4.fundOwner, externalPositionProxy = _ref4.externalPositionProxy, assets = _ref4.assets, amounts = _ref4.amounts, cTokens = _ref4.cTokens;
-            actionArgs = protocol$1.compoundExternalPositionActionArgs({
-              assets: assets,
+            signer = _ref4.signer, comptrollerProxy = _ref4.comptrollerProxy, externalPositionManager = _ref4.externalPositionManager, externalPositionProxy = _ref4.externalPositionProxy;
+            callArgs = protocol.externalPositionRemoveArgs({
+              externalPositionProxy: externalPositionProxy
+            });
+            return _context4.abrupt("return", comptrollerProxy.connect(signer).callOnExtension(externalPositionManager, protocol.ExternalPositionManagerActionId.RemoveExternalPosition, callArgs));
+
+          case 3:
+          case "end":
+            return _context4.stop();
+        }
+      }
+    }, _callee4);
+  }));
+  return _removeExternalPosition.apply(this, arguments);
+}
+
+function compoundDebtPositionAddCollateral(_x) {
+  return _compoundDebtPositionAddCollateral.apply(this, arguments);
+}
+
+function _compoundDebtPositionAddCollateral() {
+  _compoundDebtPositionAddCollateral = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime__default['default'].mark(function _callee(_ref) {
+    var comptrollerProxy, externalPositionManager, fundOwner, assets, amounts, externalPositionProxy, cTokens, actionArgs;
+    return _regeneratorRuntime__default['default'].wrap(function _callee$(_context) {
+      while (1) {
+        switch (_context.prev = _context.next) {
+          case 0:
+            comptrollerProxy = _ref.comptrollerProxy, externalPositionManager = _ref.externalPositionManager, fundOwner = _ref.fundOwner, assets = _ref.assets, amounts = _ref.amounts, externalPositionProxy = _ref.externalPositionProxy, cTokens = _ref.cTokens;
+            actionArgs = protocol.compoundExternalPositionActionArgs({
               amounts: amounts,
-              data: protocol$1.encodeArgs(['address[]'], [cTokens])
+              assets: assets,
+              data: protocol.encodeArgs(['address[]'], [cTokens])
             });
-            callArgs = protocol$1.callOnExternalPositionArgs({
+            return _context.abrupt("return", callOnExternalPosition({
+              actionArgs: actionArgs,
+              actionId: protocol.CompoundDebtPositionActionId.AddCollateralAssets,
+              comptrollerProxy: comptrollerProxy,
+              externalPositionManager: externalPositionManager,
               externalPositionProxy: externalPositionProxy,
-              actionId: protocol$1.CompoundDebtPositionActionId.BorrowAsset,
-              encodedCallArgs: actionArgs
+              signer: fundOwner
+            }));
+
+          case 3:
+          case "end":
+            return _context.stop();
+        }
+      }
+    }, _callee);
+  }));
+  return _compoundDebtPositionAddCollateral.apply(this, arguments);
+}
+
+function compoundDebtPositionBorrow(_x2) {
+  return _compoundDebtPositionBorrow.apply(this, arguments);
+}
+
+function _compoundDebtPositionBorrow() {
+  _compoundDebtPositionBorrow = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime__default['default'].mark(function _callee2(_ref2) {
+    var comptrollerProxy, externalPositionManager, fundOwner, externalPositionProxy, assets, amounts, cTokens, actionArgs;
+    return _regeneratorRuntime__default['default'].wrap(function _callee2$(_context2) {
+      while (1) {
+        switch (_context2.prev = _context2.next) {
+          case 0:
+            comptrollerProxy = _ref2.comptrollerProxy, externalPositionManager = _ref2.externalPositionManager, fundOwner = _ref2.fundOwner, externalPositionProxy = _ref2.externalPositionProxy, assets = _ref2.assets, amounts = _ref2.amounts, cTokens = _ref2.cTokens;
+            actionArgs = protocol.compoundExternalPositionActionArgs({
+              amounts: amounts,
+              assets: assets,
+              data: protocol.encodeArgs(['address[]'], [cTokens])
             });
-            borrowTx = comptrollerProxy.connect(fundOwner).callOnExtension(externalPositionManager, protocol$1.ExternalPositionManagerActionId.CallOnExternalPosition, callArgs);
-            return _context4.abrupt("return", borrowTx);
+            return _context2.abrupt("return", callOnExternalPosition({
+              actionArgs: actionArgs,
+              actionId: protocol.CompoundDebtPositionActionId.BorrowAsset,
+              comptrollerProxy: comptrollerProxy,
+              externalPositionManager: externalPositionManager,
+              externalPositionProxy: externalPositionProxy,
+              signer: fundOwner
+            }));
 
-          case 5:
+          case 3:
           case "end":
-            return _context4.stop();
+            return _context2.stop();
         }
       }
-    }, _callee4);
+    }, _callee2);
   }));
-  return _borrow.apply(this, arguments);
+  return _compoundDebtPositionBorrow.apply(this, arguments);
 }
 
-function claimComp(_x5) {
-  return _claimComp.apply(this, arguments);
+function compoundDebtPositionClaimComp(_x3) {
+  return _compoundDebtPositionClaimComp.apply(this, arguments);
 }
 
-function _claimComp() {
-  _claimComp = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime__default['default'].mark(function _callee5(_ref5) {
-    var comptrollerProxy, externalPositionManager, fundOwner, externalPositionProxy, actionArgs, callArgs, claimCompTx;
-    return _regeneratorRuntime__default['default'].wrap(function _callee5$(_context5) {
+function _compoundDebtPositionClaimComp() {
+  _compoundDebtPositionClaimComp = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime__default['default'].mark(function _callee3(_ref3) {
+    var comptrollerProxy, externalPositionManager, fundOwner, externalPositionProxy, actionArgs;
+    return _regeneratorRuntime__default['default'].wrap(function _callee3$(_context3) {
       while (1) {
-        switch (_context5.prev = _context5.next) {
+        switch (_context3.prev = _context3.next) {
           case 0:
-            comptrollerProxy = _ref5.comptrollerProxy, externalPositionManager = _ref5.externalPositionManager, fundOwner = _ref5.fundOwner, externalPositionProxy = _ref5.externalPositionProxy;
-            actionArgs = protocol$1.compoundExternalPositionActionArgs({
-              assets: [],
+            comptrollerProxy = _ref3.comptrollerProxy, externalPositionManager = _ref3.externalPositionManager, fundOwner = _ref3.fundOwner, externalPositionProxy = _ref3.externalPositionProxy;
+            actionArgs = protocol.compoundExternalPositionActionArgs({
               amounts: [],
+              assets: [],
               data: '0x'
             });
-            callArgs = protocol$1.callOnExternalPositionArgs({
+            return _context3.abrupt("return", callOnExternalPosition({
+              actionArgs: actionArgs,
+              actionId: protocol.CompoundDebtPositionActionId.ClaimComp,
+              comptrollerProxy: comptrollerProxy,
+              externalPositionManager: externalPositionManager,
               externalPositionProxy: externalPositionProxy,
-              actionId: protocol$1.CompoundDebtPositionActionId.ClaimComp,
-              encodedCallArgs: actionArgs
-            });
-            claimCompTx = comptrollerProxy.connect(fundOwner).callOnExtension(externalPositionManager, protocol$1.ExternalPositionManagerActionId.CallOnExternalPosition, callArgs);
-            return _context5.abrupt("return", claimCompTx);
+              signer: fundOwner
+            }));
 
-          case 5:
+          case 3:
           case "end":
-            return _context5.stop();
+            return _context3.stop();
         }
       }
-    }, _callee5);
+    }, _callee3);
   }));
-  return _claimComp.apply(this, arguments);
+  return _compoundDebtPositionClaimComp.apply(this, arguments);
 }
 
-function repayBorrow(_x6) {
-  return _repayBorrow.apply(this, arguments);
+function compoundDebtPositionRemoveCollateral(_x4) {
+  return _compoundDebtPositionRemoveCollateral.apply(this, arguments);
 }
 
-function _repayBorrow() {
-  _repayBorrow = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime__default['default'].mark(function _callee6(_ref6) {
-    var comptrollerProxy, externalPositionManager, fundOwner, assets, amounts, externalPositionProxy, cTokens, actionArgs, callArgs, repayTx;
-    return _regeneratorRuntime__default['default'].wrap(function _callee6$(_context6) {
+function _compoundDebtPositionRemoveCollateral() {
+  _compoundDebtPositionRemoveCollateral = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime__default['default'].mark(function _callee4(_ref4) {
+    var comptrollerProxy, externalPositionManager, fundOwner, assets, amounts, externalPositionProxy, cTokens, actionArgs;
+    return _regeneratorRuntime__default['default'].wrap(function _callee4$(_context4) {
       while (1) {
-        switch (_context6.prev = _context6.next) {
+        switch (_context4.prev = _context4.next) {
           case 0:
-            comptrollerProxy = _ref6.comptrollerProxy, externalPositionManager = _ref6.externalPositionManager, fundOwner = _ref6.fundOwner, assets = _ref6.assets, amounts = _ref6.amounts, externalPositionProxy = _ref6.externalPositionProxy, cTokens = _ref6.cTokens;
-            actionArgs = protocol$1.compoundExternalPositionActionArgs({
-              assets: assets,
+            comptrollerProxy = _ref4.comptrollerProxy, externalPositionManager = _ref4.externalPositionManager, fundOwner = _ref4.fundOwner, assets = _ref4.assets, amounts = _ref4.amounts, externalPositionProxy = _ref4.externalPositionProxy, cTokens = _ref4.cTokens;
+            actionArgs = protocol.compoundExternalPositionActionArgs({
               amounts: amounts,
-              data: protocol$1.encodeArgs(['address[]'], [cTokens])
+              assets: assets,
+              data: protocol.encodeArgs(['address[]'], [cTokens])
             });
-            callArgs = protocol$1.callOnExternalPositionArgs({
+            return _context4.abrupt("return", callOnExternalPosition({
+              actionArgs: actionArgs,
+              actionId: protocol.CompoundDebtPositionActionId.RemoveCollateralAssets,
+              comptrollerProxy: comptrollerProxy,
+              externalPositionManager: externalPositionManager,
               externalPositionProxy: externalPositionProxy,
-              actionId: protocol$1.CompoundDebtPositionActionId.RepayBorrowedAssets,
-              encodedCallArgs: actionArgs
-            });
-            repayTx = comptrollerProxy.connect(fundOwner).callOnExtension(externalPositionManager, protocol$1.ExternalPositionManagerActionId.CallOnExternalPosition, callArgs);
-            return _context6.abrupt("return", repayTx);
+              signer: fundOwner
+            }));
 
-          case 5:
+          case 3:
           case "end":
-            return _context6.stop();
+            return _context4.stop();
         }
       }
-    }, _callee6);
+    }, _callee4);
   }));
-  return _repayBorrow.apply(this, arguments);
+  return _compoundDebtPositionRemoveCollateral.apply(this, arguments);
 }
 
-function removeExternalPosition(_x7) {
-  return _removeExternalPosition.apply(this, arguments);
+function compoundDebtPositionRepayBorrow(_x5) {
+  return _compoundDebtPositionRepayBorrow.apply(this, arguments);
 }
 
-function _removeExternalPosition() {
-  _removeExternalPosition = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime__default['default'].mark(function _callee7(_ref7) {
-    var comptrollerProxy, externalPositionManager, fundOwner, externalPositionProxy, actionArgs, callArgs, removeExternalPositionTx;
-    return _regeneratorRuntime__default['default'].wrap(function _callee7$(_context7) {
+function _compoundDebtPositionRepayBorrow() {
+  _compoundDebtPositionRepayBorrow = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime__default['default'].mark(function _callee5(_ref5) {
+    var comptrollerProxy, externalPositionManager, fundOwner, assets, amounts, externalPositionProxy, cTokens, actionArgs;
+    return _regeneratorRuntime__default['default'].wrap(function _callee5$(_context5) {
       while (1) {
-        switch (_context7.prev = _context7.next) {
+        switch (_context5.prev = _context5.next) {
           case 0:
-            comptrollerProxy = _ref7.comptrollerProxy, externalPositionManager = _ref7.externalPositionManager, fundOwner = _ref7.fundOwner, externalPositionProxy = _ref7.externalPositionProxy;
-            actionArgs = protocol$1.externalPositionRemoveArgs({
-              externalPositionProxy: externalPositionProxy
+            comptrollerProxy = _ref5.comptrollerProxy, externalPositionManager = _ref5.externalPositionManager, fundOwner = _ref5.fundOwner, assets = _ref5.assets, amounts = _ref5.amounts, externalPositionProxy = _ref5.externalPositionProxy, cTokens = _ref5.cTokens;
+            actionArgs = protocol.compoundExternalPositionActionArgs({
+              amounts: amounts,
+              assets: assets,
+              data: protocol.encodeArgs(['address[]'], [cTokens])
             });
-            callArgs = protocol$1.callOnExternalPositionArgs({
+            return _context5.abrupt("return", callOnExternalPosition({
+              actionArgs: actionArgs,
+              actionId: protocol.CompoundDebtPositionActionId.RepayBorrowedAssets,
+              comptrollerProxy: comptrollerProxy,
+              externalPositionManager: externalPositionManager,
               externalPositionProxy: externalPositionProxy,
-              encodedCallArgs: actionArgs
-            });
-            removeExternalPositionTx = comptrollerProxy.connect(fundOwner).callOnExtension(externalPositionManager, protocol$1.ExternalPositionManagerActionId.RemoveExternalPosition, callArgs);
-            return _context7.abrupt("return", removeExternalPositionTx);
+              signer: fundOwner
+            }));
 
-          case 5:
+          case 3:
           case "end":
-            return _context7.stop();
+            return _context5.stop();
         }
       }
-    }, _callee7);
+    }, _callee5);
   }));
-  return _removeExternalPosition.apply(this, arguments);
+  return _compoundDebtPositionRepayBorrow.apply(this, arguments);
+}
+
+function createCompoundDebtPosition(_x6) {
+  return _createCompoundDebtPosition.apply(this, arguments);
+}
+
+function _createCompoundDebtPosition() {
+  _createCompoundDebtPosition = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime__default['default'].mark(function _callee6(_ref6) {
+    var signer, comptrollerProxy, externalPositionManager;
+    return _regeneratorRuntime__default['default'].wrap(function _callee6$(_context6) {
+      while (1) {
+        switch (_context6.prev = _context6.next) {
+          case 0:
+            signer = _ref6.signer, comptrollerProxy = _ref6.comptrollerProxy, externalPositionManager = _ref6.externalPositionManager;
+            return _context6.abrupt("return", createExternalPosition({
+              comptrollerProxy: comptrollerProxy,
+              externalPositionManager: externalPositionManager,
+              externalPositionTypeId: protocol.ExternalPositionType.CompoundDebtPosition,
+              signer: signer
+            }));
+
+          case 2:
+          case "end":
+            return _context6.stop();
+        }
+      }
+    }, _callee6);
+  }));
+  return _createCompoundDebtPosition.apply(this, arguments);
 }
 
 function createMockExternalPosition(_x) {
@@ -788,7 +899,7 @@ function _createMockExternalPosition() {
         switch (_context.prev = _context.next) {
           case 0:
             comptrollerProxy = _ref.comptrollerProxy, externalPositionManager = _ref.externalPositionManager, externalPositionFactory = _ref.externalPositionFactory, defaultActionAssetsToTransfer = _ref.defaultActionAssetsToTransfer, defaultActionAmountsToTransfer = _ref.defaultActionAmountsToTransfer, defaultActionAssetsToReceive = _ref.defaultActionAssetsToReceive, fundOwner = _ref.fundOwner, deployer = _ref.deployer;
-            _context.t0 = src.VaultLib;
+            _context.t0 = protocol.VaultLib;
             _context.next = 4;
             return comptrollerProxy.getVaultProxy();
 
@@ -806,12 +917,12 @@ function _createMockExternalPosition() {
 
           case 12:
             _context.next = 14;
-            return src.MockGenericExternalPositionLib.deploy(deployer);
+            return protocol.MockGenericExternalPositionLib.deploy(deployer);
 
           case 14:
             mockGenericExternalPositionLib = _context.sent;
             _context.next = 17;
-            return src.MockGenericExternalPositionParser.deploy(deployer);
+            return protocol.MockGenericExternalPositionParser.deploy(deployer);
 
           case 17:
             mockExternalPositionParser = _context.sent;
@@ -821,7 +932,7 @@ function _createMockExternalPosition() {
 
           case 21:
             _context.next = 23;
-            return comptrollerProxy.connect(fundOwner).callOnExtension(externalPositionManager, src.ExternalPositionManagerActionId.CreateExternalPosition, src.encodeArgs(['uint256', 'bytes'], [typeId, '0x']));
+            return comptrollerProxy.connect(fundOwner).callOnExtension(externalPositionManager, protocol.ExternalPositionManagerActionId.CreateExternalPosition, protocol.encodeArgs(['uint256', 'bytes'], [typeId, '0x']));
 
           case 23:
             receipt = _context.sent;
@@ -831,21 +942,431 @@ function _createMockExternalPosition() {
           case 26:
             externalPositionProxy = _context.sent[0];
             return _context.abrupt("return", {
-              typeId: typeId,
-              mockGenericExternalPositionLib: mockGenericExternalPositionLib,
+              externalPositionProxy: externalPositionProxy,
               mockExternalPositionParser: mockExternalPositionParser,
+              mockGenericExternalPositionLib: mockGenericExternalPositionLib,
+              receipt: receipt,
+              typeId: typeId
+            });
+
+          case 28:
+          case "end":
+            return _context.stop();
+        }
+      }
+    }, _callee);
+  }));
+  return _createMockExternalPosition.apply(this, arguments);
+}
+
+function mockExternalPositionAddDebtAssets(_x2) {
+  return _mockExternalPositionAddDebtAssets.apply(this, arguments);
+}
+
+function _mockExternalPositionAddDebtAssets() {
+  _mockExternalPositionAddDebtAssets = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime__default['default'].mark(function _callee2(_ref2) {
+    var signer, comptrollerProxy, externalPositionManager, externalPositionProxy, assets, amounts, actionArgs;
+    return _regeneratorRuntime__default['default'].wrap(function _callee2$(_context2) {
+      while (1) {
+        switch (_context2.prev = _context2.next) {
+          case 0:
+            signer = _ref2.signer, comptrollerProxy = _ref2.comptrollerProxy, externalPositionManager = _ref2.externalPositionManager, externalPositionProxy = _ref2.externalPositionProxy, assets = _ref2.assets, amounts = _ref2.amounts;
+            actionArgs = protocol.mockGenericExternalPositionActionArgs({
+              amounts: amounts,
+              assets: assets
+            });
+            return _context2.abrupt("return", callOnExternalPosition({
+              actionArgs: actionArgs,
+              actionId: protocol.MockGenericExternalPositionActionId.AddDebtAssets,
+              comptrollerProxy: comptrollerProxy,
+              externalPositionManager: externalPositionManager,
+              externalPositionProxy: externalPositionProxy,
+              signer: signer
+            }));
+
+          case 3:
+          case "end":
+            return _context2.stop();
+        }
+      }
+    }, _callee2);
+  }));
+  return _mockExternalPositionAddDebtAssets.apply(this, arguments);
+}
+
+function mockExternalPositionAddManagedAssets(_x3) {
+  return _mockExternalPositionAddManagedAssets.apply(this, arguments);
+}
+
+function _mockExternalPositionAddManagedAssets() {
+  _mockExternalPositionAddManagedAssets = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime__default['default'].mark(function _callee3(_ref3) {
+    var signer, comptrollerProxy, externalPositionManager, externalPositionProxy, assets, amounts, actionArgs;
+    return _regeneratorRuntime__default['default'].wrap(function _callee3$(_context3) {
+      while (1) {
+        switch (_context3.prev = _context3.next) {
+          case 0:
+            signer = _ref3.signer, comptrollerProxy = _ref3.comptrollerProxy, externalPositionManager = _ref3.externalPositionManager, externalPositionProxy = _ref3.externalPositionProxy, assets = _ref3.assets, amounts = _ref3.amounts;
+            actionArgs = protocol.mockGenericExternalPositionActionArgs({
+              amounts: amounts,
+              assets: assets
+            });
+            return _context3.abrupt("return", callOnExternalPosition({
+              actionArgs: actionArgs,
+              actionId: protocol.MockGenericExternalPositionActionId.AddManagedAssets,
+              comptrollerProxy: comptrollerProxy,
+              externalPositionManager: externalPositionManager,
+              externalPositionProxy: externalPositionProxy,
+              signer: signer
+            }));
+
+          case 3:
+          case "end":
+            return _context3.stop();
+        }
+      }
+    }, _callee3);
+  }));
+  return _mockExternalPositionAddManagedAssets.apply(this, arguments);
+}
+
+function mockExternalPositionRemoveDebtAssets(_x4) {
+  return _mockExternalPositionRemoveDebtAssets.apply(this, arguments);
+}
+
+function _mockExternalPositionRemoveDebtAssets() {
+  _mockExternalPositionRemoveDebtAssets = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime__default['default'].mark(function _callee4(_ref4) {
+    var signer, comptrollerProxy, externalPositionManager, externalPositionProxy, assets, amounts, actionArgs;
+    return _regeneratorRuntime__default['default'].wrap(function _callee4$(_context4) {
+      while (1) {
+        switch (_context4.prev = _context4.next) {
+          case 0:
+            signer = _ref4.signer, comptrollerProxy = _ref4.comptrollerProxy, externalPositionManager = _ref4.externalPositionManager, externalPositionProxy = _ref4.externalPositionProxy, assets = _ref4.assets, amounts = _ref4.amounts;
+            actionArgs = protocol.mockGenericExternalPositionActionArgs({
+              amounts: amounts,
+              assets: assets
+            });
+            return _context4.abrupt("return", callOnExternalPosition({
+              actionArgs: actionArgs,
+              actionId: protocol.MockGenericExternalPositionActionId.RemoveDebtAssets,
+              comptrollerProxy: comptrollerProxy,
+              externalPositionManager: externalPositionManager,
+              externalPositionProxy: externalPositionProxy,
+              signer: signer
+            }));
+
+          case 3:
+          case "end":
+            return _context4.stop();
+        }
+      }
+    }, _callee4);
+  }));
+  return _mockExternalPositionRemoveDebtAssets.apply(this, arguments);
+}
+
+function mockExternalPositionRemoveManagedAssets(_x5) {
+  return _mockExternalPositionRemoveManagedAssets.apply(this, arguments);
+}
+
+function _mockExternalPositionRemoveManagedAssets() {
+  _mockExternalPositionRemoveManagedAssets = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime__default['default'].mark(function _callee5(_ref5) {
+    var signer, comptrollerProxy, externalPositionManager, externalPositionProxy, assets, amounts, actionArgs;
+    return _regeneratorRuntime__default['default'].wrap(function _callee5$(_context5) {
+      while (1) {
+        switch (_context5.prev = _context5.next) {
+          case 0:
+            signer = _ref5.signer, comptrollerProxy = _ref5.comptrollerProxy, externalPositionManager = _ref5.externalPositionManager, externalPositionProxy = _ref5.externalPositionProxy, assets = _ref5.assets, amounts = _ref5.amounts;
+            actionArgs = protocol.mockGenericExternalPositionActionArgs({
+              amounts: amounts,
+              assets: assets
+            });
+            return _context5.abrupt("return", callOnExternalPosition({
+              actionArgs: actionArgs,
+              actionId: protocol.MockGenericExternalPositionActionId.RemoveManagedAssets,
+              comptrollerProxy: comptrollerProxy,
+              externalPositionManager: externalPositionManager,
               externalPositionProxy: externalPositionProxy,
+              signer: signer
+            }));
+
+          case 3:
+          case "end":
+            return _context5.stop();
+        }
+      }
+    }, _callee5);
+  }));
+  return _mockExternalPositionRemoveManagedAssets.apply(this, arguments);
+}
+
+var _templateObject$3;
+exports.UniswapV3FeeAmount = void 0;
+
+(function (UniswapV3FeeAmount) {
+  UniswapV3FeeAmount[UniswapV3FeeAmount["LOW"] = 500] = "LOW";
+  UniswapV3FeeAmount[UniswapV3FeeAmount["MEDIUM"] = 3000] = "MEDIUM";
+  UniswapV3FeeAmount[UniswapV3FeeAmount["HIGH"] = 10000] = "HIGH";
+})(exports.UniswapV3FeeAmount || (exports.UniswapV3FeeAmount = {}));
+
+var uniswapV3LiquidityPositionGetMinTick = function uniswapV3LiquidityPositionGetMinTick(tickSpacing) {
+  return Math.ceil(-887272 / tickSpacing) * tickSpacing;
+};
+var uniswapV3LiquidityPositionGetMaxTick = function uniswapV3LiquidityPositionGetMaxTick(tickSpacing) {
+  return Math.floor(887272 / tickSpacing) * tickSpacing;
+};
+var IUniswapV3NonFungibleTokenManager = ethers$1.contract()(_templateObject$3 || (_templateObject$3 = _taggedTemplateLiteral(["\n  function positions(uint256 tokenId) view returns (uint96 nonce, address operator, address token0, address token1, uint24 fee, int24 tickLower, int24 tickUpper, uint128 liquidity, uint256 feeGrowthInside0LastX128, uint256 feeGrowthInside1LastX128, uint128 tokensOwed0, uint128 tokensOwed1)\n"])));
+function createUniswapV3LiquidityPosition(_x) {
+  return _createUniswapV3LiquidityPosition.apply(this, arguments);
+}
+
+function _createUniswapV3LiquidityPosition() {
+  _createUniswapV3LiquidityPosition = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime__default['default'].mark(function _callee(_ref) {
+    var signer, comptrollerProxy, externalPositionManager, token0, token1, initArgs, receipt, vaultProxy, externalPositions, externalPositionProxyAddress;
+    return _regeneratorRuntime__default['default'].wrap(function _callee$(_context) {
+      while (1) {
+        switch (_context.prev = _context.next) {
+          case 0:
+            signer = _ref.signer, comptrollerProxy = _ref.comptrollerProxy, externalPositionManager = _ref.externalPositionManager, token0 = _ref.token0, token1 = _ref.token1;
+            initArgs = protocol.uniswapV3LiquidityPositionInitArgs({
+              token0: token0,
+              token1: token1
+            });
+            _context.next = 4;
+            return comptrollerProxy.connect(signer).callOnExtension(externalPositionManager, protocol.ExternalPositionManagerActionId.CreateExternalPosition, protocol.encodeArgs(['uint256', 'bytes'], [protocol.ExternalPositionType.UniswapV3LiquidityPosition, initArgs]));
+
+          case 4:
+            receipt = _context.sent;
+            _context.t0 = protocol.VaultLib;
+            _context.next = 8;
+            return comptrollerProxy.getVaultProxy();
+
+          case 8:
+            _context.t1 = _context.sent;
+            _context.t2 = signer;
+            vaultProxy = new _context.t0(_context.t1, _context.t2);
+            _context.next = 13;
+            return vaultProxy.getActiveExternalPositions.call();
+
+          case 13:
+            externalPositions = _context.sent;
+            externalPositionProxyAddress = externalPositions[externalPositions.length - 1];
+            return _context.abrupt("return", {
+              externalPositionProxyAddress: externalPositionProxyAddress,
               receipt: receipt
             });
 
-          case 28:
+          case 16:
+          case "end":
+            return _context.stop();
+        }
+      }
+    }, _callee);
+  }));
+  return _createUniswapV3LiquidityPosition.apply(this, arguments);
+}
+
+function uniswapV3LiquidityPositionAddLiquidity(_x2) {
+  return _uniswapV3LiquidityPositionAddLiquidity.apply(this, arguments);
+}
+
+function _uniswapV3LiquidityPositionAddLiquidity() {
+  _uniswapV3LiquidityPositionAddLiquidity = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime__default['default'].mark(function _callee2(_ref2) {
+    var signer, comptrollerProxy, externalPositionManager, externalPositionProxy, nftId, amount0Desired, amount1Desired, _ref2$amount0Min, amount0Min, _ref2$amount1Min, amount1Min, actionArgs, callArgs;
+
+    return _regeneratorRuntime__default['default'].wrap(function _callee2$(_context2) {
+      while (1) {
+        switch (_context2.prev = _context2.next) {
+          case 0:
+            signer = _ref2.signer, comptrollerProxy = _ref2.comptrollerProxy, externalPositionManager = _ref2.externalPositionManager, externalPositionProxy = _ref2.externalPositionProxy, nftId = _ref2.nftId, amount0Desired = _ref2.amount0Desired, amount1Desired = _ref2.amount1Desired, _ref2$amount0Min = _ref2.amount0Min, amount0Min = _ref2$amount0Min === void 0 ? 0 : _ref2$amount0Min, _ref2$amount1Min = _ref2.amount1Min, amount1Min = _ref2$amount1Min === void 0 ? 0 : _ref2$amount1Min;
+            actionArgs = protocol.uniswapV3LiquidityPositionAddLiquidityArgs({
+              amount0Desired: amount0Desired,
+              amount0Min: amount0Min,
+              amount1Desired: amount1Desired,
+              amount1Min: amount1Min,
+              nftId: nftId
+            });
+            callArgs = protocol.callOnExternalPositionArgs({
+              actionArgs: actionArgs,
+              actionId: protocol.UniswapV3LiquidityPositionActionId.AddLiquidity,
+              externalPositionProxy: externalPositionProxy
+            });
+            return _context2.abrupt("return", comptrollerProxy.connect(signer).callOnExtension(externalPositionManager, protocol.ExternalPositionManagerActionId.CallOnExternalPosition, callArgs));
+
+          case 4:
+          case "end":
+            return _context2.stop();
+        }
+      }
+    }, _callee2);
+  }));
+  return _uniswapV3LiquidityPositionAddLiquidity.apply(this, arguments);
+}
+
+function uniswapV3LiquidityPositionCollect(_x3) {
+  return _uniswapV3LiquidityPositionCollect.apply(this, arguments);
+}
+
+function _uniswapV3LiquidityPositionCollect() {
+  _uniswapV3LiquidityPositionCollect = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime__default['default'].mark(function _callee3(_ref3) {
+    var signer, comptrollerProxy, externalPositionManager, externalPositionProxy, nftId, actionArgs, callArgs;
+    return _regeneratorRuntime__default['default'].wrap(function _callee3$(_context3) {
+      while (1) {
+        switch (_context3.prev = _context3.next) {
+          case 0:
+            signer = _ref3.signer, comptrollerProxy = _ref3.comptrollerProxy, externalPositionManager = _ref3.externalPositionManager, externalPositionProxy = _ref3.externalPositionProxy, nftId = _ref3.nftId;
+            actionArgs = protocol.uniswapV3LiquidityPositionCollectArgs({
+              nftId: nftId
+            });
+            callArgs = protocol.callOnExternalPositionArgs({
+              actionArgs: actionArgs,
+              actionId: protocol.UniswapV3LiquidityPositionActionId.Collect,
+              externalPositionProxy: externalPositionProxy
+            });
+            return _context3.abrupt("return", comptrollerProxy.connect(signer).callOnExtension(externalPositionManager, protocol.ExternalPositionManagerActionId.CallOnExternalPosition, callArgs));
+
+          case 4:
+          case "end":
+            return _context3.stop();
+        }
+      }
+    }, _callee3);
+  }));
+  return _uniswapV3LiquidityPositionCollect.apply(this, arguments);
+}
+
+function uniswapV3LiquidityPositionMint(_x4) {
+  return _uniswapV3LiquidityPositionMint.apply(this, arguments);
+}
+
+function _uniswapV3LiquidityPositionMint() {
+  _uniswapV3LiquidityPositionMint = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime__default['default'].mark(function _callee4(_ref4) {
+    var signer, comptrollerProxy, externalPositionManager, externalPositionProxy, fee, tickLower, tickUpper, amount0Desired, amount1Desired, _ref4$amount0Min, amount0Min, _ref4$amount1Min, amount1Min, actionArgs, callArgs, receipt, externalPosition, nftId;
+
+    return _regeneratorRuntime__default['default'].wrap(function _callee4$(_context4) {
+      while (1) {
+        switch (_context4.prev = _context4.next) {
+          case 0:
+            signer = _ref4.signer, comptrollerProxy = _ref4.comptrollerProxy, externalPositionManager = _ref4.externalPositionManager, externalPositionProxy = _ref4.externalPositionProxy, fee = _ref4.fee, tickLower = _ref4.tickLower, tickUpper = _ref4.tickUpper, amount0Desired = _ref4.amount0Desired, amount1Desired = _ref4.amount1Desired, _ref4$amount0Min = _ref4.amount0Min, amount0Min = _ref4$amount0Min === void 0 ? 0 : _ref4$amount0Min, _ref4$amount1Min = _ref4.amount1Min, amount1Min = _ref4$amount1Min === void 0 ? 0 : _ref4$amount1Min;
+            actionArgs = protocol.uniswapV3LiquidityPositionMintArgs({
+              amount0Desired: amount0Desired,
+              amount0Min: amount0Min,
+              amount1Desired: amount1Desired,
+              amount1Min: amount1Min,
+              fee: fee,
+              tickLower: tickLower,
+              tickUpper: tickUpper
+            });
+            callArgs = protocol.callOnExternalPositionArgs({
+              actionArgs: actionArgs,
+              actionId: protocol.UniswapV3LiquidityPositionActionId.Mint,
+              externalPositionProxy: externalPositionProxy
+            });
+            _context4.next = 5;
+            return comptrollerProxy.connect(signer).callOnExtension(externalPositionManager, protocol.ExternalPositionManagerActionId.CallOnExternalPosition, callArgs);
+
+          case 5:
+            receipt = _context4.sent;
+            externalPosition = new protocol.UniswapV3LiquidityPositionLib(externalPositionProxy, provider);
+            nftId = ethers$1.extractEvent(receipt, externalPosition.abi.getEvent('NFTPositionAdded'))[0].args.tokenId;
+            return _context4.abrupt("return", {
+              nftId: nftId,
+              receipt: receipt
+            });
+
+          case 9:
+          case "end":
+            return _context4.stop();
+        }
+      }
+    }, _callee4);
+  }));
+  return _uniswapV3LiquidityPositionMint.apply(this, arguments);
+}
+
+function uniswapV3LiquidityPositionPurge(_x5) {
+  return _uniswapV3LiquidityPositionPurge.apply(this, arguments);
+}
+
+function _uniswapV3LiquidityPositionPurge() {
+  _uniswapV3LiquidityPositionPurge = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime__default['default'].mark(function _callee5(_ref5) {
+    var signer, comptrollerProxy, externalPositionManager, externalPositionProxy, nftId, liquidity, _ref5$amount0Min, amount0Min, _ref5$amount1Min, amount1Min, actionArgs, callArgs;
+
+    return _regeneratorRuntime__default['default'].wrap(function _callee5$(_context5) {
+      while (1) {
+        switch (_context5.prev = _context5.next) {
+          case 0:
+            signer = _ref5.signer, comptrollerProxy = _ref5.comptrollerProxy, externalPositionManager = _ref5.externalPositionManager, externalPositionProxy = _ref5.externalPositionProxy, nftId = _ref5.nftId, liquidity = _ref5.liquidity, _ref5$amount0Min = _ref5.amount0Min, amount0Min = _ref5$amount0Min === void 0 ? 0 : _ref5$amount0Min, _ref5$amount1Min = _ref5.amount1Min, amount1Min = _ref5$amount1Min === void 0 ? 0 : _ref5$amount1Min;
+            actionArgs = protocol.uniswapV3LiquidityPositionPurgeArgs({
+              amount0Min: amount0Min,
+              amount1Min: amount1Min,
+              liquidity: liquidity,
+              nftId: nftId
+            });
+            callArgs = protocol.callOnExternalPositionArgs({
+              actionArgs: actionArgs,
+              actionId: protocol.UniswapV3LiquidityPositionActionId.Purge,
+              externalPositionProxy: externalPositionProxy
+            });
+            return _context5.abrupt("return", comptrollerProxy.connect(signer).callOnExtension(externalPositionManager, protocol.ExternalPositionManagerActionId.CallOnExternalPosition, callArgs));
+
+          case 4:
+          case "end":
+            return _context5.stop();
+        }
+      }
+    }, _callee5);
+  }));
+  return _uniswapV3LiquidityPositionPurge.apply(this, arguments);
+}
+
+function uniswapV3LiquidityPositionRemoveLiquidity(_x6) {
+  return _uniswapV3LiquidityPositionRemoveLiquidity.apply(this, arguments);
+}
+
+function _uniswapV3LiquidityPositionRemoveLiquidity() {
+  _uniswapV3LiquidityPositionRemoveLiquidity = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime__default['default'].mark(function _callee6(_ref6) {
+    var signer, comptrollerProxy, externalPositionManager, externalPositionProxy, nftId, liquidity, _ref6$amount0Min, amount0Min, _ref6$amount1Min, amount1Min, actionArgs, callArgs;
+
+    return _regeneratorRuntime__default['default'].wrap(function _callee6$(_context6) {
+      while (1) {
+        switch (_context6.prev = _context6.next) {
+          case 0:
+            signer = _ref6.signer, comptrollerProxy = _ref6.comptrollerProxy, externalPositionManager = _ref6.externalPositionManager, externalPositionProxy = _ref6.externalPositionProxy, nftId = _ref6.nftId, liquidity = _ref6.liquidity, _ref6$amount0Min = _ref6.amount0Min, amount0Min = _ref6$amount0Min === void 0 ? 0 : _ref6$amount0Min, _ref6$amount1Min = _ref6.amount1Min, amount1Min = _ref6$amount1Min === void 0 ? 0 : _ref6$amount1Min;
+            actionArgs = protocol.uniswapV3LiquidityPositionRemoveLiquidityArgs({
+              amount0Min: amount0Min,
+              amount1Min: amount1Min,
+              liquidity: liquidity,
+              nftId: nftId
+            });
+            callArgs = protocol.callOnExternalPositionArgs({
+              actionArgs: actionArgs,
+              actionId: protocol.UniswapV3LiquidityPositionActionId.RemoveLiquidity,
+              externalPositionProxy: externalPositionProxy
+            });
+            return _context6.abrupt("return", comptrollerProxy.connect(signer).callOnExtension(externalPositionManager, protocol.ExternalPositionManagerActionId.CallOnExternalPosition, callArgs));
+
+          case 4:
           case "end":
-            return _context.stop();
+            return _context6.stop();
         }
       }
-    }, _callee);
+    }, _callee6);
   }));
-  return _createMockExternalPosition.apply(this, arguments);
+  return _uniswapV3LiquidityPositionRemoveLiquidity.apply(this, arguments);
+}
+
+function uniswapV3OrderTokenPair(_ref7) {
+  var tokenA = _ref7.tokenA,
+      tokenB = _ref7.tokenB;
+  var tokenAAddress = ethers$1.resolveAddress(tokenA);
+  var tokenBAddress = ethers$1.resolveAddress(tokenB);
+  return tokenAAddress < tokenBAddress ? {
+    token0: tokenAAddress,
+    token1: tokenBAddress
+  } : {
+    token0: tokenBAddress,
+    token1: tokenAAddress
+  };
 }
 
 function generateFeeManagerConfigWithMockFees(_x) {
@@ -868,7 +1389,7 @@ function _generateFeeManagerConfigWithMockFees() {
           case 3:
             fees = _context.sent;
             feeManagerSettingsData = [ethers.utils.randomBytes(10), '0x', ethers.utils.randomBytes(2)];
-            return _context.abrupt("return", protocol$1.feeManagerConfigArgs({
+            return _context.abrupt("return", protocol.feeManagerConfigArgs({
               fees: Object.values(fees),
               settings: feeManagerSettingsData
             }));
@@ -896,25 +1417,25 @@ function _generateMockFees() {
           case 0:
             deployer = _ref2.deployer;
             _context2.next = 3;
-            return protocol$1.IFee.mock(deployer);
+            return protocol.IFee.mock(deployer);
 
           case 3:
             mockContinuousFeeSettleOnly = _context2.sent;
             _context2.next = 6;
-            return protocol$1.IFee.mock(deployer);
+            return protocol.IFee.mock(deployer);
 
           case 6:
             mockContinuousFeeWithGavAndUpdates = _context2.sent;
             _context2.next = 9;
-            return protocol$1.IFee.mock(deployer);
+            return protocol.IFee.mock(deployer);
 
           case 9:
             mockPostBuySharesFee = _context2.sent;
             _context2.next = 12;
             return Promise.all([// Continuous fee the mimics ManagementFee
-            mockContinuousFeeSettleOnly.getRecipientForFund.returns(ethers.constants.AddressZero), mockContinuousFeeSettleOnly.settle.returns(protocol$1.FeeSettlementType.None, ethers.constants.AddressZero, 0), mockContinuousFeeSettleOnly.payout.returns(false), mockContinuousFeeSettleOnly.addFundSettings.returns(undefined), mockContinuousFeeSettleOnly.activateForFund.returns(undefined), mockContinuousFeeSettleOnly.update.returns(undefined), mockContinuousFeeSettleOnly.settlesOnHook.returns(false, false), mockContinuousFeeSettleOnly.settlesOnHook.given(protocol$1.FeeHook.Continuous).returns(true, false), mockContinuousFeeSettleOnly.settlesOnHook.given(protocol$1.FeeHook.PreBuyShares).returns(true, false), mockContinuousFeeSettleOnly.settlesOnHook.given(protocol$1.FeeHook.PreRedeemShares).returns(true, false), mockContinuousFeeSettleOnly.updatesOnHook.returns(false, false), // Continuous fee the mimics PerformanceFee
-            mockContinuousFeeWithGavAndUpdates.getRecipientForFund.returns(ethers.constants.AddressZero), mockContinuousFeeWithGavAndUpdates.settle.returns(protocol$1.FeeSettlementType.None, ethers.constants.AddressZero, 0), mockContinuousFeeWithGavAndUpdates.payout.returns(false), mockContinuousFeeWithGavAndUpdates.addFundSettings.returns(undefined), mockContinuousFeeWithGavAndUpdates.activateForFund.returns(undefined), mockContinuousFeeWithGavAndUpdates.update.returns(undefined), mockContinuousFeeWithGavAndUpdates.settlesOnHook.returns(false, false), mockContinuousFeeWithGavAndUpdates.settlesOnHook.given(protocol$1.FeeHook.Continuous).returns(true, true), mockContinuousFeeWithGavAndUpdates.settlesOnHook.given(protocol$1.FeeHook.PreBuyShares).returns(true, true), mockContinuousFeeWithGavAndUpdates.settlesOnHook.given(protocol$1.FeeHook.PreRedeemShares).returns(true, true), mockContinuousFeeWithGavAndUpdates.updatesOnHook.returns(false, false), mockContinuousFeeWithGavAndUpdates.updatesOnHook.given(protocol$1.FeeHook.Continuous).returns(true, true), mockContinuousFeeWithGavAndUpdates.updatesOnHook.given(protocol$1.FeeHook.PostBuyShares).returns(true, true), mockContinuousFeeWithGavAndUpdates.updatesOnHook.given(protocol$1.FeeHook.PreRedeemShares).returns(true, true), // PostBuyShares fee
-            mockPostBuySharesFee.getRecipientForFund.returns(ethers.constants.AddressZero), mockPostBuySharesFee.settle.returns(protocol$1.FeeSettlementType.None, ethers.constants.AddressZero, 0), mockPostBuySharesFee.payout.returns(false), mockPostBuySharesFee.addFundSettings.returns(undefined), mockPostBuySharesFee.activateForFund.returns(undefined), mockPostBuySharesFee.update.returns(undefined), mockPostBuySharesFee.settlesOnHook.returns(false, false), mockPostBuySharesFee.settlesOnHook.given(protocol$1.FeeHook.PostBuyShares).returns(true, false), mockPostBuySharesFee.updatesOnHook.returns(false, false)]);
+            mockContinuousFeeSettleOnly.getRecipientForFund.returns(ethers.constants.AddressZero), mockContinuousFeeSettleOnly.settle.returns(protocol.FeeSettlementType.None, ethers.constants.AddressZero, 0), mockContinuousFeeSettleOnly.payout.returns(false), mockContinuousFeeSettleOnly.addFundSettings.returns(undefined), mockContinuousFeeSettleOnly.activateForFund.returns(undefined), mockContinuousFeeSettleOnly.update.returns(undefined), mockContinuousFeeSettleOnly.settlesOnHook.returns(false, false), mockContinuousFeeSettleOnly.settlesOnHook.given(protocol.FeeHook.Continuous).returns(true, false), mockContinuousFeeSettleOnly.settlesOnHook.given(protocol.FeeHook.PreBuyShares).returns(true, false), mockContinuousFeeSettleOnly.settlesOnHook.given(protocol.FeeHook.PreRedeemShares).returns(true, false), mockContinuousFeeSettleOnly.updatesOnHook.returns(false, false), // Continuous fee the mimics PerformanceFee
+            mockContinuousFeeWithGavAndUpdates.getRecipientForFund.returns(ethers.constants.AddressZero), mockContinuousFeeWithGavAndUpdates.settle.returns(protocol.FeeSettlementType.None, ethers.constants.AddressZero, 0), mockContinuousFeeWithGavAndUpdates.payout.returns(false), mockContinuousFeeWithGavAndUpdates.addFundSettings.returns(undefined), mockContinuousFeeWithGavAndUpdates.activateForFund.returns(undefined), mockContinuousFeeWithGavAndUpdates.update.returns(undefined), mockContinuousFeeWithGavAndUpdates.settlesOnHook.returns(false, false), mockContinuousFeeWithGavAndUpdates.settlesOnHook.given(protocol.FeeHook.Continuous).returns(true, true), mockContinuousFeeWithGavAndUpdates.settlesOnHook.given(protocol.FeeHook.PreBuyShares).returns(true, true), mockContinuousFeeWithGavAndUpdates.settlesOnHook.given(protocol.FeeHook.PreRedeemShares).returns(true, true), mockContinuousFeeWithGavAndUpdates.updatesOnHook.returns(false, false), mockContinuousFeeWithGavAndUpdates.updatesOnHook.given(protocol.FeeHook.Continuous).returns(true, true), mockContinuousFeeWithGavAndUpdates.updatesOnHook.given(protocol.FeeHook.PostBuyShares).returns(true, true), mockContinuousFeeWithGavAndUpdates.updatesOnHook.given(protocol.FeeHook.PreRedeemShares).returns(true, true), // PostBuyShares fee
+            mockPostBuySharesFee.getRecipientForFund.returns(ethers.constants.AddressZero), mockPostBuySharesFee.settle.returns(protocol.FeeSettlementType.None, ethers.constants.AddressZero, 0), mockPostBuySharesFee.payout.returns(false), mockPostBuySharesFee.addFundSettings.returns(undefined), mockPostBuySharesFee.activateForFund.returns(undefined), mockPostBuySharesFee.update.returns(undefined), mockPostBuySharesFee.settlesOnHook.returns(false, false), mockPostBuySharesFee.settlesOnHook.given(protocol.FeeHook.PostBuyShares).returns(true, false), mockPostBuySharesFee.updatesOnHook.returns(false, false)]);
 
           case 12:
             return _context2.abrupt("return", {
@@ -946,16 +1467,16 @@ function _aaveLend() {
         switch (_context.prev = _context.next) {
           case 0:
             comptrollerProxy = _ref.comptrollerProxy, integrationManager = _ref.integrationManager, fundOwner = _ref.fundOwner, aaveAdapter = _ref.aaveAdapter, aToken = _ref.aToken, _ref$amount = _ref.amount, amount = _ref$amount === void 0 ? ethers.utils.parseEther('1') : _ref$amount;
-            lendArgs = protocol$1.aaveLendArgs({
+            lendArgs = protocol.aaveLendArgs({
               aToken: aToken,
               amount: amount
             });
-            callArgs = protocol$1.callOnIntegrationArgs({
+            callArgs = protocol.callOnIntegrationArgs({
               adapter: aaveAdapter,
-              selector: protocol$1.lendSelector,
-              encodedCallArgs: lendArgs
+              encodedCallArgs: lendArgs,
+              selector: protocol.lendSelector
             });
-            lendTx = comptrollerProxy.connect(fundOwner).callOnExtension(integrationManager, protocol$1.IntegrationManagerActionId.CallOnIntegration, callArgs);
+            lendTx = comptrollerProxy.connect(fundOwner).callOnExtension(integrationManager, protocol.IntegrationManagerActionId.CallOnIntegration, callArgs);
             return _context.abrupt("return", lendTx);
 
           case 5:
@@ -981,16 +1502,16 @@ function _aaveRedeem() {
         switch (_context2.prev = _context2.next) {
           case 0:
             comptrollerProxy = _ref2.comptrollerProxy, integrationManager = _ref2.integrationManager, fundOwner = _ref2.fundOwner, aaveAdapter = _ref2.aaveAdapter, aToken = _ref2.aToken, _ref2$amount = _ref2.amount, amount = _ref2$amount === void 0 ? ethers.utils.parseEther('1') : _ref2$amount;
-            redeemArgs = protocol$1.aaveRedeemArgs({
+            redeemArgs = protocol.aaveRedeemArgs({
               aToken: aToken,
               amount: amount
             });
-            callArgs = protocol$1.callOnIntegrationArgs({
+            callArgs = protocol.callOnIntegrationArgs({
               adapter: aaveAdapter,
-              selector: protocol$1.redeemSelector,
-              encodedCallArgs: redeemArgs
+              encodedCallArgs: redeemArgs,
+              selector: protocol.redeemSelector
             });
-            redeemTx = comptrollerProxy.connect(fundOwner).callOnExtension(integrationManager, protocol$1.IntegrationManagerActionId.CallOnIntegration, callArgs);
+            redeemTx = comptrollerProxy.connect(fundOwner).callOnExtension(integrationManager, protocol.IntegrationManagerActionId.CallOnIntegration, callArgs);
             return _context2.abrupt("return", redeemTx);
 
           case 5:
@@ -1018,17 +1539,17 @@ function _compoundLend() {
         switch (_context.prev = _context.next) {
           case 0:
             comptrollerProxy = _ref.comptrollerProxy, integrationManager = _ref.integrationManager, fundOwner = _ref.fundOwner, compoundAdapter = _ref.compoundAdapter, cToken = _ref.cToken, _ref$tokenAmount = _ref.tokenAmount, tokenAmount = _ref$tokenAmount === void 0 ? ethers.utils.parseEther('1') : _ref$tokenAmount, _ref$cTokenAmount = _ref.cTokenAmount, cTokenAmount = _ref$cTokenAmount === void 0 ? ethers.utils.parseEther('1') : _ref$cTokenAmount;
-            lendArgs = protocol$1.compoundArgs({
+            lendArgs = protocol.compoundArgs({
               cToken: cToken,
-              outgoingAssetAmount: tokenAmount,
-              minIncomingAssetAmount: cTokenAmount
+              minIncomingAssetAmount: cTokenAmount,
+              outgoingAssetAmount: tokenAmount
             });
-            callArgs = protocol$1.callOnIntegrationArgs({
+            callArgs = protocol.callOnIntegrationArgs({
               adapter: compoundAdapter,
-              selector: protocol$1.lendSelector,
-              encodedCallArgs: lendArgs
+              encodedCallArgs: lendArgs,
+              selector: protocol.lendSelector
             });
-            lendTx = comptrollerProxy.connect(fundOwner).callOnExtension(integrationManager, protocol$1.IntegrationManagerActionId.CallOnIntegration, callArgs);
+            lendTx = comptrollerProxy.connect(fundOwner).callOnExtension(integrationManager, protocol.IntegrationManagerActionId.CallOnIntegration, callArgs);
             return _context.abrupt("return", lendTx);
 
           case 5:
@@ -1054,17 +1575,17 @@ function _compoundRedeem() {
         switch (_context2.prev = _context2.next) {
           case 0:
             comptrollerProxy = _ref2.comptrollerProxy, integrationManager = _ref2.integrationManager, fundOwner = _ref2.fundOwner, compoundAdapter = _ref2.compoundAdapter, cToken = _ref2.cToken, _ref2$tokenAmount = _ref2.tokenAmount, tokenAmount = _ref2$tokenAmount === void 0 ? ethers.utils.parseEther('1') : _ref2$tokenAmount, _ref2$cTokenAmount = _ref2.cTokenAmount, cTokenAmount = _ref2$cTokenAmount === void 0 ? ethers.utils.parseEther('1') : _ref2$cTokenAmount;
-            redeemArgs = protocol$1.compoundArgs({
+            redeemArgs = protocol.compoundArgs({
               cToken: ethers$1.resolveAddress(cToken),
-              outgoingAssetAmount: cTokenAmount,
-              minIncomingAssetAmount: tokenAmount
+              minIncomingAssetAmount: tokenAmount,
+              outgoingAssetAmount: cTokenAmount
             });
-            callArgs = protocol$1.callOnIntegrationArgs({
+            callArgs = protocol.callOnIntegrationArgs({
               adapter: compoundAdapter,
-              selector: protocol$1.redeemSelector,
-              encodedCallArgs: redeemArgs
+              encodedCallArgs: redeemArgs,
+              selector: protocol.redeemSelector
             });
-            redeemTx = comptrollerProxy.connect(fundOwner).callOnExtension(integrationManager, protocol$1.IntegrationManagerActionId.CallOnIntegration, callArgs);
+            redeemTx = comptrollerProxy.connect(fundOwner).callOnExtension(integrationManager, protocol.IntegrationManagerActionId.CallOnIntegration, callArgs);
             return _context2.abrupt("return", redeemTx);
 
           case 5:
@@ -1096,19 +1617,19 @@ function _curveTakeOrder() {
         switch (_context.prev = _context.next) {
           case 0:
             comptrollerProxy = _ref.comptrollerProxy, integrationManager = _ref.integrationManager, fundOwner = _ref.fundOwner, curveExchangeAdapter = _ref.curveExchangeAdapter, pool = _ref.pool, outgoingAsset = _ref.outgoingAsset, _ref$outgoingAssetAmo = _ref.outgoingAssetAmount, outgoingAssetAmount = _ref$outgoingAssetAmo === void 0 ? ethers.utils.parseEther('1') : _ref$outgoingAssetAmo, incomingAsset = _ref.incomingAsset, _ref$minIncomingAsset = _ref.minIncomingAssetAmount, minIncomingAssetAmount = _ref$minIncomingAsset === void 0 ? ethers.utils.parseEther('1') : _ref$minIncomingAsset;
-            takeOrderArgs = protocol$1.curveTakeOrderArgs({
-              pool: pool,
+            takeOrderArgs = protocol.curveTakeOrderArgs({
+              incomingAsset: incomingAsset,
+              minIncomingAssetAmount: minIncomingAssetAmount,
               outgoingAsset: outgoingAsset,
               outgoingAssetAmount: outgoingAssetAmount,
-              incomingAsset: incomingAsset,
-              minIncomingAssetAmount: minIncomingAssetAmount
+              pool: pool
             });
-            callArgs = protocol$1.callOnIntegrationArgs({
+            callArgs = protocol.callOnIntegrationArgs({
               adapter: curveExchangeAdapter,
-              selector: protocol$1.takeOrderSelector,
-              encodedCallArgs: takeOrderArgs
+              encodedCallArgs: takeOrderArgs,
+              selector: protocol.takeOrderSelector
             });
-            return _context.abrupt("return", comptrollerProxy.connect(fundOwner).callOnExtension(integrationManager, protocol$1.IntegrationManagerActionId.CallOnIntegration, callArgs));
+            return _context.abrupt("return", comptrollerProxy.connect(fundOwner).callOnExtension(integrationManager, protocol.IntegrationManagerActionId.CallOnIntegration, callArgs));
 
           case 4:
           case "end":
@@ -1125,12 +1646,12 @@ function curveAaveClaimRewards(_ref2) {
       integrationManager = _ref2.integrationManager,
       fundOwner = _ref2.fundOwner,
       curveLiquidityAaveAdapter = _ref2.curveLiquidityAaveAdapter;
-  var callArgs = protocol$1.callOnIntegrationArgs({
+  var callArgs = protocol.callOnIntegrationArgs({
     adapter: curveLiquidityAaveAdapter,
-    selector: protocol$1.claimRewardsSelector,
-    encodedCallArgs: ethers.constants.HashZero
+    encodedCallArgs: ethers.constants.HashZero,
+    selector: protocol.claimRewardsSelector
   });
-  return comptrollerProxy.connect(fundOwner).callOnExtension(integrationManager, protocol$1.IntegrationManagerActionId.CallOnIntegration, callArgs);
+  return comptrollerProxy.connect(fundOwner).callOnExtension(integrationManager, protocol.IntegrationManagerActionId.CallOnIntegration, callArgs);
 }
 function curveAaveLend(_ref3) {
   var comptrollerProxy = _ref3.comptrollerProxy,
@@ -1147,18 +1668,18 @@ function curveAaveLend(_ref3) {
       minIncomingLPTokenAmount = _ref3$minIncomingLPTo === void 0 ? ethers.BigNumber.from(1) : _ref3$minIncomingLPTo,
       _ref3$useUnderlyings = _ref3.useUnderlyings,
       useUnderlyings = _ref3$useUnderlyings === void 0 ? false : _ref3$useUnderlyings;
-  var callArgs = protocol$1.callOnIntegrationArgs({
+  var callArgs = protocol.callOnIntegrationArgs({
     adapter: curveLiquidityAaveAdapter,
-    selector: protocol$1.lendSelector,
-    encodedCallArgs: protocol$1.curveAaveLendArgs({
+    encodedCallArgs: protocol.curveAaveLendArgs({
+      minIncomingLPTokenAmount: minIncomingLPTokenAmount,
       outgoingAaveDaiAmount: outgoingAaveDaiAmount,
       outgoingAaveUsdcAmount: outgoingAaveUsdcAmount,
       outgoingAaveUsdtAmount: outgoingAaveUsdtAmount,
-      minIncomingLPTokenAmount: minIncomingLPTokenAmount,
       useUnderlyings: useUnderlyings
-    })
+    }),
+    selector: protocol.lendSelector
   });
-  return comptrollerProxy.connect(fundOwner).callOnExtension(integrationManager, protocol$1.IntegrationManagerActionId.CallOnIntegration, callArgs);
+  return comptrollerProxy.connect(fundOwner).callOnExtension(integrationManager, protocol.IntegrationManagerActionId.CallOnIntegration, callArgs);
 }
 function curveAaveLendAndStake(_ref4) {
   var comptrollerProxy = _ref4.comptrollerProxy,
@@ -1175,18 +1696,18 @@ function curveAaveLendAndStake(_ref4) {
       minIncomingLiquidityGaugeTokenAmount = _ref4$minIncomingLiqu === void 0 ? ethers.BigNumber.from(1) : _ref4$minIncomingLiqu,
       _ref4$useUnderlyings = _ref4.useUnderlyings,
       useUnderlyings = _ref4$useUnderlyings === void 0 ? false : _ref4$useUnderlyings;
-  var callArgs = protocol$1.callOnIntegrationArgs({
+  var callArgs = protocol.callOnIntegrationArgs({
     adapter: curveLiquidityAaveAdapter,
-    selector: protocol$1.lendAndStakeSelector,
-    encodedCallArgs: protocol$1.curveAaveLendAndStakeArgs({
+    encodedCallArgs: protocol.curveAaveLendAndStakeArgs({
+      minIncomingLiquidityGaugeTokenAmount: minIncomingLiquidityGaugeTokenAmount,
       outgoingAaveDaiAmount: outgoingAaveDaiAmount,
       outgoingAaveUsdcAmount: outgoingAaveUsdcAmount,
       outgoingAaveUsdtAmount: outgoingAaveUsdtAmount,
-      minIncomingLiquidityGaugeTokenAmount: minIncomingLiquidityGaugeTokenAmount,
       useUnderlyings: useUnderlyings
-    })
+    }),
+    selector: protocol.lendAndStakeSelector
   });
-  return comptrollerProxy.connect(fundOwner).callOnExtension(integrationManager, protocol$1.IntegrationManagerActionId.CallOnIntegration, callArgs);
+  return comptrollerProxy.connect(fundOwner).callOnExtension(integrationManager, protocol.IntegrationManagerActionId.CallOnIntegration, callArgs);
 }
 function curveAaveRedeem(_ref5) {
   var comptrollerProxy = _ref5.comptrollerProxy,
@@ -1204,19 +1725,19 @@ function curveAaveRedeem(_ref5) {
       receiveSingleAsset = _ref5$receiveSingleAs === void 0 ? false : _ref5$receiveSingleAs,
       _ref5$useUnderlyings = _ref5.useUnderlyings,
       useUnderlyings = _ref5$useUnderlyings === void 0 ? false : _ref5$useUnderlyings;
-  var callArgs = protocol$1.callOnIntegrationArgs({
+  var callArgs = protocol.callOnIntegrationArgs({
     adapter: curveLiquidityAaveAdapter,
-    selector: protocol$1.redeemSelector,
-    encodedCallArgs: protocol$1.curveAaveRedeemArgs({
-      outgoingLPTokenAmount: outgoingLPTokenAmount,
+    encodedCallArgs: protocol.curveAaveRedeemArgs({
       minIncomingAaveDaiAmount: minIncomingAaveDaiAmount,
       minIncomingAaveUsdcAmount: minIncomingAaveUsdcAmount,
       minIncomingAaveUsdtAmount: minIncomingAaveUsdtAmount,
+      outgoingLPTokenAmount: outgoingLPTokenAmount,
       receiveSingleAsset: receiveSingleAsset,
       useUnderlyings: useUnderlyings
-    })
+    }),
+    selector: protocol.redeemSelector
   });
-  return comptrollerProxy.connect(fundOwner).callOnExtension(integrationManager, protocol$1.IntegrationManagerActionId.CallOnIntegration, callArgs);
+  return comptrollerProxy.connect(fundOwner).callOnExtension(integrationManager, protocol.IntegrationManagerActionId.CallOnIntegration, callArgs);
 }
 function curveAaveStake(_ref6) {
   var comptrollerProxy = _ref6.comptrollerProxy,
@@ -1224,14 +1745,14 @@ function curveAaveStake(_ref6) {
       fundOwner = _ref6.fundOwner,
       curveLiquidityAaveAdapter = _ref6.curveLiquidityAaveAdapter,
       outgoingLPTokenAmount = _ref6.outgoingLPTokenAmount;
-  var callArgs = protocol$1.callOnIntegrationArgs({
+  var callArgs = protocol.callOnIntegrationArgs({
     adapter: curveLiquidityAaveAdapter,
-    selector: protocol$1.stakeSelector,
-    encodedCallArgs: protocol$1.curveAaveStakeArgs({
+    encodedCallArgs: protocol.curveAaveStakeArgs({
       outgoingLPTokenAmount: outgoingLPTokenAmount
-    })
+    }),
+    selector: protocol.stakeSelector
   });
-  return comptrollerProxy.connect(fundOwner).callOnExtension(integrationManager, protocol$1.IntegrationManagerActionId.CallOnIntegration, callArgs);
+  return comptrollerProxy.connect(fundOwner).callOnExtension(integrationManager, protocol.IntegrationManagerActionId.CallOnIntegration, callArgs);
 }
 function curveAaveUnstakeAndRedeem(_ref7) {
   var comptrollerProxy = _ref7.comptrollerProxy,
@@ -1249,19 +1770,19 @@ function curveAaveUnstakeAndRedeem(_ref7) {
       receiveSingleAsset = _ref7$receiveSingleAs === void 0 ? false : _ref7$receiveSingleAs,
       _ref7$useUnderlyings = _ref7.useUnderlyings,
       useUnderlyings = _ref7$useUnderlyings === void 0 ? false : _ref7$useUnderlyings;
-  var callArgs = protocol$1.callOnIntegrationArgs({
+  var callArgs = protocol.callOnIntegrationArgs({
     adapter: curveLiquidityAaveAdapter,
-    selector: protocol$1.unstakeAndRedeemSelector,
-    encodedCallArgs: protocol$1.curveAaveUnstakeAndRedeemArgs({
-      outgoingLiquidityGaugeTokenAmount: outgoingLiquidityGaugeTokenAmount,
+    encodedCallArgs: protocol.curveAaveUnstakeAndRedeemArgs({
       minIncomingAaveDaiAmount: minIncomingAaveDaiAmount,
       minIncomingAaveUsdcAmount: minIncomingAaveUsdcAmount,
       minIncomingAaveUsdtAmount: minIncomingAaveUsdtAmount,
+      outgoingLiquidityGaugeTokenAmount: outgoingLiquidityGaugeTokenAmount,
       receiveSingleAsset: receiveSingleAsset,
       useUnderlyings: useUnderlyings
-    })
+    }),
+    selector: protocol.unstakeAndRedeemSelector
   });
-  return comptrollerProxy.connect(fundOwner).callOnExtension(integrationManager, protocol$1.IntegrationManagerActionId.CallOnIntegration, callArgs);
+  return comptrollerProxy.connect(fundOwner).callOnExtension(integrationManager, protocol.IntegrationManagerActionId.CallOnIntegration, callArgs);
 }
 function curveAaveUnstake(_ref8) {
   var comptrollerProxy = _ref8.comptrollerProxy,
@@ -1269,14 +1790,14 @@ function curveAaveUnstake(_ref8) {
       fundOwner = _ref8.fundOwner,
       curveLiquidityAaveAdapter = _ref8.curveLiquidityAaveAdapter,
       outgoingLiquidityGaugeTokenAmount = _ref8.outgoingLiquidityGaugeTokenAmount;
-  var callArgs = protocol$1.callOnIntegrationArgs({
+  var callArgs = protocol.callOnIntegrationArgs({
     adapter: curveLiquidityAaveAdapter,
-    selector: protocol$1.unstakeSelector,
-    encodedCallArgs: protocol$1.curveAaveUnstakeArgs({
+    encodedCallArgs: protocol.curveAaveUnstakeArgs({
       outgoingLiquidityGaugeTokenAmount: outgoingLiquidityGaugeTokenAmount
-    })
+    }),
+    selector: protocol.unstakeSelector
   });
-  return comptrollerProxy.connect(fundOwner).callOnExtension(integrationManager, protocol$1.IntegrationManagerActionId.CallOnIntegration, callArgs);
+  return comptrollerProxy.connect(fundOwner).callOnExtension(integrationManager, protocol.IntegrationManagerActionId.CallOnIntegration, callArgs);
 } // eurs pool
 
 function curveEursClaimRewards(_ref9) {
@@ -1284,12 +1805,12 @@ function curveEursClaimRewards(_ref9) {
       integrationManager = _ref9.integrationManager,
       fundOwner = _ref9.fundOwner,
       curveLiquidityEursAdapter = _ref9.curveLiquidityEursAdapter;
-  var callArgs = protocol$1.callOnIntegrationArgs({
+  var callArgs = protocol.callOnIntegrationArgs({
     adapter: curveLiquidityEursAdapter,
-    selector: protocol$1.claimRewardsSelector,
-    encodedCallArgs: ethers.constants.HashZero
+    encodedCallArgs: ethers.constants.HashZero,
+    selector: protocol.claimRewardsSelector
   });
-  return comptrollerProxy.connect(fundOwner).callOnExtension(integrationManager, protocol$1.IntegrationManagerActionId.CallOnIntegration, callArgs);
+  return comptrollerProxy.connect(fundOwner).callOnExtension(integrationManager, protocol.IntegrationManagerActionId.CallOnIntegration, callArgs);
 }
 function curveEursLend(_ref10) {
   var comptrollerProxy = _ref10.comptrollerProxy,
@@ -1299,16 +1820,16 @@ function curveEursLend(_ref10) {
       outgoingEursAmount = _ref10.outgoingEursAmount,
       outgoingSeurAmount = _ref10.outgoingSeurAmount,
       minIncomingLPTokenAmount = _ref10.minIncomingLPTokenAmount;
-  var callArgs = protocol$1.callOnIntegrationArgs({
+  var callArgs = protocol.callOnIntegrationArgs({
     adapter: curveLiquidityEursAdapter,
-    selector: protocol$1.lendSelector,
-    encodedCallArgs: protocol$1.curveEursLendArgs({
+    encodedCallArgs: protocol.curveEursLendArgs({
+      minIncomingLPTokenAmount: minIncomingLPTokenAmount,
       outgoingEursAmount: outgoingEursAmount,
-      outgoingSeurAmount: outgoingSeurAmount,
-      minIncomingLPTokenAmount: minIncomingLPTokenAmount
-    })
+      outgoingSeurAmount: outgoingSeurAmount
+    }),
+    selector: protocol.lendSelector
   });
-  return comptrollerProxy.connect(fundOwner).callOnExtension(integrationManager, protocol$1.IntegrationManagerActionId.CallOnIntegration, callArgs);
+  return comptrollerProxy.connect(fundOwner).callOnExtension(integrationManager, protocol.IntegrationManagerActionId.CallOnIntegration, callArgs);
 }
 function curveEursLendAndStake(_ref11) {
   var comptrollerProxy = _ref11.comptrollerProxy,
@@ -1318,16 +1839,16 @@ function curveEursLendAndStake(_ref11) {
       outgoingEursAmount = _ref11.outgoingEursAmount,
       outgoingSeurAmount = _ref11.outgoingSeurAmount,
       minIncomingLiquidityGaugeTokenAmount = _ref11.minIncomingLiquidityGaugeTokenAmount;
-  var callArgs = protocol$1.callOnIntegrationArgs({
+  var callArgs = protocol.callOnIntegrationArgs({
     adapter: curveLiquidityEursAdapter,
-    selector: protocol$1.lendAndStakeSelector,
-    encodedCallArgs: protocol$1.curveEursLendAndStakeArgs({
+    encodedCallArgs: protocol.curveEursLendAndStakeArgs({
+      minIncomingLiquidityGaugeTokenAmount: minIncomingLiquidityGaugeTokenAmount,
       outgoingEursAmount: outgoingEursAmount,
-      outgoingSeurAmount: outgoingSeurAmount,
-      minIncomingLiquidityGaugeTokenAmount: minIncomingLiquidityGaugeTokenAmount
-    })
+      outgoingSeurAmount: outgoingSeurAmount
+    }),
+    selector: protocol.lendAndStakeSelector
   });
-  return comptrollerProxy.connect(fundOwner).callOnExtension(integrationManager, protocol$1.IntegrationManagerActionId.CallOnIntegration, callArgs);
+  return comptrollerProxy.connect(fundOwner).callOnExtension(integrationManager, protocol.IntegrationManagerActionId.CallOnIntegration, callArgs);
 }
 function curveEursRedeem(_ref12) {
   var comptrollerProxy = _ref12.comptrollerProxy,
@@ -1338,17 +1859,17 @@ function curveEursRedeem(_ref12) {
       minIncomingEursAmount = _ref12.minIncomingEursAmount,
       minIncomingSeurAmount = _ref12.minIncomingSeurAmount,
       receiveSingleAsset = _ref12.receiveSingleAsset;
-  var callArgs = protocol$1.callOnIntegrationArgs({
+  var callArgs = protocol.callOnIntegrationArgs({
     adapter: curveLiquidityEursAdapter,
-    selector: protocol$1.redeemSelector,
-    encodedCallArgs: protocol$1.curveEursRedeemArgs({
-      outgoingLPTokenAmount: outgoingLPTokenAmount,
+    encodedCallArgs: protocol.curveEursRedeemArgs({
       minIncomingEursAmount: minIncomingEursAmount,
       minIncomingSeurAmount: minIncomingSeurAmount,
+      outgoingLPTokenAmount: outgoingLPTokenAmount,
       receiveSingleAsset: receiveSingleAsset
-    })
+    }),
+    selector: protocol.redeemSelector
   });
-  return comptrollerProxy.connect(fundOwner).callOnExtension(integrationManager, protocol$1.IntegrationManagerActionId.CallOnIntegration, callArgs);
+  return comptrollerProxy.connect(fundOwner).callOnExtension(integrationManager, protocol.IntegrationManagerActionId.CallOnIntegration, callArgs);
 }
 function curveEursStake(_ref13) {
   var comptrollerProxy = _ref13.comptrollerProxy,
@@ -1356,14 +1877,14 @@ function curveEursStake(_ref13) {
       fundOwner = _ref13.fundOwner,
       curveLiquidityEursAdapter = _ref13.curveLiquidityEursAdapter,
       outgoingLPTokenAmount = _ref13.outgoingLPTokenAmount;
-  var callArgs = protocol$1.callOnIntegrationArgs({
+  var callArgs = protocol.callOnIntegrationArgs({
     adapter: curveLiquidityEursAdapter,
-    selector: protocol$1.stakeSelector,
-    encodedCallArgs: protocol$1.curveEursStakeArgs({
+    encodedCallArgs: protocol.curveEursStakeArgs({
       outgoingLPTokenAmount: outgoingLPTokenAmount
-    })
+    }),
+    selector: protocol.stakeSelector
   });
-  return comptrollerProxy.connect(fundOwner).callOnExtension(integrationManager, protocol$1.IntegrationManagerActionId.CallOnIntegration, callArgs);
+  return comptrollerProxy.connect(fundOwner).callOnExtension(integrationManager, protocol.IntegrationManagerActionId.CallOnIntegration, callArgs);
 }
 function curveEursUnstakeAndRedeem(_ref14) {
   var comptrollerProxy = _ref14.comptrollerProxy,
@@ -1374,17 +1895,17 @@ function curveEursUnstakeAndRedeem(_ref14) {
       minIncomingEursAmount = _ref14.minIncomingEursAmount,
       minIncomingSeurAmount = _ref14.minIncomingSeurAmount,
       receiveSingleAsset = _ref14.receiveSingleAsset;
-  var callArgs = protocol$1.callOnIntegrationArgs({
+  var callArgs = protocol.callOnIntegrationArgs({
     adapter: curveLiquidityEursAdapter,
-    selector: protocol$1.unstakeAndRedeemSelector,
-    encodedCallArgs: protocol$1.curveEursUnstakeAndRedeemArgs({
-      outgoingLiquidityGaugeTokenAmount: outgoingLiquidityGaugeTokenAmount,
+    encodedCallArgs: protocol.curveEursUnstakeAndRedeemArgs({
       minIncomingEursAmount: minIncomingEursAmount,
       minIncomingSeurAmount: minIncomingSeurAmount,
+      outgoingLiquidityGaugeTokenAmount: outgoingLiquidityGaugeTokenAmount,
       receiveSingleAsset: receiveSingleAsset
-    })
+    }),
+    selector: protocol.unstakeAndRedeemSelector
   });
-  return comptrollerProxy.connect(fundOwner).callOnExtension(integrationManager, protocol$1.IntegrationManagerActionId.CallOnIntegration, callArgs);
+  return comptrollerProxy.connect(fundOwner).callOnExtension(integrationManager, protocol.IntegrationManagerActionId.CallOnIntegration, callArgs);
 }
 function curveEursUnstake(_ref15) {
   var comptrollerProxy = _ref15.comptrollerProxy,
@@ -1392,14 +1913,14 @@ function curveEursUnstake(_ref15) {
       fundOwner = _ref15.fundOwner,
       curveLiquidityEursAdapter = _ref15.curveLiquidityEursAdapter,
       outgoingLiquidityGaugeTokenAmount = _ref15.outgoingLiquidityGaugeTokenAmount;
-  var callArgs = protocol$1.callOnIntegrationArgs({
+  var callArgs = protocol.callOnIntegrationArgs({
     adapter: curveLiquidityEursAdapter,
-    selector: protocol$1.unstakeSelector,
-    encodedCallArgs: protocol$1.curveEursUnstakeArgs({
+    encodedCallArgs: protocol.curveEursUnstakeArgs({
       outgoingLiquidityGaugeTokenAmount: outgoingLiquidityGaugeTokenAmount
-    })
+    }),
+    selector: protocol.unstakeSelector
   });
-  return comptrollerProxy.connect(fundOwner).callOnExtension(integrationManager, protocol$1.IntegrationManagerActionId.CallOnIntegration, callArgs);
+  return comptrollerProxy.connect(fundOwner).callOnExtension(integrationManager, protocol.IntegrationManagerActionId.CallOnIntegration, callArgs);
 } // sETH pool
 
 function curveSethClaimRewards(_ref16) {
@@ -1407,12 +1928,12 @@ function curveSethClaimRewards(_ref16) {
       integrationManager = _ref16.integrationManager,
       fundOwner = _ref16.fundOwner,
       curveLiquiditySethAdapter = _ref16.curveLiquiditySethAdapter;
-  var callArgs = protocol$1.callOnIntegrationArgs({
+  var callArgs = protocol.callOnIntegrationArgs({
     adapter: curveLiquiditySethAdapter,
-    selector: protocol$1.claimRewardsSelector,
-    encodedCallArgs: ethers.constants.HashZero
+    encodedCallArgs: ethers.constants.HashZero,
+    selector: protocol.claimRewardsSelector
   });
-  return comptrollerProxy.connect(fundOwner).callOnExtension(integrationManager, protocol$1.IntegrationManagerActionId.CallOnIntegration, callArgs);
+  return comptrollerProxy.connect(fundOwner).callOnExtension(integrationManager, protocol.IntegrationManagerActionId.CallOnIntegration, callArgs);
 }
 function curveSethLend(_ref17) {
   var comptrollerProxy = _ref17.comptrollerProxy,
@@ -1422,16 +1943,16 @@ function curveSethLend(_ref17) {
       outgoingWethAmount = _ref17.outgoingWethAmount,
       outgoingSethAmount = _ref17.outgoingSethAmount,
       minIncomingLPTokenAmount = _ref17.minIncomingLPTokenAmount;
-  var callArgs = protocol$1.callOnIntegrationArgs({
+  var callArgs = protocol.callOnIntegrationArgs({
     adapter: curveLiquiditySethAdapter,
-    selector: protocol$1.lendSelector,
-    encodedCallArgs: protocol$1.curveSethLendArgs({
-      outgoingWethAmount: outgoingWethAmount,
+    encodedCallArgs: protocol.curveSethLendArgs({
+      minIncomingLPTokenAmount: minIncomingLPTokenAmount,
       outgoingSethAmount: outgoingSethAmount,
-      minIncomingLPTokenAmount: minIncomingLPTokenAmount
-    })
+      outgoingWethAmount: outgoingWethAmount
+    }),
+    selector: protocol.lendSelector
   });
-  return comptrollerProxy.connect(fundOwner).callOnExtension(integrationManager, protocol$1.IntegrationManagerActionId.CallOnIntegration, callArgs);
+  return comptrollerProxy.connect(fundOwner).callOnExtension(integrationManager, protocol.IntegrationManagerActionId.CallOnIntegration, callArgs);
 }
 function curveSethLendAndStake(_ref18) {
   var comptrollerProxy = _ref18.comptrollerProxy,
@@ -1441,16 +1962,16 @@ function curveSethLendAndStake(_ref18) {
       outgoingWethAmount = _ref18.outgoingWethAmount,
       outgoingSethAmount = _ref18.outgoingSethAmount,
       minIncomingLiquidityGaugeTokenAmount = _ref18.minIncomingLiquidityGaugeTokenAmount;
-  var callArgs = protocol$1.callOnIntegrationArgs({
+  var callArgs = protocol.callOnIntegrationArgs({
     adapter: curveLiquiditySethAdapter,
-    selector: protocol$1.lendAndStakeSelector,
-    encodedCallArgs: protocol$1.curveSethLendAndStakeArgs({
-      outgoingWethAmount: outgoingWethAmount,
+    encodedCallArgs: protocol.curveSethLendAndStakeArgs({
+      minIncomingLiquidityGaugeTokenAmount: minIncomingLiquidityGaugeTokenAmount,
       outgoingSethAmount: outgoingSethAmount,
-      minIncomingLiquidityGaugeTokenAmount: minIncomingLiquidityGaugeTokenAmount
-    })
+      outgoingWethAmount: outgoingWethAmount
+    }),
+    selector: protocol.lendAndStakeSelector
   });
-  return comptrollerProxy.connect(fundOwner).callOnExtension(integrationManager, protocol$1.IntegrationManagerActionId.CallOnIntegration, callArgs);
+  return comptrollerProxy.connect(fundOwner).callOnExtension(integrationManager, protocol.IntegrationManagerActionId.CallOnIntegration, callArgs);
 }
 function curveSethRedeem(_ref19) {
   var comptrollerProxy = _ref19.comptrollerProxy,
@@ -1461,17 +1982,17 @@ function curveSethRedeem(_ref19) {
       minIncomingWethAmount = _ref19.minIncomingWethAmount,
       minIncomingSethAmount = _ref19.minIncomingSethAmount,
       receiveSingleAsset = _ref19.receiveSingleAsset;
-  var callArgs = protocol$1.callOnIntegrationArgs({
+  var callArgs = protocol.callOnIntegrationArgs({
     adapter: curveLiquiditySethAdapter,
-    selector: protocol$1.redeemSelector,
-    encodedCallArgs: protocol$1.curveSethRedeemArgs({
-      outgoingLPTokenAmount: outgoingLPTokenAmount,
-      minIncomingWethAmount: minIncomingWethAmount,
+    encodedCallArgs: protocol.curveSethRedeemArgs({
       minIncomingSethAmount: minIncomingSethAmount,
+      minIncomingWethAmount: minIncomingWethAmount,
+      outgoingLPTokenAmount: outgoingLPTokenAmount,
       receiveSingleAsset: receiveSingleAsset
-    })
+    }),
+    selector: protocol.redeemSelector
   });
-  return comptrollerProxy.connect(fundOwner).callOnExtension(integrationManager, protocol$1.IntegrationManagerActionId.CallOnIntegration, callArgs);
+  return comptrollerProxy.connect(fundOwner).callOnExtension(integrationManager, protocol.IntegrationManagerActionId.CallOnIntegration, callArgs);
 }
 function curveSethStake(_ref20) {
   var comptrollerProxy = _ref20.comptrollerProxy,
@@ -1479,14 +2000,14 @@ function curveSethStake(_ref20) {
       fundOwner = _ref20.fundOwner,
       curveLiquiditySethAdapter = _ref20.curveLiquiditySethAdapter,
       outgoingLPTokenAmount = _ref20.outgoingLPTokenAmount;
-  var callArgs = protocol$1.callOnIntegrationArgs({
+  var callArgs = protocol.callOnIntegrationArgs({
     adapter: curveLiquiditySethAdapter,
-    selector: protocol$1.stakeSelector,
-    encodedCallArgs: protocol$1.curveSethStakeArgs({
+    encodedCallArgs: protocol.curveSethStakeArgs({
       outgoingLPTokenAmount: outgoingLPTokenAmount
-    })
+    }),
+    selector: protocol.stakeSelector
   });
-  return comptrollerProxy.connect(fundOwner).callOnExtension(integrationManager, protocol$1.IntegrationManagerActionId.CallOnIntegration, callArgs);
+  return comptrollerProxy.connect(fundOwner).callOnExtension(integrationManager, protocol.IntegrationManagerActionId.CallOnIntegration, callArgs);
 }
 function curveSethUnstakeAndRedeem(_ref21) {
   var comptrollerProxy = _ref21.comptrollerProxy,
@@ -1497,17 +2018,17 @@ function curveSethUnstakeAndRedeem(_ref21) {
       minIncomingWethAmount = _ref21.minIncomingWethAmount,
       minIncomingSethAmount = _ref21.minIncomingSethAmount,
       receiveSingleAsset = _ref21.receiveSingleAsset;
-  var callArgs = protocol$1.callOnIntegrationArgs({
+  var callArgs = protocol.callOnIntegrationArgs({
     adapter: curveLiquiditySethAdapter,
-    selector: protocol$1.unstakeAndRedeemSelector,
-    encodedCallArgs: protocol$1.curveSethUnstakeAndRedeemArgs({
-      outgoingLiquidityGaugeTokenAmount: outgoingLiquidityGaugeTokenAmount,
-      minIncomingWethAmount: minIncomingWethAmount,
+    encodedCallArgs: protocol.curveSethUnstakeAndRedeemArgs({
       minIncomingSethAmount: minIncomingSethAmount,
+      minIncomingWethAmount: minIncomingWethAmount,
+      outgoingLiquidityGaugeTokenAmount: outgoingLiquidityGaugeTokenAmount,
       receiveSingleAsset: receiveSingleAsset
-    })
+    }),
+    selector: protocol.unstakeAndRedeemSelector
   });
-  return comptrollerProxy.connect(fundOwner).callOnExtension(integrationManager, protocol$1.IntegrationManagerActionId.CallOnIntegration, callArgs);
+  return comptrollerProxy.connect(fundOwner).callOnExtension(integrationManager, protocol.IntegrationManagerActionId.CallOnIntegration, callArgs);
 }
 function curveSethUnstake(_ref22) {
   var comptrollerProxy = _ref22.comptrollerProxy,
@@ -1515,14 +2036,14 @@ function curveSethUnstake(_ref22) {
       fundOwner = _ref22.fundOwner,
       curveLiquiditySethAdapter = _ref22.curveLiquiditySethAdapter,
       outgoingLiquidityGaugeTokenAmount = _ref22.outgoingLiquidityGaugeTokenAmount;
-  var callArgs = protocol$1.callOnIntegrationArgs({
+  var callArgs = protocol.callOnIntegrationArgs({
     adapter: curveLiquiditySethAdapter,
-    selector: protocol$1.unstakeSelector,
-    encodedCallArgs: protocol$1.curveSethUnstakeArgs({
+    encodedCallArgs: protocol.curveSethUnstakeArgs({
       outgoingLiquidityGaugeTokenAmount: outgoingLiquidityGaugeTokenAmount
-    })
+    }),
+    selector: protocol.unstakeSelector
   });
-  return comptrollerProxy.connect(fundOwner).callOnExtension(integrationManager, protocol$1.IntegrationManagerActionId.CallOnIntegration, callArgs);
+  return comptrollerProxy.connect(fundOwner).callOnExtension(integrationManager, protocol.IntegrationManagerActionId.CallOnIntegration, callArgs);
 } // stETH pool
 
 function curveStethClaimRewards(_ref23) {
@@ -1530,12 +2051,12 @@ function curveStethClaimRewards(_ref23) {
       integrationManager = _ref23.integrationManager,
       fundOwner = _ref23.fundOwner,
       curveLiquidityStethAdapter = _ref23.curveLiquidityStethAdapter;
-  var callArgs = protocol$1.callOnIntegrationArgs({
+  var callArgs = protocol.callOnIntegrationArgs({
     adapter: curveLiquidityStethAdapter,
-    selector: protocol$1.claimRewardsSelector,
-    encodedCallArgs: ethers.constants.HashZero
+    encodedCallArgs: ethers.constants.HashZero,
+    selector: protocol.claimRewardsSelector
   });
-  return comptrollerProxy.connect(fundOwner).callOnExtension(integrationManager, protocol$1.IntegrationManagerActionId.CallOnIntegration, callArgs);
+  return comptrollerProxy.connect(fundOwner).callOnExtension(integrationManager, protocol.IntegrationManagerActionId.CallOnIntegration, callArgs);
 }
 function curveStethLend(_ref24) {
   var comptrollerProxy = _ref24.comptrollerProxy,
@@ -1545,16 +2066,16 @@ function curveStethLend(_ref24) {
       outgoingWethAmount = _ref24.outgoingWethAmount,
       outgoingStethAmount = _ref24.outgoingStethAmount,
       minIncomingLPTokenAmount = _ref24.minIncomingLPTokenAmount;
-  var callArgs = protocol$1.callOnIntegrationArgs({
+  var callArgs = protocol.callOnIntegrationArgs({
     adapter: curveLiquidityStethAdapter,
-    selector: protocol$1.lendSelector,
-    encodedCallArgs: protocol$1.curveStethLendArgs({
-      outgoingWethAmount: outgoingWethAmount,
+    encodedCallArgs: protocol.curveStethLendArgs({
+      minIncomingLPTokenAmount: minIncomingLPTokenAmount,
       outgoingStethAmount: outgoingStethAmount,
-      minIncomingLPTokenAmount: minIncomingLPTokenAmount
-    })
+      outgoingWethAmount: outgoingWethAmount
+    }),
+    selector: protocol.lendSelector
   });
-  return comptrollerProxy.connect(fundOwner).callOnExtension(integrationManager, protocol$1.IntegrationManagerActionId.CallOnIntegration, callArgs);
+  return comptrollerProxy.connect(fundOwner).callOnExtension(integrationManager, protocol.IntegrationManagerActionId.CallOnIntegration, callArgs);
 }
 function curveStethLendAndStake(_ref25) {
   var comptrollerProxy = _ref25.comptrollerProxy,
@@ -1564,16 +2085,16 @@ function curveStethLendAndStake(_ref25) {
       outgoingWethAmount = _ref25.outgoingWethAmount,
       outgoingStethAmount = _ref25.outgoingStethAmount,
       minIncomingLiquidityGaugeTokenAmount = _ref25.minIncomingLiquidityGaugeTokenAmount;
-  var callArgs = protocol$1.callOnIntegrationArgs({
+  var callArgs = protocol.callOnIntegrationArgs({
     adapter: curveLiquidityStethAdapter,
-    selector: protocol$1.lendAndStakeSelector,
-    encodedCallArgs: protocol$1.curveStethLendAndStakeArgs({
-      outgoingWethAmount: outgoingWethAmount,
+    encodedCallArgs: protocol.curveStethLendAndStakeArgs({
+      minIncomingLiquidityGaugeTokenAmount: minIncomingLiquidityGaugeTokenAmount,
       outgoingStethAmount: outgoingStethAmount,
-      minIncomingLiquidityGaugeTokenAmount: minIncomingLiquidityGaugeTokenAmount
-    })
+      outgoingWethAmount: outgoingWethAmount
+    }),
+    selector: protocol.lendAndStakeSelector
   });
-  return comptrollerProxy.connect(fundOwner).callOnExtension(integrationManager, protocol$1.IntegrationManagerActionId.CallOnIntegration, callArgs);
+  return comptrollerProxy.connect(fundOwner).callOnExtension(integrationManager, protocol.IntegrationManagerActionId.CallOnIntegration, callArgs);
 }
 function curveStethRedeem(_ref26) {
   var comptrollerProxy = _ref26.comptrollerProxy,
@@ -1584,17 +2105,17 @@ function curveStethRedeem(_ref26) {
       minIncomingWethAmount = _ref26.minIncomingWethAmount,
       minIncomingStethAmount = _ref26.minIncomingStethAmount,
       receiveSingleAsset = _ref26.receiveSingleAsset;
-  var callArgs = protocol$1.callOnIntegrationArgs({
+  var callArgs = protocol.callOnIntegrationArgs({
     adapter: curveLiquidityStethAdapter,
-    selector: protocol$1.redeemSelector,
-    encodedCallArgs: protocol$1.curveStethRedeemArgs({
-      outgoingLPTokenAmount: outgoingLPTokenAmount,
-      minIncomingWethAmount: minIncomingWethAmount,
+    encodedCallArgs: protocol.curveStethRedeemArgs({
       minIncomingStethAmount: minIncomingStethAmount,
+      minIncomingWethAmount: minIncomingWethAmount,
+      outgoingLPTokenAmount: outgoingLPTokenAmount,
       receiveSingleAsset: receiveSingleAsset
-    })
+    }),
+    selector: protocol.redeemSelector
   });
-  return comptrollerProxy.connect(fundOwner).callOnExtension(integrationManager, protocol$1.IntegrationManagerActionId.CallOnIntegration, callArgs);
+  return comptrollerProxy.connect(fundOwner).callOnExtension(integrationManager, protocol.IntegrationManagerActionId.CallOnIntegration, callArgs);
 }
 function curveStethStake(_ref27) {
   var comptrollerProxy = _ref27.comptrollerProxy,
@@ -1602,14 +2123,14 @@ function curveStethStake(_ref27) {
       fundOwner = _ref27.fundOwner,
       curveLiquidityStethAdapter = _ref27.curveLiquidityStethAdapter,
       outgoingLPTokenAmount = _ref27.outgoingLPTokenAmount;
-  var callArgs = protocol$1.callOnIntegrationArgs({
+  var callArgs = protocol.callOnIntegrationArgs({
     adapter: curveLiquidityStethAdapter,
-    selector: protocol$1.stakeSelector,
-    encodedCallArgs: protocol$1.curveStethStakeArgs({
+    encodedCallArgs: protocol.curveStethStakeArgs({
       outgoingLPTokenAmount: outgoingLPTokenAmount
-    })
+    }),
+    selector: protocol.stakeSelector
   });
-  return comptrollerProxy.connect(fundOwner).callOnExtension(integrationManager, protocol$1.IntegrationManagerActionId.CallOnIntegration, callArgs);
+  return comptrollerProxy.connect(fundOwner).callOnExtension(integrationManager, protocol.IntegrationManagerActionId.CallOnIntegration, callArgs);
 }
 function curveStethUnstakeAndRedeem(_ref28) {
   var comptrollerProxy = _ref28.comptrollerProxy,
@@ -1620,17 +2141,17 @@ function curveStethUnstakeAndRedeem(_ref28) {
       minIncomingWethAmount = _ref28.minIncomingWethAmount,
       minIncomingStethAmount = _ref28.minIncomingStethAmount,
       receiveSingleAsset = _ref28.receiveSingleAsset;
-  var callArgs = protocol$1.callOnIntegrationArgs({
+  var callArgs = protocol.callOnIntegrationArgs({
     adapter: curveLiquidityStethAdapter,
-    selector: protocol$1.unstakeAndRedeemSelector,
-    encodedCallArgs: protocol$1.curveStethUnstakeAndRedeemArgs({
-      outgoingLiquidityGaugeTokenAmount: outgoingLiquidityGaugeTokenAmount,
-      minIncomingWethAmount: minIncomingWethAmount,
+    encodedCallArgs: protocol.curveStethUnstakeAndRedeemArgs({
       minIncomingStethAmount: minIncomingStethAmount,
+      minIncomingWethAmount: minIncomingWethAmount,
+      outgoingLiquidityGaugeTokenAmount: outgoingLiquidityGaugeTokenAmount,
       receiveSingleAsset: receiveSingleAsset
-    })
+    }),
+    selector: protocol.unstakeAndRedeemSelector
   });
-  return comptrollerProxy.connect(fundOwner).callOnExtension(integrationManager, protocol$1.IntegrationManagerActionId.CallOnIntegration, callArgs);
+  return comptrollerProxy.connect(fundOwner).callOnExtension(integrationManager, protocol.IntegrationManagerActionId.CallOnIntegration, callArgs);
 }
 function curveStethUnstake(_ref29) {
   var comptrollerProxy = _ref29.comptrollerProxy,
@@ -1638,14 +2159,14 @@ function curveStethUnstake(_ref29) {
       fundOwner = _ref29.fundOwner,
       curveLiquidityStethAdapter = _ref29.curveLiquidityStethAdapter,
       outgoingLiquidityGaugeTokenAmount = _ref29.outgoingLiquidityGaugeTokenAmount;
-  var callArgs = protocol$1.callOnIntegrationArgs({
+  var callArgs = protocol.callOnIntegrationArgs({
     adapter: curveLiquidityStethAdapter,
-    selector: protocol$1.unstakeSelector,
-    encodedCallArgs: protocol$1.curveStethUnstakeArgs({
+    encodedCallArgs: protocol.curveStethUnstakeArgs({
       outgoingLiquidityGaugeTokenAmount: outgoingLiquidityGaugeTokenAmount
-    })
+    }),
+    selector: protocol.unstakeSelector
   });
-  return comptrollerProxy.connect(fundOwner).callOnExtension(integrationManager, protocol$1.IntegrationManagerActionId.CallOnIntegration, callArgs);
+  return comptrollerProxy.connect(fundOwner).callOnExtension(integrationManager, protocol.IntegrationManagerActionId.CallOnIntegration, callArgs);
 }
 
 function idleClaimRewards(_x) {
@@ -1660,14 +2181,14 @@ function _idleClaimRewards() {
         switch (_context.prev = _context.next) {
           case 0:
             comptrollerProxy = _ref.comptrollerProxy, integrationManager = _ref.integrationManager, fundOwner = _ref.fundOwner, idleAdapter = _ref.idleAdapter, idleToken = _ref.idleToken;
-            callArgs = protocol$1.callOnIntegrationArgs({
+            callArgs = protocol.callOnIntegrationArgs({
               adapter: idleAdapter,
-              selector: protocol$1.claimRewardsSelector,
-              encodedCallArgs: protocol$1.idleClaimRewardsArgs({
+              encodedCallArgs: protocol.idleClaimRewardsArgs({
                 idleToken: idleToken
-              })
+              }),
+              selector: protocol.claimRewardsSelector
             });
-            return _context.abrupt("return", comptrollerProxy.connect(fundOwner).callOnExtension(integrationManager, protocol$1.IntegrationManagerActionId.CallOnIntegration, callArgs));
+            return _context.abrupt("return", comptrollerProxy.connect(fundOwner).callOnExtension(integrationManager, protocol.IntegrationManagerActionId.CallOnIntegration, callArgs));
 
           case 3:
           case "end":
@@ -1692,16 +2213,16 @@ function _idleLend() {
         switch (_context2.prev = _context2.next) {
           case 0:
             comptrollerProxy = _ref2.comptrollerProxy, integrationManager = _ref2.integrationManager, fundOwner = _ref2.fundOwner, idleAdapter = _ref2.idleAdapter, idleToken = _ref2.idleToken, outgoingUnderlyingAmount = _ref2.outgoingUnderlyingAmount, _ref2$minIncomingIdle = _ref2.minIncomingIdleTokenAmount, minIncomingIdleTokenAmount = _ref2$minIncomingIdle === void 0 ? ethers.BigNumber.from(1) : _ref2$minIncomingIdle;
-            callArgs = protocol$1.callOnIntegrationArgs({
+            callArgs = protocol.callOnIntegrationArgs({
               adapter: idleAdapter,
-              selector: protocol$1.lendSelector,
-              encodedCallArgs: protocol$1.idleLendArgs({
+              encodedCallArgs: protocol.idleLendArgs({
                 idleToken: idleToken,
-                outgoingUnderlyingAmount: outgoingUnderlyingAmount,
-                minIncomingIdleTokenAmount: minIncomingIdleTokenAmount
-              })
+                minIncomingIdleTokenAmount: minIncomingIdleTokenAmount,
+                outgoingUnderlyingAmount: outgoingUnderlyingAmount
+              }),
+              selector: protocol.lendSelector
             });
-            return _context2.abrupt("return", comptrollerProxy.connect(fundOwner).callOnExtension(integrationManager, protocol$1.IntegrationManagerActionId.CallOnIntegration, callArgs));
+            return _context2.abrupt("return", comptrollerProxy.connect(fundOwner).callOnExtension(integrationManager, protocol.IntegrationManagerActionId.CallOnIntegration, callArgs));
 
           case 3:
           case "end":
@@ -1726,16 +2247,16 @@ function _idleRedeem() {
         switch (_context3.prev = _context3.next) {
           case 0:
             comptrollerProxy = _ref3.comptrollerProxy, integrationManager = _ref3.integrationManager, fundOwner = _ref3.fundOwner, idleAdapter = _ref3.idleAdapter, idleToken = _ref3.idleToken, outgoingIdleTokenAmount = _ref3.outgoingIdleTokenAmount, _ref3$minIncomingUnde = _ref3.minIncomingUnderlyingAmount, minIncomingUnderlyingAmount = _ref3$minIncomingUnde === void 0 ? ethers.BigNumber.from(1) : _ref3$minIncomingUnde;
-            callArgs = protocol$1.callOnIntegrationArgs({
+            callArgs = protocol.callOnIntegrationArgs({
               adapter: idleAdapter,
-              selector: protocol$1.redeemSelector,
-              encodedCallArgs: protocol$1.idleRedeemArgs({
+              encodedCallArgs: protocol.idleRedeemArgs({
                 idleToken: idleToken,
-                outgoingIdleTokenAmount: outgoingIdleTokenAmount,
-                minIncomingUnderlyingAmount: minIncomingUnderlyingAmount
-              })
+                minIncomingUnderlyingAmount: minIncomingUnderlyingAmount,
+                outgoingIdleTokenAmount: outgoingIdleTokenAmount
+              }),
+              selector: protocol.redeemSelector
             });
-            return _context3.abrupt("return", comptrollerProxy.connect(fundOwner).callOnExtension(integrationManager, protocol$1.IntegrationManagerActionId.CallOnIntegration, callArgs));
+            return _context3.abrupt("return", comptrollerProxy.connect(fundOwner).callOnExtension(integrationManager, protocol.IntegrationManagerActionId.CallOnIntegration, callArgs));
 
           case 3:
           case "end":
@@ -1747,11 +2268,11 @@ function _idleRedeem() {
   return _idleRedeem.apply(this, arguments);
 }
 
-var mockGenericRemoveOnlySelector = protocol$1.sighash(ethers.utils.FunctionFragment.fromString('removeOnly(address,bytes,bytes)'));
-var mockGenericSwapASelector = protocol$1.sighash(ethers.utils.FunctionFragment.fromString('swapA(address,bytes,bytes)'));
-var mockGenericSwapBSelector = protocol$1.sighash(ethers.utils.FunctionFragment.fromString('swapB(address,bytes,bytes)'));
-var mockGenericSwapDirectFromVaultSelector = protocol$1.sighash(ethers.utils.FunctionFragment.fromString('swapDirectFromVault(address,bytes,bytes)'));
-var mockGenericSwapViaApprovalSelector = protocol$1.sighash(ethers.utils.FunctionFragment.fromString('swapViaApproval(address,bytes,bytes)'));
+var mockGenericRemoveOnlySelector = protocol.sighash(ethers.utils.FunctionFragment.fromString('removeOnly(address,bytes,bytes)'));
+var mockGenericSwapASelector = protocol.sighash(ethers.utils.FunctionFragment.fromString('swapA(address,bytes,bytes)'));
+var mockGenericSwapBSelector = protocol.sighash(ethers.utils.FunctionFragment.fromString('swapB(address,bytes,bytes)'));
+var mockGenericSwapDirectFromVaultSelector = protocol.sighash(ethers.utils.FunctionFragment.fromString('swapDirectFromVault(address,bytes,bytes)'));
+var mockGenericSwapViaApprovalSelector = protocol.sighash(ethers.utils.FunctionFragment.fromString('swapViaApproval(address,bytes,bytes)'));
 function mockGenericSwapArgs(_ref) {
   var _ref$spendAssets = _ref.spendAssets,
       spendAssets = _ref$spendAssets === void 0 ? [] : _ref$spendAssets,
@@ -1765,7 +2286,7 @@ function mockGenericSwapArgs(_ref) {
       actualIncomingAssetAmounts = _ref$actualIncomingAs === void 0 ? [] : _ref$actualIncomingAs,
       _ref$minIncomingAsset = _ref.minIncomingAssetAmounts,
       minIncomingAssetAmounts = _ref$minIncomingAsset === void 0 ? actualIncomingAssetAmounts : _ref$minIncomingAsset;
-  return protocol$1.encodeArgs(['address[]', 'uint256[]', 'uint256[]', 'address[]', 'uint256[]', 'uint256[]'], [spendAssets, maxSpendAssetAmounts, actualSpendAssetAmounts, incomingAssets, minIncomingAssetAmounts, actualIncomingAssetAmounts]);
+  return protocol.encodeArgs(['address[]', 'uint256[]', 'uint256[]', 'address[]', 'uint256[]', 'uint256[]'], [spendAssets, maxSpendAssetAmounts, actualSpendAssetAmounts, incomingAssets, minIncomingAssetAmounts, actualIncomingAssetAmounts]);
 }
 function mockGenericSwap(_x) {
   return _mockGenericSwap.apply(this, arguments);
@@ -1804,19 +2325,19 @@ function _mockGenericSwap() {
 
           case 9:
             swapArgs = mockGenericSwapArgs({
-              spendAssets: spendAssets,
-              maxSpendAssetAmounts: maxSpendAssetAmounts,
+              actualIncomingAssetAmounts: actualIncomingAssetAmounts,
               actualSpendAssetAmounts: actualSpendAssetAmounts,
               incomingAssets: incomingAssets,
+              maxSpendAssetAmounts: maxSpendAssetAmounts,
               minIncomingAssetAmounts: minIncomingAssetAmounts,
-              actualIncomingAssetAmounts: actualIncomingAssetAmounts
+              spendAssets: spendAssets
             });
-            callArgs = protocol$1.callOnIntegrationArgs({
+            callArgs = protocol.callOnIntegrationArgs({
               adapter: mockGenericAdapter,
-              selector: selector,
-              encodedCallArgs: swapArgs
+              encodedCallArgs: swapArgs,
+              selector: selector
             });
-            swapTx = comptrollerProxy.connect(fundOwner).callOnExtension(integrationManager, protocol$1.IntegrationManagerActionId.CallOnIntegration, callArgs);
+            swapTx = comptrollerProxy.connect(fundOwner).callOnExtension(integrationManager, protocol.IntegrationManagerActionId.CallOnIntegration, callArgs);
             _context.next = 14;
             return expect(swapTx).resolves.toBeReceipt();
 
@@ -1837,10 +2358,10 @@ function paraSwapV4GenerateDummyPaths(_ref) {
   var toTokens = _ref.toTokens;
   return toTokens.map(function (toToken) {
     return {
-      to: toToken,
-      totalNetworkFee: 0,
       // Not supported in our protocol
-      routes: [] // Can ignore this param in the dummy
+      routes: [],
+      to: toToken,
+      totalNetworkFee: 0 // Can ignore this param in the dummy
 
     };
   });
@@ -1858,19 +2379,19 @@ function _paraSwapV4TakeOrder() {
         switch (_context.prev = _context.next) {
           case 0:
             comptrollerProxy = _ref2.comptrollerProxy, integrationManager = _ref2.integrationManager, fundOwner = _ref2.fundOwner, paraSwapV4Adapter = _ref2.paraSwapV4Adapter, outgoingAsset = _ref2.outgoingAsset, _ref2$outgoingAssetAm = _ref2.outgoingAssetAmount, outgoingAssetAmount = _ref2$outgoingAssetAm === void 0 ? ethers.utils.parseEther('1') : _ref2$outgoingAssetAm, _ref2$minIncomingAsse = _ref2.minIncomingAssetAmount, minIncomingAssetAmount = _ref2$minIncomingAsse === void 0 ? 1 : _ref2$minIncomingAsse, _ref2$expectedIncomin = _ref2.expectedIncomingAssetAmount, expectedIncomingAssetAmount = _ref2$expectedIncomin === void 0 ? minIncomingAssetAmount : _ref2$expectedIncomin, paths = _ref2.paths;
-            takeOrderArgs = protocol$1.paraSwapV4TakeOrderArgs({
-              minIncomingAssetAmount: minIncomingAssetAmount,
+            takeOrderArgs = protocol.paraSwapV4TakeOrderArgs({
               expectedIncomingAssetAmount: expectedIncomingAssetAmount,
+              minIncomingAssetAmount: minIncomingAssetAmount,
               outgoingAsset: outgoingAsset,
               outgoingAssetAmount: outgoingAssetAmount,
               paths: paths
             });
-            callArgs = protocol$1.callOnIntegrationArgs({
+            callArgs = protocol.callOnIntegrationArgs({
               adapter: paraSwapV4Adapter,
-              selector: protocol$1.takeOrderSelector,
-              encodedCallArgs: takeOrderArgs
+              encodedCallArgs: takeOrderArgs,
+              selector: protocol.takeOrderSelector
             });
-            return _context.abrupt("return", comptrollerProxy.connect(fundOwner).callOnExtension(integrationManager, protocol$1.IntegrationManagerActionId.CallOnIntegration, callArgs));
+            return _context.abrupt("return", comptrollerProxy.connect(fundOwner).callOnExtension(integrationManager, protocol.IntegrationManagerActionId.CallOnIntegration, callArgs));
 
           case 4:
           case "end":
@@ -1882,6 +2403,161 @@ function _paraSwapV4TakeOrder() {
   return _paraSwapV4TakeOrder.apply(this, arguments);
 }
 
+function paraSwapV5GenerateDummyPaths(_ref) {
+  var toTokens = _ref.toTokens;
+  return toTokens.map(function (toToken) {
+    return {
+      // Not supported in our protocol
+      adapters: [],
+      to: toToken,
+      totalNetworkFee: 0 // Can ignore this param in the dummy
+
+    };
+  });
+}
+function paraSwapV5TakeOrder(_x) {
+  return _paraSwapV5TakeOrder.apply(this, arguments);
+}
+
+function _paraSwapV5TakeOrder() {
+  _paraSwapV5TakeOrder = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime__default['default'].mark(function _callee(_ref2) {
+    var comptrollerProxy, integrationManager, fundOwner, paraSwapV5Adapter, outgoingAsset, outgoingAssetAmount, _ref2$minIncomingAsse, minIncomingAssetAmount, _ref2$expectedIncomin, expectedIncomingAssetAmount, _ref2$uuid, uuid, paths, takeOrderArgs, callArgs;
+
+    return _regeneratorRuntime__default['default'].wrap(function _callee$(_context) {
+      while (1) {
+        switch (_context.prev = _context.next) {
+          case 0:
+            comptrollerProxy = _ref2.comptrollerProxy, integrationManager = _ref2.integrationManager, fundOwner = _ref2.fundOwner, paraSwapV5Adapter = _ref2.paraSwapV5Adapter, outgoingAsset = _ref2.outgoingAsset, outgoingAssetAmount = _ref2.outgoingAssetAmount, _ref2$minIncomingAsse = _ref2.minIncomingAssetAmount, minIncomingAssetAmount = _ref2$minIncomingAsse === void 0 ? 1 : _ref2$minIncomingAsse, _ref2$expectedIncomin = _ref2.expectedIncomingAssetAmount, expectedIncomingAssetAmount = _ref2$expectedIncomin === void 0 ? minIncomingAssetAmount : _ref2$expectedIncomin, _ref2$uuid = _ref2.uuid, uuid = _ref2$uuid === void 0 ? ethers.utils.randomBytes(16) : _ref2$uuid, paths = _ref2.paths;
+            takeOrderArgs = protocol.paraSwapV5TakeOrderArgs({
+              expectedIncomingAssetAmount: expectedIncomingAssetAmount,
+              minIncomingAssetAmount: minIncomingAssetAmount,
+              outgoingAsset: outgoingAsset,
+              outgoingAssetAmount: outgoingAssetAmount,
+              paths: paths,
+              uuid: uuid
+            });
+            callArgs = protocol.callOnIntegrationArgs({
+              adapter: paraSwapV5Adapter,
+              encodedCallArgs: takeOrderArgs,
+              selector: protocol.takeOrderSelector
+            });
+            return _context.abrupt("return", comptrollerProxy.connect(fundOwner).callOnExtension(integrationManager, protocol.IntegrationManagerActionId.CallOnIntegration, callArgs));
+
+          case 4:
+          case "end":
+            return _context.stop();
+        }
+      }
+    }, _callee);
+  }));
+  return _paraSwapV5TakeOrder.apply(this, arguments);
+}
+
+function poolTogetherV4Lend(_x) {
+  return _poolTogetherV4Lend.apply(this, arguments);
+}
+
+function _poolTogetherV4Lend() {
+  _poolTogetherV4Lend = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime__default['default'].mark(function _callee(_ref) {
+    var comptrollerProxy, integrationManager, fundOwner, poolTogetherV4Adapter, ptToken, _ref$amount, amount, lendArgs, callArgs, lendTx;
+
+    return _regeneratorRuntime__default['default'].wrap(function _callee$(_context) {
+      while (1) {
+        switch (_context.prev = _context.next) {
+          case 0:
+            comptrollerProxy = _ref.comptrollerProxy, integrationManager = _ref.integrationManager, fundOwner = _ref.fundOwner, poolTogetherV4Adapter = _ref.poolTogetherV4Adapter, ptToken = _ref.ptToken, _ref$amount = _ref.amount, amount = _ref$amount === void 0 ? ethers.utils.parseEther('1') : _ref$amount;
+            lendArgs = protocol.poolTogetherV4LendArgs({
+              amount: amount,
+              ptToken: ptToken
+            });
+            callArgs = protocol.callOnIntegrationArgs({
+              adapter: poolTogetherV4Adapter,
+              encodedCallArgs: lendArgs,
+              selector: protocol.lendSelector
+            });
+            lendTx = comptrollerProxy.connect(fundOwner).callOnExtension(integrationManager, protocol.IntegrationManagerActionId.CallOnIntegration, callArgs);
+            return _context.abrupt("return", lendTx);
+
+          case 5:
+          case "end":
+            return _context.stop();
+        }
+      }
+    }, _callee);
+  }));
+  return _poolTogetherV4Lend.apply(this, arguments);
+}
+
+function poolTogetherV4Redeem(_x2) {
+  return _poolTogetherV4Redeem.apply(this, arguments);
+}
+
+function _poolTogetherV4Redeem() {
+  _poolTogetherV4Redeem = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime__default['default'].mark(function _callee2(_ref2) {
+    var comptrollerProxy, integrationManager, fundOwner, poolTogetherV4Adapter, ptToken, _ref2$amount, amount, redeemArgs, callArgs, redeemTx;
+
+    return _regeneratorRuntime__default['default'].wrap(function _callee2$(_context2) {
+      while (1) {
+        switch (_context2.prev = _context2.next) {
+          case 0:
+            comptrollerProxy = _ref2.comptrollerProxy, integrationManager = _ref2.integrationManager, fundOwner = _ref2.fundOwner, poolTogetherV4Adapter = _ref2.poolTogetherV4Adapter, ptToken = _ref2.ptToken, _ref2$amount = _ref2.amount, amount = _ref2$amount === void 0 ? ethers.utils.parseEther('1') : _ref2$amount;
+            redeemArgs = protocol.poolTogetherV4RedeemArgs({
+              amount: amount,
+              ptToken: ptToken
+            });
+            callArgs = protocol.callOnIntegrationArgs({
+              adapter: poolTogetherV4Adapter,
+              encodedCallArgs: redeemArgs,
+              selector: protocol.redeemSelector
+            });
+            redeemTx = comptrollerProxy.connect(fundOwner).callOnExtension(integrationManager, protocol.IntegrationManagerActionId.CallOnIntegration, callArgs);
+            return _context2.abrupt("return", redeemTx);
+
+          case 5:
+          case "end":
+            return _context2.stop();
+        }
+      }
+    }, _callee2);
+  }));
+  return _poolTogetherV4Redeem.apply(this, arguments);
+}
+
+function poolTogetherV4ClaimRewards(_x3) {
+  return _poolTogetherV4ClaimRewards.apply(this, arguments);
+}
+
+function _poolTogetherV4ClaimRewards() {
+  _poolTogetherV4ClaimRewards = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime__default['default'].mark(function _callee3(_ref3) {
+    var comptrollerProxy, integrationManager, fundOwner, poolTogetherV4Adapter, prizeDistributor, drawIds, winningPicks, claimRewardsArgs, callArgs, claimTx;
+    return _regeneratorRuntime__default['default'].wrap(function _callee3$(_context3) {
+      while (1) {
+        switch (_context3.prev = _context3.next) {
+          case 0:
+            comptrollerProxy = _ref3.comptrollerProxy, integrationManager = _ref3.integrationManager, fundOwner = _ref3.fundOwner, poolTogetherV4Adapter = _ref3.poolTogetherV4Adapter, prizeDistributor = _ref3.prizeDistributor, drawIds = _ref3.drawIds, winningPicks = _ref3.winningPicks;
+            claimRewardsArgs = protocol.poolTogetherV4ClaimRewardsArgs({
+              drawIds: drawIds,
+              prizeDistributor: prizeDistributor,
+              winningPicks: winningPicks
+            });
+            callArgs = protocol.callOnIntegrationArgs({
+              adapter: poolTogetherV4Adapter,
+              encodedCallArgs: claimRewardsArgs,
+              selector: protocol.claimRewardsSelector
+            });
+            claimTx = comptrollerProxy.connect(fundOwner).callOnExtension(integrationManager, protocol.IntegrationManagerActionId.CallOnIntegration, callArgs);
+            return _context3.abrupt("return", claimTx);
+
+          case 5:
+          case "end":
+            return _context3.stop();
+        }
+      }
+    }, _callee3);
+  }));
+  return _poolTogetherV4ClaimRewards.apply(this, arguments);
+}
+
 function synthetixAssignExchangeDelegate(_x) {
   return _synthetixAssignExchangeDelegate.apply(this, arguments);
 }
@@ -1903,7 +2579,7 @@ function _synthetixAssignExchangeDelegate() {
           case 3:
             delegateApprovals = _context.sent;
             _context.next = 6;
-            return comptrollerProxy.connect(fundOwner).vaultCallOnContract(delegateApprovals, protocol$1.synthetixAssignExchangeDelegateSelector, protocol$1.encodeArgs(['address'], [delegate]));
+            return comptrollerProxy.connect(fundOwner).vaultCallOnContract(delegateApprovals, protocol.synthetixAssignExchangeDelegateSelector, protocol.encodeArgs(['address'], [delegate]));
 
           case 6:
           case "end":
@@ -1939,52 +2615,84 @@ function _synthetixResolveAddress() {
   return _synthetixResolveAddress.apply(this, arguments);
 }
 
-function synthetixTakeOrder(_x3) {
+function synthetixRedeem(_x3) {
+  return _synthetixRedeem.apply(this, arguments);
+}
+
+function _synthetixRedeem() {
+  _synthetixRedeem = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime__default['default'].mark(function _callee3(_ref3) {
+    var comptrollerProxy, integrationManager, signer, synthetixAdapter, synths, redeemArgs, callArgs;
+    return _regeneratorRuntime__default['default'].wrap(function _callee3$(_context3) {
+      while (1) {
+        switch (_context3.prev = _context3.next) {
+          case 0:
+            comptrollerProxy = _ref3.comptrollerProxy, integrationManager = _ref3.integrationManager, signer = _ref3.signer, synthetixAdapter = _ref3.synthetixAdapter, synths = _ref3.synths;
+            redeemArgs = protocol.synthetixRedeemArgs({
+              synths: synths
+            });
+            callArgs = protocol.callOnIntegrationArgs({
+              adapter: synthetixAdapter,
+              encodedCallArgs: redeemArgs,
+              selector: protocol.redeemSelector
+            });
+            return _context3.abrupt("return", comptrollerProxy.connect(signer).callOnExtension(integrationManager, protocol.IntegrationManagerActionId.CallOnIntegration, callArgs));
+
+          case 4:
+          case "end":
+            return _context3.stop();
+        }
+      }
+    }, _callee3);
+  }));
+  return _synthetixRedeem.apply(this, arguments);
+}
+
+function synthetixTakeOrder(_x4) {
   return _synthetixTakeOrder.apply(this, arguments);
 }
 
 function _synthetixTakeOrder() {
-  _synthetixTakeOrder = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime__default['default'].mark(function _callee3(_ref3) {
-    var comptrollerProxy, vaultProxy, integrationManager, fundOwner, synthetixAdapter, outgoingAsset, _ref3$outgoingAssetAm, outgoingAssetAmount, incomingAsset, _ref3$minIncomingAsse, minIncomingAssetAmount, _ref3$seedFund, seedFund, takeOrderArgs, callArgs;
+  _synthetixTakeOrder = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime__default['default'].mark(function _callee4(_ref4) {
+    var comptrollerProxy, vaultProxy, integrationManager, fundOwner, synthetixAdapter, outgoingAsset, _ref4$outgoingAssetAm, outgoingAssetAmount, incomingAsset, _ref4$minIncomingAsse, minIncomingAssetAmount, _ref4$seedFund, seedFund, takeOrderArgs, callArgs;
 
-    return _regeneratorRuntime__default['default'].wrap(function _callee3$(_context3) {
+    return _regeneratorRuntime__default['default'].wrap(function _callee4$(_context4) {
       while (1) {
-        switch (_context3.prev = _context3.next) {
+        switch (_context4.prev = _context4.next) {
           case 0:
-            comptrollerProxy = _ref3.comptrollerProxy, vaultProxy = _ref3.vaultProxy, integrationManager = _ref3.integrationManager, fundOwner = _ref3.fundOwner, synthetixAdapter = _ref3.synthetixAdapter, outgoingAsset = _ref3.outgoingAsset, _ref3$outgoingAssetAm = _ref3.outgoingAssetAmount, outgoingAssetAmount = _ref3$outgoingAssetAm === void 0 ? ethers.utils.parseEther('1') : _ref3$outgoingAssetAm, incomingAsset = _ref3.incomingAsset, _ref3$minIncomingAsse = _ref3.minIncomingAssetAmount, minIncomingAssetAmount = _ref3$minIncomingAsse === void 0 ? ethers.utils.parseEther('1') : _ref3$minIncomingAsse, _ref3$seedFund = _ref3.seedFund, seedFund = _ref3$seedFund === void 0 ? false : _ref3$seedFund;
+            comptrollerProxy = _ref4.comptrollerProxy, vaultProxy = _ref4.vaultProxy, integrationManager = _ref4.integrationManager, fundOwner = _ref4.fundOwner, synthetixAdapter = _ref4.synthetixAdapter, outgoingAsset = _ref4.outgoingAsset, _ref4$outgoingAssetAm = _ref4.outgoingAssetAmount, outgoingAssetAmount = _ref4$outgoingAssetAm === void 0 ? ethers.utils.parseEther('1') : _ref4$outgoingAssetAm, incomingAsset = _ref4.incomingAsset, _ref4$minIncomingAsse = _ref4.minIncomingAssetAmount, minIncomingAssetAmount = _ref4$minIncomingAsse === void 0 ? ethers.utils.parseEther('1') : _ref4$minIncomingAsse, _ref4$seedFund = _ref4.seedFund, seedFund = _ref4$seedFund === void 0 ? false : _ref4$seedFund;
 
             if (!seedFund) {
-              _context3.next = 4;
+              _context4.next = 4;
               break;
             }
 
-            _context3.next = 4;
+            _context4.next = 4;
             return outgoingAsset.transfer(vaultProxy, outgoingAssetAmount);
 
           case 4:
-            takeOrderArgs = protocol$1.synthetixTakeOrderArgs({
+            takeOrderArgs = protocol.synthetixTakeOrderArgs({
               incomingAsset: incomingAsset,
               minIncomingAssetAmount: minIncomingAssetAmount,
               outgoingAsset: outgoingAsset,
               outgoingAssetAmount: outgoingAssetAmount
             });
-            _context3.next = 7;
-            return protocol$1.callOnIntegrationArgs({
+            _context4.next = 7;
+            return protocol.callOnIntegrationArgs({
               adapter: synthetixAdapter,
-              selector: protocol$1.takeOrderSelector,
-              encodedCallArgs: takeOrderArgs
+              encodedCallArgs: takeOrderArgs,
+              selector: protocol.takeOrderSelector
             });
 
           case 7:
-            callArgs = _context3.sent;
-            return _context3.abrupt("return", comptrollerProxy.connect(fundOwner).callOnExtension(integrationManager, protocol$1.IntegrationManagerActionId.CallOnIntegration, callArgs));
+            callArgs = _context4.sent;
+            return _context4.abrupt("return", comptrollerProxy.connect(fundOwner).callOnExtension(integrationManager, protocol.IntegrationManagerActionId.CallOnIntegration, callArgs));
 
           case 9:
           case "end":
-            return _context3.stop();
+            return _context4.stop();
         }
       }
-    }, _callee3);
+    }, _callee4);
   }));
   return _synthetixTakeOrder.apply(this, arguments);
 }
@@ -1997,13 +2705,13 @@ function uniswapV2Lend(_x) {
 
 function _uniswapV2Lend() {
   _uniswapV2Lend = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime__default['default'].mark(function _callee(_ref) {
-    var comptrollerProxy, vaultProxy, integrationManager, fundOwner, uniswapV2Adapter, tokenA, tokenB, amountADesired, amountBDesired, amountAMin, amountBMin, minPoolTokenAmount, _ref$seedFund, seedFund, lendArgs, callArgs, lendTx;
+    var comptrollerProxy, vaultProxy, integrationManager, fundOwner, uniswapV2LiquidityAdapter, tokenA, tokenB, amountADesired, amountBDesired, amountAMin, amountBMin, minPoolTokenAmount, _ref$seedFund, seedFund, lendArgs, callArgs, lendTx;
 
     return _regeneratorRuntime__default['default'].wrap(function _callee$(_context) {
       while (1) {
         switch (_context.prev = _context.next) {
           case 0:
-            comptrollerProxy = _ref.comptrollerProxy, vaultProxy = _ref.vaultProxy, integrationManager = _ref.integrationManager, fundOwner = _ref.fundOwner, uniswapV2Adapter = _ref.uniswapV2Adapter, tokenA = _ref.tokenA, tokenB = _ref.tokenB, amountADesired = _ref.amountADesired, amountBDesired = _ref.amountBDesired, amountAMin = _ref.amountAMin, amountBMin = _ref.amountBMin, minPoolTokenAmount = _ref.minPoolTokenAmount, _ref$seedFund = _ref.seedFund, seedFund = _ref$seedFund === void 0 ? false : _ref$seedFund;
+            comptrollerProxy = _ref.comptrollerProxy, vaultProxy = _ref.vaultProxy, integrationManager = _ref.integrationManager, fundOwner = _ref.fundOwner, uniswapV2LiquidityAdapter = _ref.uniswapV2LiquidityAdapter, tokenA = _ref.tokenA, tokenB = _ref.tokenB, amountADesired = _ref.amountADesired, amountBDesired = _ref.amountBDesired, amountAMin = _ref.amountAMin, amountBMin = _ref.amountBMin, minPoolTokenAmount = _ref.minPoolTokenAmount, _ref$seedFund = _ref.seedFund, seedFund = _ref$seedFund === void 0 ? false : _ref$seedFund;
 
             if (!seedFund) {
               _context.next = 6;
@@ -2018,21 +2726,21 @@ function _uniswapV2Lend() {
             return tokenB.transfer(vaultProxy, amountBDesired);
 
           case 6:
-            lendArgs = protocol$1.uniswapV2LendArgs({
-              tokenA: tokenA,
-              tokenB: tokenB,
+            lendArgs = protocol.uniswapV2LendArgs({
               amountADesired: amountADesired,
-              amountBDesired: amountBDesired,
               amountAMin: amountAMin,
+              amountBDesired: amountBDesired,
               amountBMin: amountBMin,
-              minPoolTokenAmount: minPoolTokenAmount
+              minPoolTokenAmount: minPoolTokenAmount,
+              tokenA: tokenA,
+              tokenB: tokenB
             });
-            callArgs = protocol$1.callOnIntegrationArgs({
-              adapter: uniswapV2Adapter,
-              selector: protocol$1.lendSelector,
-              encodedCallArgs: lendArgs
+            callArgs = protocol.callOnIntegrationArgs({
+              adapter: uniswapV2LiquidityAdapter,
+              encodedCallArgs: lendArgs,
+              selector: protocol.lendSelector
             });
-            lendTx = comptrollerProxy.connect(fundOwner).callOnExtension(integrationManager, protocol$1.IntegrationManagerActionId.CallOnIntegration, callArgs);
+            lendTx = comptrollerProxy.connect(fundOwner).callOnExtension(integrationManager, protocol.IntegrationManagerActionId.CallOnIntegration, callArgs);
             _context.next = 11;
             return expect(lendTx).resolves.toBeReceipt();
 
@@ -2055,25 +2763,25 @@ function uniswapV2Redeem(_x2) {
 
 function _uniswapV2Redeem() {
   _uniswapV2Redeem = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime__default['default'].mark(function _callee2(_ref2) {
-    var comptrollerProxy, integrationManager, fundOwner, uniswapV2Adapter, poolTokenAmount, tokenA, tokenB, amountAMin, amountBMin, redeemArgs, callArgs, redeemTx;
+    var comptrollerProxy, integrationManager, fundOwner, uniswapV2LiquidityAdapter, poolTokenAmount, tokenA, tokenB, amountAMin, amountBMin, redeemArgs, callArgs, redeemTx;
     return _regeneratorRuntime__default['default'].wrap(function _callee2$(_context2) {
       while (1) {
         switch (_context2.prev = _context2.next) {
           case 0:
-            comptrollerProxy = _ref2.comptrollerProxy, integrationManager = _ref2.integrationManager, fundOwner = _ref2.fundOwner, uniswapV2Adapter = _ref2.uniswapV2Adapter, poolTokenAmount = _ref2.poolTokenAmount, tokenA = _ref2.tokenA, tokenB = _ref2.tokenB, amountAMin = _ref2.amountAMin, amountBMin = _ref2.amountBMin;
-            redeemArgs = protocol$1.uniswapV2RedeemArgs({
+            comptrollerProxy = _ref2.comptrollerProxy, integrationManager = _ref2.integrationManager, fundOwner = _ref2.fundOwner, uniswapV2LiquidityAdapter = _ref2.uniswapV2LiquidityAdapter, poolTokenAmount = _ref2.poolTokenAmount, tokenA = _ref2.tokenA, tokenB = _ref2.tokenB, amountAMin = _ref2.amountAMin, amountBMin = _ref2.amountBMin;
+            redeemArgs = protocol.uniswapV2RedeemArgs({
+              amountAMin: amountAMin,
+              amountBMin: amountBMin,
               poolTokenAmount: poolTokenAmount,
               tokenA: tokenA,
-              tokenB: tokenB,
-              amountAMin: amountAMin,
-              amountBMin: amountBMin
+              tokenB: tokenB
             });
-            callArgs = protocol$1.callOnIntegrationArgs({
-              adapter: uniswapV2Adapter,
-              selector: protocol$1.redeemSelector,
-              encodedCallArgs: redeemArgs
+            callArgs = protocol.callOnIntegrationArgs({
+              adapter: uniswapV2LiquidityAdapter,
+              encodedCallArgs: redeemArgs,
+              selector: protocol.redeemSelector
             });
-            redeemTx = comptrollerProxy.connect(fundOwner).callOnExtension(integrationManager, protocol$1.IntegrationManagerActionId.CallOnIntegration, callArgs);
+            redeemTx = comptrollerProxy.connect(fundOwner).callOnExtension(integrationManager, protocol.IntegrationManagerActionId.CallOnIntegration, callArgs);
             _context2.next = 6;
             return expect(redeemTx).resolves.toBeReceipt();
 
@@ -2096,13 +2804,13 @@ function uniswapV2TakeOrder(_x3) {
 
 function _uniswapV2TakeOrder() {
   _uniswapV2TakeOrder = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime__default['default'].mark(function _callee3(_ref3) {
-    var comptrollerProxy, vaultProxy, integrationManager, fundOwner, uniswapV2Adapter, path, outgoingAssetAmount, minIncomingAssetAmount, _ref3$seedFund, seedFund, takeOrderArgs, callArgs;
+    var comptrollerProxy, vaultProxy, integrationManager, fundOwner, uniswapV2ExchangeAdapter, path, outgoingAssetAmount, minIncomingAssetAmount, _ref3$seedFund, seedFund, takeOrderArgs, callArgs;
 
     return _regeneratorRuntime__default['default'].wrap(function _callee3$(_context3) {
       while (1) {
         switch (_context3.prev = _context3.next) {
           case 0:
-            comptrollerProxy = _ref3.comptrollerProxy, vaultProxy = _ref3.vaultProxy, integrationManager = _ref3.integrationManager, fundOwner = _ref3.fundOwner, uniswapV2Adapter = _ref3.uniswapV2Adapter, path = _ref3.path, outgoingAssetAmount = _ref3.outgoingAssetAmount, minIncomingAssetAmount = _ref3.minIncomingAssetAmount, _ref3$seedFund = _ref3.seedFund, seedFund = _ref3$seedFund === void 0 ? false : _ref3$seedFund;
+            comptrollerProxy = _ref3.comptrollerProxy, vaultProxy = _ref3.vaultProxy, integrationManager = _ref3.integrationManager, fundOwner = _ref3.fundOwner, uniswapV2ExchangeAdapter = _ref3.uniswapV2ExchangeAdapter, path = _ref3.path, outgoingAssetAmount = _ref3.outgoingAssetAmount, minIncomingAssetAmount = _ref3.minIncomingAssetAmount, _ref3$seedFund = _ref3.seedFund, seedFund = _ref3$seedFund === void 0 ? false : _ref3$seedFund;
 
             if (!seedFund) {
               _context3.next = 4;
@@ -2113,17 +2821,17 @@ function _uniswapV2TakeOrder() {
             return path[0].transfer(vaultProxy, outgoingAssetAmount);
 
           case 4:
-            takeOrderArgs = protocol$1.uniswapV2TakeOrderArgs({
-              path: path,
+            takeOrderArgs = protocol.uniswapV2TakeOrderArgs({
+              minIncomingAssetAmount: minIncomingAssetAmount,
               outgoingAssetAmount: outgoingAssetAmount,
-              minIncomingAssetAmount: minIncomingAssetAmount
+              path: path
             });
-            callArgs = protocol$1.callOnIntegrationArgs({
-              adapter: uniswapV2Adapter,
-              selector: protocol$1.takeOrderSelector,
-              encodedCallArgs: takeOrderArgs
+            callArgs = protocol.callOnIntegrationArgs({
+              adapter: uniswapV2ExchangeAdapter,
+              encodedCallArgs: takeOrderArgs,
+              selector: protocol.takeOrderSelector
             });
-            return _context3.abrupt("return", comptrollerProxy.connect(fundOwner).callOnExtension(integrationManager, protocol$1.IntegrationManagerActionId.CallOnIntegration, callArgs));
+            return _context3.abrupt("return", comptrollerProxy.connect(fundOwner).callOnExtension(integrationManager, protocol.IntegrationManagerActionId.CallOnIntegration, callArgs));
 
           case 7:
           case "end":
@@ -2141,7 +2849,7 @@ function uniswapV3TakeOrder(_x) {
 
 function _uniswapV3TakeOrder() {
   _uniswapV3TakeOrder = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime__default['default'].mark(function _callee(_ref) {
-    var comptrollerProxy, integrationManager, fundOwner, uniswapV3Adapter, pathAddresses, pathFees, outgoingAssetAmount, _ref$minIncomingAsset, minIncomingAssetAmount, _ref$seedFund, seedFund, takeOrderArgs, callArgs;
+    var comptrollerProxy, integrationManager, fundOwner, uniswapV3Adapter, pathAddresses, pathFees, outgoingAssetAmount, _ref$minIncomingAsset, minIncomingAssetAmount, _ref$seedFund, seedFund, vaultProxy, takeOrderArgs, callArgs;
 
     return _regeneratorRuntime__default['default'].wrap(function _callee$(_context) {
       while (1) {
@@ -2150,35 +2858,33 @@ function _uniswapV3TakeOrder() {
             comptrollerProxy = _ref.comptrollerProxy, integrationManager = _ref.integrationManager, fundOwner = _ref.fundOwner, uniswapV3Adapter = _ref.uniswapV3Adapter, pathAddresses = _ref.pathAddresses, pathFees = _ref.pathFees, outgoingAssetAmount = _ref.outgoingAssetAmount, _ref$minIncomingAsset = _ref.minIncomingAssetAmount, minIncomingAssetAmount = _ref$minIncomingAsset === void 0 ? 1 : _ref$minIncomingAsset, _ref$seedFund = _ref.seedFund, seedFund = _ref$seedFund === void 0 ? false : _ref$seedFund;
 
             if (!seedFund) {
-              _context.next = 9;
+              _context.next = 7;
               break;
             }
 
-            _context.t0 = pathAddresses[0];
-            _context.next = 5;
+            _context.next = 4;
             return comptrollerProxy.getVaultProxy();
 
-          case 5:
-            _context.t1 = _context.sent;
-            _context.t2 = outgoingAssetAmount;
-            _context.next = 9;
-            return _context.t0.transfer.call(_context.t0, _context.t1, _context.t2);
+          case 4:
+            vaultProxy = _context.sent;
+            _context.next = 7;
+            return pathAddresses[0].transfer(vaultProxy, outgoingAssetAmount);
 
-          case 9:
-            takeOrderArgs = protocol$1.uniswapV3TakeOrderArgs({
-              pathAddresses: pathAddresses,
-              pathFees: pathFees,
+          case 7:
+            takeOrderArgs = protocol.uniswapV3TakeOrderArgs({
+              minIncomingAssetAmount: minIncomingAssetAmount,
               outgoingAssetAmount: outgoingAssetAmount,
-              minIncomingAssetAmount: minIncomingAssetAmount
+              pathAddresses: pathAddresses,
+              pathFees: pathFees
             });
-            callArgs = protocol$1.callOnIntegrationArgs({
+            callArgs = protocol.callOnIntegrationArgs({
               adapter: uniswapV3Adapter,
-              selector: protocol$1.takeOrderSelector,
-              encodedCallArgs: takeOrderArgs
+              encodedCallArgs: takeOrderArgs,
+              selector: protocol.takeOrderSelector
             });
-            return _context.abrupt("return", comptrollerProxy.connect(fundOwner).callOnExtension(integrationManager, protocol$1.IntegrationManagerActionId.CallOnIntegration, callArgs));
+            return _context.abrupt("return", comptrollerProxy.connect(fundOwner).callOnExtension(integrationManager, protocol.IntegrationManagerActionId.CallOnIntegration, callArgs));
 
-          case 12:
+          case 10:
           case "end":
             return _context.stop();
         }
@@ -2201,16 +2907,16 @@ function _yearnVaultV2Lend() {
         switch (_context.prev = _context.next) {
           case 0:
             signer = _ref.signer, comptrollerProxy = _ref.comptrollerProxy, integrationManager = _ref.integrationManager, yearnVaultV2Adapter = _ref.yearnVaultV2Adapter, yVault = _ref.yVault, outgoingUnderlyingAmount = _ref.outgoingUnderlyingAmount, _ref$minIncomingYVaul = _ref.minIncomingYVaultSharesAmount, minIncomingYVaultSharesAmount = _ref$minIncomingYVaul === void 0 ? ethers.BigNumber.from(1) : _ref$minIncomingYVaul;
-            callArgs = protocol$1.callOnIntegrationArgs({
+            callArgs = protocol.callOnIntegrationArgs({
               adapter: yearnVaultV2Adapter,
-              selector: protocol$1.lendSelector,
-              encodedCallArgs: protocol$1.yearnVaultV2LendArgs({
-                yVault: yVault,
+              encodedCallArgs: protocol.yearnVaultV2LendArgs({
+                minIncomingYVaultSharesAmount: minIncomingYVaultSharesAmount,
                 outgoingUnderlyingAmount: outgoingUnderlyingAmount,
-                minIncomingYVaultSharesAmount: minIncomingYVaultSharesAmount
-              })
+                yVault: yVault
+              }),
+              selector: protocol.lendSelector
             });
-            return _context.abrupt("return", comptrollerProxy.connect(signer).callOnExtension(integrationManager, protocol$1.IntegrationManagerActionId.CallOnIntegration, callArgs));
+            return _context.abrupt("return", comptrollerProxy.connect(signer).callOnExtension(integrationManager, protocol.IntegrationManagerActionId.CallOnIntegration, callArgs));
 
           case 3:
           case "end":
@@ -2235,17 +2941,17 @@ function _yearnVaultV2Redeem() {
         switch (_context2.prev = _context2.next) {
           case 0:
             signer = _ref2.signer, comptrollerProxy = _ref2.comptrollerProxy, integrationManager = _ref2.integrationManager, yearnVaultV2Adapter = _ref2.yearnVaultV2Adapter, yVault = _ref2.yVault, maxOutgoingYVaultSharesAmount = _ref2.maxOutgoingYVaultSharesAmount, _ref2$minIncomingUnde = _ref2.minIncomingUnderlyingAmount, minIncomingUnderlyingAmount = _ref2$minIncomingUnde === void 0 ? ethers.BigNumber.from(1) : _ref2$minIncomingUnde, _ref2$slippageToleran = _ref2.slippageToleranceBps, slippageToleranceBps = _ref2$slippageToleran === void 0 ? 1 : _ref2$slippageToleran;
-            callArgs = protocol$1.callOnIntegrationArgs({
+            callArgs = protocol.callOnIntegrationArgs({
               adapter: yearnVaultV2Adapter,
-              selector: protocol$1.redeemSelector,
-              encodedCallArgs: protocol$1.yearnVaultV2RedeemArgs({
-                yVault: yVault,
+              encodedCallArgs: protocol.yearnVaultV2RedeemArgs({
                 maxOutgoingYVaultSharesAmount: maxOutgoingYVaultSharesAmount,
                 minIncomingUnderlyingAmount: minIncomingUnderlyingAmount,
-                slippageToleranceBps: slippageToleranceBps
-              })
+                slippageToleranceBps: slippageToleranceBps,
+                yVault: yVault
+              }),
+              selector: protocol.redeemSelector
             });
-            return _context2.abrupt("return", comptrollerProxy.connect(signer).callOnExtension(integrationManager, protocol$1.IntegrationManagerActionId.CallOnIntegration, callArgs));
+            return _context2.abrupt("return", comptrollerProxy.connect(signer).callOnExtension(integrationManager, protocol.IntegrationManagerActionId.CallOnIntegration, callArgs));
 
           case 3:
           case "end":
@@ -2269,16 +2975,16 @@ function _zeroExV2TakeOrder() {
         switch (_context.prev = _context.next) {
           case 0:
             comptrollerProxy = _ref.comptrollerProxy, integrationManager = _ref.integrationManager, fundOwner = _ref.fundOwner, zeroExV2Adapter = _ref.zeroExV2Adapter, signedOrder = _ref.signedOrder, takerAssetFillAmount = _ref.takerAssetFillAmount;
-            takeOrderArgs = protocol$1.zeroExV2TakeOrderArgs({
+            takeOrderArgs = protocol.zeroExV2TakeOrderArgs({
               signedOrder: signedOrder,
               takerAssetFillAmount: takerAssetFillAmount
             });
-            callArgs = protocol$1.callOnIntegrationArgs({
+            callArgs = protocol.callOnIntegrationArgs({
               adapter: zeroExV2Adapter,
-              selector: protocol$1.takeOrderSelector,
-              encodedCallArgs: takeOrderArgs
+              encodedCallArgs: takeOrderArgs,
+              selector: protocol.takeOrderSelector
             });
-            return _context.abrupt("return", comptrollerProxy.connect(fundOwner).callOnExtension(integrationManager, protocol$1.IntegrationManagerActionId.CallOnIntegration, callArgs));
+            return _context.abrupt("return", comptrollerProxy.connect(fundOwner).callOnExtension(integrationManager, protocol.IntegrationManagerActionId.CallOnIntegration, callArgs));
 
           case 4:
           case "end":
@@ -2313,7 +3019,7 @@ function _generatePolicyManagerConfigWithMockPolicies() {
             policies = _context.t0.values.call(_context.t0, _context.t1);
             // Guarantees one policy has settings data
             policiesSettingsData = [].concat(_toConsumableArray(new Array(policies.length - 1).fill(ethers.constants.HashZero)), [ethers.utils.randomBytes(10)]);
-            return _context.abrupt("return", protocol$1.policyManagerConfigArgs({
+            return _context.abrupt("return", protocol.policyManagerConfigArgs({
               policies: policies,
               settings: policiesSettingsData
             }));
@@ -2341,55 +3047,55 @@ function _generateMockPolicies() {
           case 0:
             deployer = _ref2.deployer;
             _context2.next = 3;
-            return protocol$1.IPolicy.mock(deployer);
+            return protocol.IPolicy.mock(deployer);
 
           case 3:
             mockAddTrackedAssetsPolicy = _context2.sent;
             _context2.next = 6;
-            return protocol$1.IPolicy.mock(deployer);
+            return protocol.IPolicy.mock(deployer);
 
           case 6:
             mockCreateExternalPositionPolicy = _context2.sent;
             _context2.next = 9;
-            return protocol$1.IPolicy.mock(deployer);
+            return protocol.IPolicy.mock(deployer);
 
           case 9:
             mockPostBuySharesPolicy = _context2.sent;
             _context2.next = 12;
-            return protocol$1.IPolicy.mock(deployer);
+            return protocol.IPolicy.mock(deployer);
 
           case 12:
             mockPostCallOnExternalPositionPolicy = _context2.sent;
             _context2.next = 15;
-            return protocol$1.IPolicy.mock(deployer);
+            return protocol.IPolicy.mock(deployer);
 
           case 15:
             mockPostCoIPolicy = _context2.sent;
             _context2.next = 18;
-            return protocol$1.IPolicy.mock(deployer);
+            return protocol.IPolicy.mock(deployer);
 
           case 18:
             mockRedeemSharesForSpecificAssetsPolicy = _context2.sent;
             _context2.next = 21;
-            return protocol$1.IPolicy.mock(deployer);
+            return protocol.IPolicy.mock(deployer);
 
           case 21:
             mockPreTransferSharesPolicy = _context2.sent;
             _context2.next = 24;
-            return protocol$1.IPolicy.mock(deployer);
+            return protocol.IPolicy.mock(deployer);
 
           case 24:
             mockRemoveExternalPositionPolicy = _context2.sent;
             _context2.next = 27;
             return Promise.all([// AddTrackedAssets
-            mockAddTrackedAssetsPolicy.identifier.returns("MOCK_ADD_TRACKED_ASSETS"), mockAddTrackedAssetsPolicy.addFundSettings.returns(undefined), mockAddTrackedAssetsPolicy.activateForFund.returns(undefined), mockAddTrackedAssetsPolicy.canDisable.returns(false), mockAddTrackedAssetsPolicy.validateRule.returns(true), mockAddTrackedAssetsPolicy.implementedHooks.returns([protocol$1.PolicyHook.AddTrackedAssets]), mockAddTrackedAssetsPolicy.updateFundSettings.returns(undefined), // CreateExternalPosition
-            mockCreateExternalPositionPolicy.identifier.returns("MOCK_CREATE_EXTERNAL_POSITION"), mockCreateExternalPositionPolicy.addFundSettings.returns(undefined), mockCreateExternalPositionPolicy.activateForFund.returns(undefined), mockCreateExternalPositionPolicy.canDisable.returns(false), mockCreateExternalPositionPolicy.validateRule.returns(true), mockCreateExternalPositionPolicy.implementedHooks.returns([protocol$1.PolicyHook.CreateExternalPosition]), mockCreateExternalPositionPolicy.updateFundSettings.returns(undefined), // PostBuyShares
-            mockPostBuySharesPolicy.identifier.returns("MOCK_POST_BUY_SHARES"), mockPostBuySharesPolicy.addFundSettings.returns(undefined), mockPostBuySharesPolicy.activateForFund.returns(undefined), mockPostBuySharesPolicy.canDisable.returns(false), mockPostBuySharesPolicy.validateRule.returns(true), mockPostBuySharesPolicy.implementedHooks.returns([protocol$1.PolicyHook.PostBuyShares]), mockPostBuySharesPolicy.updateFundSettings.returns(undefined), // PostCallOnExternalPosition
-            mockPostCallOnExternalPositionPolicy.identifier.returns("MOCK_POST_CALL_ON_EXTERNAL_POSITION"), mockPostCallOnExternalPositionPolicy.addFundSettings.returns(undefined), mockPostCallOnExternalPositionPolicy.activateForFund.returns(undefined), mockPostCallOnExternalPositionPolicy.canDisable.returns(false), mockPostCallOnExternalPositionPolicy.validateRule.returns(true), mockPostCallOnExternalPositionPolicy.implementedHooks.returns([protocol$1.PolicyHook.PostCallOnExternalPosition]), mockPostCallOnExternalPositionPolicy.updateFundSettings.returns(undefined), // PostCallOnIntegration
-            mockPostCoIPolicy.identifier.returns("MOCK_POST_CALL_ON_INTEGRATION"), mockPostCoIPolicy.addFundSettings.returns(undefined), mockPostCoIPolicy.activateForFund.returns(undefined), mockPostCoIPolicy.canDisable.returns(false), mockPostCoIPolicy.validateRule.returns(true), mockPostCoIPolicy.implementedHooks.returns([protocol$1.PolicyHook.PostCallOnIntegration]), mockPostCoIPolicy.updateFundSettings.returns(undefined), // PreTransferSharesPolicy
-            mockPreTransferSharesPolicy.identifier.returns("MOCK_PRE_TRANSFER_SHARES"), mockPreTransferSharesPolicy.addFundSettings.returns(undefined), mockPreTransferSharesPolicy.activateForFund.returns(undefined), mockPreTransferSharesPolicy.canDisable.returns(false), mockPreTransferSharesPolicy.validateRule.returns(true), mockPreTransferSharesPolicy.implementedHooks.returns([protocol$1.PolicyHook.PreTransferShares]), mockPreTransferSharesPolicy.updateFundSettings.returns(undefined), // RedeemSharesForSpecificAssets
-            mockRedeemSharesForSpecificAssetsPolicy.identifier.returns("MOCK_REDEEM_SHARES_FOR_SPECIFIC_ASSETS"), mockRedeemSharesForSpecificAssetsPolicy.addFundSettings.returns(undefined), mockRedeemSharesForSpecificAssetsPolicy.activateForFund.returns(undefined), mockRedeemSharesForSpecificAssetsPolicy.canDisable.returns(false), mockRedeemSharesForSpecificAssetsPolicy.validateRule.returns(true), mockRedeemSharesForSpecificAssetsPolicy.implementedHooks.returns([protocol$1.PolicyHook.RedeemSharesForSpecificAssets]), mockRedeemSharesForSpecificAssetsPolicy.updateFundSettings.returns(undefined), // RemoveExternalPosition
-            mockRemoveExternalPositionPolicy.identifier.returns("MOCK_REMOVE_EXTERNAL_POSITION"), mockRemoveExternalPositionPolicy.addFundSettings.returns(undefined), mockRemoveExternalPositionPolicy.activateForFund.returns(undefined), mockRemoveExternalPositionPolicy.canDisable.returns(false), mockRemoveExternalPositionPolicy.validateRule.returns(true), mockRemoveExternalPositionPolicy.implementedHooks.returns([protocol$1.PolicyHook.RedeemSharesForSpecificAssets]), mockRemoveExternalPositionPolicy.updateFundSettings.returns(undefined)]);
+            mockAddTrackedAssetsPolicy.identifier.returns("MOCK_ADD_TRACKED_ASSETS"), mockAddTrackedAssetsPolicy.addFundSettings.returns(undefined), mockAddTrackedAssetsPolicy.activateForFund.returns(undefined), mockAddTrackedAssetsPolicy.canDisable.returns(false), mockAddTrackedAssetsPolicy.validateRule.returns(true), mockAddTrackedAssetsPolicy.implementedHooks.returns([protocol.PolicyHook.AddTrackedAssets]), mockAddTrackedAssetsPolicy.updateFundSettings.returns(undefined), // CreateExternalPosition
+            mockCreateExternalPositionPolicy.identifier.returns("MOCK_CREATE_EXTERNAL_POSITION"), mockCreateExternalPositionPolicy.addFundSettings.returns(undefined), mockCreateExternalPositionPolicy.activateForFund.returns(undefined), mockCreateExternalPositionPolicy.canDisable.returns(false), mockCreateExternalPositionPolicy.validateRule.returns(true), mockCreateExternalPositionPolicy.implementedHooks.returns([protocol.PolicyHook.CreateExternalPosition]), mockCreateExternalPositionPolicy.updateFundSettings.returns(undefined), // PostBuyShares
+            mockPostBuySharesPolicy.identifier.returns("MOCK_POST_BUY_SHARES"), mockPostBuySharesPolicy.addFundSettings.returns(undefined), mockPostBuySharesPolicy.activateForFund.returns(undefined), mockPostBuySharesPolicy.canDisable.returns(false), mockPostBuySharesPolicy.validateRule.returns(true), mockPostBuySharesPolicy.implementedHooks.returns([protocol.PolicyHook.PostBuyShares]), mockPostBuySharesPolicy.updateFundSettings.returns(undefined), // PostCallOnExternalPosition
+            mockPostCallOnExternalPositionPolicy.identifier.returns("MOCK_POST_CALL_ON_EXTERNAL_POSITION"), mockPostCallOnExternalPositionPolicy.addFundSettings.returns(undefined), mockPostCallOnExternalPositionPolicy.activateForFund.returns(undefined), mockPostCallOnExternalPositionPolicy.canDisable.returns(false), mockPostCallOnExternalPositionPolicy.validateRule.returns(true), mockPostCallOnExternalPositionPolicy.implementedHooks.returns([protocol.PolicyHook.PostCallOnExternalPosition]), mockPostCallOnExternalPositionPolicy.updateFundSettings.returns(undefined), // PostCallOnIntegration
+            mockPostCoIPolicy.identifier.returns("MOCK_POST_CALL_ON_INTEGRATION"), mockPostCoIPolicy.addFundSettings.returns(undefined), mockPostCoIPolicy.activateForFund.returns(undefined), mockPostCoIPolicy.canDisable.returns(false), mockPostCoIPolicy.validateRule.returns(true), mockPostCoIPolicy.implementedHooks.returns([protocol.PolicyHook.PostCallOnIntegration]), mockPostCoIPolicy.updateFundSettings.returns(undefined), // PreTransferSharesPolicy
+            mockPreTransferSharesPolicy.identifier.returns("MOCK_PRE_TRANSFER_SHARES"), mockPreTransferSharesPolicy.addFundSettings.returns(undefined), mockPreTransferSharesPolicy.activateForFund.returns(undefined), mockPreTransferSharesPolicy.canDisable.returns(false), mockPreTransferSharesPolicy.validateRule.returns(true), mockPreTransferSharesPolicy.implementedHooks.returns([protocol.PolicyHook.PreTransferShares]), mockPreTransferSharesPolicy.updateFundSettings.returns(undefined), // RedeemSharesForSpecificAssets
+            mockRedeemSharesForSpecificAssetsPolicy.identifier.returns("MOCK_REDEEM_SHARES_FOR_SPECIFIC_ASSETS"), mockRedeemSharesForSpecificAssetsPolicy.addFundSettings.returns(undefined), mockRedeemSharesForSpecificAssetsPolicy.activateForFund.returns(undefined), mockRedeemSharesForSpecificAssetsPolicy.canDisable.returns(false), mockRedeemSharesForSpecificAssetsPolicy.validateRule.returns(true), mockRedeemSharesForSpecificAssetsPolicy.implementedHooks.returns([protocol.PolicyHook.RedeemSharesForSpecificAssets]), mockRedeemSharesForSpecificAssetsPolicy.updateFundSettings.returns(undefined), // RemoveExternalPosition
+            mockRemoveExternalPositionPolicy.identifier.returns("MOCK_REMOVE_EXTERNAL_POSITION"), mockRemoveExternalPositionPolicy.addFundSettings.returns(undefined), mockRemoveExternalPositionPolicy.activateForFund.returns(undefined), mockRemoveExternalPositionPolicy.canDisable.returns(false), mockRemoveExternalPositionPolicy.validateRule.returns(true), mockRemoveExternalPositionPolicy.implementedHooks.returns([protocol.PolicyHook.RedeemSharesForSpecificAssets]), mockRemoveExternalPositionPolicy.updateFundSettings.returns(undefined)]);
 
           case 27:
             return _context2.abrupt("return", {
@@ -2419,7 +3125,8 @@ function assertEvent(receipt, event, match) {
   var events = ethers$1.extractEvent(receipt, event);
   expect(events.length).toBe(1);
   expect(receipt).toHaveEmittedWith(event, match);
-  var args = (_events$shift = events.shift()) === null || _events$shift === void 0 ? void 0 : _events$shift.args;
+  var args = (_events$shift = events.shift()) === null || _events$shift === void 0 ? void 0 : _events$shift.args; // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
+
   return args;
 }
 function assertNoEvent(receipt, event) {
@@ -2572,14 +3279,15 @@ function _createComptrollerProxy() {
         switch (_context.prev = _context.next) {
           case 0:
             signer = _ref.signer, comptrollerLib = _ref.comptrollerLib, denominationAsset = _ref.denominationAsset, _ref$sharesActionTime = _ref.sharesActionTimelock, sharesActionTimelock = _ref$sharesActionTime === void 0 ? 0 : _ref$sharesActionTime;
-            constructData = protocol$1.encodeFunctionData(comptrollerLib.init.fragment, [denominationAsset, sharesActionTimelock]);
+            constructData = protocol.encodeFunctionData(comptrollerLib.init.fragment, [denominationAsset, sharesActionTimelock]);
             _context.next = 4;
-            return protocol$1.ComptrollerProxy.deploy(signer, constructData, comptrollerLib);
+            return protocol.ComptrollerProxy.deploy(signer, constructData, comptrollerLib);
 
           case 4:
             comptrollerProxyContract = _context.sent;
             return _context.abrupt("return", {
-              comptrollerProxy: new protocol$1.ComptrollerLib(comptrollerProxyContract, signer),
+              comptrollerProxy: new protocol.ComptrollerLib(comptrollerProxyContract, signer),
+              // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
               receipt: comptrollerProxyContract.deployment
             });
 
@@ -2612,16 +3320,14 @@ function _createMigrationRequest() {
           case 3:
             receipt = _context2.sent;
             comptrollerDeployedArgs = assertEvent(receipt, 'ComptrollerProxyDeployed', {
-              creator: signer,
               comptrollerProxy: expect.any(String),
+              creator: signer,
               denominationAsset: denominationAsset,
-              sharesActionTimelock: ethers.BigNumber.from(sharesActionTimelock),
-              feeManagerConfigData: ethers.utils.hexlify(feeManagerConfigData),
-              policyManagerConfigData: ethers.utils.hexlify(policyManagerConfigData)
+              sharesActionTimelock: ethers.BigNumber.from(sharesActionTimelock)
             });
             return _context2.abrupt("return", {
-              receipt: receipt,
-              comptrollerProxy: new protocol$1.ComptrollerLib(comptrollerDeployedArgs.comptrollerProxy, signer)
+              comptrollerProxy: new protocol.ComptrollerLib(comptrollerDeployedArgs.comptrollerProxy, signer),
+              receipt: receipt
             });
 
           case 6:
@@ -2640,33 +3346,31 @@ function createNewFund(_x3) {
 
 function _createNewFund() {
   _createNewFund = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime__default['default'].mark(function _callee3(_ref3) {
-    var signer, fundDeployer, denominationAsset, _ref3$sharesActionTim, sharesActionTimelock, _ref3$fundOwner, fundOwner, _ref3$fundName, fundName, _ref3$feeManagerConfi, feeManagerConfig, _ref3$policyManagerCo, policyManagerConfig, investment, receipt, comptrollerDeployedArgs, comptrollerProxy, newFundDeployedArgs, vaultProxy;
+    var signer, fundDeployer, denominationAsset, _ref3$sharesActionTim, sharesActionTimelock, _ref3$fundOwner, fundOwner, _ref3$fundName, fundName, _ref3$fundSymbol, fundSymbol, _ref3$feeManagerConfi, feeManagerConfig, _ref3$policyManagerCo, policyManagerConfig, investment, receipt, comptrollerDeployedArgs, comptrollerProxy, newFundDeployedArgs, vaultProxy;
 
     return _regeneratorRuntime__default['default'].wrap(function _callee3$(_context3) {
       while (1) {
         switch (_context3.prev = _context3.next) {
           case 0:
-            signer = _ref3.signer, fundDeployer = _ref3.fundDeployer, denominationAsset = _ref3.denominationAsset, _ref3$sharesActionTim = _ref3.sharesActionTimelock, sharesActionTimelock = _ref3$sharesActionTim === void 0 ? 0 : _ref3$sharesActionTim, _ref3$fundOwner = _ref3.fundOwner, fundOwner = _ref3$fundOwner === void 0 ? ethers$1.randomAddress() : _ref3$fundOwner, _ref3$fundName = _ref3.fundName, fundName = _ref3$fundName === void 0 ? 'My Fund' : _ref3$fundName, _ref3$feeManagerConfi = _ref3.feeManagerConfig, feeManagerConfig = _ref3$feeManagerConfi === void 0 ? '0x' : _ref3$feeManagerConfi, _ref3$policyManagerCo = _ref3.policyManagerConfig, policyManagerConfig = _ref3$policyManagerCo === void 0 ? '0x' : _ref3$policyManagerCo, investment = _ref3.investment;
+            signer = _ref3.signer, fundDeployer = _ref3.fundDeployer, denominationAsset = _ref3.denominationAsset, _ref3$sharesActionTim = _ref3.sharesActionTimelock, sharesActionTimelock = _ref3$sharesActionTim === void 0 ? 0 : _ref3$sharesActionTim, _ref3$fundOwner = _ref3.fundOwner, fundOwner = _ref3$fundOwner === void 0 ? ethers$1.randomAddress() : _ref3$fundOwner, _ref3$fundName = _ref3.fundName, fundName = _ref3$fundName === void 0 ? 'My Fund' : _ref3$fundName, _ref3$fundSymbol = _ref3.fundSymbol, fundSymbol = _ref3$fundSymbol === void 0 ? '' : _ref3$fundSymbol, _ref3$feeManagerConfi = _ref3.feeManagerConfig, feeManagerConfig = _ref3$feeManagerConfi === void 0 ? '0x' : _ref3$feeManagerConfi, _ref3$policyManagerCo = _ref3.policyManagerConfig, policyManagerConfig = _ref3$policyManagerCo === void 0 ? '0x' : _ref3$policyManagerCo, investment = _ref3.investment;
             _context3.next = 3;
-            return fundDeployer.connect(signer).createNewFund(fundOwner, fundName, denominationAsset, sharesActionTimelock, feeManagerConfig, policyManagerConfig);
+            return fundDeployer.connect(signer).createNewFund(fundOwner, fundName, fundSymbol, denominationAsset, sharesActionTimelock, feeManagerConfig, policyManagerConfig);
 
           case 3:
             receipt = _context3.sent;
             comptrollerDeployedArgs = assertEvent(receipt, 'ComptrollerProxyDeployed', {
-              creator: signer,
               comptrollerProxy: expect.any(String),
+              creator: signer,
               denominationAsset: denominationAsset,
-              sharesActionTimelock: ethers.BigNumber.from(sharesActionTimelock),
-              feeManagerConfigData: ethers.utils.hexlify(feeManagerConfig),
-              policyManagerConfigData: ethers.utils.hexlify(policyManagerConfig)
+              sharesActionTimelock: ethers.BigNumber.from(sharesActionTimelock)
             });
-            comptrollerProxy = new protocol$1.ComptrollerLib(comptrollerDeployedArgs.comptrollerProxy, signer);
+            comptrollerProxy = new protocol.ComptrollerLib(comptrollerDeployedArgs.comptrollerProxy, signer);
             newFundDeployedArgs = assertEvent(receipt, 'NewFundCreated', {
+              comptrollerProxy: comptrollerProxy,
               creator: signer,
-              vaultProxy: expect.any(String),
-              comptrollerProxy: comptrollerProxy
+              vaultProxy: expect.any(String)
             });
-            vaultProxy = new protocol$1.VaultLib(newFundDeployedArgs.vaultProxy, signer);
+            vaultProxy = new protocol.VaultLib(newFundDeployedArgs.vaultProxy, signer);
 
             if (!(investment != null)) {
               _context3.next = 11;
@@ -2715,16 +3419,14 @@ function _createReconfigurationRequest() {
           case 3:
             receipt = _context4.sent;
             comptrollerDeployedArgs = assertEvent(receipt, 'ComptrollerProxyDeployed', {
-              creator: signer,
               comptrollerProxy: expect.any(String),
+              creator: signer,
               denominationAsset: denominationAsset,
-              sharesActionTimelock: ethers.BigNumber.from(sharesActionTimelock),
-              feeManagerConfigData: ethers.utils.hexlify(feeManagerConfigData),
-              policyManagerConfigData: ethers.utils.hexlify(policyManagerConfigData)
+              sharesActionTimelock: ethers.BigNumber.from(sharesActionTimelock)
             });
             return _context4.abrupt("return", {
-              receipt: receipt,
-              comptrollerProxy: new protocol$1.ComptrollerLib(comptrollerDeployedArgs.comptrollerProxy, signer)
+              comptrollerProxy: new protocol.ComptrollerLib(comptrollerDeployedArgs.comptrollerProxy, signer),
+              receipt: receipt
             });
 
           case 6:
@@ -2750,13 +3452,13 @@ function _createVaultProxy() {
         switch (_context5.prev = _context5.next) {
           case 0:
             signer = _ref5.signer, vaultLib = _ref5.vaultLib, fundOwner = _ref5.fundOwner, fundAccessor = _ref5.fundAccessor, _ref5$fundName = _ref5.fundName, fundName = _ref5$fundName === void 0 ? 'My Fund' : _ref5$fundName;
-            constructData = protocol$1.encodeFunctionData(vaultLib.init.fragment, [fundOwner, fundAccessor, fundName]);
+            constructData = protocol.encodeFunctionData(vaultLib.init.fragment, [fundOwner, fundAccessor, fundName]);
             _context5.next = 4;
-            return protocol$1.VaultProxy.deploy(signer, constructData, vaultLib);
+            return protocol.VaultProxy.deploy(signer, constructData, vaultLib);
 
           case 4:
             vaultProxyContract = _context5.sent;
-            return _context5.abrupt("return", new protocol$1.VaultLib(vaultProxyContract, fundAccessor));
+            return _context5.abrupt("return", new protocol.VaultLib(vaultProxyContract, fundAccessor));
 
           case 6:
           case "end":
@@ -2785,7 +3487,7 @@ function _setupGasRelayerPaymaster() {
             return weth.transfer(vaultProxy, startingBalance);
 
           case 3:
-            comptrollerProxy = new protocol$1.ComptrollerLib(fundAccessor, signer);
+            comptrollerProxy = new protocol.ComptrollerLib(fundAccessor, signer);
             _context6.next = 6;
             return comptrollerProxy.deployGasRelayPaymaster();
 
@@ -2794,7 +3496,7 @@ function _setupGasRelayerPaymaster() {
             eventArgs = assertEvent(receipt, 'GasRelayPaymasterSet', {
               gasRelayPaymaster: expect.any(String)
             });
-            return _context6.abrupt("return", new protocol$1.GasRelayPaymasterLib(eventArgs.gasRelayPaymaster, signer));
+            return _context6.abrupt("return", new protocol.GasRelayPaymasterLib(eventArgs.gasRelayPaymaster, signer));
 
           case 9:
           case "end":
@@ -2806,29 +3508,68 @@ function _setupGasRelayerPaymaster() {
   return _setupGasRelayerPaymaster.apply(this, arguments);
 }
 
-function vaultCallCurveMinterMint(_ref) {
-  var comptrollerProxy = _ref.comptrollerProxy,
-      minter = _ref.minter,
-      gauge = _ref.gauge;
-  return comptrollerProxy.vaultCallOnContract(minter, protocol$1.curveMinterMintSelector, protocol$1.encodeArgs(['address'], [gauge]));
+function vaultCallCreateNewList(_x) {
+  return _vaultCallCreateNewList.apply(this, arguments);
+}
+
+function _vaultCallCreateNewList() {
+  _vaultCallCreateNewList = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime__default['default'].mark(function _callee(_ref) {
+    var addressListRegistry, comptrollerProxy, items, owner, signer, updateType, listCount;
+    return _regeneratorRuntime__default['default'].wrap(function _callee$(_context) {
+      while (1) {
+        switch (_context.prev = _context.next) {
+          case 0:
+            addressListRegistry = _ref.addressListRegistry, comptrollerProxy = _ref.comptrollerProxy, items = _ref.items, owner = _ref.owner, signer = _ref.signer, updateType = _ref.updateType;
+            _context.next = 3;
+            return comptrollerProxy.connect(signer).vaultCallOnContract(addressListRegistry.address, protocol.addressListRegistryCreateListSelector, protocol.encodeArgs(['address', 'uint8', 'address[]'], [owner, updateType, items]));
+
+          case 3:
+            _context.next = 5;
+            return addressListRegistry.getListCount();
+
+          case 5:
+            listCount = _context.sent;
+            return _context.abrupt("return", listCount.sub(1));
+
+          case 7:
+          case "end":
+            return _context.stop();
+        }
+      }
+    }, _callee);
+  }));
+  return _vaultCallCreateNewList.apply(this, arguments);
 }
-function vaultCallCurveMinterMintMany(_ref2) {
+
+function vaultCallCurveMinterMint(_ref2) {
   var comptrollerProxy = _ref2.comptrollerProxy,
       minter = _ref2.minter,
-      gauges = _ref2.gauges;
+      gauge = _ref2.gauge;
+  return comptrollerProxy.vaultCallOnContract(minter, protocol.curveMinterMintSelector, protocol.encodeArgs(['address'], [gauge]));
+}
+function vaultCallCurveMinterMintMany(_ref3) {
+  var comptrollerProxy = _ref3.comptrollerProxy,
+      minter = _ref3.minter,
+      gauges = _ref3.gauges;
   var gaugesFormatted = new Array(8).fill(ethers.constants.AddressZero);
 
   for (var i in gauges) {
     gaugesFormatted[i] = gauges[i];
   }
 
-  return comptrollerProxy.vaultCallOnContract(minter, protocol$1.curveMinterMintManySelector, protocol$1.encodeArgs(['address[8]'], [gaugesFormatted]));
+  return comptrollerProxy.vaultCallOnContract(minter, protocol.curveMinterMintManySelector, protocol.encodeArgs(['address[8]'], [gaugesFormatted]));
 }
-function vaultCallCurveMinterToggleApproveMint(_ref3) {
-  var comptrollerProxy = _ref3.comptrollerProxy,
-      minter = _ref3.minter,
-      account = _ref3.account;
-  return comptrollerProxy.vaultCallOnContract(minter, protocol$1.curveMinterToggleApproveMintSelector, protocol$1.encodeArgs(['address'], [account]));
+function vaultCallCurveMinterToggleApproveMint(_ref4) {
+  var comptrollerProxy = _ref4.comptrollerProxy,
+      minter = _ref4.minter,
+      account = _ref4.account;
+  return comptrollerProxy.vaultCallOnContract(minter, protocol.curveMinterToggleApproveMintSelector, protocol.encodeArgs(['address'], [account]));
+}
+function vaultCallStartAssetBypassTimelock(_ref5) {
+  var comptrollerProxy = _ref5.comptrollerProxy,
+      contract = _ref5.contract,
+      asset = _ref5.asset;
+  return comptrollerProxy.vaultCallOnContract(contract, protocol.sighash(ethers.utils.FunctionFragment.fromString('startAssetBypassTimelock(address)')), protocol.encodeArgs(['address'], [asset]));
 }
 
 function transactionTimestamp(_x) {
@@ -2883,8 +3624,8 @@ function _calcMlnValueAndBurnAmountForSharesBuyback() {
             // 50% discount
             mlnAmountToBurn = mlnValueOfBuyback.div(2);
             return _context2.abrupt("return", {
-              mlnValue: mlnValueOfBuyback,
-              mlnAmountToBurn: mlnAmountToBurn
+              mlnAmountToBurn: mlnAmountToBurn,
+              mlnValue: mlnValueOfBuyback
             });
 
           case 8:
@@ -2900,43 +3641,51 @@ function _calcMlnValueAndBurnAmountForSharesBuyback() {
 function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); if (enumerableOnly) { symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; }); } keys.push.apply(keys, symbols); } return keys; }
 
 function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys(Object(source), true).forEach(function (key) { _defineProperty(target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } } return target; }
+
+/* eslint-disable sort-keys-fix/sort-keys-fix */
 var whales = {
-  wdgld: '0x9aa65464b4cfbe3dc2bdb3df412aee2b3de86687',
-  adai: '0x62e41b1185023bcc14a465d350e1dde341557925',
-  ausdc: '0x3DdfA8eC3052539b6C9549F12cEA2C295cfF5296',
+  // primitives
   bat: '0x12274c71304bc0e6b38a56b94d2949b118feb838',
   bnb: '0xbe0eb53f46cd790cd13851d5eff43d12404d33e8',
-  bnt: '0xbe0eb53f46cd790cd13851d5eff43d12404d33e8',
-  comp: '0xC89b6f0146642688bb254bF93C28fcCF1E182C81',
+  bnt: '0x7d1ed1601a12a172269436fa95fe156650603c1d',
+  busd: '0x47ac0fb4f2d84898e4d9e7b4dab3c24507a6d503',
+  comp: '0x0f50d31b3eaefd65236dd3736b863cffa4c63c4e',
   crv: '0x4ce799e6eD8D64536b67dD428565d52A531B3640',
-  dai: '0x16463c0fdb6ba9618909f5b120ea1581618c1b9e',
-  knc: '0x9d1167df52328db20d5d77288dce6ae3ef3a3e1f',
-  ldo: '0x3dba737ccc50a32a1764b493285dd51c8af6c278',
+  dai: '0x47ac0fb4f2d84898e4d9e7b4dab3c24507a6d503',
+  knc: '0x09d51654bd9efbfcb56da3491989cc1444095fff',
   link: '0xbe6977e08d4479c0a6777539ae0e8fa27be4e9d6',
   mana: '0xefb94ac00f1cee8a89d5c3f49faa799da6f03024',
   mln: '0xd8f8a53945bcfbbc19da162aa405e662ef71c40d',
   rep: '0xc6a043b07d33b6f30d8cb501026c391cfd25abe1',
   ren: '0xbe0eb53f46cd790cd13851d5eff43d12404d33e8',
+  susd: '0xa5f7a39e55d7878bc5bd754ee5d6bd7a7662355b',
   uni: '0x47173b170c64d16393a52e6c480b3ad8c302ba1e',
   usdc: '0xae2d4617c862309a3d75a0ffb358c7a5009c673f',
   usdt: '0x5041ed759dd4afc3a72b8192c143f72f4724081a',
   weth: '0xe08A8b19e5722a201EaF20A6BC595eF655397bd5',
   zrx: '0x206376e8940e42538781cd94ef024df3c1e0fd43',
-  cbat: '0x285306442cd985cab2c30515cfdab106fca7bc44',
+  // aTokens
+  ausdc: '0x3DdfA8eC3052539b6C9549F12cEA2C295cfF5296',
+  // cTokens
   ccomp: '0xd74f186194ab9219fafac5c2fe4b3270169666db',
-  cdai: '0x2bddEd18E2CA464355091266B7616956944ee7eE',
+  cdai: '0xab4ce310054a11328685ece1043211b68ba5d082',
   ceth: '0x8aceab8167c80cb8b3de7fa6228b889bb1130ee8',
-  crep: '0xc2386de1b7271a87b416f4605d500846e826a185',
-  cuni: '0x8889ff5b6323e71c28c26d2c34b8bb52654f00a6',
+  cuni: '0x39d8014b4f40d2cbc441137011d32023f4f1fd87',
   cusdc: '0xb3bd459e0598dde1fe84b1d0a1430be175b5d5be',
-  czrx: '0x57ca561798413a20508b6bc997481e784f3e6e5f',
+  // ptTokens
+  ptUsdc: '0xd18236cd213f39d078177b6f6908f0e44e88e4aa',
+  // synths
   seth: '0xc34a7c65aa08cb36744bda8eeec7b8e9891e147c',
-  seur: '0xe896e539e557bc751860a7763c8dd589af1698ce',
-  susd: '0x49BE88F0fcC3A8393a59d3688480d7D253C37D2A',
+  seur: '0xc3f2f91723b16b95bef0619b2504c049075d5b0b',
+  sxag: '0x40d68c490bf7262ec40048099aec23535f734be2',
+  sxau: '0x92eb453b7b5b8d41edb44e2c8b8b53eb70a482c7',
+  // misc
   lidoSteth: '0x31f644e2dd5d74f5c8d6d9de89dd517474d51800',
-  eurs: '0x98ed26de6451db36246672df78ae7c50f2c76f6d',
-  idle: '0x34aaa3d5a73d6f9594326d0422ce69748f09b14f'
+  ldo: '0x3dba737ccc50a32a1764b493285dd51c8af6c278',
+  eurs: '0x98ed26de6451db36246672df78ae7c50f2c76f6d'
 };
+/* eslint-enable sort-keys-fix/sort-keys-fix */
+
 function unlockWhale(_x) {
   return _unlockWhale.apply(this, arguments);
 }
@@ -3087,7 +3836,7 @@ function _relayTransaction() {
           case 0:
             signer = options.sendFunction.contract.signer;
 
-            if (signer && protocol$1.isTypedDataSigner(signer)) {
+            if (signer && protocol.isTypedDataSigner(signer)) {
               _context.next = 3;
               break;
             }
@@ -3096,7 +3845,7 @@ function _relayTransaction() {
 
           case 3:
             _context.next = 5;
-            return protocol$1.createSignedRelayRequest(options);
+            return protocol.createSignedRelayRequest(options);
 
           case 5:
             _yield$createSignedRe = _context.sent;
@@ -3108,10 +3857,10 @@ function _relayTransaction() {
             defaultMaxAcceptance = ethers.BigNumber.from(150000); // NOTE: There is an inconsistency between how the typed data object shape and the relayCall argument.
 
             mergedRelayRequest = {
-              request: relayRequest,
-              relayData: relayData
+              relayData: relayData,
+              request: relayRequest
             };
-            relayHub = new protocol$1.IGsnRelayHub(options.relayHub, provider.getSigner(options.relayWorker));
+            relayHub = new protocol.IGsnRelayHub(options.relayHub, provider.getSigner(options.relayWorker));
             return _context.abrupt("return", relayHub.relayCall.args(defaultMaxAcceptance, mergedRelayRequest, signedRelayRequest, '0x', defaultGasLimit).gas(defaultGasLimit, relayData.gasPrice).send());
 
           case 14:
@@ -3128,14 +3877,14 @@ var relayed = ethers.utils.EventFragment.fromString('TransactionRelayed(address
 var rejected = ethers.utils.EventFragment.fromString('TransactionRejectedByPaymaster(address indexed relayManager, address indexed paymaster, address indexed from, address to, address relayWorker, bytes4 selector, uint256 innerGasUsed, bytes reason)');
 function assertDidRelay(receipt) {
   return assertEvent(receipt, relayed, {
-    relayManager: expect.any(String),
-    relayWorker: expect.any(String),
+    charge: expect.anything(),
     from: expect.any(String),
-    to: expect.any(String),
     paymaster: expect.any(String),
+    relayManager: expect.any(String),
+    relayWorker: expect.any(String),
     selector: expect.any(String),
     status: expect.anything(),
-    charge: expect.anything()
+    to: expect.any(String)
   });
 }
 function assertDidRelaySuccessfully(receipt) {
@@ -3152,14 +3901,14 @@ function assertDidRelayWithCharge(receipt, amount, tolerance) {
 }
 function assertPaymasterDidReject(receipt) {
   return assertEvent(receipt, rejected, {
-    relayManager: expect.any(String),
-    paymaster: expect.any(String),
     from: expect.any(String),
-    to: expect.any(String),
+    innerGasUsed: expect.anything(),
+    paymaster: expect.any(String),
+    reason: expect.any(String),
+    relayManager: expect.any(String),
     relayWorker: expect.any(String),
     selector: expect.any(String),
-    innerGasUsed: expect.anything(),
-    reason: expect.any(String)
+    to: expect.any(String)
   });
 }
 function assertPaymasterDidRejectForReason(receipt, reason) {
@@ -3171,10 +3920,10 @@ exports.CurveLiquidityGaugeV2 = CurveLiquidityGaugeV2;
 exports.CurveMinter = CurveMinter;
 exports.CurveSwaps = CurveSwaps;
 exports.ICompoundComptroller = ICompoundComptroller;
+exports.IUniswapV3NonFungibleTokenManager = IUniswapV3NonFungibleTokenManager;
 exports.UniswapV2Factory = UniswapV2Factory;
 exports.aaveLend = aaveLend;
 exports.aaveRedeem = aaveRedeem;
-exports.addCollateral = addCollateral;
 exports.addNewAssetsToFund = addNewAssetsToFund;
 exports.addTrackedAssetsToVault = addTrackedAssetsToVault;
 exports.assertDidRelay = assertDidRelay;
@@ -3185,14 +3934,19 @@ exports.assertEvent = assertEvent;
 exports.assertNoEvent = assertNoEvent;
 exports.assertPaymasterDidReject = assertPaymasterDidReject;
 exports.assertPaymasterDidRejectForReason = assertPaymasterDidRejectForReason;
-exports.borrow = borrow;
 exports.buyShares = buyShares;
 exports.buySharesFunction = buySharesFunction;
 exports.calcMlnValueAndBurnAmountForSharesBuyback = calcMlnValueAndBurnAmountForSharesBuyback;
 exports.callOnExtension = callOnExtension;
-exports.claimComp = claimComp;
+exports.callOnExternalPosition = callOnExternalPosition;
+exports.compoundDebtPositionAddCollateral = compoundDebtPositionAddCollateral;
+exports.compoundDebtPositionBorrow = compoundDebtPositionBorrow;
+exports.compoundDebtPositionClaimComp = compoundDebtPositionClaimComp;
+exports.compoundDebtPositionRemoveCollateral = compoundDebtPositionRemoveCollateral;
+exports.compoundDebtPositionRepayBorrow = compoundDebtPositionRepayBorrow;
 exports.compoundLend = compoundLend;
 exports.compoundRedeem = compoundRedeem;
+exports.createCompoundDebtPosition = createCompoundDebtPosition;
 exports.createComptrollerProxy = createComptrollerProxy;
 exports.createExternalPosition = createExternalPosition;
 exports.createFundDeployer = createFundDeployer;
@@ -3200,6 +3954,7 @@ exports.createMigrationRequest = createMigrationRequest;
 exports.createMockExternalPosition = createMockExternalPosition;
 exports.createNewFund = createNewFund;
 exports.createReconfigurationRequest = createReconfigurationRequest;
+exports.createUniswapV3LiquidityPosition = createUniswapV3LiquidityPosition;
 exports.createVaultProxy = createVaultProxy;
 exports.curveAaveClaimRewards = curveAaveClaimRewards;
 exports.curveAaveLend = curveAaveLend;
@@ -3230,7 +3985,6 @@ exports.curveStethStake = curveStethStake;
 exports.curveStethUnstake = curveStethUnstake;
 exports.curveStethUnstakeAndRedeem = curveStethUnstakeAndRedeem;
 exports.curveTakeOrder = curveTakeOrder;
-exports.defaultTestDeployment = defaultTestDeployment;
 exports.deployProtocolFixture = deployProtocolFixture;
 exports.generateFeeManagerConfigWithMockFees = generateFeeManagerConfigWithMockFees;
 exports.generateMockFees = generateMockFees;
@@ -3243,6 +3997,10 @@ exports.getUnnamedSigners = getUnnamedSigners;
 exports.idleClaimRewards = idleClaimRewards;
 exports.idleLend = idleLend;
 exports.idleRedeem = idleRedeem;
+exports.mockExternalPositionAddDebtAssets = mockExternalPositionAddDebtAssets;
+exports.mockExternalPositionAddManagedAssets = mockExternalPositionAddManagedAssets;
+exports.mockExternalPositionRemoveDebtAssets = mockExternalPositionRemoveDebtAssets;
+exports.mockExternalPositionRemoveManagedAssets = mockExternalPositionRemoveManagedAssets;
 exports.mockGenericRemoveOnlySelector = mockGenericRemoveOnlySelector;
 exports.mockGenericSwap = mockGenericSwap;
 exports.mockGenericSwapASelector = mockGenericSwapASelector;
@@ -3252,29 +4010,44 @@ exports.mockGenericSwapDirectFromVaultSelector = mockGenericSwapDirectFromVaultS
 exports.mockGenericSwapViaApprovalSelector = mockGenericSwapViaApprovalSelector;
 exports.paraSwapV4GenerateDummyPaths = paraSwapV4GenerateDummyPaths;
 exports.paraSwapV4TakeOrder = paraSwapV4TakeOrder;
+exports.paraSwapV5GenerateDummyPaths = paraSwapV5GenerateDummyPaths;
+exports.paraSwapV5TakeOrder = paraSwapV5TakeOrder;
+exports.poolTogetherV4ClaimRewards = poolTogetherV4ClaimRewards;
+exports.poolTogetherV4Lend = poolTogetherV4Lend;
+exports.poolTogetherV4Redeem = poolTogetherV4Redeem;
+exports.reactivateExternalPosition = reactivateExternalPosition;
 exports.redeemSharesForSpecificAssets = redeemSharesForSpecificAssets;
 exports.redeemSharesInKind = redeemSharesInKind;
 exports.relayTransaction = relayTransaction;
-exports.removeCollateral = removeCollateral;
 exports.removeExternalPosition = removeExternalPosition;
 exports.removeTrackedAssetsFromVault = removeTrackedAssetsFromVault;
-exports.repayBorrow = repayBorrow;
 exports.setupGasRelayerPaymaster = setupGasRelayerPaymaster;
 exports.synthetixAssignExchangeDelegate = synthetixAssignExchangeDelegate;
+exports.synthetixRedeem = synthetixRedeem;
 exports.synthetixResolveAddress = synthetixResolveAddress;
 exports.synthetixTakeOrder = synthetixTakeOrder;
 exports.transactionTimestamp = transactionTimestamp;
 exports.uniswapV2Lend = uniswapV2Lend;
 exports.uniswapV2Redeem = uniswapV2Redeem;
 exports.uniswapV2TakeOrder = uniswapV2TakeOrder;
+exports.uniswapV3LiquidityPositionAddLiquidity = uniswapV3LiquidityPositionAddLiquidity;
+exports.uniswapV3LiquidityPositionCollect = uniswapV3LiquidityPositionCollect;
+exports.uniswapV3LiquidityPositionGetMaxTick = uniswapV3LiquidityPositionGetMaxTick;
+exports.uniswapV3LiquidityPositionGetMinTick = uniswapV3LiquidityPositionGetMinTick;
+exports.uniswapV3LiquidityPositionMint = uniswapV3LiquidityPositionMint;
+exports.uniswapV3LiquidityPositionPurge = uniswapV3LiquidityPositionPurge;
+exports.uniswapV3LiquidityPositionRemoveLiquidity = uniswapV3LiquidityPositionRemoveLiquidity;
+exports.uniswapV3OrderTokenPair = uniswapV3OrderTokenPair;
 exports.uniswapV3TakeOrder = uniswapV3TakeOrder;
 exports.unlockAllWhales = unlockAllWhales;
 exports.unlockWhale = unlockWhale;
 exports.unlockWhales = unlockWhales;
 exports.updateChainlinkAggregator = updateChainlinkAggregator;
+exports.vaultCallCreateNewList = vaultCallCreateNewList;
 exports.vaultCallCurveMinterMint = vaultCallCurveMinterMint;
 exports.vaultCallCurveMinterMintMany = vaultCallCurveMinterMintMany;
 exports.vaultCallCurveMinterToggleApproveMint = vaultCallCurveMinterToggleApproveMint;
+exports.vaultCallStartAssetBypassTimelock = vaultCallStartAssetBypassTimelock;
 exports.yearnVaultV2Lend = yearnVaultV2Lend;
 exports.yearnVaultV2Redeem = yearnVaultV2Redeem;
 exports.zeroExV2TakeOrder = zeroExV2TakeOrder;