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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@enzymefinance/testutils",
-  "version": "4.0.0-next.0",
+  "version": "4.0.0-next.5",
   "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.3",
-    "@enzymefinance/ethers": "^1.0.0",
-    "@enzymefinance/hardhat": "^1.0.0",
-    "@enzymefinance/protocol": "^4.0.0-next.0",
-    "ethers": "^5.4.6"
+    "@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"
   }
 }

package/src/assertions.ts

@@ -1,5 +1,6 @@
-import { ContractReceipt, extractEvent } from '@enzymefinance/ethers';
-import { utils } from 'ethers';
+import type { ContractReceipt } from '@enzymefinance/ethers';
+import { extractEvent } from '@enzymefinance/ethers';
+import type { utils } from 'ethers';
 
 export function assertEvent<TResult = any>(
   receipt: ContractReceipt<any>,
@@ -11,6 +12,8 @@ export function assertEvent<TResult = any>(
   expect(receipt).toHaveEmittedWith(event, match);
 
   const args = events.shift()?.args;
+
+  // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
   return (args as unknown as typeof match)!;
 }
 

package/src/deployment.ts

@@ -1,64 +1,74 @@
-import { Contract } from '@enzymefinance/ethers';
-import { SignerWithAddress } from '@enzymefinance/hardhat';
 import {
-  Dispatcher,
-  VaultLib,
-  FundDeployer,
-  PolicyManager,
+  AaveAdapter,
   AavePriceFeed,
-  CompoundPriceFeed,
+  AddressListRegistry,
+  AllowedAdapterIncomingAssetsPolicy,
+  AllowedAdaptersPolicy,
+  AllowedAssetsForRedemptionPolicy,
+  AllowedDepositRecipientsPolicy,
+  AllowedExternalPositionTypesPolicy,
+  AllowedSharesTransferRecipientsPolicy,
+  AssetFinalityResolver,
+  CompoundAdapter,
   CompoundDebtPositionLib,
   CompoundDebtPositionParser,
-  CurvePriceFeed,
-  IdlePriceFeed,
-  LidoStethPriceFeed,
-  RevertingPriceFeed,
-  StakehoundEthPriceFeed,
-  SynthetixPriceFeed,
-  WdgldPriceFeed,
-  YearnVaultV2PriceFeed,
-  ValueInterpreter,
-  UniswapV2PoolPriceFeed,
-  IntegrationManager,
-  AaveAdapter,
+  CompoundPriceFeed,
+  ComptrollerLib,
+  CumulativeSlippageTolerancePolicy,
+  CurveExchangeAdapter,
   CurveLiquidityAaveAdapter,
   CurveLiquidityEursAdapter,
   CurveLiquiditySethAdapter,
   CurveLiquidityStethAdapter,
-  IdleAdapter,
-  ParaSwapV4Adapter,
-  SynthetixAdapter,
-  YearnVaultV2Adapter,
-  ZeroExV2Adapter,
-  CompoundAdapter,
-  ExternalPositionManager,
-  UniswapV2Adapter,
-  UniswapV3Adapter,
-  CurveExchangeAdapter,
-  FeeManager,
-  ComptrollerLib,
+  CurvePriceFeed,
+  DepositWrapper,
+  Dispatcher,
   EntranceRateBurnFee,
   EntranceRateDirectFee,
   ExitRateBurnFee,
   ExitRateDirectFee,
+  ExternalPositionFactory,
+  ExternalPositionManager,
+  FeeManager,
+  FundDeployer,
+  FundValueCalculator,
+  FundValueCalculatorRouter,
+  FundValueCalculatorUsdWrapper,
+  GasRelayPaymasterFactory,
+  GuaranteedRedemptionPolicy,
+  IdleAdapter,
+  IdlePriceFeed,
+  IntegrationManager,
+  LidoStethPriceFeed,
   ManagementFee,
-  PerformanceFee,
-  DepositWrapper,
-  UnpermissionedActionsWrapper,
-  AllowedAdapterIncomingAssetsPolicy,
+  MinAssetBalancesPostRedemptionPolicy,
   MinMaxInvestmentPolicy,
-  AllowedDepositRecipientsPolicy,
-  GuaranteedRedemptionPolicy,
-  GlobalConfigLib,
-  AssetFinalityResolver,
+  OnlyRemoveDustExternalPositionPolicy,
+  OnlyUntrackDustOrPricelessAssetsPolicy,
+  ParaSwapV4Adapter,
+  ParaSwapV5Adapter,
+  PerformanceFee,
+  PolicyManager,
+  PoolTogetherV4Adapter,
+  PoolTogetherV4PriceFeed,
   ProtocolFeeReserveLib,
   ProtocolFeeTracker,
-  GasRelayPaymasterFactory,
-  ExternalPositionFactory,
+  RevertingPriceFeed,
+  StakehoundEthPriceFeed,
+  SynthetixAdapter,
+  SynthetixPriceFeed,
+  UniswapV2ExchangeAdapter,
+  UniswapV2LiquidityAdapter,
+  UniswapV2PoolPriceFeed,
+  UniswapV3Adapter,
+  UnpermissionedActionsWrapper,
+  ValueInterpreter,
+  VaultLib,
+  YearnVaultV2Adapter,
+  YearnVaultV2PriceFeed,
+  ZeroExV2Adapter,
 } from '@enzymefinance/protocol';
 
-import { DeploymentConfig } from '../../../deploy/utils/config';
-
 export async function getNamedSigner(name: string) {
   const accounts = await hre.getNamedAccounts();
   if (!accounts[name]) {
@@ -70,6 +80,7 @@ export async function getNamedSigner(name: string) {
 
 export async function getUnnamedSigners() {
   const accounts = await hre.getUnnamedAccounts();
+
   return Promise.all(accounts.map((account) => provider.getSignerWithAddress(account)));
 }
 
@@ -81,89 +92,181 @@ export async function deployProtocolFixture() {
 
   // prettier-ignore
   const deployment = {
-    dispatcher: new Dispatcher(fixture['Dispatcher'].address, deployer),
-    vaultLib: new VaultLib(fixture['VaultLib'].address, deployer),
-    fundDeployer: new FundDeployer(fixture['FundDeployer'].address, deployer),
-    policyManager: new PolicyManager(fixture['PolicyManager'].address, deployer),
+    aaveAdapter: new AaveAdapter(fixture['AaveAdapter'].address, deployer),
     aavePriceFeed: new AavePriceFeed(fixture['AavePriceFeed'].address, deployer),
+    addressListRegistry: new AddressListRegistry(fixture['AddressListRegistry'].address, deployer),
+    allowedAdapterIncomingAssetsPolicy: new AllowedAdapterIncomingAssetsPolicy(fixture['AllowedAdapterIncomingAssetsPolicy'].address, deployer),
+    allowedAdaptersPolicy: new AllowedAdaptersPolicy(fixture['AllowedAdaptersPolicy'].address, deployer),
+    allowedAssetsForRedemptionPolicy: new AllowedAssetsForRedemptionPolicy(fixture['AllowedAssetsForRedemptionPolicy'].address, deployer),
+    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),
-    curvePriceFeed: new CurvePriceFeed(fixture['CurvePriceFeed'].address, deployer),
-    idlePriceFeed: new IdlePriceFeed(fixture['IdlePriceFeed'].address, deployer),
-    lidoStethPriceFeed: new LidoStethPriceFeed(fixture['LidoStethPriceFeed'].address, deployer),
-    revertingPriceFeed: new RevertingPriceFeed(fixture['RevertingPriceFeed'].address, deployer),
-    synthetixPriceFeed: new SynthetixPriceFeed(fixture['SynthetixPriceFeed'].address, deployer),
-    stakehoundEthPriceFeed: new StakehoundEthPriceFeed(fixture['StakehoundEthPriceFeed'].address, deployer),
-    wdgldPriceFeed: new WdgldPriceFeed(fixture['WdgldPriceFeed'].address, deployer),
-    yearnVaultV2PriceFeed: new YearnVaultV2PriceFeed(fixture['YearnVaultV2PriceFeed'].address, deployer),
-    valueInterpreter: new ValueInterpreter(fixture['ValueInterpreter'].address, deployer),
-    uniswapV2PoolPriceFeed: new UniswapV2PoolPriceFeed(fixture['UniswapV2PoolPriceFeed'].address, deployer),
-    integrationManager: new IntegrationManager(fixture['IntegrationManager'].address, deployer),
-    externalPositionManager: new ExternalPositionManager(fixture['ExternalPositionManager'].address, deployer),
-    externalPositionFactory: new ExternalPositionFactory(fixture['ExternalPositionFactory'].address, deployer),
+    comptrollerLib: new ComptrollerLib(fixture['ComptrollerLib'].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),
-    aaveAdapter: new AaveAdapter(fixture['AaveAdapter'].address, deployer),
-    idleAdapter: new IdleAdapter(fixture['IdleAdapter'].address, deployer),
-    paraSwapV4Adapter: new ParaSwapV4Adapter(fixture['ParaSwapV4Adapter'].address, deployer),
-    synthetixAdapter: new SynthetixAdapter(fixture['SynthetixAdapter'].address, deployer),
-    yearnVaultV2Adapter: new YearnVaultV2Adapter(fixture['YearnVaultV2Adapter'].address, deployer),
-    zeroExV2Adapter: new ZeroExV2Adapter(fixture['ZeroExV2Adapter'].address, deployer),
-    compoundAdapter: new CompoundAdapter(fixture['CompoundAdapter'].address, deployer),
-    uniswapV2Adapter: new UniswapV2Adapter(fixture['UniswapV2Adapter'].address, deployer),
-    uniswapV3Adapter: new UniswapV3Adapter(fixture['UniswapV3Adapter'].address, deployer),
-    curveExchangeAdapter: new CurveExchangeAdapter(fixture['CurveExchangeAdapter'].address, deployer),
-    feeManager: new FeeManager(fixture['FeeManager'].address, deployer),
-    comptrollerLib: new ComptrollerLib(fixture['ComptrollerLib'].address, deployer),
+    curvePriceFeed: new CurvePriceFeed(fixture['CurvePriceFeed'].address, deployer),
+    depositWrapper: new DepositWrapper(fixture['DepositWrapper'].address, deployer),
+    dispatcher: new Dispatcher(fixture['Dispatcher'].address, deployer),
     entranceRateBurnFee: new EntranceRateBurnFee(fixture['EntranceRateBurnFee'].address, deployer),
     entranceRateDirectFee: new EntranceRateDirectFee(fixture['EntranceRateDirectFee'].address, deployer),
     exitRateBurnFee: new ExitRateBurnFee(fixture['ExitRateBurnFee'].address, deployer),
     exitRateDirectFee: new ExitRateDirectFee(fixture['ExitRateDirectFee'].address, deployer),
+    externalPositionFactory: new ExternalPositionFactory(fixture['ExternalPositionFactory'].address, deployer),
+    externalPositionManager: new ExternalPositionManager(fixture['ExternalPositionManager'].address, deployer),
+    feeManager: new FeeManager(fixture['FeeManager'].address, deployer),
+    fundDeployer: new FundDeployer(fixture['FundDeployer'].address, deployer),
+    fundValueCalculator: new FundValueCalculator(fixture['FundValueCalculator'].address, deployer),
+    fundValueCalculatorRouter: new FundValueCalculatorRouter(fixture['FundValueCalculatorRouter'].address, deployer),
+    fundValueCalculatorUsdWrapper: new FundValueCalculatorUsdWrapper(fixture['FundValueCalculatorUsdWrapper'].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),
+    lidoStethPriceFeed: new LidoStethPriceFeed(fixture['LidoStethPriceFeed'].address, deployer),
     managementFee: new ManagementFee(fixture['ManagementFee'].address, deployer),
-    performanceFee: new PerformanceFee(fixture['PerformanceFee'].address, deployer),
-    depositWrapper: new DepositWrapper(fixture['DepositWrapper'].address, deployer),
-    unpermissionedActionsWrapper: new UnpermissionedActionsWrapper(fixture['UnpermissionedActionsWrapper'].address, deployer),
-    allowedAdapterIncomingAssetsPolicy: new AllowedAdapterIncomingAssetsPolicy(fixture['AllowedAdapterIncomingAssetsPolicy'].address, deployer),
+    minAssetBalancesPostRedemptionPolicy: new MinAssetBalancesPostRedemptionPolicy(fixture['MinAssetBalancesPostRedemptionPolicy'].address, deployer),
     minMaxInvestmentPolicy: new MinMaxInvestmentPolicy(fixture['MinMaxInvestmentPolicy'].address, deployer),
-    allowedDepositRecipientsPolicy: new AllowedDepositRecipientsPolicy(fixture['AllowedDepositRecipientsPolicy'].address, deployer),
-    guaranteedRedemptionPolicy: new GuaranteedRedemptionPolicy(fixture['GuaranteedRedemptionPolicy'].address, deployer),
-    globalConfigLib: new GlobalConfigLib(fixture['GlobalConfigLib'].address, deployer),
-    globalConfigProxy: new GlobalConfigLib(fixture['GlobalConfigProxy'].address, deployer),
-    assetFinalityResolver: new AssetFinalityResolver(fixture['AssetFinalityResolver'].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),
+    poolTogetherV4Adapter: new PoolTogetherV4Adapter(fixture['PoolTogetherV4Adapter'].address, deployer),
+    poolTogetherV4PriceFeed: new PoolTogetherV4PriceFeed(fixture['PoolTogetherV4PriceFeed'].address, deployer),
     protocolFeeReserveLib: new ProtocolFeeReserveLib(fixture['ProtocolFeeReserveLib'].address, deployer),
     protocolFeeReserveProxy: new ProtocolFeeReserveLib(fixture['ProtocolFeeReserveProxy'].address, deployer),
     protocolFeeTracker: new ProtocolFeeTracker(fixture['ProtocolFeeTracker'].address, deployer),
-    gasRelayPaymasterFactory: new GasRelayPaymasterFactory(fixture['GasRelayPaymasterFactory'].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),
+    valueInterpreter: new ValueInterpreter(fixture['ValueInterpreter'].address, deployer),
+    vaultLib: new VaultLib(fixture['VaultLib'].address, deployer),
+    yearnVaultV2Adapter: new YearnVaultV2Adapter(fixture['YearnVaultV2Adapter'].address, deployer),
+    yearnVaultV2PriceFeed: new YearnVaultV2PriceFeed(fixture['YearnVaultV2PriceFeed'].address, deployer),
+    zeroExV2Adapter: new ZeroExV2Adapter(fixture['ZeroExV2Adapter'].address, deployer),
   } as const;
 
   return {
-    deployer,
-    deployment,
     accounts,
     config,
+    deployer,
+    deployment,
   } as const;
 }
 
 type Resolve<T extends () => any> = ReturnType<T> extends Promise<infer U> ? U : ReturnType<T>;
-type ContractMap = Record<string, Contract>;
-
-export interface DeploymentFixtureWithoutConfig<T extends ContractMap> {
-  deployer: SignerWithAddress;
-  deployment: T;
-  accounts: SignerWithAddress[];
-}
-
-export interface DeploymentFixtureWithConfig<T extends ContractMap> extends DeploymentFixtureWithoutConfig<T> {
-  config: DeploymentConfig;
-}
 
 export type ProtocolDeployment = Resolve<typeof deployProtocolFixture>;
 
-// TODO: Remove this.
-// eslint-disable-next-line @typescript-eslint/no-unused-vars
-export async function defaultTestDeployment(_: any): Promise<any> {
-  throw new Error('Removed');
+import type { ChainlinkRateAsset } from '@enzymefinance/protocol';
+
+export interface DeploymentConfig {
+  feeToken: string;
+  weth: string;
+  wrappedNativeAsset: string;
+  primitives: Record<string, string>;
+  gsn: {
+    relayHub: string;
+    relayWorker: string;
+    trustedForwarder: string;
+  };
+  chainlink: {
+    ethusd: string;
+    aggregators: Record<string, readonly [string, ChainlinkRateAsset]>;
+  };
+  synthetix: {
+    snx: string;
+    susd: string;
+    synths: Record<string, string>;
+    addressResolver: string;
+    delegateApprovals: string;
+    originator: string;
+    redeemer: string;
+    trackingCode: string;
+  };
+  curve: {
+    addressProvider: string;
+    minter: string;
+    pools: Record<string, { pool: string; lpToken: string; liquidityGaugeToken: string; invariantProxyAsset: string }>;
+  };
+  aave: {
+    lendingPoolAddressProvider: string;
+    protocolDataProvider: string;
+    atokens: Record<string, [string, string]>;
+  };
+  compound: {
+    ceth: string;
+    comptroller: string;
+    ctokens: Record<string, string>;
+  };
+  idle: {
+    bestYieldIdleDai: string;
+    bestYieldIdleUsdc: string;
+    bestYieldIdleUsdt: string;
+    bestYieldIdleSusd: string;
+    bestYieldIdleTusd: string;
+    bestYieldIdleWbtc: string;
+    riskAdjustedIdleDai: string;
+    riskAdjustedIdleUsdc: string;
+    riskAdjustedIdleUsdt: string;
+  };
+  lido: {
+    steth: string;
+  };
+  paraSwapV4: {
+    augustusSwapper: string;
+    tokenTransferProxy: string;
+  };
+  paraSwapV5: {
+    augustusSwapper: string;
+    tokenTransferProxy: string;
+  };
+  poolTogetherV4: {
+    ptTokens: Record<string, [string, string]>;
+  };
+  stakehound: {
+    steth: string;
+  };
+  unsupportedAssets: Record<string, string>;
+  uniswap: {
+    factory: string;
+    router: string;
+    pools: Record<string, string>;
+  };
+  uniswapV3: {
+    router: string;
+    nonFungiblePositionManager: string;
+  };
+  yearn: {
+    vaultV2: {
+      registry: string;
+      yVaults: Record<string, string>;
+    };
+  };
+  zeroex: {
+    exchange: string;
+    allowedMakers: string[];
+  };
+  policies: {
+    guaranteedRedemption: {
+      redemptionWindowBuffer: number;
+    };
+  };
 }

package/src/gasRelayer.ts

@@ -1,11 +1,9 @@
-import { BigNumber, BigNumberish, utils } from 'ethers';
-import { ContractReceipt } from '@enzymefinance/ethers';
-import {
-  isTypedDataSigner,
-  IGsnRelayHub,
-  createSignedRelayRequest,
-  CreateSignedRelayRequestOptions,
-} from '@enzymefinance/protocol';
+import type { ContractReceipt } from '@enzymefinance/ethers';
+import type { CreateSignedRelayRequestOptions } from '@enzymefinance/protocol';
+import { createSignedRelayRequest, IGsnRelayHub, isTypedDataSigner } from '@enzymefinance/protocol';
+import type { BigNumberish } from 'ethers';
+import { BigNumber, utils } from 'ethers';
+
 import { assertEvent } from './assertions';
 
 export interface RelayTransactionOptions extends CreateSignedRelayRequestOptions {
@@ -26,11 +24,12 @@ export async function relayTransaction(options: RelayTransactionOptions) {
 
   // NOTE: There is an inconsistency between how the typed data object shape and the relayCall argument.
   const mergedRelayRequest = {
-    request: relayRequest,
     relayData,
+    request: relayRequest,
   };
 
   const relayHub = new IGsnRelayHub(options.relayHub, provider.getSigner(options.relayWorker));
+
   return relayHub.relayCall
     .args(defaultMaxAcceptance, mergedRelayRequest, signedRelayRequest, '0x', defaultGasLimit)
     .gas(defaultGasLimit, relayData.gasPrice)
@@ -47,14 +46,14 @@ const rejected = utils.EventFragment.fromString(
 
 export function assertDidRelay(receipt: ContractReceipt<any>) {
   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),
   });
 }
 
@@ -79,14 +78,14 @@ export function assertDidRelayWithCharge(
 
 export function assertPaymasterDidReject(receipt: ContractReceipt<any>) {
   return assertEvent(receipt, rejected, {
-    relayManager: expect.any(String),
-    paymaster: expect.any(String),
     from: expect.any(String),
-    to: expect.any(String),
-    relayWorker: expect.any(String),
-    selector: 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),
+    to: expect.any(String),
   });
 }
 

package/src/helpers.ts

@@ -1,9 +1,11 @@
-import { AddressLike, ContractReceipt } from '@enzymefinance/ethers';
-import { BigNumber, BigNumberish, utils } from 'ethers';
-import { ValueInterpreter } from '@enzymefinance/protocol';
+import type { AddressLike, ContractReceipt } from '@enzymefinance/ethers';
+import type { ValueInterpreter } from '@enzymefinance/protocol';
+import type { BigNumberish } from 'ethers';
+import { BigNumber, utils } from 'ethers';
 
 export async function transactionTimestamp(receipt: ContractReceipt<any>) {
   const block = await provider.getBlock(receipt.blockNumber);
+
   return block.timestamp;
 }
 
@@ -33,5 +35,5 @@ export async function calcMlnValueAndBurnAmountForSharesBuyback({
   // 50% discount
   const mlnAmountToBurn = mlnValueOfBuyback.div(2);
 
-  return { mlnValue: mlnValueOfBuyback, mlnAmountToBurn };
+  return { mlnAmountToBurn, mlnValue: mlnValueOfBuyback };
 }

package/src/scaffolding/assets.ts

@@ -1,6 +1,7 @@
-import { SignerWithAddress } from '@enzymefinance/hardhat';
-import { ComptrollerLib, IntegrationManager, StandardToken } from '@enzymefinance/protocol';
-import { BigNumberish } from 'ethers';
+import type { SignerWithAddress } from '@enzymefinance/hardhat';
+import type { ComptrollerLib, IntegrationManager, StandardToken } from '@enzymefinance/protocol';
+import type { BigNumberish } from 'ethers';
+
 import { addTrackedAssetsToVault } from './extensions/integrations/trackedAssets';
 
 export async function addNewAssetsToFund({
@@ -18,10 +19,10 @@ export async function addNewAssetsToFund({
 }) {
   // First, add tracked assets while their balances are 0
   const receipt = addTrackedAssetsToVault({
-    signer,
+    assets,
     comptrollerProxy,
     integrationManager,
-    assets,
+    signer,
   });
 
   // Then seed the vault with balances as necessary

package/src/scaffolding/chainlink.ts

@@ -1,5 +1,5 @@
-import { BigNumberish } from 'ethers';
-import { MockChainlinkPriceSource } from '@enzymefinance/protocol';
+import type { MockChainlinkPriceSource } from '@enzymefinance/protocol';
+import type { BigNumberish } from 'ethers';
 
 export async function updateChainlinkAggregator(aggregator: MockChainlinkPriceSource, price?: BigNumberish) {
   const answer = price ?? (await aggregator.latestAnswer());

package/src/scaffolding/common.ts

@@ -1,4 +1,4 @@
-import { AddressLike } from '@enzymefinance/ethers';
+import type { AddressLike } from '@enzymefinance/ethers';
 import { StandardToken } from '@enzymefinance/protocol';
 import { utils } from 'ethers';
 

package/src/scaffolding/core.ts

@@ -1,18 +1,20 @@
-import {
+import type {
   AssetFinalityResolver,
+  Dispatcher,
+  GasRelayPaymasterFactory,
+  ValueInterpreter,
+} from '@enzymefinance/protocol';
+import {
   ComptrollerLib,
   ExternalPositionManager,
-  Dispatcher,
   FeeManager,
   FundDeployer,
-  GasRelayPaymasterFactory,
   IntegrationManager,
   PolicyManager,
   ProtocolFeeTracker,
-  ValueInterpreter,
   VaultLib,
 } from '@enzymefinance/protocol';
-import { Signer } from 'ethers';
+import type { Signer } from 'ethers';
 
 // TODO: Should refactor this function to take all deployment contracts and set up everything by default,
 // unless overrides are passed-in
@@ -21,10 +23,7 @@ export async function createFundDeployer({
   assetFinalityResolver,
   externalPositionManager,
   dispatcher,
-  feeManager,
   gasRelayPaymasterFactory,
-  integrationManager,
-  policyManager,
   valueInterpreter,
   vaultLib,
   setOnDispatcher = true,
@@ -50,16 +49,33 @@ export async function createFundDeployer({
   const protocolFeeReserve = await vaultLib.getProtocolFeeReserve();
 
   const nextFundDeployer = await FundDeployer.deploy(deployer, dispatcher, gasRelayPaymasterFactory);
+
+  // Re-deploy extensions with new FundDeployer
+  const nextPolicyManager = await PolicyManager.deploy(deployer, nextFundDeployer, gasRelayPaymasterFactory);
+  const nextExternalPositionManager = await ExternalPositionManager.deploy(
+    deployer,
+    nextFundDeployer,
+    await externalPositionManager.getExternalPositionFactory(),
+    nextPolicyManager,
+  );
+  const nextFeeManager = await FeeManager.deploy(deployer, nextFundDeployer);
+  const nextIntegrationManager = await IntegrationManager.deploy(
+    deployer,
+    nextFundDeployer,
+    nextPolicyManager,
+    valueInterpreter,
+  );
+
   const nextComptrollerLib = await ComptrollerLib.deploy(
     deployer,
     dispatcher,
     protocolFeeReserve,
     nextFundDeployer,
     valueInterpreter,
-    externalPositionManager,
-    feeManager,
-    integrationManager,
-    policyManager,
+    nextExternalPositionManager,
+    nextFeeManager,
+    nextIntegrationManager,
+    nextPolicyManager,
     assetFinalityResolver,
     gasRelayPaymasterFactory,
     mlnToken,

package/src/scaffolding/extensions/common.ts

@@ -1,7 +1,7 @@
-import { AddressLike } from '@enzymefinance/ethers';
-import { SignerWithAddress } from '@enzymefinance/hardhat';
-import { ComptrollerLib } from '@enzymefinance/protocol';
-import { BigNumberish, BytesLike } from 'ethers';
+import type { AddressLike } from '@enzymefinance/ethers';
+import type { SignerWithAddress } from '@enzymefinance/hardhat';
+import type { ComptrollerLib } from '@enzymefinance/protocol';
+import type { BigNumberish, BytesLike } from 'ethers';
 
 export async function callOnExtension({
   comptrollerProxy,