@black-market/sdk 0.12.0 → 0.14.0

package/dist/lifecycle/planner.js

@@ -3,9 +3,9 @@ import { ABYSS_FEE_TIERS } from "../abyss.js";
 import { assertLaunchTopologyCoverage, getTickAtSqrtRatio } from "../launch.js";
 import { launchLifecycleAbi, lifecycleAdapterAbi, lifecycleErc20Abi } from "./abi.js";
 import { hashLaunchIdentity, hashLaunchPlan, LifecycleFundingKind, LifecyclePhase, LifecycleRewardMode, LifecycleTokenKind, LIFECYCLE_MAX_REWARD_ERC20_SUPPLY, LIFECYCLE_MAX_ERC404_SUPPLY, parseLaunchPlan, serializeLaunchPlan } from "./schema.js";
-import { readLaunchProgress, readLifecycleProfiles, readLifecycleTokenAtBlock, readPoolBoundHookDeployment } from "./progress.js";
-import { decodeAbyssLifecycleMarketConfig, decodePoolBoundV4LifecycleMarketConfig, decodeV4LifecycleMarketConfig, encodePoolBoundV4LifecycleMarketConfig, isPoolBoundV4ConfigVersion, minePoolBoundHookSalt } from "./markets.js";
-import { assertLifecycleBlock, assertLifecycleReadClientOpen, lifecycleFailureReason, lifecyclePinnedRpc, lifecycleStaticRpc, lifecycleRpc, lifecycleStage, readLifecycleBlock, readLifecycleChainId, readLifecycleContract, resolveLifecycleLimits, rpcHex, rpcQuantity, withLifecycleReadClient } from "./rpc.js";
+import { readLaunchProgress, readLifecycleExecutionProgress, readLifecycleHeadProgress, readLifecycleProfiles, readLifecycleTokenAtBlock, readPoolBoundHookDeployment } from "./progress.js";
+import { decodeAbyssLifecycleMarketConfig, decodePoolBoundV4LifecycleMarketConfig, decodeV4LifecycleMarketConfig, encodePoolBoundV4LifecycleMarketConfig, isPoolBoundV4ConfigVersion } from "./markets.js";
+import { assertLifecycleReadClientOpen, lifecycleFailureReason, lifecyclePinnedRpc, lifecycleStaticRpc, lifecycleRpc, lifecycleStage, readLifecycleChainId, readLifecycleContract, readLifecycleGasPrice, resolveLifecycleLimits, rpcHex, rpcQuantity, withLifecycleReadClient } from "./rpc.js";
 import { prepareLaunchSimulation, simulateLaunchTransactions } from "./simulation.js";
 import { LifecyclePlanningError } from "./types.js";
 import { deriveKnownPoolBoundHookDeployment, protectOrderedBuyMinimums, validateBuySlippageBps } from "./calibration.js";
@@ -14,6 +14,8 @@ import { buildLaunchTransactions, packPreparationBatches } from "./transactions.
 import { assertLifecycleMarketAllocation, assertLifecycleSupplyAllocation } from "./allocations.js";
 import { assertUfgLaunchAccount, hashUfgLaunchConfig, UFG_LAUNCH_PROXY_ADDRESS } from "./ufg-config.js";
 import { buildUfgLaunchTransactions, buildUfgCancelTransaction, validateUfgLaunchPlan } from "./ufg.js";
+import { readLifecyclePlanningBlock } from "./snapshot.js";
+import { mineLifecycleHooks } from "./mining.js";
 function validatePlanShape(plan) {
     // Encoding checks all exact integer widths, addresses, byte strings and tuple fields.
     const commitment = hashLaunchPlan(plan);
@@ -159,7 +161,7 @@ function orderedTransactions(plan, mode, progress, approvals, batches, ufg) {
     const commands = compiled.filter((transaction) => (transaction.kind !== "begin" && transaction.kind !== "atomic" || progress.canonical.phase === LifecyclePhase.None) &&
         (transaction.kind !== "prepare" || (transaction.marketStart ?? 0) >= prepared));
     const transactions = progress.canonical.phase === LifecyclePhase.None ? [...approvals, ...commands] : commands;
-    return transactions.map((transaction, index) => ({ ...transaction, calldataBytes: (transaction.data.length - 2) / 2, dependencies: index === 0 ? [] : [transactions[index - 1].id] }));
+    return transactions.map((transaction, index) => ({ ...transaction, nonce: progress.pendingAccountNonce + BigInt(index), calldataBytes: (transaction.data.length - 2) / 2, dependencies: index === 0 ? [] : [transactions[index - 1].id] }));
 }
 function attachEstimates(transactions, simulation) {
     return transactions.map((transaction) => {
@@ -180,7 +182,8 @@ function readReviewedNextTransaction(transaction) {
         typeof transaction.data !== "string" || !/^0x(?:[\da-fA-F]{2})*$/.test(transaction.data) ||
         typeof transaction.value !== "bigint" || transaction.value < 0n || transaction.value >= 1n << 256n ||
         typeof transaction.gas !== "bigint" || transaction.gas <= 0n || transaction.gas >= 1n << 64n ||
-        typeof transaction.gasPrice !== "bigint" || transaction.gasPrice < 0n || transaction.gasPrice >= 1n << 256n) {
+        typeof transaction.gasPrice !== "bigint" || transaction.gasPrice < 0n || transaction.gasPrice >= 1n << 256n ||
+        transaction.nonce !== undefined && (typeof transaction.nonce !== "bigint" || transaction.nonce < 0n || transaction.nonce >= 1n << 64n)) {
         throw new LifecyclePlanningError("INVALID_REVIEWED_TRANSACTION", "Reviewed transaction must contain a well-formed exact chain/account/target/calldata/value and uint64 gas/uint256 price envelope");
     }
     return transaction;
@@ -188,7 +191,8 @@ function readReviewedNextTransaction(transaction) {
 function matchesReviewedNextTransaction(next, reviewed) {
     return next !== undefined && next.id === reviewed.id && next.kind === reviewed.kind && next.chainId === reviewed.chainId &&
         next.from.toLowerCase() === reviewed.from.toLowerCase() && next.to.toLowerCase() === reviewed.to.toLowerCase() &&
-        next.data.toLowerCase() === reviewed.data.toLowerCase() && next.value === reviewed.value;
+        next.data.toLowerCase() === reviewed.data.toLowerCase() && next.value === reviewed.value &&
+        (reviewed.nonce === undefined || next.nonce === reviewed.nonce);
 }
 function assertReviewedTransactionUnchanged(options, reviewed, next) {
     if (options.planned.ufg !== undefined)
@@ -297,9 +301,15 @@ export async function prepareAndPlanLifecycleLaunch(options) {
     const { commitment, ufgConfigHash } = validatePlanningIntent(options);
     if (options.buySlippageBps !== undefined)
         validateBuySlippageBps(options.buySlippageBps);
+    const fixed = options.fixedFinalEnvelope;
+    if (fixed !== undefined && (fixed === null || typeof fixed !== "object" || options.mode !== "atomic" || typeof fixed.gas !== "bigint" || fixed.gas <= 0n || fixed.gas >= 1n << 64n ||
+        fixed.gasPrice !== undefined && (typeof fixed.gasPrice !== "bigint" || fixed.gasPrice < 0n || fixed.gasPrice >= 1n << 256n))) {
+        throw new LifecyclePlanningError("INVALID_GAS_ENVELOPE", "Fixed final envelope requires atomic mode, exact positive uint64 gas and optional uint256 price");
+    }
+    const heldEnvelope = fixed === undefined ? undefined : Object.freeze({ ...fixed });
     const needsMining = options.plan.markets.some((market) => isPoolBoundV4ConfigVersion(market.configVersion));
     const needsProtection = options.buySlippageBps !== undefined && options.plan.buys.length !== 0;
-    if (!needsMining && !needsProtection)
+    if (!needsMining && !needsProtection && fixed === undefined)
         return planLaunch(options);
     const draft = parseLaunchPlan(serializeLaunchPlan(options.plan));
     const assertDraft = () => {
@@ -308,42 +318,48 @@ export async function prepareAndPlanLifecycleLaunch(options) {
             throw new LifecyclePlanningError("PLAN_MUTATED", "Economic plan changed during asynchronous preparation; previous construction is invalid");
         if ((options.ufg === undefined ? undefined : hashUfgLaunchConfig(options.ufg.config)) !== ufgConfigHash)
             throw new LifecyclePlanningError("PLAN_MUTATED", "UFG config changed during asynchronous preparation");
+        if (fixed === undefined ? options.fixedFinalEnvelope !== undefined : options.fixedFinalEnvelope !== fixed ||
+            fixed.gas !== heldEnvelope.gas || fixed.gasPrice !== heldEnvelope.gasPrice)
+            throw new LifecyclePlanningError("INVALID_GAS_ENVELOPE", "Fixed final envelope changed during preparation");
     };
-    return withLifecycleReadClient(options.client, async (client) => {
-        const [block, chainId] = await Promise.all([readLifecycleBlock(client), readLifecycleChainId(client)]);
+    const result = await withLifecycleReadClient(options.client, async (client) => {
+        const block = await readLifecyclePlanningBlock(client, draft, options.account, options.ufg !== undefined, true);
+        const chainId = await readLifecycleChainId(client);
         if (chainId !== draft.chainId)
             throw new LifecyclePlanningError("CHAIN_MISMATCH", "RPC chain differs from the economic plan being finalized");
         const metadata = needsMining ? await Promise.all(draft.markets.map((market, marketIndex) => isPoolBoundV4ConfigVersion(market.configVersion)
             ? readPoolBoundHookDeployment({ client, plan: draft, marketIndex }, block) : undefined)) : [];
         assertDraft();
         const markets = [...draft.markets];
-        const minedDeployments = [];
-        for (const [marketIndex, deployment] of metadata.entries()) {
-            if (deployment === undefined)
-                continue;
+        const minedDeployments = await mineLifecycleHooks({ client, block,
+            miner: getKnownLifecycleDeployment({ chainId, orchestrator: draft.orchestrator })?.hookSaltMiner,
+            deployments: metadata.flatMap((deployment, marketIndex) => deployment === undefined ? [] : [{ marketIndex, ...deployment }]),
+            signal: options.signal, onProgress: options.onProgress });
+        for (const mined of minedDeployments) {
             assertDraft();
-            const mined = await minePoolBoundHookSalt({
-                deployer: deployment.deployer, initCodeHash: deployment.initCodeHash, startSalt: BigInt(deployment.salt), signal: options.signal,
-                onProgress: options.onProgress === undefined ? undefined : (progress) => options.onProgress?.({ marketIndex, ...progress }),
-            });
+            const marketIndex = mined.marketIndex;
             const market = markets[marketIndex];
             if (!isPoolBoundV4ConfigVersion(market.configVersion))
                 throw new LifecyclePlanningError("INVALID_BOUND_MARKET", "Mined market lost its explicit pool-bound version");
             markets[marketIndex] = { ...market, config: encodePoolBoundV4LifecycleMarketConfig({ ...decodePoolBoundV4LifecycleMarketConfig(market.config, market.configVersion), hookSalt: mined.salt }) };
-            minedDeployments.push({ marketIndex, deployer: deployment.deployer, initCodeHash: deployment.initCodeHash, ...mined });
         }
         assertDraft();
-        // Mining is local construction, not a state admission. Economic observations
-        // start at a fresh post-mining snapshot and share it through final protection.
-        const executionBlock = needsMining ? await readLifecycleBlock(client) : block;
+        const executionBlock = block;
         assertDraft();
+        const price = heldEnvelope === undefined ? undefined : heldEnvelope.gasPrice ?? rpcQuantity(await readLifecycleGasPrice(client), "gas price");
+        const baseFeeEnvelope = (executionBlock.baseFeePerGas ?? 0n) * 2n;
+        const finalEnvelope = heldEnvelope === undefined ? undefined : Object.freeze({
+            gas: heldEnvelope.gas,
+            gasPrice: heldEnvelope.gasPrice ?? (price > baseFeeEnvelope ? price : baseFeeEnvelope),
+        });
         let plan = { ...draft, markets };
         let ownedProgress;
+        let sizing;
         if (needsProtection) {
             // A diagnostic minimum is never returned as an admitted or executable plan.
             // Price guards, funding minima, recipients and all ordered budgets stay exact.
             const diagnosticPlan = { ...plan, buys: plan.buys.map((buy) => ({ ...buy, minTokenOut: 1n })) };
-            const diagnostic = await lifecycleStage(client, "plan", () => planLaunchWithReads({ ...options, plan: diagnosticPlan }, client, executionBlock, undefined, true));
+            const diagnostic = await lifecycleStage(client, "plan", () => planLaunchWithReads({ ...options, plan: diagnosticPlan }, client, executionBlock, undefined, true, finalEnvelope));
             assertDraft();
             if (diagnostic.progress.canonical.phase !== LifecyclePhase.None || diagnostic.progress.head.phase !== LifecyclePhase.None)
                 throw new LifecyclePlanningError("LAUNCH_ALREADY_STARTED", "Buy protection cannot replace an already committed launch plan");
@@ -351,8 +367,9 @@ export async function prepareAndPlanLifecycleLaunch(options) {
             // This is the real SDK-owned None observation, not an assumed new-launch
             // state. No onchain commitment existed at this exact snapshot to replace.
             ownedProgress = { ...diagnostic.progress, planHash: hashLaunchPlan(plan) };
+            sizing = new Map(diagnostic.simulation.steps.map((step) => [step.transactionId, step.gasRequired ?? step.gasUsed]));
         }
-        const planned = await lifecycleStage(client, "plan", () => planLaunchWithReads({ ...options, plan }, client, executionBlock, ownedProgress));
+        const planned = await lifecycleStage(client, "plan", () => planLaunchWithReads({ ...options, plan }, client, executionBlock, ownedProgress, false, finalEnvelope, sizing));
         assertDraft();
         assertFinalPlan(planned, options.signal);
         if (planned.progress.canonical.phase !== LifecyclePhase.Active && planned.progress.canonical.phase !== LifecyclePhase.Cancelled) {
@@ -366,21 +383,26 @@ export async function prepareAndPlanLifecycleLaunch(options) {
             throw new LifecyclePlanningError("PROTECTED_PLAN_NOT_ADMITTED", planned.simulation.reason ?? "The final protected launch did not establish exact execution proof", planned.simulation);
         return planned;
     });
+    assertDraft();
+    assertFinalPlan(result, options.signal);
+    return result;
 }
 /** Independently fresh current-state admission of an already finalized commitment. No broadcasts. */
 export async function planLaunch(options) {
-    return withLifecycleReadClient(options.client, async (client) => {
+    const result = await withLifecycleReadClient(options.client, async (client) => {
         const planned = await lifecycleStage(client, "plan", () => planLaunchWithReads(options, client));
         assertFinalPlan(planned, options.signal);
         return planned;
     });
+    assertFinalPlan(result, options.signal);
+    return result;
 }
-async function planLaunchWithReads(options, client, pinnedBlock, ownedProgress, diagnostic = false, reviewed) {
+async function planLaunchWithReads(options, client, pinnedBlock, ownedProgress, diagnostic = false, fixedFinalEnvelope, sizing) {
     const { plan, account, mode, ufg } = options;
     const { commitment: planHash, marketConfigs, ufgConfigHash } = validatePlanningIntent(options);
     const launchId = hashLaunchIdentity(plan);
     const [block, chainId] = await lifecycleStage(client, "plan.context", () => Promise.all([
-        pinnedBlock ?? readLifecycleBlock(client), readLifecycleChainId(client),
+        pinnedBlock ?? readLifecyclePlanningBlock(client, plan, account, ufg !== undefined), readLifecycleChainId(client),
     ]));
     if (chainId !== plan.chainId)
         throw new LifecyclePlanningError("CHAIN_MISMATCH", "RPC chain differs from the committed plan");
@@ -400,7 +422,10 @@ async function planLaunchWithReads(options, client, pinnedBlock, ownedProgress,
         preset ?? readTokenFactoryBinding(client, plan.orchestrator, block),
         resolveLifecycleLimits({ client, account, orchestrator: plan.orchestrator, block, chainId: plan.chainId }, options.limits),
         lifecycleStage(client, "plan.progress", async () => {
-            const predictedToken = await readLifecycleTokenAtBlock(client, plan, block);
+            const [predictedToken] = await Promise.all([
+                readLifecycleTokenAtBlock(client, plan, block),
+                ownedProgress === undefined ? readLifecycleHeadProgress(client, plan, account, block) : undefined,
+            ]);
             const identity = { plan, planHash, launchId, predictedToken, account, mode, confirmations: options.confirmations ?? 1,
                 ...(ufg === undefined ? {} : { ufg: { config: ufg.config, configHash: ufgConfigHash } }) };
             if (ufg !== undefined)
@@ -426,11 +451,9 @@ async function planLaunchWithReads(options, client, pinnedBlock, ownedProgress,
             hookDeployments.push({ marketIndex, ...(known?.deployment ?? await readPoolBoundHookDeployment({ client, plan, marketIndex }, block)) });
         }
         const waiting = { ...placeholder, confidence: "stateful", reason: !progress.confirmationSafe ? "Canonical confirmed progress/account nonce has not caught up with head or pending transactions; wait for the selected confirmation depth" : "Wait for canonical receipt confirmations or resolve replacement before requesting another transaction" };
-        await assertLifecycleBlock(client, block, plan.chainId);
         return { ...planned, hookDeployments, simulation: waiting };
     }
     if (progress.canonical.phase === LifecyclePhase.Active || progress.canonical.phase === LifecyclePhase.Cancelled) {
-        await assertLifecycleBlock(client, block, plan.chainId);
         return { ...planned, simulation: { ...placeholder, confidence: "stateful", executionProof: "proved", protocolFit: "proved", admitted: true, reason: "Canonical launch is terminal; no transaction remains" } };
     }
     // Topology is a creation policy, not a retroactive obstacle to recovery of
@@ -447,41 +470,29 @@ async function planLaunchWithReads(options, client, pinnedBlock, ownedProgress,
     const computeCap = limits.transactionGasCeiling !== undefined && limits.transactionGasCeiling < limits.executionGasCeiling ? limits.transactionGasCeiling : limits.executionGasCeiling;
     let batches = [];
     if (mode === "staged")
-        batches = reviewed === undefined ? packPreparationBatches(plan, prepared, computeCap)
-            : [...(prepared > 0 ? [prepared] : []), ...(prepared < plan.markets.length ? [plan.markets.length - prepared] : [])];
-    if (reviewed !== undefined && reviewed.kind === "prepare") {
-        // Canonical progress fixes the start; the exact held calldata fixes its span.
-        // Never rediscover a batch or enlarge a reviewed transaction.
-        const match = /^prepare:(\d+):(\d+)$/.exec(reviewed.id);
-        const start = Number(match?.[1]), count = Number(match?.[2]);
-        if (start !== prepared || !Number.isSafeInteger(count) || count <= 0 || start + count > plan.markets.length)
-            throw new LifecyclePlanningError("REVIEWED_TRANSACTION_MISMATCH", "Reviewed preparation differs from canonical unfinished progress");
-        batches = [...(prepared > 0 ? [prepared] : []), count, ...(start + count < plan.markets.length ? [plan.markets.length - start - count] : [])];
-    }
+        batches = packPreparationBatches(plan, prepared, computeCap);
     let transactions = orderedTransactions(plan, mode, progress, funding.approvals, batches, ufg);
-    if (reviewed !== undefined) {
-        if (!matchesReviewedNextTransaction(transactions[0], reviewed))
-            throw new LifecyclePlanningError("REVIEWED_TRANSACTION_MISMATCH", "Reviewed transaction differs from the current canonical unfinished next step");
-        transactions = transactions.slice(0, 1);
+    if (fixedFinalEnvelope !== undefined && (transactions.length !== 1 || transactions[0].kind !== "atomic")) {
+        throw new LifecyclePlanningError("INVALID_GAS_ENVELOPE", "Fixed final envelope requires one immediate atomic launch with no preceding approvals");
     }
     if (metadata.reasons.length > 0) {
-        await assertLifecycleBlock(client, block, plan.chainId);
         return { ...planned, simulation: { ...placeholder, confidence: "stateful", reason: metadata.reasons.join("; "), failureCategory: "semantic" }, transactions, totalCalldataBytes: transactions.reduce((total, transaction) => total + (transaction.data.length - 2) / 2, 0) };
     }
-    const preparedSimulation = prepareLaunchSimulation({ client, planned, limits: options.limits, fork: options.fork, signal: options.signal }, block, true, reviewed);
+    const envelope = diagnostic ? undefined : fixedFinalEnvelope;
+    const preparedSimulation = prepareLaunchSimulation({ client, planned, limits: options.limits, fork: options.fork, signal: options.signal }, block, true, envelope, fixedFinalEnvelope?.gasPrice, sizing);
     try {
-        const execute = diagnostic ? preparedSimulation.measure : (candidate) => preparedSimulation(candidate, reviewed);
+        const execute = diagnostic ? preparedSimulation.measure : (candidate) => preparedSimulation(candidate, envelope);
         let simulation = await execute(transactions);
         assertFinalPlan(planned, options.signal);
         if (mode === "staged") {
-            // Only a measurement that consumed almost its entire legal envelope
-            // invalidates packing estimates, including gas hidden by CREATE wrappers.
-            while (reviewed === undefined && !simulation.admitted && simulation.failedTransactionId?.startsWith("prepare:")) {
+            // Only pressure at the native ceiling can invalidate packing. A smaller
+            // affordability/RPC/account envelope is not evidence for another wallet write.
+            while (!simulation.admitted && simulation.failedTransactionId?.startsWith("prepare:")) {
                 const failedIndex = transactions.findIndex((transaction) => transaction.id === simulation.failedTransactionId);
                 const failedTransaction = transactions[failedIndex];
                 const step = simulation.steps.find((candidate) => candidate.transactionId === simulation.failedTransactionId);
                 const count = failedTransaction?.marketCount ?? 0;
-                if (count <= 1 || step?.estimate !== undefined || step?.gasUsed === undefined || step.gasLimit === undefined || step.gasUsed * 100n < step.gasLimit * 95n)
+                if (count <= 1 || step?.gasUsed === undefined || step.gasLimit === undefined || step.gasLimit < limits.executionGasCeiling || step.gasUsed * 100n < limits.executionGasCeiling * 95n)
                     break;
                 let first = 0;
                 const batchIndex = batches.findIndex((batch) => { const matches = first === failedTransaction?.marketStart; first += batch; return matches; });
@@ -497,9 +508,6 @@ async function planLaunchWithReads(options, client, pinnedBlock, ownedProgress,
         else if (!diagnostic && !simulation.admitted && !(simulation.capacityConstraint === "compute" && simulation.confidence === "provisional")) {
             simulation = { ...simulation, reason: `${simulation.reason ?? "Exact atomic plan is not admitted"}; choose staged explicitly only if empty preparation can be partitioned and complete activation fits` };
         }
-        if (reviewed !== undefined && !matchesReviewedNextTransaction(transactions[0], reviewed)) {
-            throw new LifecyclePlanningError("REVIEWED_TRANSACTION_MISMATCH", "Reviewed transaction differs from the current canonical unfinished next step");
-        }
         return { ...planned, simulation, transactions: attachEstimates(transactions, simulation), totalCalldataBytes: transactions.reduce((total, transaction) => total + (transaction.data.length - 2) / 2, 0) };
     }
     finally {
@@ -523,11 +531,10 @@ async function preflightNextTransaction(options, next, simulation, reviewed) {
             throw new Error("Active submission RPC chain differs from the reviewed transaction");
         const estimated = rpcQuantity(await lifecycleRpc(submissionClient, "eth_estimateGas", [{
                 from: next.from, to: next.to, data: next.data, value: toHex(next.value), gas: toHex(next.gas), gasPrice: toHex(next.gasPrice),
+                ...(next.nonce === undefined ? {} : { nonce: toHex(next.nonce) }),
             }, "latest"]), "submission gas estimate");
         if (estimated <= 0n || estimated > next.gas)
             throw new Error("Submission RPC gas estimate exceeds the exact reviewed envelope or is zero");
-        if (rpcQuantity(await lifecycleRpc(submissionClient, "eth_chainId"), "submission chain ID") !== simulation.chainId)
-            throw new Error("Active submission RPC chain changed during preflight");
         assertPlanningActive(options.signal);
     }
     catch (failure) {
@@ -536,14 +543,6 @@ async function preflightNextTransaction(options, next, simulation, reviewed) {
         const reason = `Exact next-transaction submission preflight failed: ${lifecycleFailureReason(failure)}`;
         throw new LifecyclePlanningError("SUBMISSION_PREFLIGHT_FAILED", reason, { ...simulation, transportPreflight: "failed", reason });
     }
-    const [canonical, chainId] = await Promise.all([
-        readLifecycleBlock(options.client, toHex(simulation.blockNumber)),
-        lifecycleRpc(options.client, "eth_chainId"),
-    ]);
-    if (canonical.hash.toLowerCase() !== simulation.blockHash.toLowerCase())
-        throw new LifecyclePlanningError("STATE_REORGED", "Pinned launch proof changed during submission preflight; rebuild from canonical progress");
-    if (rpcQuantity(chainId, "chain ID") !== simulation.chainId)
-        throw new LifecyclePlanningError("CHAIN_MISMATCH", "Source RPC chain changed during submission preflight");
     if (next.admission === undefined)
         throw new LifecyclePlanningError("MISSING_GAS_PROOF", "Next transaction omitted its exact simulation admission", simulation);
     assertPlanningActive(options.signal);
@@ -557,15 +556,22 @@ export async function buildNextTransaction(options) {
     // Snapshot only the reviewed wire fields; caller proofs and commands are never
     // reused, and final checks compare the mutable input with this one local copy.
     const reviewed = supplied === undefined ? undefined : Object.freeze({ id: supplied.id, kind: supplied.kind, chainId: supplied.chainId,
-        from: supplied.from, to: supplied.to, data: supplied.data, value: supplied.value, gas: supplied.gas, gasPrice: supplied.gasPrice });
-    return withLifecycleReadClient(options.client, async (client) => {
-        const block = await readLifecycleBlock(client);
-        const progress = await readLaunchProgress({ ...options, client }, block);
+        from: supplied.from, to: supplied.to, data: supplied.data, value: supplied.value, gas: supplied.gas, gasPrice: supplied.gasPrice, nonce: supplied.nonce });
+    const result = await withLifecycleReadClient(options.client, async (client) => {
+        const block = await readLifecyclePlanningBlock(client, options.planned.plan, options.planned.account, options.planned.ufg !== undefined);
+        const limitSource = options.limits === undefined ? options.planned.limits : options.limits;
+        if (getKnownLifecycleDeployment({ chainId: options.planned.chainId, orchestrator: options.planned.plan.orchestrator }) !== undefined && typeof limitSource !== "function") {
+            await Promise.all([
+                readLifecycleTokenAtBlock(client, options.planned.plan, block),
+                readLifecycleHeadProgress(client, options.planned.plan, options.planned.account, block),
+                resolveLifecycleLimits({ client, account: options.planned.account, orchestrator: options.planned.plan.orchestrator, block, chainId: options.planned.chainId }, limitSource),
+            ]);
+        }
+        const progress = await readLifecycleExecutionProgress({ ...options, client }, block);
         if (progress.canonical.phase === LifecyclePhase.Active || progress.canonical.phase === LifecyclePhase.Cancelled) {
             // Only the confirmed canonical terminal phase is terminal; a head-only
             // Active observation is not, and the confirmation/nonce/receipt gates below
             // remain in force for every nonterminal case.
-            await assertLifecycleBlock(client, block, options.planned.chainId);
             return undefined;
         }
         if (!progress.confirmationSafe)
@@ -580,6 +586,7 @@ export async function buildNextTransaction(options) {
             assertFinalPlan(planned, options.signal);
             const transaction = planned.ufg !== undefined ? buildUfgCancelTransaction({ plan: planned.plan, preparedMarkets: progress.canonical.preparedMarkets })
                 : { id: "cancel", kind: "cancel", chainId: Number(planned.chainId), from: planned.account, to: planned.plan.orchestrator, data: encodeFunctionData({ abi: launchLifecycleAbi, functionName: "cancelLaunch", args: [planned.plan] }), value: 0n, dependencies: [], postconditions: [{ kind: "launch", phase: "Cancelled", preparedMarkets: progress.canonical.preparedMarkets }] };
+            transaction.nonce = progress.pendingAccountNonce;
             if (reviewed !== undefined && !matchesReviewedNextTransaction(transaction, reviewed))
                 throw new LifecyclePlanningError("REVIEWED_TRANSACTION_MISMATCH", "Reviewed transaction differs from the current canonical cancellation");
             const simulation = await simulateLaunchTransactions({ client, planned, limits: options.limits === undefined ? planned.limits : options.limits, fork: options.fork, signal: options.signal }, [transaction], block, reviewed);
@@ -590,17 +597,53 @@ export async function buildNextTransaction(options) {
                 throw new LifecyclePlanningError("MISSING_GAS_PROOF", "Cancellation omitted its exact simulation admission", simulation);
             return preflightNextTransaction(options, next, simulation, reviewed);
         }
-        const refreshed = await lifecycleStage(client, "plan", () => planLaunchWithReads({ client, plan: options.planned.plan, account: options.planned.account, mode: options.planned.mode, limits: options.limits === undefined ? options.planned.limits : options.limits, fork: options.fork, receipts: options.receipts, confirmations: options.confirmations ?? options.planned.confirmations, signal: options.signal,
-            ufg: options.planned.ufg, allowTopologyGaps: options.planned.allowTopologyGaps, allowMissingPermanentTail: options.planned.allowMissingPermanentTail }, client, block, progress, false, reviewed));
-        assertFinalPlan(refreshed, options.signal);
-        if (!refreshed.simulation.admitted)
-            throw new LifecyclePlanningError("PLAN_NOT_ADMITTED", refreshed.simulation.reason ?? "Remaining exact launch sequence is not admitted", refreshed.simulation);
-        assertPlannedDeploymentBindings(options.planned, refreshed);
-        const next = refreshed.transactions[0];
-        if (next === undefined)
+        const { planned } = options;
+        assertFinalPlan(planned, options.signal);
+        const funding = progress.canonical.phase === LifecyclePhase.None
+            ? await readFunding(client, planned.plan, block, planned.account, planned.ufg !== undefined)
+            : { prerequisites: [], approvals: [] };
+        const prepared = progress.canonical.preparedMarkets;
+        let batches = [];
+        if (planned.mode === "staged") {
+            let suffixStart = prepared;
+            const prefix = prepared > 0 ? [prepared] : [];
+            if (reviewed?.kind === "prepare") {
+                const span = /^prepare:(\d+):(\d+)$/.exec(reviewed.id);
+                const first = Number(span?.[1]), count = Number(span?.[2]);
+                if (first !== prepared || !Number.isSafeInteger(count) || count <= 0 || first + count > planned.plan.markets.length)
+                    throw new LifecyclePlanningError("REVIEWED_TRANSACTION_MISMATCH", "Reviewed preparation does not start at the canonical unfinished market");
+                prefix.push(count);
+                suffixStart += count;
+            }
+            const suffix = planned.transactions
+                .filter((transaction) => transaction.kind === "prepare" && transaction.marketStart + transaction.marketCount > suffixStart)
+                .map((transaction) => transaction.marketStart + transaction.marketCount - Math.max(transaction.marketStart, suffixStart));
+            if (suffix.length === 0 && suffixStart < planned.plan.markets.length) {
+                const { limits } = await resolveLifecycleLimits({ client, account: planned.account, orchestrator: planned.plan.orchestrator, block, chainId: planned.chainId }, limitSource);
+                const cap = limits.transactionGasCeiling !== undefined && limits.transactionGasCeiling < limits.executionGasCeiling ? limits.transactionGasCeiling : limits.executionGasCeiling;
+                suffix.push(...packPreparationBatches(planned.plan, suffixStart, cap).slice(suffixStart > 0 ? 1 : 0));
+            }
+            batches = [...prefix, ...suffix];
+        }
+        const candidate = orderedTransactions(planned.plan, planned.mode, progress, funding.approvals, batches, planned.ufg)[0];
+        if (candidate === undefined)
             return undefined;
-        return preflightNextTransaction(options, next, refreshed.simulation, reviewed);
+        if (reviewed !== undefined && !matchesReviewedNextTransaction(candidate, reviewed))
+            throw new LifecyclePlanningError("REVIEWED_TRANSACTION_MISMATCH", "Reviewed transaction differs from the current canonical unfinished next step");
+        const observed = planned.simulation.executionProof === "proved" ? planned.simulation.steps.find((step) => step.transactionId === candidate.id && step.success) : undefined;
+        const compute = observed?.computeGasRequired;
+        const sizing = reviewed !== undefined || compute === undefined ? undefined : new Map([[candidate.id, compute]]);
+        const simulation = await simulateLaunchTransactions({ client, planned, limits: limitSource, fork: options.fork, signal: options.signal }, [candidate], block, reviewed, sizing);
+        assertFinalPlan(planned, options.signal);
+        if (!simulation.admitted)
+            throw new LifecyclePlanningError("PLAN_NOT_ADMITTED", simulation.reason ?? "Next exact launch transaction is not admitted", simulation);
+        const next = attachEstimates([candidate], simulation)[0];
+        return preflightNextTransaction(options, next, simulation, reviewed);
     });
+    assertFinalPlan(options.planned, options.signal);
+    if (result !== undefined)
+        assertReviewedTransactionUnchanged(options, reviewed, result);
+    return result;
 }
 /** Re-simulates only canonical unfinished work with the same submitted receipt
  * evidence and confirmation depth as build-next, never silently dropping context. */