@kingdomchain/wallet-client 0.6.1 → 0.6.2

package/dist/index.js

@@ -3352,14 +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 before inclusion:", 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);
@@ -3377,7 +3396,8 @@ async function broadcastAndConfirmTx(client, signerAddress, messages, fee, memo
   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:", {