bulletin-deploy 0.6.11 → 0.6.12

package/dist/bug-report.js

@@ -2,10 +2,10 @@ import {
   classifyErrorArea,
   isInteractive,
   promptYesNo
-} from "./chunk-OKLWNC3M.js";
+} from "./chunk-ELKNME32.js";
 import {
   VERSION
-} from "./chunk-2WNEX6D2.js";
+} from "./chunk-VL2Q4CNZ.js";
 import "./chunk-QGM4M3NI.js";
 
 // src/bug-report.ts

package/dist/{chunk-OKLWNC3M.js → chunk-ELKNME32.js}

@@ -1,6 +1,6 @@
 import {
   VERSION
-} from "./chunk-2WNEX6D2.js";
+} from "./chunk-VL2Q4CNZ.js";
 
 // src/version-check.ts
 import { execSync, execFileSync } from "child_process";

package/dist/{chunk-BIGY46US.js → chunk-M6WNBKCT.js}

@@ -4,7 +4,7 @@ import {
 import {
   captureWarning,
   withSpan
-} from "./chunk-2WNEX6D2.js";
+} from "./chunk-VL2Q4CNZ.js";
 
 // src/dotns.ts
 import crypto from "crypto";
@@ -49,6 +49,19 @@ var NATIVE_TO_ETH_RATIO = 1000000n;
 var CONNECTION_TIMEOUT_MS = 3e4;
 var OPERATION_TIMEOUT_MS = 3e5;
 var TX_TIMEOUT_MS = 9e4;
+var TX_CHAIN_TIME_BUDGET_MS = 18e4;
+var TX_WALL_CLOCK_CEILING_MS = 10 * 60 * 1e3;
+var WS_HEARTBEAT_TIMEOUT_MS = 3e5;
+var DOTNS_TX_MAX_ATTEMPTS = 3;
+function classifyTxRetryDecision(err) {
+  const msg = err instanceof Error ? err.message : String(err);
+  const lower = msg.toLowerCase();
+  if (/\bstale\b/.test(lower)) return "retry";
+  if (/"type"\s*:\s*"future"|\binvalid::future\b/.test(lower)) return "retry";
+  if (lower.includes("websocket") || lower.includes("connection") || lower.includes("socket closed") || lower.includes("disconnect")) return "retry";
+  if (lower.includes("timed out") || lower.includes("timeout")) return "retry";
+  return "abort";
+}
 var DEFAULT_MNEMONIC = "bottom drive obey lake curtain smoke basket hold race lonely fit walk";
 var _rpcIdCounter = 0;
 async function fetchNonce(rpc, ss58Address) {
@@ -302,10 +315,9 @@ var ReviveClientWrapper = class _ReviveClientWrapper {
       this.mappedAccounts.add(substrateAddress);
       return;
     }
-    const mappingExtrinsic = this.client.tx.Revive.map_account();
     try {
-      await this.signAndSubmitExtrinsic(mappingExtrinsic, signer, () => {
-      });
+      await this.signAndSubmitWithRetry(() => this.client.tx.Revive.map_account(), signer, () => {
+      }, "Revive.map_account");
       this.mappedAccounts.add(substrateAddress);
     } catch (error) {
       const errorMessage = error?.message || String(error);
@@ -316,30 +328,50 @@ var ReviveClientWrapper = class _ReviveClientWrapper {
       throw error;
     }
   }
-  signAndSubmitExtrinsic(extrinsic, signer, statusCallback, { nonceFallback } = {}) {
+  // `nonceFallback` is accepted for call-site compatibility but no longer
+  // used: a nonce-increment shortcut can't distinguish our tx from a
+  // concurrent/zombie tx on the same account (Alice's default mnemonic is
+  // widely shared on testnets), producing false-positive resolution. The
+  // chain-time deadline below is the reliability knob instead.
+  signAndSubmitExtrinsic(extrinsic, signer, statusCallback, _opts = {}) {
     return new Promise((resolve, reject) => {
       let settled = false;
-      let noncePoller = null;
+      let deadlinePoller = null;
+      let sub;
       const finish = (fn) => (...args) => {
         if (!settled) {
           settled = true;
-          clearTimeout(timer);
-          if (noncePoller) clearInterval(noncePoller);
+          if (deadlinePoller) clearInterval(deadlinePoller);
           try {
-            sub.unsubscribe();
+            sub?.unsubscribe();
           } catch {
           }
           fn(...args);
         }
       };
-      const timer = setTimeout(() => {
-        if (!settled) {
-          statusCallback("failed");
-          finish(reject)(new Error(`Transaction timed out after ${TX_TIMEOUT_MS / 1e3}s waiting for finalization`));
+      const startWallClockMs = Date.now();
+      let startChainTimeMs = null;
+      deadlinePoller = setInterval(async () => {
+        if (settled) return;
+        try {
+          if (Date.now() - startWallClockMs > TX_WALL_CLOCK_CEILING_MS) {
+            statusCallback("failed");
+            finish(reject)(new Error(`Transaction did not settle within ${TX_WALL_CLOCK_CEILING_MS / 1e3}s wall-clock (chain may be stalled)`));
+            return;
+          }
+          const chainNowMs = Number(await this.client.query.Timestamp.Now.getValue());
+          if (startChainTimeMs === null) startChainTimeMs = chainNowMs;
+          const chainElapsedMs = chainNowMs - startChainTimeMs;
+          if (chainElapsedMs > TX_CHAIN_TIME_BUDGET_MS) {
+            statusCallback("failed");
+            finish(reject)(new Error(`Transaction not included after ${Math.floor(chainElapsedMs / 1e3)}s of chain progress (budget=${TX_CHAIN_TIME_BUDGET_MS / 1e3}s)`));
+            return;
+          }
+        } catch {
         }
-      }, TX_TIMEOUT_MS);
+      }, 6e3);
       try {
-        var sub = extrinsic.signSubmitAndWatch(signer, { mortality: { mortal: true, period: 256 } }).subscribe({
+        sub = extrinsic.signSubmitAndWatch(signer, { mortality: { mortal: true, period: 256 } }).subscribe({
           next: (event) => {
             const transactionHash = event.txHash?.toString();
             switch (event.type) {
@@ -350,25 +382,7 @@ var ReviveClientWrapper = class _ReviveClientWrapper {
                 statusCallback("broadcasting");
                 break;
               case "txBestBlocksState":
-                if (event.found) {
-                  statusCallback("included");
-                  if (nonceFallback && !noncePoller) {
-                    noncePoller = setInterval(async () => {
-                      if (settled) {
-                        clearInterval(noncePoller);
-                        return;
-                      }
-                      try {
-                        const currentNonce = await fetchNonce(nonceFallback.rpc, nonceFallback.senderSS58);
-                        if (currentNonce > nonceFallback.expectedNonce) {
-                          statusCallback("finalized");
-                          finish(resolve)("nonce-confirmed");
-                        }
-                      } catch {
-                      }
-                    }, 6e3);
-                  }
-                }
+                if (event.found) statusCallback("included");
                 break;
               case "finalized":
                 if (event.dispatchError) {
@@ -397,6 +411,27 @@ var ReviveClientWrapper = class _ReviveClientWrapper {
       }
     });
   }
+  // Wrapper around signAndSubmitExtrinsic that retries on transient errors
+  // (Stale, Future, connection, timeout — see classifyTxRetryDecision). The
+  // extrinsic is rebuilt per attempt via `buildExtrinsic` so polkadot-api
+  // assigns a fresh nonce + mortality window — same pattern as
+  // pool.ts:submitAliceTxWithRetry. `label` is the human-readable op name
+  // used in retry log lines.
+  async signAndSubmitWithRetry(buildExtrinsic, signer, statusCallback, label, opts = {}) {
+    let lastError;
+    for (let attempt = 1; attempt <= DOTNS_TX_MAX_ATTEMPTS; attempt++) {
+      try {
+        return await this.signAndSubmitExtrinsic(buildExtrinsic(), signer, statusCallback, opts);
+      } catch (e) {
+        lastError = e;
+        const decision = classifyTxRetryDecision(e);
+        if (decision === "abort" || attempt === DOTNS_TX_MAX_ATTEMPTS) break;
+        const short = (e?.message ?? String(e)).slice(0, 80);
+        console.log(`   ${label}: attempt ${attempt}/${DOTNS_TX_MAX_ATTEMPTS} failed (${short}), retrying...`);
+      }
+    }
+    throw lastError instanceof Error ? lastError : new Error(String(lastError));
+  }
   async submitTransaction(contractAddress, value, encodedData, signerSubstrateAddress, signer, statusCallback, { rpc, useNoncePolling } = {}) {
     await this.ensureAccountMapped(signerSubstrateAddress, signer);
     const gasEstimate = await this.estimateGasForCall(signerSubstrateAddress, contractAddress, value, encodedData);
@@ -405,7 +440,7 @@ var ReviveClientWrapper = class _ReviveClientWrapper {
     const minimumStorageDeposit = 2000000000000n;
     let storageDepositLimit = gasEstimate.storageDeposit === 0n ? minimumStorageDeposit : gasEstimate.storageDeposit * 120n / 100n;
     if (storageDepositLimit < minimumStorageDeposit) storageDepositLimit = minimumStorageDeposit;
-    const callExtrinsic = this.client.tx.Revive.call({ dest: Binary.fromHex(contractAddress), value, weight_limit: weightLimit, storage_deposit_limit: storageDepositLimit, data: Binary.fromHex(encodedData) });
+    const buildExtrinsic = () => this.client.tx.Revive.call({ dest: Binary.fromHex(contractAddress), value, weight_limit: weightLimit, storage_deposit_limit: storageDepositLimit, data: Binary.fromHex(encodedData) });
     let nonceFallback;
     if (useNoncePolling && rpc) {
       try {
@@ -414,7 +449,7 @@ var ReviveClientWrapper = class _ReviveClientWrapper {
       } catch {
       }
     }
-    return await this.signAndSubmitExtrinsic(callExtrinsic, signer, statusCallback, { nonceFallback });
+    return await this.signAndSubmitWithRetry(buildExtrinsic, signer, statusCallback, "Revive.call", { nonceFallback });
   }
 };
 var DotNS = class {
@@ -441,7 +476,7 @@ var DotNS = class {
       try {
         console.log(`   Connecting to: ${rpc}`);
         this.rpc = rpc;
-        this.client = createClient(getWsProvider(rpc));
+        this.client = createClient(getWsProvider(rpc, { heartbeatTimeout: WS_HEARTBEAT_TIMEOUT_MS }));
         const unsafeApi = this.client.getUnsafeApi();
         this.clientWrapper = new ReviveClientWrapper(unsafeApi);
         if (options.signer && options.signerAddress) {
@@ -911,6 +946,11 @@ export {
   CONNECTION_TIMEOUT_MS,
   OPERATION_TIMEOUT_MS,
   TX_TIMEOUT_MS,
+  TX_CHAIN_TIME_BUDGET_MS,
+  TX_WALL_CLOCK_CEILING_MS,
+  WS_HEARTBEAT_TIMEOUT_MS,
+  DOTNS_TX_MAX_ATTEMPTS,
+  classifyTxRetryDecision,
   DEFAULT_MNEMONIC,
   fetchNonce,
   ProofOfPersonhoodStatus,

package/dist/{chunk-VT4THP4H.js → chunk-RECT3AEW.js}

@@ -5,7 +5,7 @@ import {
   fetchNonce,
   popStatusName,
   validateDomainLabel
-} from "./chunk-BIGY46US.js";
+} from "./chunk-M6WNBKCT.js";
 import {
   merkleizeJS
 } from "./chunk-GZ5UUECB.js";
@@ -27,7 +27,7 @@ import {
   truncateAddress,
   withDeploySpan,
   withSpan
-} from "./chunk-2WNEX6D2.js";
+} from "./chunk-VL2Q4CNZ.js";
 
 // src/deploy.ts
 import { Buffer } from "buffer";

package/dist/{chunk-2WNEX6D2.js → chunk-VL2Q4CNZ.js}

@@ -7,7 +7,7 @@ import * as path from "path";
 // package.json
 var package_default = {
   name: "bulletin-deploy",
-  version: "0.6.11",
+  version: "0.6.12",
   private: false,
   repository: {
     type: "git",

package/dist/deploy.js

@@ -23,11 +23,11 @@ import {
   storeChunkedContent,
   storeDirectory,
   storeFile
-} from "./chunk-VT4THP4H.js";
-import "./chunk-BIGY46US.js";
+} from "./chunk-RECT3AEW.js";
+import "./chunk-M6WNBKCT.js";
 import "./chunk-GZ5UUECB.js";
 import "./chunk-JHNW2EKY.js";
-import "./chunk-2WNEX6D2.js";
+import "./chunk-VL2Q4CNZ.js";
 import "./chunk-QGM4M3NI.js";
 export {
   DEFAULT_BULLETIN_RPC,

package/dist/dotns.d.ts

@@ -54,6 +54,11 @@ declare const NATIVE_TO_ETH_RATIO: bigint;
 declare const CONNECTION_TIMEOUT_MS: number;
 declare const OPERATION_TIMEOUT_MS: number;
 declare const TX_TIMEOUT_MS: number;
+declare const TX_CHAIN_TIME_BUDGET_MS: number;
+declare const TX_WALL_CLOCK_CEILING_MS: number;
+declare const WS_HEARTBEAT_TIMEOUT_MS: number;
+declare const DOTNS_TX_MAX_ATTEMPTS: number;
+declare function classifyTxRetryDecision(err: unknown): "retry" | "abort";
 declare const DEFAULT_MNEMONIC: string;
 declare function fetchNonce(rpc: string, ss58Address: string): Promise<number>;
 declare const ProofOfPersonhoodStatus: {
@@ -95,7 +100,14 @@ declare class ReviveClientWrapper {
     estimateGasForCall(originSubstrateAddress: string, contractAddress: string, value: bigint, encodedData: string): Promise<any>;
     checkIfAccountMapped(substrateAddress: string): Promise<boolean>;
     ensureAccountMapped(substrateAddress: string, signer: PolkadotSigner): Promise<void>;
-    signAndSubmitExtrinsic(extrinsic: any, signer: PolkadotSigner, statusCallback: (status: string) => void, { nonceFallback }?: {
+    signAndSubmitExtrinsic(extrinsic: any, signer: PolkadotSigner, statusCallback: (status: string) => void, _opts?: {
+        nonceFallback?: {
+            rpc: string;
+            senderSS58: string;
+            expectedNonce: number;
+        };
+    }): Promise<string>;
+    signAndSubmitWithRetry(buildExtrinsic: () => any, signer: PolkadotSigner, statusCallback: (status: string) => void, label: string, opts?: {
         nonceFallback?: {
             rpc: string;
             senderSS58: string;
@@ -156,4 +168,4 @@ declare class DotNS {
 }
 declare const dotns: DotNS;
 
-export { CONNECTION_TIMEOUT_MS, CONTRACTS, DECIMALS, DEFAULT_MNEMONIC, DOT_NODE, DotNS, type DotNSConnectOptions, type DotnsPreflightResult, NATIVE_TO_ETH_RATIO, OPERATION_TIMEOUT_MS, type OwnershipResult, type PriceValidationResult, ProofOfPersonhoodStatus, RPC_ENDPOINTS, TX_TIMEOUT_MS, canRegister, classifyDotnsLabel, computeDomainTokenId, convertWeiToNative, countTrailingDigits, dotns, fetchNonce, isCommitmentMature, parseProofOfPersonhoodStatus, popStatusName, sanitizeDomainLabel, simulateUserStatus, stripTrailingDigits, validateDomainLabel };
+export { CONNECTION_TIMEOUT_MS, CONTRACTS, DECIMALS, DEFAULT_MNEMONIC, DOTNS_TX_MAX_ATTEMPTS, DOT_NODE, DotNS, type DotNSConnectOptions, type DotnsPreflightResult, NATIVE_TO_ETH_RATIO, OPERATION_TIMEOUT_MS, type OwnershipResult, type PriceValidationResult, ProofOfPersonhoodStatus, RPC_ENDPOINTS, TX_CHAIN_TIME_BUDGET_MS, TX_TIMEOUT_MS, TX_WALL_CLOCK_CEILING_MS, WS_HEARTBEAT_TIMEOUT_MS, canRegister, classifyDotnsLabel, classifyTxRetryDecision, computeDomainTokenId, convertWeiToNative, countTrailingDigits, dotns, fetchNonce, isCommitmentMature, parseProofOfPersonhoodStatus, popStatusName, sanitizeDomainLabel, simulateUserStatus, stripTrailingDigits, validateDomainLabel };

package/dist/dotns.js

@@ -3,15 +3,20 @@ import {
   CONTRACTS,
   DECIMALS,
   DEFAULT_MNEMONIC,
+  DOTNS_TX_MAX_ATTEMPTS,
   DOT_NODE,
   DotNS,
   NATIVE_TO_ETH_RATIO,
   OPERATION_TIMEOUT_MS,
   ProofOfPersonhoodStatus,
   RPC_ENDPOINTS,
+  TX_CHAIN_TIME_BUDGET_MS,
   TX_TIMEOUT_MS,
+  TX_WALL_CLOCK_CEILING_MS,
+  WS_HEARTBEAT_TIMEOUT_MS,
   canRegister,
   classifyDotnsLabel,
+  classifyTxRetryDecision,
   computeDomainTokenId,
   convertWeiToNative,
   countTrailingDigits,
@@ -24,24 +29,29 @@ import {
   simulateUserStatus,
   stripTrailingDigits,
   validateDomainLabel
-} from "./chunk-BIGY46US.js";
+} from "./chunk-M6WNBKCT.js";
 import "./chunk-JHNW2EKY.js";
-import "./chunk-2WNEX6D2.js";
+import "./chunk-VL2Q4CNZ.js";
 import "./chunk-QGM4M3NI.js";
 export {
   CONNECTION_TIMEOUT_MS,
   CONTRACTS,
   DECIMALS,
   DEFAULT_MNEMONIC,
+  DOTNS_TX_MAX_ATTEMPTS,
   DOT_NODE,
   DotNS,
   NATIVE_TO_ETH_RATIO,
   OPERATION_TIMEOUT_MS,
   ProofOfPersonhoodStatus,
   RPC_ENDPOINTS,
+  TX_CHAIN_TIME_BUDGET_MS,
   TX_TIMEOUT_MS,
+  TX_WALL_CLOCK_CEILING_MS,
+  WS_HEARTBEAT_TIMEOUT_MS,
   canRegister,
   classifyDotnsLabel,
+  classifyTxRetryDecision,
   computeDomainTokenId,
   convertWeiToNative,
   countTrailingDigits,

package/dist/index.js

@@ -1,9 +1,9 @@
 import {
   deploy
-} from "./chunk-VT4THP4H.js";
+} from "./chunk-RECT3AEW.js";
 import {
   DotNS
-} from "./chunk-BIGY46US.js";
+} from "./chunk-M6WNBKCT.js";
 import {
   merkleizeJS
 } from "./chunk-GZ5UUECB.js";
@@ -14,7 +14,7 @@ import {
   fetchPoolAuthorizations,
   selectAccount
 } from "./chunk-JHNW2EKY.js";
-import "./chunk-2WNEX6D2.js";
+import "./chunk-VL2Q4CNZ.js";
 import "./chunk-QGM4M3NI.js";
 export {
   DotNS,

package/dist/telemetry.js

@@ -17,7 +17,7 @@ import {
   truncateAddress,
   withDeploySpan,
   withSpan
-} from "./chunk-2WNEX6D2.js";
+} from "./chunk-VL2Q4CNZ.js";
 import "./chunk-QGM4M3NI.js";
 export {
   VERSION,

package/dist/version-check.js

@@ -8,8 +8,8 @@ import {
   isPreReleaseVersion,
   preReleaseWarning,
   promptYesNo
-} from "./chunk-OKLWNC3M.js";
-import "./chunk-2WNEX6D2.js";
+} from "./chunk-ELKNME32.js";
+import "./chunk-VL2Q4CNZ.js";
 import "./chunk-QGM4M3NI.js";
 export {
   assessVersion,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "bulletin-deploy",
-  "version": "0.6.11",
+  "version": "0.6.12",
   "private": false,
   "repository": {
     "type": "git",