@across-protocol/sdk 4.3.38 → 4.3.41

package/dist/types/providers/solana/quorumFallbackRpcFactory.d.ts

@@ -0,0 +1,17 @@
+import { RpcFromTransport, RpcTransport, SolanaRpcApiFromTransport } from "@solana/kit";
+import { CachedSolanaRpcFactory } from "./cachedRpcFactory";
+import { SolanaBaseRpcFactory } from "./baseRpcFactories";
+import { Logger } from "winston";
+export declare class QuorumFallbackSolanaRpcFactory extends SolanaBaseRpcFactory {
+    readonly nodeQuorumThreshold: number;
+    readonly logger: Logger;
+    readonly rpcFactories: {
+        transport: RpcTransport;
+        rpcClient: RpcFromTransport<SolanaRpcApiFromTransport<RpcTransport>, RpcTransport>;
+        rpcFactory: CachedSolanaRpcFactory;
+    }[];
+    constructor(factoryConstructorParams: ConstructorParameters<typeof CachedSolanaRpcFactory>[], nodeQuorumThreshold: number, logger: Logger);
+    createTransport(): RpcTransport;
+    _getQuorum(method: string, _params: Array<unknown>): number;
+}
+//# sourceMappingURL=quorumFallbackRpcFactory.d.ts.map

package/dist/types/providers/solana/quorumFallbackRpcFactory.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"quorumFallbackRpcFactory.d.ts","sourceRoot":"","sources":["../../../../src/providers/solana/quorumFallbackRpcFactory.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAe,YAAY,EAAE,yBAAyB,EAAE,MAAM,aAAa,CAAC;AACrG,OAAO,EAAE,sBAAsB,EAAE,MAAM,oBAAoB,CAAC;AAC5D,OAAO,EAAE,oBAAoB,EAA2B,MAAM,oBAAoB,CAAC;AAGnF,OAAO,EAAE,MAAM,EAAE,MAAM,SAAS,CAAC;AAKjC,qBAAa,8BAA+B,SAAQ,oBAAoB;IASpE,QAAQ,CAAC,mBAAmB,EAAE,MAAM;IACpC,QAAQ,CAAC,MAAM,EAAE,MAAM;IATzB,QAAQ,CAAC,YAAY,EAAE;QACrB,SAAS,EAAE,YAAY,CAAC;QACxB,SAAS,EAAE,gBAAgB,CAAC,yBAAyB,CAAC,YAAY,CAAC,EAAE,YAAY,CAAC,CAAC;QACnF,UAAU,EAAE,sBAAsB,CAAC;KACpC,EAAE,CAAM;gBAGP,wBAAwB,EAAE,qBAAqB,CAAC,OAAO,sBAAsB,CAAC,EAAE,EACvE,mBAAmB,EAAE,MAAM,EAC3B,MAAM,EAAE,MAAM;IAkBlB,eAAe,IAAI,YAAY;IAiMtC,UAAU,CAAC,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE,KAAK,CAAC,OAAO,CAAC,GAAG,MAAM;CAY5D"}

package/dist/types/providers/utils.d.ts

@@ -48,6 +48,7 @@ export declare function createSendErrorWithMessage(message: string, sendError: R
  * @returns True if the results are equal, false otherwise.
  */
 export declare function compareRpcResults(method: string, rpcResultA: unknown, rpcResultB: unknown): boolean;
+export declare function compareSvmRpcResults(_method: string, rpcResultA: unknown, rpcResultB: unknown): boolean;
 export declare enum CacheType {
     NONE = 0,
     WITH_TTL = 1,

package/dist/types/providers/utils.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../../src/providers/utils.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,SAAS,EAAE,MAAM,QAAQ,CAAC;AAGnC,OAAO,EAAE,WAAW,EAAE,YAAY,EAAE,MAAM,SAAS,CAAC;AAiBpD;;;;GAIG;AACH,wBAAgB,mBAAmB,CAAC,QAAQ,EAAE,MAAM,GAAG,QAAQ,IAAI,WAAW,CAE7E;AAED;;;;;;;GAOG;AACH,wBAAgB,MAAM,CACpB,QAAQ,EAAE,WAAW,EACrB,OAAO,EAAE,MAAM,EACf,MAAM,EAAE,MAAM,EACd,SAAS,GAAE,YAAsB,GAChC,MAAM,CAIR;AAmBD,wBAAgB,kCAAkC,CAChD,WAAW,EAAE,MAAM,EAAE,EACrB,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAC9B,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAC7B,OAAO,CAOT;AAED,wBAAgB,kCAAkC,CAAC,WAAW,EAAE,MAAM,EAAE,EAAE,IAAI,EAAE,OAAO,EAAE,EAAE,IAAI,EAAE,OAAO,EAAE,GAAG,OAAO,CAOnH;AA4BD;;GAEG;AACH,MAAM,WAAW,aAAa;IAE5B,QAAQ,EAAE,CAAC,MAAM,EAAE,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC;IAInC,OAAO,EAAE,CAAC,MAAM,EAAE,OAAO,KAAK,IAAI,CAAC;IACnC,MAAM,EAAE,CAAC,GAAG,EAAE,OAAO,KAAK,IAAI,CAAC;CAChC;AAED;;;;;GAKG;AACH,wBAAgB,mBAAmB,CAAC,QAAQ,EAAE,SAAS,CAAC,qBAAqB,EAAE,YAAY,EAAE,MAAM,UAElG;AAED,wBAAgB,0BAA0B,CAAC,OAAO,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC;;;;;EAG7F;AAED;;;;;;;;GAQG;AACH,wBAAgB,iBAAiB,CAAC,MAAM,EAAE,MAAM,EAAE,UAAU,EAAE,OAAO,EAAE,UAAU,EAAE,OAAO,GAAG,OAAO,CAkBnG;AAED,oBAAY,SAAS;IACnB,IAAI,IAAA;IACJ,QAAQ,IAAA;IACR,MAAM,IAAA;IACN,oBAAoB,IAAA;CACrB"}
+{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../../src/providers/utils.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,SAAS,EAAE,MAAM,QAAQ,CAAC;AAGnC,OAAO,EAAE,WAAW,EAAE,YAAY,EAAE,MAAM,SAAS,CAAC;AAiBpD;;;;GAIG;AACH,wBAAgB,mBAAmB,CAAC,QAAQ,EAAE,MAAM,GAAG,QAAQ,IAAI,WAAW,CAE7E;AAED;;;;;;;GAOG;AACH,wBAAgB,MAAM,CACpB,QAAQ,EAAE,WAAW,EACrB,OAAO,EAAE,MAAM,EACf,MAAM,EAAE,MAAM,EACd,SAAS,GAAE,YAAsB,GAChC,MAAM,CAIR;AAmBD,wBAAgB,kCAAkC,CAChD,WAAW,EAAE,MAAM,EAAE,EACrB,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAC9B,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAC7B,OAAO,CAOT;AAED,wBAAgB,kCAAkC,CAAC,WAAW,EAAE,MAAM,EAAE,EAAE,IAAI,EAAE,OAAO,EAAE,EAAE,IAAI,EAAE,OAAO,EAAE,GAAG,OAAO,CAOnH;AA4BD;;GAEG;AACH,MAAM,WAAW,aAAa;IAE5B,QAAQ,EAAE,CAAC,MAAM,EAAE,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC;IAInC,OAAO,EAAE,CAAC,MAAM,EAAE,OAAO,KAAK,IAAI,CAAC;IACnC,MAAM,EAAE,CAAC,GAAG,EAAE,OAAO,KAAK,IAAI,CAAC;CAChC;AAED;;;;;GAKG;AACH,wBAAgB,mBAAmB,CAAC,QAAQ,EAAE,SAAS,CAAC,qBAAqB,EAAE,YAAY,EAAE,MAAM,UAElG;AAED,wBAAgB,0BAA0B,CAAC,OAAO,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC;;;;;EAG7F;AAED;;;;;;;;GAQG;AACH,wBAAgB,iBAAiB,CAAC,MAAM,EAAE,MAAM,EAAE,UAAU,EAAE,OAAO,EAAE,UAAU,EAAE,OAAO,GAAG,OAAO,CAkBnG;AAED,wBAAgB,oBAAoB,CAAC,OAAO,EAAE,MAAM,EAAE,UAAU,EAAE,OAAO,EAAE,UAAU,EAAE,OAAO,GAAG,OAAO,CAEvG;AAED,oBAAY,SAAS;IACnB,IAAI,IAAA;IACJ,QAAQ,IAAA;IACR,MAAM,IAAA;IACN,oBAAoB,IAAA;CACrB"}

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@across-protocol/sdk",
   "author": "UMA Team",
-  "version": "4.3.38",
+  "version": "4.3.41",
   "license": "AGPL-3.0",
   "homepage": "https://docs.across.to/reference/sdk",
   "files": [

package/src/arch/svm/BlockUtils.ts

@@ -6,6 +6,7 @@ import { getCurrentTime } from "../../utils/TimeUtils";
 import { CHAIN_IDs } from "../../constants";
 import { SVMProvider } from "./";
 import { getNearestSlotTime } from "./utils";
+import winston from "winston";
 
 interface SVMBlock extends Block {}
 
@@ -32,6 +33,7 @@ function estimateBlocksElapsed(seconds: number, cushionPercentage = 0.0, _provid
 
 export class SVMBlockFinder extends BlockFinder<SVMBlock> {
   constructor(
+    private readonly logger: winston.Logger,
     private readonly provider: SVMProvider,
     private readonly blocks: SVMBlock[] = []
   ) {
@@ -97,7 +99,7 @@ export class SVMBlockFinder extends BlockFinder<SVMBlock> {
    */
   private getBlockTime(slot?: bigint): Promise<{ slot: bigint; timestamp: number }> {
     const opts = isDefined(slot) ? { slot } : undefined;
-    return getNearestSlotTime(this.provider, opts);
+    return getNearestSlotTime(this.provider, opts, this.logger);
   }
 
   // Grabs the most recent slot and caches it.

package/src/arch/svm/SpokeUtils.ts

@@ -31,10 +31,11 @@ import {
   signTransactionMessageWithSigners,
   some,
   type TransactionSigner,
+  type Commitment,
 } from "@solana/kit";
 import assert from "assert";
+import winston from "winston";
 import { arrayify } from "ethers/lib/utils";
-import { Logger } from "winston";
 import { CHAIN_IDs, TOKEN_SYMBOLS_MAP } from "../../constants";
 import { DepositWithBlock, FillStatus, FillWithBlock, RelayData, RelayExecutionEventInfo } from "../../interfaces";
 import {
@@ -88,22 +89,51 @@ type ProtoFill = Omit<RelayData, "recipient" | "outputToken"> & {
   outputToken: SvmAddress;
 };
 
+export function getSlot(provider: SVMProvider, commitment: Commitment, logger?: winston.Logger): Promise<bigint> {
+  return _callGetSlotWithRetry(provider, commitment, logger);
+}
+
+async function _callGetSlotWithRetry(
+  provider: SVMProvider,
+  commitment: Commitment,
+  logger?: winston.Logger
+): Promise<bigint> {
+  try {
+    return await provider.getSlot({ commitment }).send();
+  } catch (err) {
+    if (isSolanaError(err)) {
+      const { __code: code } = err.context;
+      logger?.debug({
+        at: "_getSlotWithRetry",
+        message: "Caught error from getSlot()",
+        code,
+        commitment,
+      });
+    }
+
+    // TODO: Implement retry logic once we better understand how these errors look:
+    throw err;
+  }
+}
+
 /**
  * Retrieves the chain time at a particular slot.
  */
 export function getTimestampForSlot(
   provider: SVMProvider,
   slotNumber: bigint,
-  maxRetries = 2
+  maxRetries = 2,
+  logger?: winston.Logger
 ): Promise<number | undefined> {
-  return _callGetTimestampForSlotWithRetry(provider, slotNumber, 0, maxRetries);
+  return _callGetTimestampForSlotWithRetry(provider, slotNumber, 0, maxRetries, logger);
 }
 
 async function _callGetTimestampForSlotWithRetry(
   provider: SVMProvider,
   slotNumber: bigint,
   retryAttempt: number,
-  maxRetries: number
+  maxRetries: number,
+  logger?: winston.Logger
 ): Promise<number | undefined> {
   // @note: getBlockTime receives a slot number, not a block number.
   let _timestamp: bigint;
@@ -117,6 +147,7 @@ async function _callGetTimestampForSlotWithRetry(
 
     const { __code: code } = err.context;
     const slot = slotNumber.toString();
+
     switch (err.context.__code) {
       case SVM_SLOT_SKIPPED:
         return undefined;
@@ -128,11 +159,27 @@ async function _callGetTimestampForSlotWithRetry(
         if (retryAttempt >= maxRetries) {
           throw new Error(`Timeout on SVM getBlockTime() for slot ${slot} after ${retryAttempt} retry attempts`);
         }
+        logger?.debug({
+          at: "getTimestampForSlot",
+          message: `Retrying getBlockTime() after ${delaySeconds} seconds for retry attempt #${retryAttempt}`,
+          slot,
+          retryAttempt,
+          maxRetries,
+          delaySeconds,
+        });
         await delay(delaySeconds);
-        return _callGetTimestampForSlotWithRetry(provider, slotNumber, ++retryAttempt, maxRetries);
+        return _callGetTimestampForSlotWithRetry(provider, slotNumber, ++retryAttempt, maxRetries, logger);
       }
 
       default:
+        logger?.debug({
+          at: "getTimestampForSlot",
+          message: "Caught error from getBlockTime()",
+          errorCode: code,
+          slot,
+          retryAttempt,
+          maxRetries,
+        });
         throw new Error(`Unhandled SVM getBlockTime() error for slot ${slot}: ${code}`, { cause: err });
     }
   }
@@ -196,6 +243,7 @@ export function getDepositIdAtBlock(_contract: unknown, _blockTag: number): Prom
 export async function findDeposit(
   eventClient: SvmCpiEventsClient,
   depositId: BigNumber,
+  logger: winston.Logger,
   slot?: bigint,
   secondsLookback = 2 * 24 * 60 * 60 // 2 days
 ): Promise<DepositWithBlock | undefined> {
@@ -205,7 +253,8 @@ export async function findDeposit(
   }
 
   const provider = eventClient.getRpc();
-  const { slot: currentSlot } = await getNearestSlotTime(provider);
+  const opts = undefined;
+  const { slot: currentSlot } = await getNearestSlotTime(provider, opts, logger);
 
   // If no slot is provided, use the current slot
   // If a slot is provided, ensure it's not in the future
@@ -263,6 +312,7 @@ export async function relayFillStatus(
   relayData: RelayData,
   destinationChainId: number,
   svmEventsClient: SvmCpiEventsClient,
+  logger: winston.Logger,
   atHeight?: number
 ): Promise<FillStatus> {
   assert(chainIsSvm(destinationChainId), "Destination chain must be an SVM chain");
@@ -276,7 +326,7 @@ export async function relayFillStatus(
     const commitment = "confirmed";
     const [fillStatusAccount, { slot: currentSlot, timestamp }] = await Promise.all([
       fetchEncodedAccount(provider, fillStatusPda, { commitment }),
-      getNearestSlotTime(provider, { commitment }),
+      getNearestSlotTime(provider, { commitment }, logger),
     ]);
     toSlot = currentSlot;
 
@@ -313,8 +363,8 @@ export async function fillStatusArray(
   relayData: RelayData[],
   destinationChainId: number,
   svmEventsClient: SvmCpiEventsClient,
-  atHeight?: number,
-  logger?: Logger
+  logger: winston.Logger,
+  atHeight?: number
 ): Promise<(FillStatus | undefined)[]> {
   assert(chainIsSvm(destinationChainId), "Destination chain must be an SVM chain");
   const provider = svmEventsClient.getRpc();
@@ -342,7 +392,7 @@ export async function fillStatusArray(
   // Otherwise, initialize all statuses as undefined
   const fillStatuses: (FillStatus | undefined)[] =
     atHeight === undefined
-      ? await fetchBatchFillStatusFromPdaAccounts(provider, fillStatusPdas, relayData)
+      ? await fetchBatchFillStatusFromPdaAccounts(provider, fillStatusPdas, relayData, logger)
       : new Array(relayData.length).fill(undefined);
 
   // Collect indices of deposits that still need their status resolved
@@ -358,7 +408,8 @@ export async function fillStatusArray(
   const missingResults: { index: number; fillStatus: FillStatus }[] = [];
 
   // Determine the toSlot to use for event reconstruction
-  const toSlot = atHeight ? BigInt(atHeight) : (await getNearestSlotTime(provider)).slot;
+  const opts = undefined;
+  const toSlot = atHeight ? BigInt(atHeight) : (await getNearestSlotTime(provider, opts, logger)).slot;
 
   // @note: This path is mostly used for deposits past their fill deadline.
   // If it becomes a bottleneck, consider returning an "Unknown" status that can be handled downstream.
@@ -397,10 +448,12 @@ export async function findFillEvent(
   destinationChainId: number,
   svmEventsClient: SvmCpiEventsClient,
   fromSlot: number,
-  toSlot?: number
+  toSlot?: number,
+  logger?: winston.Logger
 ): Promise<FillWithBlock | undefined> {
   assert(chainIsSvm(destinationChainId), "Destination chain must be an SVM chain");
-  toSlot ??= Number((await getNearestSlotTime(svmEventsClient.getRpc())).slot);
+  const opts = undefined;
+  toSlot ??= Number((await getNearestSlotTime(svmEventsClient.getRpc(), opts, logger)).slot);
 
   // Get fillStatus PDA using relayData
   const programId = svmEventsClient.getProgramAddress();
@@ -873,14 +926,15 @@ async function resolveFillStatusFromPdaEvents(
 async function fetchBatchFillStatusFromPdaAccounts(
   provider: SVMProvider,
   fillStatusPdas: Address[],
-  relayDataArray: RelayData[]
+  relayDataArray: RelayData[],
+  logger: winston.Logger
 ): Promise<(FillStatus | undefined)[]> {
   const chunkSize = 100; // SVM method getMultipleAccounts allows a max of 100 addresses per request
   const commitment = "confirmed";
 
   const [pdaAccounts, { timestamp }] = await Promise.all([
     Promise.all(chunk(fillStatusPdas, chunkSize).map((chunk) => fetchEncodedAccounts(provider, chunk, { commitment }))),
-    getNearestSlotTime(provider, { commitment }),
+    getNearestSlotTime(provider, { commitment }, logger),
   ]);
 
   const fillStatuses = pdaAccounts.flat().map((account, index) => {

package/src/arch/svm/utils.ts

@@ -25,8 +25,9 @@ import bs58 from "bs58";
 import { ethers } from "ethers";
 import { FillType, RelayData } from "../../interfaces";
 import { BigNumber, Address as SdkAddress, biMin, getRelayDataHash, isDefined, isUint8Array } from "../../utils";
-import { getTimestampForSlot } from "./SpokeUtils";
+import { getTimestampForSlot, getSlot } from "./SpokeUtils";
 import { AttestedCCTPMessage, EventName, SVMEventNames, SVMProvider } from "./types";
+import winston from "winston";
 
 export { isSolanaError } from "@solana/kit";
 
@@ -67,13 +68,15 @@ export function toAddress(address: SdkAddress): Address<string> {
  */
 export async function getNearestSlotTime(
   provider: SVMProvider,
-  opts: { slot: bigint } | { commitment: Commitment } = { commitment: "confirmed" }
+  opts: { slot: bigint } | { commitment: Commitment } = { commitment: "confirmed" },
+  logger?: winston.Logger
 ): Promise<{ slot: bigint; timestamp: number }> {
   let timestamp: number | undefined;
-  let slot = "slot" in opts ? opts.slot : await provider.getSlot(opts).send();
+  let slot = "slot" in opts ? opts.slot : await getSlot(provider, opts.commitment, logger);
+  const maxRetries = undefined; // Inherit defaults
 
   do {
-    timestamp = await getTimestampForSlot(provider, slot);
+    timestamp = await getTimestampForSlot(provider, slot, maxRetries, logger);
   } while (!isDefined(timestamp) && --slot);
   assert(isDefined(timestamp), `Unable to resolve block time for SVM slot ${slot}`);
 
@@ -87,11 +90,12 @@ export async function getNearestSlotTime(
  */
 export async function getLatestFinalizedSlotWithBlock(
   provider: SVMProvider,
+  logger: winston.Logger,
   maxSlot: bigint,
   maxLookback = 1000
 ): Promise<number> {
   const opts = { maxSupportedTransactionVersion: 0, transactionDetails: "none", rewards: false } as const;
-  const { slot: finalizedSlot } = await getNearestSlotTime(provider, { commitment: "finalized" });
+  const { slot: finalizedSlot } = await getNearestSlotTime(provider, { commitment: "finalized" }, logger);
   const endSlot = biMin(maxSlot, finalizedSlot);
 
   let slot = endSlot;

package/src/clients/BaseAbstractClient.ts

@@ -2,6 +2,7 @@ import { providers } from "ethers";
 import { CachingMechanismInterface } from "../interfaces";
 import { EventSearchConfig, isDefined, MakeOptional } from "../utils";
 import { getNearestSlotTime, SVMProvider } from "../arch/svm";
+import winston from "winston";
 
 export enum UpdateFailureReason {
   NotReady,
@@ -59,9 +60,7 @@ export abstract class BaseAbstractClient {
    * @provider Ethers RPC provider instance.
    * @returns An EventSearchConfig instance if valid, otherwise an UpdateFailureReason.
    */
-  public async updateSearchConfig(
-    provider: providers.Provider | SVMProvider
-  ): Promise<EventSearchConfig | UpdateFailureReason> {
+  public async updateSearchConfig(provider: providers.Provider): Promise<EventSearchConfig | UpdateFailureReason> {
     const from = this.firstHeightToSearch;
     let { to } = this.eventSearchConfig;
     if (isDefined(to)) {
@@ -69,12 +68,30 @@ export abstract class BaseAbstractClient {
         throw new Error(`Invalid event search config from (${from}) > to (${to})`);
       }
     } else {
-      if (provider instanceof providers.Provider) {
-        to = await provider.getBlockNumber();
-      } else {
-        const { slot } = await getNearestSlotTime(provider);
-        to = Number(slot);
+      to = await provider.getBlockNumber();
+      if (to < from) {
+        return UpdateFailureReason.AlreadyUpdated;
       }
+    }
+
+    const { maxLookBack } = this.eventSearchConfig;
+    return { from, to, maxLookBack };
+  }
+
+  public async updateSvmSearchConfig(
+    provider: SVMProvider,
+    logger: winston.Logger
+  ): Promise<EventSearchConfig | UpdateFailureReason> {
+    const from = this.firstHeightToSearch;
+    let { to } = this.eventSearchConfig;
+    if (isDefined(to)) {
+      if (from > to) {
+        throw new Error(`Invalid event search config from (${from}) > to (${to})`);
+      }
+    } else {
+      const opts = undefined; // Inherit defaults
+      const { slot } = await getNearestSlotTime(provider, opts, logger);
+      to = Number(slot);
       if (to < from) {
         return UpdateFailureReason.AlreadyUpdated;
       }

package/src/clients/BundleDataClient/BundleDataClient.ts

@@ -1652,7 +1652,8 @@ export class BundleDataClient {
         spokePoolClient.chainId,
         spokePoolClient.svmEventsClient,
         spokePoolClient.deploymentBlock,
-        spokePoolClient.latestHeightSearched
+        spokePoolClient.latestHeightSearched,
+        spokePoolClient.logger
       );
     } else if (isEVMSpokePoolClient(spokePoolClient)) {
       return await findEvmFillEvent(

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

@@ -41,7 +41,11 @@ export async function getWidestPossibleExpectedBlockRange(
     assert(isSVMSpokePoolClient(spokePoolClient));
 
     const maxSlot = resolveEndBlock(chainId, idx); // Respect any configured buffer for Solana.
-    return getLatestFinalizedSlotWithBlock(spokePoolClient.svmEventsClient.getRpc(), BigInt(maxSlot));
+    return getLatestFinalizedSlotWithBlock(
+      spokePoolClient.svmEventsClient.getRpc(),
+      spokePoolClient.logger,
+      BigInt(maxSlot)
+    );
   };
 
   const latestPossibleBundleEndBlockNumbers = await Promise.all(

package/src/clients/SpokePoolClient/SVMSpokePoolClient.ts

@@ -115,7 +115,7 @@ export class SVMSpokePoolClient extends SpokePoolClient {
    * Performs an update to refresh the state of this client by querying SVM events.
    */
   protected async _update(eventsToQuery: string[]): Promise<SpokePoolUpdate> {
-    const searchConfig = await this.updateSearchConfig(this.svmEventsClient.getRpc());
+    const searchConfig = await this.updateSvmSearchConfig(this.svmEventsClient.getRpc(), this.logger);
     if (isUpdateFailureReason(searchConfig)) {
       const reason = searchConfig;
       return { success: false, reason };
@@ -194,8 +194,9 @@ export class SVMSpokePoolClient extends SpokePoolClient {
    */
   public override async getTimestampForBlock(slot: number): Promise<number> {
     let _slot = BigInt(slot);
+    const maxRetries = undefined; // Inherit defaults
     do {
-      const timestamp = await getTimestampForSlot(this.svmEventsClient.getRpc(), _slot);
+      const timestamp = await getTimestampForSlot(this.svmEventsClient.getRpc(), _slot, maxRetries, this.logger);
       if (isDefined(timestamp)) {
         return timestamp;
       }
@@ -217,7 +218,7 @@ export class SVMSpokePoolClient extends SpokePoolClient {
    * Finds a deposit based on its deposit ID on the SVM chain.
    */
   public async findDeposit(depositId: BigNumber): Promise<DepositSearchResult> {
-    const deposit = await findDeposit(this.svmEventsClient, depositId);
+    const deposit = await findDeposit(this.svmEventsClient, depositId, this.logger);
     if (!deposit) {
       return {
         found: false,
@@ -244,7 +245,7 @@ export class SVMSpokePoolClient extends SpokePoolClient {
    * Retrieves the fill status for a given relay data from the SVM chain.
    */
   public override relayFillStatus(relayData: RelayData, atHeight?: number): Promise<FillStatus> {
-    return relayFillStatus(this.programId, relayData, this.chainId, this.svmEventsClient, atHeight);
+    return relayFillStatus(this.programId, relayData, this.chainId, this.svmEventsClient, this.logger, atHeight);
   }
 
   /**
@@ -260,6 +261,6 @@ export class SVMSpokePoolClient extends SpokePoolClient {
   ): Promise<(FillStatus | undefined)[]> {
     // @note: deploymentBlock actually refers to the deployment slot. Also, blockTag should be a slot number.
     destinationChainId ??= this.chainId;
-    return fillStatusArray(this.programId, relayData, destinationChainId, this.svmEventsClient, atHeight, this.logger);
+    return fillStatusArray(this.programId, relayData, destinationChainId, this.svmEventsClient, this.logger, atHeight);
   }
 }

package/src/providers/mocks/MockCachedSolanaRpcFactory.ts

@@ -1,4 +1,4 @@
-import { CachedSolanaRpcFactory } from "..";
+import { CachedSolanaRpcFactory } from "../solana/cachedRpcFactory";
 import { MockRetrySolanaRpcFactory } from "./MockRetrySolanaRpcFactory";
 
 // Creates mocked cached Solana RPC factory by using the mocked retry Solana RPC factory.

package/src/providers/mocks/MockRateLimitedSolanaRpcFactory.ts

@@ -1,4 +1,4 @@
-import { RateLimitedSolanaRpcFactory } from "..";
+import { RateLimitedSolanaRpcFactory } from "../solana/rateLimitedRpcFactory";
 import { MockSolanaRpcFactory } from "./MockSolanaRpcFactory";
 
 // Creates mocked rate limited Solana RPC factory by using the mocked Solana RPC factory.

package/src/providers/mocks/MockRetrySolanaRpcFactory.ts

@@ -1,4 +1,4 @@
-import { RetrySolanaRpcFactory } from "..";
+import { RetrySolanaRpcFactory } from "../solana/retryRpcFactory";
 import { MockRateLimitedSolanaRpcFactory } from "./MockRateLimitedSolanaRpcFactory";
 
 // Creates mocked retry Solana RPC factory by using the mocked rate limited Solana RPC factory.

package/src/providers/solana/baseRpcFactories.ts

@@ -2,7 +2,7 @@ import { ClusterUrl, createSolanaRpcFromTransport, RpcTransport } from "@solana/
 
 // This is abstract base class for creating Solana RPC clients and transports.
 export abstract class SolanaBaseRpcFactory {
-  constructor(readonly chainId: number) {}
+  constructor() {}
 
   // This method must be implemented by the derived class to create a transport.
   public abstract createTransport(): RpcTransport;
@@ -18,8 +18,8 @@ export abstract class SolanaBaseRpcFactory {
 export abstract class SolanaClusterRpcFactory extends SolanaBaseRpcFactory {
   constructor(
     readonly clusterUrl: ClusterUrl,
-    ...baseConstructorParams: ConstructorParameters<typeof SolanaBaseRpcFactory>
+    readonly chainId: number
   ) {
-    super(...baseConstructorParams);
+    super();
   }
 }

package/src/providers/solana/cachedRpcFactory.ts

@@ -7,6 +7,8 @@ import { CacheType } from "../utils";
 import { jsonReplacerWithBigInts, jsonReviverWithBigInts } from "../../utils";
 import { RetrySolanaRpcFactory } from "./retryRpcFactory";
 
+// A CachedFactory contains a RetryFactory and provides a caching layer that caches
+// the results of the RetryFactory's RPC calls.
 export class CachedSolanaRpcFactory extends SolanaClusterRpcFactory {
   public readonly getTransactionCachePrefix: string;
 

package/src/providers/solana/index.ts

@@ -3,4 +3,5 @@ export * from "./cachedRpcFactory";
 export * from "./defaultRpcFactory";
 export * from "./rateLimitedRpcFactory";
 export * from "./retryRpcFactory";
+export * from "./quorumFallbackRpcFactory";
 export * from "./utils";