bulletin-deploy 0.7.11-rc.2 → 0.7.12

package/dist/bug-report.js

@@ -9,10 +9,10 @@ import {
   offerBugReport,
   scrubSecrets,
   setDeployContext
-} from "./chunk-NEVV3FCX.js";
-import "./chunk-O56TCT3R.js";
-import "./chunk-X7VEHFJA.js";
-import "./chunk-JS54GLCG.js";
+} from "./chunk-N2OZLFJA.js";
+import "./chunk-RVCY2VEY.js";
+import "./chunk-LOZ5PSD3.js";
+import "./chunk-VQJLGE5J.js";
 import "./chunk-QGM4M3NI.js";
 export {
   buildCliFlagsSummary,

package/dist/{chunk-P7IBAWMN.js → chunk-7WKHLBZA.js}

@@ -2,10 +2,10 @@ import {
   captureWarning,
   setDeployAttribute,
   withSpan
-} from "./chunk-X7VEHFJA.js";
+} from "./chunk-LOZ5PSD3.js";
 import {
   isTestnetSpecName
-} from "./chunk-RP4YJYNB.js";
+} from "./chunk-VOEFHED3.js";
 
 // src/dotns.ts
 import { spawn } from "child_process";

package/dist/{chunk-X7VEHFJA.js → chunk-LOZ5PSD3.js}

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

package/dist/{chunk-NEVV3FCX.js → chunk-N2OZLFJA.js}

@@ -2,11 +2,11 @@ import {
   classifyErrorArea,
   isInteractive,
   promptYesNo
-} from "./chunk-O56TCT3R.js";
+} from "./chunk-RVCY2VEY.js";
 import {
   VERSION,
   getCurrentSentryTraceId
-} from "./chunk-X7VEHFJA.js";
+} from "./chunk-LOZ5PSD3.js";
 
 // src/bug-report.ts
 import { execSync, execFileSync } from "child_process";

package/dist/{chunk-O56TCT3R.js → chunk-RVCY2VEY.js}

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

package/dist/{chunk-RP4YJYNB.js → chunk-VOEFHED3.js}

@@ -14,9 +14,8 @@ function formatPasBalance(plancks) {
 var DEPLOY_PATH_PREFIX = "//deploy";
 var TOPUP_TRANSACTIONS = 1e3;
 var TOPUP_BYTES = 100000000n;
-var TOPUP_THRESHOLD_TXS = 50n;
-var TOPUP_THRESHOLD_BYTES = 50000000n;
 var WS_HEARTBEAT_TIMEOUT_MS = 3e5;
+var AUTHORIZATION_EXTENSION_BLOCKS = 2e6;
 function derivePoolAccounts(poolSize = 10, mnemonic = DEV_PHRASE) {
   const entropy = mnemonicToEntropy(mnemonic);
   const miniSecret = entropyToMiniSecret(entropy);
@@ -34,9 +33,12 @@ function derivePoolAccounts(poolSize = 10, mnemonic = DEV_PHRASE) {
 }
 var MIN_TRANSACTIONS = 30n;
 var MIN_BYTES = 20000000n;
-function selectAccount(authorizations, random = Math.random) {
+function isAuthorizationActive(auth, currentBlock) {
+  return auth !== void 0 && Number(auth.expiration ?? 0) > currentBlock;
+}
+function selectAccount(authorizations, random = Math.random, currentBlock) {
   const eligible = authorizations.filter(
-    (a) => a.transactions > MIN_TRANSACTIONS && a.bytes > MIN_BYTES
+    (a) => a.transactions > MIN_TRANSACTIONS && a.bytes > MIN_BYTES && (currentBlock === void 0 || a.expiration > currentBlock)
   );
   if (eligible.length === 0) return null;
   return eligible[Math.floor(random() * eligible.length)];
@@ -50,11 +52,12 @@ async function fetchPoolAuthorizations(api, accounts) {
         );
         return {
           ...account,
-          transactions: auth ? BigInt(auth.extent.transactions) : 0n,
-          bytes: auth ? auth.extent.bytes : 0n
+          transactions: auth ? BigInt(auth.extent.transactions_allowance) - BigInt(auth.extent.transactions) : 0n,
+          bytes: auth ? BigInt(auth.extent.bytes_allowance) - BigInt(auth.extent.bytes) : 0n,
+          expiration: auth ? Number(auth.expiration) : 0
         };
       } catch {
-        return { ...account, transactions: 0n, bytes: 0n };
+        return { ...account, transactions: 0n, bytes: 0n, expiration: 0 };
       }
     })
   );
@@ -131,61 +134,50 @@ function aliceKeyring() {
   const signer = getPolkadotSigner(alice.publicKey, "Sr25519", (data) => alice.sign(data));
   return { alice, signer };
 }
-var U32_MAX = 0xFFFFFFFFn;
-function clampU32(n, name) {
-  if (n < 0n) throw new Error(`${name} must be non-negative`);
-  if (n > U32_MAX) throw new Error(`${name} (${n}) exceeds u32 max \u2014 split the deploy into smaller batches`);
-  return Number(n);
-}
-async function ensureAuthorized(api, address, label, minimum = { txs: TOPUP_THRESHOLD_TXS, bytes: TOPUP_THRESHOLD_BYTES }) {
-  const auth = await api.query.TransactionStorage.Authorizations.getValue(
-    Enum("Account", address)
-  );
-  const txsRemaining = auth ? BigInt(auth.extent.transactions) : 0n;
-  const bytesRemaining = auth ? auth.extent.bytes : 0n;
-  if (txsRemaining >= minimum.txs && bytesRemaining >= minimum.bytes) {
-    return;
-  }
+async function ensureAuthorized(api, address, label) {
+  const [auth, currentBlock] = await Promise.all([
+    api.query.TransactionStorage.Authorizations.getValue(Enum("Account", address)),
+    api.query.System.Number.getValue()
+  ]);
+  if (isAuthorizationActive(auth, currentBlock)) return;
   console.log(`   Auto-authorizing ${label ?? "account"} (${address.slice(0, 8)}...)...`);
   const { signer } = aliceKeyring();
+  const newExpiration = currentBlock + AUTHORIZATION_EXTENSION_BLOCKS;
   await submitAliceTxWithRetry(
     () => api.tx.TransactionStorage.authorize_account({
       who: address,
-      transactions: TOPUP_TRANSACTIONS,
-      bytes: TOPUP_BYTES
+      expiration: newExpiration
     }),
     signer,
     `authorize_account(${label ?? "account"})`
   );
-  console.log(`   Authorized: ${TOPUP_TRANSACTIONS} txs, ${TOPUP_BYTES / 1000000n}MB`);
+  console.log(`   Authorized: expires at block ${newExpiration} (current: ${currentBlock})`);
 }
 async function topUpBy(api, address, needs, label) {
-  const currentAuth = await api.query.TransactionStorage.Authorizations.getValue(
-    Enum("Account", address)
-  );
-  const current = {
-    transactions: currentAuth ? BigInt(currentAuth.extent.transactions) : 0n,
-    bytes: currentAuth ? currentAuth.extent.bytes : 0n
-  };
-  const fmtMB = (b) => (Number(b) / 1e6).toFixed(1);
-  const target = computeTopUpTarget(current, needs);
-  if (!target) {
-    console.log(`   Pre-auth skipped for ${label ?? "account"} (${address.slice(0, 8)}...): current ${current.transactions} txs / ${fmtMB(current.bytes)}MB covers needs + floor.`);
+  const [currentAuth, currentBlock] = await Promise.all([
+    api.query.TransactionStorage.Authorizations.getValue(Enum("Account", address)),
+    api.query.System.Number.getValue()
+  ]);
+  if (isAuthorizationActive(currentAuth, currentBlock)) {
+    const fmtMB = (b) => (Number(b) / 1e6).toFixed(1);
+    const txsRemaining = BigInt(currentAuth.extent.transactions_allowance) - BigInt(currentAuth.extent.transactions);
+    const bytesRemaining = BigInt(currentAuth.extent.bytes_allowance) - BigInt(currentAuth.extent.bytes);
+    const expiration = Number(currentAuth.expiration);
+    console.log(`   Pre-auth skipped for ${label ?? "account"} (${address.slice(0, 8)}...): authorized until block ${expiration}, ${txsRemaining} txs / ${fmtMB(bytesRemaining)}MB remaining.`);
     return;
   }
-  const transactions = clampU32(target.transactions, "topUpBy.txs");
+  const newExpiration = currentBlock + AUTHORIZATION_EXTENSION_BLOCKS;
   const { signer } = aliceKeyring();
-  console.log(`   Pre-authorizing ${label ?? "account"} (${address.slice(0, 8)}...): current ${current.transactions} txs / ${fmtMB(current.bytes)}MB \u2192 target ${target.transactions} txs / ${fmtMB(target.bytes)}MB...`);
+  console.log(`   Pre-authorizing ${label ?? "account"} (${address.slice(0, 8)}...): extending authorization to block ${newExpiration}...`);
   await submitAliceTxWithRetry(
     () => api.tx.TransactionStorage.authorize_account({
       who: address,
-      transactions,
-      bytes: target.bytes
+      expiration: newExpiration
     }),
     signer,
     `topUpBy(${label ?? "account"})`
   );
-  console.log(`   Pre-authorized: target ${transactions} txs / ${fmtMB(target.bytes)}MB`);
+  console.log(`   Pre-authorized: expires at block ${newExpiration}`);
 }
 async function bootstrapPool(bulletinRpc, poolSize = 10, mnemonic) {
   console.log(`Bootstrapping ${poolSize} pool accounts on ${bulletinRpc}...
@@ -203,18 +195,21 @@ async function bootstrapPool(bulletinRpc, poolSize = 10, mnemonic) {
   const aliceAccount = await api.query.System.Account.getValue(alice.address);
   const aliceBalance = BigInt(aliceAccount.data.free);
   console.log(`Alice balance: ${formatPasBalance(aliceBalance)} PAS
+`);
+  const currentBlock = await api.query.System.Number.getValue();
+  const authExpiration = currentBlock + AUTHORIZATION_EXTENSION_BLOCKS;
+  console.log(`Authorizing accounts until block ${authExpiration} (current: ${currentBlock})
 `);
   for (const account of accounts) {
     console.log(`Account ${account.index}: ${account.address}`);
     try {
       const tx = api.tx.TransactionStorage.authorize_account({
         who: account.address,
-        transactions: TOPUP_TRANSACTIONS,
-        bytes: TOPUP_BYTES
+        expiration: authExpiration
       });
       const result = await tx.signAndSubmit(aliceSigner);
       if (!result.ok) throw new Error("dispatch failed");
-      console.log(`  Authorized: ${TOPUP_TRANSACTIONS} txs, ${Number(TOPUP_BYTES) / 1e6}MB`);
+      console.log(`  Authorized: expires at block ${authExpiration}`);
     } catch (e) {
       console.log(`  Authorization failed: ${e.message?.slice(0, 80)}`);
     }

package/dist/{chunk-JS54GLCG.js → chunk-VQJLGE5J.js}

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

package/dist/{chunk-5CLZQA7J.js → chunk-WK2GKDMX.js}

@@ -1,6 +1,6 @@
 import {
   setDeployContext
-} from "./chunk-NEVV3FCX.js";
+} from "./chunk-N2OZLFJA.js";
 import {
   DotNS,
   TX_TIMEOUT_MS,
@@ -8,7 +8,7 @@ import {
   parseDomainName,
   popStatusName,
   verifyNonceAdvanced
-} from "./chunk-P7IBAWMN.js";
+} from "./chunk-7WKHLBZA.js";
 import {
   MirrorSkipped,
   mirrorToGitHubPages,
@@ -27,7 +27,7 @@ import {
   truncateAddress,
   withDeploySpan,
   withSpan
-} from "./chunk-X7VEHFJA.js";
+} from "./chunk-LOZ5PSD3.js";
 import {
   merkleizeJS
 } from "./chunk-B7GUYYAN.js";
@@ -38,7 +38,7 @@ import {
   fetchPoolAuthorizations,
   selectAccount,
   topUpBy
-} from "./chunk-RP4YJYNB.js";
+} from "./chunk-VOEFHED3.js";
 
 // src/deploy.ts
 import { Buffer } from "buffer";
@@ -170,8 +170,11 @@ async function getProvider() {
     await cryptoWaitReady();
     const poolMnemonic = process.env.BULLETIN_POOL_MNEMONIC || void 0;
     const poolAccounts = derivePoolAccounts(POOL_SIZE, poolMnemonic);
-    const authorizations = await fetchPoolAuthorizations(unsafeApi, poolAccounts);
-    let selected = selectAccount(authorizations);
+    const [authorizations, currentBlockForPool] = await Promise.all([
+      fetchPoolAuthorizations(unsafeApi, poolAccounts),
+      unsafeApi.query.System.Number.getValue()
+    ]);
+    let selected = selectAccount(authorizations, Math.random, currentBlockForPool);
     if (!selected) {
       const best = authorizations.reduce((a, b) => a.transactions > b.transactions ? a : b);
       console.log(`   All pool accounts low on capacity, auto-authorizing account ${best.index}...`);
@@ -200,16 +203,16 @@ async function getDirectProvider(mnemonic, derivationPath = "") {
   const unsafeApi = client.getUnsafeApi();
   const { signer, ss58 } = deriveRootSigner(mnemonic, derivationPath);
   console.log(`   Using direct signer: ${ss58}${derivationPath ? ` (path: ${derivationPath})` : ""}`);
-  const auth = await unsafeApi.query.TransactionStorage.Authorizations.getValue(
-    Enum("Account", ss58)
-  );
-  const txsRemaining = auth ? BigInt(auth.extent.transactions) : 0n;
-  const bytesRemaining = auth ? auth.extent.bytes : 0n;
-  if (txsRemaining === 0n && bytesRemaining === 0n) {
+  const [auth, currentBlock] = await Promise.all([
+    unsafeApi.query.TransactionStorage.Authorizations.getValue(Enum("Account", ss58)),
+    client.getFinalizedBlock()
+  ]);
+  const now = currentBlock.number;
+  if (!auth || Number(auth.expiration ?? 0) <= now) {
     client.destroy();
     throw new NonRetryableError(`Account ${ss58} is not authorized for Bulletin storage.`);
   }
-  console.log(`   Authorization: ${txsRemaining} txs, ${Number(bytesRemaining) / 1e6}MB remaining`);
+  console.log(`   Authorization: expires at block ${Number(auth.expiration)} (current: ${now})`);
   setDeployAttribute("deploy.signer.mode", "direct");
   setDeployAttribute("deploy.signer.address", truncateAddress(ss58));
   return { client, unsafeApi, signer, ss58 };
@@ -341,20 +344,22 @@ async function storeChunkedContent(chunks, { client: existingClient, unsafeApi:
   }
   const requiredTxs = BigInt(chunks.length + 1);
   const requiredBytes = BigInt(totalBytes);
-  const auth = await unsafeApi.query.TransactionStorage.Authorizations.getValue(
-    Enum("Account", ss58)
-  );
-  const txsRemaining = auth ? BigInt(auth.extent.transactions) : 0n;
-  const bytesRemaining = auth ? auth.extent.bytes : 0n;
-  if (txsRemaining < requiredTxs || bytesRemaining < requiredBytes) {
+  const [uploadAuth, currentBlockNum] = await Promise.all([
+    unsafeApi.query.TransactionStorage.Authorizations.getValue(Enum("Account", ss58)),
+    unsafeApi.query.System.Number.getValue()
+  ]);
+  const txsRemaining = uploadAuth ? BigInt(uploadAuth.extent.transactions_allowance) - BigInt(uploadAuth.extent.transactions) : 0n;
+  const bytesRemaining = uploadAuth ? BigInt(uploadAuth.extent.bytes_allowance) - BigInt(uploadAuth.extent.bytes) : 0n;
+  const isAuthorized = uploadAuth !== void 0 && Number(uploadAuth.expiration ?? 0) > currentBlockNum;
+  if (!isAuthorized || txsRemaining < requiredTxs || bytesRemaining < requiredBytes) {
     console.log(`
-   Account has insufficient authorization for this upload (need ${requiredTxs} txs / ${(totalBytes / 1e6).toFixed(1)}MB, have ${txsRemaining} txs / ${Number(bytesRemaining) / 1e6}MB)`);
+   Account needs re-authorization (authorized=${isAuthorized}, need ${requiredTxs} txs / ${(totalBytes / 1e6).toFixed(1)}MB, have ${txsRemaining} txs / ${Number(bytesRemaining) / 1e6}MB)`);
     console.log(`   Attempting to re-authorize with Alice...`);
     try {
-      await ensureAuthorized(unsafeApi, ss58, void 0, { txs: requiredTxs, bytes: requiredBytes });
+      await ensureAuthorized(unsafeApi, ss58);
       console.log(`   Re-authorization successful`);
     } catch (e) {
-      throw new NonRetryableError(`Account ${ss58} has insufficient Bulletin authorization quota and auto-authorization via Alice failed (${e.message}). Authorize the account on-chain.`);
+      throw new NonRetryableError(`Account ${ss58} has insufficient Bulletin authorization and auto-authorization via Alice failed (${e.message}). Authorize the account on-chain.`);
     }
   }
   let reconnectionsUsed = 0;

package/dist/deploy.js

@@ -26,15 +26,15 @@ import {
   storeChunkedContent,
   storeDirectory,
   storeFile
-} from "./chunk-5CLZQA7J.js";
-import "./chunk-NEVV3FCX.js";
-import "./chunk-O56TCT3R.js";
-import "./chunk-P7IBAWMN.js";
+} from "./chunk-WK2GKDMX.js";
+import "./chunk-N2OZLFJA.js";
+import "./chunk-RVCY2VEY.js";
+import "./chunk-7WKHLBZA.js";
 import "./chunk-HOTQDYHD.js";
-import "./chunk-X7VEHFJA.js";
-import "./chunk-JS54GLCG.js";
+import "./chunk-LOZ5PSD3.js";
+import "./chunk-VQJLGE5J.js";
 import "./chunk-B7GUYYAN.js";
-import "./chunk-RP4YJYNB.js";
+import "./chunk-VOEFHED3.js";
 import "./chunk-QGM4M3NI.js";
 export {
   CHUNK_MORTALITY_PERIOD,

package/dist/dotns.js

@@ -35,10 +35,10 @@ import {
   stripTrailingDigits,
   validateDomainLabel,
   verifyNonceAdvanced
-} from "./chunk-P7IBAWMN.js";
-import "./chunk-X7VEHFJA.js";
-import "./chunk-JS54GLCG.js";
-import "./chunk-RP4YJYNB.js";
+} from "./chunk-7WKHLBZA.js";
+import "./chunk-LOZ5PSD3.js";
+import "./chunk-VQJLGE5J.js";
+import "./chunk-VOEFHED3.js";
 import "./chunk-QGM4M3NI.js";
 export {
   CONNECTION_TIMEOUT_MS,

package/dist/index.js

@@ -1,14 +1,14 @@
 import {
   deploy
-} from "./chunk-5CLZQA7J.js";
-import "./chunk-NEVV3FCX.js";
-import "./chunk-O56TCT3R.js";
+} from "./chunk-WK2GKDMX.js";
+import "./chunk-N2OZLFJA.js";
+import "./chunk-RVCY2VEY.js";
 import {
   DotNS,
   parseDomainName
-} from "./chunk-P7IBAWMN.js";
+} from "./chunk-7WKHLBZA.js";
 import "./chunk-HOTQDYHD.js";
-import "./chunk-X7VEHFJA.js";
+import "./chunk-LOZ5PSD3.js";
 import {
   VERSION,
   loadRunState,
@@ -18,7 +18,7 @@ import {
   shouldSkipStaleWarning,
   stateFilePath,
   writeRunState
-} from "./chunk-JS54GLCG.js";
+} from "./chunk-VQJLGE5J.js";
 import {
   merkleizeJS
 } from "./chunk-B7GUYYAN.js";
@@ -28,7 +28,7 @@ import {
   ensureAuthorized,
   fetchPoolAuthorizations,
   selectAccount
-} from "./chunk-RP4YJYNB.js";
+} from "./chunk-VOEFHED3.js";
 import "./chunk-QGM4M3NI.js";
 export {
   DotNS,

package/dist/memory-report.js

@@ -5,8 +5,8 @@ import {
   maybeWriteMemoryReport,
   safeHeap,
   sampleFromBytes
-} from "./chunk-X7VEHFJA.js";
-import "./chunk-JS54GLCG.js";
+} from "./chunk-LOZ5PSD3.js";
+import "./chunk-VQJLGE5J.js";
 import "./chunk-QGM4M3NI.js";
 export {
   DEFAULT_THRESHOLD_MB,

package/dist/pool.d.ts

@@ -11,9 +11,10 @@ interface PoolAccount {
 interface PoolAuthorization extends PoolAccount {
     transactions: bigint;
     bytes: bigint;
+    expiration: number;
 }
 declare function derivePoolAccounts(poolSize?: number, mnemonic?: string): PoolAccount[];
-declare function selectAccount(authorizations: PoolAuthorization[], random?: () => number): PoolAuthorization | null;
+declare function selectAccount(authorizations: PoolAuthorization[], random?: () => number, currentBlock?: number): PoolAuthorization | null;
 declare function fetchPoolAuthorizations(api: any, accounts: PoolAccount[]): Promise<PoolAuthorization[]>;
 interface AuthorizationNeeds {
     txs: bigint;
@@ -31,7 +32,7 @@ declare function classifyAliceTxError(err: unknown): TxRetryDecision;
 declare function isTestnetSpecName(specName: string | undefined | null): boolean;
 declare function detectTestnet(api: any): Promise<boolean>;
 declare function _resetTestnetCacheForTests(): void;
-declare function ensureAuthorized(api: any, address: string, label?: string, minimum?: AuthorizationNeeds): Promise<void>;
+declare function ensureAuthorized(api: any, address: string, label?: string): Promise<void>;
 declare function topUpBy(api: any, address: string, needs: AuthorizationNeeds, label?: string): Promise<void>;
 declare function bootstrapPool(bulletinRpc: string, poolSize?: number, mnemonic?: string): Promise<void>;
 

package/dist/pool.js

@@ -11,7 +11,7 @@ import {
   isTestnetSpecName,
   selectAccount,
   topUpBy
-} from "./chunk-RP4YJYNB.js";
+} from "./chunk-VOEFHED3.js";
 import "./chunk-QGM4M3NI.js";
 export {
   _resetTestnetCacheForTests,

package/dist/run-state.js

@@ -7,7 +7,7 @@ import {
   shouldSkipStaleWarning,
   stateFilePath,
   writeRunState
-} from "./chunk-JS54GLCG.js";
+} from "./chunk-VQJLGE5J.js";
 import "./chunk-QGM4M3NI.js";
 export {
   VERSION,

package/dist/telemetry.js

@@ -27,8 +27,8 @@ import {
   truncateAddress,
   withDeploySpan,
   withSpan
-} from "./chunk-X7VEHFJA.js";
-import "./chunk-JS54GLCG.js";
+} from "./chunk-LOZ5PSD3.js";
+import "./chunk-VQJLGE5J.js";
 import "./chunk-QGM4M3NI.js";
 export {
   VERSION,

package/dist/version-check.js

@@ -8,9 +8,9 @@ import {
   isPreReleaseVersion,
   preReleaseWarning,
   promptYesNo
-} from "./chunk-O56TCT3R.js";
-import "./chunk-X7VEHFJA.js";
-import "./chunk-JS54GLCG.js";
+} from "./chunk-RVCY2VEY.js";
+import "./chunk-LOZ5PSD3.js";
+import "./chunk-VQJLGE5J.js";
 import "./chunk-QGM4M3NI.js";
 export {
   assessVersion,

package/package.json

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