address review comments

Author: M-Picco

cli/src/__tests__/xrpl-onboarding.test.ts

@@ -76,8 +76,8 @@ describe("buildOnboardingPayload", () => {
     const out = buildOnboardingPayload({
       admin: ADMIN,
       app: "NTT",
-      initialTicket: 100,
-      ticketCount: 150,
+      initialTicket: 100n,
+      ticketCount: 150n,
       initData,
     });
 
@@ -104,8 +104,8 @@ describe("buildOnboardingPayload", () => {
     const out = buildOnboardingPayload({
       admin: ADMIN,
       app: "NTT",
-      initialTicket: 1,
-      ticketCount: 2,
+      initialTicket: 1n,
+      ticketCount: 2n,
       initData,
     });
     // 72 (fixed) + 43 (init_data) = 115 bytes => 230 hex chars

cli/src/commands/xrpl/init.ts

@@ -62,12 +62,12 @@ export function createXrplInitCommand(
         })
         .option("initial-ticket", {
           describe: "First ticket ID in the pre-allocated range",
-          type: "number",
+          type: "string",
           demandOption: true,
         })
         .option("ticket-count", {
           describe: "Number of tickets available",
-          type: "number",
+          type: "string",
           demandOption: true,
         })
         .option("token", {
@@ -135,8 +135,8 @@ export function createXrplInitCommand(
         const payload = buildOnboardingPayload({
           admin: argv.admin,
           app: APP_TYPE,
-          initialTicket: argv["initial-ticket"],
-          ticketCount: argv["ticket-count"],
+          initialTicket: BigInt(argv["initial-ticket"]),
+          ticketCount: BigInt(argv["ticket-count"]),
           initData,
         });
         const memoData = buildPublishMemoData(payload);

cli/src/commands/xrpl/relay.ts

@@ -2,9 +2,9 @@ import type {
   Network,
   WormholeConfigOverrides,
 } from "@wormhole-foundation/sdk-connect";
-import { RequestPrefix } from "@wormhole-foundation/sdk-connect";
+import { RequestPrefix, UniversalAddress } from "@wormhole-foundation/sdk-connect";
 import { fetchQuote, fetchStatus } from "@wormhole-foundation/sdk-connect";
-import { toChain, toUniversal, type Chain } from "@wormhole-foundation/sdk";
+import { toChain, toUniversal, type Chain, executor, CONFIG } from "@wormhole-foundation/sdk";
 import { ethers } from "ethers";
 import { decodeAccountID } from "xrpl";
 import { colors } from "../../colors.js";
@@ -17,12 +17,6 @@ import {
   walletFromSeed,
   withXrplClient,
 } from "../../xrpl/helpers";
-import { getDefaultExecutorApiForNetwork } from "../../xrpl/executor";
-import {
-  CHAIN_ID_XRPL,
-  getDefaultGuardianApiForNetwork,
-  pollSignedVaa,
-} from "../../xrpl/guardian";
 import {
   buildGasInstructionHex,
   serializeRequest,
@@ -39,6 +33,9 @@ import {
   type TokenId,
 } from "../../xrpl/tokenId";
 import { withCommon } from "./common";
+import { getVaaBytesWithRetry } from "@wormhole-foundation/sdk-connect/whscan-api";
+
+const CHAIN_ID_XRPL = 66;
 
 /**
  * Resolve a destination address to a 32-byte universal hex. Accepts the
@@ -309,15 +306,15 @@ export async function runRelay(
 
   // ── 2. Poll the guardian API for the signed VAA ──
   console.log(colors.blue("\n⏳ Waiting for guardian VAA..."));
-  await pollSignedVaa({
+  await getVaaBytesWithRetry(
     guardianApi,
-    chain: CHAIN_ID_XRPL,
-    emitterHex,
-    sequence,
-    pollIntervalMs: pollInterval,
-    pollTimeoutMs: pollTimeout,
-    onAttempt: (n, url) => console.log(colors.dim(`  attempt ${n}: ${url}`)),
-  });
+    {
+      chain: toChain(CHAIN_ID_XRPL),
+      emitter: new UniversalAddress(emitterHex),
+      sequence: sequence
+    },
+    pollTimeout
+  );
   console.log(colors.green("  VAA available."));
 
   // ── 3. Fetch a quote ──
@@ -433,3 +430,33 @@ export async function runRelay(
     )
   );
 }
+
+/**
+ * Default Executor API base URL for a network. Throws if there is no default
+ * for that network (e.g. not deployed yet) — pass `--executor-api` explicitly
+ * in that case.
+ */
+export function getDefaultExecutorApiForNetwork(network: Network): string {
+  const api = executor.executorAPI.get(network);
+  if (!api) {
+    throw new Error(
+      `No default Executor API for ${network}; pass --executor-api`
+    );
+  }
+  return api;
+}
+
+/**
+ * Default Guardian / Wormholescan API base URL for a network. Throws if there
+ * is no default for that network (e.g. not deployed yet) — pass `--guardian-api`
+ * explicitly in that case.
+ */
+export function getDefaultGuardianApiForNetwork(network: Network): string {
+  const api = CONFIG[network].api;
+  if (!api) {
+    throw new Error(
+      `No default Guardian API for ${network}; pass --guardian-api`
+    );
+  }
+  return api;
+}

cli/src/xrpl/executor.ts

@@ -59,10 +59,7 @@ const U64_MAX = (1n << 64n) - 1n;
  * Encode a non-negative integer that fits in a u64 as a big-endian 8-byte
  * (16 hex char) value. Accepts a number, bigint, or decimal string.
  */
-function u64Hex(n: string | number | bigint): string {
-  if (typeof n === "number" && !Number.isInteger(n)) {
-    throw new Error(`value ${n} must be an integer`);
-  }
+function u64Hex(n: string | bigint): string {
   let v: bigint;
   try {
     v = BigInt(n);
@@ -148,8 +145,8 @@ export function buildInitData(decimals: number, token: TokenInit): string {
 export function buildOnboardingPayload(params: {
   admin: string;
   app: string;
-  initialTicket: number;
-  ticketCount: number;
+  initialTicket: bigint;
+  ticketCount: bigint;
   initData: string;
 }): string {
   const adminHex = accountIdHex(params.admin);