@enzymefinance/testutils 4.0.0-next.5 → 4.0.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@enzymefinance/testutils",
-  "version": "4.0.0-next.5",
+  "version": "4.0.0",
   "main": "dist/enzymefinance-testutils.cjs.js",
   "module": "dist/enzymefinance-testutils.esm.js",
   "browser": {
@@ -8,10 +8,10 @@
     "./dist/enzymefinance-testutils.esm.js": "./dist/enzymefinance-testutils.browser.esm.js"
   },
   "dependencies": {
-    "@babel/runtime": "^7.15.4",
-    "@enzymefinance/ethers": "^1.0.10",
-    "@enzymefinance/hardhat": "^1.0.11",
-    "@enzymefinance/protocol": "^4.0.0-next.5",
-    "ethers": "^5.5.1"
+    "@babel/runtime": "^7.16.7",
+    "@enzymefinance/ethers": "^1.0.16",
+    "@enzymefinance/hardhat": "^1.0.16",
+    "@enzymefinance/protocol": "^4.0.0",
+    "ethers": "^5.5.4"
   }
 }

package/src/deployment.ts

@@ -1,5 +1,7 @@
 import {
   AaveAdapter,
+  AaveDebtPositionLib,
+  AaveDebtPositionParser,
   AavePriceFeed,
   AddressListRegistry,
   AllowedAdapterIncomingAssetsPolicy,
@@ -8,18 +10,17 @@ import {
   AllowedDepositRecipientsPolicy,
   AllowedExternalPositionTypesPolicy,
   AllowedSharesTransferRecipientsPolicy,
-  AssetFinalityResolver,
   CompoundAdapter,
   CompoundDebtPositionLib,
   CompoundDebtPositionParser,
   CompoundPriceFeed,
   ComptrollerLib,
+  ConvexCurveLpStakingAdapter,
+  ConvexCurveLpStakingWrapperFactory,
+  ConvexCurveLpStakingWrapperPriceFeed,
   CumulativeSlippageTolerancePolicy,
   CurveExchangeAdapter,
-  CurveLiquidityAaveAdapter,
-  CurveLiquidityEursAdapter,
-  CurveLiquiditySethAdapter,
-  CurveLiquidityStethAdapter,
+  CurveLiquidityAdapter,
   CurvePriceFeed,
   DepositWrapper,
   Dispatcher,
@@ -34,8 +35,9 @@ import {
   FundValueCalculator,
   FundValueCalculatorRouter,
   FundValueCalculatorUsdWrapper,
+  FuseAdapter,
+  FusePriceFeed,
   GasRelayPaymasterFactory,
-  GuaranteedRedemptionPolicy,
   IdleAdapter,
   IdlePriceFeed,
   IntegrationManager,
@@ -43,9 +45,9 @@ import {
   ManagementFee,
   MinAssetBalancesPostRedemptionPolicy,
   MinMaxInvestmentPolicy,
+  OlympusV2Adapter,
   OnlyRemoveDustExternalPositionPolicy,
   OnlyUntrackDustOrPricelessAssetsPolicy,
-  ParaSwapV4Adapter,
   ParaSwapV5Adapter,
   PerformanceFee,
   PolicyManager,
@@ -54,14 +56,13 @@ import {
   ProtocolFeeReserveLib,
   ProtocolFeeTracker,
   RevertingPriceFeed,
-  StakehoundEthPriceFeed,
   SynthetixAdapter,
-  SynthetixPriceFeed,
   UniswapV2ExchangeAdapter,
   UniswapV2LiquidityAdapter,
   UniswapV2PoolPriceFeed,
   UniswapV3Adapter,
   UnpermissionedActionsWrapper,
+  UsdEthSimulatedAggregator,
   ValueInterpreter,
   VaultLib,
   YearnVaultV2Adapter,
@@ -93,6 +94,8 @@ export async function deployProtocolFixture() {
   // prettier-ignore
   const deployment = {
     aaveAdapter: new AaveAdapter(fixture['AaveAdapter'].address, deployer),
+    aaveDebtPositionLib: new AaveDebtPositionLib(fixture['AaveDebtPositionLib'].address, deployer),
+    aaveDebtPositionParser: new AaveDebtPositionParser(fixture['AaveDebtPositionParser'].address, deployer),
     aavePriceFeed: new AavePriceFeed(fixture['AavePriceFeed'].address, deployer),
     addressListRegistry: new AddressListRegistry(fixture['AddressListRegistry'].address, deployer),
     allowedAdapterIncomingAssetsPolicy: new AllowedAdapterIncomingAssetsPolicy(fixture['AllowedAdapterIncomingAssetsPolicy'].address, deployer),
@@ -101,18 +104,17 @@ export async function deployProtocolFixture() {
     allowedDepositRecipientsPolicy: new AllowedDepositRecipientsPolicy(fixture['AllowedDepositRecipientsPolicy'].address, deployer),
     allowedExternalPositionTypesPolicy: new AllowedExternalPositionTypesPolicy(fixture['AllowedExternalPositionTypesPolicy'].address, deployer),
     allowedSharesTransferRecipientsPolicy: new AllowedSharesTransferRecipientsPolicy(fixture['AllowedSharesTransferRecipientsPolicy'].address, deployer),
-    assetFinalityResolver: new AssetFinalityResolver(fixture['AssetFinalityResolver'].address, deployer),
     compoundAdapter: new CompoundAdapter(fixture['CompoundAdapter'].address, deployer),
     compoundDebtPositionLib: new CompoundDebtPositionLib(fixture['CompoundDebtPositionLib'].address, deployer),
     compoundDebtPositionParser: new CompoundDebtPositionParser(fixture['CompoundDebtPositionParser'].address, deployer),
     compoundPriceFeed: new CompoundPriceFeed(fixture['CompoundPriceFeed'].address, deployer),
     comptrollerLib: new ComptrollerLib(fixture['ComptrollerLib'].address, deployer),
+    convexCurveLpStakingAdapter: new ConvexCurveLpStakingAdapter(fixture['ConvexCurveLpStakingAdapter'].address, deployer),
+    convexCurveLpStakingWrapperFactory: new ConvexCurveLpStakingWrapperFactory(fixture['ConvexCurveLpStakingWrapperFactory'].address, deployer),
+    convexCurveLpStakingWrapperPriceFeed: new ConvexCurveLpStakingWrapperPriceFeed(fixture['ConvexCurveLpStakingWrapperPriceFeed'].address, deployer),
     cumulativeSlippageTolerancePolicy: new CumulativeSlippageTolerancePolicy(fixture['CumulativeSlippageTolerancePolicy'].address, deployer),
     curveExchangeAdapter: new CurveExchangeAdapter(fixture['CurveExchangeAdapter'].address, deployer),
-    curveLiquidityAaveAdapter: new CurveLiquidityAaveAdapter(fixture['CurveLiquidityAaveAdapter'].address, deployer),
-    curveLiquidityEursAdapter: new CurveLiquidityEursAdapter(fixture['CurveLiquidityEursAdapter'].address, deployer),
-    curveLiquiditySethAdapter: new CurveLiquiditySethAdapter(fixture['CurveLiquiditySethAdapter'].address, deployer),
-    curveLiquidityStethAdapter: new CurveLiquidityStethAdapter(fixture['CurveLiquidityStethAdapter'].address, deployer),
+    curveLiquidityAdapter: new CurveLiquidityAdapter(fixture['CurveLiquidityAdapter'].address, deployer),
     curvePriceFeed: new CurvePriceFeed(fixture['CurvePriceFeed'].address, deployer),
     depositWrapper: new DepositWrapper(fixture['DepositWrapper'].address, deployer),
     dispatcher: new Dispatcher(fixture['Dispatcher'].address, deployer),
@@ -127,8 +129,9 @@ export async function deployProtocolFixture() {
     fundValueCalculator: new FundValueCalculator(fixture['FundValueCalculator'].address, deployer),
     fundValueCalculatorRouter: new FundValueCalculatorRouter(fixture['FundValueCalculatorRouter'].address, deployer),
     fundValueCalculatorUsdWrapper: new FundValueCalculatorUsdWrapper(fixture['FundValueCalculatorUsdWrapper'].address, deployer),
+    fuseAdapter: new FuseAdapter(fixture['FuseAdapter'].address, deployer),
+    fusePriceFeed: new FusePriceFeed(fixture['FusePriceFeed'].address, deployer),
     gasRelayPaymasterFactory: new GasRelayPaymasterFactory(fixture['GasRelayPaymasterFactory'].address, deployer),
-    guaranteedRedemptionPolicy: new GuaranteedRedemptionPolicy(fixture['GuaranteedRedemptionPolicy'].address, deployer),
     idleAdapter: new IdleAdapter(fixture['IdleAdapter'].address, deployer),
     idlePriceFeed: new IdlePriceFeed(fixture['IdlePriceFeed'].address, deployer),
     integrationManager: new IntegrationManager(fixture['IntegrationManager'].address, deployer),
@@ -136,9 +139,9 @@ export async function deployProtocolFixture() {
     managementFee: new ManagementFee(fixture['ManagementFee'].address, deployer),
     minAssetBalancesPostRedemptionPolicy: new MinAssetBalancesPostRedemptionPolicy(fixture['MinAssetBalancesPostRedemptionPolicy'].address, deployer),
     minMaxInvestmentPolicy: new MinMaxInvestmentPolicy(fixture['MinMaxInvestmentPolicy'].address, deployer),
+    olympusV2Adapter: new OlympusV2Adapter(fixture['OlympusV2Adapter'].address, deployer),
     onlyRemoveDustExternalPositionPolicy: new OnlyRemoveDustExternalPositionPolicy(fixture['OnlyRemoveDustExternalPositionPolicy'].address, deployer),
     onlyUntrackDustOrPricelessAssetsPolicy: new OnlyUntrackDustOrPricelessAssetsPolicy(fixture['OnlyUntrackDustOrPricelessAssetsPolicy'].address, deployer),
-    paraSwapV4Adapter: new ParaSwapV4Adapter(fixture['ParaSwapV4Adapter'].address, deployer),
     paraSwapV5Adapter: new ParaSwapV5Adapter(fixture['ParaSwapV5Adapter'].address, deployer),
     performanceFee: new PerformanceFee(fixture['PerformanceFee'].address, deployer),
     policyManager: new PolicyManager(fixture['PolicyManager'].address, deployer),
@@ -148,14 +151,13 @@ export async function deployProtocolFixture() {
     protocolFeeReserveProxy: new ProtocolFeeReserveLib(fixture['ProtocolFeeReserveProxy'].address, deployer),
     protocolFeeTracker: new ProtocolFeeTracker(fixture['ProtocolFeeTracker'].address, deployer),
     revertingPriceFeed: new RevertingPriceFeed(fixture['RevertingPriceFeed'].address, deployer),
-    stakehoundEthPriceFeed: new StakehoundEthPriceFeed(fixture['StakehoundEthPriceFeed'].address, deployer),
     synthetixAdapter: new SynthetixAdapter(fixture['SynthetixAdapter'].address, deployer),
-    synthetixPriceFeed: new SynthetixPriceFeed(fixture['SynthetixPriceFeed'].address, deployer),
     uniswapV2ExchangeAdapter: new UniswapV2ExchangeAdapter(fixture['UniswapV2ExchangeAdapter'].address, deployer),
     uniswapV2LiquidityAdapter: new UniswapV2LiquidityAdapter(fixture['UniswapV2LiquidityAdapter'].address, deployer),
     uniswapV2PoolPriceFeed: new UniswapV2PoolPriceFeed(fixture['UniswapV2PoolPriceFeed'].address, deployer),
     uniswapV3Adapter: new UniswapV3Adapter(fixture['UniswapV3Adapter'].address, deployer),
     unpermissionedActionsWrapper: new UnpermissionedActionsWrapper(fixture['UnpermissionedActionsWrapper'].address, deployer),
+    usdEthSimulatedAggregator: new UsdEthSimulatedAggregator(fixture['UsdEthSimulatedAggregator'].address, deployer),
     valueInterpreter: new ValueInterpreter(fixture['ValueInterpreter'].address, deployer),
     vaultLib: new VaultLib(fixture['VaultLib'].address, deployer),
     yearnVaultV2Adapter: new YearnVaultV2Adapter(fixture['YearnVaultV2Adapter'].address, deployer),
@@ -178,7 +180,13 @@ export type ProtocolDeployment = Resolve<typeof deployProtocolFixture>;
 import type { ChainlinkRateAsset } from '@enzymefinance/protocol';
 
 export interface DeploymentConfig {
+  feeBps: number;
   feeToken: string;
+  feeTokenBurn: {
+    burnFromVault: boolean;
+    sendToProtocolFeeReserve: boolean;
+    externalBurnerAddress: string;
+  };
   weth: string;
   wrappedNativeAsset: string;
   primitives: Record<string, string>;
@@ -194,19 +202,23 @@ export interface DeploymentConfig {
   synthetix: {
     snx: string;
     susd: string;
-    synths: Record<string, string>;
-    addressResolver: string;
     delegateApprovals: string;
     originator: string;
     redeemer: string;
     trackingCode: string;
   };
+  convex: {
+    booster: string;
+    crvToken: string;
+    cvxToken: string;
+  };
   curve: {
     addressProvider: string;
     minter: string;
     pools: Record<string, { pool: string; lpToken: string; liquidityGaugeToken: string; invariantProxyAsset: string }>;
   };
   aave: {
+    incentivesController: string;
     lendingPoolAddressProvider: string;
     protocolDataProvider: string;
     atokens: Record<string, [string, string]>;
@@ -216,6 +228,10 @@ export interface DeploymentConfig {
     comptroller: string;
     ctokens: Record<string, string>;
   };
+  fuse: {
+    fetherTokens: Record<string, string>;
+    ftokens: Record<string, string>;
+  };
   idle: {
     bestYieldIdleDai: string;
     bestYieldIdleUsdc: string;
@@ -230,9 +246,8 @@ export interface DeploymentConfig {
   lido: {
     steth: string;
   };
-  paraSwapV4: {
-    augustusSwapper: string;
-    tokenTransferProxy: string;
+  olympusV2: {
+    stakingContract: string;
   };
   paraSwapV5: {
     augustusSwapper: string;
@@ -241,9 +256,7 @@ export interface DeploymentConfig {
   poolTogetherV4: {
     ptTokens: Record<string, [string, string]>;
   };
-  stakehound: {
-    steth: string;
-  };
+  positionsLimit: number;
   unsupportedAssets: Record<string, string>;
   uniswap: {
     factory: string;
@@ -264,9 +277,4 @@ export interface DeploymentConfig {
     exchange: string;
     allowedMakers: string[];
   };
-  policies: {
-    guaranteedRedemption: {
-      redemptionWindowBuffer: number;
-    };
-  };
 }

package/src/scaffolding/assets.ts

@@ -17,7 +17,7 @@ export async function addNewAssetsToFund({
   assets: StandardToken[];
   amounts?: BigNumberish[];
 }) {
-  // First, add tracked assets while their balances are 0
+  // First, add tracked assets
   const receipt = addTrackedAssetsToVault({
     assets,
     comptrollerProxy,

package/src/scaffolding/core.ts

@@ -1,9 +1,4 @@
-import type {
-  AssetFinalityResolver,
-  Dispatcher,
-  GasRelayPaymasterFactory,
-  ValueInterpreter,
-} from '@enzymefinance/protocol';
+import type { Dispatcher, GasRelayPaymasterFactory, ValueInterpreter } from '@enzymefinance/protocol';
 import {
   ComptrollerLib,
   ExternalPositionManager,
@@ -20,7 +15,6 @@ import type { Signer } from 'ethers';
 // unless overrides are passed-in
 export async function createFundDeployer({
   deployer,
-  assetFinalityResolver,
   externalPositionManager,
   dispatcher,
   gasRelayPaymasterFactory,
@@ -30,7 +24,6 @@ export async function createFundDeployer({
   setReleaseLive = true,
 }: {
   deployer: Signer;
-  assetFinalityResolver: AssetFinalityResolver;
   externalPositionManager: ExternalPositionManager;
   dispatcher: Dispatcher;
   feeManager: FeeManager;
@@ -76,7 +69,6 @@ export async function createFundDeployer({
     nextFeeManager,
     nextIntegrationManager,
     nextPolicyManager,
-    assetFinalityResolver,
     gasRelayPaymasterFactory,
     mlnToken,
     wethToken,
@@ -94,7 +86,9 @@ export async function createFundDeployer({
     await vaultLib.getProtocolFeeReserve(),
     nextProtocolFeeTracker,
     await vaultLib.getMlnToken(),
+    await vaultLib.getMlnBurner(),
     await vaultLib.getWethToken(),
+    await vaultLib.getPositionsLimit(),
   );
   await nextFundDeployer.setVaultLib(nextVaultLib);
 

package/src/scaffolding/extensions/external-positions/aave-debt.ts

@@ -0,0 +1,179 @@
+import type { AddressLike } from '@enzymefinance/ethers';
+import type { SignerWithAddress } from '@enzymefinance/hardhat';
+import type { ComptrollerLib, ExternalPositionManager } from '@enzymefinance/protocol';
+import {
+  AaveDebtPositionActionId,
+  aaveDebtPositionAddCollateralArgs,
+  aaveDebtPositionBorrowArgs,
+  aaveDebtPositionClaimRewardsArgs,
+  aaveDebtPositionRemoveCollateralArgs,
+  aaveDebtPositionRepayBorrowArgs,
+  ExternalPositionType,
+} from '@enzymefinance/protocol';
+import type { BigNumberish } from 'ethers';
+
+import { callOnExternalPosition, createExternalPosition } from './actions';
+
+export async function aaveDebtPositionAddCollateral({
+  comptrollerProxy,
+  externalPositionManager,
+  signer,
+  aTokens,
+  amounts,
+  externalPositionProxy,
+}: {
+  comptrollerProxy: ComptrollerLib;
+  externalPositionManager: ExternalPositionManager;
+  signer: SignerWithAddress;
+  aTokens: AddressLike[];
+  amounts: BigNumberish[];
+  externalPositionProxy: AddressLike;
+}) {
+  const actionArgs = aaveDebtPositionAddCollateralArgs({
+    aTokens,
+    amounts,
+  });
+
+  return callOnExternalPosition({
+    actionArgs,
+    actionId: AaveDebtPositionActionId.AddCollateralAssets,
+    comptrollerProxy,
+    externalPositionManager,
+    externalPositionProxy,
+    signer,
+  });
+}
+
+export async function aaveDebtPositionBorrow({
+  comptrollerProxy,
+  externalPositionManager,
+  signer,
+  tokens,
+  amounts,
+  externalPositionProxy,
+}: {
+  comptrollerProxy: ComptrollerLib;
+  externalPositionManager: ExternalPositionManager;
+  signer: SignerWithAddress;
+  tokens: AddressLike[];
+  amounts: BigNumberish[];
+  externalPositionProxy: AddressLike;
+}) {
+  const actionArgs = aaveDebtPositionBorrowArgs({
+    amounts,
+    tokens,
+  });
+
+  return callOnExternalPosition({
+    actionArgs,
+    actionId: AaveDebtPositionActionId.BorrowAsset,
+    comptrollerProxy,
+    externalPositionManager,
+    externalPositionProxy,
+    signer,
+  });
+}
+
+export async function aaveDebtPositionClaimRewards({
+  comptrollerProxy,
+  externalPositionManager,
+  signer,
+  assets,
+  externalPositionProxy,
+}: {
+  comptrollerProxy: ComptrollerLib;
+  externalPositionManager: ExternalPositionManager;
+  signer: SignerWithAddress;
+  assets: AddressLike[];
+  externalPositionProxy: AddressLike;
+}) {
+  const actionArgs = aaveDebtPositionClaimRewardsArgs({
+    assets,
+  });
+
+  return callOnExternalPosition({
+    actionArgs,
+    actionId: AaveDebtPositionActionId.ClaimRewards,
+    comptrollerProxy,
+    externalPositionManager,
+    externalPositionProxy,
+    signer,
+  });
+}
+
+export async function aaveDebtPositionRemoveCollateral({
+  comptrollerProxy,
+  externalPositionManager,
+  signer,
+  aTokens,
+  amounts,
+  externalPositionProxy,
+}: {
+  comptrollerProxy: ComptrollerLib;
+  externalPositionManager: ExternalPositionManager;
+  signer: SignerWithAddress;
+  aTokens: AddressLike[];
+  amounts: BigNumberish[];
+  externalPositionProxy: AddressLike;
+}) {
+  const actionArgs = aaveDebtPositionRemoveCollateralArgs({
+    aTokens,
+    amounts,
+  });
+
+  return callOnExternalPosition({
+    actionArgs,
+    actionId: AaveDebtPositionActionId.RemoveCollateralAssets,
+    comptrollerProxy,
+    externalPositionManager,
+    externalPositionProxy,
+    signer,
+  });
+}
+
+export async function aaveDebtPositionRepayBorrow({
+  comptrollerProxy,
+  externalPositionManager,
+  signer,
+  tokens,
+  amounts,
+  externalPositionProxy,
+}: {
+  comptrollerProxy: ComptrollerLib;
+  externalPositionManager: ExternalPositionManager;
+  signer: SignerWithAddress;
+  tokens: AddressLike[];
+  amounts: BigNumberish[];
+  externalPositionProxy: AddressLike;
+}) {
+  const actionArgs = aaveDebtPositionRepayBorrowArgs({
+    amounts,
+    tokens,
+  });
+
+  return callOnExternalPosition({
+    actionArgs,
+    actionId: AaveDebtPositionActionId.RepayBorrowedAssets,
+    comptrollerProxy,
+    externalPositionManager,
+    externalPositionProxy,
+    signer,
+  });
+}
+
+export async function createAaveDebtPosition({
+  signer,
+  comptrollerProxy,
+  externalPositionManager,
+}: {
+  signer: SignerWithAddress;
+  comptrollerProxy: ComptrollerLib;
+  externalPositionManager: ExternalPositionManager;
+}) {
+  return createExternalPosition({
+    comptrollerProxy,
+    externalPositionManager,
+    externalPositionTypeId: ExternalPositionType.AaveDebtPosition,
+    signer,
+  });
+}

package/src/scaffolding/extensions/external-positions/actions.ts

@@ -44,19 +44,24 @@ export async function createExternalPosition({
   externalPositionManager,
   externalPositionTypeId,
   initializationData = '0x',
+  callOnExternalPositionData = '0x',
 }: {
   signer: SignerWithAddress;
   comptrollerProxy: ComptrollerLib;
   externalPositionManager: ExternalPositionManager;
   externalPositionTypeId: BigNumberish;
   initializationData?: BytesLike;
+  callOnExternalPositionData?: BytesLike;
 }) {
   const receipt = await comptrollerProxy
     .connect(signer)
     .callOnExtension(
       externalPositionManager,
       ExternalPositionManagerActionId.CreateExternalPosition,
-      encodeArgs(['uint256', 'bytes'], [externalPositionTypeId, initializationData]),
+      encodeArgs(
+        ['uint256', 'bytes', 'bytes'],
+        [externalPositionTypeId, initializationData, callOnExternalPositionData],
+      ),
     );
 
   const event = extractEvent(receipt, externalPositionManager.abi.getEvent('ExternalPositionDeployedForFund'));

package/src/scaffolding/extensions/external-positions/index.ts

@@ -1,4 +1,5 @@
 export * from './actions';
 export * from './compound';
 export * from './mocks';
+export * from './aave-debt';
 export * from './uniswap-v3-liquidity';

package/src/scaffolding/extensions/external-positions/mocks.ts

@@ -2,8 +2,6 @@ import type { AddressLike } from '@enzymefinance/ethers';
 import type { SignerWithAddress } from '@enzymefinance/hardhat';
 import type { ComptrollerLib, ExternalPositionFactory, ExternalPositionManager } from '@enzymefinance/protocol';
 import {
-  encodeArgs,
-  ExternalPositionManagerActionId,
   mockGenericExternalPositionActionArgs,
   MockGenericExternalPositionActionId,
   MockGenericExternalPositionLib,
@@ -12,7 +10,7 @@ import {
 } from '@enzymefinance/protocol';
 import type { BigNumberish } from 'ethers';
 
-import { callOnExternalPosition } from './actions';
+import { callOnExternalPosition, createExternalPosition } from './actions';
 
 export async function createMockExternalPosition({
   comptrollerProxy,
@@ -54,13 +52,12 @@ export async function createMockExternalPosition({
     [mockExternalPositionParser],
   );
 
-  const receipt = await comptrollerProxy
-    .connect(fundOwner)
-    .callOnExtension(
-      externalPositionManager,
-      ExternalPositionManagerActionId.CreateExternalPosition,
-      encodeArgs(['uint256', 'bytes'], [typeId, '0x']),
-    );
+  const receipt = await createExternalPosition({
+    comptrollerProxy,
+    externalPositionManager,
+    externalPositionTypeId: typeId,
+    signer: fundOwner,
+  });
 
   const externalPositionProxy = (await vaultProxy.getActiveExternalPositions())[0];
 

package/src/scaffolding/extensions/external-positions/uniswap-v3-liquidity.ts

@@ -4,20 +4,19 @@ import type { SignerWithAddress } from '@enzymefinance/hardhat';
 import type { ComptrollerLib, ExternalPositionManager } from '@enzymefinance/protocol';
 import {
   callOnExternalPositionArgs,
-  encodeArgs,
   ExternalPositionManagerActionId,
   ExternalPositionType,
   UniswapV3LiquidityPositionActionId,
   uniswapV3LiquidityPositionAddLiquidityArgs,
   uniswapV3LiquidityPositionCollectArgs,
-  uniswapV3LiquidityPositionInitArgs,
   UniswapV3LiquidityPositionLib,
   uniswapV3LiquidityPositionMintArgs,
   uniswapV3LiquidityPositionPurgeArgs,
   uniswapV3LiquidityPositionRemoveLiquidityArgs,
-  VaultLib,
 } from '@enzymefinance/protocol';
-import type { BigNumber, BigNumberish } from 'ethers';
+import type { BigNumber, BigNumberish, BytesLike } from 'ethers';
+
+import { createExternalPosition } from './actions';
 
 export enum UniswapV3FeeAmount {
   LOW = 500,
@@ -58,33 +57,22 @@ export async function createUniswapV3LiquidityPosition({
   signer,
   comptrollerProxy,
   externalPositionManager,
-  token0,
-  token1,
+  callOnExternalPositionData = '0x',
 }: {
   signer: SignerWithAddress;
   comptrollerProxy: ComptrollerLib;
   externalPositionManager: ExternalPositionManager;
-  token0: AddressLike;
-  token1: AddressLike;
+  callOnExternalPositionData?: BytesLike;
 }) {
-  const initArgs = uniswapV3LiquidityPositionInitArgs({
-    token0,
-    token1,
+  const { externalPositionProxy: externalPositionProxyContract, receipt } = await createExternalPosition({
+    callOnExternalPositionData,
+    comptrollerProxy,
+    externalPositionManager,
+    externalPositionTypeId: ExternalPositionType.UniswapV3LiquidityPosition,
+    signer,
   });
 
-  const receipt = await comptrollerProxy
-    .connect(signer)
-    .callOnExtension(
-      externalPositionManager,
-      ExternalPositionManagerActionId.CreateExternalPosition,
-      encodeArgs(['uint256', 'bytes'], [ExternalPositionType.UniswapV3LiquidityPosition, initArgs]),
-    );
-
-  const vaultProxy = new VaultLib(await comptrollerProxy.getVaultProxy(), signer);
-  const externalPositions = await vaultProxy.getActiveExternalPositions.call();
-  const externalPositionProxyAddress = externalPositions[externalPositions.length - 1];
-
-  return { externalPositionProxyAddress, receipt };
+  return { externalPositionProxyAddress: externalPositionProxyContract.address, receipt };
 }
 
 export async function uniswapV3LiquidityPositionAddLiquidity({
@@ -160,6 +148,8 @@ export async function uniswapV3LiquidityPositionMint({
   comptrollerProxy,
   externalPositionManager,
   externalPositionProxy,
+  token0,
+  token1,
   fee,
   tickLower,
   tickUpper,
@@ -172,6 +162,8 @@ export async function uniswapV3LiquidityPositionMint({
   comptrollerProxy: ComptrollerLib;
   externalPositionManager: ExternalPositionManager;
   externalPositionProxy: AddressLike;
+  token0: AddressLike;
+  token1: AddressLike;
   fee: BigNumberish;
   tickLower: BigNumberish;
   tickUpper: BigNumberish;
@@ -188,6 +180,8 @@ export async function uniswapV3LiquidityPositionMint({
     fee,
     tickLower,
     tickUpper,
+    token0,
+    token1,
   });
 
   const callArgs = callOnExternalPositionArgs({