@enzymefinance/testutils 4.0.0-next.5 → 4.0.0

package/CHANGELOG.md

@@ -1,5 +1,45 @@
 # @enzymefinance/testutils
 
+## 4.0.0
+
+### Major Changes
+
+- 3a27d558: Entering pre-release phase for Sulu
+
+### Patch Changes
+
+- 837da449: Upgrade dependencies and publish new version
+- a18335ad: Upgrade dependencies and including new policies.
+- 8b844ad4: Publish with call signatures.
+- 90955319: Publishing new adapters
+- a0b65d53: Publishing post-audit packages.
+- 10b83667: Upgrade deps and publish new version
+- Updated dependencies [837da449]
+- Updated dependencies [a18335ad]
+- Updated dependencies [8b844ad4]
+- Updated dependencies [3a27d558]
+- Updated dependencies [90955319]
+- Updated dependencies [3d8a980b]
+- Updated dependencies [a0b65d53]
+- Updated dependencies [10b83667]
+  - @enzymefinance/protocol@4.0.0
+
+## 4.0.0-next.7
+
+### Patch Changes
+
+- 837da449: Upgrade dependencies and publish new version
+- Updated dependencies [837da449]
+  - @enzymefinance/protocol@4.0.0-next.7
+
+## 4.0.0-next.6
+
+### Patch Changes
+
+- 10b83667: Upgrade deps and publish new version
+- Updated dependencies [10b83667]
+  - @enzymefinance/protocol@4.0.0-next.6
+
 ## 4.0.0-next.5
 
 ### Patch Changes

package/dist/declarations/src/deployment.d.ts

@@ -1,12 +1,14 @@
-import { AaveAdapter, AavePriceFeed, AddressListRegistry, AllowedAdapterIncomingAssetsPolicy, AllowedAdaptersPolicy, AllowedAssetsForRedemptionPolicy, AllowedDepositRecipientsPolicy, AllowedExternalPositionTypesPolicy, AllowedSharesTransferRecipientsPolicy, AssetFinalityResolver, CompoundAdapter, CompoundDebtPositionLib, CompoundDebtPositionParser, CompoundPriceFeed, ComptrollerLib, CumulativeSlippageTolerancePolicy, CurveExchangeAdapter, CurveLiquidityAaveAdapter, CurveLiquidityEursAdapter, CurveLiquiditySethAdapter, CurveLiquidityStethAdapter, CurvePriceFeed, DepositWrapper, Dispatcher, EntranceRateBurnFee, EntranceRateDirectFee, ExitRateBurnFee, ExitRateDirectFee, ExternalPositionFactory, ExternalPositionManager, FeeManager, FundDeployer, FundValueCalculator, FundValueCalculatorRouter, FundValueCalculatorUsdWrapper, GasRelayPaymasterFactory, GuaranteedRedemptionPolicy, IdleAdapter, IdlePriceFeed, IntegrationManager, LidoStethPriceFeed, ManagementFee, MinAssetBalancesPostRedemptionPolicy, MinMaxInvestmentPolicy, OnlyRemoveDustExternalPositionPolicy, OnlyUntrackDustOrPricelessAssetsPolicy, ParaSwapV4Adapter, ParaSwapV5Adapter, PerformanceFee, PolicyManager, PoolTogetherV4Adapter, PoolTogetherV4PriceFeed, ProtocolFeeReserveLib, ProtocolFeeTracker, RevertingPriceFeed, StakehoundEthPriceFeed, SynthetixAdapter, SynthetixPriceFeed, UniswapV2ExchangeAdapter, UniswapV2LiquidityAdapter, UniswapV2PoolPriceFeed, UniswapV3Adapter, UnpermissionedActionsWrapper, ValueInterpreter, VaultLib, YearnVaultV2Adapter, YearnVaultV2PriceFeed, ZeroExV2Adapter } from '@enzymefinance/protocol';
-export declare function getNamedSigner(name: string): Promise<import("@enzymefinance/hardhat").SignerWithAddress>;
-export declare function getUnnamedSigners(): Promise<import("@enzymefinance/hardhat").SignerWithAddress[]>;
+import { AaveAdapter, AaveDebtPositionLib, AaveDebtPositionParser, AavePriceFeed, AddressListRegistry, AllowedAdapterIncomingAssetsPolicy, AllowedAdaptersPolicy, AllowedAssetsForRedemptionPolicy, AllowedDepositRecipientsPolicy, AllowedExternalPositionTypesPolicy, AllowedSharesTransferRecipientsPolicy, CompoundAdapter, CompoundDebtPositionLib, CompoundDebtPositionParser, CompoundPriceFeed, ComptrollerLib, ConvexCurveLpStakingAdapter, ConvexCurveLpStakingWrapperFactory, ConvexCurveLpStakingWrapperPriceFeed, CumulativeSlippageTolerancePolicy, CurveExchangeAdapter, CurveLiquidityAdapter, CurvePriceFeed, DepositWrapper, Dispatcher, EntranceRateBurnFee, EntranceRateDirectFee, ExitRateBurnFee, ExitRateDirectFee, ExternalPositionFactory, ExternalPositionManager, FeeManager, FundDeployer, FundValueCalculator, FundValueCalculatorRouter, FundValueCalculatorUsdWrapper, FuseAdapter, FusePriceFeed, GasRelayPaymasterFactory, IdleAdapter, IdlePriceFeed, IntegrationManager, LidoStethPriceFeed, ManagementFee, MinAssetBalancesPostRedemptionPolicy, MinMaxInvestmentPolicy, OlympusV2Adapter, OnlyRemoveDustExternalPositionPolicy, OnlyUntrackDustOrPricelessAssetsPolicy, ParaSwapV5Adapter, PerformanceFee, PolicyManager, PoolTogetherV4Adapter, PoolTogetherV4PriceFeed, ProtocolFeeReserveLib, ProtocolFeeTracker, RevertingPriceFeed, SynthetixAdapter, UniswapV2ExchangeAdapter, UniswapV2LiquidityAdapter, UniswapV2PoolPriceFeed, UniswapV3Adapter, UnpermissionedActionsWrapper, UsdEthSimulatedAggregator, ValueInterpreter, VaultLib, YearnVaultV2Adapter, YearnVaultV2PriceFeed, ZeroExV2Adapter } from '@enzymefinance/protocol';
+export declare function getNamedSigner(name: string): Promise<import("@nomiclabs/hardhat-ethers/signers").SignerWithAddress>;
+export declare function getUnnamedSigners(): Promise<import("@nomiclabs/hardhat-ethers/signers").SignerWithAddress[]>;
 export declare function deployProtocolFixture(): Promise<{
-    readonly accounts: import("@enzymefinance/hardhat").SignerWithAddress[];
+    readonly accounts: import("@nomiclabs/hardhat-ethers/signers").SignerWithAddress[];
     readonly config: DeploymentConfig;
-    readonly deployer: import("@enzymefinance/hardhat").SignerWithAddress;
+    readonly deployer: import("@nomiclabs/hardhat-ethers/signers").SignerWithAddress;
     readonly deployment: {
         readonly aaveAdapter: AaveAdapter;
+        readonly aaveDebtPositionLib: AaveDebtPositionLib;
+        readonly aaveDebtPositionParser: AaveDebtPositionParser;
         readonly aavePriceFeed: AavePriceFeed;
         readonly addressListRegistry: AddressListRegistry;
         readonly allowedAdapterIncomingAssetsPolicy: AllowedAdapterIncomingAssetsPolicy;
@@ -15,18 +17,17 @@ export declare function deployProtocolFixture(): Promise<{
         readonly allowedDepositRecipientsPolicy: AllowedDepositRecipientsPolicy;
         readonly allowedExternalPositionTypesPolicy: AllowedExternalPositionTypesPolicy;
         readonly allowedSharesTransferRecipientsPolicy: AllowedSharesTransferRecipientsPolicy;
-        readonly assetFinalityResolver: AssetFinalityResolver;
         readonly compoundAdapter: CompoundAdapter;
         readonly compoundDebtPositionLib: CompoundDebtPositionLib;
         readonly compoundDebtPositionParser: CompoundDebtPositionParser;
         readonly compoundPriceFeed: CompoundPriceFeed;
         readonly comptrollerLib: ComptrollerLib;
+        readonly convexCurveLpStakingAdapter: ConvexCurveLpStakingAdapter;
+        readonly convexCurveLpStakingWrapperFactory: ConvexCurveLpStakingWrapperFactory;
+        readonly convexCurveLpStakingWrapperPriceFeed: ConvexCurveLpStakingWrapperPriceFeed;
         readonly cumulativeSlippageTolerancePolicy: CumulativeSlippageTolerancePolicy;
         readonly curveExchangeAdapter: CurveExchangeAdapter;
-        readonly curveLiquidityAaveAdapter: CurveLiquidityAaveAdapter;
-        readonly curveLiquidityEursAdapter: CurveLiquidityEursAdapter;
-        readonly curveLiquiditySethAdapter: CurveLiquiditySethAdapter;
-        readonly curveLiquidityStethAdapter: CurveLiquidityStethAdapter;
+        readonly curveLiquidityAdapter: CurveLiquidityAdapter;
         readonly curvePriceFeed: CurvePriceFeed;
         readonly depositWrapper: DepositWrapper;
         readonly dispatcher: Dispatcher;
@@ -41,8 +42,9 @@ export declare function deployProtocolFixture(): Promise<{
         readonly fundValueCalculator: FundValueCalculator;
         readonly fundValueCalculatorRouter: FundValueCalculatorRouter;
         readonly fundValueCalculatorUsdWrapper: FundValueCalculatorUsdWrapper;
+        readonly fuseAdapter: FuseAdapter;
+        readonly fusePriceFeed: FusePriceFeed;
         readonly gasRelayPaymasterFactory: GasRelayPaymasterFactory;
-        readonly guaranteedRedemptionPolicy: GuaranteedRedemptionPolicy;
         readonly idleAdapter: IdleAdapter;
         readonly idlePriceFeed: IdlePriceFeed;
         readonly integrationManager: IntegrationManager;
@@ -50,9 +52,9 @@ export declare function deployProtocolFixture(): Promise<{
         readonly managementFee: ManagementFee;
         readonly minAssetBalancesPostRedemptionPolicy: MinAssetBalancesPostRedemptionPolicy;
         readonly minMaxInvestmentPolicy: MinMaxInvestmentPolicy;
+        readonly olympusV2Adapter: OlympusV2Adapter;
         readonly onlyRemoveDustExternalPositionPolicy: OnlyRemoveDustExternalPositionPolicy;
         readonly onlyUntrackDustOrPricelessAssetsPolicy: OnlyUntrackDustOrPricelessAssetsPolicy;
-        readonly paraSwapV4Adapter: ParaSwapV4Adapter;
         readonly paraSwapV5Adapter: ParaSwapV5Adapter;
         readonly performanceFee: PerformanceFee;
         readonly policyManager: PolicyManager;
@@ -62,14 +64,13 @@ export declare function deployProtocolFixture(): Promise<{
         readonly protocolFeeReserveProxy: ProtocolFeeReserveLib;
         readonly protocolFeeTracker: ProtocolFeeTracker;
         readonly revertingPriceFeed: RevertingPriceFeed;
-        readonly stakehoundEthPriceFeed: StakehoundEthPriceFeed;
         readonly synthetixAdapter: SynthetixAdapter;
-        readonly synthetixPriceFeed: SynthetixPriceFeed;
         readonly uniswapV2ExchangeAdapter: UniswapV2ExchangeAdapter;
         readonly uniswapV2LiquidityAdapter: UniswapV2LiquidityAdapter;
         readonly uniswapV2PoolPriceFeed: UniswapV2PoolPriceFeed;
         readonly uniswapV3Adapter: UniswapV3Adapter;
         readonly unpermissionedActionsWrapper: UnpermissionedActionsWrapper;
+        readonly usdEthSimulatedAggregator: UsdEthSimulatedAggregator;
         readonly valueInterpreter: ValueInterpreter;
         readonly vaultLib: VaultLib;
         readonly yearnVaultV2Adapter: YearnVaultV2Adapter;
@@ -81,7 +82,13 @@ declare type Resolve<T extends () => any> = ReturnType<T> extends Promise<infer
 export declare 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>;
@@ -97,13 +104,16 @@ 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;
@@ -115,6 +125,7 @@ export interface DeploymentConfig {
         }>;
     };
     aave: {
+        incentivesController: string;
         lendingPoolAddressProvider: string;
         protocolDataProvider: string;
         atokens: Record<string, [string, string]>;
@@ -124,6 +135,10 @@ export interface DeploymentConfig {
         comptroller: string;
         ctokens: Record<string, string>;
     };
+    fuse: {
+        fetherTokens: Record<string, string>;
+        ftokens: Record<string, string>;
+    };
     idle: {
         bestYieldIdleDai: string;
         bestYieldIdleUsdc: string;
@@ -138,9 +153,8 @@ export interface DeploymentConfig {
     lido: {
         steth: string;
     };
-    paraSwapV4: {
-        augustusSwapper: string;
-        tokenTransferProxy: string;
+    olympusV2: {
+        stakingContract: string;
     };
     paraSwapV5: {
         augustusSwapper: string;
@@ -149,9 +163,7 @@ export interface DeploymentConfig {
     poolTogetherV4: {
         ptTokens: Record<string, [string, string]>;
     };
-    stakehound: {
-        steth: string;
-    };
+    positionsLimit: number;
     unsupportedAssets: Record<string, string>;
     uniswap: {
         factory: string;
@@ -172,10 +184,5 @@ export interface DeploymentConfig {
         exchange: string;
         allowedMakers: string[];
     };
-    policies: {
-        guaranteedRedemption: {
-            redemptionWindowBuffer: number;
-        };
-    };
 }
 export {};

package/dist/declarations/src/scaffolding/assets.d.ts

@@ -7,4 +7,4 @@ export declare function addNewAssetsToFund({ signer, comptrollerProxy, integrati
     integrationManager: IntegrationManager;
     assets: StandardToken[];
     amounts?: BigNumberish[];
-}): Promise<import("@enzymefinance/ethers").ContractReceipt<import("@enzymefinance/ethers").SendFunction<[_extension: import("@enzymefinance/ethers").AddressLike, _actionId: BigNumberish, _callArgs: import("ethers").BytesLike], void, ComptrollerLib>>>;
+}): Promise<import("@enzymefinance/ethers/*").ContractReceipt<import("@enzymefinance/ethers/*").SendFunction<[_extension: import("@enzymefinance/ethers/*").AddressLike, _actionId: BigNumberish, _callArgs: import("ethers").BytesLike], void, ComptrollerLib>>>;

package/dist/declarations/src/scaffolding/core.d.ts

@@ -1,9 +1,8 @@
-import type { AssetFinalityResolver, Dispatcher, GasRelayPaymasterFactory, ValueInterpreter } from '@enzymefinance/protocol';
+import type { Dispatcher, GasRelayPaymasterFactory, ValueInterpreter } from '@enzymefinance/protocol';
 import { ExternalPositionManager, FeeManager, FundDeployer, IntegrationManager, PolicyManager, VaultLib } from '@enzymefinance/protocol';
 import type { Signer } from 'ethers';
-export declare function createFundDeployer({ deployer, assetFinalityResolver, externalPositionManager, dispatcher, gasRelayPaymasterFactory, valueInterpreter, vaultLib, setOnDispatcher, setReleaseLive, }: {
+export declare function createFundDeployer({ deployer, externalPositionManager, dispatcher, gasRelayPaymasterFactory, valueInterpreter, vaultLib, setOnDispatcher, setReleaseLive, }: {
     deployer: Signer;
-    assetFinalityResolver: AssetFinalityResolver;
     externalPositionManager: ExternalPositionManager;
     dispatcher: Dispatcher;
     feeManager: FeeManager;

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

@@ -0,0 +1,51 @@
+import type { AddressLike } from '@enzymefinance/ethers';
+import type { SignerWithAddress } from '@enzymefinance/hardhat';
+import type { ComptrollerLib, ExternalPositionManager } from '@enzymefinance/protocol';
+import type { BigNumberish } from 'ethers';
+export declare function aaveDebtPositionAddCollateral({ comptrollerProxy, externalPositionManager, signer, aTokens, amounts, externalPositionProxy, }: {
+    comptrollerProxy: ComptrollerLib;
+    externalPositionManager: ExternalPositionManager;
+    signer: SignerWithAddress;
+    aTokens: AddressLike[];
+    amounts: BigNumberish[];
+    externalPositionProxy: AddressLike;
+}): Promise<import("@enzymefinance/ethers").ContractReceipt<import("@enzymefinance/ethers").SendFunction<[_extension: AddressLike, _actionId: BigNumberish, _callArgs: import("ethers").BytesLike], void, ComptrollerLib>>>;
+export declare function aaveDebtPositionBorrow({ comptrollerProxy, externalPositionManager, signer, tokens, amounts, externalPositionProxy, }: {
+    comptrollerProxy: ComptrollerLib;
+    externalPositionManager: ExternalPositionManager;
+    signer: SignerWithAddress;
+    tokens: AddressLike[];
+    amounts: BigNumberish[];
+    externalPositionProxy: AddressLike;
+}): Promise<import("@enzymefinance/ethers").ContractReceipt<import("@enzymefinance/ethers").SendFunction<[_extension: AddressLike, _actionId: BigNumberish, _callArgs: import("ethers").BytesLike], void, ComptrollerLib>>>;
+export declare function aaveDebtPositionClaimRewards({ comptrollerProxy, externalPositionManager, signer, assets, externalPositionProxy, }: {
+    comptrollerProxy: ComptrollerLib;
+    externalPositionManager: ExternalPositionManager;
+    signer: SignerWithAddress;
+    assets: AddressLike[];
+    externalPositionProxy: AddressLike;
+}): Promise<import("@enzymefinance/ethers").ContractReceipt<import("@enzymefinance/ethers").SendFunction<[_extension: AddressLike, _actionId: BigNumberish, _callArgs: import("ethers").BytesLike], void, ComptrollerLib>>>;
+export declare function aaveDebtPositionRemoveCollateral({ comptrollerProxy, externalPositionManager, signer, aTokens, amounts, externalPositionProxy, }: {
+    comptrollerProxy: ComptrollerLib;
+    externalPositionManager: ExternalPositionManager;
+    signer: SignerWithAddress;
+    aTokens: AddressLike[];
+    amounts: BigNumberish[];
+    externalPositionProxy: AddressLike;
+}): Promise<import("@enzymefinance/ethers").ContractReceipt<import("@enzymefinance/ethers").SendFunction<[_extension: AddressLike, _actionId: BigNumberish, _callArgs: import("ethers").BytesLike], void, ComptrollerLib>>>;
+export declare function aaveDebtPositionRepayBorrow({ comptrollerProxy, externalPositionManager, signer, tokens, amounts, externalPositionProxy, }: {
+    comptrollerProxy: ComptrollerLib;
+    externalPositionManager: ExternalPositionManager;
+    signer: SignerWithAddress;
+    tokens: AddressLike[];
+    amounts: BigNumberish[];
+    externalPositionProxy: AddressLike;
+}): Promise<import("@enzymefinance/ethers").ContractReceipt<import("@enzymefinance/ethers").SendFunction<[_extension: AddressLike, _actionId: BigNumberish, _callArgs: import("ethers").BytesLike], void, ComptrollerLib>>>;
+export declare function createAaveDebtPosition({ signer, comptrollerProxy, externalPositionManager, }: {
+    signer: SignerWithAddress;
+    comptrollerProxy: ComptrollerLib;
+    externalPositionManager: ExternalPositionManager;
+}): Promise<{
+    externalPositionProxy: import("@enzymefinance/protocol").IExternalPositionProxy;
+    receipt: import("@enzymefinance/ethers").ContractReceipt<import("@enzymefinance/ethers").SendFunction<[_extension: AddressLike, _actionId: BigNumberish, _callArgs: import("ethers").BytesLike], void, ComptrollerLib>>;
+}>;

package/dist/declarations/src/scaffolding/extensions/external-positions/actions.d.ts

@@ -11,12 +11,13 @@ export declare function callOnExternalPosition({ signer, comptrollerProxy, exter
     actionId: BigNumberish;
     actionArgs: BytesLike;
 }): Promise<import("@enzymefinance/ethers").ContractReceipt<import("@enzymefinance/ethers").SendFunction<[_extension: AddressLike, _actionId: BigNumberish, _callArgs: BytesLike], void, ComptrollerLib>>>;
-export declare function createExternalPosition({ signer, comptrollerProxy, externalPositionManager, externalPositionTypeId, initializationData, }: {
+export declare function createExternalPosition({ signer, comptrollerProxy, externalPositionManager, externalPositionTypeId, initializationData, callOnExternalPositionData, }: {
     signer: SignerWithAddress;
     comptrollerProxy: ComptrollerLib;
     externalPositionManager: ExternalPositionManager;
     externalPositionTypeId: BigNumberish;
     initializationData?: BytesLike;
+    callOnExternalPositionData?: BytesLike;
 }): Promise<{
     externalPositionProxy: IExternalPositionProxy;
     receipt: import("@enzymefinance/ethers").ContractReceipt<import("@enzymefinance/ethers").SendFunction<[_extension: AddressLike, _actionId: BigNumberish, _callArgs: BytesLike], void, ComptrollerLib>>;

package/dist/declarations/src/scaffolding/extensions/external-positions/index.d.ts

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

package/dist/declarations/src/scaffolding/extensions/external-positions/mocks.d.ts

@@ -16,7 +16,10 @@ export declare function createMockExternalPosition({ comptrollerProxy, externalP
     externalPositionProxy: string;
     mockExternalPositionParser: MockGenericExternalPositionParser;
     mockGenericExternalPositionLib: MockGenericExternalPositionLib;
-    receipt: import("@enzymefinance/ethers").ContractReceipt<import("@enzymefinance/ethers").SendFunction<[_extension: AddressLike, _actionId: BigNumberish, _callArgs: import("ethers").BytesLike], void, ComptrollerLib>>;
+    receipt: {
+        externalPositionProxy: import("@enzymefinance/protocol").IExternalPositionProxy;
+        receipt: import("@enzymefinance/ethers").ContractReceipt<import("@enzymefinance/ethers").SendFunction<[_extension: AddressLike, _actionId: BigNumberish, _callArgs: import("ethers").BytesLike], void, ComptrollerLib>>;
+    };
     typeId: import("ethers").BigNumber;
 }>;
 export declare function mockExternalPositionAddDebtAssets({ signer, comptrollerProxy, externalPositionManager, externalPositionProxy, assets, amounts, }: {

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

@@ -1,7 +1,7 @@
 import type { AddressLike, Call, Contract } from '@enzymefinance/ethers';
 import type { SignerWithAddress } from '@enzymefinance/hardhat';
 import type { ComptrollerLib, ExternalPositionManager } from '@enzymefinance/protocol';
-import type { BigNumber, BigNumberish } from 'ethers';
+import type { BigNumber, BigNumberish, BytesLike } from 'ethers';
 export declare enum UniswapV3FeeAmount {
     LOW = 500,
     MEDIUM = 3000,
@@ -26,15 +26,14 @@ export interface IUniswapV3NonFungibleTokenManager extends Contract<IUniswapV3No
     }, Contract<any>>;
 }
 export declare const IUniswapV3NonFungibleTokenManager: import("@enzymefinance/ethers").ContractFactory<IUniswapV3NonFungibleTokenManager, never>;
-export declare function createUniswapV3LiquidityPosition({ signer, comptrollerProxy, externalPositionManager, token0, token1, }: {
+export declare function createUniswapV3LiquidityPosition({ signer, comptrollerProxy, externalPositionManager, callOnExternalPositionData, }: {
     signer: SignerWithAddress;
     comptrollerProxy: ComptrollerLib;
     externalPositionManager: ExternalPositionManager;
-    token0: AddressLike;
-    token1: AddressLike;
+    callOnExternalPositionData?: BytesLike;
 }): Promise<{
     externalPositionProxyAddress: string;
-    receipt: import("@enzymefinance/ethers").ContractReceipt<import("@enzymefinance/ethers").SendFunction<[_extension: AddressLike, _actionId: BigNumberish, _callArgs: import("ethers").BytesLike], void, ComptrollerLib>>;
+    receipt: import("@enzymefinance/ethers").ContractReceipt<import("@enzymefinance/ethers").SendFunction<[_extension: AddressLike, _actionId: BigNumberish, _callArgs: BytesLike], void, ComptrollerLib>>;
 }>;
 export declare function uniswapV3LiquidityPositionAddLiquidity({ signer, comptrollerProxy, externalPositionManager, externalPositionProxy, nftId, amount0Desired, amount1Desired, amount0Min, amount1Min, }: {
     signer: SignerWithAddress;
@@ -46,19 +45,21 @@ export declare function uniswapV3LiquidityPositionAddLiquidity({ signer, comptro
     amount1Desired: BigNumberish;
     amount0Min?: BigNumberish;
     amount1Min?: BigNumberish;
-}): Promise<import("@enzymefinance/ethers").ContractReceipt<import("@enzymefinance/ethers").SendFunction<[_extension: AddressLike, _actionId: BigNumberish, _callArgs: import("ethers").BytesLike], void, ComptrollerLib>>>;
+}): Promise<import("@enzymefinance/ethers").ContractReceipt<import("@enzymefinance/ethers").SendFunction<[_extension: AddressLike, _actionId: BigNumberish, _callArgs: BytesLike], void, ComptrollerLib>>>;
 export declare function uniswapV3LiquidityPositionCollect({ signer, comptrollerProxy, externalPositionManager, externalPositionProxy, nftId, }: {
     signer: SignerWithAddress;
     comptrollerProxy: ComptrollerLib;
     externalPositionManager: ExternalPositionManager;
     externalPositionProxy: AddressLike;
     nftId: BigNumberish;
-}): Promise<import("@enzymefinance/ethers").ContractReceipt<import("@enzymefinance/ethers").SendFunction<[_extension: AddressLike, _actionId: BigNumberish, _callArgs: import("ethers").BytesLike], void, ComptrollerLib>>>;
-export declare function uniswapV3LiquidityPositionMint({ signer, comptrollerProxy, externalPositionManager, externalPositionProxy, fee, tickLower, tickUpper, amount0Desired, amount1Desired, amount0Min, amount1Min, }: {
+}): Promise<import("@enzymefinance/ethers").ContractReceipt<import("@enzymefinance/ethers").SendFunction<[_extension: AddressLike, _actionId: BigNumberish, _callArgs: BytesLike], void, ComptrollerLib>>>;
+export declare function uniswapV3LiquidityPositionMint({ signer, comptrollerProxy, externalPositionManager, externalPositionProxy, token0, token1, fee, tickLower, tickUpper, amount0Desired, amount1Desired, amount0Min, amount1Min, }: {
     signer: SignerWithAddress;
     comptrollerProxy: ComptrollerLib;
     externalPositionManager: ExternalPositionManager;
     externalPositionProxy: AddressLike;
+    token0: AddressLike;
+    token1: AddressLike;
     fee: BigNumberish;
     tickLower: BigNumberish;
     tickUpper: BigNumberish;
@@ -68,7 +69,7 @@ export declare function uniswapV3LiquidityPositionMint({ signer, comptrollerProx
     amount1Min?: BigNumberish;
 }): Promise<{
     nftId: any;
-    receipt: import("@enzymefinance/ethers").ContractReceipt<import("@enzymefinance/ethers").SendFunction<[_extension: AddressLike, _actionId: BigNumberish, _callArgs: import("ethers").BytesLike], void, ComptrollerLib>>;
+    receipt: import("@enzymefinance/ethers").ContractReceipt<import("@enzymefinance/ethers").SendFunction<[_extension: AddressLike, _actionId: BigNumberish, _callArgs: BytesLike], void, ComptrollerLib>>;
 }>;
 export declare function uniswapV3LiquidityPositionPurge({ signer, comptrollerProxy, externalPositionManager, externalPositionProxy, nftId, liquidity, amount0Min, amount1Min, }: {
     signer: SignerWithAddress;
@@ -79,7 +80,7 @@ export declare function uniswapV3LiquidityPositionPurge({ signer, comptrollerPro
     liquidity: BigNumberish;
     amount0Min?: BigNumberish;
     amount1Min?: BigNumberish;
-}): Promise<import("@enzymefinance/ethers").ContractReceipt<import("@enzymefinance/ethers").SendFunction<[_extension: AddressLike, _actionId: BigNumberish, _callArgs: import("ethers").BytesLike], void, ComptrollerLib>>>;
+}): Promise<import("@enzymefinance/ethers").ContractReceipt<import("@enzymefinance/ethers").SendFunction<[_extension: AddressLike, _actionId: BigNumberish, _callArgs: BytesLike], void, ComptrollerLib>>>;
 export declare function uniswapV3LiquidityPositionRemoveLiquidity({ signer, comptrollerProxy, externalPositionManager, externalPositionProxy, nftId, liquidity, amount0Min, amount1Min, }: {
     signer: SignerWithAddress;
     comptrollerProxy: ComptrollerLib;
@@ -89,7 +90,7 @@ export declare function uniswapV3LiquidityPositionRemoveLiquidity({ signer, comp
     liquidity: BigNumberish;
     amount0Min?: BigNumberish;
     amount1Min?: BigNumberish;
-}): Promise<import("@enzymefinance/ethers").ContractReceipt<import("@enzymefinance/ethers").SendFunction<[_extension: AddressLike, _actionId: BigNumberish, _callArgs: import("ethers").BytesLike], void, ComptrollerLib>>>;
+}): Promise<import("@enzymefinance/ethers").ContractReceipt<import("@enzymefinance/ethers").SendFunction<[_extension: AddressLike, _actionId: BigNumberish, _callArgs: BytesLike], void, ComptrollerLib>>>;
 export declare function uniswapV3OrderTokenPair({ tokenA, tokenB }: {
     tokenA: AddressLike;
     tokenB: AddressLike;

package/dist/declarations/src/scaffolding/extensions/fees.d.ts

@@ -6,7 +6,7 @@ export declare function generateFeeManagerConfigWithMockFees({ deployer }: {
 export declare function generateMockFees({ deployer }: {
     deployer: SignerWithAddress;
 }): Promise<{
-    mockContinuousFeeSettleOnly: import("@enzymefinance/ethers").MockContract<IFee>;
-    mockContinuousFeeWithGavAndUpdates: import("@enzymefinance/ethers").MockContract<IFee>;
-    mockPostBuySharesFee: import("@enzymefinance/ethers").MockContract<IFee>;
+    mockContinuousFeeSettleOnly: import("@enzymefinance/ethers/*").MockContract<IFee>;
+    mockContinuousFeeWithGavAndUpdates: import("@enzymefinance/ethers/*").MockContract<IFee>;
+    mockPostBuySharesFee: import("@enzymefinance/ethers/*").MockContract<IFee>;
 }>;

package/dist/declarations/src/scaffolding/extensions/integrations/aave.d.ts

@@ -9,7 +9,7 @@ export declare function aaveLend({ comptrollerProxy, integrationManager, fundOwn
     aaveAdapter: AaveAdapter;
     aToken: StandardToken;
     amount?: BigNumberish;
-}): Promise<import("@enzymefinance/ethers").ContractReceipt<import("@enzymefinance/ethers").SendFunction<[_extension: import("@enzymefinance/ethers").AddressLike, _actionId: BigNumberish, _callArgs: utils.BytesLike], void, ComptrollerLib>>>;
+}): Promise<import("@enzymefinance/ethers/*").ContractReceipt<import("@enzymefinance/ethers/*").SendFunction<[_extension: import("@enzymefinance/ethers/*").AddressLike, _actionId: BigNumberish, _callArgs: utils.BytesLike], void, ComptrollerLib>>>;
 export declare function aaveRedeem({ comptrollerProxy, integrationManager, fundOwner, aaveAdapter, aToken, amount, }: {
     comptrollerProxy: ComptrollerLib;
     integrationManager: IntegrationManager;
@@ -17,4 +17,4 @@ export declare function aaveRedeem({ comptrollerProxy, integrationManager, fundO
     aaveAdapter: AaveAdapter;
     aToken: StandardToken;
     amount?: BigNumberish;
-}): Promise<import("@enzymefinance/ethers").ContractReceipt<import("@enzymefinance/ethers").SendFunction<[_extension: import("@enzymefinance/ethers").AddressLike, _actionId: BigNumberish, _callArgs: utils.BytesLike], void, ComptrollerLib>>>;
+}): Promise<import("@enzymefinance/ethers/*").ContractReceipt<import("@enzymefinance/ethers/*").SendFunction<[_extension: import("@enzymefinance/ethers/*").AddressLike, _actionId: BigNumberish, _callArgs: utils.BytesLike], void, ComptrollerLib>>>;

package/dist/declarations/src/scaffolding/extensions/integrations/compound.d.ts

@@ -1,12 +1,40 @@
 import type { AddressLike, Contract, Send } from '@enzymefinance/ethers';
 import type { SignerWithAddress } from '@enzymefinance/hardhat';
-import type { CompoundAdapter, ComptrollerLib, IntegrationManager, VaultLib } from '@enzymefinance/protocol';
+import type { CompoundAdapter, CompoundPriceFeed, ComptrollerLib, ICERC20, IntegrationManager, VaultLib } from '@enzymefinance/protocol';
 import type { BigNumberish } from 'ethers';
-import { utils } from 'ethers';
+import { BigNumber, utils } from 'ethers';
 export interface ICompoundComptroller extends Contract<ICompoundComptroller> {
     claimComp: Send<(_account: AddressLike) => void>;
 }
 export declare const ICompoundComptroller: import("@enzymefinance/ethers").ContractFactory<ICompoundComptroller, never>;
+export declare function assertCompoundLend({ tokenWhale, comptrollerProxy, vaultProxy, integrationManager, fundOwner, compoundAdapter, tokenAmount, cToken, compoundPriceFeed, }: {
+    tokenWhale: SignerWithAddress;
+    comptrollerProxy: ComptrollerLib;
+    vaultProxy: VaultLib;
+    integrationManager: IntegrationManager;
+    fundOwner: SignerWithAddress;
+    compoundAdapter: CompoundAdapter;
+    tokenAmount?: BigNumber;
+    cToken: ICERC20;
+    compoundPriceFeed: CompoundPriceFeed;
+}): Promise<import("@enzymefinance/ethers").ContractReceipt<import("@enzymefinance/ethers").SendFunction<[_extension: AddressLike, _actionId: BigNumberish, _callArgs: utils.BytesLike], void, ComptrollerLib>>>;
+export declare function assertCompoundRedeem({ comptrollerProxy, vaultProxy, integrationManager, fundOwner, compoundAdapter, cToken, compoundPriceFeed, }: {
+    comptrollerProxy: ComptrollerLib;
+    vaultProxy: VaultLib;
+    integrationManager: IntegrationManager;
+    fundOwner: SignerWithAddress;
+    compoundAdapter: CompoundAdapter;
+    cToken: ICERC20;
+    compoundPriceFeed: CompoundPriceFeed;
+}): Promise<import("@enzymefinance/ethers").ContractReceipt<import("@enzymefinance/ethers").SendFunction<[_extension: AddressLike, _actionId: BigNumberish, _callArgs: utils.BytesLike], void, ComptrollerLib>>>;
+export declare function compoundClaim({ comptrollerProxy, integrationManager, fundOwner, compoundAdapter, compoundComptroller, cTokens, }: {
+    comptrollerProxy: ComptrollerLib;
+    integrationManager: IntegrationManager;
+    fundOwner: SignerWithAddress;
+    compoundAdapter: CompoundAdapter;
+    compoundComptroller: AddressLike;
+    cTokens: AddressLike[];
+}): Promise<import("@enzymefinance/ethers").ContractReceipt<import("@enzymefinance/ethers").SendFunction<[_extension: AddressLike, _actionId: BigNumberish, _callArgs: utils.BytesLike], void, ComptrollerLib>>>;
 export declare function compoundLend({ comptrollerProxy, integrationManager, fundOwner, compoundAdapter, cToken, tokenAmount, cTokenAmount, }: {
     comptrollerProxy: ComptrollerLib;
     integrationManager: IntegrationManager;