@across-protocol/sdk 4.3.18 → 4.3.19

package/src/arch/svm/utils.ts

@@ -1,7 +1,9 @@
+import assert from "assert";
 import { MessageTransmitterClient, SvmSpokeClient } from "@across-protocol/contracts";
 import { BN, BorshEventCoder, Idl } from "@coral-xyz/anchor";
 import {
   Address,
+  type Commitment,
   IInstruction,
   KeyPairSigner,
   address,
@@ -24,6 +26,7 @@ import { ethers } from "ethers";
 import { FillType, RelayData } from "../../interfaces";
 import { BigNumber, Address as SdkAddress, getRelayDataHash, isDefined, isUint8Array } from "../../utils";
 import { AttestedCCTPMessage, EventName, SVMEventNames, SVMProvider } from "./types";
+import { getTimestampForSlot } from "./SpokeUtils";
 
 export { isSolanaError } from "@solana/kit";
 
@@ -56,6 +59,27 @@ export function toAddress(address: SdkAddress): Address<string> {
   return address.toBase58() as Address<string>;
 }
 
+/**
+ * For a given slot (or implicit head of chain), find the immediate preceding slot that contained a block.
+ * @param provider SVM Provider instance.
+ * @param opts An object containing a specific slot number, or a Solana commitment, defaulting to "confirmed".
+ * @returns An object containing the slot number and the relevant timestamp for the block.
+ */
+export async function getNearestSlotTime(
+  provider: SVMProvider,
+  opts: { slot: bigint } | { commitment: Commitment } = { commitment: "confirmed" }
+): Promise<{ slot: bigint; timestamp: number }> {
+  let timestamp: number | undefined;
+  let slot = "slot" in opts ? opts.slot : await provider.getSlot(opts).send();
+
+  do {
+    timestamp = await getTimestampForSlot(provider, slot);
+  } while (!isDefined(timestamp) && --slot);
+  assert(isDefined(timestamp), `Unable to resolve block time for SVM slot ${slot}`);
+
+  return { slot, timestamp };
+}
+
 /**
  * Resolve the latest finalized slot, and then work backwards to find the nearest slot containing a block.
  * In most cases the first-resolved slot should also have a block. Avoid making arbitrary decisions about
@@ -66,7 +90,7 @@ export async function getLatestFinalizedSlotWithBlock(
   maxSlot: bigint,
   maxLookback = 1000
 ): Promise<number> {
-  const finalizedSlot = await provider.getSlot({ commitment: "finalized" }).send();
+  const { slot: finalizedSlot } = await getNearestSlotTime(provider, { commitment: "finalized" });
   const endSlot = Math.min(Number(maxSlot), Number(finalizedSlot));
   const opts = { maxSupportedTransactionVersion: 0, transactionDetails: "none", rewards: false } as const;
 

package/src/clients/BaseAbstractClient.ts

@@ -1,7 +1,7 @@
 import { providers } from "ethers";
 import { CachingMechanismInterface } from "../interfaces";
 import { EventSearchConfig, isDefined, MakeOptional } from "../utils";
-import { SVMProvider } from "../arch/svm";
+import { getNearestSlotTime, SVMProvider } from "../arch/svm";
 
 export enum UpdateFailureReason {
   NotReady,
@@ -72,7 +72,8 @@ export abstract class BaseAbstractClient {
       if (provider instanceof providers.Provider) {
         to = await provider.getBlockNumber();
       } else {
-        to = Number(await provider.getSlot({ commitment: "confirmed" }).send());
+        const { slot } = await getNearestSlotTime(provider);
+        to = Number(slot);
       }
       if (to < from) {
         return UpdateFailureReason.AlreadyUpdated;