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

package/package.json

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

package/src/deployment.ts

@@ -17,6 +17,7 @@ import {
   CumulativeSlippageTolerancePolicy,
   CurveExchangeAdapter,
   CurveLiquidityAaveAdapter,
+  CurveLiquidityAdapter,
   CurveLiquidityEursAdapter,
   CurveLiquiditySethAdapter,
   CurveLiquidityStethAdapter,
@@ -43,6 +44,7 @@ import {
   ManagementFee,
   MinAssetBalancesPostRedemptionPolicy,
   MinMaxInvestmentPolicy,
+  OlympusV2Adapter,
   OnlyRemoveDustExternalPositionPolicy,
   OnlyUntrackDustOrPricelessAssetsPolicy,
   ParaSwapV4Adapter,
@@ -110,6 +112,7 @@ export async function deployProtocolFixture() {
     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),
     curveLiquidityEursAdapter: new CurveLiquidityEursAdapter(fixture['CurveLiquidityEursAdapter'].address, deployer),
     curveLiquiditySethAdapter: new CurveLiquiditySethAdapter(fixture['CurveLiquiditySethAdapter'].address, deployer),
     curveLiquidityStethAdapter: new CurveLiquidityStethAdapter(fixture['CurveLiquidityStethAdapter'].address, deployer),
@@ -136,6 +139,7 @@ export async function deployProtocolFixture() {
     managementFee: new ManagementFee(fixture['ManagementFee'].address, deployer),
     minAssetBalancesPostRedemptionPolicy: new MinAssetBalancesPostRedemptionPolicy(fixture['MinAssetBalancesPostRedemptionPolicy'].address, deployer),
     minMaxInvestmentPolicy: new MinMaxInvestmentPolicy(fixture['MinMaxInvestmentPolicy'].address, deployer),
+    olympusV2Adapter: new OlympusV2Adapter(fixture['OlympusV2Adapter'].address, deployer),
     onlyRemoveDustExternalPositionPolicy: new OnlyRemoveDustExternalPositionPolicy(fixture['OnlyRemoveDustExternalPositionPolicy'].address, deployer),
     onlyUntrackDustOrPricelessAssetsPolicy: new OnlyUntrackDustOrPricelessAssetsPolicy(fixture['OnlyUntrackDustOrPricelessAssetsPolicy'].address, deployer),
     paraSwapV4Adapter: new ParaSwapV4Adapter(fixture['ParaSwapV4Adapter'].address, deployer),
@@ -179,6 +183,11 @@ 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>;
@@ -230,6 +239,9 @@ export interface DeploymentConfig {
   lido: {
     steth: string;
   };
+  olympusV2: {
+    stakingContract: string;
+  };
   paraSwapV4: {
     augustusSwapper: string;
     tokenTransferProxy: string;
@@ -241,6 +253,7 @@ export interface DeploymentConfig {
   poolTogetherV4: {
     ptTokens: Record<string, [string, string]>;
   };
+  positionsLimit: number;
   stakehound: {
     steth: string;
   };

package/src/scaffolding/assets.ts

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

package/src/scaffolding/core.ts

@@ -94,7 +94,9 @@ export async function createFundDeployer({
     await vaultLib.getProtocolFeeReserve(),
     nextProtocolFeeTracker,
     await vaultLib.getMlnToken(),
+    await vaultLib.getMlnBurner(),
     await vaultLib.getWethToken(),
+    await vaultLib.getPositionsLimit(),
   );
   await nextFundDeployer.setVaultLib(nextVaultLib);
 

package/src/scaffolding/extensions/integrations/curve.ts

@@ -5,9 +5,11 @@ import type {
   ComptrollerLib,
   CurveExchangeAdapter,
   CurveLiquidityAaveAdapter,
+  CurveLiquidityAdapter,
   CurveLiquidityEursAdapter,
   CurveLiquiditySethAdapter,
   CurveLiquidityStethAdapter,
+  CurveRedeemType,
   IntegrationManager,
   StandardToken,
 } from '@enzymefinance/protocol';
@@ -20,18 +22,23 @@ import {
   curveAaveStakeArgs,
   curveAaveUnstakeAndRedeemArgs,
   curveAaveUnstakeArgs,
+  curveClaimRewardsArgs,
   curveEursLendAndStakeArgs,
   curveEursLendArgs,
   curveEursRedeemArgs,
   curveEursStakeArgs,
   curveEursUnstakeAndRedeemArgs,
   curveEursUnstakeArgs,
+  curveLendAndStakeArgs,
+  curveLendArgs,
+  curveRedeemArgs,
   curveSethLendAndStakeArgs,
   curveSethLendArgs,
   curveSethRedeemArgs,
   curveSethStakeArgs,
   curveSethUnstakeAndRedeemArgs,
   curveSethUnstakeArgs,
+  curveStakeArgs,
   curveStethLendAndStakeArgs,
   curveStethLendArgs,
   curveStethRedeemArgs,
@@ -39,6 +46,8 @@ import {
   curveStethUnstakeAndRedeemArgs,
   curveStethUnstakeArgs,
   curveTakeOrderArgs,
+  curveUnstakeAndRedeemArgs,
+  curveUnstakeArgs,
   IntegrationManagerActionId,
   lendAndStakeSelector,
   lendSelector,
@@ -48,7 +57,7 @@ import {
   unstakeAndRedeemSelector,
   unstakeSelector,
 } from '@enzymefinance/protocol';
-import type { BigNumberish } from 'ethers';
+import type { BigNumberish, BytesLike } from 'ethers';
 import { BigNumber, constants, utils } from 'ethers';
 
 export interface CurveLiquidityGaugeV2 extends Contract<CurveLiquidityGaugeV2> {
@@ -61,6 +70,16 @@ export const CurveLiquidityGaugeV2 = contract<CurveLiquidityGaugeV2>()`
   function integrate_fraction(address) view returns (uint256)
 `;
 
+export interface CurveRegistry extends Contract<CurveRegistry> {
+  get_coins: Call<(_pool: AddressLike) => AddressLike[], Contract<any>>;
+  get_lp_token: Call<(_pool: AddressLike) => AddressLike, Contract<any>>;
+}
+
+export const CurveRegistry = contract<CurveRegistry>()`
+  function get_coins(address) view returns (address[8])
+  function get_lp_token(address) view returns (address)
+`;
+
 // prettier-ignore
 export interface CurveSwaps extends Contract<CurveSwaps> {
   get_best_rate: Call<(_from: AddressLike, to: AddressLike, amount: BigNumberish) => { bestPool: AddressLike, amountReceived: BigNumber }, CurveSwaps>
@@ -120,6 +139,248 @@ export async function curveTakeOrder({
     .callOnExtension(integrationManager, IntegrationManagerActionId.CallOnIntegration, callArgs);
 }
 
+// combined liquidity
+
+export function curveClaimRewards({
+  comptrollerProxy,
+  integrationManager,
+  fundOwner,
+  curveLiquidityAdapter,
+  gaugeToken,
+}: {
+  comptrollerProxy: ComptrollerLib;
+  integrationManager: IntegrationManager;
+  fundOwner: SignerWithAddress;
+  curveLiquidityAdapter: CurveLiquidityAdapter;
+  gaugeToken: AddressLike;
+}) {
+  const callArgs = callOnIntegrationArgs({
+    adapter: curveLiquidityAdapter,
+    encodedCallArgs: curveClaimRewardsArgs({ gaugeToken }),
+    selector: claimRewardsSelector,
+  });
+
+  return comptrollerProxy
+    .connect(fundOwner)
+    .callOnExtension(integrationManager, IntegrationManagerActionId.CallOnIntegration, callArgs);
+}
+
+export async function curveLend({
+  comptrollerProxy,
+  integrationManager,
+  signer,
+  curveLiquidityAdapter,
+  pool,
+  orderedOutgoingAssetAmounts,
+  minIncomingLpTokenAmount = BigNumber.from(1),
+  useUnderlyings,
+}: {
+  comptrollerProxy: ComptrollerLib;
+  integrationManager: IntegrationManager;
+  signer: SignerWithAddress;
+  curveLiquidityAdapter: CurveLiquidityAdapter;
+  pool: AddressLike;
+  orderedOutgoingAssetAmounts: BigNumberish[];
+  minIncomingLpTokenAmount?: BigNumberish;
+  useUnderlyings: boolean;
+}) {
+  const callArgs = callOnIntegrationArgs({
+    adapter: curveLiquidityAdapter,
+    encodedCallArgs: curveLendArgs({
+      minIncomingLpTokenAmount,
+      orderedOutgoingAssetAmounts,
+      pool,
+      useUnderlyings,
+    }),
+    selector: lendSelector,
+  });
+
+  return comptrollerProxy
+    .connect(signer)
+    .callOnExtension(integrationManager, IntegrationManagerActionId.CallOnIntegration, callArgs);
+}
+
+export async function curveLendAndStake({
+  comptrollerProxy,
+  integrationManager,
+  signer,
+  curveLiquidityAdapter,
+  pool,
+  orderedOutgoingAssetAmounts,
+  incomingGaugeToken,
+  minIncomingGaugeTokenAmount = BigNumber.from(1),
+  useUnderlyings,
+}: {
+  comptrollerProxy: ComptrollerLib;
+  integrationManager: IntegrationManager;
+  signer: SignerWithAddress;
+  curveLiquidityAdapter: CurveLiquidityAdapter;
+  pool: AddressLike;
+  orderedOutgoingAssetAmounts: BigNumberish[];
+  incomingGaugeToken: AddressLike;
+  minIncomingGaugeTokenAmount?: BigNumberish;
+  useUnderlyings: boolean;
+}) {
+  const callArgs = callOnIntegrationArgs({
+    adapter: curveLiquidityAdapter,
+    encodedCallArgs: curveLendAndStakeArgs({
+      incomingGaugeToken,
+      minIncomingGaugeTokenAmount,
+      orderedOutgoingAssetAmounts,
+      pool,
+      useUnderlyings,
+    }),
+    selector: lendAndStakeSelector,
+  });
+
+  return comptrollerProxy
+    .connect(signer)
+    .callOnExtension(integrationManager, IntegrationManagerActionId.CallOnIntegration, callArgs);
+}
+
+export async function curveRedeem({
+  comptrollerProxy,
+  integrationManager,
+  signer,
+  curveLiquidityAdapter,
+  pool,
+  outgoingLpTokenAmount,
+  useUnderlyings,
+  redeemType,
+  incomingAssetData,
+}: {
+  comptrollerProxy: ComptrollerLib;
+  integrationManager: IntegrationManager;
+  signer: SignerWithAddress;
+  curveLiquidityAdapter: CurveLiquidityAdapter;
+  pool: AddressLike;
+  outgoingLpTokenAmount: BigNumberish;
+  useUnderlyings: boolean;
+  redeemType: CurveRedeemType;
+  incomingAssetData: BytesLike;
+}) {
+  const callArgs = callOnIntegrationArgs({
+    adapter: curveLiquidityAdapter,
+    encodedCallArgs: curveRedeemArgs({
+      incomingAssetData,
+      outgoingLpTokenAmount,
+      pool,
+      redeemType,
+      useUnderlyings,
+    }),
+    selector: redeemSelector,
+  });
+
+  return comptrollerProxy
+    .connect(signer)
+    .callOnExtension(integrationManager, IntegrationManagerActionId.CallOnIntegration, callArgs);
+}
+
+export async function curveStake({
+  comptrollerProxy,
+  integrationManager,
+  signer,
+  curveLiquidityAdapter,
+  pool,
+  incomingGaugeToken,
+  amount,
+}: {
+  comptrollerProxy: ComptrollerLib;
+  integrationManager: IntegrationManager;
+  signer: SignerWithAddress;
+  curveLiquidityAdapter: CurveLiquidityAdapter;
+  pool: AddressLike;
+  incomingGaugeToken: AddressLike;
+  amount: BigNumberish;
+}) {
+  const callArgs = callOnIntegrationArgs({
+    adapter: curveLiquidityAdapter,
+    encodedCallArgs: curveStakeArgs({
+      amount,
+      incomingGaugeToken,
+      pool,
+    }),
+    selector: stakeSelector,
+  });
+
+  return comptrollerProxy
+    .connect(signer)
+    .callOnExtension(integrationManager, IntegrationManagerActionId.CallOnIntegration, callArgs);
+}
+
+export async function curveUnstake({
+  comptrollerProxy,
+  integrationManager,
+  signer,
+  curveLiquidityAdapter,
+  pool,
+  outgoingGaugeToken,
+  amount,
+}: {
+  comptrollerProxy: ComptrollerLib;
+  integrationManager: IntegrationManager;
+  signer: SignerWithAddress;
+  curveLiquidityAdapter: CurveLiquidityAdapter;
+  pool: AddressLike;
+  outgoingGaugeToken: AddressLike;
+  amount: BigNumberish;
+}) {
+  const callArgs = callOnIntegrationArgs({
+    adapter: curveLiquidityAdapter,
+    encodedCallArgs: curveUnstakeArgs({
+      amount,
+      outgoingGaugeToken,
+      pool,
+    }),
+    selector: unstakeSelector,
+  });
+
+  return comptrollerProxy
+    .connect(signer)
+    .callOnExtension(integrationManager, IntegrationManagerActionId.CallOnIntegration, callArgs);
+}
+
+export async function curveUnstakeAndRedeem({
+  comptrollerProxy,
+  integrationManager,
+  signer,
+  curveLiquidityAdapter,
+  pool,
+  outgoingGaugeToken,
+  outgoingGaugeTokenAmount,
+  useUnderlyings,
+  redeemType,
+  incomingAssetData,
+}: {
+  comptrollerProxy: ComptrollerLib;
+  integrationManager: IntegrationManager;
+  signer: SignerWithAddress;
+  curveLiquidityAdapter: CurveLiquidityAdapter;
+  pool: AddressLike;
+  outgoingGaugeToken: StandardToken;
+  outgoingGaugeTokenAmount: BigNumberish;
+  useUnderlyings: boolean;
+  redeemType: CurveRedeemType;
+  incomingAssetData: BytesLike;
+}) {
+  const callArgs = callOnIntegrationArgs({
+    adapter: curveLiquidityAdapter,
+    encodedCallArgs: curveUnstakeAndRedeemArgs({
+      incomingAssetData,
+      outgoingGaugeToken,
+      outgoingGaugeTokenAmount,
+      pool,
+      redeemType,
+      useUnderlyings,
+    }),
+    selector: unstakeAndRedeemSelector,
+  });
+
+  return comptrollerProxy
+    .connect(signer)
+    .callOnExtension(integrationManager, IntegrationManagerActionId.CallOnIntegration, callArgs);
+}
+
 // aave pool
 
 export function curveAaveClaimRewards({

package/src/scaffolding/extensions/integrations/index.ts

@@ -3,6 +3,7 @@ export * from './compound';
 export * from './curve';
 export * from './idle';
 export * from './mock';
+export * from './olympusV2';
 export * from './paraSwapV4';
 export * from './paraSwapV5';
 export * from './poolTogetherV4';

package/src/scaffolding/extensions/integrations/olympusV2.ts

@@ -0,0 +1,71 @@
+import type { SignerWithAddress } from '@enzymefinance/hardhat';
+import type { ComptrollerLib, IntegrationManager, OlympusV2Adapter } from '@enzymefinance/protocol';
+import {
+  callOnIntegrationArgs,
+  IntegrationManagerActionId,
+  olympusV2StakeArgs,
+  olympusV2UnstakeArgs,
+  stakeSelector,
+  unstakeSelector,
+} from '@enzymefinance/protocol';
+import type { BigNumberish } from 'ethers';
+
+export async function olympusV2Stake({
+  comptrollerProxy,
+  integrationManager,
+  signer,
+  olympusV2Adapter,
+  amount,
+}: {
+  comptrollerProxy: ComptrollerLib;
+  integrationManager: IntegrationManager;
+  signer: SignerWithAddress;
+  olympusV2Adapter: OlympusV2Adapter;
+  amount: BigNumberish;
+}) {
+  const stakeArgs = olympusV2StakeArgs({
+    amount,
+  });
+
+  const callArgs = callOnIntegrationArgs({
+    adapter: olympusV2Adapter,
+    encodedCallArgs: stakeArgs,
+    selector: stakeSelector,
+  });
+
+  const stakeTx = comptrollerProxy
+    .connect(signer)
+    .callOnExtension(integrationManager, IntegrationManagerActionId.CallOnIntegration, callArgs);
+
+  return stakeTx;
+}
+
+export async function olympusV2Unstake({
+  comptrollerProxy,
+  integrationManager,
+  signer,
+  olympusV2Adapter,
+  amount,
+}: {
+  comptrollerProxy: ComptrollerLib;
+  integrationManager: IntegrationManager;
+  signer: SignerWithAddress;
+  olympusV2Adapter: OlympusV2Adapter;
+  amount: BigNumberish;
+}) {
+  const unstakeArgs = olympusV2UnstakeArgs({
+    amount,
+  });
+
+  const callArgs = callOnIntegrationArgs({
+    adapter: olympusV2Adapter,
+    encodedCallArgs: unstakeArgs,
+    selector: unstakeSelector,
+  });
+
+  const unstakeTx = comptrollerProxy
+    .connect(signer)
+    .callOnExtension(integrationManager, IntegrationManagerActionId.CallOnIntegration, callArgs);
+
+  return unstakeTx;
+}

package/src/whales.ts

@@ -12,12 +12,15 @@ const whales = {
   crv: '0x4ce799e6eD8D64536b67dD428565d52A531B3640',
   dai: '0x47ac0fb4f2d84898e4d9e7b4dab3c24507a6d503',
   knc: '0x09d51654bd9efbfcb56da3491989cc1444095fff',
+  ldo: '0x3dba737ccc50a32a1764b493285dd51c8af6c278',
   link: '0xbe6977e08d4479c0a6777539ae0e8fa27be4e9d6',
   mana: '0xefb94ac00f1cee8a89d5c3f49faa799da6f03024',
   mln: '0xd8f8a53945bcfbbc19da162aa405e662ef71c40d',
+  ohm: '0x71a53aff36a699110d66d6bdfff2320caf8d2d59',
   rep: '0xc6a043b07d33b6f30d8cb501026c391cfd25abe1',
   ren: '0xbe0eb53f46cd790cd13851d5eff43d12404d33e8',
   susd: '0xa5f7a39e55d7878bc5bd754ee5d6bd7a7662355b',
+  sohm: '0xf280f037cdbda99727ddf5dfede91e68fa78605c',
   uni: '0x47173b170c64d16393a52e6c480b3ad8c302ba1e',
   usdc: '0xae2d4617c862309a3d75a0ffb358c7a5009c673f',
   usdt: '0x5041ed759dd4afc3a72b8192c143f72f4724081a',
@@ -25,12 +28,13 @@ const whales = {
   zrx: '0x206376e8940e42538781cd94ef024df3c1e0fd43',
   // aTokens
   ausdc: '0x3DdfA8eC3052539b6C9549F12cEA2C295cfF5296',
+  ausdt: '0x7d6149ad9a573a6e2ca6ebf7d4897c1b766841b4',
   // cTokens
   ccomp: '0xd74f186194ab9219fafac5c2fe4b3270169666db',
   cdai: '0xab4ce310054a11328685ece1043211b68ba5d082',
   ceth: '0x8aceab8167c80cb8b3de7fa6228b889bb1130ee8',
   cuni: '0x39d8014b4f40d2cbc441137011d32023f4f1fd87',
-  cusdc: '0xb3bd459e0598dde1fe84b1d0a1430be175b5d5be',
+  cusdc: '0xe1ed4da4284924ddaf69983b4d813fb1be58c380',
   // ptTokens
   ptUsdc: '0xd18236cd213f39d078177b6f6908f0e44e88e4aa',
   // synths
@@ -40,8 +44,8 @@ const whales = {
   sxau: '0x92eb453b7b5b8d41edb44e2c8b8b53eb70a482c7',
   // misc
   lidoSteth: '0x31f644e2dd5d74f5c8d6d9de89dd517474d51800',
-  ldo: '0x3dba737ccc50a32a1764b493285dd51c8af6c278',
   eurs: '0x98ed26de6451db36246672df78ae7c50f2c76f6d',
+  ust: '0xf584f8728b874a6a5c7a8d4d387c9aae9172d621',
 } as const;
 /* eslint-enable sort-keys-fix/sort-keys-fix */