fix: query events v2

Signed-off-by: Pablo Maldonado <[email protected]>

Author: md0x

scripts/svm/queryEventsV2.ts

@@ -1,6 +1,6 @@
 // This script queries the events of the spoke pool and prints them in a human readable format.
 import { AnchorProvider } from "@coral-xyz/anchor";
-import { address, createSolanaRpc } from "@solana/kit";
+import { address, createSolanaRpc, createSolanaRpcSubscriptions } from "@solana/kit";
 import { stringifyCpiEvent } from "../../src/svm/web3-v1";
 import { SvmSpokeIdl } from "../../src/svm";
 import yargs from "yargs";
@@ -41,11 +41,18 @@ const argvPromise = yargs(hideBin(process.argv))
 async function queryEvents(): Promise<void> {
   const argv = await argvPromise;
   const eventName = argv.eventName || "any";
-  const programId = argv.programId;
-  const rpc = createSolanaRpc(provider.connection.rpcEndpoint);
-  const events = await readProgramEvents(rpc, address(programId), SvmSpokeIdl, "confirmed");
-  const filteredEvents = events.filter((event: any) => (eventName == "any" ? true : event.name == eventName));
-  const formattedEvents = filteredEvents.map((event: any) => stringifyCpiEvent(event));
+  const { programId } = argv;
+  const { rpcEndpoint } = provider.connection;
+
+  const rpc = createSolanaRpc(rpcEndpoint);
+  const rpcSubscriptions = createSolanaRpcSubscriptions(
+    rpcEndpoint.replace(/^http(s?):\/\//i, (_m, s) => `ws${s ?? ""}://`)
+  );
+
+  const events = await readProgramEvents({ rpc, rpcSubscriptions }, address(programId), SvmSpokeIdl, "confirmed");
+
+  const filteredEvents = events.filter((e) => (eventName === "any" ? true : e.name === eventName));
+  const formattedEvents = filteredEvents.map(stringifyCpiEvent);
 
   console.log(JSON.stringify(formattedEvents, null, 2));
 }