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

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

@@ -6,7 +6,6 @@ import type {
   CurveExchangeAdapter,
   CurveLiquidityAaveAdapter,
   CurveLiquidityAdapter,
-  CurveLiquidityEursAdapter,
   CurveLiquiditySethAdapter,
   CurveLiquidityStethAdapter,
   CurveRedeemType,
@@ -23,12 +22,6 @@ import {
   curveAaveUnstakeAndRedeemArgs,
   curveAaveUnstakeArgs,
   curveClaimRewardsArgs,
-  curveEursLendAndStakeArgs,
-  curveEursLendArgs,
-  curveEursRedeemArgs,
-  curveEursStakeArgs,
-  curveEursUnstakeAndRedeemArgs,
-  curveEursUnstakeArgs,
   curveLendAndStakeArgs,
   curveLendArgs,
   curveRedeemArgs,
@@ -146,17 +139,17 @@ export function curveClaimRewards({
   integrationManager,
   fundOwner,
   curveLiquidityAdapter,
-  gaugeToken,
+  stakingToken,
 }: {
   comptrollerProxy: ComptrollerLib;
   integrationManager: IntegrationManager;
   fundOwner: SignerWithAddress;
   curveLiquidityAdapter: CurveLiquidityAdapter;
-  gaugeToken: AddressLike;
+  stakingToken: AddressLike;
 }) {
   const callArgs = callOnIntegrationArgs({
     adapter: curveLiquidityAdapter,
-    encodedCallArgs: curveClaimRewardsArgs({ gaugeToken }),
+    encodedCallArgs: curveClaimRewardsArgs({ stakingToken }),
     selector: claimRewardsSelector,
   });
 
@@ -207,8 +200,8 @@ export async function curveLendAndStake({
   curveLiquidityAdapter,
   pool,
   orderedOutgoingAssetAmounts,
-  incomingGaugeToken,
-  minIncomingGaugeTokenAmount = BigNumber.from(1),
+  incomingStakingToken,
+  minIncomingStakingTokenAmount = BigNumber.from(1),
   useUnderlyings,
 }: {
   comptrollerProxy: ComptrollerLib;
@@ -217,15 +210,15 @@ export async function curveLendAndStake({
   curveLiquidityAdapter: CurveLiquidityAdapter;
   pool: AddressLike;
   orderedOutgoingAssetAmounts: BigNumberish[];
-  incomingGaugeToken: AddressLike;
-  minIncomingGaugeTokenAmount?: BigNumberish;
+  incomingStakingToken: AddressLike;
+  minIncomingStakingTokenAmount?: BigNumberish;
   useUnderlyings: boolean;
 }) {
   const callArgs = callOnIntegrationArgs({
     adapter: curveLiquidityAdapter,
     encodedCallArgs: curveLendAndStakeArgs({
-      incomingGaugeToken,
-      minIncomingGaugeTokenAmount,
+      incomingStakingToken,
+      minIncomingStakingTokenAmount,
       orderedOutgoingAssetAmounts,
       pool,
       useUnderlyings,
@@ -282,7 +275,7 @@ export async function curveStake({
   signer,
   curveLiquidityAdapter,
   pool,
-  incomingGaugeToken,
+  incomingStakingToken,
   amount,
 }: {
   comptrollerProxy: ComptrollerLib;
@@ -290,14 +283,14 @@ export async function curveStake({
   signer: SignerWithAddress;
   curveLiquidityAdapter: CurveLiquidityAdapter;
   pool: AddressLike;
-  incomingGaugeToken: AddressLike;
+  incomingStakingToken: AddressLike;
   amount: BigNumberish;
 }) {
   const callArgs = callOnIntegrationArgs({
     adapter: curveLiquidityAdapter,
     encodedCallArgs: curveStakeArgs({
       amount,
-      incomingGaugeToken,
+      incomingStakingToken,
       pool,
     }),
     selector: stakeSelector,
@@ -314,7 +307,7 @@ export async function curveUnstake({
   signer,
   curveLiquidityAdapter,
   pool,
-  outgoingGaugeToken,
+  outgoingStakingToken,
   amount,
 }: {
   comptrollerProxy: ComptrollerLib;
@@ -322,14 +315,14 @@ export async function curveUnstake({
   signer: SignerWithAddress;
   curveLiquidityAdapter: CurveLiquidityAdapter;
   pool: AddressLike;
-  outgoingGaugeToken: AddressLike;
+  outgoingStakingToken: AddressLike;
   amount: BigNumberish;
 }) {
   const callArgs = callOnIntegrationArgs({
     adapter: curveLiquidityAdapter,
     encodedCallArgs: curveUnstakeArgs({
       amount,
-      outgoingGaugeToken,
+      outgoingStakingToken,
       pool,
     }),
     selector: unstakeSelector,
@@ -346,8 +339,8 @@ export async function curveUnstakeAndRedeem({
   signer,
   curveLiquidityAdapter,
   pool,
-  outgoingGaugeToken,
-  outgoingGaugeTokenAmount,
+  outgoingStakingToken,
+  outgoingStakingTokenAmount,
   useUnderlyings,
   redeemType,
   incomingAssetData,
@@ -357,8 +350,8 @@ export async function curveUnstakeAndRedeem({
   signer: SignerWithAddress;
   curveLiquidityAdapter: CurveLiquidityAdapter;
   pool: AddressLike;
-  outgoingGaugeToken: StandardToken;
-  outgoingGaugeTokenAmount: BigNumberish;
+  outgoingStakingToken: StandardToken;
+  outgoingStakingTokenAmount: BigNumberish;
   useUnderlyings: boolean;
   redeemType: CurveRedeemType;
   incomingAssetData: BytesLike;
@@ -367,8 +360,8 @@ export async function curveUnstakeAndRedeem({
     adapter: curveLiquidityAdapter,
     encodedCallArgs: curveUnstakeAndRedeemArgs({
       incomingAssetData,
-      outgoingGaugeToken,
-      outgoingGaugeTokenAmount,
+      outgoingStakingToken,
+      outgoingStakingTokenAmount,
       pool,
       redeemType,
       useUnderlyings,
@@ -615,216 +608,6 @@ export function curveAaveUnstake({
     .callOnExtension(integrationManager, IntegrationManagerActionId.CallOnIntegration, callArgs);
 }
 
-// eurs pool
-
-export function curveEursClaimRewards({
-  comptrollerProxy,
-  integrationManager,
-  fundOwner,
-  curveLiquidityEursAdapter,
-}: {
-  comptrollerProxy: ComptrollerLib;
-  integrationManager: IntegrationManager;
-  fundOwner: SignerWithAddress;
-  curveLiquidityEursAdapter: CurveLiquidityEursAdapter;
-}) {
-  const callArgs = callOnIntegrationArgs({
-    adapter: curveLiquidityEursAdapter,
-    encodedCallArgs: constants.HashZero,
-    selector: claimRewardsSelector,
-  });
-
-  return comptrollerProxy
-    .connect(fundOwner)
-    .callOnExtension(integrationManager, IntegrationManagerActionId.CallOnIntegration, callArgs);
-}
-
-export function curveEursLend({
-  comptrollerProxy,
-  integrationManager,
-  fundOwner,
-  curveLiquidityEursAdapter,
-  outgoingEursAmount,
-  outgoingSeurAmount,
-  minIncomingLPTokenAmount,
-}: {
-  comptrollerProxy: ComptrollerLib;
-  integrationManager: IntegrationManager;
-  fundOwner: SignerWithAddress;
-  curveLiquidityEursAdapter: CurveLiquidityEursAdapter;
-  outgoingEursAmount: BigNumberish;
-  outgoingSeurAmount: BigNumberish;
-  minIncomingLPTokenAmount: BigNumberish;
-}) {
-  const callArgs = callOnIntegrationArgs({
-    adapter: curveLiquidityEursAdapter,
-    encodedCallArgs: curveEursLendArgs({
-      minIncomingLPTokenAmount,
-      outgoingEursAmount,
-      outgoingSeurAmount,
-    }),
-    selector: lendSelector,
-  });
-
-  return comptrollerProxy
-    .connect(fundOwner)
-    .callOnExtension(integrationManager, IntegrationManagerActionId.CallOnIntegration, callArgs);
-}
-
-export function curveEursLendAndStake({
-  comptrollerProxy,
-  integrationManager,
-  fundOwner,
-  curveLiquidityEursAdapter,
-  outgoingEursAmount,
-  outgoingSeurAmount,
-  minIncomingLiquidityGaugeTokenAmount,
-}: {
-  comptrollerProxy: ComptrollerLib;
-  integrationManager: IntegrationManager;
-  fundOwner: SignerWithAddress;
-  curveLiquidityEursAdapter: CurveLiquidityEursAdapter;
-  outgoingEursAmount: BigNumberish;
-  outgoingSeurAmount: BigNumberish;
-  minIncomingLiquidityGaugeTokenAmount: BigNumberish;
-}) {
-  const callArgs = callOnIntegrationArgs({
-    adapter: curveLiquidityEursAdapter,
-    encodedCallArgs: curveEursLendAndStakeArgs({
-      minIncomingLiquidityGaugeTokenAmount,
-      outgoingEursAmount,
-      outgoingSeurAmount,
-    }),
-    selector: lendAndStakeSelector,
-  });
-
-  return comptrollerProxy
-    .connect(fundOwner)
-    .callOnExtension(integrationManager, IntegrationManagerActionId.CallOnIntegration, callArgs);
-}
-
-export function curveEursRedeem({
-  comptrollerProxy,
-  integrationManager,
-  fundOwner,
-  curveLiquidityEursAdapter,
-  outgoingLPTokenAmount,
-  minIncomingEursAmount,
-  minIncomingSeurAmount,
-  receiveSingleAsset,
-}: {
-  comptrollerProxy: ComptrollerLib;
-  integrationManager: IntegrationManager;
-  fundOwner: SignerWithAddress;
-  curveLiquidityEursAdapter: CurveLiquidityEursAdapter;
-  outgoingLPTokenAmount: BigNumberish;
-  minIncomingEursAmount: BigNumberish;
-  minIncomingSeurAmount: BigNumberish;
-  receiveSingleAsset: boolean;
-}) {
-  const callArgs = callOnIntegrationArgs({
-    adapter: curveLiquidityEursAdapter,
-    encodedCallArgs: curveEursRedeemArgs({
-      minIncomingEursAmount,
-      minIncomingSeurAmount,
-      outgoingLPTokenAmount,
-      receiveSingleAsset,
-    }),
-    selector: redeemSelector,
-  });
-
-  return comptrollerProxy
-    .connect(fundOwner)
-    .callOnExtension(integrationManager, IntegrationManagerActionId.CallOnIntegration, callArgs);
-}
-
-export function curveEursStake({
-  comptrollerProxy,
-  integrationManager,
-  fundOwner,
-  curveLiquidityEursAdapter,
-  outgoingLPTokenAmount,
-}: {
-  comptrollerProxy: ComptrollerLib;
-  integrationManager: IntegrationManager;
-  fundOwner: SignerWithAddress;
-  curveLiquidityEursAdapter: CurveLiquidityEursAdapter;
-  outgoingLPTokenAmount: BigNumberish;
-}) {
-  const callArgs = callOnIntegrationArgs({
-    adapter: curveLiquidityEursAdapter,
-    encodedCallArgs: curveEursStakeArgs({
-      outgoingLPTokenAmount,
-    }),
-    selector: stakeSelector,
-  });
-
-  return comptrollerProxy
-    .connect(fundOwner)
-    .callOnExtension(integrationManager, IntegrationManagerActionId.CallOnIntegration, callArgs);
-}
-
-export function curveEursUnstakeAndRedeem({
-  comptrollerProxy,
-  integrationManager,
-  fundOwner,
-  curveLiquidityEursAdapter,
-  outgoingLiquidityGaugeTokenAmount,
-  minIncomingEursAmount,
-  minIncomingSeurAmount,
-  receiveSingleAsset,
-}: {
-  comptrollerProxy: ComptrollerLib;
-  integrationManager: IntegrationManager;
-  fundOwner: SignerWithAddress;
-  curveLiquidityEursAdapter: CurveLiquidityEursAdapter;
-  outgoingLiquidityGaugeTokenAmount: BigNumberish;
-  minIncomingEursAmount: BigNumberish;
-  minIncomingSeurAmount: BigNumberish;
-  receiveSingleAsset: boolean;
-}) {
-  const callArgs = callOnIntegrationArgs({
-    adapter: curveLiquidityEursAdapter,
-    encodedCallArgs: curveEursUnstakeAndRedeemArgs({
-      minIncomingEursAmount,
-      minIncomingSeurAmount,
-      outgoingLiquidityGaugeTokenAmount,
-      receiveSingleAsset,
-    }),
-    selector: unstakeAndRedeemSelector,
-  });
-
-  return comptrollerProxy
-    .connect(fundOwner)
-    .callOnExtension(integrationManager, IntegrationManagerActionId.CallOnIntegration, callArgs);
-}
-
-export function curveEursUnstake({
-  comptrollerProxy,
-  integrationManager,
-  fundOwner,
-  curveLiquidityEursAdapter,
-  outgoingLiquidityGaugeTokenAmount,
-}: {
-  comptrollerProxy: ComptrollerLib;
-  integrationManager: IntegrationManager;
-  fundOwner: SignerWithAddress;
-  curveLiquidityEursAdapter: CurveLiquidityEursAdapter;
-  outgoingLiquidityGaugeTokenAmount: BigNumberish;
-}) {
-  const callArgs = callOnIntegrationArgs({
-    adapter: curveLiquidityEursAdapter,
-    encodedCallArgs: curveEursUnstakeArgs({
-      outgoingLiquidityGaugeTokenAmount,
-    }),
-    selector: unstakeSelector,
-  });
-
-  return comptrollerProxy
-    .connect(fundOwner)
-    .callOnExtension(integrationManager, IntegrationManagerActionId.CallOnIntegration, callArgs);
-}
-
 // sETH pool
 
 export function curveSethClaimRewards({

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

@@ -2,7 +2,6 @@ import type { AddressLike } from '@enzymefinance/ethers';
 import type {
   ComptrollerLib,
   IntegrationManager,
-  ISynthetixAddressResolver,
   StandardToken,
   SynthetixAdapter,
   VaultLib,
@@ -22,39 +21,24 @@ import { utils } from 'ethers';
 
 export async function synthetixAssignExchangeDelegate({
   comptrollerProxy,
-  addressResolver,
+  synthetixDelegateApprovals,
   fundOwner,
   delegate,
 }: {
   comptrollerProxy: ComptrollerLib;
-  addressResolver: ISynthetixAddressResolver;
+  synthetixDelegateApprovals: AddressLike;
   fundOwner: Signer;
   delegate: AddressLike;
 }) {
-  const delegateApprovals = await synthetixResolveAddress({
-    addressResolver,
-    name: 'DelegateApprovals',
-  });
-
   await comptrollerProxy
     .connect(fundOwner)
     .vaultCallOnContract(
-      delegateApprovals,
+      synthetixDelegateApprovals,
       synthetixAssignExchangeDelegateSelector,
       encodeArgs(['address'], [delegate]),
     );
 }
 
-export async function synthetixResolveAddress({
-  addressResolver,
-  name,
-}: {
-  addressResolver: ISynthetixAddressResolver;
-  name: string;
-}) {
-  return addressResolver.requireAndGetAddress(utils.formatBytes32String(name), `Missing ${name}`);
-}
-
 export async function synthetixRedeem({
   comptrollerProxy,
   integrationManager,
@@ -91,8 +75,7 @@ export async function synthetixTakeOrder({
   synthetixAdapter,
   outgoingAsset,
   outgoingAssetAmount = utils.parseEther('1'),
-  incomingAsset,
-  minIncomingAssetAmount = utils.parseEther('1'),
+  minIncomingSusdAmount = utils.parseEther('1'),
   seedFund = false,
 }: {
   comptrollerProxy: ComptrollerLib;
@@ -102,8 +85,7 @@ export async function synthetixTakeOrder({
   synthetixAdapter: SynthetixAdapter;
   outgoingAsset: StandardToken;
   outgoingAssetAmount?: BigNumberish;
-  incomingAsset: StandardToken;
-  minIncomingAssetAmount?: BigNumberish;
+  minIncomingSusdAmount?: BigNumberish;
   seedFund?: boolean;
 }) {
   if (seedFund) {
@@ -112,8 +94,7 @@ export async function synthetixTakeOrder({
   }
 
   const takeOrderArgs = synthetixTakeOrderArgs({
-    incomingAsset,
-    minIncomingAssetAmount,
+    minIncomingSusdAmount,
     outgoingAsset,
     outgoingAssetAmount,
   });

package/src/types.d.ts

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

package/src/whales.ts

@@ -35,17 +35,22 @@ const whales = {
   ceth: '0x8aceab8167c80cb8b3de7fa6228b889bb1130ee8',
   cuni: '0x39d8014b4f40d2cbc441137011d32023f4f1fd87',
   cusdc: '0xe1ed4da4284924ddaf69983b4d813fb1be58c380',
+  // fTokens
+  fdai7: '0x88884e35d7006ae84efef09ee6bc6a43dd8e2bb8',
+  feth7: '0xcd2ba6a4d50745b0b4096186f925115387852c15',
+  fdai8: '0x93f3f612a525a59523e91cc5552f718df9fc0746',
+  ftribe8: '0xdb5ac83c137321da29a59a7592232bc4ed461730',
   // ptTokens
   ptUsdc: '0xd18236cd213f39d078177b6f6908f0e44e88e4aa',
-  // synths
+  // synths (unsupported)
   seth: '0xc34a7c65aa08cb36744bda8eeec7b8e9891e147c',
-  seur: '0xc3f2f91723b16b95bef0619b2504c049075d5b0b',
   sxag: '0x40d68c490bf7262ec40048099aec23535f734be2',
   sxau: '0x92eb453b7b5b8d41edb44e2c8b8b53eb70a482c7',
   // misc
   lidoSteth: '0x31f644e2dd5d74f5c8d6d9de89dd517474d51800',
-  eurs: '0x98ed26de6451db36246672df78ae7c50f2c76f6d',
   ust: '0xf584f8728b874a6a5c7a8d4d387c9aae9172d621',
+  // Curve steth pool related
+  stecrv: '0x56c915758ad3f76fd287fff7563ee313142fb663',
 } as const;
 /* eslint-enable sort-keys-fix/sort-keys-fix */