@across-protocol/sdk 3.1.34 → 3.1.35

package/src/clients/BundleDataClient/utils/SuperstructUtils.ts

@@ -11,7 +11,7 @@ import {
   boolean,
   defaulted,
 } from "superstruct";
-import { BigNumber } from "ethers";
+import { BigNumber } from "../../../utils";
 
 const PositiveIntegerStringSS = pattern(string(), /\d+/);
 const Web3AddressSS = pattern(string(), /^0x[a-fA-F0-9]{40}$/);

package/src/clients/HubPoolClient.ts

@@ -1,5 +1,5 @@
 import assert from "assert";
-import { BigNumber, Contract, Event, EventFilter } from "ethers";
+import { Contract, Event, EventFilter } from "ethers";
 import _ from "lodash";
 import winston from "winston";
 import { DEFAULT_CACHING_SAFE_LAG, DEFAULT_CACHING_TTL } from "../constants";
@@ -22,6 +22,7 @@ import {
 } from "../interfaces";
 import * as lpFeeCalculator from "../lpFeeCalculator";
 import {
+  BigNumber,
   BlockFinder,
   bnZero,
   dedupArray,

package/src/clients/SpokePoolClient.ts

@@ -1,7 +1,8 @@
-import { BigNumber, Contract, Event, EventFilter } from "ethers";
+import { Contract, Event, EventFilter } from "ethers";
 import winston from "winston";
 import {
   AnyObject,
+  BigNumber,
   bnZero,
   DefaultLogLevels,
   EventSearchConfig,

package/src/clients/mocks/MockHubPoolClient.ts

@@ -1,6 +1,6 @@
 import winston from "winston";
-import { BigNumber, Contract, Event } from "ethers";
-import { randomAddress, assign, bnZero } from "../../utils";
+import { Contract, Event } from "ethers";
+import { BigNumber, randomAddress, assign, bnZero } from "../../utils";
 import { L1Token, PendingRootBundle, RealizedLpFee } from "../../interfaces";
 import { AcrossConfigStoreClient as ConfigStoreClient } from "../AcrossConfigStoreClient";
 import { HubPoolClient, HubPoolUpdate, LpFeeRequest } from "../HubPoolClient";

package/src/clients/mocks/MockSpokePoolClient.ts

@@ -1,5 +1,5 @@
 import assert from "assert";
-import { BigNumber, Contract, Event, providers } from "ethers";
+import { Contract, Event, providers } from "ethers";
 import { random } from "lodash";
 import winston from "winston";
 import { ZERO_ADDRESS } from "../../constants";
@@ -15,7 +15,7 @@ import {
   SlowFillLeaf,
   SpeedUp,
 } from "../../interfaces";
-import { bnZero, toBN, toBNWei, forEachAsync, getCurrentTime, randomAddress } from "../../utils";
+import { BigNumber, bnZero, toBN, toBNWei, forEachAsync, getCurrentTime, randomAddress } from "../../utils";
 import { SpokePoolClient, SpokePoolUpdate } from "../SpokePoolClient";
 import { HubPoolClient } from "../HubPoolClient";
 import { EventManager, EventOverrides, getEventManager } from "./MockEvents";

package/src/constants.ts

@@ -1,4 +1,4 @@
-import { constants as ethersConstants, BigNumber, utils } from "ethers";
+import { constants as ethersConstants } from "ethers";
 import { TOKEN_SYMBOLS_MAP } from "@across-protocol/constants";
 
 export {
@@ -44,9 +44,6 @@ export const PROTOCOL_DEFAULT_CHAIN_ID_INDICES = [1, 10, 137, 288, 42161];
 export const DEFAULT_CACHING_TTL = 60 * 60 * 24 * 7 * 2; // 2 Weeks
 export const DEFAULT_CACHING_SAFE_LAG = 60 * 60; // 1 hour
 
-export const UBA_BOUNDS_RANGE_MAX = BigNumber.from(String(Number.MAX_SAFE_INTEGER)).mul(utils.parseEther("1.0"));
-export const UBA_BOUNDS_RANGE_MIN = UBA_BOUNDS_RANGE_MAX.mul(-1);
-
 export const DEFAULT_SIMULATED_RELAYER_ADDRESS = "0x07aE8551Be970cB1cCa11Dd7a11F47Ae82e70E67";
 export const DEFAULT_SIMULATED_RELAYER_ADDRESS_TEST = "0x9A8f92a830A5cB89a3816e3D267CB7791c16b04D"; // Görli, ...
 

package/src/contracts/utils.ts

@@ -1,6 +1,6 @@
 import assert from "assert";
-import { BigNumber, BigNumberish, Event } from "ethers";
-import { isDefined } from "../utils";
+import { Event } from "ethers";
+import { BigNumber, BigNumberish, isDefined } from "../utils";
 
 /**
  * @dev Originally imported from @uma/sdk.

package/src/gasPriceOracle/adapters/arbitrum.ts

@@ -1,14 +1,15 @@
-import { providers, utils as ethersUtils } from "ethers";
-import { bnOne } from "../../utils";
+import { providers } from "ethers";
+import { BigNumber, bnOne, parseUnits } from "../../utils";
 import { GasPriceEstimate } from "../types";
 import * as ethereum from "./ethereum";
 
-const DEFAULT_PRIORITY_FEE = ethersUtils.parseUnits("1.5", 9);
+let DEFAULT_PRIORITY_FEE: BigNumber | undefined = undefined;
 
 // Arbitrum Nitro implements EIP-1559 pricing, but the priority fee is always refunded to the caller. Further,
 // ethers typically hardcodes the priority fee to 1.5 Gwei. So, confirm that the priority fee supplied was 1.5
 // Gwei, and then drop it to 1 Wei. Reference: https://developer.arbitrum.io/faqs/gas-faqs#q-priority
 export async function eip1559(provider: providers.Provider, chainId: number): Promise<GasPriceEstimate> {
+  DEFAULT_PRIORITY_FEE ??= parseUnits("1.5", 9);
   const { maxFeePerGas: _maxFeePerGas, maxPriorityFeePerGas } = await ethereum.eip1559(provider, chainId);
 
   // If this throws, ethers default behaviour has changed, or Arbitrum RPCs are returning something more sensible.

package/src/gasPriceOracle/adapters/ethereum.ts

@@ -1,5 +1,5 @@
-import { BigNumber, providers } from "ethers";
-import { bnZero } from "../../utils";
+import { providers } from "ethers";
+import { BigNumber, bnZero } from "../../utils";
 import { GasPriceEstimate } from "../types";
 import { gasPriceError } from "../util";
 

package/src/gasPriceOracle/adapters/polygon.ts

@@ -1,6 +1,6 @@
-import { providers, utils as ethersUtils } from "ethers";
+import { providers } from "ethers";
 import { BaseHTTPAdapter, BaseHTTPAdapterArgs } from "../../priceClient/adapters/baseAdapter";
-import { bnZero, isDefined } from "../../utils";
+import { bnZero, isDefined, parseUnits } from "../../utils";
 import { CHAIN_IDs } from "../../constants";
 import { GasPriceEstimate } from "../types";
 import { gasPriceError } from "../util";
@@ -50,12 +50,12 @@ class PolygonGasStation extends BaseHTTPAdapter {
 
     [gasPrice.maxFee, gasPrice.maxPriorityFee].forEach((gasPrice) => {
       if (Number(gasPrice) < 0) {
-        gasPriceError("getFeeData()", this.chainId, ethersUtils.parseUnits(gasPrice.toString(), 9));
+        gasPriceError("getFeeData()", this.chainId, parseUnits(gasPrice.toString(), 9));
       }
     });
 
-    const maxPriorityFeePerGas = ethersUtils.parseUnits(gasPrice.maxPriorityFee.toString(), 9);
-    const maxFeePerGas = ethersUtils.parseUnits(gasPrice.maxFee.toString(), 9);
+    const maxPriorityFeePerGas = parseUnits(gasPrice.maxPriorityFee.toString(), 9);
+    const maxFeePerGas = parseUnits(gasPrice.maxFee.toString(), 9);
 
     return { maxPriorityFeePerGas, maxFeePerGas };
   }

package/src/gasPriceOracle/types.ts

@@ -1,4 +1,5 @@
-import { BigNumber, providers } from "ethers";
+import { providers } from "ethers";
+import { BigNumber } from "../utils";
 
 export type GasPriceEstimate = {
   maxFeePerGas: BigNumber;

package/src/gasPriceOracle/util.ts

@@ -1,4 +1,5 @@
-import { BigNumber, providers } from "ethers";
+import { providers } from "ethers";
+import { BigNumber } from "../utils";
 
 export function gasPriceError(method: string, chainId: number, data: providers.FeeData | BigNumber): void {
   throw new Error(`Malformed ${method} response on chain ID ${chainId} (${JSON.stringify(data)})`);

package/src/interfaces/Bridge.ts

@@ -1,4 +1,4 @@
-import { BigNumber } from "ethers";
+import { BigNumber } from "../utils";
 
 export interface OutstandingTransfers {
   [address: string]: {

package/src/interfaces/BundleData.ts

@@ -1,8 +1,9 @@
-import { BigNumber, Signer } from "ethers";
+import { Signer } from "ethers";
 import { DepositWithBlock, FillWithBlock, Refund } from "./SpokePool";
 import { HubPoolClient } from "../clients/HubPoolClient";
 import { AcrossConfigStoreClient } from "../clients";
 import { ArweaveClient } from "../caching";
+import { BigNumber } from "../utils";
 
 export type ExpiredDepositsToRefundV3 = {
   [originChainId: number]: {

package/src/interfaces/Common.ts

@@ -1,4 +1,4 @@
-import { BigNumber } from "ethers";
+import { BigNumber } from "../utils";
 
 export interface SortableEvent {
   blockNumber: number;

package/src/interfaces/ConfigStore.ts

@@ -1,5 +1,5 @@
-import { BigNumber } from "ethers";
 import { RateModelDictionary } from "../lpFeeCalculator/rateModel";
+import { BigNumber } from "../utils";
 import { SortableEvent } from "./Common";
 
 export interface ParsedTokenConfig {

package/src/interfaces/HubPool.ts

@@ -1,4 +1,4 @@
-import { BigNumber } from "ethers";
+import { BigNumber } from "../utils";
 import { SortableEvent } from "./Common";
 
 export interface PoolRebalanceLeaf {

package/src/interfaces/SpokePool.ts

@@ -1,7 +1,7 @@
-import { BigNumber } from "ethers";
 import { SortableEvent } from "./Common";
 import { FilledRelayEvent, FilledV3RelayEvent, FundsDepositedEvent, V3FundsDepositedEvent } from "../typechain";
 import { SpokePoolClient } from "../clients";
+import { BigNumber } from "../utils";
 import { RelayerRefundLeaf } from "./HubPool";
 
 export type { FilledRelayEvent, FilledV3RelayEvent, FundsDepositedEvent, V3FundsDepositedEvent };

package/src/pool/poolClient.ts

@@ -1,7 +1,16 @@
 import assert from "assert";
 import * as uma from "@uma/sdk";
-import { toBNWei, fixedPointAdjustment, calcPeriodicCompoundInterest, calcApr, BigNumberish, fromWei } from "../utils";
-import { ethers, Signer, BigNumber } from "ethers";
+import {
+  bnZero,
+  toBNWei,
+  fixedPointAdjustment,
+  calcPeriodicCompoundInterest,
+  calcApr,
+  BigNumber,
+  BigNumberish,
+  fromWei,
+} from "../utils";
+import { ethers, Signer } from "ethers";
 import type { Overrides } from "@ethersproject/contracts";
 import { TransactionRequest, TransactionReceipt, Log } from "@ethersproject/abstract-provider";
 import { Provider, Block } from "@ethersproject/providers";
@@ -256,10 +265,10 @@ class UserState {
     if (endBlock <= this.startBlock) return [];
     const { userAddress } = this;
     const events: TypedEvent<
-      [string, string, uma.oracle.types.ethers.BigNumber] & {
+      [string, string, BigNumber] & {
         from: string;
         to: string;
-        value: uma.oracle.types.ethers.BigNumber;
+        value: BigNumber;
       }
     >[] = (
       await Promise.all([
@@ -352,9 +361,9 @@ function joinUserState(
   poolState: Pool,
   tokenEventState: hubPool.TokenEventState,
   userState: Awaited<ReturnType<UserState["read"]>>,
-  transferValue: BigNumber = ethers.constants.Zero,
-  cumulativeStakeBalance: BigNumber = ethers.constants.Zero,
-  cumulativeStakeClaimBalance: BigNumber = ethers.constants.Zero
+  transferValue = bnZero,
+  cumulativeStakeBalance = bnZero,
+  cumulativeStakeClaimBalance = bnZero
 ): User {
   const positionValue = BigNumber.from(poolState.exchangeRateCurrent)
     .mul(userState.balanceOf.add(cumulativeStakeBalance))
@@ -534,7 +543,7 @@ export class Client {
           )
         )
       )
-    ).reduce((prev, acc) => acc.add(prev), ethers.constants.Zero);
+    ).reduce((prev, acc) => acc.add(prev), bnZero);
 
     // Get the cumulative balance of the user from the accelerating distributor contract.
     const { cumulativeBalance } = await acceleratingDistributorContract.getUserStake(lpToken, userState.address);
@@ -578,7 +587,7 @@ export class Client {
       }
       // we make sure to filter out any transfers where to/from is the same user
       return result;
-    }, ethers.constants.Zero);
+    }, bnZero);
   }
   private getOrCreateTransactionManager(signer: Signer, address: string) {
     if (this.transactionManagers[address]) return this.transactionManagers[address];
@@ -744,7 +753,7 @@ export class Client {
     const { address: userAddress } = userState;
     const transferValue = this.config.hasArchive
       ? await this.calculateLpTransferValue(l1TokenAddress, userState)
-      : ethers.constants.Zero;
+      : bnZero;
     const stakeData = await this.resolveStakingData(lpToken, l1TokenAddress, userState);
     const tokenEventState = poolEventState[l1TokenAddress];
     const newUserState = this.setUserState(

package/src/providers/retryProvider.ts

@@ -53,6 +53,8 @@ export class RetryProvider extends ethers.providers.StaticJsonRpcProvider {
       });
     });
 
+    this.pollingInterval = 1000;
+
     if (this.nodeQuorumThreshold < 1 || !Number.isInteger(this.nodeQuorumThreshold)) {
       throw new Error(
         `nodeQuorum,Threshold cannot be < 1 and must be an integer. Currently set to ${this.nodeQuorumThreshold}`
@@ -125,9 +127,38 @@ export class RetryProvider extends ethers.providers.StaticJsonRpcProvider {
       return values[0][1];
     }
 
-    const throwQuorumError = () => {
+    const getMismatchedProviders = (values: [ethers.providers.StaticJsonRpcProvider, unknown][]) => {
+      return Object.fromEntries(
+        values
+          .filter(([, result]) => !compareRpcResults(method, result, quorumResult))
+          .map(([provider, result]) => [provider.connection.url, result])
+      );
+    };
+
+    const logQuorumMismatchOrFailureDetails = (
+      method: string,
+      params: Array<unknown>,
+      quorumProviders: string[],
+      mismatchedProviders: { [k: string]: unknown },
+      errors: [ethers.providers.StaticJsonRpcProvider, string][]
+    ) => {
+      logger.warn({
+        at: "ProviderUtils",
+        message: "Some providers mismatched with the quorum result or failed 🚸",
+        notificationPath: "across-warn",
+        method,
+        params: JSON.stringify(params),
+        quorumProviders,
+        mismatchedProviders: JSON.stringify(mismatchedProviders),
+        erroringProviders: errors.map(([provider, errorText]) => formatProviderError(provider, errorText)),
+      });
+    };
+
+    const throwQuorumError = (fallbackValues?: [ethers.providers.StaticJsonRpcProvider, unknown][]) => {
       const errorTexts = errors.map(([provider, errorText]) => formatProviderError(provider, errorText));
       const successfulProviderUrls = values.map(([provider]) => provider.connection.url);
+      const mismatchedProviders = getMismatchedProviders([...values, ...(fallbackValues || [])]);
+      logQuorumMismatchOrFailureDetails(method, params, successfulProviderUrls, mismatchedProviders, errors);
       throw new Error(
         "Not enough providers agreed to meet quorum.\n" +
           "Providers that errored:\n" +
@@ -186,29 +217,16 @@ export class RetryProvider extends ethers.providers.StaticJsonRpcProvider {
 
     // If this count is less than we need for quorum, throw the quorum error.
     if (count < quorumThreshold) {
-      throwQuorumError();
+      throwQuorumError(fallbackValues);
     }
 
     // If we've achieved quorum, then we should still log the providers that mismatched with the quorum result.
-    const mismatchedProviders = Object.fromEntries(
-      [...values, ...fallbackValues]
-        .filter(([, result]) => !compareRpcResults(method, result, quorumResult))
-        .map(([provider, result]) => [provider.connection.url, result])
-    );
+    const mismatchedProviders = getMismatchedProviders([...values, ...fallbackValues]);
     const quorumProviders = [...values, ...fallbackValues]
       .filter(([, result]) => compareRpcResults(method, result, quorumResult))
       .map(([provider]) => provider.connection.url);
     if (Object.keys(mismatchedProviders).length > 0 || errors.length > 0) {
-      logger.warn({
-        at: "ProviderUtils",
-        message: "Some providers mismatched with the quorum result or failed 🚸",
-        notificationPath: "across-warn",
-        method,
-        params,
-        quorumProviders,
-        mismatchedProviders,
-        erroringProviders: errors.map(([provider, errorText]) => formatProviderError(provider, errorText)),
-      });
+      logQuorumMismatchOrFailureDetails(method, params, quorumProviders, mismatchedProviders, errors);
     }
 
     return quorumResult;

package/src/relayFeeCalculator/relayFeeCalculator.ts

@@ -1,8 +1,8 @@
 import assert from "assert";
-import { BigNumber } from "ethers";
 import { DEFAULT_SIMULATED_RELAYER_ADDRESS, TOKEN_SYMBOLS_MAP } from "../constants";
 import { Deposit } from "../interfaces";
 import {
+  BigNumber,
   BigNumberish,
   MAX_BIG_INT,
   TransactionCostEstimate,

package/src/utils/AddressUtils.ts

@@ -1,4 +1,5 @@
-import { BigNumber, providers, utils } from "ethers";
+import { providers, utils } from "ethers";
+import { BigNumber } from "./BigNumberUtils";
 
 /**
  * Checks if a contract is deployed at the given address

package/src/utils/BigNumberUtils.ts

@@ -4,14 +4,20 @@
  * @author Across Protocol
  */
 
-import { ethers, BigNumber } from "ethers";
+import { utils as ethersUtils } from "ethers";
 
-export type BigNumberish = ethers.BigNumberish;
-export type BN = ethers.BigNumber;
+// eslint-disable-next-line no-restricted-imports
+import { BigNumber, BigNumberish } from "@ethersproject/bignumber";
 
-export const { Zero: bnZero, One: bnOne, MaxUint256: bnUint256Max } = ethers.constants;
+// eslint-disable-next-line no-restricted-imports
+export * from "@ethersproject/bignumber";
+export type BN = BigNumber;
 
+export const { formatEther, formatUnits, parseEther, parseUnits } = ethersUtils;
+export const bnZero = BigNumber.from("0");
+export const bnOne = BigNumber.from("1");
 export const bnUint32Max = BigNumber.from("0xffffffff");
+export const bnUint256Max = BigNumber.from("0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff");
 
 /**
  * Converts a stringified number into a BigNumber with 18 decimal places.
@@ -19,7 +25,7 @@ export const bnUint32Max = BigNumber.from("0xffffffff");
  * @returns The parsed BigNumber.
  */
 export function toWei(num: BigNumberish): BN {
-  return ethers.utils.parseEther(num.toString());
+  return ethersUtils.parseEther(num.toString());
 }
 
 /**
@@ -28,7 +34,7 @@ export function toWei(num: BigNumberish): BN {
  * @returns The parsed BigNumber.
  */
 export function toGWei(num: BigNumberish): BN {
-  return ethers.utils.parseUnits(num.toString(), 9);
+  return ethersUtils.parseUnits(num.toString(), 9);
 }
 
 /**

package/src/utils/FormattingUtils.ts

@@ -1,5 +1,5 @@
-import { ethers } from "ethers";
-import { BN, toBN } from "./BigNumberUtils";
+import { utils as ethersUtils } from "ethers";
+import { formatUnits, BigNumber as ethersBigNumber, BN, parseUnits, toBN } from "./BigNumberUtils";
 import { fromWei } from "./common";
 import assert from "assert";
 import { BigNumber } from "bignumber.js";
@@ -93,7 +93,7 @@ export function createShortHexString(hex: string, maxLength = 8, delimiter = "..
  * @returns The hex string.
  */
 export function utf8ToHex(input: string): string {
-  return ethers.utils.formatBytes32String(input);
+  return ethersUtils.formatBytes32String(input);
 }
 
 /**
@@ -102,7 +102,7 @@ export function utf8ToHex(input: string): string {
  * @returns The utf8 string.
  */
 export function hexToUtf8(input: string): string {
-  return ethers.utils.toUtf8String(input);
+  return ethersUtils.toUtf8String(input);
 }
 
 /**
@@ -112,7 +112,7 @@ export function hexToUtf8(input: string): string {
  * @returns The 32-byte hexadecimal string representation of the input.
  */
 export function bnToHex(input: BN): string {
-  return ethers.utils.hexZeroPad(ethers.utils.hexlify(toBN(input)), 32);
+  return ethersUtils.hexZeroPad(ethersUtils.hexlify(toBN(input)), 32);
 }
 
 /**
@@ -172,8 +172,8 @@ export const ConvertDecimals = (fromDecimals: number, toDecimals: number): ((amo
  * @param numericString The numeric string to convert
  * @returns The winston representation of the numeric string as a BigNumber
  */
-export function parseWinston(numericString: string): ethers.BigNumber {
-  return ethers.utils.parseUnits(numericString, 12);
+export function parseWinston(numericString: string): ethersBigNumber {
+  return parseUnits(numericString, 12);
 }
 
 /**
@@ -181,6 +181,6 @@ export function parseWinston(numericString: string): ethers.BigNumber {
  * @param winstonValue The winston value to convert
  * @returns The numeric string representation of the winston value
  */
-export function formatWinston(winstonValue: ethers.BigNumber): string {
-  return ethers.utils.formatUnits(winstonValue, 12);
+export function formatWinston(winstonValue: ethersBigNumber): string {
+  return formatUnits(winstonValue, 12);
 }

package/src/utils/JSONUtils.ts

@@ -1,4 +1,4 @@
-import { BigNumber } from "ethers";
+import { BigNumber } from "./BigNumberUtils";
 import { isDefined } from "./TypeGuards";
 
 /**

package/src/utils/Multicall.ts

@@ -1,5 +1,6 @@
-import { BigNumber, Contract, providers, Signer, utils as ethersUtils } from "ethers";
+import { Contract, providers, Signer, utils as ethersUtils } from "ethers";
 import { CHAIN_IDs } from "@across-protocol/constants";
+import { BigNumber } from "./BigNumberUtils";
 import { Multicall3, Multicall3__factory } from "./abi/typechain";
 
 type Provider = providers.Provider;

package/src/utils/SpokeUtils.ts

@@ -1,10 +1,10 @@
 import assert from "assert";
-import { BigNumber, BytesLike, Contract, PopulatedTransaction, providers, utils as ethersUtils } from "ethers";
+import { BytesLike, Contract, PopulatedTransaction, providers, utils as ethersUtils } from "ethers";
 import { CHAIN_IDs, ZERO_ADDRESS } from "../constants";
 import { Deposit, Fill, FillStatus, RelayData, SlowFillRequest } from "../interfaces";
 import { SpokePoolClient } from "../clients";
 import { chunk } from "./ArrayUtils";
-import { toBN } from "./BigNumberUtils";
+import { BigNumber, toBN } from "./BigNumberUtils";
 import { isDefined } from "./TypeGuards";
 import { getNetworkName } from "./NetworkUtils";
 

package/src/utils/TokenUtils.ts

@@ -1,8 +1,9 @@
 import { BlockTag } from "@ethersproject/abstract-provider";
-import { BigNumber, Contract, providers, Signer } from "ethers";
+import { Contract, providers, Signer } from "ethers";
 import * as constants from "../constants";
 import { L1Token } from "../interfaces";
 import { ERC20__factory } from "../typechain";
+import { BigNumber } from "./BigNumberUtils";
 import { getNetworkName } from "./NetworkUtils";
 import { isDefined } from "./TypeGuards";
 import { compareAddressesSimple } from "./AddressUtils";

package/src/utils/ValidatorUtils.ts

@@ -1,10 +1,11 @@
-import { BigNumber, ethers } from "ethers";
+import { utils as ethersUtils } from "ethers";
 import { object, min as Min, define, optional, string, integer, boolean } from "superstruct";
 import { DepositWithBlock } from "../interfaces";
+import { BigNumber } from "../utils";
 
-const AddressValidator = define<string>("AddressValidator", (v) => ethers.utils.isAddress(String(v)));
-const HexValidator = define<string>("HexValidator", (v) => ethers.utils.isHexString(String(v)));
-const BigNumberValidator = define<BigNumber>("BigNumberValidator", (v) => ethers.BigNumber.isBigNumber(v));
+const AddressValidator = define<string>("AddressValidator", (v) => ethersUtils.isAddress(String(v)));
+const HexValidator = define<string>("HexValidator", (v) => ethersUtils.isHexString(String(v)));
+const BigNumberValidator = define<BigNumber>("BigNumberValidator", (v) => BigNumber.isBigNumber(v));
 
 const V3DepositSchema = object({
   depositId: Min(integer(), 0),

package/src/utils/common.ts

@@ -2,10 +2,10 @@ import { L2Provider } from "@eth-optimism/sdk/dist/interfaces/l2-provider";
 import { isL2Provider as isOptimismL2Provider } from "@eth-optimism/sdk/dist/l2-provider";
 import assert from "assert";
 import Decimal from "decimal.js";
-import { BigNumber, ethers, PopulatedTransaction, providers, VoidSigner } from "ethers";
+import { ethers, PopulatedTransaction, providers, VoidSigner } from "ethers";
 import { getGasPriceEstimate } from "../gasPriceOracle";
 import { TypedMessage } from "../interfaces/TypedData";
-import { BigNumberish, BN, toBN } from "./BigNumberUtils";
+import { BigNumber, BigNumberish, BN, formatUnits, parseUnits, toBN } from "./BigNumberUtils";
 import { ConvertDecimals } from "./FormattingUtils";
 import { chainIsOPStack } from "./NetworkUtils";
 
@@ -20,7 +20,7 @@ export const MAX_BIG_INT = BigNumber.from(Number.MAX_SAFE_INTEGER.toString());
  * @param {number} decimals
  * @returns {BN}
  */
-export const toBNWei = (num: BigNumberish, decimals?: number): BN => ethers.utils.parseUnits(num.toString(), decimals);
+export const toBNWei = (num: BigNumberish, decimals?: number): BN => parseUnits(num.toString(), decimals);
 
 /**
  * fromWei.
@@ -29,8 +29,7 @@ export const toBNWei = (num: BigNumberish, decimals?: number): BN => ethers.util
  * @param {number} decimals
  * @returns {string}
  */
-export const fromWei = (num: BigNumberish, decimals?: number): string =>
-  ethers.utils.formatUnits(num.toString(), decimals);
+export const fromWei = (num: BigNumberish, decimals?: number): string => formatUnits(num.toString(), decimals);
 
 /**
  * min.