@across-protocol/sdk 4.3.9 → 4.3.11

package/src/arch/svm/utils.ts

@@ -20,6 +20,8 @@ import { FillType, RelayData } from "../../interfaces";
 import { BigNumber, getRelayDataHash, isDefined, isUint8Array, Address as SdkAddress } from "../../utils";
 import { EventName, SVMEventNames, SVMProvider } from "./types";
 
+export { isSolanaError } from "@solana/kit";
+
 /**
  * Basic void TransactionSigner type
  */

package/src/clients/SpokePoolClient/SVMSpokePoolClient.ts

@@ -17,6 +17,8 @@ import {
   DepositSearchResult,
   EventSearchConfig,
   InvalidFill,
+  getNetworkName,
+  isDefined,
   MakeOptional,
   sortEventsAscendingInPlace,
   SvmAddress,
@@ -140,7 +142,7 @@ export class SVMSpokePoolClient extends SpokePoolClient {
     const timerStart = Date.now();
 
     const [currentTime, ...eventsQueried] = await Promise.all([
-      this.svmEventsClient.getRpc().getBlockTime(BigInt(searchConfig.to)).send(),
+      this.getTimeAt(searchConfig.to),
       ...eventsToQuery.map(async (eventName, idx) => {
         const config = eventSearchConfigs[idx];
         const events = await this.svmEventsClient.queryEvents(
@@ -190,8 +192,16 @@ export class SVMSpokePoolClient extends SpokePoolClient {
   /**
    * Retrieves the timestamp for a given SVM slot number.
    */
-  public override getTimestampForBlock(slot: number): Promise<number> {
-    return getTimestampForSlot(this.svmEventsClient.getRpc(), slot);
+  public override async getTimestampForBlock(slot: number): Promise<number> {
+    let _slot = BigInt(slot);
+    do {
+      const timestamp = await getTimestampForSlot(this.svmEventsClient.getRpc(), _slot);
+      if (isDefined(timestamp)) {
+        return timestamp;
+      }
+    } while (--_slot > 0);
+
+    throw new Error(`Unable to resolve time at or before ${getNetworkName(this.chainId)} slot ${slot}`);
   }
 
   /**
@@ -200,7 +210,7 @@ export class SVMSpokePoolClient extends SpokePoolClient {
    *       It is kept for consistency with the EVM SpokePoolClient.
    */
   public getTimeAt(slot: number): Promise<number> {
-    return getTimestampForSlot(this.svmEventsClient.getRpc(), slot);
+    return this.getTimestampForBlock(slot);
   }
 
   /**

package/src/interfaces/PubSubMechanism.ts

@@ -0,0 +1,15 @@
+export interface PubSubMechanismInterface {
+  /**
+   * Subscribes to a topic.
+   * @param topic The topic to subscribe to.
+   * @param callback The callback to call when a message is received.
+   */
+  sub<T>(topic: string, callback: (message: T) => unknown): Promise<void>;
+
+  /**
+   * Publishes a message to the network.
+   * @param topic The topic to publish to.
+   * @param message The message to publish.
+   */
+  pub<T>(topic: string, message: T): Promise<void>;
+}

package/src/interfaces/index.ts

@@ -6,4 +6,5 @@ export * from "./Bridge";
 export * from "./Error";
 export * from "./TypedData";
 export * from "./CachingMechanism";
+export * from "./PubSubMechanism";
 export * from "./BundleData";

package/src/typeguards/error.ts

@@ -1,6 +1,8 @@
 import { ethers } from "ethers";
-import { EthersError } from "../interfaces";
 import { BaseError } from "viem";
+import { EthersError } from "../interfaces";
+
+export { isSolanaError } from "../arch/svm";
 
 export const isError = (error: unknown): error is Error => error instanceof Error;