@across-protocol/sdk 3.1.33 → 3.1.35

package/src/apiClient/mockedClient.ts

@@ -1,6 +1,7 @@
 /* eslint-disable @typescript-eslint/no-unused-vars */
 import { ethers } from "ethers";
 import { deepCopy } from "ethers/lib/utils";
+import { BigNumber, bnOne } from "../utils";
 import AbstractApiClient from "./abstractClient";
 import {
   AcrossBridgeStatisticsType,
@@ -39,7 +40,7 @@ export default class MockedApiClient extends AbstractApiClient {
     );
   }
   public getSuggestedFees(
-    _amount: ethers.BigNumber,
+    _amount: BigNumber,
     _originToken: string,
     _toChainid: number,
     _fromChainid: number
@@ -47,20 +48,20 @@ export default class MockedApiClient extends AbstractApiClient {
     return Promise.resolve(
       this.mockedData.SuggestedFees ?? {
         relayerFee: {
-          pct: ethers.constants.One,
-          total: ethers.constants.One,
+          pct: bnOne,
+          total: bnOne,
         },
         relayerCapitalFee: {
-          pct: ethers.constants.One,
-          total: ethers.constants.One,
+          pct: bnOne,
+          total: bnOne,
         },
         relayerGasFee: {
-          pct: ethers.constants.One,
-          total: ethers.constants.One,
+          pct: bnOne,
+          total: bnOne,
         },
         isAmountTooLow: false,
-        quoteBlock: ethers.constants.One,
-        quoteTimestamp: ethers.constants.One,
+        quoteBlock: bnOne,
+        quoteTimestamp: bnOne,
       }
     );
   }
@@ -71,10 +72,10 @@ export default class MockedApiClient extends AbstractApiClient {
   ): Promise<BridgeLimitsReturnType> {
     return Promise.resolve(
       this.mockedData.BridgeLimits ?? {
-        minDeposit: ethers.BigNumber.from("317845960607070"),
-        maxDeposit: ethers.BigNumber.from("1625976243310274613043"),
-        maxDepositInstant: ethers.BigNumber.from("148518401181482545509"),
-        maxDepositShortDelay: ethers.BigNumber.from("1625976243310274613043"),
+        minDeposit: BigNumber.from("317845960607070"),
+        maxDeposit: BigNumber.from("1625976243310274613043"),
+        maxDepositInstant: BigNumber.from("148518401181482545509"),
+        maxDepositShortDelay: BigNumber.from("1625976243310274613043"),
       }
     );
   }

package/src/apiClient/productionClient.ts

@@ -1,6 +1,6 @@
 import axios from "axios";
-import { ethers } from "ethers";
 import AbstractApiClient from "./abstractClient";
+import { BigNumber, parseEther } from "../utils";
 import {
   CoingeckoDataReturnType,
   SuggestedFeeReturnType,
@@ -27,14 +27,13 @@ export default class ProductionApiClient extends AbstractApiClient {
       },
     });
     const result = response.data;
-    const price =
-      baseCurrency === "usd" ? ethers.utils.parseEther(String(result.price)) : ethers.BigNumber.from(result.price);
+    const price = baseCurrency === "usd" ? parseEther(String(result.price)) : BigNumber.from(result.price);
     return {
       price,
     };
   }
   public async getSuggestedFees(
-    amount: ethers.BigNumber,
+    amount: BigNumber,
     originToken: string,
     toChainid: number,
     fromChainid: number
@@ -49,19 +48,19 @@ export default class ProductionApiClient extends AbstractApiClient {
       },
     });
     const result = response.data;
-    const relayFeePct = ethers.BigNumber.from(result["relayFeePct"]);
-    const relayFeeTotal = ethers.BigNumber.from(result["relayFeeTotal"]);
+    const relayFeePct = BigNumber.from(result["relayFeePct"]);
+    const relayFeeTotal = BigNumber.from(result["relayFeeTotal"]);
 
-    const capitalFeePct = ethers.BigNumber.from(result["capitalFeePct"]);
-    const capitalFeeTotal = ethers.BigNumber.from(result["capitalFeeTotal"]);
+    const capitalFeePct = BigNumber.from(result["capitalFeePct"]);
+    const capitalFeeTotal = BigNumber.from(result["capitalFeeTotal"]);
 
-    const relayGasFeePct = ethers.BigNumber.from(result["relayGasFeePct"]);
-    const relayGasFeeTotal = ethers.BigNumber.from(result["relayGasFeeTotal"]);
+    const relayGasFeePct = BigNumber.from(result["relayGasFeePct"]);
+    const relayGasFeeTotal = BigNumber.from(result["relayGasFeeTotal"]);
 
     const isAmountTooLow = result["isAmountTooLow"];
 
-    const quoteTimestamp = ethers.BigNumber.from(result["timestamp"]);
-    const quoteBlock = ethers.BigNumber.from(result["quoteBlock"]);
+    const quoteTimestamp = BigNumber.from(result["timestamp"]);
+    const quoteBlock = BigNumber.from(result["quoteBlock"]);
 
     return {
       relayerFee: {

package/src/apiClient/types.ts

@@ -1,25 +1,25 @@
-import { ethers } from "ethers";
+import { BigNumber } from "../utils";
 
-export type CoingeckoDataReturnType = { price: ethers.BigNumber };
+export type CoingeckoDataReturnType = { price: BigNumber };
 
 export type Fee = {
-  total: ethers.BigNumber;
-  pct: ethers.BigNumber;
+  total: BigNumber;
+  pct: BigNumber;
 };
 export type SuggestedFeeReturnType = {
   relayerFee: Fee;
   relayerGasFee: Fee;
   relayerCapitalFee: Fee;
   isAmountTooLow: boolean;
-  quoteTimestamp: ethers.BigNumber;
-  quoteBlock: ethers.BigNumber;
+  quoteTimestamp: BigNumber;
+  quoteBlock: BigNumber;
 };
 
 export type BridgeLimitsReturnType = {
-  minDeposit: ethers.BigNumber;
-  maxDeposit: ethers.BigNumber;
-  maxDepositInstant: ethers.BigNumber;
-  maxDepositShortDelay: ethers.BigNumber;
+  minDeposit: BigNumber;
+  maxDeposit: BigNumber;
+  maxDepositInstant: BigNumber;
+  maxDepositShortDelay: BigNumber;
 };
 
 export type SpecificRewardType = {

package/src/caching/Arweave/ArweaveClient.ts

@@ -1,11 +1,10 @@
 import Arweave from "arweave";
 import { JWKInterface } from "arweave/node/lib/wallet";
 import axios from "axios";
-import { BigNumber, ethers } from "ethers";
 import { Struct, create } from "superstruct";
 import winston from "winston";
 import { ARWEAVE_TAG_APP_NAME, ARWEAVE_TAG_APP_VERSION, DEFAULT_ARWEAVE_STORAGE_ADDRESS } from "../../constants";
-import { isDefined, jsonReplacerWithBigNumbers, toBN } from "../../utils";
+import { BigNumber, isDefined, jsonReplacerWithBigNumbers, toBN } from "../../utils";
 
 export class ArweaveClient {
   private client: Arweave;
@@ -230,14 +229,14 @@ export class ArweaveClient {
    * The balance of the signer
    * @returns The balance of the signer in winston units
    */
-  async getBalance(): Promise<ethers.BigNumber> {
+  async getBalance(): Promise<BigNumber> {
     const address = await this.getAddress();
     const balanceInFloat = await this.client.wallets.getBalance(address);
     // Sometimes the balance is returned in scientific notation, so we need to
     // convert it to a BigNumber
     if (balanceInFloat.includes("e")) {
       const [balance, exponent] = balanceInFloat.split("e");
-      const resultingBN = ethers.BigNumber.from(balance).mul(toBN(10).pow(exponent.replace("+", "")));
+      const resultingBN = BigNumber.from(balance).mul(toBN(10).pow(exponent.replace("+", "")));
       return BigNumber.from(resultingBN.toString());
     } else {
       return BigNumber.from(balanceInFloat);

package/src/clients/BaseAbstractClient.ts

@@ -3,6 +3,7 @@ import { CachingMechanismInterface } from "../interfaces";
 import { EventSearchConfig, isDefined, MakeOptional } from "../utils";
 
 export enum UpdateFailureReason {
+  NotReady,
   AlreadyUpdated,
   BadRequest,
   RPCError,

package/src/clients/BundleDataClient/BundleDataClient.ts

@@ -17,6 +17,7 @@ import {
 } from "../../interfaces";
 import { AcrossConfigStoreClient, SpokePoolClient } from "..";
 import {
+  BigNumber,
   bnZero,
   queryHistoricalDepositForFill,
   assign,
@@ -31,7 +32,6 @@ import {
   mapAsync,
   bnUint32Max,
 } from "../../utils";
-import { BigNumber } from "ethers";
 import winston from "winston";
 import {
   _buildPoolRebalanceRoot,

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

@@ -1,8 +1,7 @@
 import { MerkleTree } from "@across-protocol/contracts/dist/utils/MerkleTree";
 import { RunningBalances, PoolRebalanceLeaf, Clients, SpokePoolTargetBalance } from "../../../interfaces";
 import { SpokePoolClient } from "../../SpokePoolClient";
-import { BigNumber } from "ethers";
-import { bnZero, compareAddresses } from "../../../utils";
+import { BigNumber, bnZero, compareAddresses } from "../../../utils";
 import { HubPoolClient } from "../../HubPoolClient";
 import { V3DepositWithBlock } from "./shims";
 import { AcrossConfigStoreClient } from "../../AcrossConfigStoreClient";

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/index.ts

@@ -4,6 +4,7 @@ export {
   AcrossConfigStoreClient,
   ConfigStoreUpdate,
 } from "./AcrossConfigStoreClient";
+export { UpdateFailureReason } from "./BaseAbstractClient";
 export { HubPoolClient, LpFeeRequest } from "./HubPoolClient";
 export { SpokePoolClient, SpokePoolUpdate } from "./SpokePoolClient";
 export * as BundleDataClient from "./BundleDataClient";

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