@enzymefinance/testutils 4.0.0-next.7 → 4.0.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@enzymefinance/testutils",
-  "version": "4.0.0-next.7",
+  "version": "4.0.0",
   "main": "dist/enzymefinance-testutils.cjs.js",
   "module": "dist/enzymefinance-testutils.esm.js",
   "browser": {
@@ -11,7 +11,7 @@
     "@babel/runtime": "^7.16.7",
     "@enzymefinance/ethers": "^1.0.16",
     "@enzymefinance/hardhat": "^1.0.16",
-    "@enzymefinance/protocol": "^4.0.0-next.7",
+    "@enzymefinance/protocol": "^4.0.0",
     "ethers": "^5.5.4"
   }
 }

package/src/deployment.ts

@@ -1,5 +1,7 @@
 import {
   AaveAdapter,
+  AaveDebtPositionLib,
+  AaveDebtPositionParser,
   AavePriceFeed,
   AddressListRegistry,
   AllowedAdapterIncomingAssetsPolicy,
@@ -18,10 +20,7 @@ import {
   ConvexCurveLpStakingWrapperPriceFeed,
   CumulativeSlippageTolerancePolicy,
   CurveExchangeAdapter,
-  CurveLiquidityAaveAdapter,
   CurveLiquidityAdapter,
-  CurveLiquiditySethAdapter,
-  CurveLiquidityStethAdapter,
   CurvePriceFeed,
   DepositWrapper,
   Dispatcher,
@@ -49,7 +48,6 @@ import {
   OlympusV2Adapter,
   OnlyRemoveDustExternalPositionPolicy,
   OnlyUntrackDustOrPricelessAssetsPolicy,
-  ParaSwapV4Adapter,
   ParaSwapV5Adapter,
   PerformanceFee,
   PolicyManager,
@@ -58,13 +56,13 @@ import {
   ProtocolFeeReserveLib,
   ProtocolFeeTracker,
   RevertingPriceFeed,
-  StakehoundEthPriceFeed,
   SynthetixAdapter,
   UniswapV2ExchangeAdapter,
   UniswapV2LiquidityAdapter,
   UniswapV2PoolPriceFeed,
   UniswapV3Adapter,
   UnpermissionedActionsWrapper,
+  UsdEthSimulatedAggregator,
   ValueInterpreter,
   VaultLib,
   YearnVaultV2Adapter,
@@ -96,6 +94,8 @@ export async function deployProtocolFixture() {
   // prettier-ignore
   const deployment = {
     aaveAdapter: new AaveAdapter(fixture['AaveAdapter'].address, deployer),
+    aaveDebtPositionLib: new AaveDebtPositionLib(fixture['AaveDebtPositionLib'].address, deployer),
+    aaveDebtPositionParser: new AaveDebtPositionParser(fixture['AaveDebtPositionParser'].address, deployer),
     aavePriceFeed: new AavePriceFeed(fixture['AavePriceFeed'].address, deployer),
     addressListRegistry: new AddressListRegistry(fixture['AddressListRegistry'].address, deployer),
     allowedAdapterIncomingAssetsPolicy: new AllowedAdapterIncomingAssetsPolicy(fixture['AllowedAdapterIncomingAssetsPolicy'].address, deployer),
@@ -114,10 +114,7 @@ export async function deployProtocolFixture() {
     convexCurveLpStakingWrapperPriceFeed: new ConvexCurveLpStakingWrapperPriceFeed(fixture['ConvexCurveLpStakingWrapperPriceFeed'].address, deployer),
     cumulativeSlippageTolerancePolicy: new CumulativeSlippageTolerancePolicy(fixture['CumulativeSlippageTolerancePolicy'].address, deployer),
     curveExchangeAdapter: new CurveExchangeAdapter(fixture['CurveExchangeAdapter'].address, deployer),
-    curveLiquidityAaveAdapter: new CurveLiquidityAaveAdapter(fixture['CurveLiquidityAaveAdapter'].address, deployer),
     curveLiquidityAdapter: new CurveLiquidityAdapter(fixture['CurveLiquidityAdapter'].address, deployer),
-    curveLiquiditySethAdapter: new CurveLiquiditySethAdapter(fixture['CurveLiquiditySethAdapter'].address, deployer),
-    curveLiquidityStethAdapter: new CurveLiquidityStethAdapter(fixture['CurveLiquidityStethAdapter'].address, deployer),
     curvePriceFeed: new CurvePriceFeed(fixture['CurvePriceFeed'].address, deployer),
     depositWrapper: new DepositWrapper(fixture['DepositWrapper'].address, deployer),
     dispatcher: new Dispatcher(fixture['Dispatcher'].address, deployer),
@@ -145,7 +142,6 @@ export async function deployProtocolFixture() {
     olympusV2Adapter: new OlympusV2Adapter(fixture['OlympusV2Adapter'].address, deployer),
     onlyRemoveDustExternalPositionPolicy: new OnlyRemoveDustExternalPositionPolicy(fixture['OnlyRemoveDustExternalPositionPolicy'].address, deployer),
     onlyUntrackDustOrPricelessAssetsPolicy: new OnlyUntrackDustOrPricelessAssetsPolicy(fixture['OnlyUntrackDustOrPricelessAssetsPolicy'].address, deployer),
-    paraSwapV4Adapter: new ParaSwapV4Adapter(fixture['ParaSwapV4Adapter'].address, deployer),
     paraSwapV5Adapter: new ParaSwapV5Adapter(fixture['ParaSwapV5Adapter'].address, deployer),
     performanceFee: new PerformanceFee(fixture['PerformanceFee'].address, deployer),
     policyManager: new PolicyManager(fixture['PolicyManager'].address, deployer),
@@ -155,13 +151,13 @@ export async function deployProtocolFixture() {
     protocolFeeReserveProxy: new ProtocolFeeReserveLib(fixture['ProtocolFeeReserveProxy'].address, deployer),
     protocolFeeTracker: new ProtocolFeeTracker(fixture['ProtocolFeeTracker'].address, deployer),
     revertingPriceFeed: new RevertingPriceFeed(fixture['RevertingPriceFeed'].address, deployer),
-    stakehoundEthPriceFeed: new StakehoundEthPriceFeed(fixture['StakehoundEthPriceFeed'].address, deployer),
     synthetixAdapter: new SynthetixAdapter(fixture['SynthetixAdapter'].address, deployer),
     uniswapV2ExchangeAdapter: new UniswapV2ExchangeAdapter(fixture['UniswapV2ExchangeAdapter'].address, deployer),
     uniswapV2LiquidityAdapter: new UniswapV2LiquidityAdapter(fixture['UniswapV2LiquidityAdapter'].address, deployer),
     uniswapV2PoolPriceFeed: new UniswapV2PoolPriceFeed(fixture['UniswapV2PoolPriceFeed'].address, deployer),
     uniswapV3Adapter: new UniswapV3Adapter(fixture['UniswapV3Adapter'].address, deployer),
     unpermissionedActionsWrapper: new UnpermissionedActionsWrapper(fixture['UnpermissionedActionsWrapper'].address, deployer),
+    usdEthSimulatedAggregator: new UsdEthSimulatedAggregator(fixture['UsdEthSimulatedAggregator'].address, deployer),
     valueInterpreter: new ValueInterpreter(fixture['ValueInterpreter'].address, deployer),
     vaultLib: new VaultLib(fixture['VaultLib'].address, deployer),
     yearnVaultV2Adapter: new YearnVaultV2Adapter(fixture['YearnVaultV2Adapter'].address, deployer),
@@ -184,6 +180,7 @@ export type ProtocolDeployment = Resolve<typeof deployProtocolFixture>;
 import type { ChainlinkRateAsset } from '@enzymefinance/protocol';
 
 export interface DeploymentConfig {
+  feeBps: number;
   feeToken: string;
   feeTokenBurn: {
     burnFromVault: boolean;
@@ -221,6 +218,7 @@ export interface DeploymentConfig {
     pools: Record<string, { pool: string; lpToken: string; liquidityGaugeToken: string; invariantProxyAsset: string }>;
   };
   aave: {
+    incentivesController: string;
     lendingPoolAddressProvider: string;
     protocolDataProvider: string;
     atokens: Record<string, [string, string]>;
@@ -251,10 +249,6 @@ export interface DeploymentConfig {
   olympusV2: {
     stakingContract: string;
   };
-  paraSwapV4: {
-    augustusSwapper: string;
-    tokenTransferProxy: string;
-  };
   paraSwapV5: {
     augustusSwapper: string;
     tokenTransferProxy: string;
@@ -263,9 +257,6 @@ export interface DeploymentConfig {
     ptTokens: Record<string, [string, string]>;
   };
   positionsLimit: number;
-  stakehound: {
-    steth: string;
-  };
   unsupportedAssets: Record<string, string>;
   uniswap: {
     factory: string;

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

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

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

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