chore: merge

Author: james-a-morris

src/arch/svm/SpokeUtils.ts

@@ -1,6 +1,8 @@
-import { Rpc, SolanaRpcApi } from "@solana/kit";
+import { Rpc, SolanaRpcApi, Address } from "@solana/kit";
+
 import { Deposit, FillStatus, FillWithBlock, RelayData } from "../../interfaces";
 import { BigNumber, isUnsafeDepositId } from "../../utils";
+import { fetchState } from "@across-protocol/contracts/dist/src/svm/clients/SvmSpoke";
 
 type Provider = Rpc<SolanaRpcApi>;
 
@@ -46,18 +48,14 @@ export async function getTimestampForBlock(provider: Provider, blockNumber: numb
 }
 
 /**
- * Return maximum of fill deadline buffer at start and end of block range.
- * @param spokePool SpokePool contract instance
- * @param startBlock start block
- * @param endBlock end block
- * @returns maximum of fill deadline buffer at start and end block
+ * Returns the current fill deadline buffer.
+ * @param provider SVM Provider instance
+ * @param statePda Spoke Pool's State PDA
+ * @returns fill deadline buffer
  */
-export function getMaxFillDeadlineInRange(
-  _spokePool: unknown,
-  _startBlock: number,
-  _endBlock: number
-): Promise<number> {
-  throw new Error("getMaxFillDeadlineInRange: not implemented");
+export async function getFillDeadline(provider: Provider, statePda: Address): Promise<number> {
+  const state = await fetchState(provider, statePda);
+  return state.data.fillDeadlineBuffer;
 }
 
 /**

src/arch/svm/utils.ts

@@ -1,6 +1,7 @@
 import { BN, BorshEventCoder, Idl } from "@coral-xyz/anchor";
-import web3, { address, isAddress, RpcTransport } from "@solana/kit";
 import { BigNumber, isUint8Array, SvmAddress } from "../../utils";
+import web3, { address, isAddress, RpcTransport, getProgramDerivedAddress, getU64Encoder, Address } from "@solana/kit";
+
 import { EventName, EventData, SVMEventNames } from "./types";
 import { FillType } from "../../interfaces";
 
@@ -132,3 +133,18 @@ export function unwrapEventData(
   // Return primitives as is
   return data;
 }
+
+/**
+ * Returns the PDA for the State account.
+ * @param programId The SpokePool program ID.
+ * @returns The PDA for the State account.
+ */
+export async function getStatePda(programId: Address): Promise<Address> {
+  const intEncoder = getU64Encoder();
+  const seed = intEncoder.encode(0);
+  const [statePda] = await getProgramDerivedAddress({
+    programAddress: programId,
+    seeds: ["state", seed],
+  });
+  return statePda;
+}

src/clients/SpokePoolClient/SVMSpokePoolClient.ts

@@ -1,6 +1,13 @@
-import { Rpc, RpcTransport, SolanaRpcApiFromTransport } from "@solana/kit";
+import { Address, Rpc, RpcTransport, SolanaRpcApiFromTransport } from "@solana/kit";
 import winston from "winston";
-import { SVMEventNames, SvmSpokeEventsClient, unwrapEventData } from "../../arch/svm";
+import {
+  SVMEventNames,
+  SvmSpokeEventsClient,
+  unwrapEventData,
+  getFillDeadline,
+  getTimestampForBlock,
+  getStatePda,
+} from "../../arch/svm";
 import { FillStatus, RelayData, SortableEvent } from "../../interfaces";
 import {
   BigNumber,
@@ -27,6 +34,8 @@ export class SvmSpokePoolClient extends SpokePoolClient {
     chainId: number,
     deploymentSlot: bigint, // Using slot instead of block number for SVM
     eventSearchConfig: MakeOptional<EventSearchConfig, "toBlock">,
+    protected programId: Address,
+    protected statePda: Address,
     protected svmEventsClient: SvmSpokeEventsClient,
     protected rpc: Rpc<SolanaRpcApiFromTransport<RpcTransport>>
   ) {
@@ -46,12 +55,16 @@ export class SvmSpokePoolClient extends SpokePoolClient {
     rpc: Rpc<SolanaRpcApiFromTransport<RpcTransport>>
   ): Promise<SvmSpokePoolClient> {
     const svmEventsClient = await SvmSpokeEventsClient.create(rpc);
+    const programId = svmEventsClient.getSvmSpokeAddress();
+    const statePda = await getStatePda(programId);
     return new SvmSpokePoolClient(
       logger,
       hubPoolClient,
       chainId,
       deploymentSlot,
       eventSearchConfig,
+      programId,
+      statePda,
       svmEventsClient,
       rpc
     );
@@ -152,18 +165,18 @@ export class SvmSpokePoolClient extends SpokePoolClient {
   }
 
   /**
-   * Retrieves the maximum fill deadline buffer.
-   * TODO: Implement SVM equivalent, perhaps reading from a config account.
+   * Retrieves the fill deadline buffer fetched from the State PDA.
+   * @note This function assumes that fill deadline buffer is a constant value in svm environments.
    */
-  public getMaxFillDeadlineInRange(_startSlot: number, _endSlot: number): Promise<number> {
-    throw new Error("getMaxFillDeadlineInRange not implemented for SVM");
+  public override getMaxFillDeadlineInRange(_startSlot: number, _endSlot: number): Promise<number> {
+    return getFillDeadline(this.rpc, this.statePda);
   }
 
   /**
    * Retrieves the timestamp for a given SVM slot number.
    */
-  public getTimestampForBlock(_blockNumber: number): Promise<number> {
-    throw new Error("getTimestampForBlock not implemented for SVM");
+  public override getTimestampForBlock(blockNumber: number): Promise<number> {
+    return getTimestampForBlock(this.rpc, blockNumber);
   }
 
   /**