chore: Unify svm w/ arch/svm

src/svm/eventsClient.ts → src/arch/svm/eventsClient.ts

@@ -8,10 +8,9 @@ import web3, {
   RpcTransport,
   Signature,
 } from "@solana/kit";
-import { bs58 } from "../utils";
+import { bs58 } from "../../utils";
 import { EventData, EventName, EventWithData } from "./types";
-import { decodeEvent } from "./utils/events";
-import { isDevnet } from "./utils/helpers";
+import { decodeEvent, isDevnet } from "./utils";
 
 // Utility type to extract the return type for the JSON encoding overload. We only care about the overload where the
 // configuration parameter (C) has the optional property 'encoding' set to 'json'.

src/arch/svm/index.ts

@@ -1 +1,4 @@
+export * from "./eventsClient";
 export * from "./SpokeUtils";
+export * from "./types";
+export * from "./utils";

src/svm/utils/events.ts → src/arch/svm/utils.ts

@@ -1,6 +1,14 @@
 import { BN, BorshEventCoder, Idl } from "@coral-xyz/anchor";
-import { address } from "@solana/kit";
-import { EventName, EventData, SVMEventNames } from "../types";
+import web3, { address, RpcTransport } from "@solana/kit";
+import { EventName, EventData, SVMEventNames } from "./types";
+
+/**
+ * Helper to determine if the current RPC network is devnet.
+ */
+export async function isDevnet(rpc: web3.Rpc<web3.SolanaRpcApiFromTransport<RpcTransport>>): Promise<boolean> {
+  const genesisHash = await rpc.getGenesisHash().send();
+  return genesisHash === "EtWTRABZaYq6iMfeYKouRu166VU2xqa1wcaWoxPkrZBG";
+}
 
 /**
  * Parses event data from a transaction.

src/clients/SpokePoolClient/SVMSpokePoolClient.ts

@@ -1,12 +1,10 @@
 import winston from "winston";
 import { Rpc, SolanaRpcApiFromTransport, RpcTransport } from "@solana/kit";
 import { BigNumber, DepositSearchResult, EventSearchConfig, MakeOptional } from "../../utils";
+import { SvmSpokeEventsClient, SVMEventNames } from "../../arch/svm";
 import { HubPoolClient } from "../HubPoolClient";
 import { knownEventNames, SpokePoolClient, SpokePoolUpdate } from "./SpokePoolClient";
-import { SvmSpokeEventsClient } from "../../svm/eventsClient";
 import { RelayData, FillStatus } from "../../interfaces";
-import { SVMEventNames } from "../../svm/types";
-
 /**
  * SvmSpokePoolClient is a client for the SVM SpokePool program. It extends the base SpokePoolClient
  * and implements the abstract methods required for interacting with an SVM Spoke Pool.

src/index.ts

@@ -16,4 +16,3 @@ export * as clients from "./clients";
 export * as typechain from "./typechain";
 export * as caching from "./caching";
 export * as providers from "./providers";
-export * as svm from "./svm";