@across-protocol/sdk 3.4.19 → 4.0.0-beta.0

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

@@ -14,6 +14,7 @@ import {
 import {
   bnZero,
   AnyObject,
+  groupObjectCountsByTwoProps,
   fixedPointAdjustment,
   count2DDictionaryValues,
   count3DDictionaryValues,
@@ -25,6 +26,7 @@ import {
   updateRunningBalance,
   updateRunningBalanceForDeposit,
 } from "./PoolRebalanceUtils";
+import { V3FillWithBlock } from "./shims";
 import { AcrossConfigStoreClient } from "../../AcrossConfigStoreClient";
 import { HubPoolClient } from "../../HubPoolClient";
 import { buildPoolRebalanceLeafTree } from "./MerkleTreeUtils";
@@ -81,6 +83,7 @@ export function getRefundsFromBundle(
 export function prettyPrintV3SpokePoolEvents(
   bundleDepositsV3: BundleDepositsV3,
   bundleFillsV3: BundleFillsV3,
+  bundleInvalidFillsV3: V3FillWithBlock[],
   bundleSlowFillsV3: BundleSlowFills,
   expiredDepositsToRefundV3: ExpiredDepositsToRefundV3,
   unexecutableSlowFills: BundleExcessSlowFills
@@ -91,6 +94,11 @@ export function prettyPrintV3SpokePoolEvents(
     bundleSlowFillsV3: count2DDictionaryValues(bundleSlowFillsV3),
     expiredDepositsToRefundV3: count2DDictionaryValues(expiredDepositsToRefundV3),
     unexecutableSlowFills: count2DDictionaryValues(unexecutableSlowFills),
+    allInvalidFillsInRangeByDestinationChainAndRelayer: groupObjectCountsByTwoProps(
+      bundleInvalidFillsV3,
+      "destinationChainId",
+      (fill) => `${fill.relayer}`
+    ),
   };
 }
 

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

@@ -1,7 +1,5 @@
-import _ from "lodash";
-import { providers } from "ethers";
-import { DepositWithBlock, Fill, FillWithBlock } from "../../../interfaces";
-import { getBlockRangeForChain, isSlowFill, chainIsEvm, isValidEvmAddress, isDefined } from "../../../utils";
+import { Fill } from "../../../interfaces";
+import { getBlockRangeForChain, isSlowFill } from "../../../utils";
 import { HubPoolClient } from "../../HubPoolClient";
 
 export function getRefundInformationFromFill(
@@ -46,46 +44,3 @@ export function getRefundInformationFromFill(
     repaymentToken,
   };
 }
-
-// Verify that a fill sent to an EVM chain has a 20 byte address. If the fill does not, then attempt
-// to repay the `msg.sender` of the relay transaction. Otherwise, return undefined.
-export async function verifyFillRepayment(
-  fill: FillWithBlock,
-  destinationChainProvider: providers.Provider,
-  matchedDeposit: DepositWithBlock,
-  possibleRepaymentChainIds: number[]
-): Promise<FillWithBlock | undefined> {
-  // Slow fills don't result in repayments so they're always valid.
-  if (isSlowFill(fill)) {
-    return fill;
-  }
-  // Lite chain deposits force repayment on origin chain.
-  const repaymentChainId = matchedDeposit.fromLiteChain ? fill.originChainId : fill.repaymentChainId;
-  // Return undefined if the requested repayment chain ID is not recognized by the hub pool.
-  if (!possibleRepaymentChainIds.includes(repaymentChainId)) {
-    return undefined;
-  }
-  const updatedFill = _.cloneDeep(fill);
-
-  // If the fill requests repayment on a chain where the repayment address is not valid, attempt to find a valid
-  // repayment address, otherwise return undefined.
-
-  // Case 1: repayment chain is an EVM chain but repayment address is not a valid EVM address.
-  if (chainIsEvm(repaymentChainId) && !isValidEvmAddress(updatedFill.relayer)) {
-    // TODO: Handle case where fill was sent on non-EVM chain, in which case the following call would fail
-    // or return something unexpected. We'd want to return undefined here.
-    const fillTransaction = await destinationChainProvider.getTransaction(updatedFill.transactionHash);
-    const destinationRelayer = fillTransaction?.from;
-    // Repayment chain is still an EVM chain, but the msg.sender is a bytes32 address, so the fill is invalid.
-    if (!isDefined(destinationRelayer) || !isValidEvmAddress(destinationRelayer)) {
-      return undefined;
-    }
-    // Otherwise, assume the relayer to be repaid is the msg.sender. We don't need to modify the repayment chain since
-    // the getTransaction() call would only succeed if the fill was sent on an EVM chain and therefore the msg.sender
-    // is a valid EVM address and the repayment chain is an EVM chain.
-    updatedFill.relayer = destinationRelayer;
-  }
-
-  // Case 2: TODO repayment chain is an SVM chain and repayment address is not a valid SVM address.
-  return updatedFill;
-}

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

@@ -10,7 +10,6 @@ import {
   pattern,
   boolean,
   defaulted,
-  union,
   type,
 } from "superstruct";
 import { BigNumber } from "../../../utils";
@@ -18,7 +17,7 @@ import { BigNumber } from "../../../utils";
 const PositiveIntegerStringSS = pattern(string(), /\d+/);
 const Web3AddressSS = pattern(string(), /^0x[a-fA-F0-9]{40}$/);
 
-const BigNumberType = coerce(instance(BigNumber), union([string(), number()]), (value) => {
+const BigNumberType = coerce(instance(BigNumber), string(), (value) => {
   try {
     // Attempt to convert the string to a BigNumber
     return BigNumber.from(value);
@@ -42,7 +41,7 @@ const V3RelayDataSS = {
   originChainId: number(),
   depositor: string(),
   recipient: string(),
-  depositId: BigNumberType,
+  depositId: number(),
   message: string(),
 };
 
@@ -92,7 +91,6 @@ const V3FillSS = {
   repaymentChainId: number(),
   relayExecutionInfo: V3RelayExecutionEventInfoSS,
   quoteTimestamp: number(),
-  messageHash: optional(string()),
 };
 
 const V3FillWithBlockSS = {

package/src/clients/SpokePoolClient.ts

@@ -12,8 +12,6 @@ import {
   getRelayDataHash,
   isDefined,
   toBN,
-  bnOne,
-  isUnsafeDepositId,
 } from "../utils";
 import {
   paginatedEventQuery,
@@ -48,8 +46,8 @@ type SpokePoolUpdateSuccess = {
   success: true;
   currentTime: number;
   oldestTime: number;
-  firstDepositId: BigNumber;
-  latestDepositId: BigNumber;
+  firstDepositId: number;
+  latestDepositId: number;
   events: Log[][];
   searchEndBlock: number;
 };
@@ -67,8 +65,9 @@ export class SpokePoolClient extends BaseAbstractClient {
   protected currentTime = 0;
   protected oldestTime = 0;
   protected depositHashes: { [depositHash: string]: DepositWithBlock } = {};
+  protected duplicateDepositHashes: { [depositHash: string]: DepositWithBlock[] } = {};
   protected depositHashesToFills: { [depositHash: string]: FillWithBlock[] } = {};
-  protected speedUps: { [depositorAddress: string]: { [depositId: string]: SpeedUpWithBlock[] } } = {};
+  protected speedUps: { [depositorAddress: string]: { [depositId: number]: SpeedUpWithBlock[] } } = {};
   protected slowFillRequests: { [relayDataHash: string]: SlowFillRequestWithBlock } = {};
   protected depositRoutes: { [originToken: string]: { [DestinationChainId: number]: boolean } } = {};
   protected tokensBridged: TokensBridged[] = [];
@@ -76,10 +75,10 @@ export class SpokePoolClient extends BaseAbstractClient {
   protected relayerRefundExecutions: RelayerRefundExecutionWithBlock[] = [];
   protected queryableEventNames: string[] = [];
   protected configStoreClient: AcrossConfigStoreClient | undefined;
-  public earliestDepositIdQueried = MAX_BIG_INT;
-  public latestDepositIdQueried = bnZero;
-  public firstDepositIdForSpokePool = MAX_BIG_INT;
-  public lastDepositIdForSpokePool = MAX_BIG_INT;
+  public earliestDepositIdQueried = Number.MAX_SAFE_INTEGER;
+  public latestDepositIdQueried = 0;
+  public firstDepositIdForSpokePool = Number.MAX_SAFE_INTEGER;
+  public lastDepositIdForSpokePool = Number.MAX_SAFE_INTEGER;
   public fills: { [OriginChainId: number]: FillWithBlock[] } = {};
 
   /**
@@ -126,7 +125,7 @@ export class SpokePoolClient extends BaseAbstractClient {
   }
 
   /**
-   * Retrieves a list of deposits from the SpokePool contract destined for the given destination chain ID.
+   * Retrieves a list of unique deposits from the SpokePool contract destined for the given destination chain ID.
    * @param destinationChainId The destination chain ID.
    * @returns A list of deposits.
    */
@@ -134,6 +133,21 @@ export class SpokePoolClient extends BaseAbstractClient {
     return Object.values(this.depositHashes).filter((deposit) => deposit.destinationChainId === destinationChainId);
   }
 
+  /**
+   * Returns a list of all deposits including any duplicate ones. Designed only to be used in use cases where
+   * all deposits are required, regardless of duplicates. For example, the Dataworker can use this to refund
+   * expired deposits including for duplicates.
+   * @param destinationChainId
+   * @returns A list of deposits
+   */
+  public getDepositsForDestinationChainWithDuplicates(destinationChainId: number): DepositWithBlock[] {
+    const deposits = this.getDepositsForDestinationChain(destinationChainId);
+    const duplicateDeposits = Object.values(this.duplicateDepositHashes).filter(
+      (deposits) => deposits.length > 0 && deposits[0].destinationChainId === destinationChainId
+    );
+    return sortEventsAscendingInPlace(deposits.concat(duplicateDeposits.flat()));
+  }
+
   /**
    * Retrieves a list of deposits from the SpokePool contract that are associated with this spoke pool.
    * @returns A list of deposits.
@@ -234,7 +248,7 @@ export class SpokePoolClient extends BaseAbstractClient {
    */
   public appendMaxSpeedUpSignatureToDeposit(deposit: DepositWithBlock): DepositWithBlock {
     const { depositId, depositor } = deposit;
-    const speedups = this.speedUps[depositor]?.[depositId.toString()];
+    const speedups = this.speedUps[depositor]?.[depositId];
     if (!isDefined(speedups) || speedups.length === 0) {
       return deposit;
     }
@@ -267,7 +281,7 @@ export class SpokePoolClient extends BaseAbstractClient {
    * @param depositId The unique ID of the deposit being queried.
    * @returns The corresponding deposit if found, undefined otherwise.
    */
-  public getDeposit(depositId: BigNumber): DepositWithBlock | undefined {
+  public getDeposit(depositId: number): DepositWithBlock | undefined {
     const depositHash = this.getDepositHash({ depositId, originChainId: this.chainId });
     return this.depositHashes[depositHash];
   }
@@ -297,7 +311,7 @@ export class SpokePoolClient extends BaseAbstractClient {
    * Retrieves speed up requests grouped by depositor and depositId.
    * @returns A mapping of depositor addresses to deposit ids with their corresponding speed up requests.
    */
-  public getSpeedUps(): { [depositorAddress: string]: { [depositId: string]: SpeedUpWithBlock[] } } {
+  public getSpeedUps(): { [depositorAddress: string]: { [depositId: number]: SpeedUpWithBlock[] } } {
     return this.speedUps;
   }
 
@@ -315,7 +329,7 @@ export class SpokePoolClient extends BaseAbstractClient {
 
     this.logger.debug({
       at: "SpokePoolClient::getDepositForFill",
-      message: `Rejected fill for ${getNetworkName(fill.originChainId)} deposit ${fill.depositId.toString()}.`,
+      message: `Rejected fill for ${getNetworkName(fill.originChainId)} deposit ${fill.depositId}.`,
       reason: match.reason,
       deposit,
       fill,
@@ -367,7 +381,7 @@ export class SpokePoolClient extends BaseAbstractClient {
     );
 
     // Log any invalid deposits with same deposit id but different params.
-    const invalidFillsForDeposit = invalidFills.filter((x) => x.depositId.eq(deposit.depositId));
+    const invalidFillsForDeposit = invalidFills.filter((x) => x.depositId === deposit.depositId);
     if (invalidFillsForDeposit.length > 0) {
       this.logger.warn({
         at: "SpokePoolClient",
@@ -398,8 +412,8 @@ export class SpokePoolClient extends BaseAbstractClient {
    * @note This hash is used to match deposits and fills together.
    * @note This hash takes the form of: `${depositId}-${originChainId}`.
    */
-  public getDepositHash(event: { depositId: BigNumber; originChainId: number }): string {
-    return `${event.depositId.toString()}-${event.originChainId}`;
+  public getDepositHash(event: { depositId: number; originChainId: number }): string {
+    return `${event.depositId}-${event.originChainId}`;
   }
 
   /**
@@ -407,7 +421,7 @@ export class SpokePoolClient extends BaseAbstractClient {
    * @param blockTag The block number to search for the deposit ID at.
    * @returns The deposit ID.
    */
-  public _getDepositIdAtBlock(blockTag: number): Promise<BigNumber> {
+  public _getDepositIdAtBlock(blockTag: number): Promise<number> {
     return getDepositIdAtBlock(this.spokePool as SpokePool, blockTag);
   }
 
@@ -440,11 +454,10 @@ export class SpokePoolClient extends BaseAbstractClient {
    */
   protected async _update(eventsToQuery: string[]): Promise<SpokePoolUpdate> {
     // Find the earliest known depositId. This assumes no deposits were placed in the deployment block.
-    let firstDepositId = this.firstDepositIdForSpokePool;
-    if (firstDepositId.eq(MAX_BIG_INT)) {
+    let firstDepositId: number = this.firstDepositIdForSpokePool;
+    if (firstDepositId === Number.MAX_SAFE_INTEGER) {
       firstDepositId = await this.spokePool.numberOfDeposits({ blockTag: this.deploymentBlock });
-      firstDepositId = BigNumber.from(firstDepositId); // Cast input to a big number.
-      if (!BigNumber.isBigNumber(firstDepositId) || firstDepositId.lt(bnZero)) {
+      if (isNaN(firstDepositId) || firstDepositId < 0) {
         throw new Error(`SpokePoolClient::update: Invalid first deposit id (${firstDepositId})`);
       }
     }
@@ -494,10 +507,9 @@ export class SpokePoolClient extends BaseAbstractClient {
     ]);
     this.log("debug", `Time to query new events from RPC for ${this.chainId}: ${Date.now() - timerStart} ms`);
 
-    const [currentTime, _numberOfDeposits] = multicallFunctions.map(
+    const [currentTime, numberOfDeposits] = multicallFunctions.map(
       (fn, idx) => spokePool.interface.decodeFunctionResult(fn, multicallOutput[idx])[0]
     );
-    const _latestDepositId = BigNumber.from(_numberOfDeposits).sub(bnOne);
 
     if (!BigNumber.isBigNumber(currentTime) || currentTime.lt(this.currentTime)) {
       const errMsg = BigNumber.isBigNumber(currentTime)
@@ -514,7 +526,7 @@ export class SpokePoolClient extends BaseAbstractClient {
       currentTime: currentTime.toNumber(), // uint32
       oldestTime: oldestTime.toNumber(),
       firstDepositId,
-      latestDepositId: _latestDepositId.gt(bnZero) ? _latestDepositId : bnZero,
+      latestDepositId: Math.max(numberOfDeposits - 1, 0),
       searchEndBlock: searchConfig.toBlock,
       events,
     };
@@ -579,14 +591,15 @@ export class SpokePoolClient extends BaseAbstractClient {
         }
 
         if (this.depositHashes[this.getDepositHash(deposit)] !== undefined) {
+          assign(this.duplicateDepositHashes, [this.getDepositHash(deposit)], [deposit]);
           continue;
         }
         assign(this.depositHashes, [this.getDepositHash(deposit)], deposit);
 
-        if (deposit.depositId.lt(this.earliestDepositIdQueried) && !isUnsafeDepositId(deposit.depositId)) {
+        if (deposit.depositId < this.earliestDepositIdQueried) {
           this.earliestDepositIdQueried = deposit.depositId;
         }
-        if (deposit.depositId.gt(this.latestDepositIdQueried) && !isUnsafeDepositId(deposit.depositId)) {
+        if (deposit.depositId > this.latestDepositIdQueried) {
           this.latestDepositIdQueried = deposit.depositId;
         }
       }
@@ -598,7 +611,7 @@ export class SpokePoolClient extends BaseAbstractClient {
 
       for (const event of speedUpEvents) {
         const speedUp = { ...spreadEventWithBlockNumber(event), originChainId: this.chainId } as SpeedUpWithBlock;
-        assign(this.speedUps, [speedUp.depositor, speedUp.depositId.toString()], [speedUp]);
+        assign(this.speedUps, [speedUp.depositor, speedUp.depositId], [speedUp]);
 
         // Find deposit hash matching this speed up event and update the deposit data associated with the hash,
         // if the hash+data exists.
@@ -782,7 +795,7 @@ export class SpokePoolClient extends BaseAbstractClient {
     return this.oldestTime;
   }
 
-  async findDeposit(depositId: BigNumber, destinationChainId: number): Promise<DepositWithBlock> {
+  async findDeposit(depositId: number, destinationChainId: number): Promise<DepositWithBlock> {
     // Binary search for event search bounds. This way we can get the blocks before and after the deposit with
     // deposit ID = fill.depositId and use those blocks to optimize the search for that deposit.
     // Stop searches after a maximum # of searches to limit number of eth_call requests. Make an
@@ -811,12 +824,12 @@ export class SpokePoolClient extends BaseAbstractClient {
     );
     const tStop = Date.now();
 
-    const event = query.find(({ args }) => args["depositId"].eq(depositId));
+    const event = query.find(({ args }) => args["depositId"] === depositId);
     if (event === undefined) {
       const srcChain = getNetworkName(this.chainId);
       const dstChain = getNetworkName(destinationChainId);
       throw new Error(
-        `Could not find deposit ${depositId.toString()} for ${dstChain} fill` +
+        `Could not find deposit ${depositId} for ${dstChain} fill` +
           ` between ${srcChain} blocks [${searchBounds.low}, ${searchBounds.high}]`
       );
     }

package/src/clients/mocks/MockSpokePoolClient.ts

@@ -13,9 +13,8 @@ import {
   FillWithBlock,
   SlowFillLeaf,
   SpeedUp,
-  TokensBridged,
 } from "../../interfaces";
-import { toBN, toBNWei, getCurrentTime, randomAddress, BigNumber, bnZero, bnOne, bnMax } from "../../utils";
+import { toBN, toBNWei, getCurrentTime, randomAddress } from "../../utils";
 import { SpokePoolClient, SpokePoolUpdate } from "../SpokePoolClient";
 import { HubPoolClient } from "../HubPoolClient";
 import { EventManager, EventOverrides, getEventManager } from "./MockEvents";
@@ -27,8 +26,8 @@ export class MockSpokePoolClient extends SpokePoolClient {
   public eventManager: EventManager;
   private destinationTokenForChainOverride: Record<number, string> = {};
   // Allow tester to set the numberOfDeposits() returned by SpokePool at a block height.
-  public depositIdAtBlock: BigNumber[] = [];
-  public numberOfDeposits = bnZero;
+  public depositIdAtBlock: number[] = [];
+  public numberOfDeposits = 0;
 
   constructor(
     logger: winston.Logger,
@@ -58,21 +57,21 @@ export class MockSpokePoolClient extends SpokePoolClient {
     this.latestBlockSearched = blockNumber;
   }
 
-  setDepositIds(_depositIds: BigNumber[]): void {
+  setDepositIds(_depositIds: number[]): void {
     this.depositIdAtBlock = [];
     if (_depositIds.length === 0) {
       return;
     }
     let lastDepositId = _depositIds[0];
     for (let i = 0; i < _depositIds.length; i++) {
-      if (_depositIds[i].lt(lastDepositId)) {
+      if (_depositIds[i] < lastDepositId) {
         throw new Error("deposit ID must be equal to or greater than previous");
       }
       this.depositIdAtBlock[i] = _depositIds[i];
       lastDepositId = _depositIds[i];
     }
   }
-  _getDepositIdAtBlock(blockTag: number): Promise<BigNumber> {
+  _getDepositIdAtBlock(blockTag: number): Promise<number> {
     return Promise.resolve(this.depositIdAtBlock[blockTag]);
   }
 
@@ -97,13 +96,13 @@ export class MockSpokePoolClient extends SpokePoolClient {
     // Update latestDepositIdQueried.
     const idx = eventsToQuery.indexOf("V3FundsDeposited");
     const latestDepositId = (events[idx] ?? []).reduce(
-      (depositId, event) => bnMax(depositId, event.args["depositId"] ?? bnZero),
+      (depositId, event) => Math.max(depositId, (event.args["depositId"] ?? 0) as number),
       this.latestDepositIdQueried
     );
 
     return Promise.resolve({
       success: true,
-      firstDepositId: bnZero,
+      firstDepositId: 0,
       latestDepositId,
       currentTime,
       oldestTime: 0,
@@ -123,8 +122,7 @@ export class MockSpokePoolClient extends SpokePoolClient {
     const { blockNumber, transactionIndex } = deposit;
     let { depositId, depositor, destinationChainId, inputToken, inputAmount, outputToken, outputAmount } = deposit;
     depositId ??= this.numberOfDeposits;
-    assert(depositId.gte(this.numberOfDeposits), `${depositId.toString()} < ${this.numberOfDeposits}`);
-    this.numberOfDeposits = depositId.add(bnOne);
+    this.numberOfDeposits = depositId + 1;
 
     destinationChainId ??= random(1, 42161, false);
     depositor ??= randomAddress();
@@ -169,7 +167,7 @@ export class MockSpokePoolClient extends SpokePoolClient {
     const { blockNumber, transactionIndex } = fill;
     let { originChainId, depositId, inputToken, inputAmount, outputAmount, fillDeadline, relayer } = fill;
     originChainId ??= random(1, 42161, false);
-    depositId ??= BigNumber.from(random(1, 100_000, false));
+    depositId ??= random(1, 100_000, false);
     inputToken ??= randomAddress();
     inputAmount ??= toBNWei(random(1, 1000, false));
     outputAmount ??= inputAmount;
@@ -226,19 +224,6 @@ export class MockSpokePoolClient extends SpokePoolClient {
     });
   }
 
-  setTokensBridged(tokensBridged: TokensBridged): Log {
-    const event = "TokensBridged";
-    const topics = [tokensBridged.chainId, tokensBridged.leafId, tokensBridged.l2TokenAddress];
-    const args = { ...tokensBridged };
-
-    return this.eventManager.generateEvent({
-      event,
-      address: this.spokePool.address,
-      topics: topics.map((topic) => topic.toString()),
-      args,
-    });
-  }
-
   requestV3SlowFill(request: SlowFillRequestWithBlock): Log {
     const event = "RequestedV3SlowFill";
 

package/src/constants.ts

@@ -10,7 +10,7 @@ export {
   TOKEN_SYMBOLS_MAP,
 } from "@across-protocol/constants";
 
-export const { AddressZero: ZERO_ADDRESS, HashZero: ZERO_BYTES } = ethersConstants;
+export const { AddressZero: ZERO_ADDRESS } = ethersConstants;
 
 // 2^96 - 1 is a conservative erc20 max allowance.
 export const MAX_SAFE_ALLOWANCE = "79228162514264337593543950335";
@@ -33,7 +33,7 @@ export const TRANSFER_THRESHOLD_MAX_CONFIG_STORE_VERSION = 1;
 export const ARWEAVE_TAG_APP_NAME = "across-protocol";
 
 // A hardcoded version number used, by default, to tag all Arweave records.
-export const ARWEAVE_TAG_APP_VERSION = 3;
+export const ARWEAVE_TAG_APP_VERSION = 2;
 
 /**
  * A default list of chain Ids that the protocol supports. This is outlined

package/src/interfaces/SpokePool.ts

@@ -10,7 +10,7 @@ export interface RelayData {
   originChainId: number;
   depositor: string;
   recipient: string;
-  depositId: BigNumber;
+  depositId: number;
   inputToken: string;
   inputAmount: BigNumber;
   outputToken: string;
@@ -67,7 +67,7 @@ export interface FillWithBlock extends Fill, SortableEvent {}
 export interface SpeedUp {
   depositor: string;
   depositorSignature: string;
-  depositId: BigNumber;
+  depositId: number;
   originChainId: number;
   updatedRecipient: string;
   updatedOutputAmount: BigNumber;

package/src/providers/index.ts

@@ -5,4 +5,3 @@ export * from "./speedProvider";
 export * from "./constants";
 export * from "./types";
 export * from "./utils";
-export * as mocks from "./mockProvider";

package/src/utils/AddressUtils.ts

@@ -38,29 +38,3 @@ export function compareAddressesSimple(addressA?: string, addressB?: string): bo
   }
   return addressA.toLowerCase() === addressB.toLowerCase();
 }
-
-// Converts an input (assumed to be) bytes32 string into a bytes20 string.
-// If the input is not a bytes32 but is less than type(uint160).max, then this function
-// will still succeed.
-// Throws an error if the string as an unsigned integer is greater than type(uint160).max.
-export function toAddress(hexString: string): string {
-  // rawAddress is the address which is not properly checksummed.
-  const rawAddress = utils.hexZeroPad(utils.hexStripZeros(hexString), 20);
-  return utils.getAddress(rawAddress);
-}
-
-export function isValidEvmAddress(address: string): boolean {
-  if (utils.isAddress(address)) {
-    return true;
-  }
-  // We may throw an error here if hexZeroPadFails. This will happen if the address to pad is greater than 20 bytes long, indicating
-  // that the address had less than 12 leading zero bytes.
-  // We may also throw at getAddress if the input cannot be converted into a checksummed EVM address for some reason.
-  // For both cases, this indicates that the address cannot be casted as a bytes20 EVM address, so we should return false.
-  try {
-    const evmAddress = utils.hexZeroPad(utils.hexStripZeros(address), 20);
-    return utils.isAddress(utils.getAddress(evmAddress));
-  } catch (_e) {
-    return false;
-  }
-}

package/src/utils/BigNumberUtils.ts

@@ -62,14 +62,3 @@ export const toBN = (num: BigNumberish, rounding: "floor" | "round" | "ceil" = "
   // Otherwise, it is a string int and we can parse it directly.
   return BigNumber.from(num.toString());
 };
-
-/**
- * Compares two BigNumbers and returns the maximum. Order does not matter.
- *
- * @param val The first BigNumber to compare.
- * @param cmp The second BigNumber to compare.
- * @returns The greater of the two BigNumbers.
- */
-export const bnMax = (val: BigNumber, cmp: BigNumber) => {
-  return val.gt(cmp) ? val : cmp;
-};

package/src/utils/CachingUtils.ts

@@ -52,5 +52,5 @@ export async function setDepositInCache(
  */
 export function getDepositKey(bridgeEvent: Deposit | Fill | SlowFillRequest): string {
   const relayHash = getRelayHashFromEvent(bridgeEvent);
-  return `deposit_${bridgeEvent.originChainId}_${bridgeEvent.depositId.toString()}_${relayHash}`;
+  return `deposit_${bridgeEvent.originChainId}_${bridgeEvent.depositId}_${relayHash}`;
 }

package/src/utils/DepositUtils.ts

@@ -5,7 +5,6 @@ import { CachingMechanismInterface, Deposit, DepositWithBlock, Fill, SlowFillReq
 import { getNetworkName } from "./NetworkUtils";
 import { getDepositInCache, getDepositKey, setDepositInCache } from "./CachingUtils";
 import { validateFillForDeposit } from "./FlowUtils";
-import { isUnsafeDepositId } from "./SpokeUtils";
 import { getCurrentTime } from "./TimeUtils";
 import { isDefined } from "./TypeGuards";
 import { isDepositFormedCorrectly } from "./ValidatorUtils";
@@ -18,7 +17,6 @@ export enum InvalidFill {
   DepositIdInvalid = 0, // Deposit ID seems invalid for origin SpokePool
   DepositIdNotFound, // Deposit ID not found (bad RPC data?)
   FillMismatch, // Fill does not match deposit parameters for deposit ID.
-  DepositIdOutOfRange, // Fill is for a deterministic deposit.
 }
 
 export type DepositSearchResult =
@@ -42,13 +40,6 @@ export async function queryHistoricalDepositForFill(
   fill: Fill | SlowFillRequest,
   cache?: CachingMechanismInterface
 ): Promise<DepositSearchResult> {
-  if (isUnsafeDepositId(fill.depositId)) {
-    return {
-      found: false,
-      code: InvalidFill.DepositIdOutOfRange,
-      reason: `Cannot find historical deposit for fill with unsafe deposit ID ${fill.depositId}.`,
-    };
-  }
   if (fill.originChainId !== spokePoolClient.chainId) {
     throw new Error(`OriginChainId mismatch (${fill.originChainId} != ${spokePoolClient.chainId})`);
   }
@@ -61,16 +52,16 @@ export async function queryHistoricalDepositForFill(
 
   const { depositId } = fill;
   let { firstDepositIdForSpokePool: lowId, lastDepositIdForSpokePool: highId } = spokePoolClient;
-  if (depositId.lt(lowId) || depositId.gt(highId)) {
+  if (depositId < lowId || depositId > highId) {
     return {
       found: false,
       code: InvalidFill.DepositIdInvalid,
-      reason: `Deposit ID ${depositId.toString()} is outside of SpokePool bounds [${lowId},${highId}].`,
+      reason: `Deposit ID ${depositId} is outside of SpokePool bounds [${lowId},${highId}].`,
     };
   }
 
   ({ earliestDepositIdQueried: lowId, latestDepositIdQueried: highId } = spokePoolClient);
-  if (depositId.gte(lowId) && depositId.lte(highId)) {
+  if (depositId >= lowId && depositId <= highId) {
     const originChain = getNetworkName(fill.originChainId);
     const deposit = spokePoolClient.getDeposit(depositId);
     if (isDefined(deposit)) {
@@ -82,14 +73,14 @@ export async function queryHistoricalDepositForFill(
       return {
         found: false,
         code: InvalidFill.FillMismatch,
-        reason: `Fill for ${originChain} deposit ID ${depositId.toString()} is invalid (${match.reason}).`,
+        reason: `Fill for ${originChain} deposit ID ${depositId} is invalid (${match.reason}).`,
       };
     }
 
     return {
       found: false,
       code: InvalidFill.DepositIdNotFound,
-      reason: `${originChain} deposit ID ${depositId.toString()} not found in SpokePoolClient event buffer.`,
+      reason: `${originChain} deposit ID ${depositId} not found in SpokePoolClient event buffer.`,
     };
   }
 

package/src/utils/EventUtils.ts

@@ -3,27 +3,10 @@ import { Result } from "@ethersproject/abi";
 import { Contract, Event, EventFilter } from "ethers";
 import { Log, SortableEvent } from "../interfaces";
 import { delay } from "./common";
-import { isDefined, toBN, BigNumberish, toAddress } from "./";
 
 const maxRetries = 3;
 const retrySleepTime = 10;
 
-// Event fields which changed from an `address` to `bytes32` after the SVM contract upgrade.
-const knownExtendedAddressFields = [
-  // TokensBridged
-  "l2TokenAddress",
-  // FundsDeposited/FilledRelay/RequestedSlowFill
-  "inputToken",
-  "outputToken",
-  "depositor",
-  "recipient",
-  "exclusiveRelayer",
-  // FilledRelay
-  "relayer",
-  // RequestedSpeedUpDeposit
-  "updatedRecipient",
-];
-
 // eslint-disable-next-line @typescript-eslint/no-explicit-any
 export function spreadEvent(args: Result | Record<string, unknown>): { [key: string]: any } {
   const keys = Object.keys(args).filter((key: string) => isNaN(+key)); // Extract non-numeric keys.
@@ -75,20 +58,6 @@ export function spreadEvent(args: Result | Record<string, unknown>): { [key: str
   if (returnedObject.rootBundleId) {
     returnedObject.rootBundleId = Number(returnedObject.rootBundleId);
   }
-  // If depositId is included in the event, cast it to a BigNumber. Need to check if it is defined since the deposit ID can
-  // be 0, which would still make this evaluate as false.
-  if (isDefined(returnedObject.depositId)) {
-    // Assuming a numeric output, we can safely cast the unknown to BigNumberish since the depositId will either be a uint32 (and therefore a TypeScript `number`),
-    // or a uint256 (and therefore an ethers BigNumber).
-    returnedObject.depositId = toBN(returnedObject.depositId as BigNumberish);
-  }
-
-  // Truncate all fields which may be bytes32 into a bytes20 string.
-  for (const field of knownExtendedAddressFields) {
-    if (isDefined(returnedObject[field])) {
-      returnedObject[field] = toAddress(String(returnedObject[field]));
-    }
-  }
 
   return returnedObject;
 }