@kingdomchain/wallet-client 0.6.0 → 0.6.2

package/dist/index.d.ts

@@ -700,7 +700,9 @@ declare function fetchFeeGrantGranter(restUrl: string, grantee: string): Promise
 
 declare class CitizenTxError extends Error {
     readonly code: CitizenTxErrorCode;
-    constructor(message: string, code: CitizenTxErrorCode, cause?: unknown);
+    /** Raw on-chain log from a failed DeliverTx/indexed tx, when available. */
+    readonly rawLog?: string;
+    constructor(message: string, code: CitizenTxErrorCode, cause?: unknown, rawLog?: string);
 }
 type CitizenTxErrorCode = "INSUFFICIENT_FEE" | "INSUFFICIENT_BALANCE" | "SEQUENCE_MISMATCH" | "TX_FAILED" | "TIMEOUT" | "INVALID_INPUT";
 interface BroadcastConfirmOptions {

package/dist/index.js

@@ -3273,12 +3273,15 @@ async function fetchFeeGrantGranter(restUrl, grantee) {
   }
 }
 var CitizenTxError = class extends Error {
-  constructor(message, code, cause) {
+  constructor(message, code, cause, rawLog) {
     super(message, { cause });
     this.code = code;
     this.name = "CitizenTxError";
+    this.rawLog = rawLog;
   }
   code;
+  /** Raw on-chain log from a failed DeliverTx/indexed tx, when available. */
+  rawLog;
 };
 var DEFAULT_GAS = "200000";
 var DEFAULT_FEE_UKDR = "5000";
@@ -3349,13 +3352,33 @@ function citizenTxErrorMessage(code) {
       return "The transaction could not be completed. Please try again.";
   }
 }
+function withTimeout(promise, ms, label) {
+  let timer;
+  const timeout = new Promise((_, reject) => {
+    timer = setTimeout(
+      () => reject(new Error(`[citizenTx] ${label} did not respond within ${ms}ms`)),
+      ms
+    );
+  });
+  return Promise.race([promise, timeout]).finally(() => clearTimeout(timer));
+}
 async function broadcastAndConfirmTx(client, signerAddress, messages, fee, memo = "", options = {}) {
   const pollIntervalMs = options.pollIntervalMs ?? 1500;
   const timeoutMs = options.timeoutMs ?? 9e4;
   let deliverTx;
   try {
-    deliverTx = await client.signAndBroadcast(signerAddress, messages, fee, memo);
+    console.log("[citizenTx] signAndBroadcast: starting", { signerAddress, messages });
+    deliverTx = await withTimeout(
+      client.signAndBroadcast(signerAddress, messages, fee, memo),
+      2e4,
+      "signAndBroadcast"
+    );
+    console.log("[citizenTx] signAndBroadcast: settled", {
+      code: deliverTx.code,
+      hash: deliverTx.transactionHash
+    });
   } catch (err) {
+    console.error("[citizenTx] broadcast threw or timed out before inclusion:", err);
     const message = err instanceof Error ? err.message : String(err);
     if (message.toLowerCase().includes("insufficient")) {
       throw new CitizenTxError(citizenTxErrorMessage("INSUFFICIENT_FEE"), "INSUFFICIENT_FEE", err);
@@ -3363,17 +3386,26 @@ async function broadcastAndConfirmTx(client, signerAddress, messages, fee, memo
     throw new CitizenTxError(citizenTxErrorMessage("TX_FAILED"), "TX_FAILED", err);
   }
   if (deliverTx.code !== 0) {
+    console.error("[citizenTx] deliverTx failed:", {
+      code: deliverTx.code,
+      rawLog: deliverTx.rawLog
+    });
     const code = classifyBroadcastFailure(deliverTx.rawLog ?? "", deliverTx.code);
-    throw new CitizenTxError(citizenTxErrorMessage(code), code);
+    throw new CitizenTxError(citizenTxErrorMessage(code), code, void 0, deliverTx.rawLog ?? "");
   }
   const hash = deliverTx.transactionHash;
   const deadline = Date.now() + timeoutMs;
   while (Date.now() < deadline) {
-    const indexed = await client.getTx(hash);
+    console.log("[citizenTx] getTx poll: checking", { hash });
+    const indexed = await withTimeout(client.getTx(hash), 15e3, `getTx(${hash})`);
     if (indexed) {
       if (indexed.code !== 0) {
+        console.error("[citizenTx] indexed tx failed:", {
+          code: indexed.code,
+          rawLog: indexed.rawLog
+        });
         const code = classifyBroadcastFailure(indexed.rawLog ?? "", indexed.code);
-        throw new CitizenTxError(citizenTxErrorMessage(code), code);
+        throw new CitizenTxError(citizenTxErrorMessage(code), code, void 0, indexed.rawLog ?? "");
       }
       return {
         hash,