@across-protocol/sdk 4.1.25 → 4.1.27

package/src/clients/SpokePoolClient.ts

@@ -7,16 +7,16 @@ import {
   bnZero,
   bnUint32Max,
   DefaultLogLevels,
+  DepositSearchResult,
   EventSearchConfig,
   MAX_BIG_INT,
   MakeOptional,
   assign,
   getRelayEventKey,
+  InvalidFill,
   isDefined,
   toBN,
-  bnOne,
   getMessageHash,
-  isUnsafeDepositId,
   isSlowFill,
   isValidEvmAddress,
   isZeroAddress,
@@ -56,8 +56,6 @@ import { getRepaymentChainId, forceDestinationRepayment } from "./BundleDataClie
 type SpokePoolUpdateSuccess = {
   success: true;
   currentTime: number;
-  firstDepositId: BigNumber;
-  latestDepositId: BigNumber;
   events: Log[][];
   searchEndBlock: number;
 };
@@ -85,10 +83,6 @@ export class SpokePoolClient extends BaseAbstractClient {
   protected queryableEventNames: string[] = [];
   protected configStoreClient: AcrossConfigStoreClient | undefined;
   protected invalidFills: Set<string> = new Set();
-  public earliestDepositIdQueried = MAX_BIG_INT;
-  public latestDepositIdQueried = bnZero;
-  public firstDepositIdForSpokePool = MAX_BIG_INT;
-  public lastDepositIdForSpokePool = MAX_BIG_INT;
   public fills: { [OriginChainId: number]: FillWithBlock[] } = {};
 
   /**
@@ -518,16 +512,6 @@ export class SpokePoolClient extends BaseAbstractClient {
    * @returns A Promise that resolves to a SpokePoolUpdate object.
    */
   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)) {
-      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)) {
-        throw new Error(`SpokePoolClient::update: Invalid first deposit id (${firstDepositId})`);
-      }
-    }
-
     const searchConfig = await this.updateSearchConfig(this.spokePool.provider);
     if (isUpdateFailureReason(searchConfig)) {
       const reason = searchConfig;
@@ -562,7 +546,7 @@ export class SpokePoolClient extends BaseAbstractClient {
     });
 
     const timerStart = Date.now();
-    const multicallFunctions = ["getCurrentTime", "numberOfDeposits"];
+    const multicallFunctions = ["getCurrentTime"];
     const [multicallOutput, ...events] = await Promise.all([
       spokePool.callStatic.multicall(
         multicallFunctions.map((f) => spokePool.interface.encodeFunctionData(f)),
@@ -572,10 +556,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] = 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)
@@ -590,8 +573,6 @@ export class SpokePoolClient extends BaseAbstractClient {
     return {
       success: true,
       currentTime: currentTime.toNumber(), // uint32
-      firstDepositId,
-      latestDepositId: _latestDepositId.gt(bnZero) ? _latestDepositId : bnZero,
       searchEndBlock: searchConfig.toBlock,
       events,
     };
@@ -673,13 +654,6 @@ export class SpokePoolClient extends BaseAbstractClient {
           continue;
         }
         assign(this.depositHashes, [getRelayEventKey(deposit)], deposit);
-
-        if (deposit.depositId.lt(this.earliestDepositIdQueried) && !isUnsafeDepositId(deposit.depositId)) {
-          this.earliestDepositIdQueried = deposit.depositId;
-        }
-        if (deposit.depositId.gt(this.latestDepositIdQueried) && !isUnsafeDepositId(deposit.depositId)) {
-          this.latestDepositIdQueried = deposit.depositId;
-        }
       }
     };
 
@@ -831,9 +805,7 @@ export class SpokePoolClient extends BaseAbstractClient {
 
     // Next iteration should start off from where this one ended.
     this.currentTime = currentTime;
-    this.firstDepositIdForSpokePool = update.firstDepositId;
     this.latestBlockSearched = searchEndBlock;
-    this.lastDepositIdForSpokePool = update.latestDepositId;
     this.firstBlockToSearch = searchEndBlock + 1;
     this.eventSearchConfig.toBlock = undefined; // Caller can re-set on subsequent updates if necessary
     this.isUpdated = true;
@@ -929,14 +901,27 @@ export class SpokePoolClient extends BaseAbstractClient {
     return currentTime.toNumber();
   }
 
-  async findDeposit(depositId: BigNumber, destinationChainId: number): Promise<DepositWithBlock> {
+  /**
+   * For a given origin chain depositId, resolve the corresponding Deposit.
+   * Note: This method can only be used for depositIds within the non-deterministic range (0 < depositId < 2^32 - 1).
+   * @param depositId Deposit ID of the deposit to resolve.
+   * @returns A DepositSearchResult instance.
+   */
+  async findDeposit(depositId: BigNumber): Promise<DepositSearchResult> {
+    let deposit = this.getDeposit(depositId);
+    if (deposit) {
+      return { found: true, deposit };
+    }
+
+    // No deposit found; revert to searching for it.
     const upperBound = this.latestBlockSearched || undefined; // Don't permit block 0 as the high block.
     const fromBlock = await findDepositBlock(this.spokePool, depositId, this.deploymentBlock, upperBound);
+    const chain = getNetworkName(this.chainId);
     if (!fromBlock) {
-      const chain = getNetworkName(this.chainId);
-      throw new Error(
-        `Unable to find ${chain} depositId ${depositId} within blocks [${this.deploymentBlock}, ${upperBound}]`
-      );
+      const reason =
+        `Unable to find ${chain} depositId ${depositId}` +
+        ` within blocks [${this.deploymentBlock}, ${upperBound ?? "latest"}].`;
+      return { found: false, code: InvalidFill.DepositIdNotFound, reason };
     }
 
     const toBlock = fromBlock;
@@ -961,15 +946,14 @@ export class SpokePoolClient extends BaseAbstractClient {
 
     const event = query.find(({ args }) => args["depositId"].eq(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` +
-          ` between ${srcChain} blocks [${fromBlock}, ${toBlock}]`
-      );
+      return {
+        found: false,
+        code: InvalidFill.DepositIdNotFound,
+        reason: `${chain} depositId ${depositId} not found at block ${fromBlock}.`,
+      };
     }
 
-    const deposit = {
+    deposit = {
       ...spreadEventWithBlockNumber(event),
       originChainId: this.chainId,
       quoteBlockNumber: await this.getBlockNumber(Number(event.args["quoteTimestamp"])),
@@ -990,7 +974,7 @@ export class SpokePoolClient extends BaseAbstractClient {
       elapsedMs: tStop - tStart,
     });
 
-    return deposit;
+    return { found: true, deposit };
   }
 
   /**

package/src/clients/mocks/MockSpokePoolClient.ts

@@ -24,7 +24,6 @@ import {
   randomAddress,
   BigNumber,
   bnZero,
-  bnMax,
   bnOne,
   toAddress,
   toBytes32,
@@ -107,19 +106,10 @@ 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),
-      this.latestDepositIdQueried
-    );
-
     return Promise.resolve({
       success: true,
       firstDepositId: bnZero,
-      latestDepositId,
       currentTime,
-      oldestTime: 0,
       events,
       searchEndBlock: this.eventSearchConfig.toBlock || latestBlockSearched,
     });

package/src/providers/solana/cachedRpcFactory.ts

@@ -1,4 +1,5 @@
 import { RpcTransport, GetTransactionApi, RpcFromTransport, SolanaRpcApiFromTransport } from "@solana/kit";
+import { getThrowSolanaErrorResponseTransformer } from "@solana/rpc-transformers";
 import { is, object, optional, string, tuple } from "superstruct";
 import { CachingMechanismInterface } from "../../interfaces";
 import { SolanaClusterRpcFactory } from "./baseRpcFactories";
@@ -70,25 +71,38 @@ export class CachedSolanaRpcFactory extends SolanaClusterRpcFactory {
     // Do not throw if params are not valid, just skip caching and pass through to the underlying transport.
     if (!this.isGetTransactionParams(params)) return this.rateLimitedTransport<TResponse>(...args);
 
-    // Check the confirmation status first to avoid caching non-finalized transactions.
-    const getSignatureStatusesResponse = await this.rateLimitedRpcClient
-      .getSignatureStatuses([params[0]], {
-        searchTransactionHistory: true,
-      })
-      .send();
+    // Check the confirmation status first to avoid caching non-finalized transactions. In case of null or errors just
+    // skip caching and pass through to the underlying transport.
+    try {
+      const getSignatureStatusesResponse = await this.rateLimitedRpcClient
+        .getSignatureStatuses([params[0]], {
+          searchTransactionHistory: true,
+        })
+        .send();
+      if (getSignatureStatusesResponse.value[0]?.confirmationStatus !== "finalized") {
+        return this.rateLimitedTransport<TResponse>(...args);
+      }
+    } catch (error) {
+      return this.rateLimitedTransport<TResponse>(...args);
+    }
 
     const getTransactionResponse = await this.rateLimitedTransport<TResponse>(...args);
 
-    // Cache the transaction only if it is finalized.
-    if (getSignatureStatusesResponse.value[0]?.confirmationStatus === "finalized") {
-      const redisKey = this.buildRedisKey(method, params);
-      await this.redisClient?.set(
-        redisKey,
-        JSON.stringify(getTransactionResponse, jsonReplacerWithBigInts),
-        Number.POSITIVE_INFINITY
-      );
+    // Do not cache JSON-RPC error responses, let them pass through for the RPC client to handle.
+    try {
+      getThrowSolanaErrorResponseTransformer()(getTransactionResponse, { methodName: method, params });
+    } catch {
+      return getTransactionResponse;
     }
 
+    // Cache the transaction JSON-RPC response as we checked the transaction is finalized and not an error.
+    const redisKey = this.buildRedisKey(method, params);
+    await this.redisClient?.set(
+      redisKey,
+      JSON.stringify(getTransactionResponse, jsonReplacerWithBigInts),
+      Number.POSITIVE_INFINITY
+    );
+
     return getTransactionResponse;
   }
 

package/src/utils/DepositUtils.ts

@@ -60,40 +60,23 @@ export async function queryHistoricalDepositForFill(
   }
 
   const { depositId } = fill;
-  let { firstDepositIdForSpokePool: lowId, lastDepositIdForSpokePool: highId } = spokePoolClient;
-  if (depositId.lt(lowId) || depositId.gt(highId)) {
-    return {
-      found: false,
-      code: InvalidFill.DepositIdInvalid,
-      reason: `Deposit ID ${depositId.toString()} is outside of SpokePool bounds [${lowId},${highId}].`,
-    };
-  }
-
-  ({ earliestDepositIdQueried: lowId, latestDepositIdQueried: highId } = spokePoolClient);
-  if (depositId.gte(lowId) && depositId.lte(highId)) {
-    const originChain = getNetworkName(fill.originChainId);
-    const deposit = spokePoolClient.getDeposit(depositId);
-    if (isDefined(deposit)) {
-      const match = validateFillForDeposit(fill, deposit);
-      if (match.valid) {
-        return { found: true, deposit };
-      }
-
-      return {
-        found: false,
-        code: InvalidFill.FillMismatch,
-        reason: `Fill for ${originChain} deposit ID ${depositId.toString()} is invalid (${match.reason}).`,
-      };
+  const originChain = getNetworkName(fill.originChainId);
+  let deposit = spokePoolClient.getDeposit(depositId);
+  if (isDefined(deposit)) {
+    const match = validateFillForDeposit(fill, deposit);
+    if (match.valid) {
+      return { found: true, deposit };
     }
 
     return {
       found: false,
-      code: InvalidFill.DepositIdNotFound,
-      reason: `${originChain} deposit ID ${depositId.toString()} not found in SpokePoolClient event buffer.`,
+      code: InvalidFill.FillMismatch,
+      reason: `Fill for ${originChain} deposit ID ${depositId.toString()} is invalid (${match.reason}).`,
     };
   }
 
-  let deposit: DepositWithBlock, cachedDeposit: Deposit | undefined;
+  // Deposit not found in SpokePoolClient buffer, search elsewhere.
+  let cachedDeposit: Deposit | undefined;
   if (cache) {
     cachedDeposit = await getDepositInCache(getDepositKey(fill), cache);
     // We only want to warn and remove the cached deposit if it
@@ -116,17 +99,23 @@ export async function queryHistoricalDepositForFill(
   if (isDefined(cachedDeposit)) {
     deposit = cachedDeposit as DepositWithBlock;
   } else {
-    deposit = await spokePoolClient.findDeposit(fill.depositId, fill.destinationChainId);
+    const result = await spokePoolClient.findDeposit(fill.depositId);
+    if (!result.found) {
+      return result;
+    }
+
+    ({ deposit } = result);
     if (cache) {
       await setDepositInCache(deposit, getCurrentTime(), cache, DEFAULT_CACHING_TTL);
     }
   }
+  assert(isDefined(deposit), `Unexpectedly failed to locate ${originChain} deposit ${fill.depositId}`);
 
   deposit.messageHash ??= getMessageHash(deposit.message);
 
   const match = validateFillForDeposit(fill, deposit);
   if (match.valid) {
-    return { found: true, deposit };
+    return { found: true, deposit: deposit! };
   }
 
   return {

package/src/utils/Multicall.ts

@@ -1,5 +1,6 @@
+import assert from "assert";
 import { Contract, providers, Signer, utils as ethersUtils } from "ethers";
-import { CHAIN_IDs } from "@across-protocol/constants";
+import { CHAIN_IDs, MAINNET_CHAIN_IDs } from "@across-protocol/constants";
 import { chainIsOPStack, hreNetworks } from "./NetworkUtils";
 import { BigNumber } from "./BigNumberUtils";
 import { Multicall3, Multicall3__factory } from "./abi/typechain";
@@ -16,6 +17,7 @@ export type Call3 = {
 };
 
 const DETERMINISTIC_MULTICALL_ADDRESS = "0xcA11bde05977b3631167028862bE2a173976CA11";
+const MULTICALL_DEPLOYER = "0x05f32B3cC3888453ff71B01135B34FF8e41263F2";
 
 const NON_DETERMINISTIC_MULTICALL_ADDRESSES = {
   [CHAIN_IDs.ZK_SYNC]: "0xF9cda624FBC7e059355ce98a31693d299FACd963",
@@ -68,6 +70,10 @@ export async function aggregate(multicall3: Contract, calls: Call3[], blockTag?:
   });
 }
 
+/**
+ * Note that this function behaves unexpectedly on Arbitrum chains, where block.number
+ * corresponds to the approximate block number of the underlying chain.
+ */
 export async function blockAndAggregate(
   multicall3: Contract,
   calls: Call3[],
@@ -94,3 +100,34 @@ export async function blockAndAggregate(
 
   return { blockNumber: blockNumber.toNumber(), returnData };
 }
+
+async function isDeployed(provider: providers.Provider): Promise<boolean> {
+  const { chainId } = await provider.getNetwork();
+  const expectedMulticallAddress = getMulticallAddress(chainId) ?? DETERMINISTIC_MULTICALL_ADDRESS;
+  const code = await provider.getCode(expectedMulticallAddress);
+  return code !== "0x";
+}
+
+/**
+ * Deploy a Multicall3 instance.
+ * Guidance: https://github.com/mds1/multicall3?tab=readme-ov-file#new-deployments
+ * @param signer An Ethers Signer instance with at least 0.1 ETH.
+ */
+export async function deploy(signer: Signer) {
+  assert(signer.provider);
+  if (await isDeployed(signer.provider)) {
+    return true;
+  }
+  const { chainId } = await signer.provider.getNetwork();
+  assert(!Object.values(MAINNET_CHAIN_IDs).includes(chainId));
+
+  await signer.sendTransaction({ to: MULTICALL_DEPLOYER, value: ethersUtils.parseEther("0.1") }); // Pre-fund the deployer address.
+  await signer.provider.sendTransaction(MULTICALL_CALLDATA); // Deploy
+
+  assert(await isDeployed(signer.provider));
+  return true;
+}
+
+// Multicall3 deployment transaction, pre-signed `deployer`.
+const MULTICALL_CALLDATA =
+  "0xf90f538085174876e800830f42408080b90f00608060405234801561001057600080fd5b50610ee0806100206000396000f3fe6080604052600436106100f35760003560e01c80634d2301cc1161008a578063a8b0574e11610059578063a8b0574e1461025a578063bce38bd714610275578063c3077fa914610288578063ee82ac5e1461029b57600080fd5b80634d2301cc146101ec57806372425d9d1461022157806382ad56cb1461023457806386d516e81461024757600080fd5b80633408e470116100c65780633408e47014610191578063399542e9146101a45780633e64a696146101c657806342cbb15c146101d957600080fd5b80630f28c97d146100f8578063174dea711461011a578063252dba421461013a57806327e86d6e1461015b575b600080fd5b34801561010457600080fd5b50425b6040519081526020015b60405180910390f35b61012d610128366004610a85565b6102ba565b6040516101119190610bbe565b61014d610148366004610a85565b6104ef565b604051610111929190610bd8565b34801561016757600080fd5b50437fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff0140610107565b34801561019d57600080fd5b5046610107565b6101b76101b2366004610c60565b610690565b60405161011193929190610cba565b3480156101d257600080fd5b5048610107565b3480156101e557600080fd5b5043610107565b3480156101f857600080fd5b50610107610207366004610ce2565b73ffffffffffffffffffffffffffffffffffffffff163190565b34801561022d57600080fd5b5044610107565b61012d610242366004610a85565b6106ab565b34801561025357600080fd5b5045610107565b34801561026657600080fd5b50604051418152602001610111565b61012d610283366004610c60565b61085a565b6101b7610296366004610a85565b610a1a565b3480156102a757600080fd5b506101076102b6366004610d18565b4090565b60606000828067ffffffffffffffff8111156102d8576102d8610d31565b60405190808252806020026020018201604052801561031e57816020015b6040805180820190915260008152606060208201528152602001906001900390816102f65790505b5092503660005b8281101561047757600085828151811061034157610341610d60565b6020026020010151905087878381811061035d5761035d610d60565b905060200281019061036f9190610d8f565b6040810135958601959093506103886020850185610ce2565b73ffffffffffffffffffffffffffffffffffffffff16816103ac6060870187610dcd565b6040516103ba929190610e32565b60006040518083038185875af1925050503d80600081146103f7576040519150601f19603f3d011682016040523d82523d6000602084013e6103fc565b606091505b50602080850191909152901515808452908501351761046d577f08c379a000000000000000000000000000000000000000000000000000000000600052602060045260176024527f4d756c746963616c6c333a2063616c6c206661696c656400000000000000000060445260846000fd5b5050600101610325565b508234146104e6576040517f08c379a000000000000000000000000000000000000000000000000000000000815260206004820152601a60248201527f4d756c746963616c6c333a2076616c7565206d69736d6174636800000000000060448201526064015b60405180910390fd5b50505092915050565b436060828067ffffffffffffffff81111561050c5761050c610d31565b60405190808252806020026020018201604052801561053f57816020015b606081526020019060019003908161052a5790505b5091503660005b8281101561068657600087878381811061056257610562610d60565b90506020028101906105749190610e42565b92506105836020840184610ce2565b73ffffffffffffffffffffffffffffffffffffffff166105a66020850185610dcd565b6040516105b4929190610e32565b6000604051808303816000865af19150503d80600081146105f1576040519150601f19603f3d011682016040523d82523d6000602084013e6105f6565b606091505b5086848151811061060957610609610d60565b602090810291909101015290508061067d576040517f08c379a000000000000000000000000000000000000000000000000000000000815260206004820152601760248201527f4d756c746963616c6c333a2063616c6c206661696c656400000000000000000060448201526064016104dd565b50600101610546565b5050509250929050565b43804060606106a086868661085a565b905093509350939050565b6060818067ffffffffffffffff8111156106c7576106c7610d31565b60405190808252806020026020018201604052801561070d57816020015b6040805180820190915260008152606060208201528152602001906001900390816106e55790505b5091503660005b828110156104e657600084828151811061073057610730610d60565b6020026020010151905086868381811061074c5761074c610d60565b905060200281019061075e9190610e76565b925061076d6020840184610ce2565b73ffffffffffffffffffffffffffffffffffffffff166107906040850185610dcd565b60405161079e929190610e32565b6000604051808303816000865af19150503d80600081146107db576040519150601f19603f3d011682016040523d82523d6000602084013e6107e0565b606091505b506020808401919091529015158083529084013517610851577f08c379a000000000000000000000000000000000000000000000000000000000600052602060045260176024527f4d756c746963616c6c333a2063616c6c206661696c656400000000000000000060445260646000fd5b50600101610714565b6060818067ffffffffffffffff81111561087657610876610d31565b6040519080825280602002602001820160405280156108bc57816020015b6040805180820190915260008152606060208201528152602001906001900390816108945790505b5091503660005b82811015610a105760008482815181106108df576108df610d60565b602002602001015190508686838181106108fb576108fb610d60565b905060200281019061090d9190610e42565b925061091c6020840184610ce2565b73ffffffffffffffffffffffffffffffffffffffff1661093f6020850185610dcd565b60405161094d929190610e32565b6000604051808303816000865af19150503d806000811461098a576040519150601f19603f3d011682016040523d82523d6000602084013e61098f565b606091505b506020830152151581528715610a07578051610a07576040517f08c379a000000000000000000000000000000000000000000000000000000000815260206004820152601760248201527f4d756c746963616c6c333a2063616c6c206661696c656400000000000000000060448201526064016104dd565b506001016108c3565b5050509392505050565b6000806060610a2b60018686610690565b919790965090945092505050565b60008083601f840112610a4b57600080fd5b50813567ffffffffffffffff811115610a6357600080fd5b6020830191508360208260051b8501011115610a7e57600080fd5b9250929050565b60008060208385031215610a9857600080fd5b823567ffffffffffffffff811115610aaf57600080fd5b610abb85828601610a39565b90969095509350505050565b6000815180845260005b81811015610aed57602081850181015186830182015201610ad1565b81811115610aff576000602083870101525b50601f017fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe0169290920160200192915050565b600082825180855260208086019550808260051b84010181860160005b84811015610bb1578583037fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe001895281518051151584528401516040858501819052610b9d81860183610ac7565b9a86019a9450505090830190600101610b4f565b5090979650505050505050565b602081526000610bd16020830184610b32565b9392505050565b600060408201848352602060408185015281855180845260608601915060608160051b870101935082870160005b82811015610c52577fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa0888703018452610c40868351610ac7565b95509284019290840190600101610c06565b509398975050505050505050565b600080600060408486031215610c7557600080fd5b83358015158114610c8557600080fd5b9250602084013567ffffffffffffffff811115610ca157600080fd5b610cad86828701610a39565b9497909650939450505050565b838152826020820152606060408201526000610cd96060830184610b32565b95945050505050565b600060208284031215610cf457600080fd5b813573ffffffffffffffffffffffffffffffffffffffff81168114610bd157600080fd5b600060208284031215610d2a57600080fd5b5035919050565b7f4e487b7100000000000000000000000000000000000000000000000000000000600052604160045260246000fd5b7f4e487b7100000000000000000000000000000000000000000000000000000000600052603260045260246000fd5b600082357fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff81833603018112610dc357600080fd5b9190910192915050565b60008083357fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe1843603018112610e0257600080fd5b83018035915067ffffffffffffffff821115610e1d57600080fd5b602001915036819003821315610a7e57600080fd5b8183823760009101908152919050565b600082357fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffc1833603018112610dc357600080fd5b600082357fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa1833603018112610dc357600080fdfea2646970667358221220bb2b5c71a328032f97c676ae39a1ec2148d3e5d6f73d95e9b17910152d61f16264736f6c634300080c00331ca0edce47092c0f398cebf3ffc267f05c8e7076e3b89445e0fe50f6332273d4569ba01b0b9d000e19b24c5869b0fc3b22b0d6fa47cd63316875cbbd577d76e6fde086";

package/src/utils/SpokeUtils.ts

@@ -7,7 +7,6 @@ import { chunk } from "./ArrayUtils";
 import { BigNumber, toBN, bnOne, bnZero } from "./BigNumberUtils";
 import { keccak256 } from "./common";
 import { isMessageEmpty } from "./DepositUtils";
-import { blockAndAggregate, getMulticall3 } from "./Multicall";
 import { isDefined } from "./TypeGuards";
 import { getNetworkName } from "./NetworkUtils";
 import { paginatedEventQuery, spreadEventWithBlockNumber } from "./EventUtils";
@@ -345,22 +344,17 @@ export async function findDepositBlock(
     throw new Error(`Cannot binary search for depositId ${depositId}`);
   }
 
-  // @todo this call can be optimised away by using multicall3.blockAndAggregate(..., { blockTag: highBlockNumber }).
-  // This is left for future because the change is a bit complex, and multicall3 isn't supported in test.
-  const { chainId } = await spokePool.provider.getNetwork();
-  const multicall3 = getMulticall3(chainId, spokePool.provider);
-  assert(multicall3, `No multicall3 defined for chain ${chainId}`);
+  highBlock ??= await spokePool.provider.getBlockNumber();
+  assert(highBlock > lowBlock, `Block numbers out of range (${lowBlock} >= ${highBlock})`);
 
   // Make sure the deposit occurred within the block range supplied by the caller.
-  const [_nDepositsLow, { blockNumber: _highBlock, returnData }] = await Promise.all([
-    spokePool.numberOfDeposits({ blockTag: lowBlock }),
-    blockAndAggregate(multicall3, [{ contract: spokePool, method: "numberOfDeposits" }], highBlock),
-  ]);
-  highBlock = _highBlock;
-  assert(highBlock > lowBlock, `Block numbers out of range (${lowBlock} >= ${highBlock})`);
+  const [nDepositsLow, nDepositsHigh] = (
+    await Promise.all([
+      spokePool.numberOfDeposits({ blockTag: lowBlock }),
+      spokePool.numberOfDeposits({ blockTag: highBlock }),
+    ])
+  ).map((n) => toBN(n));
 
-  const nDepositsLow = toBN(_nDepositsLow);
-  const nDepositsHigh = toBN(returnData.at(0)!);
   if (nDepositsLow.gt(depositId) || nDepositsHigh.lte(depositId)) {
     return undefined; // Deposit did not occur within the specified block range.
   }