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

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

@@ -0,0 +1,73 @@
+import type { AddressLike } from '@enzymefinance/ethers';
+import type { SignerWithAddress } from '@enzymefinance/hardhat';
+import type {
+  ComptrollerLib,
+  IntegrationManager,
+  ParaSwapV5Adapter,
+  ParaSwapV5Path,
+  StandardToken,
+} from '@enzymefinance/protocol';
+import {
+  callOnIntegrationArgs,
+  IntegrationManagerActionId,
+  paraSwapV5TakeOrderArgs,
+  takeOrderSelector,
+} from '@enzymefinance/protocol';
+import type { BigNumberish, BytesLike } from 'ethers';
+import { utils } from 'ethers';
+
+// ParaSwapV5Path
+export function paraSwapV5GenerateDummyPaths({ toTokens }: { toTokens: AddressLike[] }) {
+  return toTokens.map((toToken) => {
+    return {
+      // Not supported in our protocol
+      adapters: [],
+
+      to: toToken,
+      totalNetworkFee: 0, // Can ignore this param in the dummy
+    };
+  });
+}
+
+export async function paraSwapV5TakeOrder({
+  comptrollerProxy,
+  integrationManager,
+  fundOwner,
+  paraSwapV5Adapter,
+  outgoingAsset,
+  outgoingAssetAmount,
+  minIncomingAssetAmount = 1,
+  expectedIncomingAssetAmount = minIncomingAssetAmount,
+  uuid = utils.randomBytes(16),
+  paths,
+}: {
+  comptrollerProxy: ComptrollerLib;
+  integrationManager: IntegrationManager;
+  fundOwner: SignerWithAddress;
+  paraSwapV5Adapter: ParaSwapV5Adapter;
+  outgoingAsset: StandardToken;
+  outgoingAssetAmount: BigNumberish;
+  minIncomingAssetAmount?: BigNumberish;
+  expectedIncomingAssetAmount?: BigNumberish;
+  uuid?: BytesLike;
+  paths: ParaSwapV5Path[];
+}) {
+  const takeOrderArgs = paraSwapV5TakeOrderArgs({
+    expectedIncomingAssetAmount,
+    minIncomingAssetAmount,
+    outgoingAsset,
+    outgoingAssetAmount,
+    paths,
+    uuid,
+  });
+
+  const callArgs = callOnIntegrationArgs({
+    adapter: paraSwapV5Adapter,
+    encodedCallArgs: takeOrderArgs,
+    selector: takeOrderSelector,
+  });
+
+  return comptrollerProxy
+    .connect(fundOwner)
+    .callOnExtension(integrationManager, IntegrationManagerActionId.CallOnIntegration, callArgs);
+}

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

@@ -0,0 +1,117 @@
+import type { AddressLike } from '@enzymefinance/ethers';
+import type { SignerWithAddress } from '@enzymefinance/hardhat';
+import type { ComptrollerLib, IntegrationManager, PoolTogetherV4Adapter, StandardToken } from '@enzymefinance/protocol';
+import {
+  callOnIntegrationArgs,
+  claimRewardsSelector,
+  IntegrationManagerActionId,
+  lendSelector,
+  poolTogetherV4ClaimRewardsArgs,
+  poolTogetherV4LendArgs,
+  poolTogetherV4RedeemArgs,
+  redeemSelector,
+} from '@enzymefinance/protocol';
+import type { BigNumberish, BytesLike } from 'ethers';
+import { utils } from 'ethers';
+
+export async function poolTogetherV4Lend({
+  comptrollerProxy,
+  integrationManager,
+  fundOwner,
+  poolTogetherV4Adapter,
+  ptToken,
+  amount = utils.parseEther('1'),
+}: {
+  comptrollerProxy: ComptrollerLib;
+  integrationManager: IntegrationManager;
+  fundOwner: SignerWithAddress;
+  poolTogetherV4Adapter: PoolTogetherV4Adapter;
+  ptToken: StandardToken;
+  amount?: BigNumberish;
+}) {
+  const lendArgs = poolTogetherV4LendArgs({
+    amount,
+    ptToken,
+  });
+
+  const callArgs = callOnIntegrationArgs({
+    adapter: poolTogetherV4Adapter,
+    encodedCallArgs: lendArgs,
+    selector: lendSelector,
+  });
+
+  const lendTx = comptrollerProxy
+    .connect(fundOwner)
+    .callOnExtension(integrationManager, IntegrationManagerActionId.CallOnIntegration, callArgs);
+
+  return lendTx;
+}
+
+export async function poolTogetherV4Redeem({
+  comptrollerProxy,
+  integrationManager,
+  fundOwner,
+  poolTogetherV4Adapter,
+  ptToken,
+  amount = utils.parseEther('1'),
+}: {
+  comptrollerProxy: ComptrollerLib;
+  integrationManager: IntegrationManager;
+  fundOwner: SignerWithAddress;
+  poolTogetherV4Adapter: PoolTogetherV4Adapter;
+  ptToken: StandardToken;
+  amount?: BigNumberish;
+}) {
+  const redeemArgs = poolTogetherV4RedeemArgs({
+    amount,
+    ptToken,
+  });
+
+  const callArgs = callOnIntegrationArgs({
+    adapter: poolTogetherV4Adapter,
+    encodedCallArgs: redeemArgs,
+    selector: redeemSelector,
+  });
+
+  const redeemTx = comptrollerProxy
+    .connect(fundOwner)
+    .callOnExtension(integrationManager, IntegrationManagerActionId.CallOnIntegration, callArgs);
+
+  return redeemTx;
+}
+
+export async function poolTogetherV4ClaimRewards({
+  comptrollerProxy,
+  integrationManager,
+  fundOwner,
+  poolTogetherV4Adapter,
+  prizeDistributor,
+  drawIds,
+  winningPicks,
+}: {
+  comptrollerProxy: ComptrollerLib;
+  integrationManager: IntegrationManager;
+  fundOwner: SignerWithAddress;
+  poolTogetherV4Adapter: PoolTogetherV4Adapter;
+  prizeDistributor: AddressLike;
+  drawIds: BigNumberish[];
+  winningPicks: BytesLike;
+}) {
+  const claimRewardsArgs = poolTogetherV4ClaimRewardsArgs({
+    drawIds,
+    prizeDistributor,
+    winningPicks,
+  });
+
+  const callArgs = callOnIntegrationArgs({
+    adapter: poolTogetherV4Adapter,
+    encodedCallArgs: claimRewardsArgs,
+    selector: claimRewardsSelector,
+  });
+
+  const claimTx = comptrollerProxy
+    .connect(fundOwner)
+    .callOnExtension(integrationManager, IntegrationManagerActionId.CallOnIntegration, callArgs);
+
+  return claimTx;
+}

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

@@ -1,19 +1,24 @@
-import { AddressLike } from '@enzymefinance/ethers';
-import {
-  callOnIntegrationArgs,
+import type { AddressLike } from '@enzymefinance/ethers';
+import type {
   ComptrollerLib,
-  encodeArgs,
   IntegrationManager,
-  IntegrationManagerActionId,
   ISynthetixAddressResolver,
   StandardToken,
   SynthetixAdapter,
+  VaultLib,
+} from '@enzymefinance/protocol';
+import {
+  callOnIntegrationArgs,
+  encodeArgs,
+  IntegrationManagerActionId,
+  redeemSelector,
   synthetixAssignExchangeDelegateSelector,
+  synthetixRedeemArgs,
   synthetixTakeOrderArgs,
   takeOrderSelector,
-  VaultLib,
 } from '@enzymefinance/protocol';
-import { BigNumberish, Signer, utils } from 'ethers';
+import type { BigNumberish, Signer } from 'ethers';
+import { utils } from 'ethers';
 
 export async function synthetixAssignExchangeDelegate({
   comptrollerProxy,
@@ -50,6 +55,34 @@ export async function synthetixResolveAddress({
   return addressResolver.requireAndGetAddress(utils.formatBytes32String(name), `Missing ${name}`);
 }
 
+export async function synthetixRedeem({
+  comptrollerProxy,
+  integrationManager,
+  signer,
+  synthetixAdapter,
+  synths,
+}: {
+  comptrollerProxy: ComptrollerLib;
+  integrationManager: IntegrationManager;
+  signer: Signer;
+  synthetixAdapter: SynthetixAdapter;
+  synths: AddressLike[];
+}) {
+  const redeemArgs = synthetixRedeemArgs({
+    synths,
+  });
+
+  const callArgs = callOnIntegrationArgs({
+    adapter: synthetixAdapter,
+    encodedCallArgs: redeemArgs,
+    selector: redeemSelector,
+  });
+
+  return comptrollerProxy
+    .connect(signer)
+    .callOnExtension(integrationManager, IntegrationManagerActionId.CallOnIntegration, callArgs);
+}
+
 export async function synthetixTakeOrder({
   comptrollerProxy,
   vaultProxy,
@@ -79,16 +112,16 @@ export async function synthetixTakeOrder({
   }
 
   const takeOrderArgs = synthetixTakeOrderArgs({
-    incomingAsset: incomingAsset,
-    minIncomingAssetAmount: minIncomingAssetAmount,
-    outgoingAsset: outgoingAsset,
-    outgoingAssetAmount: outgoingAssetAmount,
+    incomingAsset,
+    minIncomingAssetAmount,
+    outgoingAsset,
+    outgoingAssetAmount,
   });
 
   const callArgs = await callOnIntegrationArgs({
     adapter: synthetixAdapter,
-    selector: takeOrderSelector,
     encodedCallArgs: takeOrderArgs,
+    selector: takeOrderSelector,
   });
 
   return comptrollerProxy

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

@@ -1,9 +1,8 @@
-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 } from '@enzymefinance/protocol';
 import {
   addTrackedAssetsToVaultArgs,
-  ComptrollerLib,
-  IntegrationManager,
   IntegrationManagerActionId,
   removeTrackedAssetsFromVaultArgs,
 } from '@enzymefinance/protocol';

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

@@ -1,21 +1,25 @@
-import { AddressLike, Call, Contract, contract, Send } from '@enzymefinance/ethers';
-import { SignerWithAddress } from '@enzymefinance/hardhat';
-import {
-  callOnIntegrationArgs,
+import type { AddressLike, Call, Contract, Send } from '@enzymefinance/ethers';
+import { contract } from '@enzymefinance/ethers';
+import type { SignerWithAddress } from '@enzymefinance/hardhat';
+import type {
   ComptrollerLib,
   IntegrationManager,
+  StandardToken,
+  UniswapV2ExchangeAdapter,
+  UniswapV2LiquidityAdapter,
+  VaultLib,
+} from '@enzymefinance/protocol';
+import {
+  callOnIntegrationArgs,
   IntegrationManagerActionId,
   lendSelector,
   redeemSelector,
-  StandardToken,
   takeOrderSelector,
-  UniswapV2Adapter,
   uniswapV2LendArgs,
   uniswapV2RedeemArgs,
   uniswapV2TakeOrderArgs,
-  VaultLib,
 } from '@enzymefinance/protocol';
-import { BigNumberish } from 'ethers';
+import type { BigNumberish } from 'ethers';
 
 export interface UniswapV2Factory extends Contract<UniswapV2Factory> {
   createPair: Send<(_token0: AddressLike, _token1: AddressLike) => AddressLike>;
@@ -32,7 +36,7 @@ export async function uniswapV2Lend({
   vaultProxy,
   integrationManager,
   fundOwner,
-  uniswapV2Adapter,
+  uniswapV2LiquidityAdapter,
   tokenA,
   tokenB,
   amountADesired,
@@ -46,7 +50,7 @@ export async function uniswapV2Lend({
   vaultProxy: VaultLib;
   integrationManager: IntegrationManager;
   fundOwner: SignerWithAddress;
-  uniswapV2Adapter: UniswapV2Adapter;
+  uniswapV2LiquidityAdapter: UniswapV2LiquidityAdapter;
   tokenA: StandardToken;
   tokenB: StandardToken;
   amountADesired: BigNumberish;
@@ -63,19 +67,19 @@ export async function uniswapV2Lend({
   }
 
   const lendArgs = uniswapV2LendArgs({
-    tokenA,
-    tokenB,
     amountADesired,
-    amountBDesired,
     amountAMin,
+    amountBDesired,
     amountBMin,
     minPoolTokenAmount,
+    tokenA,
+    tokenB,
   });
 
   const callArgs = callOnIntegrationArgs({
-    adapter: uniswapV2Adapter,
-    selector: lendSelector,
+    adapter: uniswapV2LiquidityAdapter,
     encodedCallArgs: lendArgs,
+    selector: lendSelector,
   });
 
   const lendTx = comptrollerProxy
@@ -90,7 +94,7 @@ export async function uniswapV2Redeem({
   comptrollerProxy,
   integrationManager,
   fundOwner,
-  uniswapV2Adapter,
+  uniswapV2LiquidityAdapter,
   poolTokenAmount,
   tokenA,
   tokenB,
@@ -100,7 +104,7 @@ export async function uniswapV2Redeem({
   comptrollerProxy: ComptrollerLib;
   integrationManager: IntegrationManager;
   fundOwner: SignerWithAddress;
-  uniswapV2Adapter: UniswapV2Adapter;
+  uniswapV2LiquidityAdapter: UniswapV2LiquidityAdapter;
   poolTokenAmount: BigNumberish;
   tokenA: AddressLike;
   tokenB: AddressLike;
@@ -108,16 +112,16 @@ export async function uniswapV2Redeem({
   amountBMin: BigNumberish;
 }) {
   const redeemArgs = uniswapV2RedeemArgs({
+    amountAMin,
+    amountBMin,
     poolTokenAmount,
     tokenA,
     tokenB,
-    amountAMin,
-    amountBMin,
   });
   const callArgs = callOnIntegrationArgs({
-    adapter: uniswapV2Adapter,
-    selector: redeemSelector,
+    adapter: uniswapV2LiquidityAdapter,
     encodedCallArgs: redeemArgs,
+    selector: redeemSelector,
   });
 
   const redeemTx = comptrollerProxy
@@ -133,7 +137,7 @@ export async function uniswapV2TakeOrder({
   vaultProxy,
   integrationManager,
   fundOwner,
-  uniswapV2Adapter,
+  uniswapV2ExchangeAdapter,
   path,
   outgoingAssetAmount,
   minIncomingAssetAmount,
@@ -143,7 +147,7 @@ export async function uniswapV2TakeOrder({
   vaultProxy: VaultLib;
   integrationManager: IntegrationManager;
   fundOwner: SignerWithAddress;
-  uniswapV2Adapter: UniswapV2Adapter;
+  uniswapV2ExchangeAdapter: UniswapV2ExchangeAdapter;
   path: StandardToken[];
   outgoingAssetAmount: BigNumberish;
   minIncomingAssetAmount: BigNumberish;
@@ -155,14 +159,14 @@ export async function uniswapV2TakeOrder({
   }
 
   const takeOrderArgs = uniswapV2TakeOrderArgs({
-    path,
-    outgoingAssetAmount,
     minIncomingAssetAmount,
+    outgoingAssetAmount,
+    path,
   });
   const callArgs = callOnIntegrationArgs({
-    adapter: uniswapV2Adapter,
-    selector: takeOrderSelector,
+    adapter: uniswapV2ExchangeAdapter,
     encodedCallArgs: takeOrderArgs,
+    selector: takeOrderSelector,
   });
 
   return comptrollerProxy

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