@enzymefinance/testutils 4.0.0-next.2 → 4.0.0-next.7

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

@@ -1,15 +1,13 @@
-import { AddressLike } from '@enzymefinance/ethers';
-import { SignerWithAddress } from '@enzymefinance/hardhat';
+import type { AddressLike } from '@enzymefinance/ethers';
+import type { SignerWithAddress } from '@enzymefinance/hardhat';
+import type { ComptrollerLib, IntegrationManager, StandardToken } from '@enzymefinance/protocol';
 import {
   callOnIntegrationArgs,
-  ComptrollerLib,
-  IntegrationManager,
   IntegrationManagerActionId,
-  StandardToken,
   takeOrderSelector,
   uniswapV3TakeOrderArgs,
 } from '@enzymefinance/protocol';
-import { BigNumber, BigNumberish } from 'ethers';
+import type { BigNumber, BigNumberish } from 'ethers';
 
 export async function uniswapV3TakeOrder({
   comptrollerProxy,
@@ -34,20 +32,21 @@ export async function uniswapV3TakeOrder({
 }) {
   if (seedFund) {
     // Seed the VaultProxy with enough outgoingAsset for the tx
-    await pathAddresses[0].transfer(await comptrollerProxy.getVaultProxy(), outgoingAssetAmount);
+    const vaultProxy = await comptrollerProxy.getVaultProxy();
+    await pathAddresses[0].transfer(vaultProxy, outgoingAssetAmount);
   }
 
   const takeOrderArgs = uniswapV3TakeOrderArgs({
+    minIncomingAssetAmount,
+    outgoingAssetAmount,
     pathAddresses,
     pathFees,
-    outgoingAssetAmount,
-    minIncomingAssetAmount,
   });
 
   const callArgs = callOnIntegrationArgs({
     adapter: uniswapV3Adapter,
-    selector: takeOrderSelector,
     encodedCallArgs: takeOrderArgs,
+    selector: takeOrderSelector,
   });
 
   return comptrollerProxy

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

@@ -1,17 +1,15 @@
-import { SignerWithAddress } from '@enzymefinance/hardhat';
+import type { SignerWithAddress } from '@enzymefinance/hardhat';
+import type { ComptrollerLib, IntegrationManager, StandardToken, YearnVaultV2Adapter } from '@enzymefinance/protocol';
 import {
   callOnIntegrationArgs,
-  ComptrollerLib,
-  IntegrationManager,
   IntegrationManagerActionId,
   lendSelector,
   redeemSelector,
-  StandardToken,
-  YearnVaultV2Adapter,
   yearnVaultV2LendArgs,
   yearnVaultV2RedeemArgs,
 } from '@enzymefinance/protocol';
-import { BigNumber, BigNumberish } from 'ethers';
+import type { BigNumberish } from 'ethers';
+import { BigNumber } from 'ethers';
 
 export async function yearnVaultV2Lend({
   signer,
@@ -32,12 +30,12 @@ export async function yearnVaultV2Lend({
 }) {
   const callArgs = callOnIntegrationArgs({
     adapter: yearnVaultV2Adapter,
-    selector: lendSelector,
     encodedCallArgs: yearnVaultV2LendArgs({
-      yVault,
-      outgoingUnderlyingAmount,
       minIncomingYVaultSharesAmount,
+      outgoingUnderlyingAmount,
+      yVault,
     }),
+    selector: lendSelector,
   });
 
   return comptrollerProxy
@@ -66,13 +64,13 @@ export async function yearnVaultV2Redeem({
 }) {
   const callArgs = callOnIntegrationArgs({
     adapter: yearnVaultV2Adapter,
-    selector: redeemSelector,
     encodedCallArgs: yearnVaultV2RedeemArgs({
-      yVault,
       maxOutgoingYVaultSharesAmount,
       minIncomingUnderlyingAmount,
       slippageToleranceBps,
+      yVault,
     }),
+    selector: redeemSelector,
   });
 
   return comptrollerProxy

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

@@ -1,16 +1,18 @@
-import { SignerWithAddress } from '@enzymefinance/hardhat';
-import {
+import type { SignerWithAddress } from '@enzymefinance/hardhat';
+import type {
   ComptrollerLib,
   IntegrationManager,
-  ZeroExV2Adapter,
-  VaultLib,
   SignedZeroExV2Order,
+  VaultLib,
+  ZeroExV2Adapter,
+} from '@enzymefinance/protocol';
+import {
   callOnIntegrationArgs,
+  IntegrationManagerActionId,
   takeOrderSelector,
   zeroExV2TakeOrderArgs,
-  IntegrationManagerActionId,
 } from '@enzymefinance/protocol';
-import { BigNumberish } from 'ethers';
+import type { BigNumberish } from 'ethers';
 
 export async function zeroExV2TakeOrder({
   comptrollerProxy,
@@ -35,8 +37,8 @@ export async function zeroExV2TakeOrder({
 
   const callArgs = callOnIntegrationArgs({
     adapter: zeroExV2Adapter,
-    selector: takeOrderSelector,
     encodedCallArgs: takeOrderArgs,
+    selector: takeOrderSelector,
   });
 
   return comptrollerProxy

package/src/scaffolding/extensions/policies.ts

@@ -1,5 +1,6 @@
 import { IPolicy, PolicyHook, policyManagerConfigArgs } from '@enzymefinance/protocol';
-import { constants, Signer, utils } from 'ethers';
+import type { Signer } from 'ethers';
+import { constants, utils } from 'ethers';
 
 // Policy Manager
 

package/src/scaffolding/setup.ts

@@ -1,18 +1,21 @@
-import { AddressLike, randomAddress } from '@enzymefinance/ethers';
-import { SignerWithAddress } from '@enzymefinance/hardhat';
+import type { AddressLike } from '@enzymefinance/ethers';
+import { randomAddress } from '@enzymefinance/ethers';
+import type { SignerWithAddress } from '@enzymefinance/hardhat';
+import type { FundDeployer, StandardToken } from '@enzymefinance/protocol';
 import {
   ComptrollerLib,
   ComptrollerProxy,
   encodeFunctionData,
-  FundDeployer,
   GasRelayPaymasterLib,
-  StandardToken,
   VaultLib,
   VaultProxy,
 } from '@enzymefinance/protocol';
-import { BigNumber, BigNumberish, BytesLike, utils } from 'ethers';
+import type { BigNumberish, BytesLike } from 'ethers';
+import { BigNumber, utils } from 'ethers';
+
 import { assertEvent } from '../assertions';
-import { buyShares, BuySharesParams } from './shares';
+import type { BuySharesParams } from './shares';
+import { buyShares } from './shares';
 
 export type InitialInvestmentParams = Omit<BuySharesParams, 'comptrollerProxy' | 'denominationAsset'>;
 
@@ -34,6 +37,7 @@ export interface CreateNewFundParams {
   sharesActionTimelock?: BigNumberish;
   fundOwner?: AddressLike;
   fundName?: string;
+  fundSymbol?: string;
   feeManagerConfig?: BytesLike;
   policyManagerConfig?: BytesLike;
   investment?: InitialInvestmentParams;
@@ -66,6 +70,7 @@ export async function createComptrollerProxy({
 
   return {
     comptrollerProxy: new ComptrollerLib(comptrollerProxyContract, signer),
+    // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
     receipt: comptrollerProxyContract.deployment!,
   };
 }
@@ -92,15 +97,15 @@ export async function createMigrationRequest({
     );
 
   const comptrollerDeployedArgs = assertEvent(receipt, 'ComptrollerProxyDeployed', {
-    creator: signer,
     comptrollerProxy: expect.any(String) as string,
+    creator: signer,
     denominationAsset,
     sharesActionTimelock: BigNumber.from(sharesActionTimelock),
   });
 
   return {
-    receipt,
     comptrollerProxy: new ComptrollerLib(comptrollerDeployedArgs.comptrollerProxy, signer),
+    receipt,
   };
 }
 
@@ -112,17 +117,26 @@ export async function createNewFund({
   sharesActionTimelock = 0,
   fundOwner = randomAddress(),
   fundName = 'My Fund',
+  fundSymbol = '',
   feeManagerConfig = '0x',
   policyManagerConfig = '0x',
   investment,
 }: CreateNewFundParams) {
   const receipt = await fundDeployer
     .connect(signer)
-    .createNewFund(fundOwner, fundName, denominationAsset, sharesActionTimelock, feeManagerConfig, policyManagerConfig);
+    .createNewFund(
+      fundOwner,
+      fundName,
+      fundSymbol,
+      denominationAsset,
+      sharesActionTimelock,
+      feeManagerConfig,
+      policyManagerConfig,
+    );
 
   const comptrollerDeployedArgs = assertEvent(receipt, 'ComptrollerProxyDeployed', {
-    creator: signer,
     comptrollerProxy: expect.any(String) as string,
+    creator: signer,
     denominationAsset,
     sharesActionTimelock: BigNumber.from(sharesActionTimelock),
   });
@@ -130,9 +144,9 @@ export async function createNewFund({
   const comptrollerProxy = new ComptrollerLib(comptrollerDeployedArgs.comptrollerProxy, signer);
 
   const newFundDeployedArgs = assertEvent(receipt, 'NewFundCreated', {
+    comptrollerProxy,
     creator: signer,
     vaultProxy: expect.any(String) as string,
-    comptrollerProxy,
   });
 
   const vaultProxy = new VaultLib(newFundDeployedArgs.vaultProxy, signer);
@@ -172,15 +186,15 @@ export async function createReconfigurationRequest({
     );
 
   const comptrollerDeployedArgs = assertEvent(receipt, 'ComptrollerProxyDeployed', {
-    creator: signer,
     comptrollerProxy: expect.any(String) as string,
+    creator: signer,
     denominationAsset,
     sharesActionTimelock: BigNumber.from(sharesActionTimelock),
   });
 
   return {
-    receipt,
     comptrollerProxy: new ComptrollerLib(comptrollerDeployedArgs.comptrollerProxy, signer),
+    receipt,
   };
 }
 

package/src/scaffolding/shares.ts

@@ -1,7 +1,8 @@
-import { AddressLike } from '@enzymefinance/ethers';
-import { SignerWithAddress } from '@enzymefinance/hardhat';
-import { ComptrollerLib, StandardToken } from '@enzymefinance/protocol';
-import { BigNumberish, constants, utils } from 'ethers';
+import type { AddressLike } from '@enzymefinance/ethers';
+import type { SignerWithAddress } from '@enzymefinance/hardhat';
+import type { ComptrollerLib, StandardToken } from '@enzymefinance/protocol';
+import type { BigNumberish } from 'ethers';
+import { constants, utils } from 'ethers';
 
 export interface BuySharesParams {
   comptrollerProxy: ComptrollerLib;

package/src/scaffolding/vaultCalls.ts

@@ -1,6 +1,8 @@
-import { AddressLike } from '@enzymefinance/ethers';
+import type { AddressLike } from '@enzymefinance/ethers';
+import type { SignerWithAddress } from '@enzymefinance/hardhat';
+import type { AddressListRegistry, AddressListUpdateType, ComptrollerLib } from '@enzymefinance/protocol';
 import {
-  ComptrollerLib,
+  addressListRegistryCreateListSelector,
   curveMinterMintManySelector,
   curveMinterMintSelector,
   curveMinterToggleApproveMintSelector,
@@ -9,6 +11,34 @@ import {
 } from '@enzymefinance/protocol';
 import { constants, utils } from 'ethers';
 
+export async function vaultCallCreateNewList({
+  addressListRegistry,
+  comptrollerProxy,
+  items,
+  owner,
+  signer,
+  updateType,
+}: {
+  addressListRegistry: AddressListRegistry;
+  comptrollerProxy: ComptrollerLib;
+  items: AddressLike[];
+  owner: AddressLike;
+  signer: SignerWithAddress;
+  updateType: AddressListUpdateType;
+}) {
+  await comptrollerProxy
+    .connect(signer)
+    .vaultCallOnContract(
+      addressListRegistry.address,
+      addressListRegistryCreateListSelector,
+      encodeArgs(['address', 'uint8', 'address[]'], [owner, updateType, items]),
+    );
+
+  const listCount = await addressListRegistry.getListCount();
+
+  return listCount.sub(1);
+}
+
 export function vaultCallCurveMinterMint({
   comptrollerProxy,
   minter,

package/src/types.d.ts

@@ -1 +1,2 @@
 import '@enzymefinance/hardhat/types';
+import 'hardhat-deploy/dist/src/type-extensions';

package/src/whales.ts

@@ -1,43 +1,58 @@
 import { resolveAddress } from '@enzymefinance/ethers';
-import { SignerWithAddress } from '@enzymefinance/hardhat';
+import type { SignerWithAddress } from '@enzymefinance/hardhat';
 
+/* eslint-disable sort-keys-fix/sort-keys-fix */
 const whales = {
-  wdgld: '0x9aa65464b4cfbe3dc2bdb3df412aee2b3de86687',
-  adai: '0x62e41b1185023bcc14a465d350e1dde341557925',
-  ausdc: '0x3DdfA8eC3052539b6C9549F12cEA2C295cfF5296',
+  // primitives
   bat: '0x12274c71304bc0e6b38a56b94d2949b118feb838',
   bnb: '0xbe0eb53f46cd790cd13851d5eff43d12404d33e8',
-  bnt: '0xbe0eb53f46cd790cd13851d5eff43d12404d33e8',
-  comp: '0xC89b6f0146642688bb254bF93C28fcCF1E182C81',
+  bnt: '0x7d1ed1601a12a172269436fa95fe156650603c1d',
+  busd: '0x47ac0fb4f2d84898e4d9e7b4dab3c24507a6d503',
+  comp: '0x0f50d31b3eaefd65236dd3736b863cffa4c63c4e',
   crv: '0x4ce799e6eD8D64536b67dD428565d52A531B3640',
-  dai: '0x16463c0fdb6ba9618909f5b120ea1581618c1b9e',
-  knc: '0x9d1167df52328db20d5d77288dce6ae3ef3a3e1f',
+  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',
   weth: '0xe08A8b19e5722a201EaF20A6BC595eF655397bd5',
   zrx: '0x206376e8940e42538781cd94ef024df3c1e0fd43',
-  cbat: '0x285306442cd985cab2c30515cfdab106fca7bc44',
+  // aTokens
+  ausdc: '0x3DdfA8eC3052539b6C9549F12cEA2C295cfF5296',
+  ausdt: '0x7d6149ad9a573a6e2ca6ebf7d4897c1b766841b4',
+  // cTokens
   ccomp: '0xd74f186194ab9219fafac5c2fe4b3270169666db',
-  cdai: '0x2bddEd18E2CA464355091266B7616956944ee7eE',
+  cdai: '0xab4ce310054a11328685ece1043211b68ba5d082',
   ceth: '0x8aceab8167c80cb8b3de7fa6228b889bb1130ee8',
-  crep: '0xc2386de1b7271a87b416f4605d500846e826a185',
-  cuni: '0x8889ff5b6323e71c28c26d2c34b8bb52654f00a6',
-  cusdc: '0xb3bd459e0598dde1fe84b1d0a1430be175b5d5be',
-  czrx: '0x57ca561798413a20508b6bc997481e784f3e6e5f',
+  cuni: '0x39d8014b4f40d2cbc441137011d32023f4f1fd87',
+  cusdc: '0xe1ed4da4284924ddaf69983b4d813fb1be58c380',
+  // fTokens
+  fdai7: '0x88884e35d7006ae84efef09ee6bc6a43dd8e2bb8',
+  feth7: '0xcd2ba6a4d50745b0b4096186f925115387852c15',
+  fdai8: '0x93f3f612a525a59523e91cc5552f718df9fc0746',
+  ftribe8: '0xdb5ac83c137321da29a59a7592232bc4ed461730',
+  // ptTokens
+  ptUsdc: '0xd18236cd213f39d078177b6f6908f0e44e88e4aa',
+  // synths (unsupported)
   seth: '0xc34a7c65aa08cb36744bda8eeec7b8e9891e147c',
-  seur: '0xe896e539e557bc751860a7763c8dd589af1698ce',
-  susd: '0x49BE88F0fcC3A8393a59d3688480d7D253C37D2A',
+  sxag: '0x40d68c490bf7262ec40048099aec23535f734be2',
+  sxau: '0x92eb453b7b5b8d41edb44e2c8b8b53eb70a482c7',
+  // misc
   lidoSteth: '0x31f644e2dd5d74f5c8d6d9de89dd517474d51800',
-  eurs: '0x98ed26de6451db36246672df78ae7c50f2c76f6d',
-  idle: '0x34aaa3d5a73d6f9594326d0422ce69748f09b14f',
+  ust: '0xf584f8728b874a6a5c7a8d4d387c9aae9172d621',
+  // Curve steth pool related
+  stecrv: '0x56c915758ad3f76fd287fff7563ee313142fb663',
 } as const;
+/* eslint-enable sort-keys-fix/sort-keys-fix */
 
 export type Whale = keyof typeof whales;
 export type WhaleSigners<T extends Partial<Whale> = Whale> = Record<T, SignerWithAddress>;
@@ -45,12 +60,14 @@ export type WhaleSigners<T extends Partial<Whale> = Whale> = Record<T, SignerWit
 export async function unlockWhale(token: Whale) {
   const address = resolveAddress(whales[token]);
   await provider.send('hardhat_impersonateAccount', [address]);
+
   return provider.getSignerWithAddress(address);
 }
 
 export async function unlockAllWhales() {
   const keys = Object.keys(whales) as Whale[];
   const signers = await Promise.all(keys.map(async (token) => unlockWhale(token)));
+
   return keys.reduce((carry, key, index) => {
     return { ...carry, [key]: signers[index] };
   }, {} as WhaleSigners);
@@ -58,6 +75,7 @@ export async function unlockAllWhales() {
 
 export async function unlockWhales<T extends Whale>(...tokens: T[]) {
   const signers = await Promise.all(tokens.map(async (token) => unlockWhale(token)));
+
   return tokens.reduce((carry, key, index) => {
     return { ...carry, [key]: signers[index] };
   }, {} as WhaleSigners<T>);