fix(multicall): Wrong imports

src/app-toolkit/helpers/balance/token-balance.helper.ts

@@ -3,7 +3,7 @@ import BigNumberJS from 'bignumber.js';
 import { identity, isArray, pick } from 'lodash';
 
 import { IAppToolkit, APP_TOOLKIT } from '~app-toolkit/app-toolkit.interface';
-import { EthersMulticall } from '~multicall/multicall.ethers';
+import { IMulticallWrapper } from '~multicall/multicall.interface';
 import { ContractType } from '~position/contract.interface';
 import { DefaultDataProps, StatsItem, WithMetaType } from '~position/display.interface';
 import { AppTokenPositionBalance, BaseTokenBalance } from '~position/position-balance.interface';
@@ -20,7 +20,7 @@ type GetTokenBalancesParams<T> = {
   address: string;
   filter?: (contractPosition: AppTokenPosition<T>) => boolean;
   resolveBalance?: (opts: {
-    multicall: EthersMulticall;
+    multicall: IMulticallWrapper;
     address: string;
     token: AppTokenPosition<T>;
   }) => Promise<string>;

src/app-toolkit/helpers/position/vault.token-helper.ts

@@ -10,7 +10,7 @@ import {
   buildPercentageDisplayItem,
 } from '~app-toolkit/helpers/presentation/display-item.present';
 import { getImagesFromToken } from '~app-toolkit/helpers/presentation/image.present';
-import { EthersMulticall } from '~multicall';
+import { IMulticallWrapper } from '~multicall/multicall.interface';
 import { ContractType } from '~position/contract.interface';
 import { StatsItem } from '~position/display.interface';
 import { AppTokenPosition, ExchangeableAppTokenDataProps, Token } from '~position/position.interface';
@@ -56,20 +56,23 @@ export type VaultTokenHelperParams<T> = {
    * You can either use static string addresses, leverage the multicall function (which should map to the
    * the contract passed in via resolveContract) or other methods (such as an external API call).
    */
-  resolveVaultAddresses: (opts: { multicall: EthersMulticall; network: Network }) => string[] | Promise<string[]>;
+  resolveVaultAddresses: (opts: { multicall: IMulticallWrapper; network: Network }) => string[] | Promise<string[]>;
   /**
    * The address of an underlying token which correponds to a vault deposit.
    * You can either use static string addresses, leverage the multicall function (which should map to the
    * the contract passed in via resolveContract) or other methods (such as an external API call).
    */
-  resolveUnderlyingTokenAddress: (opts: { multicall: EthersMulticall; contract: T }) => string | Promise<string | null>;
+  resolveUnderlyingTokenAddress: (opts: {
+    multicall: IMulticallWrapper;
+    contract: T;
+  }) => string | Promise<string | null>;
   /**
    * How do we resolve the reserve (aka: the liquidity or total supply) of a given underlying token.
    */
   resolveReserve: (opts: {
     address: string;
     contract: T;
-    multicall: EthersMulticall;
+    multicall: IMulticallWrapper;
     underlyingToken: Token;
     network: Network;
   }) => number | Promise<number>;
@@ -78,7 +81,7 @@ export type VaultTokenHelperParams<T> = {
    */
   resolvePricePerShare: (opts: {
     contract: T;
-    multicall: EthersMulticall;
+    multicall: IMulticallWrapper;
     underlyingToken: Token;
     reserve: number;
     supply: number;
@@ -89,7 +92,7 @@ export type VaultTokenHelperParams<T> = {
    * e.g: A value of 6 corresponds to 6%, 42.56 would correspond to 42.56%.
    * If empty, we default to 0
    */
-  resolveApy?: (opts: { vaultAddress: string; multicall: EthersMulticall; contract: T }) => Promise<number>;
+  resolveApy?: (opts: { vaultAddress: string; multicall: IMulticallWrapper; contract: T }) => Promise<number>;
   /**
    * How do we resolve the label that will be displayed on the frontend.
    * By default, we will use the symbol.

src/apps/compound/helper/compound.borrow.contract-position-helper.ts

@@ -8,7 +8,7 @@ import {
   buildPercentageDisplayItem,
 } from '~app-toolkit/helpers/presentation/display-item.present';
 import { getLabelFromToken } from '~app-toolkit/helpers/presentation/image.present';
-import { EthersMulticall } from '~multicall';
+import { IMulticallWrapper } from '~multicall/multicall.interface';
 import { ContractType } from '~position/contract.interface';
 import { ContractPosition } from '~position/position.interface';
 import { borrowed } from '~position/position.utils';
@@ -32,7 +32,7 @@ type CompoundBorrowContractPositionHelperParams = {
     contract: CompoundCToken;
     address: string;
     network: Network;
-    multicall: EthersMulticall;
+    multicall: IMulticallWrapper;
   }) => Promise<BigNumberish>;
 };
 

src/apps/curve/helpers/curve.gauge.is-active-strategy.ts

@@ -2,10 +2,10 @@ import { Injectable } from '@nestjs/common';
 import { BigNumberish } from 'ethers';
 
 import { SingleStakingFarmContractPositionHelperParams } from '~app-toolkit';
-import { EthersMulticall } from '~multicall';
+import { IMulticallWrapper } from '~multicall/multicall.interface';
 
 type CurveGaugeIsActiveStrategyParams<T> = {
-  resolveInflationRate: (opts: { multicall: EthersMulticall; contract: T }) => Promise<BigNumberish>;
+  resolveInflationRate: (opts: { multicall: IMulticallWrapper; contract: T }) => Promise<BigNumberish>;
 };
 
 @Injectable()

src/apps/curve/helpers/curve.gauge.roi-strategy.ts

@@ -2,14 +2,14 @@ import { Injectable } from '@nestjs/common';
 import { BigNumberish } from 'ethers';
 
 import { SingleStakingFarmContractPositionHelperParams } from '~app-toolkit';
-import { EthersMulticall } from '~multicall';
+import { IMulticallWrapper } from '~multicall/multicall.interface';
 import { Network } from '~types/network.interface';
 
 type CurveGaugeRoiStrategyParams<T, V> = {
-  resolveInflationRate: (opts: { multicall: EthersMulticall; gaugeContract: T }) => Promise<BigNumberish>;
-  resolveWorkingSupply: (opts: { multicall: EthersMulticall; gaugeContract: T }) => Promise<BigNumberish>;
+  resolveInflationRate: (opts: { multicall: IMulticallWrapper; gaugeContract: T }) => Promise<BigNumberish>;
+  resolveWorkingSupply: (opts: { multicall: IMulticallWrapper; gaugeContract: T }) => Promise<BigNumberish>;
   resolveRelativeWeight: (opts: {
-    multicall: EthersMulticall;
+    multicall: IMulticallWrapper;
     controllerContract: V;
     address: string;
   }) => Promise<BigNumberish>;

src/apps/curve/helpers/curve.rewards-only-gauge.roi-strategy.ts

@@ -3,7 +3,7 @@ import BigNumber from 'bignumber.js';
 import { range, sum } from 'lodash';
 
 import { SingleStakingFarmContractPositionHelperParams } from '~app-toolkit';
-import { EthersMulticall } from '~multicall';
+import { IMulticallWrapper } from '~multicall/multicall.interface';
 import { WithMetaType } from '~position/display.interface';
 import { Token } from '~position/position.interface';
 import { Network } from '~types/network.interface';
@@ -14,7 +14,7 @@ import { CurvePoolDefinition } from '../curve.types';
 type GetRewardsInUsdOpts = {
   rewardStreamAddress: string;
   rewardTokens: WithMetaType<Token>[];
-  multicall: EthersMulticall;
+  multicall: IMulticallWrapper;
   network: Network;
 };
 

src/apps/curve/helpers/curve.vesting-escrow.contract-position-balance-helper.ts

@@ -4,7 +4,7 @@ import { compact, sumBy } from 'lodash';
 
 import { drillBalance } from '~app-toolkit';
 import { APP_TOOLKIT, IAppToolkit } from '~app-toolkit/app-toolkit.interface';
-import { EthersMulticall } from '~multicall';
+import { IMulticallWrapper } from '~multicall/multicall.interface';
 import { ContractPositionBalance } from '~position/position-balance.interface';
 import { isClaimable, isVesting } from '~position/position.utils';
 import { Network } from '~types/network.interface';
@@ -17,8 +17,8 @@ type CurveVestingEscrowContractPositionBalanceHelperParams<T> = {
   groupId: string;
   network: Network;
   resolveContract: (opts: { contractFactory: ContractFactory; address: string }) => T;
-  resolveUnlockedBalance: (opts: { contract: T; multicall: EthersMulticall; address: string }) => Promise<BigNumber>;
-  resolveLockedBalance: (opts: { contract: T; multicall: EthersMulticall; address: string }) => Promise<BigNumber>;
+  resolveUnlockedBalance: (opts: { contract: T; multicall: IMulticallWrapper; address: string }) => Promise<BigNumber>;
+  resolveLockedBalance: (opts: { contract: T; multicall: IMulticallWrapper; address: string }) => Promise<BigNumber>;
 };
 
 @Injectable()

src/apps/curve/helpers/curve.voting-escrow.contract-position-balance-helper.ts

@@ -4,7 +4,7 @@ import { compact, sumBy } from 'lodash';
 
 import { drillBalance } from '~app-toolkit';
 import { APP_TOOLKIT, IAppToolkit } from '~app-toolkit/app-toolkit.interface';
-import { EthersMulticall } from '~multicall';
+import { IMulticallWrapper } from '~multicall/multicall.interface';
 import { ContractPositionBalance } from '~position/position-balance.interface';
 import { MetaType } from '~position/position.interface';
 import { Network } from '~types/network.interface';
@@ -20,12 +20,12 @@ type CurveVotingEscrowContractPositionBalanceHelperParams<T, V = null> = {
   resolveRewardContract?: (opts: { network: Network; address: string }) => V;
   resolveLockedTokenBalance: (opts: {
     contract: T;
-    multicall: EthersMulticall;
+    multicall: IMulticallWrapper;
     address: string;
   }) => Promise<BigNumberish>;
   resolveRewardTokenBalance?: (opts: {
     contract: V;
-    multicall: EthersMulticall;
+    multicall: IMulticallWrapper;
     address: string;
   }) => Promise<BigNumberish>;
 };

src/apps/yearn/helpers/yearn.v1-vault.token-helper.ts

@@ -7,7 +7,7 @@ import {
   buildPercentageDisplayItem,
 } from '~app-toolkit/helpers/presentation/display-item.present';
 import { getImagesFromToken, getLabelFromToken } from '~app-toolkit/helpers/presentation/image.present';
-import { EthersMulticall } from '~multicall';
+import { IMulticallWrapper } from '~multicall/multicall.interface';
 import { ContractType } from '~position/contract.interface';
 import { AppTokenPosition } from '~position/position.interface';
 import { AppGroupsDefinition } from '~position/position.service';
@@ -47,7 +47,7 @@ export class YearnV1VaultTokenHelper {
   }: {
     vaultDefinition: YearnVaultData;
     network: Network;
-    multicall: EthersMulticall;
+    multicall: IMulticallWrapper;
   }) {
     const contract = this.yearnContractFactory.yearnVault({ address: vaultDefinition.address, network });
     const pricePerShareRaw = await multicall

src/apps/yearn/helpers/yearn.v2-vault.token-helper.ts

@@ -7,7 +7,7 @@ import {
   buildPercentageDisplayItem,
 } from '~app-toolkit/helpers/presentation/display-item.present';
 import { getImagesFromToken, getLabelFromToken } from '~app-toolkit/helpers/presentation/image.present';
-import { EthersMulticall } from '~multicall';
+import { IMulticallWrapper } from '~multicall/multicall.interface';
 import { ContractType } from '~position/contract.interface';
 import { AppTokenPosition } from '~position/position.interface';
 import { AppGroupsDefinition } from '~position/position.service';
@@ -47,7 +47,7 @@ export class YearnV2VaultTokenHelper {
   }: {
     vaultDefinition: YearnVaultData;
     network: Network;
-    multicall: EthersMulticall;
+    multicall: IMulticallWrapper;
   }) {
     const contract = this.yearnContractFactory.yearnVaultV2({ address: vaultDefinition.address, network });
     const pricePerShareRaw = await multicall