@across-protocol/sdk 3.1.33 → 3.1.35

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.