bulletin-deploy 0.7.26-rc.2 → 0.7.26-rc.4

package/dist/bug-report.js

@@ -9,10 +9,10 @@ import {
   offerBugReport,
   scrubSecrets,
   setDeployContext
-} from "./chunk-7NRU7N5A.js";
-import "./chunk-3Z6VK7XP.js";
-import "./chunk-IJOPI6JC.js";
-import "./chunk-77OAX2MH.js";
+} from "./chunk-AWULVGHI.js";
+import "./chunk-DLSRMJGO.js";
+import "./chunk-TQOWUM4X.js";
+import "./chunk-JHCSIZFE.js";
 export {
   buildCliFlagsSummary,
   buildLabels,

package/dist/{chunk-7NRU7N5A.js → chunk-AWULVGHI.js}

@@ -2,11 +2,11 @@ import {
   classifyErrorArea,
   isInteractive,
   promptYesNo
-} from "./chunk-3Z6VK7XP.js";
+} from "./chunk-DLSRMJGO.js";
 import {
   VERSION,
   getCurrentSentryTraceId
-} from "./chunk-IJOPI6JC.js";
+} from "./chunk-TQOWUM4X.js";
 
 // src/bug-report.ts
 import { execSync, execFileSync } from "child_process";

package/dist/{chunk-3Z6VK7XP.js → chunk-DLSRMJGO.js}

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

package/dist/{chunk-OHAO2BPD.js → chunk-GY4T5MYF.js}

@@ -20,10 +20,10 @@ import {
 } from "./chunk-S7EM5VMW.js";
 import {
   setDeployContext
-} from "./chunk-7NRU7N5A.js";
+} from "./chunk-AWULVGHI.js";
 import {
   probeChunks
-} from "./chunk-SEMZRS7Q.js";
+} from "./chunk-WOKJ47IC.js";
 import {
   packSection
 } from "./chunk-C2TS5MER.js";
@@ -34,7 +34,7 @@ import {
   parseDomainName,
   popStatusName,
   verifyNonceAdvanced
-} from "./chunk-4LB5PXBL.js";
+} from "./chunk-WQ7FBUNK.js";
 import {
   derivePoolAccounts,
   detectTestnet,
@@ -56,7 +56,7 @@ import {
   truncateAddress,
   withDeploySpan,
   withSpan
-} from "./chunk-IJOPI6JC.js";
+} from "./chunk-TQOWUM4X.js";
 import {
   DEFAULT_ENV_ID,
   getPopSelfServeConfig,
@@ -143,7 +143,8 @@ var RETRY_MAX_DELAY_MS = 15e3;
 var WS_HEARTBEAT_TIMEOUT_MS = 3e5;
 var GRANDPA_NATURAL_WAIT_MS = parseInt(process.env.BULLETIN_GRANDPA_NATURAL_WAIT_MS ?? "90000", 10);
 var GRANDPA_REUPLOAD_POLL_MS = 5e3;
-var GRANDPA_REUPLOAD_TIMEOUT_MS = 6e4;
+var GRANDPA_REUPLOAD_TIMEOUT_MS = 12e4;
+var GRANDPA_REUPLOAD_MAX_ROUNDS = 3;
 var RETRY_BUDGET_MAX_EVENTS = parseInt(process.env.BULLETIN_RETRY_BUDGET_MAX ?? "5", 10);
 var RETRY_BUDGET_WINDOW_MS = parseInt(process.env.BULLETIN_RETRY_BUDGET_WINDOW_MS ?? "30000", 10);
 function retryBudgetExhausted(history, maxEvents, windowMs, now = Date.now()) {
@@ -1279,53 +1280,56 @@ async function storeDirectoryV2(directoryPath, opts = {}) {
         const rootFileData = new UnixFS({ type: "file", blockSizes: rootChunkLinks.map((c) => BigInt(c.len)) });
         const rootDagNode = dagPB.prepare({ Data: rootFileData.marshal(), Links: rootChunkLinks.map((c) => ({ Name: "", Tsize: c.len, Hash: c.cid })) });
         const rootDagBytes = dagPB.encode(rootDagNode);
-        console.log(`   ${missingCids.size} chunks still missing after wait \u2014 re-uploading`);
         const phaseBChunkByCid = /* @__PURE__ */ new Map();
         for (let i = 0; i < phaseB.chunkCids.length; i++) {
           phaseBChunkByCid.set(phaseB.chunkCids[i], phaseB.chunks[i]);
         }
         const fetchNonceFn = phaseALiveProvider.fetchNonce ?? fetchNonce;
-        const reuploadList = [...missingCids];
-        for (let i = 0; i < reuploadList.length; i++) {
-          const cid = reuploadList[i];
-          const freshNonce = await fetchNonceFn(BULLETIN_ENDPOINTS, phaseALiveProvider.ss58);
-          if (cid === storageCid) {
-            const rootTx = phaseALiveProvider.unsafeApi.tx.TransactionStorage.store_with_cid_config({
-              cid: { codec: BigInt(112), hashing: toHashingEnum(rootHashCode) },
-              data: rootDagBytes
-            });
-            await watchTransaction(rootTx, phaseALiveProvider.signer, { mortality: { mortal: true, period: 256 }, nonce: freshNonce }, () => storageCid, {
-              label: "root-reupload",
-              rpc: BULLETIN_ENDPOINTS,
-              senderSS58: phaseALiveProvider.ss58,
-              expectedNonce: freshNonce,
-              timeoutMs: CHUNK_TIMEOUT_MS,
-              fetchNonce: phaseALiveProvider.fetchNonce
-            });
-          } else {
-            const chunkBytes = phaseBChunkByCid.get(cid);
-            if (!chunkBytes) {
-              throw new Error(
-                `Deploy verification failed: chunk ${cid.slice(0, 20)}\u2026 missing at finalised head and its bytes are not in phaseB.chunks (cannot re-upload). This indicates an internal state issue.`
-              );
+        for (let round = 1; round <= GRANDPA_REUPLOAD_MAX_ROUNDS && missingCids.size > 0; round++) {
+          const roundSuffix = round > 1 ? ` (round ${round}/${GRANDPA_REUPLOAD_MAX_ROUNDS}, retry after fork)` : "";
+          console.log(`   ${missingCids.size} chunks still missing after wait \u2014 re-uploading${roundSuffix}`);
+          const reuploadList = [...missingCids];
+          for (let i = 0; i < reuploadList.length; i++) {
+            const cid = reuploadList[i];
+            const freshNonce = await fetchNonceFn(BULLETIN_ENDPOINTS, phaseALiveProvider.ss58);
+            if (cid === storageCid) {
+              const rootTx = phaseALiveProvider.unsafeApi.tx.TransactionStorage.store_with_cid_config({
+                cid: { codec: BigInt(112), hashing: toHashingEnum(rootHashCode) },
+                data: rootDagBytes
+              });
+              await watchTransaction(rootTx, phaseALiveProvider.signer, { mortality: { mortal: true, period: 256 }, nonce: freshNonce }, () => storageCid, {
+                label: "root-reupload",
+                rpc: BULLETIN_ENDPOINTS,
+                senderSS58: phaseALiveProvider.ss58,
+                expectedNonce: freshNonce,
+                timeoutMs: CHUNK_TIMEOUT_MS,
+                fetchNonce: phaseALiveProvider.fetchNonce
+              });
+            } else {
+              const chunkBytes = phaseBChunkByCid.get(cid);
+              if (!chunkBytes) {
+                throw new Error(
+                  `Deploy verification failed: chunk ${cid.slice(0, 20)}\u2026 missing at finalised head and its bytes are not in phaseB.chunks (cannot re-upload). This indicates an internal state issue.`
+                );
+              }
+              await storeChunk(phaseALiveProvider.unsafeApi, phaseALiveProvider.signer, chunkBytes, freshNonce, phaseALiveProvider.ss58, { fetchNonce: phaseALiveProvider.fetchNonce });
             }
-            await storeChunk(phaseALiveProvider.unsafeApi, phaseALiveProvider.signer, chunkBytes, freshNonce, phaseALiveProvider.ss58, { fetchNonce: phaseALiveProvider.fetchNonce });
+            reuploadCount++;
+            console.log(`      [${i + 1}/${reuploadList.length}] re-uploaded ${cid.slice(0, 20)}\u2026 (nonce ${freshNonce})`);
           }
-          reuploadCount++;
-          console.log(`      [${i + 1}/${reuploadList.length}] re-uploaded ${cid.slice(0, 20)}\u2026 (nonce ${freshNonce})`);
-        }
-        const reuploadStart = Date.now();
-        while (Date.now() - reuploadStart < GRANDPA_REUPLOAD_TIMEOUT_MS && missingCids.size > 0) {
-          await new Promise((r) => setTimeout(r, GRANDPA_REUPLOAD_POLL_MS));
-          const poll = await probeChunks([...missingCids], { client: phaseALiveProvider.client, atFinalized: true });
-          for (const r of poll) {
-            if (r.present === true) missingCids.delete(r.cid);
+          const reuploadStart = Date.now();
+          while (Date.now() - reuploadStart < GRANDPA_REUPLOAD_TIMEOUT_MS && missingCids.size > 0) {
+            await new Promise((r) => setTimeout(r, GRANDPA_REUPLOAD_POLL_MS));
+            const poll = await probeChunks([...missingCids], { client: phaseALiveProvider.client, atFinalized: true });
+            for (const r of poll) {
+              if (r.present === true) missingCids.delete(r.cid);
+            }
           }
         }
         if (missingCids.size > 0) {
           const stuck = [...missingCids][0];
           throw new Error(
-            `Deploy verification failed: ${missingCids.size} chunk(s) not finalised after re-upload within ${GRANDPA_REUPLOAD_TIMEOUT_MS / 1e3}s (first: ${stuck.slice(0, 20)}\u2026). The chain may have dropped chunks due to a fork. Re-run deploy.`
+            `Deploy verification failed: ${missingCids.size} chunk(s) not finalised after ${GRANDPA_REUPLOAD_MAX_ROUNDS} re-upload round(s) (first: ${stuck.slice(0, 20)}\u2026). The chain may have dropped chunks due to a persistent fork. Re-run deploy.`
           );
         }
         console.log(`   \u2713 All ${grandpaCids.length} chunks finalised after re-upload`);

package/dist/{chunk-77OAX2MH.js → chunk-JHCSIZFE.js}

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

package/dist/{chunk-IJOPI6JC.js → chunk-TQOWUM4X.js}

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

package/dist/{chunk-SEMZRS7Q.js → chunk-WOKJ47IC.js}

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

package/dist/{chunk-4LB5PXBL.js → chunk-WQ7FBUNK.js}

@@ -7,7 +7,7 @@ import {
   setDeploySentryTag,
   truncateAddress,
   withSpan
-} from "./chunk-IJOPI6JC.js";
+} from "./chunk-TQOWUM4X.js";
 import {
   validateContractAddresses
 } from "./chunk-MGU5I7H5.js";

package/dist/chunk-probe.js

@@ -5,9 +5,9 @@ import {
   _decodeStorageValue,
   _resetProbeSession,
   probeChunks
-} from "./chunk-SEMZRS7Q.js";
-import "./chunk-IJOPI6JC.js";
-import "./chunk-77OAX2MH.js";
+} from "./chunk-WOKJ47IC.js";
+import "./chunk-TQOWUM4X.js";
+import "./chunk-JHCSIZFE.js";
 export {
   ChainProbeCrossValidationError,
   ChainProbeMetadataError,

package/dist/deploy.js

@@ -32,19 +32,19 @@ import {
   storeDirectory,
   storeDirectoryV2,
   storeFile
-} from "./chunk-OHAO2BPD.js";
+} from "./chunk-GY4T5MYF.js";
 import "./chunk-KHVTYIIX.js";
 import "./chunk-KOSF5FDO.js";
 import "./chunk-FZWJV5AD.js";
 import "./chunk-S7EM5VMW.js";
-import "./chunk-7NRU7N5A.js";
-import "./chunk-3Z6VK7XP.js";
-import "./chunk-SEMZRS7Q.js";
+import "./chunk-AWULVGHI.js";
+import "./chunk-DLSRMJGO.js";
+import "./chunk-WOKJ47IC.js";
 import "./chunk-C2TS5MER.js";
-import "./chunk-4LB5PXBL.js";
+import "./chunk-WQ7FBUNK.js";
 import "./chunk-QMYW3D6E.js";
-import "./chunk-IJOPI6JC.js";
-import "./chunk-77OAX2MH.js";
+import "./chunk-TQOWUM4X.js";
+import "./chunk-JHCSIZFE.js";
 import "./chunk-MGU5I7H5.js";
 import {
   EXIT_CODE_NO_RETRY,

package/dist/dotns.js

@@ -41,10 +41,10 @@ import {
   stripTrailingDigits,
   validateDomainLabel,
   verifyNonceAdvanced
-} from "./chunk-4LB5PXBL.js";
+} from "./chunk-WQ7FBUNK.js";
 import "./chunk-QMYW3D6E.js";
-import "./chunk-IJOPI6JC.js";
-import "./chunk-77OAX2MH.js";
+import "./chunk-TQOWUM4X.js";
+import "./chunk-JHCSIZFE.js";
 import "./chunk-MGU5I7H5.js";
 import "./chunk-ZOC4GITL.js";
 export {

package/dist/index.js

@@ -2,7 +2,7 @@ import {
   deploy,
   merkleizeJS,
   merkleizeWithStableOrder
-} from "./chunk-OHAO2BPD.js";
+} from "./chunk-GY4T5MYF.js";
 import {
   computeStats,
   renderSummary,
@@ -24,18 +24,18 @@ import {
   isVolatilePath,
   parseManifest
 } from "./chunk-S7EM5VMW.js";
-import "./chunk-7NRU7N5A.js";
-import "./chunk-3Z6VK7XP.js";
+import "./chunk-AWULVGHI.js";
+import "./chunk-DLSRMJGO.js";
 import {
   probeChunks
-} from "./chunk-SEMZRS7Q.js";
+} from "./chunk-WOKJ47IC.js";
 import "./chunk-C2TS5MER.js";
 import {
   DEFAULT_MNEMONIC,
   DotNS,
   parseDomainName,
   sanitizeDomainLabel
-} from "./chunk-4LB5PXBL.js";
+} from "./chunk-WQ7FBUNK.js";
 import {
   bootstrapPool,
   derivePoolAccounts,
@@ -43,7 +43,7 @@ import {
   fetchPoolAuthorizations,
   selectAccount
 } from "./chunk-QMYW3D6E.js";
-import "./chunk-IJOPI6JC.js";
+import "./chunk-TQOWUM4X.js";
 import {
   VERSION,
   loadRunState,
@@ -53,7 +53,7 @@ import {
   shouldSkipStaleWarning,
   stateFilePath,
   writeRunState
-} from "./chunk-77OAX2MH.js";
+} from "./chunk-JHCSIZFE.js";
 import {
   DEFAULT_ENV_ID,
   defaultBundledPath,

package/dist/memory-report.js

@@ -5,8 +5,8 @@ import {
   maybeWriteMemoryReport,
   safeHeap,
   sampleFromBytes
-} from "./chunk-IJOPI6JC.js";
-import "./chunk-77OAX2MH.js";
+} from "./chunk-TQOWUM4X.js";
+import "./chunk-JHCSIZFE.js";
 export {
   DEFAULT_THRESHOLD_MB,
   buildMemoryReport,

package/dist/merkle.js

@@ -6,19 +6,19 @@ import {
   merkleizeKuboBackend,
   merkleizeWithStableOrder,
   rebuildOrderedCarFromBytes
-} from "./chunk-OHAO2BPD.js";
+} from "./chunk-GY4T5MYF.js";
 import "./chunk-KHVTYIIX.js";
 import "./chunk-KOSF5FDO.js";
 import "./chunk-FZWJV5AD.js";
 import "./chunk-S7EM5VMW.js";
-import "./chunk-7NRU7N5A.js";
-import "./chunk-3Z6VK7XP.js";
-import "./chunk-SEMZRS7Q.js";
+import "./chunk-AWULVGHI.js";
+import "./chunk-DLSRMJGO.js";
+import "./chunk-WOKJ47IC.js";
 import "./chunk-C2TS5MER.js";
-import "./chunk-4LB5PXBL.js";
+import "./chunk-WQ7FBUNK.js";
 import "./chunk-QMYW3D6E.js";
-import "./chunk-IJOPI6JC.js";
-import "./chunk-77OAX2MH.js";
+import "./chunk-TQOWUM4X.js";
+import "./chunk-JHCSIZFE.js";
 import "./chunk-MGU5I7H5.js";
 import "./chunk-ZOC4GITL.js";
 import "./chunk-HOTQDYHD.js";

package/dist/personhood/bootstrap.js

@@ -21,10 +21,10 @@ import {
 } from "../chunk-T7EEVWNU.js";
 import {
   WS_HEARTBEAT_TIMEOUT_MS
-} from "../chunk-4LB5PXBL.js";
+} from "../chunk-WQ7FBUNK.js";
 import "../chunk-QMYW3D6E.js";
-import "../chunk-IJOPI6JC.js";
-import "../chunk-77OAX2MH.js";
+import "../chunk-TQOWUM4X.js";
+import "../chunk-JHCSIZFE.js";
 import {
   loadEnvironments
 } from "../chunk-MGU5I7H5.js";

package/dist/personhood/people-client.js

@@ -1,9 +1,9 @@
 import {
   WS_HEARTBEAT_TIMEOUT_MS
-} from "../chunk-4LB5PXBL.js";
+} from "../chunk-WQ7FBUNK.js";
 import "../chunk-QMYW3D6E.js";
-import "../chunk-IJOPI6JC.js";
-import "../chunk-77OAX2MH.js";
+import "../chunk-TQOWUM4X.js";
+import "../chunk-JHCSIZFE.js";
 import {
   loadEnvironments
 } from "../chunk-MGU5I7H5.js";

package/dist/run-state.js

@@ -7,7 +7,7 @@ import {
   shouldSkipStaleWarning,
   stateFilePath,
   writeRunState
-} from "./chunk-77OAX2MH.js";
+} from "./chunk-JHCSIZFE.js";
 export {
   VERSION,
   loadRunState,

package/dist/telemetry.js

@@ -31,8 +31,8 @@ import {
   truncateAddress,
   withDeploySpan,
   withSpan
-} from "./chunk-IJOPI6JC.js";
-import "./chunk-77OAX2MH.js";
+} from "./chunk-TQOWUM4X.js";
+import "./chunk-JHCSIZFE.js";
 export {
   VERSION,
   __setDeployRootSpanForTest,

package/dist/version-check.js

@@ -11,9 +11,9 @@ import {
   isPreReleaseVersion,
   preReleaseWarning,
   promptYesNo
-} from "./chunk-3Z6VK7XP.js";
-import "./chunk-IJOPI6JC.js";
-import "./chunk-77OAX2MH.js";
+} from "./chunk-DLSRMJGO.js";
+import "./chunk-TQOWUM4X.js";
+import "./chunk-JHCSIZFE.js";
 export {
   assessVersion,
   checkNodeVersion,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "bulletin-deploy",
-  "version": "0.7.26-rc.2",
+  "version": "0.7.26-rc.4",
   "private": false,
   "repository": {
     "type": "git",