bulletin-deploy 0.7.24 → 0.7.25-rc.1

package/assets/environments.json

@@ -9,6 +9,7 @@
       "ipfs": "https://previewnet.substrate.dev/ipfs/",
       "autoAccountMapping": true,
       "bulletinAuthorizeV2": true,
+      "registerStorageDeposit": 2000000000000,
       "contracts": {
         "DOTNS_PROTOCOL_REGISTRY": "0xc07A2F24387DA27283CD87b9F24573b74C9e0c9b",
         "DOTNS_REGISTRAR": "0x6c40817cdb96Ab57A4d9E9fa21D0eEa8307BDDE8",
@@ -56,6 +57,7 @@
       "autoAccountMapping": true,
       "bulletinAuthorizeV2": true,
       "nativeToEthRatio": 100000000,
+      "registerStorageDeposit": 2000000000000,
       "popSelfServe": {
         "sudoEnvLabel": "Next V2",
         "faucetUrl": "https://faucet.polkadot.io/?parachain=1500",

package/bin/bulletin-deploy

@@ -2,7 +2,7 @@
 
 import { deploy, DEFAULT_BULLETIN_RPC, DEFAULT_POOL_SIZE, NonRetryableError, EXIT_CODE_NO_RETRY, isConnectionError } from "../dist/deploy.js";
 import { VERSION, setDeployAttribute, captureWarning, closeTelemetry, setRunStateActive, markRelaunchOomHintShown } from "../dist/telemetry.js";
-import { handleFailedDeploy, preReleaseWarning, checkNodeVersion } from "../dist/version-check.js";
+import { handleFailedDeploy, handlePreflightVersionCheck, fetchVersionInfo, preReleaseWarning, checkNodeVersion } from "../dist/version-check.js";
 import { setDeployContext, installLogCapture, buildCliFlagsSummary } from "../dist/bug-report.js";
 import { loadRunState, writeRunState, shouldSkipStaleWarning, shouldShowOomHint, probablyOomRssMb } from "../dist/run-state.js";
 import { loadEnvironments, listEnvironments, formatEnvironmentTable, DEFAULT_ENV_ID } from "../dist/environments.js";
@@ -113,6 +113,11 @@ Options:
 const rcWarning = preReleaseWarning(VERSION);
 if (rcWarning) console.error(rcWarning);
 
+// Fire in background immediately; await just before deploy() to stay non-blocking during flag-parse.
+const _versionCheckPromise = process.env.BULLETIN_DEPLOY_UPDATE_CHECK !== "0"
+  ? fetchVersionInfo()
+  : Promise.resolve(null);
+
 // ── Crash capture (issue #154) ───────────────────────────────────
 // Only wire crash capture for actual deploy runs — skip for --help / --version
 // (which exit above).
@@ -251,6 +256,10 @@ try {
     ci,
   });
 
+  // Await the background version check started at startup.
+  const _versionInfo = await _versionCheckPromise;
+  if (handlePreflightVersionCheck(_versionInfo) === "abort") process.exit(1);
+
   const result = await deploy(buildDir, domain, {
     mnemonic: flags.mnemonic,
     derivationPath: flags.derivationPath,

package/dist/bug-report.js

@@ -9,10 +9,10 @@ import {
   offerBugReport,
   scrubSecrets,
   setDeployContext
-} from "./chunk-K6RIDRB7.js";
-import "./chunk-L7KXFYLH.js";
-import "./chunk-5VEZVLDN.js";
-import "./chunk-N6AK5PSE.js";
+} from "./chunk-LE62ANFY.js";
+import "./chunk-Z2ZZKED3.js";
+import "./chunk-DJYVUPAF.js";
+import "./chunk-5BYKEV2D.js";
 export {
   buildCliFlagsSummary,
   buildLabels,

package/dist/{chunk-4V6HI3TA.js → chunk-4HFR7OYX.js}

@@ -1,6 +1,6 @@
 import {
   captureWarning
-} from "./chunk-5VEZVLDN.js";
+} from "./chunk-DJYVUPAF.js";
 
 // src/chunk-probe.ts
 import { Twox128, Blake2128Concat, decAnyMetadata, unifyMetadata } from "@polkadot-api/substrate-bindings";

package/dist/{chunk-N6AK5PSE.js → chunk-5BYKEV2D.js}

@@ -6,7 +6,7 @@ import * as path from "path";
 // package.json
 var package_default = {
   name: "bulletin-deploy",
-  version: "0.7.24",
+  version: "0.7.25-rc.1",
   private: false,
   repository: {
     type: "git",
@@ -77,7 +77,7 @@ var package_default = {
     "@types/node": "^22.0.0",
     tsup: "^8.5.0",
     typescript: "^5.9.3",
-    ws: "^8.20.0"
+    ws: "^8.20.1"
   },
   minimumVersion: "0.5.6",
   engines: {

package/dist/{chunk-LEYQOOWC.js → chunk-BO22ZDUF.js}

@@ -25,6 +25,7 @@ function computeStats(input) {
     recycledCids: recycled.length,
     retentionPeriodBlocks: input.retentionPeriodBlocks,
     bytesProbePresent: input.bytesProbePresent,
+    bytesProbeAbsent: input.bytesProbeAbsent ?? 0,
     bytesSkipped: input.bytesSkipped,
     bytesUploaded: input.bytesUploaded,
     chunksTotal: input.chunksTotal,
@@ -64,6 +65,7 @@ function telemetryAttributes(s) {
     "deploy.cache.chunks_uploaded": String(s.chunksUploaded),
     "deploy.cache.chunks_skipped": String(s.chunksSkipped),
     "deploy.cache.bytes_probe_present": String(s.bytesProbePresent),
+    "deploy.cache.bytes_probe_absent": String(s.bytesProbeAbsent),
     "deploy.cache.bytes_skipped": String(s.bytesSkipped),
     "deploy.cache.bytes_uploaded": String(s.bytesUploaded),
     "deploy.cache.car_bytes": String(s.carBytes),
@@ -84,8 +86,9 @@ function fmtKb(bytes) {
 }
 function renderSummary(s) {
   const lines = [];
+  const attemptsWord = s.manifestFetchAttempts === 1 ? "attempt" : "attempts";
   if (s.manifestSource === "heuristic_fallback") {
-    lines.push(`  \u26A0 Previous manifest fetch failed after ${s.manifestFetchAttempts} attempts (gateway timeout).`);
+    lines.push(`  \u26A0 Previous manifest fetch failed after ${s.manifestFetchAttempts} ${attemptsWord} (gateway timeout).`);
     lines.push(`    Using heuristic classification \u2014 hit rate may be lower this run.`);
     lines.push(`    Subsequent deploys recover automatically.`);
     lines.push("");
@@ -94,15 +97,15 @@ function renderSummary(s) {
   if (s.manifestSource === "none") {
     lines.push(`  Manifest:      first deploy (no previous manifest)`);
   } else if (s.manifestSource === "embedded") {
-    const attemptsStr = `${s.manifestFetchAttempts} attempt${s.manifestFetchAttempts === 1 ? "" : "s"}`;
     const sizeStr = s.manifestBytes > 0 ? `, ${fmtKb(s.manifestBytes)} KB Range hit` : "";
-    lines.push(`  Manifest:      embedded (${attemptsStr}${sizeStr})`);
+    lines.push(`  Manifest:      embedded (${s.manifestFetchAttempts} ${attemptsWord}${sizeStr})`);
   } else {
-    lines.push(`  Manifest:      heuristic_fallback (${s.manifestFetchAttempts} attempts)`);
+    lines.push(`  Manifest:      heuristic_fallback (${s.manifestFetchAttempts} ${attemptsWord})`);
   }
   if (s.filesTotal > 0 && s.manifestSource !== "none") {
     const pct = s.filesTotal === 0 ? 0 : Math.round(s.filesStable / s.filesTotal * 100);
-    lines.push(`  Files:         ${s.filesStable} unchanged, ${s.filesVolatile} changed (${pct} % stable)`);
+    const heuristicNote = s.manifestSource === "heuristic_fallback" ? " (heuristic estimate)" : "";
+    lines.push(`  Files:         ${s.filesStable} unchanged, ${s.filesVolatile} changed (${pct} % stable)${heuristicNote}`);
   }
   if (s.probedTotal > 0) {
     let probeFailedStr = "";
@@ -115,7 +118,7 @@ function renderSummary(s) {
     }
     lines.push(`  Probed:        ${s.probedTotal} chunks  \u2192  ${s.probePresent} cached, ${s.probeAbsent} to upload${probeFailedStr}`);
   }
-  if (s.recycledCids > 0) {
+  if (s.recycledCids > 0 && s.manifestSource === "embedded") {
     lines.push(`  Recycled:      ${s.recycledCids} CIDs found on-chain that weren't in the previous manifest`);
   }
   if (s.tier2FallbackCount > 0) {
@@ -123,10 +126,12 @@ function renderSummary(s) {
     lines.push(`  Verify:        ${s.tier2VerifiedCount}/${s.tier2FallbackCount} via-fallback chunks confirmed on chain${inconclusiveStr}`);
   }
   lines.push(`  CAR sections:  manifest ${fmtKb(s.section0Bytes)} KB \xB7 stable ${fmtMb(s.section1Bytes)} MB \xB7 volatile ${fmtMb(s.section2Bytes)} MB`);
-  if (s.chunksUploaded > 0 && s.bytesSkipped > 0) {
-    lines.push(`  Upload:        ${fmtMb(s.bytesUploaded)} MB across ${s.chunksUploaded} chunks (vs ${fmtMb(s.carBytes)} MB if full deploy)`);
-  } else if (s.chunksUploaded > 0) {
-    lines.push(`  Upload:        ${fmtMb(s.bytesUploaded)} MB across ${s.chunksUploaded} chunks`);
+  if (s.chunksUploaded > 0) {
+    if (s.bytesSkipped > 0) {
+      lines.push(`  Upload:        ${fmtMb(s.bytesUploaded)} MB across ${s.chunksUploaded} chunks (vs ${fmtMb(s.carBytes)} MB if full deploy)`);
+    } else {
+      lines.push(`  Upload:        ${fmtMb(s.bytesUploaded)} MB across ${s.chunksUploaded} chunks`);
+    }
   }
   if (s.estimatedSecondsSaved > 0 || s.bytesSkipped > 0) {
     lines.push(`  Saved:         ~${s.estimatedSecondsSaved} s and ${fmtMb(s.bytesSkipped)} MB`);

package/dist/{chunk-5VEZVLDN.js → chunk-DJYVUPAF.js}

@@ -1,7 +1,7 @@
 import {
   package_default,
   writeRunState
-} from "./chunk-N6AK5PSE.js";
+} from "./chunk-5BYKEV2D.js";
 
 // src/memory-report.ts
 import * as fs2 from "fs";

package/dist/{chunk-5MRZ3V4A.js → chunk-JOHTUV2D.js}

@@ -1,15 +1,24 @@
 import {
   MANIFEST_DIR,
   MANIFEST_FILENAME,
+  MANIFEST_PATH,
   parseManifest
 } from "./chunk-S7EM5VMW.js";
+import {
+  mirrorUrl,
+  normalizeDomainFilename,
+  resolveOwnerRepo
+} from "./chunk-HOTQDYHD.js";
 
 // src/manifest-fetch.ts
+import * as fs from "fs";
+import * as path from "path";
 import { CarReader } from "@ipld/car/reader";
 import * as dagPB from "@ipld/dag-pb";
 import { CID } from "multiformats/cid";
 var DEFAULT_GATEWAY = "https://paseo-ipfs.polkadot.io";
 var DEFAULT_TIMEOUT_MS = 5e3;
+var SIDECAR_FILENAME = ".last_deploy_cid";
 var RANGE_TIERS = [
   "bytes=0-4095",
   "bytes=0-65535",
@@ -17,6 +26,67 @@ var RANGE_TIERS = [
   void 0
   // full body
 ];
+function readLocalManifest(buildDir, prevContenthash) {
+  const sidePath = path.join(buildDir, MANIFEST_DIR, SIDECAR_FILENAME);
+  try {
+    const lastCid = fs.readFileSync(sidePath, "utf8").trim();
+    if (lastCid !== prevContenthash) return null;
+  } catch {
+    return null;
+  }
+  const manifestPath = path.join(buildDir, MANIFEST_PATH);
+  let text;
+  try {
+    text = fs.readFileSync(manifestPath, "utf8");
+  } catch {
+    return null;
+  }
+  const parsed = parseManifest(text);
+  if (!parsed.ok) return null;
+  return {
+    source: "embedded",
+    manifest: parsed.manifest,
+    attempts: 0,
+    bytesDownloaded: text.length
+  };
+}
+async function fetchFromGitHubPages(domain, prevContenthash, options, start) {
+  let ownerRepo;
+  try {
+    ownerRepo = resolveOwnerRepo(process.cwd());
+  } catch {
+    return null;
+  }
+  if (!ownerRepo) return null;
+  const { owner, repo } = ownerRepo;
+  let domainFilename;
+  try {
+    domainFilename = normalizeDomainFilename(domain);
+  } catch {
+    return null;
+  }
+  const carUrl = mirrorUrl(owner, repo, domainFilename);
+  const sidecarUrl = carUrl.replace(/\.car$/, ".json");
+  const budget = options.timeoutMs ?? DEFAULT_TIMEOUT_MS;
+  try {
+    const sidecarBudget = Math.min(2e3, budget - (Date.now() - start));
+    if (sidecarBudget <= 0) return null;
+    const ctrl = new AbortController();
+    const timer = setTimeout(() => ctrl.abort(), sidecarBudget);
+    let sidecarRes;
+    try {
+      sidecarRes = await fetch(sidecarUrl, { signal: ctrl.signal });
+    } finally {
+      clearTimeout(timer);
+    }
+    if (!sidecarRes.ok) return null;
+    const sidecar = await sidecarRes.json();
+    if (sidecar.cid !== prevContenthash) return null;
+  } catch {
+    return null;
+  }
+  return fetchAcrossTiers(carUrl, budget, start);
+}
 async function fetchAcrossTiers(url, budget, start) {
   let lastReason = "unknown";
   let attempts = 0;
@@ -91,9 +161,34 @@ async function fetchAcrossTiers(url, budget, start) {
 }
 async function fetchPreviousManifest(prevContenthash, options = {}) {
   if (prevContenthash === null) return { source: "none" };
-  const gatewayList = (options.gateways ?? (options.gateway ? [options.gateway] : [DEFAULT_GATEWAY])).map((g) => g.replace(/\/$/, ""));
-  const budget = options.timeoutMs ?? DEFAULT_TIMEOUT_MS;
+  if (options.buildDir) {
+    const local = readLocalManifest(options.buildDir, prevContenthash);
+    if (local) return local;
+  }
   const start = Date.now();
+  const budget = options.timeoutMs ?? DEFAULT_TIMEOUT_MS;
+  if (options.domain) {
+    const ghResult = await fetchFromGitHubPages(options.domain, prevContenthash, options, start);
+    if (ghResult) {
+      if (ghResult.outcome === "success") {
+        return {
+          source: "embedded",
+          manifest: ghResult.manifest,
+          attempts: ghResult.attempts,
+          bytesDownloaded: ghResult.bytesDownloaded
+        };
+      }
+      if (ghResult.outcome === "404" || ghResult.outcome === "parse_error") {
+        return {
+          source: "heuristic_fallback",
+          reason: ghResult.outcome === "404" ? "gh-pages 404" : ghResult.reason,
+          attempts: ghResult.attempts,
+          bytesDownloaded: ghResult.bytesDownloaded
+        };
+      }
+    }
+  }
+  const gatewayList = (options.gateways ?? (options.gateway ? [options.gateway] : [DEFAULT_GATEWAY])).map((g) => g.replace(/\/$/, ""));
   let lastReason = "unknown";
   let totalAttempts = 0;
   let bytesDownloaded = 0;
@@ -166,6 +261,8 @@ async function extractManifestFromCar(carBytes) {
 export {
   DEFAULT_GATEWAY,
   DEFAULT_TIMEOUT_MS,
+  SIDECAR_FILENAME,
+  readLocalManifest,
   fetchPreviousManifest,
   extractManifestFromCar
 };

package/dist/{chunk-K6RIDRB7.js → chunk-LE62ANFY.js}

@@ -2,11 +2,11 @@ import {
   classifyErrorArea,
   isInteractive,
   promptYesNo
-} from "./chunk-L7KXFYLH.js";
+} from "./chunk-Z2ZZKED3.js";
 import {
   VERSION,
   getCurrentSentryTraceId
-} from "./chunk-5VEZVLDN.js";
+} from "./chunk-DJYVUPAF.js";
 
 // src/bug-report.ts
 import { execSync, execFileSync } from "child_process";

package/dist/{chunk-R6NLVFXP.js → chunk-O3S64AGV.js}

@@ -7,7 +7,10 @@ import {
   setDeploySentryTag,
   truncateAddress,
   withSpan
-} from "./chunk-5VEZVLDN.js";
+} from "./chunk-DJYVUPAF.js";
+import {
+  validateContractAddresses
+} from "./chunk-Q7JW7TGW.js";
 
 // src/dotns.ts
 import crypto from "crypto";
@@ -37,6 +40,7 @@ var FEE_FLOOR_OWNED = ONE_PAS / 100n;
 var FEE_FLOOR_REGISTER = ONE_PAS / 10n;
 var TOP_UP_TARGET = ONE_PAS / 2n;
 var SOURCE_BUFFER = ONE_PAS;
+var MINIMUM_REGISTER_STORAGE_DEPOSIT = 2000000000000n;
 var REPROVE_FEE_ESTIMATE = ONE_PAS / 100n;
 var REPROVE_FEE_SAFETY_MARGIN_PCT = 110n;
 var TOP_UP_TRANSFER_TIMEOUT_MS = 6e4;
@@ -51,8 +55,13 @@ function resolveNativeTokenSymbol(envId) {
   if (envId.includes("rococo")) return "ROC";
   return "PAS";
 }
-function feeFloorFor(plannedAction) {
-  return plannedAction === "already-owned-by-us" ? FEE_FLOOR_OWNED : FEE_FLOOR_REGISTER;
+function feeFloorFor(plannedAction, storageDeposit = MINIMUM_REGISTER_STORAGE_DEPOSIT) {
+  if (plannedAction === "already-owned-by-us") return FEE_FLOOR_OWNED;
+  return FEE_FLOOR_REGISTER + storageDeposit;
+}
+function topUpTargetFor(plannedAction, storageDeposit = MINIMUM_REGISTER_STORAGE_DEPOSIT) {
+  if (plannedAction === "already-owned-by-us") return TOP_UP_TARGET;
+  return TOP_UP_TARGET + storageDeposit;
 }
 var RPC_ENDPOINTS = [
   "wss://asset-hub-paseo.dotters.network",
@@ -145,6 +154,7 @@ var DOTNS_REGISTRAR_CONTROLLER_ABI = [
   { inputs: [{ name: "registration", type: "tuple", components: [{ name: "label", type: "string" }, { name: "owner", type: "address" }, { name: "secret", type: "bytes32" }, { name: "reserved", type: "bool" }] }], name: "makeCommitment", outputs: [{ name: "", type: "bytes32" }], stateMutability: "view", type: "function" },
   { inputs: [{ name: "commitment", type: "bytes32" }], name: "commit", outputs: [], stateMutability: "nonpayable", type: "function" },
   { inputs: [], name: "minCommitmentAge", outputs: [{ name: "", type: "uint256" }], stateMutability: "view", type: "function" },
+  { inputs: [], name: "maxCommitmentAge", outputs: [{ name: "", type: "uint256" }], stateMutability: "view", type: "function" },
   { inputs: [{ name: "commitment", type: "bytes32" }], name: "commitments", outputs: [{ name: "", type: "uint256" }], stateMutability: "view", type: "function" },
   { inputs: [{ name: "registration", type: "tuple", components: [{ name: "label", type: "string" }, { name: "owner", type: "address" }, { name: "secret", type: "bytes32" }, { name: "reserved", type: "bool" }] }], name: "register", outputs: [], stateMutability: "payable", type: "function" }
 ];
@@ -156,7 +166,6 @@ var POP_RULES_ABI = [
   { inputs: [{ name: "name", type: "string" }], name: "price", outputs: [{ name: "", type: "uint256" }], stateMutability: "view", type: "function" },
   { inputs: [{ name: "name", type: "string" }, { name: "userAddress", type: "address" }], name: "priceWithCheck", outputs: [{ name: "metadata", type: "tuple", components: [{ name: "price", type: "uint256" }, { name: "status", type: "uint8" }, { name: "userStatus", type: "uint8" }, { name: "message", type: "string" }] }], stateMutability: "view", type: "function" },
   { inputs: [{ name: "name", type: "string" }, { name: "userAddress", type: "address" }], name: "priceWithoutCheck", outputs: [{ name: "metadata", type: "tuple", components: [{ name: "price", type: "uint256" }, { name: "status", type: "uint8" }, { name: "userStatus", type: "uint8" }, { name: "message", type: "string" }] }], stateMutability: "view", type: "function" },
-  { inputs: [{ name: "status", type: "uint8" }], name: "setUserPopStatus", outputs: [], stateMutability: "nonpayable", type: "function" },
   { inputs: [{ name: "name", type: "string" }], name: "isBaseNameReserved", outputs: [{ name: "isReserved", type: "bool" }, { name: "reservationOwner", type: "address" }, { name: "expiryTimestamp", type: "uint64" }], stateMutability: "view", type: "function" }
 ];
 var PERSONHOOD_ABI = [
@@ -268,14 +277,27 @@ function formatContractDryRunFailure(gasEstimate, context) {
   const revertData = gasEstimate.revertData;
   const isBareRevert = (revertData === void 0 || revertData.trim() === "0x") && gasEstimate.revertFlags === 1n;
   if (isBareRevert && BARE_REVERT_DIAGNOSTIC_FUNCTIONS.has(functionName)) {
-    lines.push(
-      `  diagnostic: bare-revert (empty 0x). Account mapping was verified at connect time, so the cause is likely:`,
-      `    1. PoP status changed between preflight and registration (race condition).`,
-      `    2. Commitment timing: the revealed commitment is still too new or already expired.`,
-      `    3. Label was registered by someone else between preflight and register.`,
-      `  To reproduce in isolation: \`node tools/dotns-dry-run.mjs <label>\``,
-      `  To rule out a mapping issue: add --fresh (a brand-new unmapped origin) \u2014 if --fresh reverts but the mapped one doesn't, it's a mapping bug.`
-    );
+    if (functionName === "register") {
+      lines.push(
+        `  diagnostic: bare-revert (empty 0x) during register. Most likely cause: insufficient signer balance for storage deposit.`,
+        `    A fresh TLD register() requires sufficient free balance to cover the chain's storage deposit (typically 200+ PAS).`,
+        `    Other possible causes:`,
+        `    1. PoP status changed between preflight and registration (race condition).`,
+        `    2. Commitment timing: the revealed commitment is still too new or already expired.`,
+        `    3. Label was registered by someone else between preflight and register.`,
+        `  To reproduce in isolation: \`node tools/dotns-dry-run.mjs <label>\``,
+        `  To rule out a mapping issue: add --fresh (a brand-new unmapped origin) \u2014 if --fresh reverts but the mapped one doesn't, it's a mapping bug.`
+      );
+    } else {
+      lines.push(
+        `  diagnostic: bare-revert (empty 0x). Account mapping was verified at connect time, so the cause is likely:`,
+        `    1. PoP status changed between preflight and registration (race condition).`,
+        `    2. Commitment timing: the revealed commitment is still too new or already expired.`,
+        `    3. Label was registered by someone else between preflight and register.`,
+        `  To reproduce in isolation: \`node tools/dotns-dry-run.mjs <label>\``,
+        `  To rule out a mapping issue: add --fresh (a brand-new unmapped origin) \u2014 if --fresh reverts but the mapped one doesn't, it's a mapping bug.`
+      );
+    }
   }
   return lines.join("\n");
 }
@@ -348,6 +370,9 @@ function validateDomainLabel(label) {
 function isCommitmentMature(chainNowSeconds, commitTimestampSeconds, minimumAgeSeconds) {
   return chainNowSeconds > commitTimestampSeconds + minimumAgeSeconds;
 }
+function isCommitmentTimingBarerevert(msg) {
+  return /bare-revert.*\(empty 0x\)/i.test(msg) || /commitment.*too new.*expired/i.test(msg) || /expired.*commitment/i.test(msg);
+}
 function classifyDotnsLabel(label) {
   const totalLength = label.length;
   const trailingDigits = countTrailingDigits(label);
@@ -385,21 +410,6 @@ function exampleNoStatusLabel(label) {
   const base = stripTrailingDigits(validateDomainLabel(label)).replace(/[^a-z0-9-]/g, "x");
   return `${base.padEnd(9, "x").slice(0, 9)}00.dot`;
 }
-function simulateUserStatus(currentStatus, requiredStatus, options) {
-  const canSelfAttest = options.canSelfAttest ?? true;
-  const max = (a, b) => a > b ? a : b;
-  if (options.explicitStatus !== void 0) {
-    if (options.isTestnet && canSelfAttest) return max(currentStatus, options.explicitStatus);
-    return currentStatus;
-  }
-  if (requiredStatus === ProofOfPersonhoodStatus.NoStatus && currentStatus === ProofOfPersonhoodStatus.ProofOfPersonhoodLite && options.isTestnet && canSelfAttest) {
-    return ProofOfPersonhoodStatus.ProofOfPersonhoodFull;
-  }
-  if (requiredStatus !== ProofOfPersonhoodStatus.NoStatus && options.isTestnet && canSelfAttest) {
-    return max(currentStatus, requiredStatus);
-  }
-  return currentStatus;
-}
 function parseDomainName(input) {
   const name = input.replace(/\.dot$/, "");
   const parts = name.split(".");
@@ -707,6 +717,7 @@ var DotNS = class {
   _nativeToEthRatio = NATIVE_TO_ETH_RATIO;
   _environmentId = null;
   _popSelfServe = null;
+  _registerStorageDeposit = MINIMUM_REGISTER_STORAGE_DEPOSIT;
   // Test-only seam: consumed once by classifyAliasAccountState() then cleared.
   // Mirrors the __setDeployRootSpanForTest / __setSentryForTest pattern.
   _classifyOverrideForTest = null;
@@ -742,6 +753,7 @@ var DotNS = class {
       this.assetHubEndpoints = options.assetHubEndpoints;
     }
     if (options.contracts && Object.keys(options.contracts).length > 0) {
+      validateContractAddresses(options.contracts, options.environmentId ?? "unknown");
       this._contracts = { ...CONTRACTS, ...options.contracts };
     }
     if (options.environmentId) {
@@ -750,6 +762,9 @@ var DotNS = class {
     if (options.popSelfServe !== void 0) {
       this._popSelfServe = options.popSelfServe ?? null;
     }
+    if (options.registerStorageDeposit !== void 0) {
+      this._registerStorageDeposit = options.registerStorageDeposit;
+    }
     const rpc = options.rpc || process.env.DOTNS_RPC || this.assetHubEndpoints[0];
     this.rpc = rpc;
     this._usesExternalSigner = Boolean(options.signer && options.signerAddress);
@@ -1136,9 +1151,6 @@ var DotNS = class {
       );
     }
   }
-  async setUserPopStatus(_status) {
-    throw new Error("DotNS self-attestation is no longer available. Personhood status is read from the Personhood precompile; contact the DotNS team for whitelisting / status changes.");
-  }
   async checkSubdomainOwnership(sublabel, parentLabel) {
     this.ensureConnected();
     if (!this.clientWrapper) return { owned: false, owner: null };
@@ -1183,9 +1195,20 @@ var DotNS = class {
       }
       if (!ipfsCid) throw new Error(`setContenthash: cannot decode contenthash ${contenthashHex} to an IPFS CID`);
       console.log(`   Setting contenthash: ${ipfsCid}`);
+      const expected = contenthashHex.toLowerCase();
+      try {
+        const current = (await this.getContenthash(domainName) || "0x").toLowerCase();
+        if (current === expected) {
+          console.log(`   Contenthash already set: ${ipfsCid} \u2014 skipping tx`);
+          setDeployAttribute("deploy.dotns.contenthash_unchanged", "true");
+          return { node };
+        }
+      } catch (_) {
+      }
+      setDeployAttribute("deploy.dotns.contenthash_unchanged", "false");
       const txHash = await this.contractTransaction(this._contracts.DOTNS_CONTENT_RESOLVER, 0n, DOTNS_CONTENT_RESOLVER_ABI, "setContenthash", [node, contenthashHex], (s) => console.log(`      ${s}`), { useNoncePolling: true });
       console.log(`   Tx: ${txHash}`);
-      const expected = contenthashHex.toLowerCase();
+      let txResolution = txHash.startsWith("nonce-advanced:") ? "nonce-advanced" : "finalized";
       const MAX_CHAIN_WAIT_SECONDS = 90;
       const POLL_INTERVAL_MS = 2e3;
       const startChainMs = Number(await this.clientWrapper.client.query.Timestamp.Now.getValue());
@@ -1199,6 +1222,8 @@ var DotNS = class {
         console.log(`   Awaiting finalization (chain time +${Math.floor(chainElapsed)}s / ${MAX_CHAIN_WAIT_SECONDS}s)...`);
         await new Promise((r) => setTimeout(r, POLL_INTERVAL_MS));
       }
+      if (onChain !== expected) txResolution = "timeout";
+      setDeployAttribute("deploy.dotns.tx_resolution", txResolution);
       if (onChain !== expected) {
         throw new Error(
           `Post-deploy verification failed for ${domainName}.dot: on-chain contenthash is ${onChain}, not the ${expected} we just wrote. The setContenthash tx may have silently failed, or another party overwrote the domain. Re-run the deploy to retry.`
@@ -1300,16 +1325,19 @@ var DotNS = class {
     const POLL_INTERVAL_MS = 3e3;
     console.log(`
    Reading minimum commitment age...`);
-    const [minimumAge, initialCommitTimestamp] = await Promise.all([
+    const [minimumAge, maximumAge, initialCommitTimestamp] = await Promise.all([
       withTimeout(this.contractCall(this._contracts.DOTNS_REGISTRAR_CONTROLLER, DOTNS_REGISTRAR_CONTROLLER_ABI, "minCommitmentAge", []), 3e4, "minCommitmentAge"),
+      withTimeout(this.contractCall(this._contracts.DOTNS_REGISTRAR_CONTROLLER, DOTNS_REGISTRAR_CONTROLLER_ABI, "maxCommitmentAge", []), 3e4, "maxCommitmentAge"),
       withTimeout(this.contractCall(this._contracts.DOTNS_REGISTRAR_CONTROLLER, DOTNS_REGISTRAR_CONTROLLER_ABI, "commitments", [commitment]), 3e4, "commitments")
     ]);
     const minimumAgeSeconds = typeof minimumAge === "bigint" ? Number(minimumAge) : minimumAge;
+    const maximumAgeSeconds = typeof maximumAge === "bigint" ? Number(maximumAge) : maximumAge ?? 86400;
     const commitTimestamp = typeof initialCommitTimestamp === "bigint" ? Number(initialCommitTimestamp) : initialCommitTimestamp;
     if (commitTimestamp === 0) {
       throw new Error("Commitment not found on-chain. It may not have been included in a block yet.");
     }
-    console.log(`   Minimum commitment age: ${minimumAgeSeconds}s`);
+    console.log(`   Minimum commitment age: ${minimumAgeSeconds}s, maximum: ${maximumAgeSeconds}s`);
+    console.log(`   Commitment valid window: ${commitTimestamp + minimumAgeSeconds} \u2013 ${commitTimestamp + maximumAgeSeconds}`);
     console.log(`   Commitment stored on-chain (timestamp: ${commitTimestamp})`);
     console.log(`   Waiting for on-chain block.timestamp > ${commitTimestamp + minimumAgeSeconds}...`);
     const pollDeadline = Date.now() + POLL_TIMEOUT_MS;
@@ -1318,6 +1346,17 @@ var DotNS = class {
       const chainNowSeconds = Math.floor(Number(nowMs) / 1e3);
       if (isCommitmentMature(chainNowSeconds, commitTimestamp, minimumAgeSeconds)) {
         console.log(`   Commitment age requirement met (chain.now=${chainNowSeconds}, target>${commitTimestamp + minimumAgeSeconds})`);
+        console.log(`   Buffering ${POLL_INTERVAL_MS / 1e3}s for block propagation (guard against node lag after maturity)...`);
+        await new Promise((resolve) => setTimeout(resolve, POLL_INTERVAL_MS));
+        const nowAfterBuffer = Math.floor(Number(await this.clientWrapper.client.query.Timestamp.Now.getValue()) / 1e3);
+        const expiresAt = commitTimestamp + maximumAgeSeconds;
+        const remainingSecs = expiresAt - nowAfterBuffer;
+        if (remainingSecs <= 0) {
+          throw new Error(`Commitment has expired (chain.now=${nowAfterBuffer}, expired at=${expiresAt}). A fresh commit cycle is needed.`);
+        }
+        if (remainingSecs < 30) {
+          console.log(`   Warning: commitment expires in ${remainingSecs}s \u2014 proceeding immediately.`);
+        }
         return;
       }
       const remaining = Math.ceil((pollDeadline - Date.now()) / 1e3);
@@ -1645,13 +1684,13 @@ var DotNS = class {
   // canProceed:true result with an actionable canProceed:false when even the
   // top-up can't get the signer above the threshold.
   async gateOnFeeBalance(candidate, signerFreeBalance, isTestnet) {
-    const feeFloor = feeFloorFor(candidate.plannedAction);
+    const feeFloor = feeFloorFor(candidate.plannedAction, this._registerStorageDeposit);
     let effectiveBalance = signerFreeBalance;
     let toppedUp;
     if (effectiveBalance < feeFloor && isTestnet) {
       setDeployAttribute("deploy.dotns.signer_below_floor", "true");
       console.log(`   DotNS signer ${this.substrateAddress?.slice(0, 8)}... balance ${fmtPas(effectiveBalance)} PAS < ${fmtPas(feeFloor)} PAS floor \u2014 attempting testnet auto top-up...`);
-      const result = await this.attemptTestnetTopUp(this.substrateAddress, TOP_UP_TARGET);
+      const result = await this.attemptTestnetTopUp(this.substrateAddress, topUpTargetFor(candidate.plannedAction, this._registerStorageDeposit));
       if (result) {
         console.log(`   Topped up ${fmtPas(result.transferred)} PAS from ${result.source}`);
         effectiveBalance += result.transferred;
@@ -1728,11 +1767,24 @@ var DotNS = class {
       if (!canRegister(requiredStatus, userStatus, trailingDigitCount)) {
         rejectIneligible(requiredStatus, userStatus);
       }
-      const { commitment, registration } = await this.generateCommitment(label, reverse);
-      await withSpan("deploy.dotns.submit-commitment", "2a-i. submit-commitment", {}, () => this.submitCommitment(commitment));
-      await withSpan("deploy.dotns.wait-commitment-age", "2a-ii. wait-commitment-age", {}, () => this.waitForCommitmentAge(commitment));
-      const pricing = await withSpan("deploy.dotns.price-validation", "2a-iii. price-validation", {}, () => this.getPriceAndValidate(label));
-      await withSpan("deploy.dotns.finalize-registration", "2a-iv. finalize-registration", {}, () => this.finalizeRegistration(registration, pricing.priceWei));
+      const doCommitAndRegister = async () => {
+        const { commitment, registration } = await this.generateCommitment(label, reverse);
+        await withSpan("deploy.dotns.submit-commitment", "2a-i. submit-commitment", {}, () => this.submitCommitment(commitment));
+        await withSpan("deploy.dotns.wait-commitment-age", "2a-ii. wait-commitment-age", {}, () => this.waitForCommitmentAge(commitment));
+        const pricing = await withSpan("deploy.dotns.price-validation", "2a-iii. price-validation", {}, () => this.getPriceAndValidate(label));
+        await withSpan("deploy.dotns.finalize-registration", "2a-iv. finalize-registration", {}, () => this.finalizeRegistration(registration, pricing.priceWei));
+      };
+      try {
+        await doCommitAndRegister();
+      } catch (err) {
+        const msg = err.message ?? "";
+        if (!isCommitmentTimingBarerevert(msg)) throw err;
+        console.log(`
+   Register bare-reverted (commitment timing race \u2014 node saw a block where commitment was too new or expired).`);
+        console.log(`   Retrying with a fresh commitment. This usually resolves in one block.
+`);
+        await doCommitAndRegister();
+      }
       await this.verifyOwnership(label);
       console.log(`
    Registration complete!`);
@@ -1810,6 +1862,7 @@ var DotNS = class {
 var dotns = new DotNS();
 
 export {
+  MINIMUM_REGISTER_STORAGE_DEPOSIT,
   fmtPas,
   feeFloorFor,
   RPC_ENDPOINTS,
@@ -1838,9 +1891,9 @@ export {
   sanitizeDomainLabel,
   validateDomainLabel,
   isCommitmentMature,
+  isCommitmentTimingBarerevert,
   classifyDotnsLabel,
   canRegister,
-  simulateUserStatus,
   parseDomainName,
   parseProofOfPersonhoodStatus,
   popStatusName,