@enzymefinance/testutils 4.0.0-next.1 → 4.0.0-next.6

package/CHANGELOG.md

@@ -1,5 +1,37 @@
 # @enzymefinance/testutils
 
+## 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
+
+- 8b844ad4: Publish with call signatures.
+- Updated dependencies [8b844ad4]
+  - @enzymefinance/protocol@4.0.0-next.5
+
+## 4.0.0-next.3
+
+### Patch Changes
+
+- 90955319: Publishing new adapters
+- Updated dependencies [90955319]
+  - @enzymefinance/protocol@4.0.0-next.3
+
+## 4.0.0-next.2
+
+### Patch Changes
+
+- a0b65d53: Publishing post-audit packages.
+- Updated dependencies [a0b65d53]
+  - @enzymefinance/protocol@4.0.0-next.2
+
 ## 4.0.0-next.1
 
 ### Patch Changes

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

@@ -1,4 +1,4 @@
-import { ContractReceipt } from '@enzymefinance/ethers';
-import { utils } from 'ethers';
+import type { ContractReceipt } from '@enzymefinance/ethers';
+import type { utils } from 'ethers';
 export declare function assertEvent<TResult = any>(receipt: ContractReceipt<any>, event: string | utils.EventFragment, match?: TResult): NonNullable<TResult>;
 export declare function assertNoEvent(receipt: ContractReceipt<any>, event: string | utils.EventFragment): void;

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

@@ -1,88 +1,192 @@
-import { Contract } from '@enzymefinance/ethers';
-import { SignerWithAddress } from '@enzymefinance/hardhat';
-import { Dispatcher, VaultLib, FundDeployer, PolicyManager, AavePriceFeed, CompoundPriceFeed, CompoundDebtPositionLib, CompoundDebtPositionParser, CurvePriceFeed, IdlePriceFeed, LidoStethPriceFeed, RevertingPriceFeed, StakehoundEthPriceFeed, SynthetixPriceFeed, WdgldPriceFeed, YearnVaultV2PriceFeed, ValueInterpreter, UniswapV2PoolPriceFeed, IntegrationManager, AaveAdapter, CurveLiquidityAaveAdapter, CurveLiquidityEursAdapter, CurveLiquiditySethAdapter, CurveLiquidityStethAdapter, IdleAdapter, ParaSwapV4Adapter, SynthetixAdapter, YearnVaultV2Adapter, ZeroExV2Adapter, CompoundAdapter, ExternalPositionManager, UniswapV2Adapter, UniswapV3Adapter, CurveExchangeAdapter, FeeManager, ComptrollerLib, EntranceRateBurnFee, EntranceRateDirectFee, ExitRateBurnFee, ExitRateDirectFee, ManagementFee, PerformanceFee, DepositWrapper, UnpermissionedActionsWrapper, AllowedAdapterIncomingAssetsPolicy, MinMaxInvestmentPolicy, AllowedDepositRecipientsPolicy, GuaranteedRedemptionPolicy, GlobalConfigLib, AssetFinalityResolver, ProtocolFeeReserveLib, ProtocolFeeTracker, GasRelayPaymasterFactory, ExternalPositionFactory, AddressListRegistry, AllowedAdaptersPolicy, AllowedAssetsForRedemptionPolicy, AllowedExternalPositionTypesPolicy, AllowedSharesTransferRecipientsPolicy, OnlyUntrackDustOrPricelessAssetsPolicy } from '@enzymefinance/protocol';
-import { DeploymentConfig } from '../../../deploy/utils/config';
-export declare function getNamedSigner(name: string): Promise<SignerWithAddress>;
-export declare function getUnnamedSigners(): Promise<SignerWithAddress[]>;
+import { AaveAdapter, AavePriceFeed, AddressListRegistry, AllowedAdapterIncomingAssetsPolicy, AllowedAdaptersPolicy, AllowedAssetsForRedemptionPolicy, AllowedDepositRecipientsPolicy, AllowedExternalPositionTypesPolicy, AllowedSharesTransferRecipientsPolicy, AssetFinalityResolver, CompoundAdapter, CompoundDebtPositionLib, CompoundDebtPositionParser, CompoundPriceFeed, ComptrollerLib, CumulativeSlippageTolerancePolicy, CurveExchangeAdapter, CurveLiquidityAaveAdapter, CurveLiquidityAdapter, 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, OlympusV2Adapter, 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[]>;
 export declare function deployProtocolFixture(): Promise<{
-    readonly deployer: SignerWithAddress;
+    readonly accounts: import("@enzymefinance/hardhat").SignerWithAddress[];
+    readonly config: DeploymentConfig;
+    readonly deployer: import("@enzymefinance/hardhat").SignerWithAddress;
     readonly deployment: {
-        readonly dispatcher: Dispatcher;
-        readonly vaultLib: VaultLib;
-        readonly fundDeployer: FundDeployer;
-        readonly policyManager: PolicyManager;
+        readonly aaveAdapter: AaveAdapter;
         readonly aavePriceFeed: AavePriceFeed;
+        readonly addressListRegistry: AddressListRegistry;
+        readonly allowedAdapterIncomingAssetsPolicy: AllowedAdapterIncomingAssetsPolicy;
+        readonly allowedAdaptersPolicy: AllowedAdaptersPolicy;
+        readonly allowedAssetsForRedemptionPolicy: AllowedAssetsForRedemptionPolicy;
+        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 curvePriceFeed: CurvePriceFeed;
-        readonly idlePriceFeed: IdlePriceFeed;
-        readonly lidoStethPriceFeed: LidoStethPriceFeed;
-        readonly revertingPriceFeed: RevertingPriceFeed;
-        readonly synthetixPriceFeed: SynthetixPriceFeed;
-        readonly stakehoundEthPriceFeed: StakehoundEthPriceFeed;
-        readonly wdgldPriceFeed: WdgldPriceFeed;
-        readonly yearnVaultV2PriceFeed: YearnVaultV2PriceFeed;
-        readonly valueInterpreter: ValueInterpreter;
-        readonly uniswapV2PoolPriceFeed: UniswapV2PoolPriceFeed;
-        readonly integrationManager: IntegrationManager;
-        readonly externalPositionManager: ExternalPositionManager;
-        readonly externalPositionFactory: ExternalPositionFactory;
+        readonly comptrollerLib: ComptrollerLib;
+        readonly cumulativeSlippageTolerancePolicy: CumulativeSlippageTolerancePolicy;
+        readonly curveExchangeAdapter: CurveExchangeAdapter;
         readonly curveLiquidityAaveAdapter: CurveLiquidityAaveAdapter;
+        readonly curveLiquidityAdapter: CurveLiquidityAdapter;
         readonly curveLiquidityEursAdapter: CurveLiquidityEursAdapter;
         readonly curveLiquiditySethAdapter: CurveLiquiditySethAdapter;
         readonly curveLiquidityStethAdapter: CurveLiquidityStethAdapter;
-        readonly aaveAdapter: AaveAdapter;
-        readonly idleAdapter: IdleAdapter;
-        readonly paraSwapV4Adapter: ParaSwapV4Adapter;
-        readonly synthetixAdapter: SynthetixAdapter;
-        readonly yearnVaultV2Adapter: YearnVaultV2Adapter;
-        readonly zeroExV2Adapter: ZeroExV2Adapter;
-        readonly compoundAdapter: CompoundAdapter;
-        readonly uniswapV2Adapter: UniswapV2Adapter;
-        readonly uniswapV3Adapter: UniswapV3Adapter;
-        readonly curveExchangeAdapter: CurveExchangeAdapter;
-        readonly feeManager: FeeManager;
-        readonly comptrollerLib: ComptrollerLib;
+        readonly curvePriceFeed: CurvePriceFeed;
+        readonly depositWrapper: DepositWrapper;
+        readonly dispatcher: Dispatcher;
         readonly entranceRateBurnFee: EntranceRateBurnFee;
         readonly entranceRateDirectFee: EntranceRateDirectFee;
         readonly exitRateBurnFee: ExitRateBurnFee;
         readonly exitRateDirectFee: ExitRateDirectFee;
+        readonly externalPositionFactory: ExternalPositionFactory;
+        readonly externalPositionManager: ExternalPositionManager;
+        readonly feeManager: FeeManager;
+        readonly fundDeployer: FundDeployer;
+        readonly fundValueCalculator: FundValueCalculator;
+        readonly fundValueCalculatorRouter: FundValueCalculatorRouter;
+        readonly fundValueCalculatorUsdWrapper: FundValueCalculatorUsdWrapper;
+        readonly gasRelayPaymasterFactory: GasRelayPaymasterFactory;
+        readonly guaranteedRedemptionPolicy: GuaranteedRedemptionPolicy;
+        readonly idleAdapter: IdleAdapter;
+        readonly idlePriceFeed: IdlePriceFeed;
+        readonly integrationManager: IntegrationManager;
+        readonly lidoStethPriceFeed: LidoStethPriceFeed;
         readonly managementFee: ManagementFee;
-        readonly performanceFee: PerformanceFee;
-        readonly depositWrapper: DepositWrapper;
-        readonly unpermissionedActionsWrapper: UnpermissionedActionsWrapper;
-        readonly allowedAdapterIncomingAssetsPolicy: AllowedAdapterIncomingAssetsPolicy;
+        readonly minAssetBalancesPostRedemptionPolicy: MinAssetBalancesPostRedemptionPolicy;
         readonly minMaxInvestmentPolicy: MinMaxInvestmentPolicy;
-        readonly allowedDepositRecipientsPolicy: AllowedDepositRecipientsPolicy;
-        readonly guaranteedRedemptionPolicy: GuaranteedRedemptionPolicy;
-        readonly globalConfigLib: GlobalConfigLib;
-        readonly globalConfigProxy: GlobalConfigLib;
-        readonly assetFinalityResolver: AssetFinalityResolver;
+        readonly olympusV2Adapter: OlympusV2Adapter;
+        readonly onlyRemoveDustExternalPositionPolicy: OnlyRemoveDustExternalPositionPolicy;
+        readonly onlyUntrackDustOrPricelessAssetsPolicy: OnlyUntrackDustOrPricelessAssetsPolicy;
+        readonly paraSwapV4Adapter: ParaSwapV4Adapter;
+        readonly paraSwapV5Adapter: ParaSwapV5Adapter;
+        readonly performanceFee: PerformanceFee;
+        readonly policyManager: PolicyManager;
+        readonly poolTogetherV4Adapter: PoolTogetherV4Adapter;
+        readonly poolTogetherV4PriceFeed: PoolTogetherV4PriceFeed;
         readonly protocolFeeReserveLib: ProtocolFeeReserveLib;
         readonly protocolFeeReserveProxy: ProtocolFeeReserveLib;
         readonly protocolFeeTracker: ProtocolFeeTracker;
-        readonly gasRelayPaymasterFactory: GasRelayPaymasterFactory;
-        readonly addressListRegistry: AddressListRegistry;
-        readonly allowedAdaptersPolicy: AllowedAdaptersPolicy;
-        readonly allowedAssetsForRedemptionPolicy: AllowedAssetsForRedemptionPolicy;
-        readonly allowedExternalPositionTypesPolicy: AllowedExternalPositionTypesPolicy;
-        readonly allowedSharesTransferRecipientsPolicy: AllowedSharesTransferRecipientsPolicy;
-        readonly onlyUntrackDustOrPricelessAssetsPolicy: OnlyUntrackDustOrPricelessAssetsPolicy;
+        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 valueInterpreter: ValueInterpreter;
+        readonly vaultLib: VaultLib;
+        readonly yearnVaultV2Adapter: YearnVaultV2Adapter;
+        readonly yearnVaultV2PriceFeed: YearnVaultV2PriceFeed;
+        readonly zeroExV2Adapter: ZeroExV2Adapter;
     };
-    readonly accounts: SignerWithAddress[];
-    readonly config: DeploymentConfig;
 }>;
 declare type Resolve<T extends () => any> = ReturnType<T> extends Promise<infer U> ? U : ReturnType<T>;
-declare 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 declare type ProtocolDeployment = Resolve<typeof deployProtocolFixture>;
-export declare function defaultTestDeployment(_: any): Promise<any>;
+import type { ChainlinkRateAsset } from '@enzymefinance/protocol';
+export interface DeploymentConfig {
+    feeToken: string;
+    feeTokenBurn: {
+        burnFromVault: boolean;
+        sendToProtocolFeeReserve: boolean;
+        externalBurnerAddress: 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;
+    };
+    olympusV2: {
+        stakingContract: string;
+    };
+    paraSwapV4: {
+        augustusSwapper: string;
+        tokenTransferProxy: string;
+    };
+    paraSwapV5: {
+        augustusSwapper: string;
+        tokenTransferProxy: string;
+    };
+    poolTogetherV4: {
+        ptTokens: Record<string, [string, string]>;
+    };
+    positionsLimit: number;
+    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;
+        };
+    };
+}
 export {};

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

@@ -1,6 +1,8 @@
-import { BigNumberish, utils } from 'ethers';
-import { ContractReceipt } from '@enzymefinance/ethers';
-import { IGsnRelayHub, CreateSignedRelayRequestOptions } from '@enzymefinance/protocol';
+import type { ContractReceipt } from '@enzymefinance/ethers';
+import type { CreateSignedRelayRequestOptions } from '@enzymefinance/protocol';
+import { IGsnRelayHub } from '@enzymefinance/protocol';
+import type { BigNumberish } from 'ethers';
+import { utils } from 'ethers';
 export interface RelayTransactionOptions extends CreateSignedRelayRequestOptions {
     relayHub: string;
 }
@@ -29,26 +31,26 @@ export declare function relayTransaction(options: RelayTransactionOptions): Prom
     returnValue: string;
 }, IGsnRelayHub>>>;
 export declare function assertDidRelay(receipt: ContractReceipt<any>): {
-    relayManager: any;
-    relayWorker: any;
+    charge: any;
     from: any;
-    to: any;
     paymaster: any;
+    relayManager: any;
+    relayWorker: any;
     selector: any;
     status: any;
-    charge: any;
+    to: any;
 };
 export declare function assertDidRelaySuccessfully(receipt: ContractReceipt<any>): void;
 export declare function assertDidRelayWithError(receipt: ContractReceipt<any>): void;
 export declare function assertDidRelayWithCharge(receipt: ContractReceipt<any>, amount: BigNumberish, tolerance?: BigNumberish): void;
 export declare function assertPaymasterDidReject(receipt: ContractReceipt<any>): {
-    relayManager: any;
-    paymaster: any;
     from: any;
-    to: any;
-    relayWorker: any;
-    selector: any;
     innerGasUsed: any;
+    paymaster: any;
     reason: any;
+    relayManager: any;
+    relayWorker: any;
+    selector: any;
+    to: any;
 };
 export declare function assertPaymasterDidRejectForReason(receipt: ContractReceipt<any>, reason: string): void;

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

@@ -1,6 +1,7 @@
-import { AddressLike, ContractReceipt } from '@enzymefinance/ethers';
-import { BigNumber, BigNumberish } 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 } from 'ethers';
 export declare function transactionTimestamp(receipt: ContractReceipt<any>): Promise<number>;
 export declare function calcMlnValueAndBurnAmountForSharesBuyback({ valueInterpreter, mln, denominationAsset, sharesSupply, gav, buybackSharesAmount, }: {
     valueInterpreter: ValueInterpreter;
@@ -10,6 +11,6 @@ export declare function calcMlnValueAndBurnAmountForSharesBuyback({ valueInterpr
     gav: BigNumberish;
     buybackSharesAmount: BigNumberish;
 }): Promise<{
-    mlnValue: BigNumber;
     mlnAmountToBurn: BigNumber;
+    mlnValue: BigNumber;
 }>;

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

@@ -1,6 +1,6 @@
-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';
 export declare function addNewAssetsToFund({ signer, comptrollerProxy, integrationManager, assets, amounts, }: {
     signer: SignerWithAddress;
     comptrollerProxy: ComptrollerLib;

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

@@ -1,3 +1,3 @@
-import { BigNumberish } from 'ethers';
-import { MockChainlinkPriceSource } from '@enzymefinance/protocol';
+import type { MockChainlinkPriceSource } from '@enzymefinance/protocol';
+import type { BigNumberish } from 'ethers';
 export declare function updateChainlinkAggregator(aggregator: MockChainlinkPriceSource, price?: BigNumberish): Promise<void>;

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

@@ -1,4 +1,4 @@
-import { AddressLike } from '@enzymefinance/ethers';
+import type { AddressLike } from '@enzymefinance/ethers';
 import { StandardToken } from '@enzymefinance/protocol';
 export declare function getAssetBalances({ account, assets }: {
     account: AddressLike;

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

@@ -1,6 +1,7 @@
-import { AssetFinalityResolver, ExternalPositionManager, Dispatcher, FeeManager, FundDeployer, GasRelayPaymasterFactory, IntegrationManager, PolicyManager, ValueInterpreter, VaultLib } from '@enzymefinance/protocol';
-import { Signer } from 'ethers';
-export declare function createFundDeployer({ deployer, assetFinalityResolver, externalPositionManager, dispatcher, feeManager, gasRelayPaymasterFactory, integrationManager, policyManager, valueInterpreter, vaultLib, setOnDispatcher, setReleaseLive, }: {
+import type { AssetFinalityResolver, 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, }: {
     deployer: Signer;
     assetFinalityResolver: AssetFinalityResolver;
     externalPositionManager: ExternalPositionManager;

package/dist/declarations/src/scaffolding/extensions/common.d.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 declare function callOnExtension({ comptrollerProxy, extension, actionId, callArgs, signer, }: {
     comptrollerProxy: ComptrollerLib;
     extension: AddressLike;

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

@@ -1,7 +1,16 @@
-import { AddressLike } from '@enzymefinance/ethers';
-import { SignerWithAddress } from '@enzymefinance/hardhat';
-import { ComptrollerLib, ExternalPositionManager, IExternalPositionProxy } from '@enzymefinance/protocol';
-import { BigNumberish, BytesLike } from 'ethers';
+import type { AddressLike } from '@enzymefinance/ethers';
+import type { SignerWithAddress } from '@enzymefinance/hardhat';
+import type { ComptrollerLib, ExternalPositionManager } from '@enzymefinance/protocol';
+import { IExternalPositionProxy } from '@enzymefinance/protocol';
+import type { BigNumberish, BytesLike } from 'ethers';
+export declare function callOnExternalPosition({ signer, comptrollerProxy, externalPositionManager, externalPositionProxy, actionId, actionArgs, }: {
+    signer: SignerWithAddress;
+    comptrollerProxy: ComptrollerLib;
+    externalPositionManager: ExternalPositionManager;
+    externalPositionProxy: AddressLike;
+    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, }: {
     signer: SignerWithAddress;
     comptrollerProxy: ComptrollerLib;
@@ -9,8 +18,8 @@ export declare function createExternalPosition({ signer, comptrollerProxy, exter
     externalPositionTypeId: BigNumberish;
     initializationData?: BytesLike;
 }): Promise<{
-    receipt: import("@enzymefinance/ethers").ContractReceipt<import("@enzymefinance/ethers").SendFunction<[_extension: AddressLike, _actionId: BigNumberish, _callArgs: BytesLike], void, ComptrollerLib>>;
     externalPositionProxy: IExternalPositionProxy;
+    receipt: import("@enzymefinance/ethers").ContractReceipt<import("@enzymefinance/ethers").SendFunction<[_extension: AddressLike, _actionId: BigNumberish, _callArgs: BytesLike], void, ComptrollerLib>>;
 }>;
 export declare function reactivateExternalPosition({ signer, comptrollerProxy, externalPositionManager, externalPositionProxy, }: {
     signer: SignerWithAddress;

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

@@ -1,16 +1,8 @@
-import { AddressLike } from '@enzymefinance/ethers';
-import { SignerWithAddress } from '@enzymefinance/hardhat';
-import { ComptrollerLib, ExternalPositionManager, VaultLib } from '@enzymefinance/protocol';
-import { BigNumberish } from 'ethers';
-export declare function createCompoundDebtPosition({ signer, comptrollerProxy, externalPositionManager, }: {
-    signer: SignerWithAddress;
-    comptrollerProxy: ComptrollerLib;
-    externalPositionManager: ExternalPositionManager;
-}): Promise<{
-    receipt: import("@enzymefinance/ethers").ContractReceipt<import("@enzymefinance/ethers").SendFunction<[_extension: AddressLike, _actionId: BigNumberish, _callArgs: import("ethers").BytesLike], void, ComptrollerLib>>;
-    externalPositionProxy: import("@enzymefinance/protocol").IExternalPositionProxy;
-}>;
-export declare function addCollateral({ comptrollerProxy, externalPositionManager, fundOwner, assets, amounts, externalPositionProxy, cTokens, }: {
+import type { AddressLike } from '@enzymefinance/ethers';
+import type { SignerWithAddress } from '@enzymefinance/hardhat';
+import type { ComptrollerLib, ExternalPositionManager, VaultLib } from '@enzymefinance/protocol';
+import type { BigNumberish } from 'ethers';
+export declare function compoundDebtPositionAddCollateral({ comptrollerProxy, externalPositionManager, fundOwner, assets, amounts, externalPositionProxy, cTokens, }: {
     comptrollerProxy: ComptrollerLib;
     externalPositionManager: ExternalPositionManager;
     fundOwner: SignerWithAddress;
@@ -19,33 +11,33 @@ export declare function addCollateral({ comptrollerProxy, externalPositionManage
     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 removeCollateral({ comptrollerProxy, externalPositionManager, fundOwner, assets, amounts, externalPositionProxy, cTokens, }: {
+export declare function compoundDebtPositionBorrow({ comptrollerProxy, externalPositionManager, fundOwner, externalPositionProxy, assets, amounts, cTokens, }: {
     comptrollerProxy: ComptrollerLib;
+    vaultProxy: VaultLib;
     externalPositionManager: ExternalPositionManager;
     fundOwner: SignerWithAddress;
+    externalPositionProxy: AddressLike;
     assets: AddressLike[];
     amounts: BigNumberish[];
-    externalPositionProxy: AddressLike;
     cTokens: AddressLike[];
 }): Promise<import("@enzymefinance/ethers").ContractReceipt<import("@enzymefinance/ethers").SendFunction<[_extension: AddressLike, _actionId: BigNumberish, _callArgs: import("ethers").BytesLike], void, ComptrollerLib>>>;
-export declare function borrow({ comptrollerProxy, externalPositionManager, fundOwner, externalPositionProxy, assets, amounts, cTokens, }: {
+export declare function compoundDebtPositionClaimComp({ comptrollerProxy, externalPositionManager, fundOwner, externalPositionProxy, }: {
     comptrollerProxy: ComptrollerLib;
     vaultProxy: VaultLib;
     externalPositionManager: ExternalPositionManager;
     fundOwner: SignerWithAddress;
     externalPositionProxy: AddressLike;
-    assets: AddressLike[];
-    amounts: BigNumberish[];
-    cTokens: AddressLike[];
 }): Promise<import("@enzymefinance/ethers").ContractReceipt<import("@enzymefinance/ethers").SendFunction<[_extension: AddressLike, _actionId: BigNumberish, _callArgs: import("ethers").BytesLike], void, ComptrollerLib>>>;
-export declare function claimComp({ comptrollerProxy, externalPositionManager, fundOwner, externalPositionProxy, }: {
+export declare function compoundDebtPositionRemoveCollateral({ comptrollerProxy, externalPositionManager, fundOwner, assets, amounts, externalPositionProxy, cTokens, }: {
     comptrollerProxy: ComptrollerLib;
-    vaultProxy: VaultLib;
     externalPositionManager: ExternalPositionManager;
     fundOwner: SignerWithAddress;
+    assets: AddressLike[];
+    amounts: BigNumberish[];
     externalPositionProxy: AddressLike;
+    cTokens: AddressLike[];
 }): Promise<import("@enzymefinance/ethers").ContractReceipt<import("@enzymefinance/ethers").SendFunction<[_extension: AddressLike, _actionId: BigNumberish, _callArgs: import("ethers").BytesLike], void, ComptrollerLib>>>;
-export declare function repayBorrow({ comptrollerProxy, externalPositionManager, fundOwner, assets, amounts, externalPositionProxy, cTokens, }: {
+export declare function compoundDebtPositionRepayBorrow({ comptrollerProxy, externalPositionManager, fundOwner, assets, amounts, externalPositionProxy, cTokens, }: {
     comptrollerProxy: ComptrollerLib;
     externalPositionManager: ExternalPositionManager;
     fundOwner: SignerWithAddress;
@@ -54,3 +46,11 @@ export declare function repayBorrow({ comptrollerProxy, externalPositionManager,
     externalPositionProxy: AddressLike;
     cTokens: AddressLike[];
 }): Promise<import("@enzymefinance/ethers").ContractReceipt<import("@enzymefinance/ethers").SendFunction<[_extension: AddressLike, _actionId: BigNumberish, _callArgs: import("ethers").BytesLike], void, ComptrollerLib>>>;
+export declare function createCompoundDebtPosition({ 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/index.d.ts

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

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

@@ -1,7 +1,8 @@
-import { ComptrollerLib, ExternalPositionFactory, ExternalPositionManager, MockGenericExternalPositionLib, MockGenericExternalPositionParser } from '@enzymefinance/protocol/src';
-import { SignerWithAddress } from '@enzymefinance/hardhat';
-import { AddressLike } from '@enzymefinance/ethers';
-import { BigNumberish } from 'ethers';
+import type { AddressLike } from '@enzymefinance/ethers';
+import type { SignerWithAddress } from '@enzymefinance/hardhat';
+import type { ComptrollerLib, ExternalPositionFactory, ExternalPositionManager } from '@enzymefinance/protocol';
+import { MockGenericExternalPositionLib, MockGenericExternalPositionParser } from '@enzymefinance/protocol';
+import type { BigNumberish } from 'ethers';
 export declare function createMockExternalPosition({ comptrollerProxy, externalPositionManager, externalPositionFactory, defaultActionAssetsToTransfer, defaultActionAmountsToTransfer, defaultActionAssetsToReceive, fundOwner, deployer, }: {
     comptrollerProxy: ComptrollerLib;
     externalPositionManager: ExternalPositionManager;
@@ -12,9 +13,41 @@ export declare function createMockExternalPosition({ comptrollerProxy, externalP
     fundOwner: SignerWithAddress;
     deployer: SignerWithAddress;
 }): Promise<{
-    typeId: import("ethers").BigNumber;
-    mockGenericExternalPositionLib: MockGenericExternalPositionLib;
-    mockExternalPositionParser: MockGenericExternalPositionParser;
     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>>;
+    typeId: import("ethers").BigNumber;
 }>;
+export declare function mockExternalPositionAddDebtAssets({ signer, comptrollerProxy, externalPositionManager, externalPositionProxy, assets, amounts, }: {
+    signer: SignerWithAddress;
+    comptrollerProxy: ComptrollerLib;
+    externalPositionManager: ExternalPositionManager;
+    externalPositionProxy: AddressLike;
+    assets: AddressLike[];
+    amounts: BigNumberish[];
+}): Promise<import("@enzymefinance/ethers").ContractReceipt<import("@enzymefinance/ethers").SendFunction<[_extension: AddressLike, _actionId: BigNumberish, _callArgs: import("ethers").BytesLike], void, ComptrollerLib>>>;
+export declare function mockExternalPositionAddManagedAssets({ signer, comptrollerProxy, externalPositionManager, externalPositionProxy, assets, amounts, }: {
+    signer: SignerWithAddress;
+    comptrollerProxy: ComptrollerLib;
+    externalPositionManager: ExternalPositionManager;
+    externalPositionProxy: AddressLike;
+    assets: AddressLike[];
+    amounts: BigNumberish[];
+}): Promise<import("@enzymefinance/ethers").ContractReceipt<import("@enzymefinance/ethers").SendFunction<[_extension: AddressLike, _actionId: BigNumberish, _callArgs: import("ethers").BytesLike], void, ComptrollerLib>>>;
+export declare function mockExternalPositionRemoveDebtAssets({ signer, comptrollerProxy, externalPositionManager, externalPositionProxy, assets, amounts, }: {
+    signer: SignerWithAddress;
+    comptrollerProxy: ComptrollerLib;
+    externalPositionManager: ExternalPositionManager;
+    externalPositionProxy: AddressLike;
+    assets: AddressLike[];
+    amounts: BigNumberish[];
+}): Promise<import("@enzymefinance/ethers").ContractReceipt<import("@enzymefinance/ethers").SendFunction<[_extension: AddressLike, _actionId: BigNumberish, _callArgs: import("ethers").BytesLike], void, ComptrollerLib>>>;
+export declare function mockExternalPositionRemoveManagedAssets({ signer, comptrollerProxy, externalPositionManager, externalPositionProxy, assets, amounts, }: {
+    signer: SignerWithAddress;
+    comptrollerProxy: ComptrollerLib;
+    externalPositionManager: ExternalPositionManager;
+    externalPositionProxy: AddressLike;
+    assets: AddressLike[];
+    amounts: BigNumberish[];
+}): Promise<import("@enzymefinance/ethers").ContractReceipt<import("@enzymefinance/ethers").SendFunction<[_extension: AddressLike, _actionId: BigNumberish, _callArgs: import("ethers").BytesLike], void, ComptrollerLib>>>;