@bsv/wallet-toolbox-client 2.4.21 → 2.5.0

package/out/index.client.mjs

@@ -1,5 +1,5 @@
 import { t as __exportAll } from "./rolldown-runtime-D7D4PA-g.mjs";
-import { AuthFetch, BEEF_V1, BEEF_V2, Beef, BeefParty, BigNumber, BlockHeadersService, CachedKeyDeriver, Certificate, Curve, Hash, LocalKVStore, LockingScript, LookupResolver, MasterCertificate, MerklePath, P2PKH, PrivateKey, ProtoWallet, PublicKey, PushDrop, RPuzzle, Random, SHIPBroadcaster, Script, ScriptEvaluationError, Signature, Spend, SymmetricKey, Telemetry, Transaction, Utils, Validation, Validation as Validation$1, VerifiableCertificate, createNonce, defaultHttpClient, verifyNonce } from "@bsv/sdk";
+import { AuthFetch, BEEF_V1, BEEF_V2, Beef, BeefParty, BigNumber, BlockHeadersService, CachedKeyDeriver, Certificate, Curve, Hash, LocalKVStore, LockingScript, LookupResolver, MasterCertificate, MerklePath, P2PKH, PrivateKey, ProtoWallet, PublicKey, PushDrop, RPuzzle, Random, SHIPBroadcaster, Script, ScriptEvaluationError, Signature, Spend, SymmetricKey, Telemetry, Transaction, TransactionSignature, Utils, Validation, Validation as Validation$1, VerifiableCertificate, createNonce, defaultHttpClient, verifyNonce } from "@bsv/sdk";
 import { deleteDB, openDB } from "idb";
 import { AESGCM, AESGCMDecrypt } from "@bsv/sdk/primitives/AESGCM";
 import argon2Api from "hash-wasm/dist/argon2.umd.min.js";
@@ -1222,7 +1222,11 @@ var ScriptTemplateBRC29 = class {
 		return `${this.params.derivationPrefix ?? ""} ${this.params.derivationSuffix ?? ""}`;
 	}
 	getKeyDeriver(privKey) {
-		if (typeof privKey === "string") privKey = PrivateKey.fromHex(privKey);
+		if (this.params.keyDeriver?.rootKey === privKey) return this.params.keyDeriver;
+		if (typeof privKey === "string") {
+			if (this.params.keyDeriver?.rootKey.toHex() === privKey) return this.params.keyDeriver;
+			privKey = PrivateKey.fromHex(privKey);
+		}
 		if (this.params.keyDeriver == null || this.params.keyDeriver.rootKey.toHex() !== privKey.toHex()) return new CachedKeyDeriver(privKey);
 		return this.params.keyDeriver;
 	}
@@ -1231,8 +1235,11 @@ var ScriptTemplateBRC29 = class {
 		return this.p2pkh.lock(address);
 	}
 	unlock(unlockerPrivKey, lockerPubKey, sourceSatoshis, lockingScript) {
-		const derivedPrivateKey = this.getKeyDeriver(unlockerPrivKey).derivePrivateKey(brc29ProtocolID, this.getKeyID(), lockerPubKey).toHex();
-		return this.p2pkh.unlock(asBsvSdkPrivateKey(derivedPrivateKey), "all", false, sourceSatoshis, lockingScript);
+		const derivedPrivateKey = this.getKeyDeriver(unlockerPrivKey).derivePrivateKey(brc29ProtocolID, this.getKeyID(), lockerPubKey);
+		return this.unlockWithDerivedPrivateKey(derivedPrivateKey, sourceSatoshis, lockingScript);
+	}
+	unlockWithDerivedPrivateKey(derivedPrivateKey, sourceSatoshis, lockingScript) {
+		return this.p2pkh.unlock(derivedPrivateKey, "all", false, sourceSatoshis, lockingScript);
 	}
 	/**
 	* P2PKH unlock estimateLength is a constant
@@ -2426,11 +2433,16 @@ var EntityProvenTx = class EntityProvenTx extends EntityBase {
 	/**
 	* @returns desirialized `MerklePath` object, value is cached.
 	*/
-	getMerklePath() {
-		this._mp ??= MerklePath.fromBinary(this.api.merklePath);
-		return this._mp;
+	getMerklePath(validateRoots = true) {
+		if (validateRoots) {
+			this._mp ??= MerklePath.fromBinary(this.api.merklePath);
+			return this._mp;
+		}
+		this._mpUnchecked ??= MerklePath.fromBinary(this.api.merklePath, true, false);
+		return this._mpUnchecked;
 	}
 	_mp;
+	_mpUnchecked;
 	get provenTxId() {
 		return this.api.provenTxId;
 	}
@@ -4888,6 +4900,12 @@ function upgradeOutputs(db) {
 		autoIncrement: true
 	});
 	store.createIndex("userId", "userId");
+	store.createIndex("userId_basketId", ["userId", "basketId"]);
+	store.createIndex("txid_vout_userId", [
+		"txid",
+		"vout",
+		"userId"
+	], { unique: true });
 	store.createIndex("transactionId", "transactionId");
 	store.createIndex("basketId", "basketId");
 	store.createIndex("spentBy", "spentBy");
@@ -5021,8 +5039,10 @@ async function mergeInputBeefs(rawTx, beef, trustSelf, knownTxids, trx, required
 	for (const input of tx.inputs) {
 		const sourceTXID = input.sourceTXID ?? "";
 		if (sourceTXID === "") throw new WERR_INTERNAL("req all transaction inputs must have valid sourceTXID");
-		if (beef.findTxid(sourceTXID) != null) continue;
-		if ((requiredLevels == null || requiredLevels === 0) && knownTxids?.includes(sourceTXID) === true) beef.mergeTxidOnly(sourceTXID);
+		const existing = beef.findTxid(sourceTXID);
+		const callerKnows = (requiredLevels == null || requiredLevels === 0) && knownTxids?.includes(sourceTXID) === true;
+		if (existing != null && (!existing.isTxidOnly || callerKnows || trustSelf === "known")) continue;
+		if (callerKnows) beef.mergeTxidOnly(sourceTXID);
 		else await getValidBeef(sourceTXID, beef, trustSelf, knownTxids, trx, requiredLevels);
 	}
 }
@@ -5086,26 +5106,22 @@ async function notifyTransactionsOfProof(ids, provenTxId, addNote, updateTransac
 * @param options
 */
 async function getBeefForTransaction(storage, txid, options) {
-	let beef;
-	if (options.mergeToBeef instanceof Beef) beef = options.mergeToBeef;
-	else if (options.mergeToBeef != null) beef = Beef.fromBinary(options.mergeToBeef);
-	else beef = new Beef();
-	const knownTxids = new Set(options.knownTxids ?? []);
+	const beef = mergeTarget(options);
+	const hasKnownTxid = makeKnownTxidLookup$1(options.knownTxids ?? []);
 	const scheduled = /* @__PURE__ */ new Set([txid]);
 	let frontier = [{
 		txid,
 		depth: 0
 	}];
-	const requestedConcurrency = options.maxConcurrency ?? 8;
-	const concurrency = Number.isFinite(requestedConcurrency) ? Math.max(1, Math.min(32, Math.floor(requestedConcurrency))) : 8;
+	const concurrency = normalizeConcurrency(options.maxConcurrency);
 	while (frontier.length > 0) {
-		const current = frontier.filter((item) => beef.findTxid(item.txid) == null);
-		const resolved = await mapWithConcurrency(current, concurrency, async (item) => await resolveBeefForTransaction(storage, item.txid, options, knownTxids, item.depth));
+		const current = frontier.filter((item) => needsResolution(beef, item.txid, hasKnownTxid));
+		const resolved = await mapWithConcurrency(current, concurrency, async (item) => await resolveBeefForTransaction(storage, item.txid, options, hasKnownTxid, item.depth));
 		const next = [];
 		for (let i = 0; i < resolved.length; i++) {
 			const result = resolved[i];
 			beef.mergeBeef(result.beef);
-			for (const dependency of result.dependencies) if (!scheduled.has(dependency) && beef.findTxid(dependency) == null) {
+			for (const dependency of result.dependencies) if (!scheduled.has(dependency) && needsResolution(beef, dependency, hasKnownTxid)) {
 				scheduled.add(dependency);
 				next.push({
 					txid: dependency,
@@ -5117,6 +5133,188 @@ async function getBeefForTransaction(storage, txid, options) {
 	}
 	return beef;
 }
+/**
+* Build one aggregate BEEF for several roots while resolving each storage
+* frontier as a set. This avoids one proof query per funding input on the
+* createAction success path. Complex proof-level and chain-tracker policies
+* retain the established single-root implementation.
+*/
+async function getBeefForTransactions(storage, txids, options) {
+	const beef = mergeTarget(options);
+	const roots = [...new Set(txids)];
+	if (roots.length === 0) return beef;
+	if (requiresSingleRootPolicy(options)) return await mergeSingleRootFragments(storage, roots, options, beef);
+	const hasKnownTxid = makeKnownTxidLookup$1(options.knownTxids ?? []);
+	const scheduled = new Set(roots);
+	let frontier = roots.map((txid) => ({
+		txid,
+		depth: 0
+	}));
+	while (frontier.length > 0) {
+		const unresolved = collectUnresolvedFrontier(storage, frontier, beef, hasKnownTxid);
+		if (unresolved.length === 0) break;
+		const stored = await storage.getProvenOrRawTxs(unresolved.map((item) => item.txid));
+		if (options.trustSelf !== "known" && unresolved.every((item) => stored.get(item.txid)?.proven != null)) {
+			mergeAllProven(storage, beef, unresolved, stored);
+			break;
+		}
+		const [next, missing] = mergeStoredFrontier(beef, unresolved, stored, options, scheduled, hasKnownTxid);
+		await mergeMissingFragments(storage, beef, missing, options);
+		frontier = next;
+	}
+	return beef;
+}
+function mergeTarget(options) {
+	if (options.mergeToBeef instanceof Beef) return options.mergeToBeef;
+	if (options.mergeToBeef != null) return Beef.fromBinary(options.mergeToBeef);
+	return new Beef();
+}
+function requiresSingleRootPolicy(options) {
+	return options.ignoreStorage === true || options.minProofLevel !== void 0 || options.chainTracker != null || options.skipInvalidProofs === true;
+}
+async function mergeSingleRootFragments(storage, roots, options, beef) {
+	const fragments = await mapWithConcurrency(roots.filter((txid) => beef.findTxid(txid) == null), normalizeConcurrency(options.maxConcurrency), async (txid) => await getBeefForTransaction(storage, txid, {
+		...options,
+		mergeToBeef: void 0
+	}));
+	for (const fragment of fragments) beef.mergeBeef(fragment);
+	return beef;
+}
+function collectUnresolvedFrontier(storage, frontier, beef, hasKnownTxid) {
+	const unresolved = [];
+	for (const item of frontier) {
+		if (!needsResolution(beef, item.txid, hasKnownTxid)) continue;
+		if (storage.maxRecursionDepth && storage.maxRecursionDepth <= item.depth) throw new WERR_INVALID_OPERATION(`Maximum BEEF depth exceeded. Limit is ${storage.maxRecursionDepth}`);
+		if (hasKnownTxid(item.txid)) beef.mergeTxidOnly(item.txid);
+		else unresolved.push(item);
+	}
+	return unresolved;
+}
+function decodeProvenEntries(storage, unresolved, stored) {
+	const span = storage.telemetry.enabled ? storage.telemetry.startSpan("wallet.storage.beef.decode_proven_batch", {
+		component: "wallet-storage",
+		attributes: { "beef.proven_tx_count": unresolved.length }
+	}) : void 0;
+	try {
+		const entries = unresolved.map((item) => {
+			const proven = stored.get(item.txid).proven;
+			return {
+				rawTx: proven.rawTx,
+				merklePath: new EntityProvenTx(proven).getMerklePath(false),
+				merkleRoot: proven.merkleRoot
+			};
+		});
+		span?.end({ attributes: { "beef.decoded_proof_count": entries.length } });
+		return entries;
+	} catch (error) {
+		span?.end({
+			status: "error",
+			error
+		});
+		throw error;
+	}
+}
+function mergeAllProven(storage, beef, unresolved, stored) {
+	const entries = decodeProvenEntries(storage, unresolved, stored);
+	const span = storage.telemetry.enabled ? storage.telemetry.startSpan("wallet.storage.beef.merge_proven_batch", {
+		component: "wallet-storage",
+		attributes: { "beef.proven_tx_count": entries.length }
+	}) : void 0;
+	try {
+		mergeProvenEntries(beef, entries, unresolved, stored);
+		span?.end({ attributes: {
+			"beef.merged_tx_count": entries.length,
+			"beef.result_tx_count": beef.txs.length,
+			"beef.result_bump_count": beef.bumps.length
+		} });
+	} catch (error) {
+		span?.end({
+			status: "error",
+			error
+		});
+		throw error;
+	}
+}
+function mergeProvenEntries(beef, entries, unresolved, stored) {
+	if (typeof beef.mergeProvenTxs === "function") {
+		beef.mergeProvenTxs(entries);
+		return;
+	}
+	for (const item of unresolved) {
+		const proven = stored.get(item.txid).proven;
+		beef.mergeRawTx(proven.rawTx);
+		beef.mergeBump(new EntityProvenTx(proven).getMerklePath());
+	}
+}
+function mergeStoredFrontier(beef, unresolved, stored, options, scheduled, hasKnownTxid) {
+	const next = [];
+	const missing = [];
+	for (const item of unresolved) {
+		const result = stored.get(item.txid);
+		if (result?.proven != null) mergeStoredProven(beef, item, result, options);
+		else if (result?.rawTx != null) mergeStoredRaw(beef, item, result, options, scheduled, next, hasKnownTxid);
+		else missing.push(item);
+	}
+	return [next, missing];
+}
+function mergeStoredProven(beef, item, result, options) {
+	if (options.trustSelf === "known") {
+		beef.mergeTxidOnly(item.txid);
+		return;
+	}
+	const proven = result.proven;
+	beef.mergeRawTx(proven.rawTx);
+	beef.mergeBump(new EntityProvenTx(proven).getMerklePath());
+}
+function mergeStoredRaw(beef, item, result, options, scheduled, next, hasKnownTxid) {
+	if (options.trustSelf === "known") {
+		beef.mergeTxidOnly(item.txid);
+		return;
+	}
+	const transaction = beef.mergeRawTx(result.rawTx);
+	if (result.inputBEEF != null) beef.mergeBeef(result.inputBEEF);
+	appendNewDependencies(transaction.inputTxids, item.depth + 1, beef, scheduled, next, hasKnownTxid);
+}
+function appendNewDependencies(dependencies, depth, beef, scheduled, next, hasKnownTxid) {
+	for (const txid of dependencies) {
+		if (scheduled.has(txid) || !needsResolution(beef, txid, hasKnownTxid)) continue;
+		scheduled.add(txid);
+		next.push({
+			txid,
+			depth
+		});
+	}
+}
+function needsResolution(beef, txid, hasKnownTxid) {
+	const entry = beef.findTxid(txid);
+	return entry == null || entry.isTxidOnly && !hasKnownTxid(txid);
+}
+async function mergeMissingFragments(storage, beef, missing, options) {
+	if (missing.length === 0) return;
+	if (options.ignoreServices === true) throw new WERR_INVALID_PARAMETER(`txid ${missing[0].txid}`, `valid transaction on chain ${storage.chain}`);
+	const fragments = await mapWithConcurrency(missing, normalizeConcurrency(options.maxConcurrency), async (item) => await getBeefForTransaction(storage, item.txid, {
+		...options,
+		ignoreStorage: true,
+		mergeToBeef: void 0
+	}));
+	for (const fragment of fragments) beef.mergeBeef(fragment);
+}
+function makeKnownTxidLookup$1(knownTxids) {
+	let lookups = 0;
+	let indexed;
+	return (txid) => {
+		lookups++;
+		if (indexed != null) return indexed.has(txid);
+		if (knownTxids.length > 64 && lookups > 4) {
+			indexed = new Set(knownTxids);
+			return indexed.has(txid);
+		}
+		return knownTxids.includes(txid);
+	};
+}
+function normalizeConcurrency(value = 8) {
+	return Number.isFinite(value) ? Math.max(1, Math.min(32, Math.floor(value))) : 8;
+}
 async function mapWithConcurrency(values, concurrency, mapper) {
 	const results = Array.from({ length: values.length }, () => void 0);
 	let cursor = 0;
@@ -5160,11 +5358,11 @@ async function mergeUsableProvenTransaction(beef, txid, result, options, recursi
 	beef.mergeBump(merklePath);
 	return beef;
 }
-async function resolveBeefForTransaction(storage, txid, options, knownTxids, recursionDepth) {
+async function resolveBeefForTransaction(storage, txid, options, hasKnownTxid, recursionDepth) {
 	const maxDepth = storage.maxRecursionDepth;
 	if (maxDepth && maxDepth <= recursionDepth) throw new WERR_INVALID_OPERATION(`Maximum BEEF depth exceeded. Limit is ${storage.maxRecursionDepth}`);
 	const beef = new Beef();
-	if (knownTxids.has(txid)) {
+	if (hasKnownTxid(txid)) {
 		beef.mergeTxidOnly(txid);
 		return {
 			beef,
@@ -5245,6 +5443,23 @@ async function createMergedBeefOfTxids(txids, storage) {
 //#endregion
 //#region ../src/storage/methods/processAction.ts
 async function processAction$1(storage, auth, args) {
+	if (!storage.telemetry.enabled) return await processActionCore(storage, auth, args);
+	return await storage.telemetry.withSpan("wallet.storage.process_action", {
+		component: "wallet-storage",
+		carrier: args,
+		attributes: {
+			"action.is_new_transaction": args.isNewTx,
+			"action.is_no_send": args.isNoSend,
+			"action.is_delayed": args.isDelayed,
+			"action.send_with_count": args.sendWith.length
+		}
+	}, async (span) => {
+		const result = await processActionCore(storage, auth, args, span);
+		span.end({ attributes: { "action.send_result_count": result.sendWithResults?.length ?? 0 } });
+		return result;
+	});
+}
+async function processActionCore(storage, auth, args, parent) {
 	const logger = args.logger;
 	logger?.group("storage processAction");
 	const userId = verifyId(auth.userId);
@@ -5252,9 +5467,9 @@ async function processAction$1(storage, auth, args) {
 	let req;
 	const txidsOfReqsToShareWithWorld = [...args.sendWith];
 	if (args.isNewTx) {
-		const vargs = await validateCommitNewTxToStorageArgs(storage, userId, args);
+		const vargs = await traceProcessStep(storage, "wallet.storage.process_action.validate", parent, async () => await validateCommitNewTxToStorageArgs(storage, userId, args));
 		logger?.log("validated new tx updates to storage");
-		({req} = await commitNewTxToStorage(storage, userId, vargs));
+		({req} = await traceProcessStep(storage, "wallet.storage.process_action.commit", parent, async () => await commitNewTxToStorage(storage, userId, vargs)));
 		logger?.log("committed new tx updates to storage ");
 		if (!req) throw new WERR_INTERNAL();
 		if (args.isNoSend && !args.isSendWith) logger?.log(`noSend txid ${req.txid}`);
@@ -5263,12 +5478,19 @@ async function processAction$1(storage, auth, args) {
 			logger?.log(`sending txid ${req.txid}`);
 		}
 	}
-	const { swr, ndr } = await shareReqsWithWorld(storage, userId, txidsOfReqsToShareWithWorld, args.isDelayed, void 0, logger);
+	const { swr, ndr } = await traceProcessStep(storage, "wallet.storage.process_action.share", parent, async () => await shareReqsWithWorld(storage, userId, txidsOfReqsToShareWithWorld, args.isDelayed, void 0, logger));
 	r.sendWithResults = swr;
 	r.notDelayedResults = ndr;
 	logger?.groupEnd();
 	return r;
 }
+async function traceProcessStep(storage, name, parent, callback) {
+	if (parent == null) return await callback();
+	return await storage.telemetry.withSpan(name, {
+		component: "wallet-storage",
+		parent: parent.context
+	}, callback);
+}
 /**
 * Verifies that all the txids are known reqs with ready-to-share status.
 * Assigns a batch identifier and updates all the provenTxReqs.
@@ -5439,21 +5661,16 @@ async function validateCommitNewTxToStorageArgs(storage, userId, params) {
 	} }));
 	if (!transaction.isOutgoing) throw new WERR_INVALID_OPERATION("isOutgoing is not true");
 	if (transaction.inputBEEF == null) throw new WERR_INVALID_OPERATION();
-	const beef = Beef.fromBinary(asArray(transaction.inputBEEF));
 	if (transaction.status !== "unsigned" && transaction.status !== "unprocessed") throw new WERR_INVALID_OPERATION(`invalid transaction status ${transaction.status}`);
 	const transactionId = verifyId(transaction.transactionId);
-	const outputOutputs = await storage.findOutputs({ partial: {
+	const [outputOutputs, commissionRows] = await Promise.all([storage.findOutputs({ partial: {
 		userId,
 		transactionId
-	} });
-	const inputOutputs = await storage.findOutputs({ partial: {
-		userId,
-		spentBy: transactionId
-	} });
-	const commission = verifyOneOrNone(await storage.findCommissions({ partial: {
+	} }), storage.commissionSatoshis > 0 ? storage.findCommissions({ partial: {
 		transactionId,
 		userId
-	} }));
+	} }) : Promise.resolve([])]);
+	const commission = verifyOneOrNone(commissionRows);
 	if (storage.commissionSatoshis > 0) {
 		if (commission == null) throw new WERR_INTERNAL();
 		if (!tx.outputs.some((x) => x.satoshis === commission.satoshis && x.lockingScript.toHex() === asString(commission.lockingScript))) throw new WERR_INVALID_OPERATION("Transaction did not include an output to cover service fee.");
@@ -5473,10 +5690,7 @@ async function validateCommitNewTxToStorageArgs(storage, userId, params) {
 		txScriptOffsets,
 		transactionId,
 		transaction,
-		inputOutputs,
 		outputOutputs,
-		commission,
-		beef,
 		req,
 		outputUpdates: [],
 		transactionUpdate: {
@@ -6154,17 +6368,24 @@ async function generateChangeSdkCore(params, allocateChangeInput, releaseChangeI
 		};
 		const fixedInputs = params.fixedInputs;
 		const fixedOutputs = params.fixedOutputs;
+		const fixedFunding = fixedInputs.reduce((sum, input) => sum + input.satoshis, 0);
+		let fixedSpending = fixedOutputs.reduce((sum, output) => sum + output.satoshis, 0);
+		const fixedInputSize = fixedInputs.reduce((sum, input) => sum + transactionInputSize(input.unlockingScriptLength), 0);
+		const fixedOutputSize = fixedOutputs.reduce((sum, output) => sum + transactionOutputSize(output.lockingScriptLength), 0);
+		const changeInputSize = transactionInputSize(params.changeUnlockingScriptLength);
+		const changeOutputSize = transactionOutputSize(params.changeLockingScriptLength);
+		let allocatedFunding = 0;
 		/**
 		* @returns sum of transaction fixedInputs satoshis and fundingInputs satoshis
 		*/
 		const funding = () => {
-			return fixedInputs.reduce((a, e) => a + e.satoshis, 0) + r.allocatedChangeInputs.reduce((a, e) => a + e.satoshis, 0);
+			return fixedFunding + allocatedFunding;
 		};
 		/**
 		* @returns sum of transaction fixedOutputs satoshis
 		*/
 		const spending = () => {
-			return fixedOutputs.reduce((a, e) => a + e.satoshis, 0);
+			return fixedSpending;
 		};
 		/**
 		* @returns sum of transaction changeOutputs satoshis
@@ -6174,7 +6395,9 @@ async function generateChangeSdkCore(params, allocateChangeInput, releaseChangeI
 		};
 		const fee = () => funding() - spending() - change();
 		const size = (addedChangeInputs, addedChangeOutputs) => {
-			return transactionSize([...fixedInputs.map((x) => x.unlockingScriptLength), ...Array.from({ length: r.allocatedChangeInputs.length + (addedChangeInputs || 0) }, () => params.changeUnlockingScriptLength)], [...fixedOutputs.map((x) => x.lockingScriptLength), ...Array.from({ length: r.changeOutputs.length + (addedChangeOutputs || 0) }, () => params.changeLockingScriptLength)]);
+			const inputCount = fixedInputs.length + r.allocatedChangeInputs.length + (addedChangeInputs || 0);
+			const outputCount = fixedOutputs.length + r.changeOutputs.length + (addedChangeOutputs || 0);
+			return 4 + varUintSize(inputCount) + fixedInputSize + (r.allocatedChangeInputs.length + (addedChangeInputs || 0)) * changeInputSize + varUintSize(outputCount) + fixedOutputSize + (r.changeOutputs.length + (addedChangeOutputs || 0)) * changeOutputSize + 4;
 		};
 		/**
 		* @returns the target fee required for the transaction as currently configured under feeModel.
@@ -6213,7 +6436,10 @@ async function generateChangeSdkCore(params, allocateChangeInput, releaseChangeI
 		const releaseAllocatedChangeInputs = async () => {
 			while (r.allocatedChangeInputs.length > 0) {
 				const i = r.allocatedChangeInputs.pop();
-				if (i != null) await releaseChangeInput(i.outputId);
+				if (i != null) {
+					allocatedFunding -= i.satoshis;
+					await releaseChangeInput(i.outputId);
+				}
 			}
 			feeExcessNow = feeExcess();
 		};
@@ -6248,6 +6474,7 @@ async function generateChangeSdkCore(params, allocateChangeInput, releaseChangeI
 				const allocatedChangeInput = await allocateChangeInput(-feeExcess(1, ao) + (ao === 1 ? 2 * params.changeInitialSatoshis : 0) + changeBuffer, exactSatoshis);
 				if (allocatedChangeInput == null) return false;
 				r.allocatedChangeInputs.push(allocatedChangeInput);
+				allocatedFunding += allocatedChangeInput.satoshis;
 				maybeAddChangeOutput(ao);
 				return true;
 			};
@@ -6259,6 +6486,7 @@ async function generateChangeSdkCore(params, allocateChangeInput, releaseChangeI
 				while (r.changeOutputs.length > 0 && feeExcess() < 0) r.changeOutputs.pop();
 				if (feeExcess() < 0) break;
 				removeChurnPairs(r.allocatedChangeInputs, r.changeOutputs);
+				allocatedFunding = r.allocatedChangeInputs.reduce((sum, input) => sum + input.satoshis, 0);
 			}
 		};
 		/**
@@ -6267,7 +6495,9 @@ async function generateChangeSdkCore(params, allocateChangeInput, releaseChangeI
 		await fundTransaction();
 		if (feeExcess() < 0 && vgcpr.hasMaxPossibleOutput !== void 0) {
 			if (fixedOutputs[vgcpr.hasMaxPossibleOutput].satoshis !== 0x775f05a073fff) throw new WERR_INTERNAL();
-			fixedOutputs[vgcpr.hasMaxPossibleOutput].satoshis += feeExcess();
+			const adjustment = feeExcess();
+			fixedOutputs[vgcpr.hasMaxPossibleOutput].satoshis += adjustment;
+			fixedSpending += adjustment;
 			r.maxPossibleSatoshisAdjustment = {
 				fixedOutputIndex: vgcpr.hasMaxPossibleOutput,
 				satoshis: fixedOutputs[vgcpr.hasMaxPossibleOutput].satoshis
@@ -6286,8 +6516,11 @@ async function generateChangeSdkCore(params, allocateChangeInput, releaseChangeI
 		* If needed, seek funding to avoid overspending on fees without a change output to recapture it.
 		*/
 		if (r.changeOutputs.length === 0 && feeExcessNow > 0) {
+			const minimumChange = Math.max(dustFloor, params.changeFirstSatoshis);
+			const totalSatoshisNeeded = spending() + feeTarget(0, 1) + minimumChange;
+			const moreSatoshisNeeded = Math.max(1, totalSatoshisNeeded - funding());
 			await releaseAllocatedChangeInputs();
-			throw new WERR_INSUFFICIENT_FUNDS(spending() + feeTarget(), params.changeFirstSatoshis);
+			throw new WERR_INSUFFICIENT_FUNDS(totalSatoshisNeeded, moreSatoshisNeeded);
 		}
 		/**
 		* Distribute the excess fees across the changeOutputs added.
@@ -6611,6 +6844,8 @@ function makeChangeLock(out, dctr, args, changeKeys, wallet) {
 }
 //#endregion
 //#region ../src/signer/methods/verifyUnlockScripts.ts
+const postChronicleHeightFallback = 943816;
+const canonicalP2PKHScope = TransactionSignature.SIGHASH_ALL + TransactionSignature.SIGHASH_FORKID;
 const javaScriptOnlyVerifier = {
 	shouldVerifySpend: () => false,
 	verifySpend: async () => {
@@ -6622,10 +6857,11 @@ function invalidUnlockingScript(inputIndex, detail) {
 	return new WERR_INVALID_PARAMETER(`inputs[${inputIndex}].unlockScript`, `valid.${suffix}`);
 }
 async function verifyOneSpend(pending, verifier) {
+	const [inputIndex, , spend, context] = pending;
 	try {
-		if (!(verifier === void 0 ? pending.spend.validate(pending.context) : await pending.spend.validateWith(verifier, pending.context))) throw invalidUnlockingScript(pending.inputIndex);
+		if (!(verifier === void 0 ? spend.validate(context) : await spend.validateWith(verifier, context))) throw invalidUnlockingScript(inputIndex);
 	} catch (error) {
-		if (error instanceof ScriptEvaluationError) throw invalidUnlockingScript(pending.inputIndex, error.message);
+		if (error instanceof ScriptEvaluationError) throw invalidUnlockingScript(inputIndex, error.message);
 		throw error;
 	}
 }
@@ -6635,33 +6871,157 @@ async function verifyPendingSpends(pending, verifier) {
 		return;
 	}
 	const batched = [];
-	for (const item of pending) if (verifier.shouldVerifySpend?.(item.spend, item.context) !== false) batched.push(item);
+	for (const item of pending) if (verifier.shouldVerifySpend?.(item[2], item[3]) !== false) batched.push(item);
 	else await verifyOneSpend(item, javaScriptOnlyVerifier);
 	if (batched.length === 0) return;
 	let verdicts;
 	try {
 		verdicts = await verifier.verifySpendsBatch(batched.map((item) => ({
-			spend: item.spend,
-			...item.context
+			spend: item[2],
+			...item[3]
 		})));
 	} catch (error) {
-		if (error instanceof ScriptEvaluationError) throw invalidUnlockingScript(batched[0].inputIndex, error.message);
+		if (error instanceof ScriptEvaluationError) throw invalidUnlockingScript(batched[0][0], error.message);
 		throw error;
 	}
 	if (verdicts.length !== batched.length) throw new Error("Script verifier returned an invalid batch result count");
 	verdicts.forEach((valid, index) => {
-		if (!valid) throw invalidUnlockingScript(batched[index].inputIndex);
+		if (!valid) throw invalidUnlockingScript(batched[index][0]);
 	});
 }
-function collectTransactionSpends(txid, resultIndex, beef, result, pending) {
-	const tx = beef.findTxid(txid)?.tx;
+function wholeTransactionVerifier(verifier) {
+	const candidate = verifier;
+	return typeof candidate?.verifyScripts === "function" ? candidate : void 0;
+}
+function digestBatchVerifier(verifier) {
+	const candidate = verifier;
+	if (typeof candidate?.verifyDigestBatch !== "function") return void 0;
+	if (candidate.isReady?.() === false) return void 0;
+	if (candidate.supportsCrypto?.("verifyDigestBatch") === false) return void 0;
+	return candidate;
+}
+function equalBytes(left, right) {
+	if (left.length !== right.length) return false;
+	for (let index = 0; index < left.length; index++) if (left[index] !== right[index]) return false;
+	return true;
+}
+function isCanonicalP2PKHLock(lock) {
+	return lock.length === 25 && lock[0] === 118 && lock[1] === 169 && lock[2] === 20 && lock[23] === 136 && lock[24] === 172;
+}
+function parseCanonicalP2PKHUnlock(unlock, lock) {
+	const signatureLength = unlock[0];
+	if (signatureLength == null || signatureLength < 9 || signatureLength > 73 || unlock.length !== 1 + signatureLength + 1 + 33 || unlock[1 + signatureLength] !== 33) return void 0;
+	const checksig = Array.from(unlock.subarray(1, 1 + signatureLength));
+	const publicKey = unlock.subarray(1 + signatureLength + 1);
+	if (publicKey[0] !== 2 && publicKey[0] !== 3 || !equalBytes(Hash.hash160(publicKey), lock.subarray(3, 23))) return void 0;
+	let signature;
+	try {
+		signature = TransactionSignature.fromChecksigFormat(checksig);
+	} catch {
+		return;
+	}
+	if (signature.scope !== canonicalP2PKHScope || !signature.hasLowS() || !equalBytes(signature.toChecksigFormat(), checksig)) return void 0;
+	return [
+		checksig,
+		publicKey,
+		signature
+	];
+}
+/**
+* Recognizes only the exact canonical P2PKH shape generated by this wallet.
+* Anything else retains the general-purpose script interpreter/backend path.
+*/
+function standardP2PKHDigests(tx) {
+	const cache = { hashOutputsSingle: /* @__PURE__ */ new Map() };
+	const items = [];
+	for (let inputIndex = 0; inputIndex < tx.inputs.length; inputIndex++) {
+		const input = tx.inputs[inputIndex];
+		const sourceTransaction = input.sourceTransaction;
+		const sourceTXID = input.sourceTXID;
+		const unlockingScript = input.unlockingScript;
+		if (sourceTransaction == null || sourceTXID == null || unlockingScript == null) return void 0;
+		const sourceOutput = sourceTransaction.outputs[input.sourceOutputIndex];
+		if (sourceOutput == null) return void 0;
+		const lock = sourceOutput.lockingScript.toUint8Array();
+		if (!isCanonicalP2PKHLock(lock)) return void 0;
+		const parsed = parseCanonicalP2PKHUnlock(unlockingScript.toUint8Array(), lock);
+		if (parsed == null) return void 0;
+		const [checksig, publicKey, signature] = parsed;
+		const preimage = TransactionSignature.formatBytes({
+			sourceTXID,
+			sourceOutputIndex: input.sourceOutputIndex,
+			sourceSatoshis: sourceOutput.satoshis ?? 0,
+			transactionVersion: tx.version,
+			otherInputs: [],
+			allInputs: tx.inputs,
+			outputs: tx.outputs,
+			inputIndex,
+			subscript: sourceOutput.lockingScript,
+			inputSequence: input.sequence ?? 4294967295,
+			lockTime: tx.lockTime,
+			scope: signature.scope,
+			cache
+		});
+		items.push({
+			publicKey,
+			digest: Uint8Array.from(Hash.hash256(preimage)),
+			signature: Uint8Array.from(checksig.slice(0, -1))
+		});
+	}
+	return items;
+}
+async function verifyStandardP2PKHDigests(pending, verifier) {
+	if (pending.length === 0) return /* @__PURE__ */ new Set();
+	const items = pending.flatMap((entry) => entry[1]);
+	const verdicts = await verifier.verifyDigestBatch(items);
+	if (verdicts.length !== items.length) throw new Error("Script verifier returned an invalid digest batch result count");
+	const verified = /* @__PURE__ */ new Set();
+	let offset = 0;
+	for (const entry of pending) {
+		const end = offset + entry[1].length;
+		if (verdicts.slice(offset, end).every(Boolean)) verified.add(entry[0]);
+		offset = end;
+	}
+	return verified;
+}
+function hydrateTransactionSources(txid, transactions) {
+	const tx = transactions.get(txid);
+	if (tx == null) throw new WERR_INVALID_PARAMETER("txid", `contained in beef, txid ${txid}`);
+	for (let inputIndex = 0; inputIndex < tx.inputs.length; inputIndex++) {
+		const input = tx.inputs[inputIndex];
+		if (input.sourceTXID == null) throw new WERR_INVALID_PARAMETER(`inputs[${inputIndex}].sourceTXID`, "valid");
+		if (input.unlockingScript == null) throw new WERR_INVALID_PARAMETER(`inputs[${inputIndex}].unlockingScript`, "valid");
+		input.sourceTransaction = transactions.get(input.sourceTXID);
+		if (input.sourceTransaction == null) return void 0;
+		if (input.sourceTransaction.outputs[input.sourceOutputIndex] == null) throw new WERR_INVALID_PARAMETER(`inputs[${inputIndex}].sourceOutputIndex`, "reference an output in the source transaction");
+	}
+	return tx;
+}
+function transactionIndex(txids, beef) {
+	if (txids.length > 0) beef.findTxid(txids[0]);
+	return new Map(beef.txs.map((item) => [item.txid, item.tx]));
+}
+async function verifyWholeTransactions(pending, verifier) {
+	if (pending.length === 0) return /* @__PURE__ */ new Set();
+	let verdicts;
+	try {
+		verdicts = verifier.verifyScriptsBatch === void 0 ? await Promise.all(pending.map(async (item) => await verifier.verifyScripts(item[1]))) : await verifier.verifyScriptsBatch(pending.map((item) => item[1]));
+	} catch (error) {
+		if (error instanceof ScriptEvaluationError) return /* @__PURE__ */ new Set();
+		throw error;
+	}
+	if (verdicts.length !== pending.length) throw new Error("Script verifier returned an invalid transaction batch result count");
+	return new Set(pending.filter((_, index) => verdicts[index]).map((item) => item[0]));
+}
+function collectTransactionSpends(txid, resultIndex, transactions, result, pending) {
+	const tx = transactions.get(txid);
 	if (tx == null) throw new WERR_INVALID_PARAMETER("txid", `contained in beef, txid ${txid}`);
 	const sigHashCache = { hashOutputsSingle: /* @__PURE__ */ new Map() };
 	for (let inputIndex = 0; inputIndex < tx.inputs.length; inputIndex++) {
 		const input = tx.inputs[inputIndex];
 		if (input.sourceTXID == null) throw new WERR_INVALID_PARAMETER(`inputs[${inputIndex}].sourceTXID`, "valid");
 		if (input.unlockingScript == null) throw new WERR_INVALID_PARAMETER(`inputs[${inputIndex}].unlockingScript`, "valid");
-		input.sourceTransaction = beef.findTxid(input.sourceTXID)?.tx;
+		input.sourceTransaction = transactions.get(input.sourceTXID);
 		if (input.sourceTransaction == null) {
 			result.skippedInputs++;
 			continue;
@@ -6673,11 +7033,10 @@ function collectTransactionSpends(txid, resultIndex, beef, result, pending) {
 			consensus: true,
 			utxoHeight
 		};
-		pending.push({
+		pending.push([
 			inputIndex,
 			resultIndex,
-			context,
-			spend: new Spend({
+			new Spend({
 				sourceTXID: input.sourceTXID,
 				sourceOutputIndex: input.sourceOutputIndex,
 				lockingScript: sourceOutput.lockingScript,
@@ -6691,9 +7050,52 @@ function collectTransactionSpends(txid, resultIndex, beef, result, pending) {
 				outputs: tx.outputs,
 				lockTime: tx.lockTime,
 				sigHashCache
-			})
-		});
+			}),
+			context
+		]);
+	}
+}
+function collectAcceleratedTransactions(txids, transactions, digestVerifier, enabled) {
+	const hydrated = /* @__PURE__ */ new Map();
+	const digests = [];
+	if (!enabled) return [hydrated, digests];
+	for (let resultIndex = 0; resultIndex < txids.length; resultIndex++) {
+		const tx = hydrateTransactionSources(txids[resultIndex], transactions);
+		if (tx == null) continue;
+		hydrated.set(resultIndex, tx);
+		if (digestVerifier === void 0) continue;
+		const items = standardP2PKHDigests(tx);
+		if (items != null) digests.push([resultIndex, items]);
+	}
+	return [hydrated, digests];
+}
+function collectWholeTransactionVerifications(hydrated, digestAttempted, verifier) {
+	if (verifier === void 0) return [];
+	const pending = [];
+	for (const [resultIndex, tx] of hydrated) {
+		if (digestAttempted.has(resultIndex)) continue;
+		const params = {
+			tx,
+			blockHeight: postChronicleHeightFallback,
+			consensus: true
+		};
+		if (verifier.shouldVerifyScripts?.(params) === false) continue;
+		pending.push([resultIndex, params]);
+	}
+	return pending;
+}
+function collectFallbackSpends(txids, transactions, accelerated, results) {
+	const pending = [];
+	for (let resultIndex = 0; resultIndex < txids.length; resultIndex++) {
+		if (!accelerated.has(resultIndex)) {
+			collectTransactionSpends(txids[resultIndex], resultIndex, transactions, results[resultIndex], pending);
+			continue;
+		}
+		const tx = transactions.get(txids[resultIndex]);
+		if (tx == null) throw new WERR_INVALID_PARAMETER("txid", `contained in beef, txid ${txids[resultIndex]}`);
+		results[resultIndex].verifiedInputs = tx.inputs.length;
 	}
+	return pending;
 }
 /**
 * Verifies every resolvable input from several transactions in one optional
@@ -6704,10 +7106,17 @@ async function verifyUnlockScriptsBatch(txids, beef, verifier) {
 		verifiedInputs: 0,
 		skippedInputs: 0
 	}));
-	const pending = [];
-	for (let resultIndex = 0; resultIndex < txids.length; resultIndex++) collectTransactionSpends(txids[resultIndex], resultIndex, beef, results[resultIndex], pending);
+	const transactions = transactionIndex(txids, beef);
+	const digestVerifier = digestBatchVerifier(verifier);
+	const wholeVerifier = wholeTransactionVerifier(verifier);
+	const [hydrated, digestPending] = collectAcceleratedTransactions(txids, transactions, digestVerifier, digestVerifier !== void 0 || wholeVerifier !== void 0);
+	const digestAttempted = new Set(digestPending.map((item) => item[0]));
+	const digestVerified = digestVerifier === void 0 ? /* @__PURE__ */ new Set() : await verifyStandardP2PKHDigests(digestPending, digestVerifier);
+	const wholePending = collectWholeTransactionVerifications(hydrated, digestAttempted, wholeVerifier);
+	const wholeVerified = wholeVerifier === void 0 ? /* @__PURE__ */ new Set() : await verifyWholeTransactions(wholePending, wholeVerifier);
+	const pending = collectFallbackSpends(txids, transactions, /* @__PURE__ */ new Set([...digestVerified, ...wholeVerified]), results);
 	await verifyPendingSpends(pending, verifier);
-	for (const item of pending) results[item.resultIndex].verifiedInputs++;
+	for (const item of pending) results[item[1]].verifiedInputs++;
 	return results;
 }
 /**
@@ -6730,21 +7139,56 @@ async function completeSignedTransaction(prior, spends, wallet) {
 		input.unlockingScript = asBsvSdkScript(spend.unlockingScript);
 		if (spend.sequenceNumber !== void 0) input.sequence = spend.sequenceNumber;
 	}
-	for (const pdi of prior.pdi) {
-		const sabppp = new ScriptTemplateBRC29({
-			derivationPrefix: pdi.derivationPrefix,
-			derivationSuffix: pdi.derivationSuffix,
-			keyDeriver: wallet.keyDeriver
-		});
-		const keys = wallet.getClientChangeKeyPair();
-		const lockerPrivKey = keys.privateKey;
-		const unlockerPubKey = pdi.unlockerPubKey || keys.publicKey;
-		const sourceSatoshis = pdi.sourceSatoshis;
-		const lockingScript = asBsvSdkScript(pdi.lockingScript);
-		const unlockTemplate = sabppp.unlock(lockerPrivKey, unlockerPubKey, sourceSatoshis, lockingScript);
-		const input = prior.tx.inputs[pdi.vin];
-		input.unlockingScriptTemplate = unlockTemplate;
-	}
+	const prepareUnlockingTemplates = (keys) => {
+		const counterparties = /* @__PURE__ */ new Map();
+		const counterparty = (publicKey) => {
+			let parsed = counterparties.get(publicKey);
+			if (parsed == null) {
+				parsed = PublicKey.fromString(publicKey);
+				counterparties.set(publicKey, parsed);
+			}
+			return parsed;
+		};
+		const prepared = prior.pdi.map((pdi) => {
+			return {
+				pdi,
+				template: new ScriptTemplateBRC29({
+					derivationPrefix: pdi.derivationPrefix,
+					derivationSuffix: pdi.derivationSuffix,
+					keyDeriver: wallet.keyDeriver
+				}),
+				unlockerPubKey: counterparty(pdi.unlockerPubKey || keys.publicKey)
+			};
+		});
+		const derivations = prepared.map(({ template, unlockerPubKey }) => ({
+			protocolID: brc29ProtocolID,
+			keyID: template.getKeyID(),
+			counterparty: unlockerPubKey
+		}));
+		const derivedPrivateKeys = wallet.keyDeriver.derivePrivateKeys?.(derivations) ?? derivations.map((derivation) => wallet.keyDeriver.derivePrivateKey(derivation.protocolID, derivation.keyID, derivation.counterparty));
+		for (let index = 0; index < prepared.length; index++) {
+			const { pdi, template } = prepared[index];
+			const unlockTemplate = template.unlockWithDerivedPrivateKey(derivedPrivateKeys[index], pdi.sourceSatoshis, asBsvSdkScript(pdi.lockingScript));
+			const input = prior.tx.inputs[pdi.vin];
+			input.unlockingScriptTemplate = unlockTemplate;
+		}
+	};
+	if (wallet.telemetry.enabled && prior.pdi.length > 0) await wallet.telemetry.withSpan("wallet.crypto.prepare_unlocking_templates", {
+		component: "wallet-toolbox",
+		carrier: prior.args,
+		attributes: { "crypto.managed_input_count": prior.pdi.length }
+	}, async (span) => {
+		const keys = await wallet.telemetry.withSpan("wallet.crypto.client_change_key", {
+			component: "wallet-toolbox",
+			parent: span.context
+		}, () => wallet.getClientChangeKeyPair());
+		await wallet.telemetry.withSpan("wallet.crypto.derive_unlocking_templates", {
+			component: "wallet-toolbox",
+			parent: span.context,
+			attributes: { "crypto.managed_input_count": prior.pdi.length }
+		}, () => prepareUnlockingTemplates(keys));
+	});
+	else if (prior.pdi.length > 0) prepareUnlockingTemplates(wallet.getClientChangeKeyPair());
 	if (wallet.telemetry.enabled) await wallet.telemetry.withSpan("wallet.crypto.transaction_sign", {
 		component: "wallet-toolbox",
 		carrier: prior.args,
@@ -6765,7 +7209,7 @@ function getResultBeef(result) {
 //#endregion
 //#region ../src/signer/methods/createAction.ts
 async function createAction$1(wallet, auth, vargs) {
-	if (!wallet.telemetry.enabled) return await createActionCore(wallet, auth, vargs);
+	if (!wallet.telemetry.enabled) return await createActionCore$1(wallet, auth, vargs);
 	return await wallet.telemetry.withSpan("wallet.create_action", {
 		component: "wallet-toolbox",
 		carrier: vargs,
@@ -6776,7 +7220,7 @@ async function createAction$1(wallet, auth, vargs) {
 			"action.is_sign_action": vargs.isSignAction
 		}
 	}, async (span) => {
-		const result = await createActionCore(wallet, auth, vargs, span);
+		const result = await createActionCore$1(wallet, auth, vargs, span);
 		span.end({ attributes: {
 			"action.has_transaction": result.tx != null,
 			"action.has_signable_transaction": result.signableTransaction != null,
@@ -6785,7 +7229,7 @@ async function createAction$1(wallet, auth, vargs) {
 		return result;
 	});
 }
-async function createActionCore(wallet, auth, vargs, parent) {
+async function createActionCore$1(wallet, auth, vargs, parent) {
 	const r = {};
 	const logger = vargs.logger;
 	let prior;
@@ -6800,19 +7244,22 @@ async function createActionCore(wallet, auth, vargs, parent) {
 		prior.tx = await traceActionStep(wallet, "wallet.create_action.complete_signing", parent, async () => await completeSignedTransaction(prior, {}, wallet));
 		logger?.log("completed signed transaction");
 		r.txid = prior.tx.id("hex");
-		const beef = new Beef();
-		if (prior.dcr.inputBeef != null) {
-			const inputBeef = prior.dcr.inputBeef instanceof Uint8Array ? Beef.fromBinaryView(prior.dcr.inputBeef) : Beef.fromBinary(prior.dcr.inputBeef);
-			beef.mergeBeef(inputBeef);
-		}
-		beef.mergeTransaction(prior.tx);
+		const beef = await traceActionStep(wallet, "wallet.create_action.assemble_result_beef", parent, () => {
+			const result = new Beef();
+			if (prior.dcr.inputBeef != null) {
+				const inputBeef = prior.dcr.inputBeef instanceof Uint8Array ? Beef.fromBinaryView(prior.dcr.inputBeef) : Beef.fromBinary(prior.dcr.inputBeef);
+				result.mergeBeef(inputBeef);
+			}
+			result.mergeTransaction(prior.tx);
+			return result;
+		});
 		logger?.log("merged beef");
 		await traceActionStep(wallet, "wallet.create_action.verify_unlock_scripts", parent, async () => await verifyUnlockScripts(r.txid, beef, wallet.scriptVerifier));
 		logger?.log("verified unlock scripts");
 		r.noSendChange = prior.dcr.noSendChangeOutputVouts?.map((vout) => `${r.txid}.${vout}`);
 		beef.atomicTxid = r.txid;
 		setResultBeef(r, beef);
-		if (!vargs.options.returnTXIDOnly) r.tx = beef.toUint8ArrayAtomic(r.txid);
+		if (!vargs.options.returnTXIDOnly) r.tx = await traceActionStep(wallet, "wallet.create_action.serialize_result_beef", parent, () => beef.toUint8ArrayAtomic(r.txid));
 	}
 	const { sendWithResults, notDelayedResults } = await traceActionStep(wallet, "wallet.create_action.process", parent, async () => await processAction(prior, wallet, auth, vargs));
 	logger?.log("processed transaction");
@@ -7430,6 +7877,50 @@ function selectCanonicalChange(outputs, targetSatoshis, exactSatoshis) {
 	if (over != null) return over;
 	return outputs.filter((output) => output.satoshis < targetSatoshis).sort((a, b) => b.satoshis - a.satoshis || b.outputId - a.outputId)[0];
 }
+/**
+* Stateful form of the canonical selector for allocating many inputs from one
+* candidate set. It preserves exact / least-over / largest-under ordering but
+* sorts once instead of filtering and sorting the full set per input.
+*/
+var CanonicalChangeSelector = class {
+	sorted;
+	allocated = /* @__PURE__ */ new Set();
+	constructor(outputs) {
+		this.sorted = [...outputs].sort((a, b) => a.satoshis - b.satoshis || a.outputId - b.outputId);
+	}
+	take(targetSatoshis, exactSatoshis) {
+		if (exactSatoshis !== void 0) for (let index = this.lowerBound(exactSatoshis); index < this.sorted.length; index++) {
+			const output = this.sorted[index];
+			if (output.satoshis !== exactSatoshis) break;
+			if (!this.allocated.has(output.outputId)) return this.allocate(output);
+		}
+		for (let index = this.lowerBound(targetSatoshis); index < this.sorted.length; index++) {
+			const output = this.sorted[index];
+			if (!this.allocated.has(output.outputId)) return this.allocate(output);
+		}
+		for (let index = this.lowerBound(targetSatoshis) - 1; index >= 0; index--) {
+			const output = this.sorted[index];
+			if (!this.allocated.has(output.outputId)) return this.allocate(output);
+		}
+	}
+	release(outputId) {
+		this.allocated.delete(outputId);
+	}
+	allocate(output) {
+		this.allocated.add(output.outputId);
+		return output;
+	}
+	lowerBound(satoshis) {
+		let low = 0;
+		let high = this.sorted.length;
+		while (low < high) {
+			const middle = low + high >>> 1;
+			if (this.sorted[middle].satoshis < satoshis) low = middle + 1;
+			else high = middle;
+		}
+		return low;
+	}
+};
 function repeatableRandom(randomVals) {
 	const values = [...randomVals ?? []];
 	return () => {
@@ -8565,6 +9056,22 @@ var ActionBatchController = class {
 };
 //#endregion
 //#region ../src/Wallet.ts
+function prepareKnownTxidsForCreateAction(wallet, args) {
+	if (!wallet.autoKnownTxids || args.options?.knownTxids != null) return;
+	if (!wallet.telemetry.enabled) {
+		args.options.knownTxids = wallet.getKnownTxids(args.options?.knownTxids);
+		return;
+	}
+	args.options.knownTxids = wallet.telemetry.withSpan("wallet.create_action.prepare_known_txids", {
+		component: "wallet-toolbox",
+		carrier: args,
+		attributes: { "beef.tx_count": wallet.beef.txs.length }
+	}, (span) => {
+		const knownTxids = wallet.getKnownTxids(args.options?.knownTxids);
+		span.end({ attributes: { "beef.known_txid_count": knownTxids.length } });
+		return knownTxids;
+	});
+}
 /**
 * Build a {@link DiscoverCertificatesResult} from contact records so {@link Wallet.discoverByIdentityKey}
 * and {@link Wallet.discoverByAttributes} can short-circuit on a local contacts hit. The synthetic
@@ -9038,6 +9545,7 @@ var Wallet = class {
 		if (this.returnTxidOnly) return beef;
 		const b = parsedBeef ?? Beef.fromBinary(beef);
 		if (!b.atomicTxid) throw new WERR_INTERNAL();
+		if (!b.txs.some((btx) => btx.isTxidOnly && !knownTxids?.includes(btx.txid))) return beef;
 		return this.verifyReturnedTxidOnly(b, knownTxids).toBinaryAtomic(b.atomicTxid);
 	}
 	verifyReturnedTxidOnlyBEEF(beef) {
@@ -9069,7 +9577,7 @@ var Wallet = class {
 			Validation.validateOriginator(originator);
 			args.options ??= {};
 			args.options.trustSelf ||= this.trustSelf;
-			if (this.autoKnownTxids && args.options.knownTxids == null) args.options.knownTxids = this.getKnownTxids(args.options.knownTxids);
+			prepareKnownTxidsForCreateAction(this, args);
 			const { auth, vargs } = this.validateAuthAndArgs(args, Validation.validateCreateActionArgs, logger);
 			logger?.log("validated args");
 			vargs.includeAllSourceTransactions = this.includeAllSourceTransactions;
@@ -9077,9 +9585,25 @@ var Wallet = class {
 			const r = await createAction$1(this, auth, vargs);
 			logger?.log("action created");
 			const resultBeef = getResultBeef(r);
-			if (r.tx != null) this.beef.mergeBeefFromParty(this.storageParty, resultBeef ?? r.tx);
 			if (r.tx != null) {
-				r.tx = this.verifyReturnedTxidOnlyAtomicBEEF(r.tx, args.options?.knownTxids, resultBeef);
+				const merge = () => this.beef.mergeBeefFromParty(this.storageParty, resultBeef ?? r.tx);
+				if (this.telemetry.enabled) this.telemetry.withSpan("wallet.create_action.merge_result_beef", {
+					component: "wallet-toolbox",
+					carrier: args,
+					attributes: {
+						"beef.retained_tx_count_before": this.beef.txs.length,
+						"beef.result_byte_count": r.tx.length
+					}
+				}, merge);
+				else merge();
+			}
+			if (r.tx != null) {
+				const verify = () => this.verifyReturnedTxidOnlyAtomicBEEF(r.tx, args.options?.knownTxids, resultBeef);
+				r.tx = this.telemetry.enabled ? this.telemetry.withSpan("wallet.create_action.verify_result_beef", {
+					component: "wallet-toolbox",
+					carrier: args,
+					attributes: { "beef.result_byte_count": r.tx.length }
+				}, verify) : verify();
 				logger?.log("verify returned AtomicBEEF");
 			}
 			if (!vargs.isDelayed) throwIfAnyUnsuccessfulCreateActions(r);
@@ -9388,6 +9912,28 @@ function isAutoSpendableChangeOutput(output) {
 	return isManagedChangeOutput(output) && output.spendable && output.spentBy == null;
 }
 async function createAction(storage, auth, vargs, _originator) {
+	if (!storage.telemetry.enabled) return await createActionCore(storage, auth, vargs);
+	return await storage.telemetry.withSpan("wallet.storage.create_action", {
+		component: "wallet-storage",
+		carrier: vargs,
+		attributes: {
+			"action.fixed_input_count": vargs.inputs.length,
+			"action.fixed_output_count": vargs.outputs.length,
+			"action.known_txid_count": vargs.options.knownTxids?.length ?? 0,
+			"action.is_delayed": vargs.isDelayed,
+			"action.is_no_send": vargs.isNoSend
+		}
+	}, async (span) => {
+		const result = await createActionCore(storage, auth, vargs, span);
+		span.end({ attributes: {
+			"action.result_input_count": result.inputs.length,
+			"action.result_output_count": result.outputs.length,
+			"action.input_beef_bytes": result.inputBeef?.length ?? 0
+		} });
+		return result;
+	});
+}
+async function createActionCore(storage, auth, vargs, parent) {
 	const logger = vargs.logger;
 	logger?.group("storage createAction");
 	if (vargs.isTestWerrReviewActions) throwDummyReviewActions();
@@ -9407,57 +9953,119 @@ async function createAction(storage, auth, vargs, _originator) {
 	* - Create and return result.
 	*/
 	const userId = auth.userId;
-	const { storageBeef, beef, xinputs } = await validateRequiredInputs(storage, userId, vargs);
-	logger?.log("validated required inputs");
-	const xoutputs = validateRequiredOutputs(storage, userId, vargs);
-	logger?.log("validated required outputs");
-	const changeBasketName = "default";
-	const changeBasket = verifyOne(await storage.findOutputBaskets({ partial: {
-		userId,
-		name: changeBasketName
-	} }), `Invalid outputGeneration basket "${changeBasketName}"`);
-	logger?.log("found change basket");
-	const noSendChangeIn = await validateNoSendChange(storage, userId, vargs, changeBasket);
-	logger?.log("validated noSendChange");
-	const availableChangeCount = await storage.countChangeInputs(userId, changeBasket.basketId, !vargs.isDelayed);
-	logger?.log(`counted change inputs ${availableChangeCount}`);
+	const { storageBeef, beef, xinputs, xoutputs, changeBasket, noSendChangeIn } = await traceStorageStep(storage, "wallet.storage.create_action.validate", parent, {
+		"action.fixed_input_count": vargs.inputs.length,
+		"action.fixed_output_count": vargs.outputs.length
+	}, async (span) => {
+		const requiredInputs = await validateRequiredInputs(storage, userId, vargs);
+		logger?.log("validated required inputs");
+		const xoutputs = validateRequiredOutputs(storage, userId, vargs);
+		logger?.log("validated required outputs");
+		const changeBasketName = "default";
+		const changeBasket = verifyOne(await storage.findOutputBaskets({ partial: {
+			userId,
+			name: changeBasketName
+		} }), `Invalid outputGeneration basket "${changeBasketName}"`);
+		logger?.log("found change basket");
+		const noSendChangeIn = await validateNoSendChange(storage, userId, vargs, changeBasket);
+		logger?.log("validated noSendChange");
+		span?.end({ attributes: {
+			"action.validated_input_count": requiredInputs.xinputs.length,
+			"action.validated_output_count": xoutputs.length,
+			"action.no_send_change_input_count": noSendChangeIn.length,
+			"action.validated_beef_tx_count": requiredInputs.beef.txs.length
+		} });
+		return {
+			...requiredInputs,
+			xoutputs,
+			changeBasket,
+			noSendChangeIn
+		};
+	});
 	const feeModel = validateStorageFeeModel(storage.feeModel);
 	logger?.log(`validated fee model ${JSON.stringify(feeModel)}`);
-	await preflightInsufficientFundsFastPath(vargs, xinputs, xoutputs, noSendChangeIn, availableChangeCount, feeModel);
-	logger?.log("passed insufficient-funds preflight");
+	const initialFundingPlan = await prepareFundingPlan(storage, [
+		userId,
+		vargs,
+		xinputs,
+		xoutputs,
+		changeBasket,
+		noSendChangeIn,
+		feeModel,
+		parent
+	]);
+	logger?.log(`planned funding from ${initialFundingPlan.availableChangeCount} change inputs`);
+	const allocatedBeefPrefetch = startAllocatedChangeBeefPrefetch(storage, vargs, initialFundingPlan.selected, beef, parent);
+	const storageBeefBytes = storageBeef.toBinary();
 	let newTx;
+	let newTxCommitted = false;
 	try {
-		newTx = await createNewTxRecord(storage, userId, vargs, storageBeef);
-		logger?.log("created new transaction record");
-		const ctx = {
-			xinputs,
-			xoutputs,
-			changeBasket,
-			noSendChangeIn,
-			availableChangeCount,
-			feeModel,
-			transactionId: newTx.transactionId
-		};
-		const { allocatedChange, changeOutputs, derivationPrefix, maxPossibleSatoshisAdjustment } = await fundNewTransactionSdk(storage, userId, vargs, ctx);
-		logger?.log("funded new transaction");
-		if (maxPossibleSatoshisAdjustment != null) {
-			const a = maxPossibleSatoshisAdjustment;
-			if (ctx.xoutputs[a.fixedOutputIndex].satoshis !== 0x775f05a073fff) throw new WERR_INTERNAL();
-			ctx.xoutputs[a.fixedOutputIndex].satoshis = a.satoshis;
-			logger?.log("adjusted change outputs to max possible");
-		}
-		const satoshis = changeOutputs.reduce((a, e) => a + e.satoshis, 0) - allocatedChange.reduce((a, e) => a + e.satoshis, 0);
-		await storage.updateTransaction(newTx.transactionId, { satoshis });
-		const { outputs, changeVouts } = await createNewOutputs(storage, userId, vargs, ctx, changeOutputs);
+		const persisted = await storage.transaction(async (trx) => {
+			const initialSatoshis = fundingPlanSatoshis(initialFundingPlan);
+			newTx = await traceStorageStep(storage, "wallet.storage.create_action.create_record", parent, {
+				"action.label_count": vargs.labels.length,
+				"action.storage_beef_bytes": storageBeefBytes.length
+			}, async (span) => {
+				const transaction = await createNewTxRecord(storage, userId, vargs, storageBeefBytes, initialSatoshis, trx);
+				span?.end({ attributes: { "action.transaction_record_created": true } });
+				return transaction;
+			});
+			logger?.log("created new transaction record");
+			const ctx = {
+				xinputs,
+				xoutputs,
+				changeBasket,
+				noSendChangeIn,
+				feeModel,
+				transactionId: newTx.transactionId
+			};
+			const funded = await fundNewTransactionSdk(storage, userId, vargs, ctx, initialFundingPlan, parent, trx);
+			logger?.log("funded new transaction");
+			if (funded.maxPossibleSatoshisAdjustment != null) {
+				const adjustment = funded.maxPossibleSatoshisAdjustment;
+				if (ctx.xoutputs[adjustment.fixedOutputIndex].satoshis !== 0x775f05a073fff) throw new WERR_INTERNAL();
+				ctx.xoutputs[adjustment.fixedOutputIndex].satoshis = adjustment.satoshis;
+				logger?.log("adjusted change outputs to max possible");
+			}
+			const satoshis = funded.changeOutputs.reduce((sum, output) => sum + output.satoshis, 0) - funded.allocatedChange.reduce((sum, output) => sum + output.satoshis, 0);
+			if (satoshis !== initialSatoshis) {
+				await storage.updateTransaction(newTx.transactionId, { satoshis }, trx);
+				newTx.satoshis = satoshis;
+			}
+			const storedOutputs = await traceStorageStep(storage, "wallet.storage.create_action.persist_outputs", parent, {
+				"action.fixed_output_count": ctx.xoutputs.length,
+				"action.change_output_count": funded.changeOutputs.length
+			}, async (span) => {
+				const result = await createNewOutputs(storage, userId, vargs, ctx, funded.changeOutputs, trx);
+				span?.end({ attributes: { "action.persisted_output_count": result.outputs.length } });
+				return result;
+			});
+			return {
+				...funded,
+				...storedOutputs,
+				ctx
+			};
+		});
+		newTxCommitted = true;
+		const committedTx = verifyTruthy(newTx);
+		const { allocatedChange, derivationPrefix, outputs, changeVouts, ctx } = persisted;
 		logger?.log("created new output records");
-		const inputBeef = await mergeAllocatedChangeBeefs(storage, userId, vargs, allocatedChange, beef);
+		const inputBeef = await mergeAllocatedChangeBeefs(storage, vargs, allocatedChange, beef, allocatedBeefPrefetch, parent);
 		logger?.log("merged allocated change beefs");
-		const inputs = await createNewInputs(storage, userId, vargs, ctx, allocatedChange);
+		const inputs = await traceStorageStep(storage, "wallet.storage.create_action.assemble_inputs", parent, {
+			"action.fixed_input_count": ctx.xinputs.length,
+			"action.funding_input_count": allocatedChange.length,
+			"action.include_source_transactions": vargs.includeAllSourceTransactions
+		}, async (span) => {
+			const assembled = await createNewInputs(storage, userId, vargs, ctx, allocatedChange);
+			span?.end({ attributes: { "action.result_input_count": assembled.length } });
+			return assembled;
+		});
 		logger?.log("created new inputs");
 		const r = {
-			reference: newTx.reference,
-			version: newTx.version,
-			lockTime: newTx.lockTime,
+			reference: committedTx.reference,
+			version: committedTx.version,
+			lockTime: committedTx.lockTime,
 			inputs,
 			outputs,
 			derivationPrefix,
@@ -9467,9 +10075,15 @@ async function createAction(storage, auth, vargs, _originator) {
 		logger?.groupEnd();
 		return r;
 	} catch (error) {
+		await allocatedBeefPrefetch;
 		if (newTx?.transactionId != null) try {
-			await storage.updateTransactionStatus("failed", newTx.transactionId);
-			logger?.log(`marked failed createAction transaction ${newTx.transactionId} after construction error`);
+			if (newTxCommitted) {
+				await storage.updateTransactionStatus("failed", newTx.transactionId);
+				logger?.log(`marked failed createAction transaction ${newTx.transactionId} after construction error`);
+			} else {
+				const failed = await createNewTxRecord(storage, userId, vargs, storageBeefBytes, 0, void 0, "failed");
+				logger?.log(`recorded failed createAction transaction ${failed.transactionId} after rollback`);
+			}
 		} catch (cleanupError) {
 			logger?.log(`failed to clean up createAction transaction ${newTx.transactionId}: ${String(cleanupError)}`);
 		}
@@ -9619,23 +10233,10 @@ async function getCompetingBeefForReview(storage, txid) {
 		throw e;
 	}
 }
-/** Randomly reassign vout values across newOutputs using either the provided randomVals or crypto-random bytes. */
-/** Insert the output and attach its tags; return the SDK output descriptor. */
-async function persistNewOutput(storage, o, tags, txTags, txBaskets) {
-	o.outputId = await storage.insertOutput(o);
-	const changeVout = o.change && o.purpose === "change" && o.providedBy === "storage" ? o.vout : void 0;
-	for (const tagName of new Set(tags)) {
-		const tag = txTags[tagName];
-		await storage.insertOutputTagMap({
-			outputId: verifyId(o.outputId),
-			outputTagId: verifyId(tag.outputTagId),
-			created_at: /* @__PURE__ */ new Date(),
-			updated_at: /* @__PURE__ */ new Date(),
-			isDeleted: false
-		});
-	}
+/** Build the SDK descriptor for a persisted output. */
+function describeNewOutput(o, tags, txBaskets) {
 	return {
-		changeVout,
+		changeVout: o.change && o.purpose === "change" && o.providedBy === "storage" ? o.vout : void 0,
 		ro: {
 			vout: verifyInteger(o.vout),
 			satoshis: Validation.validateSatoshis(o.satoshis, "o.satoshis"),
@@ -9650,13 +10251,28 @@ async function persistNewOutput(storage, o, tags, txTags, txBaskets) {
 		}
 	};
 }
-async function createNewOutputs(storage, userId, vargs, ctx, changeOutputs) {
+/** Insert the output and attach its tags; return the SDK output descriptor. */
+async function persistNewOutput(storage, o, tags, txTags, txBaskets, trx) {
+	o.outputId = await storage.insertOutput(o, trx);
+	for (const tagName of new Set(tags)) {
+		const tag = txTags[tagName];
+		await storage.insertOutputTagMap({
+			outputId: verifyId(o.outputId),
+			outputTagId: verifyId(tag.outputTagId),
+			created_at: /* @__PURE__ */ new Date(),
+			updated_at: /* @__PURE__ */ new Date(),
+			isDeleted: false
+		}, trx);
+	}
+	return describeNewOutput(o, tags, txBaskets);
+}
+async function createNewOutputs(storage, userId, vargs, ctx, changeOutputs, trx) {
 	const txBaskets = {};
 	const basketNames = [...new Set(ctx.xoutputs.map((x) => x.basket).filter((v) => !!v))];
-	Object.assign(txBaskets, await storage.findOrInsertOutputBasketsBulk(userId, basketNames));
+	Object.assign(txBaskets, await storage.findOrInsertOutputBasketsBulk(userId, basketNames, trx));
 	const txTags = {};
 	const tagNames = [...new Set(ctx.xoutputs.flatMap((x) => x.tags))];
-	Object.assign(txTags, await storage.findOrInsertOutputTagsBulk(userId, tagNames));
+	Object.assign(txTags, await storage.findOrInsertOutputTagsBulk(userId, tagNames, trx));
 	const newOutputs = [];
 	for (const xo of ctx.xoutputs) {
 		const lockingScript = asArray(xo.lockingScript);
@@ -9672,7 +10288,7 @@ async function createNewOutputs(storage, userId, vargs, ctx, changeOutputs) {
 				created_at: now,
 				updated_at: now,
 				commissionId: 0
-			});
+			}, trx);
 			const o = makeDefaultOutput(userId, ctx.transactionId, xo.satoshis, xo.vout);
 			o.lockingScript = lockingScript;
 			o.providedBy = "storage";
@@ -9706,10 +10322,12 @@ async function createNewOutputs(storage, userId, vargs, ctx, changeOutputs) {
 		});
 	}
 	if (vargs.options.randomizeOutputs) randomizeOutputVouts(newOutputs.map((output) => output.o), vargs.randomVals);
+	const untagged = newOutputs.filter((output) => output.tags.length === 0);
+	await storage.insertOutputs(untagged.map((output) => output.o), trx);
 	const outputs = [];
 	const changeVouts = [];
 	for (const { o, tags } of newOutputs) {
-		const { changeVout, ro } = await persistNewOutput(storage, o, tags, txTags, txBaskets);
+		const { changeVout, ro } = tags.length === 0 ? describeNewOutput(o, tags, txBaskets) : await persistNewOutput(storage, o, tags, txTags, txBaskets, trx);
 		if (changeVout !== void 0) changeVouts.push(changeVout);
 		outputs.push(ro);
 	}
@@ -9718,7 +10336,7 @@ async function createNewOutputs(storage, userId, vargs, ctx, changeOutputs) {
 		changeVouts
 	};
 }
-async function createNewTxRecord(storage, userId, vargs, storageBeef) {
+async function createNewTxRecord(storage, userId, vargs, storageBeef, satoshis = 0, trx, status = "unsigned") {
 	const now = /* @__PURE__ */ new Date();
 	const newTx = {
 		created_at: now,
@@ -9726,20 +10344,22 @@ async function createNewTxRecord(storage, userId, vargs, storageBeef) {
 		transactionId: 0,
 		version: vargs.version,
 		lockTime: vargs.lockTime,
-		status: "unsigned",
+		status,
 		reference: randomBytesBase64(12),
-		satoshis: 0,
+		satoshis,
 		userId,
 		isOutgoing: true,
-		inputBEEF: storageBeef.toBinary(),
+		inputBEEF: storageBeef,
 		description: vargs.description,
 		txid: void 0,
 		rawTx: void 0
 	};
-	newTx.transactionId = await storage.insertTransaction(newTx);
-	for (const label of vargs.labels) {
-		const txLabel = await storage.findOrInsertTxLabel(userId, label);
-		await storage.findOrInsertTxLabelMap(verifyId(newTx.transactionId), verifyId(txLabel.txLabelId));
+	newTx.transactionId = await storage.insertTransaction(newTx, trx);
+	const labelNames = [...new Set(vargs.labels)];
+	const labels = await storage.findOrInsertTxLabelsBulk(userId, labelNames, trx);
+	for (const label of labelNames) {
+		const txLabel = labels[label];
+		await storage.findOrInsertTxLabelMap(verifyId(newTx.transactionId), verifyId(txLabel.txLabelId), trx);
 	}
 	return newTx;
 }
@@ -9923,87 +10543,227 @@ async function validateNoSendChange(storage, userId, vargs, changeBasket) {
 	const r = [];
 	if (!vargs.isNoSend) return [];
 	const noSendChange = vargs.options.noSendChange;
-	if (noSendChange && noSendChange.length > 0) for (const op of noSendChange) {
-		const output = verifyOneOrNone(await storage.findOutputs({ partial: {
-			userId,
-			txid: op.txid,
-			vout: op.vout
-		} }));
-		if (!isAutoSpendableChangeOutput(output) || !verifyNumber(output.satoshis) || output.basketId !== changeBasket.basketId) throw new WERR_INVALID_PARAMETER("noSendChange outpoint", "wallet-managed BRC-29 change");
-		if (r.some((o) => o.outputId === output.outputId)) throw new WERR_INVALID_PARAMETER("noSendChange outpoint", "unique. Duplicates are not allowed.");
-		r.push(output);
+	if (noSendChange && noSendChange.length > 0) {
+		const byOutpoint = await storage.findOutputsByOutpoints(userId, noSendChange);
+		for (const op of noSendChange) {
+			const output = byOutpoint[`${op.txid}.${op.vout}`];
+			if (!isAutoSpendableChangeOutput(output) || !verifyNumber(output.satoshis) || output.basketId !== changeBasket.basketId) throw new WERR_INVALID_PARAMETER("noSendChange outpoint", "wallet-managed BRC-29 change");
+			if (r.some((o) => o.outputId === output.outputId)) throw new WERR_INVALID_PARAMETER("noSendChange outpoint", "unique. Duplicates are not allowed.");
+			r.push(output);
+		}
 	}
 	if ((await storage.findReservedActionBatchOutputIds(r.map((output) => output.outputId))).length > 0) throw new WERR_INVALID_PARAMETER("noSendChange", "outputs not reserved by an active action batch");
 	return r;
 }
-async function preflightInsufficientFundsFastPath(vargs, xinputs, xoutputs, noSendChangeIn, availableChangeCount, feeModel) {
-	if (feeModel.model !== "sat/kb" || !feeModel.value) return;
-	const fixedInputSatoshis = xinputs.reduce((a, e) => a + e.satoshis, 0);
-	const noSendSatoshis = noSendChangeIn.reduce((a, e) => a + Number(e.satoshis || 0), 0);
-	const spending = xoutputs.reduce((a, e) => a + e.satoshis, 0);
-	const minSize = transactionSize(xinputs.map((i) => i.unlockingScriptLength || 0), xoutputs.map((o) => Math.floor(o.lockingScript.length / 2)));
-	const minRequired = spending + Math.ceil(minSize / 1e3 * feeModel.value);
-	const fixedAvailable = fixedInputSatoshis + noSendSatoshis;
-	if (fixedAvailable >= minRequired) return;
-	const deficit = minRequired - fixedAvailable;
-	if (availableChangeCount <= 0) throw new WERR_INSUFFICIENT_FUNDS(minRequired, deficit);
-}
-async function fundNewTransactionSdk(storage, userId, vargs, ctx) {
-	const params = {
-		fixedInputs: ctx.xinputs.map((xi) => ({
-			satoshis: xi.satoshis,
-			unlockingScriptLength: xi.unlockingScriptLength
+function fundingPlanSatoshis(plan) {
+	return plan.result.changeOutputs.reduce((sum, output) => sum + output.satoshis, 0) - plan.selected.reduce((sum, output) => sum + output.satoshis, 0);
+}
+var FundingClaimConflict = class extends Error {
+	conflict;
+	constructor(conflict) {
+		super("createAction funding claim changed concurrently");
+		this.conflict = conflict;
+	}
+};
+async function traceStorageStep(storage, name, parent, attributes, callback) {
+	if (!storage.telemetry.enabled) return await callback();
+	return await storage.telemetry.withSpan(name, {
+		component: "wallet-storage",
+		parent: parent?.context,
+		attributes
+	}, async (span) => await callback(span));
+}
+function makeFundingParams(vargs, xinputs, xoutputs, changeBasket, feeModel, availableChangeCount) {
+	return {
+		fixedInputs: xinputs.map((input) => ({
+			satoshis: input.satoshis,
+			unlockingScriptLength: input.unlockingScriptLength
 		})),
-		fixedOutputs: ctx.xoutputs.map((xo) => ({
-			satoshis: xo.satoshis,
-			lockingScriptLength: xo.lockingScript.length / 2
+		fixedOutputs: xoutputs.map((output) => ({
+			satoshis: output.satoshis,
+			lockingScriptLength: output.lockingScript.length / 2
 		})),
-		feeModel: ctx.feeModel,
-		changeInitialSatoshis: Math.max(1, ctx.changeBasket.minimumDesiredUTXOValue),
-		changeFirstSatoshis: Math.max(1, Math.round(ctx.changeBasket.minimumDesiredUTXOValue / 4)),
+		feeModel,
+		changeInitialSatoshis: Math.max(1, changeBasket.minimumDesiredUTXOValue),
+		changeFirstSatoshis: Math.max(1, Math.round(changeBasket.minimumDesiredUTXOValue / 4)),
 		changeLockingScriptLength: 25,
 		changeUnlockingScriptLength: 107,
-		targetNetCount: ctx.changeBasket.numberOfDesiredUTXOs - ctx.availableChangeCount,
+		targetNetCount: changeBasket.numberOfDesiredUTXOs - availableChangeCount,
 		randomVals: vargs.randomVals
 	};
-	const noSendChange = [...ctx.noSendChangeIn];
-	const outputs = {};
-	const allocateChangeInput = async (targetSatoshis, exactSatoshis) => {
-		if (noSendChange.length > 0) {
-			const o = noSendChange.pop();
-			outputs[o.outputId] = o;
-			await storage.updateOutput(o.outputId, {
-				spendable: false,
-				spentBy: ctx.transactionId
-			});
-			o.spendable = false;
-			o.spentBy = ctx.transactionId;
+}
+async function prepareFundingPlan(storage, context) {
+	const [userId, vargs, xinputs, xoutputs, changeBasket, noSendChangeIn, feeModel, parent, trx] = context;
+	const excludeSending = !vargs.isDelayed;
+	const candidates = await traceStorageStep(storage, "wallet.storage.create_action.funding_candidates", parent, { "funding.exclude_sending": excludeSending }, async (span) => {
+		const outputs = await storage.findAvailableManagedChangeInputCandidates(userId, changeBasket.basketId, excludeSending, trx);
+		span?.end({ attributes: {
+			"funding.candidate_count": outputs.length,
+			"funding.candidate_satoshis": outputs.reduce((sum, output) => sum + output.satoshis, 0)
+		} });
+		return outputs;
+	});
+	const noSendIds = new Set(noSendChangeIn.map((output) => output.outputId));
+	const available = candidates.filter((output) => !noSendIds.has(output.outputId));
+	const params = makeFundingParams(vargs, xinputs, xoutputs, changeBasket, feeModel, candidates.length);
+	return await traceStorageStep(storage, "wallet.storage.create_action.funding_plan", parent, {
+		"funding.candidate_count": available.length,
+		"funding.no_send_change_count": noSendChangeIn.length
+	}, async (span) => {
+		const allocated = /* @__PURE__ */ new Map();
+		const availableSelector = new CanonicalChangeSelector(available);
+		const noSend = [...noSendChangeIn];
+		const noSendById = new Map(noSendChangeIn.map((output) => [output.outputId, output]));
+		const allocate = async (targetSatoshis, exactSatoshis) => {
+			let output = noSend.pop();
+			output ??= availableSelector.take(targetSatoshis, exactSatoshis);
+			if (output == null) return void 0;
+			allocated.set(output.outputId, output);
 			return {
-				outputId: o.outputId,
-				satoshis: o.satoshis
+				outputId: output.outputId,
+				satoshis: output.satoshis
 			};
+		};
+		const release = async (outputId) => {
+			if (allocated.get(outputId) == null) return;
+			allocated.delete(outputId);
+			availableSelector.release(outputId);
+			const noSendOutput = noSendById.get(outputId);
+			if (noSendOutput != null) noSend.push(noSendOutput);
+		};
+		const result = await generateChangeSdk(params, allocate, release, vargs.logger, storage.telemetry);
+		const selected = result.allocatedChangeInputs.map((input) => verifyTruthy(allocated.get(input.outputId)));
+		span?.end({ attributes: {
+			"funding.allocated_input_count": selected.length,
+			"funding.change_output_count": result.changeOutputs.length,
+			"funding.fee_satoshis": result.fee,
+			"funding.transaction_size_bytes": result.size
+		} });
+		return {
+			params,
+			result,
+			selected,
+			availableChangeCount: candidates.length
+		};
+	});
+}
+async function claimFundingPlan(storage, request) {
+	const [userId, basketId, excludeSending, transactionId, noSendChangeIn, plan, trx] = request;
+	if (plan.selected.length === 0) return {
+		outputs: [],
+		sourceTransactionCount: 0,
+		hydratedScriptCount: 0,
+		scriptSourceTransactionCount: 0
+	};
+	const noSendIds = new Set(noSendChangeIn.map((output) => output.outputId));
+	const statuses = ["completed", "unproven"];
+	if (!excludeSending) statuses.push("sending");
+	const claim = await storage.transaction(async (claimTrx) => {
+		const currentById = await storage.findFundingOutputsForUpdate(userId, plan.selected.map((output) => output.outputId), statuses, claimTrx);
+		const transactionIds = [...new Set(Object.values(currentById).map((output) => output.transactionId))];
+		const claimed = [];
+		for (const planned of plan.selected) {
+			const current = currentById[planned.outputId];
+			if (current?.outputId !== planned.outputId || current?.satoshis !== planned.satoshis || current?.basketId !== basketId || !isAutoSpendableChangeOutput(current) || current?.txid !== planned.txid || current?.vout !== planned.vout) return { conflict: noSendIds.has(planned.outputId) ? "noSendChange" : "candidate" };
+			claimed.push(current);
+		}
+		if (await storage.markChangeInputsSpent(claimed.map((output) => output.outputId), transactionId, claimTrx) !== claimed.length) throw new FundingClaimConflict(claimed.some((output) => noSendIds.has(output.outputId)) ? "noSendChange" : "candidate");
+		for (const output of claimed) {
+			output.spendable = false;
+			output.spentBy = transactionId;
 		}
-		const basketId = ctx.changeBasket.basketId;
-		const o = await storage.allocateChangeInput(userId, basketId, targetSatoshis, exactSatoshis, !vargs.isDelayed, ctx.transactionId);
-		if (o == null) return void 0;
-		outputs[o.outputId] = o;
 		return {
-			outputId: o.outputId,
-			satoshis: o.satoshis
+			outputs: claimed,
+			sourceTransactionCount: transactionIds.length
 		};
+	}, trx).catch((error) => {
+		if (error instanceof FundingClaimConflict) return { conflict: error.conflict };
+		throw error;
+	});
+	if (claim.outputs == null) return claim;
+	const hydration = await hydrateFundingInputScripts(storage, claim.outputs, trx);
+	return {
+		outputs: claim.outputs,
+		sourceTransactionCount: claim.sourceTransactionCount,
+		...hydration
 	};
-	const releaseChangeInput = async (outputId) => {
-		const nsco = ctx.noSendChangeIn.find((o) => o.outputId === outputId);
-		if (nsco != null) {
-			noSendChange.push(nsco);
-			return;
+}
+async function hydrateFundingInputScripts(storage, outputs, trx) {
+	const missing = outputs.filter((output) => output.lockingScript?.length !== output.scriptLength && output.scriptLength != null && output.scriptLength > 0 && output.scriptOffset != null && output.scriptOffset > 0 && output.txid != null && output.txid !== "");
+	if (missing.length === 0) return {
+		hydratedScriptCount: 0,
+		scriptSourceTransactionCount: 0
+	};
+	const byTxid = /* @__PURE__ */ new Map();
+	for (const output of missing) {
+		const txid = verifyTruthy(output.txid);
+		const group = byTxid.get(txid) ?? [];
+		group.push(output);
+		byTxid.set(txid, group);
+	}
+	const groups = [...byTxid.entries()];
+	let cursor = 0;
+	await Promise.all(Array.from({ length: Math.min(8, groups.length) }, async () => {
+		while (cursor < groups.length) {
+			const [txid, group] = groups[cursor++];
+			if (group.length === 1) {
+				await storage.validateOutputScript(group[0], trx);
+				continue;
+			}
+			const rawTx = await storage.getRawTxOfKnownValidTransaction(txid, void 0, void 0, trx);
+			if (rawTx != null) for (const output of group) output.lockingScript = rawTx.slice(output.scriptOffset, output.scriptOffset + output.scriptLength);
+			else for (const output of group) await storage.validateOutputScript(output, trx);
 		}
-		await storage.updateOutput(outputId, {
-			spendable: true,
-			spentBy: void 0
-		});
+	}));
+	return {
+		hydratedScriptCount: missing.filter((output) => output.lockingScript?.length === output.scriptLength).length,
+		scriptSourceTransactionCount: groups.length
 	};
-	const gcr = await generateChangeSdk(params, allocateChangeInput, releaseChangeInput, vargs.logger, storage.telemetry);
+}
+async function fundNewTransactionSdk(storage, userId, vargs, ctx, initialPlan, parent, trx) {
+	let plan = initialPlan;
+	let allocatedChange;
+	let retryCount = 0;
+	await traceStorageStep(storage, "wallet.storage.create_action.funding_claim", parent, { "funding.planned_input_count": initialPlan.selected.length }, async (span) => {
+		for (let attempt = 0; attempt < 3; attempt++) {
+			const claim = await claimFundingPlan(storage, [
+				userId,
+				ctx.changeBasket.basketId,
+				!vargs.isDelayed,
+				ctx.transactionId,
+				ctx.noSendChangeIn,
+				plan,
+				trx
+			]);
+			if (claim.outputs != null) {
+				allocatedChange = claim.outputs;
+				span?.end({ attributes: {
+					"funding.claim_retry_count": retryCount,
+					"funding.source_transaction_count": claim.sourceTransactionCount,
+					"funding.hydrated_script_count": claim.hydratedScriptCount,
+					"funding.script_source_transaction_count": claim.scriptSourceTransactionCount
+				} });
+				return;
+			}
+			if (claim.conflict === "noSendChange") throw new WERR_INVALID_PARAMETER("noSendChange", "outputs that remain spendable during action planning");
+			retryCount++;
+			plan = await prepareFundingPlan(storage, [
+				userId,
+				vargs,
+				ctx.xinputs,
+				ctx.xoutputs,
+				ctx.changeBasket,
+				ctx.noSendChangeIn,
+				ctx.feeModel,
+				parent,
+				trx
+			]);
+		}
+		throw new WERR_INVALID_OPERATION("wallet funding changed repeatedly during action planning; retry createAction");
+	});
+	if (allocatedChange == null) throw new WERR_INTERNAL("funding plan was not claimed");
+	const params = plan.params;
+	const gcr = plan.result;
 	const nextRandomVal = () => {
 		let val = 0;
 		if (vargs.randomVals == null || vargs.randomVals.length === 0) {
@@ -10031,7 +10791,7 @@ async function fundNewTransactionSdk(storage, userId, vargs, ctx) {
 	const derivationPrefix = randomDerivation(16);
 	return {
 		maxPossibleSatoshisAdjustment: gcr.maxPossibleSatoshisAdjustment,
-		allocatedChange: gcr.allocatedChangeInputs.map((i) => outputs[i.outputId]),
+		allocatedChange,
 		changeOutputs: gcr.changeOutputs.map((o, i) => ({
 			created_at: /* @__PURE__ */ new Date(),
 			updated_at: /* @__PURE__ */ new Date(),
@@ -10066,12 +10826,73 @@ async function fundNewTransactionSdk(storage, userId, vargs, ctx) {
 */
 function trimInputBeef(beef, vargs) {
 	if (vargs.options.returnTXIDOnly) return void 0;
-	const knownTxids = {};
-	for (const txid of vargs.options.knownTxids || []) knownTxids[txid] = true;
-	for (const txid of beef.txs.map((btx) => btx.txid)) if (knownTxids[txid]) beef.makeTxidOnly(txid);
+	const hasKnownTxid = makeKnownTxidLookup(vargs.options.knownTxids ?? []);
+	for (const btx of beef.txs) if (hasKnownTxid(btx.txid)) beef.makeTxidOnly(btx.txid);
 	return beef.toUint8Array();
 }
-async function mergeAllocatedChangeBeefs(storage, userId, vargs, allocatedChange, beef) {
+function makeKnownTxidLookup(knownTxids) {
+	let lookups = 0;
+	let indexed;
+	return (txid) => {
+		lookups++;
+		if (indexed != null) return indexed.has(txid);
+		if (knownTxids.length > 64 && lookups > 4) {
+			indexed = new Set(knownTxids);
+			return indexed.has(txid);
+		}
+		return knownTxids.includes(txid);
+	};
+}
+function missingAllocatedChangeTxids(allocatedChange, beef, knownTxids) {
+	const hasKnownTxid = makeKnownTxidLookup(knownTxids);
+	return Array.from(new Set(allocatedChange.map((output) => verifyTruthy(output.txid)).filter((txid) => beef.findTxid(txid) == null && !hasKnownTxid(txid))));
+}
+function startAllocatedChangeBeefPrefetch(storage, vargs, allocatedChange, beef, parent) {
+	if (vargs.options.returnTXIDOnly) return Promise.resolve({
+		sourceCount: 0,
+		txids: []
+	});
+	const knownTxids = vargs.options.knownTxids ?? [];
+	const missing = missingAllocatedChangeTxids(allocatedChange, beef, knownTxids);
+	if (missing.length === 0) return Promise.resolve({
+		sourceCount: 0,
+		txids: []
+	});
+	const options = {
+		trustSelf: void 0,
+		knownTxids,
+		ignoreStorage: false,
+		ignoreServices: true,
+		ignoreNewProven: false,
+		minProofLevel: void 0
+	};
+	return traceStorageStep(storage, "wallet.storage.create_action.beef_prefetch", parent, {
+		"beef.planned_source_count": allocatedChange.length,
+		"beef.missing_source_count": missing.length,
+		"beef.storage_batch_count": missing.length === 0 ? 0 : 1
+	}, async (span) => {
+		const fetched = await storage.getBeefForTransactions(missing, options);
+		span?.end({ attributes: {
+			"beef.fetched_tx_count": fetched.txs.length,
+			"beef.fetched_bump_count": fetched.bumps.length
+		} });
+		return fetched;
+	}).then((prefetched) => ({
+		beef: prefetched,
+		sourceCount: missing.length,
+		txids: missing
+	}), (error) => ({
+		error,
+		sourceCount: missing.length,
+		txids: missing
+	}));
+}
+function sameTxids(left, right) {
+	if (left.length !== right.length) return false;
+	const expected = new Set(left);
+	return right.every((txid) => expected.has(txid));
+}
+async function mergeAllocatedChangeBeefs(storage, vargs, allocatedChange, beef, prefetch, parent) {
 	const options = {
 		trustSelf: void 0,
 		knownTxids: vargs.options.knownTxids,
@@ -10082,25 +10903,52 @@ async function mergeAllocatedChangeBeefs(storage, userId, vargs, allocatedChange
 		minProofLevel: void 0
 	};
 	if (vargs.options.returnTXIDOnly) return void 0;
-	const known = new Set(vargs.options.knownTxids ?? []);
-	const missing = Array.from(new Set(allocatedChange.map((o) => o.txid).filter((txid) => beef.findTxid(txid) == null && !known.has(txid))));
-	const fetched = Array.from({ length: missing.length });
-	const concurrency = Math.min(8, Math.max(1, missing.length));
-	let cursor = 0;
-	await Promise.all(Array.from({ length: concurrency }, async () => {
-		while (cursor < missing.length) {
-			const index = cursor++;
-			fetched[index] = await storage.getBeefForTransaction(missing[index], {
-				...options,
-				mergeToBeef: void 0
-			});
-		}
-	}));
-	for (const fetchedBeef of fetched) {
-		if (fetchedBeef == null) continue;
-		beef.mergeBeef(fetchedBeef);
-	}
-	return trimInputBeef(beef, vargs);
+	const knownTxids = vargs.options.knownTxids ?? [];
+	const requiredBeforePrefetch = missingAllocatedChangeTxids(allocatedChange, beef, knownTxids);
+	const prefetched = await traceStorageStep(storage, "wallet.storage.create_action.beef_prefetch_join", parent, { "beef.prefetch_source_count": 0 }, async (span) => {
+		const result = await prefetch;
+		span?.end({ attributes: { "beef.prefetch_source_count": result.sourceCount } });
+		return result;
+	});
+	const usePrefetch = sameTxids(prefetched.txids, requiredBeforePrefetch);
+	if (usePrefetch && prefetched.error != null) throw prefetched.error;
+	if (usePrefetch && prefetched.beef != null) beef.mergeBeef(prefetched.beef);
+	const missing = missingAllocatedChangeTxids(allocatedChange, beef, knownTxids);
+	let fetched;
+	await traceStorageStep(storage, "wallet.storage.create_action.beef_fetch", parent, {
+		"beef.allocated_change_count": allocatedChange.length,
+		"beef.distinct_source_count": new Set(allocatedChange.map((output) => output.txid)).size,
+		"beef.known_txid_count": knownTxids.length,
+		"beef.missing_source_count": missing.length,
+		"beef.fetch_concurrency": 1,
+		"beef.prefetch_reused": usePrefetch
+	}, async (span) => {
+		if (missing.length > 0) fetched = await storage.getBeefForTransactions(missing, {
+			...options,
+			mergeToBeef: void 0
+		});
+		span?.end({ attributes: {
+			"beef.fetched_tx_count": fetched?.txs.length ?? 0,
+			"beef.fetched_bump_count": fetched?.bumps.length ?? 0,
+			"beef.storage_batch_count": missing.length === 0 ? 0 : 1
+		} });
+	});
+	await traceStorageStep(storage, "wallet.storage.create_action.beef_merge", parent, { "beef.fragment_count": (usePrefetch && prefetched.beef != null ? 1 : 0) + (fetched == null ? 0 : 1) }, async (span) => {
+		if (fetched != null) beef.mergeBeef(fetched);
+		span?.end({ attributes: {
+			"beef.merged_tx_count": beef.txs.length,
+			"beef.merged_bump_count": beef.bumps.length
+		} });
+	});
+	return await traceStorageStep(storage, "wallet.storage.create_action.beef_trim_serialize", parent, {
+		"beef.tx_count": beef.txs.length,
+		"beef.bump_count": beef.bumps.length,
+		"beef.known_txid_count": knownTxids.length
+	}, async (span) => {
+		const result = trimInputBeef(beef, vargs);
+		span?.end({ attributes: { "beef.result_bytes": result?.length ?? 0 } });
+		return result;
+	});
 }
 const dirtyHashLookup = {
 	"00000000000000000019f112ec0a9982926f1258cdcc558dd7c3b7e5dc7fa148": "This is the first header of the invalid SegWit chain.",
@@ -12715,21 +13563,6 @@ async function cleanupExpiredActionBatches(storage) {
 	});
 	return released;
 }
-async function availableManagedChange(storage, userId, basketId, excludeSending, trx) {
-	const statuses = ["completed", "unproven"];
-	if (!excludeSending) statuses.push("sending");
-	const outputs = (await storage.findOutputs({
-		partial: {
-			userId,
-			basketId,
-			spendable: true
-		},
-		txStatus: statuses,
-		trx
-	})).filter(isAutoSpendableChangeOutput);
-	const reserved = new Set(await storage.findReservedActionBatchOutputIds(outputs.map((o) => o.outputId), trx));
-	return outputs.filter((output) => output.spentBy == null && !reserved.has(output.outputId));
-}
 function sourceOutputFromBeef(beef, outpoint) {
 	const output = (beef.findTxid(outpoint.txid)?.tx)?.outputs[outpoint.vout];
 	if (output == null) return void 0;
@@ -12894,7 +13727,7 @@ async function beginActionBatch(storage, auth, args) {
 	const explicit = await resolveExplicitOutputs(storage, userId, args.firstAction, outputScriptLengths != null);
 	const noSendChange = await resolveNoSendChangeOutputs(storage, userId, args.firstAction);
 	const fixedOutputIds = new Set([...explicit.outputs, ...noSendChange.outputs].map((output) => output.outputId));
-	const available = (await availableManagedChange(storage, userId, changeBasket.basketId, !args.firstAction.isDelayed)).filter((output) => !fixedOutputIds.has(output.outputId));
+	const available = (await storage.findAvailableManagedChangeInputs(userId, changeBasket.basketId, !args.firstAction.isDelayed)).filter((output) => !fixedOutputIds.has(output.outputId));
 	const target = estimateFirstActionTarget(storage, args.firstAction, explicit.inputSatoshis + noSendChange.inputSatoshis, outputScriptLengths);
 	const fixedOutputs = [...explicit.outputs, ...noSendChange.outputs];
 	const funding = chooseReservationPool(available, target, Math.max(0, INITIAL_RESERVATION_LIMIT - fixedOutputs.length), INITIAL_EXTRA_OUTPUTS, false, reservationPlanningCosts(storage, changeBasket));
@@ -12938,7 +13771,7 @@ async function extendActionBatch(storage, auth, args) {
 		name: "default"
 	} }));
 	const alreadyReserved = await storage.findActionBatchOutputIds(batch.actionBatchId);
-	const available = await availableManagedChange(storage, userId, basket.basketId, false);
+	const available = await storage.findAvailableManagedChangeInputs(userId, basket.basketId, false);
 	if (!Number.isSafeInteger(args.requestedOutputs) || args.requestedOutputs < 0) throw new WERR_INVALID_PARAMETER("requestedOutputs", "non-negative safe integer");
 	const requestedCount = Math.min(args.requestedOutputs, 64);
 	const funding = chooseReservationPool(available, Math.max(1, args.targetSatoshis), requestedCount, 0, true, reservationPlanningCosts(storage, basket));
@@ -13311,6 +14144,31 @@ async function abortActionBatch(storage, auth, batchId) {
 	});
 }
 //#endregion
+//#region ../src/storage/methods/availableManagedChange.ts
+/**
+* Return the exact set of wallet-managed outputs currently eligible for
+* automatic funding. Keeping this predicate shared prevents the planner,
+* allocator, action-batch reservations, and availability count from drifting.
+*/
+async function availableManagedChange(storage, userId, basketId, excludeSending, trx) {
+	const statuses = ["completed", "unproven"];
+	if (!excludeSending) statuses.push("sending");
+	const outputs = (await storage.findOutputs({
+		partial: {
+			userId,
+			basketId,
+			spendable: true,
+			...managedChangeOutputFields
+		},
+		txStatus: statuses,
+		noScript: true,
+		trx
+	})).filter(isAutoSpendableChangeOutput);
+	if (outputs.length === 0) return outputs;
+	const reserved = new Set(await storage.findReservedActionBatchOutputIds(outputs.map((output) => output.outputId), trx));
+	return outputs.filter((output) => !reserved.has(output.outputId));
+}
+//#endregion
 //#region ../src/storage/StorageProvider.ts
 var StorageProvider = class StorageProvider extends StorageReaderWriter {
 	isDirty = false;
@@ -13344,6 +14202,81 @@ var StorageProvider = class StorageProvider extends StorageReaderWriter {
 		this.maxRecursionDepth = 12;
 		this.scriptVerifier = options.scriptVerifier;
 	}
+	/** Mark a planned set of change inputs spent within the caller's transaction. */
+	async markChangeInputsSpent(outputIds, transactionId, trx) {
+		let updated = 0;
+		const current = await this.findOutputsByIds(outputIds, trx);
+		for (const outputId of outputIds) {
+			const output = current[outputId];
+			if (output == null || !output.spendable || output.spentBy != null) continue;
+			updated += await this.updateOutput(outputId, {
+				spendable: false,
+				spentBy: transactionId
+			}, trx);
+		}
+		return updated;
+	}
+	/**
+	* Insert outputs that do not need their generated ids returned to the
+	* caller. Engines with a multi-row insert override this common-path helper;
+	* the fallback preserves existing storage implementations unchanged.
+	*/
+	async insertOutputs(outputs, trx) {
+		for (const output of outputs) await this.insertOutput(output, trx);
+	}
+	/** Return unreserved wallet-managed outputs eligible for automatic funding. */
+	async findAvailableManagedChangeInputs(userId, basketId, excludeSending, trx) {
+		return await availableManagedChange(this, userId, basketId, excludeSending, trx);
+	}
+	/** Read only the fields needed by the in-memory funding planner. */
+	async findAvailableManagedChangeInputCandidates(userId, basketId, excludeSending, trx) {
+		return (await this.findAvailableManagedChangeInputs(userId, basketId, excludeSending, trx)).map(({ outputId, transactionId, satoshis, txid, vout }) => ({
+			outputId,
+			transactionId,
+			satoshis,
+			txid,
+			vout
+		}));
+	}
+	/** Read the current status of a set of source transactions without loading raw transaction bytes. */
+	async findTransactionStatusesByIds(userId, transactionIds, trx) {
+		const statuses = /* @__PURE__ */ new Map();
+		for (const transactionId of new Set(transactionIds)) {
+			const transaction = await this.findTransactionById(transactionId, trx, true);
+			if (transaction?.userId === userId) statuses.set(transactionId, transaction.status);
+		}
+		return statuses;
+	}
+	/**
+	* Lock and return the selected funding rows whose source transaction and
+	* action-batch reservation state still permit allocation.
+	*/
+	async findFundingOutputsForUpdate(userId, outputIds, statuses, trx) {
+		const rows = await this.findOutputsByIds(outputIds, trx);
+		const reserved = new Set(await this.findReservedActionBatchOutputIds(outputIds, trx));
+		const transactionIds = [...new Set(Object.values(rows).map((output) => output.transactionId))];
+		const transactionStatuses = await this.findTransactionStatusesByIds(userId, transactionIds, trx);
+		const eligible = {};
+		for (const output of Object.values(rows)) if (output.userId === userId && !reserved.has(output.outputId) && statuses.includes(transactionStatuses.get(output.transactionId))) eligible[output.outputId] = output;
+		return eligible;
+	}
+	/**
+	* Resolve several transaction proofs in one storage operation when the
+	* backend supports it. The default preserves compatibility for custom
+	* providers; SQL and IndexedDB providers override this hot path.
+	*/
+	async getProvenOrRawTxs(txids, trx) {
+		const results = /* @__PURE__ */ new Map();
+		const unique = [...new Set(txids)];
+		let cursor = 0;
+		await Promise.all(Array.from({ length: Math.min(8, unique.length) }, async () => {
+			while (cursor < unique.length) {
+				const txid = unique[cursor++];
+				results.set(txid, await this.getProvenOrRawTx(txid, trx));
+			}
+		}));
+		return results;
+	}
 	async insertActionBatch(_batch, _trx) {
 		throw new WERR_NOT_IMPLEMENTED();
 	}
@@ -13395,6 +14328,10 @@ var StorageProvider = class StorageProvider extends StorageReaderWriter {
 	supportsActionBatchPersistence() {
 		return false;
 	}
+	/** Custom providers may require physical expiry cleanup before reservations are queried. */
+	requiresActionBatchCleanupBeforeCreateAction() {
+		return true;
+	}
 	async beginActionBatch(auth, args) {
 		if (!this.supportsActionBatchPersistence()) throw new WERR_NOT_IMPLEMENTED("actionBatch capability is not available");
 		return await beginActionBatch(this, auth, args);
@@ -13454,7 +14391,7 @@ var StorageProvider = class StorageProvider extends StorageReaderWriter {
 		}
 		return byOutpoint;
 	}
-	async findOutputsByOutpointsForUpdate(userId, outpoints, trx) {
+	async findOutputsByOutpointsForUpdate(userId, outpoints, trx, _noScript = false) {
 		return await this.findOutputsByOutpoints(userId, outpoints, trx);
 	}
 	async findOrInsertOutputBasketsBulk(userId, names, trx) {
@@ -13783,7 +14720,7 @@ var StorageProvider = class StorageProvider extends StorageReaderWriter {
 	}
 	async createAction(auth, args) {
 		if (auth.userId == null) throw new WERR_UNAUTHORIZED();
-		if (this.supportsActionBatchPersistence()) await cleanupExpiredActionBatches(this);
+		if (this.supportsActionBatchPersistence() && this.requiresActionBatchCleanupBeforeCreateAction()) await cleanupExpiredActionBatches(this);
 		return await createAction(this, auth, args);
 	}
 	async processAction(auth, args) {
@@ -13873,6 +14810,9 @@ var StorageProvider = class StorageProvider extends StorageReaderWriter {
 	async getBeefForTransaction(txid, options) {
 		return await getBeefForTransaction(this, txid, options);
 	}
+	async getBeefForTransactions(txids, options) {
+		return await getBeefForTransactions(this, txids, options);
+	}
 	async findMonitorEventById(id, trx) {
 		return verifyOneOrNone(await this.findMonitorEvents({
 			partial: { id },
@@ -14831,6 +15771,9 @@ var StorageIdb = class extends StorageProvider {
 	supportsActionBatchPersistence() {
 		return true;
 	}
+	requiresActionBatchCleanupBeforeCreateAction() {
+		return false;
+	}
 	/**
 	* This method must be called at least once before any other method accesses the database,
 	* and each time the schema may have updated.
@@ -14891,9 +15834,16 @@ var StorageIdb = class extends StorageProvider {
 	async initDB(storageName, storageIdentityKey) {
 		const chain = this.chain;
 		const maxOutputScript = 1024;
-		return await openDB(this.dbName, 2, { upgrade(db) {
+		return await openDB(this.dbName, 3, { upgrade(db, _oldVersion, _newVersion, transaction) {
 			upgradeAllStoresV1(db);
 			upgradeActionBatchStoresV2(db);
+			const outputs = transaction.objectStore("outputs");
+			if (!outputs.indexNames.contains("userId_basketId")) outputs.createIndex("userId_basketId", ["userId", "basketId"]);
+			if (!outputs.indexNames.contains("txid_vout_userId")) outputs.createIndex("txid_vout_userId", [
+				"txid",
+				"vout",
+				"userId"
+			], { unique: true });
 			if (!db.objectStoreNames.contains("settings")) {
 				if (storageName == null || storageName === "" || storageIdentityKey == null || storageIdentityKey === "") throw new WERR_INVALID_OPERATION("migrate must be called before first access");
 				const settings = db.createObjectStore("settings", { keyPath: "storageIdentityKey" });
@@ -15003,6 +15953,50 @@ var StorageIdb = class extends StorageProvider {
 		}
 		return r;
 	}
+	async getProvenOrRawTxs(txids, trx) {
+		const results = /* @__PURE__ */ new Map();
+		const unique = [...new Set(txids)];
+		if (unique.length === 0) return results;
+		const dbTrx = this.toDbTrx(["proven_txs", "proven_tx_reqs"], "readonly", trx);
+		const provenIndex = dbTrx.objectStore("proven_txs").index("txid");
+		const requestIndex = dbTrx.objectStore("proven_tx_reqs").index("txid");
+		const usableStatuses = /* @__PURE__ */ new Set([
+			"unsent",
+			"unmined",
+			"unconfirmed",
+			"sending",
+			"nosend",
+			"completed"
+		]);
+		await Promise.all(unique.map(async (txid) => {
+			const proven = await provenIndex.get(txid);
+			if (proven != null) {
+				results.set(txid, {
+					proven: this.validateEntity(proven),
+					rawTx: void 0,
+					inputBEEF: void 0
+				});
+				return;
+			}
+			const request = await requestIndex.get(txid);
+			if (request != null && usableStatuses.has(request.status)) {
+				const validated = this.validateEntity(request);
+				results.set(txid, {
+					proven: void 0,
+					rawTx: Array.from(validated.rawTx),
+					inputBEEF: validated.inputBEEF == null ? void 0 : Array.from(validated.inputBEEF)
+				});
+				return;
+			}
+			results.set(txid, {
+				proven: void 0,
+				rawTx: void 0,
+				inputBEEF: void 0
+			});
+		}));
+		if (trx == null) await dbTrx.done;
+		return results;
+	}
 	async getRawTxOfKnownValidTransaction(txid, offset, length, trx) {
 		if (txid == null || txid === "") return void 0;
 		if (!this.isAvailable()) await this.makeAvailable();
@@ -15099,11 +16093,53 @@ var StorageIdb = class extends StorageProvider {
 			txStatus,
 			noScript: true
 		};
-		let count = 0;
+		const outputIds = [];
 		await this.filterOutputs(args, (r) => {
-			if (isAutoSpendableChangeOutput(r)) count++;
+			if (isAutoSpendableChangeOutput(r)) outputIds.push(r.outputId);
 		});
-		return count;
+		const reserved = await this.findReservedActionBatchOutputIds(outputIds);
+		return outputIds.length - reserved.length;
+	}
+	async findTransactionStatusesByIds(userId, transactionIds, trx) {
+		const statuses = /* @__PURE__ */ new Map();
+		if (transactionIds.length === 0) return statuses;
+		const dbTrx = this.toDbTrx(["transactions"], "readonly", trx);
+		const store = dbTrx.objectStore("transactions");
+		for (const transactionId of new Set(transactionIds)) {
+			const transaction = await store.get(transactionId);
+			if (transaction?.userId === userId) statuses.set(transactionId, transaction.status);
+		}
+		if (trx == null) await dbTrx.done;
+		return statuses;
+	}
+	async findOutputsByOutpointsInternal(userId, outpoints, trx, noScript = false) {
+		const byOutpoint = {};
+		if (outpoints.length === 0) return byOutpoint;
+		const dbTrx = this.toDbTrx(noScript ? ["outputs"] : [
+			"outputs",
+			"proven_txs",
+			"proven_tx_reqs"
+		], "readonly", trx);
+		const index = dbTrx.objectStore("outputs").index("txid_vout_userId");
+		const unique = [...new Map(outpoints.map((outpoint) => [`${outpoint.txid}.${outpoint.vout}`, outpoint])).values()];
+		const rows = await Promise.all(unique.map(async (outpoint) => await index.get([
+			outpoint.txid,
+			outpoint.vout,
+			userId
+		])));
+		for (const row of rows) {
+			if (row == null) continue;
+			if (!noScript) await this.validateOutputScript(row, dbTrx);
+			byOutpoint[`${String(row.txid)}.${row.vout}`] = this.validateEntity(row);
+		}
+		if (trx == null) await dbTrx.done;
+		return byOutpoint;
+	}
+	async findOutputsByOutpoints(userId, outpoints, trx) {
+		return await this.findOutputsByOutpointsInternal(userId, outpoints, trx);
+	}
+	async findOutputsByOutpointsForUpdate(userId, outpoints, trx, noScript = false) {
+		return await this.findOutputsByOutpointsInternal(userId, outpoints, trx, noScript);
 	}
 	async findCertificatesAuth(auth, args) {
 		if (auth.userId == null || args.partial.userId != null && args.partial.userId !== 0 && args.partial.userId !== auth.userId) throw new WERR_UNAUTHORIZED();
@@ -15222,6 +16258,7 @@ var StorageIdb = class extends StorageProvider {
 		else cursor = await store.openCursor(null, direction);
 		await scanCursor(cursor, args.since, args.paged?.offset ?? 0, args.paged?.limit, async (r) => {
 			if (!matchesProvenTxPartial(r, args.partial)) return false;
+			if (args.txids != null && args.txids.length > 0 && !args.txids.includes(r.txid)) return false;
 			if (userId !== void 0) {
 				if (await this.countTransactions({
 					partial: {
@@ -15666,11 +16703,18 @@ var StorageIdb = class extends StorageProvider {
 		return rows.map((r) => r.outputId);
 	}
 	async findReservedActionBatchOutputIds(outputIds, trx) {
-		const tx = this.toDbTrx(["action_batch_outputs"], "readonly", trx);
+		const tx = this.toDbTrx(["action_batch_outputs", "action_batches"], "readonly", trx);
 		const store = tx.objectStore("action_batch_outputs");
+		const batchStore = tx.objectStore("action_batches");
 		if (store.get == null) throw new WERR_INTERNAL("IndexedDB action_batch_outputs store does not support get");
 		const reserved = [];
-		for (const outputId of outputIds) if (await store.get(outputId) != null) reserved.push(outputId);
+		const now = Date.now();
+		for (const outputId of outputIds) {
+			const reservation = await store.get(outputId);
+			if (reservation == null) continue;
+			const batch = await batchStore.get(reservation.actionBatchId);
+			if (batch != null && (batch.status === "active" || batch.status === "prepared") && batch.expiresAt.getTime() > now && batch.hardExpiresAt.getTime() > now) reserved.push(outputId);
+		}
 		if (trx == null) await tx.done;
 		return reserved;
 	}
@@ -15866,6 +16910,12 @@ var StorageIdb = class extends StorageProvider {
 				partial.vout,
 				partial.userId
 			], direction);
+			if (partial?.txid != null && partial.txid !== "" && partial?.vout !== void 0) return store.index("txid_vout_userId").openCursor([
+				partial.txid,
+				partial.vout,
+				partial.userId
+			], direction);
+			if (partial?.basketId !== void 0) return store.index("userId_basketId").openCursor([partial.userId, partial.basketId], direction);
 			return store.index("userId").openCursor(partial.userId, direction);
 		}
 		if (partial?.transactionId !== void 0) return store.index("transactionId").openCursor(partial.transactionId, direction);
@@ -15873,6 +16923,17 @@ var StorageIdb = class extends StorageProvider {
 		if (partial?.spentBy !== void 0) return store.index("spentBy").openCursor(partial.spentBy, direction);
 		return store.openCursor(null, direction);
 	}
+	async eligibleOutputTransactionIds(args, dbTrx) {
+		if (args.txStatus == null) return void 0;
+		const validTransactionIds = /* @__PURE__ */ new Set();
+		const transactions = dbTrx.objectStore("transactions");
+		for (const status of args.txStatus) {
+			const index = args.partial.userId === void 0 ? transactions.index("status") : transactions.index("status_userId");
+			const key = args.partial.userId === void 0 ? status : [status, args.partial.userId];
+			for (const transactionId of await index.getAllKeys(key)) validTransactionIds.add(Number(transactionId));
+		}
+		return validTransactionIds;
+	}
 	async filterOutputs(args, filtered, tagIds, isQueryModeAll) {
 		this.assertNoUndefinedInPartial(args.partial);
 		if (args.partial.lockingScript != null) throw new WERR_INVALID_PARAMETER("args.partial.lockingScript", "undefined. Outputs may not be found by lockingScript value.");
@@ -15882,15 +16943,10 @@ var StorageIdb = class extends StorageProvider {
 		const dbTrx = this.toDbTrx(stores, "readonly", args.trx);
 		const direction = args.orderDescending === true ? "prev" : "next";
 		const store = dbTrx.objectStore("outputs");
+		const validTransactionIds = await this.eligibleOutputTransactionIds(args, dbTrx);
 		await scanCursor(await this.openOutputsCursor(store, args.partial, direction), args.since, args.paged?.offset ?? 0, args.paged?.limit, async (r) => {
 			if (!matchesOutputPartial(r, args.partial)) return false;
-			if (args.txStatus !== void 0) {
-				if (await this.countTransactions({
-					partial: { transactionId: r.transactionId },
-					status: args.txStatus,
-					trx: dbTrx
-				}) === 0) return false;
-			}
+			if (validTransactionIds != null && !validTransactionIds.has(r.transactionId)) return false;
 			if (tagIds != null && tagIds.length > 0 && !await this.outputMatchesTags(r.outputId, tagIds, isQueryModeAll, dbTrx)) return false;
 			return true;
 		}, (r) => {
@@ -27588,7 +28644,7 @@ function isValidProfile(value) {
 	return typeof profile.name === "string" && profile.name.length > 0 && profile.name.length <= 250 && isByteArrayOfLength(profile.id, 16) && isByteArrayOfLength(profile.primaryPad, 32) && isByteArrayOfLength(profile.privilegedPad, 32) && typeof profile.createdAt === "number" && Number.isFinite(profile.createdAt) && profile.createdAt >= 0;
 }
 /**
-* Raised when UMP absence cannot be established authoritatively.
+* Raised when a UMP lookup yields neither a verified token nor a clean empty response.
 *
 * Callers must offer retry/recovery rather than treating this error as a new
 * account. Diagnostics contain counts only and never hashes, keys, or tokens.
@@ -27686,49 +28742,119 @@ var OverlayUMPTokenInteractor = class {
 			throw new UMPTokenLookupError("lookup-unavailable", diagnostics, { cause: error });
 		}
 		const diagnostics = this.toLookupDiagnostics(resolution);
-		if (resolution.answer.outputs.length === 0) {
-			if (!(resolution.progress.isFinal && resolution.progress.hostCount > 0 && resolution.progress.completedHosts === resolution.progress.hostCount && resolution.progress.successfulHosts === resolution.progress.hostCount && resolution.progress.emptyHosts === resolution.progress.hostCount && resolution.progress.failedHosts === 0 && resolution.progress.rejectedHosts === 0 && resolution.progress.freeformHosts === 0)) {
-				this.captureLookupFailure(lookupKind, "lookup-incomplete", diagnostics, startedAt);
-				throw new UMPTokenLookupError("lookup-incomplete", diagnostics);
-			}
-			this.telemetry.capture({
-				name: "wallet-toolbox.ump.lookup.completed",
-				component: "wallet-toolbox.ump",
-				severity: "info",
-				correlationId: diagnostics.correlationId,
-				attributes: {
-					lookupKind,
-					result: "not-found",
-					durationMs: Date.now() - startedAt,
-					...this.lookupDiagnosticAttributes(diagnostics)
-				}
-			});
-			return;
-		}
 		const tokens = this.parseLookupAnswers(resolution.answer);
 		const expectedHash = question.query[lookupKind === "presentation" ? "presentationHash" : "recoveryHash"].toLowerCase();
-		if (!(tokens.length === resolution.answer.outputs.length && tokens.every((token) => Utils.toHex(lookupKind === "presentation" ? token.presentationHash : token.recoveryHash).toLowerCase() === expectedHash)) || tokens.length === 0) {
-			this.captureLookupFailure(lookupKind, "token-malformed", diagnostics, startedAt);
-			throw new UMPTokenLookupError("token-malformed", diagnostics);
-		}
-		if (tokens.length !== 1) {
+		const matchingTokens = tokens.filter((token) => Utils.toHex(lookupKind === "presentation" ? token.presentationHash : token.recoveryHash).toLowerCase() === expectedHash);
+		if (matchingTokens.length > 1) {
+			const newest = this.resolveNewestToken(matchingTokens, resolution.answer.outputs);
+			if (newest != null) {
+				this.captureLookupCompleted(lookupKind, "found", diagnostics, startedAt, { supersededTokens: matchingTokens.length - 1 });
+				return newest;
+			}
 			const reason = "token-ambiguous";
 			this.captureLookupFailure(lookupKind, reason, diagnostics, startedAt);
 			throw new UMPTokenLookupError(reason, diagnostics);
 		}
-		this.telemetry.capture({
-			name: "wallet-toolbox.ump.lookup.completed",
-			component: "wallet-toolbox.ump",
-			severity: "info",
-			correlationId: diagnostics.correlationId,
-			attributes: {
-				lookupKind,
-				result: "found",
-				durationMs: Date.now() - startedAt,
-				...this.lookupDiagnosticAttributes(diagnostics)
+		if (matchingTokens.length === 1) {
+			this.captureLookupCompleted(lookupKind, "found", diagnostics, startedAt);
+			return matchingTokens[0];
+		}
+		if (resolution.progress.emptyHosts > 0) {
+			this.captureLookupCompleted(lookupKind, "not-found", diagnostics, startedAt);
+			return;
+		}
+		const reason = resolution.answer.outputs.length > 0 ? "token-malformed" : "lookup-incomplete";
+		this.captureLookupFailure(lookupKind, reason, diagnostics, startedAt);
+		throw new UMPTokenLookupError(reason, diagnostics);
+	}
+	/**
+	* Picks the newest rendition among distinct verified tokens, when possible.
+	*
+	* The on-chain UMP protocol expresses token updates by consumption: the
+	* transaction creating a new rendition spends the previous rendition's
+	* outpoint (there is no rendition counter field in the current format).
+	* A candidate is therefore superseded when any other candidate's ancestry
+	* (available from its BEEF) spends the candidate's outpoint.
+	*
+	* @returns The single unsuperseded candidate, or undefined when supersession
+	* cannot be established for every stale candidate (e.g. forked tokens).
+	*/
+	resolveNewestToken(matchingTokens, outputs) {
+		const candidates = /* @__PURE__ */ new Map();
+		for (const token of matchingTokens) {
+			if (token.currentOutpoint == null) return void 0;
+			candidates.set(token.currentOutpoint, token);
+		}
+		const evidenceByCandidate = /* @__PURE__ */ new Map();
+		for (const output of outputs) try {
+			const tx = Transaction.fromBEEF(output.beef);
+			const outpoint = `${tx.id("hex")}.${output.outputIndex}`;
+			if (!candidates.has(outpoint)) continue;
+			const evidence = evidenceByCandidate.get(outpoint) ?? {
+				txs: [],
+				spent: /* @__PURE__ */ new Set()
+			};
+			evidence.txs.push(tx);
+			this.collectSpentOutpoints(tx, evidence.spent, /* @__PURE__ */ new Set());
+			evidenceByCandidate.set(outpoint, evidence);
+		} catch {}
+		if (evidenceByCandidate.size !== candidates.size) return void 0;
+		const survivors = [...candidates.keys()].filter((outpoint) => ![...evidenceByCandidate.entries()].some(([other, { spent }]) => other !== outpoint && spent.has(outpoint)));
+		if (survivors.length === 1) return candidates.get(survivors[0]);
+		const provenContinuations = survivors.filter((outpoint) => {
+			const evidence = evidenceByCandidate.get(outpoint);
+			const token = candidates.get(outpoint);
+			return evidence != null && token != null && evidence.txs.some((tx) => this.consumesSameIdentityToken(tx, token));
+		});
+		if (provenContinuations.length !== 1) return void 0;
+		return candidates.get(provenContinuations[0]);
+	}
+	/**
+	* Whether `tx` spends an input whose source output (available in the BEEF)
+	* decodes as a UMP token sharing the candidate's presentation or recovery
+	* hash — on-chain proof that the candidate is an update of a same-identity
+	* predecessor rather than an independently minted token.
+	*/
+	consumesSameIdentityToken(tx, token) {
+		const presentationHash = Utils.toHex(token.presentationHash);
+		const recoveryHash = Utils.toHex(token.recoveryHash);
+		for (const input of tx.inputs) {
+			const source = input.sourceTransaction;
+			if (source == null || input.sourceOutputIndex == null) continue;
+			const sourceOutput = source.outputs[input.sourceOutputIndex];
+			if (sourceOutput == null) continue;
+			try {
+				const decoded = PushDrop.decode(sourceOutput.lockingScript);
+				if (decoded.fields == null) continue;
+				const fields = stripVerifiedPushDropSignature(decoded.fields, decoded.lockingPublicKey);
+				if (fields.length < 11 || fields[6]?.length !== 32 || fields[7]?.length !== 32) continue;
+				if (Utils.toHex(fields[6]) === presentationHash || Utils.toHex(fields[7]) === recoveryHash) return true;
+			} catch {
+				continue;
 			}
-		});
-		return tokens[0];
+		}
+		return false;
+	}
+	/**
+	* Accumulates every outpoint spent by `tx` and by the ancestor transactions
+	* embedded in its BEEF, so supersession is detected even when intermediate
+	* renditions are absent from the lookup answer. Iterative so arbitrarily
+	* long update chains cannot exhaust the call stack.
+	*/
+	collectSpentOutpoints(tx, spent, visited) {
+		const pending = [tx];
+		while (pending.length > 0) {
+			const current = pending.pop();
+			const txid = current.id("hex");
+			if (visited.has(txid)) continue;
+			visited.add(txid);
+			for (const input of current.inputs) {
+				const sourceTxid = input.sourceTXID ?? input.sourceTransaction?.id("hex");
+				if (sourceTxid == null || input.sourceOutputIndex == null) continue;
+				spent.add(`${sourceTxid}.${input.sourceOutputIndex}`);
+				if (input.sourceTransaction != null) pending.push(input.sourceTransaction);
+			}
+		}
 	}
 	emptyLookupDiagnostics(correlationId) {
 		return {
@@ -27769,6 +28895,21 @@ var OverlayUMPTokenInteractor = class {
 			outputCount: diagnostics.outputCount
 		};
 	}
+	captureLookupCompleted(lookupKind, result, diagnostics, startedAt, extraAttributes = {}) {
+		this.telemetry.capture({
+			name: "wallet-toolbox.ump.lookup.completed",
+			component: "wallet-toolbox.ump",
+			severity: "info",
+			correlationId: diagnostics.correlationId,
+			attributes: {
+				lookupKind,
+				result,
+				durationMs: Date.now() - startedAt,
+				...this.lookupDiagnosticAttributes(diagnostics),
+				...extraAttributes
+			}
+		});
+	}
 	captureLookupFailure(lookupKind, reason, diagnostics, startedAt, error) {
 		this.telemetry.capture({
 			name: "wallet-toolbox.ump.lookup.indeterminate",
@@ -28009,8 +29150,7 @@ var OverlayUMPTokenInteractor = class {
 			throw new UMPTokenLookupError("lookup-unavailable", diagnostics, { cause: error });
 		}
 		if (resolution.answer.outputs.length === 0) {
-			const p = resolution.progress;
-			if (!(p.isFinal && p.hostCount > 0 && p.completedHosts === p.hostCount && p.successfulHosts === p.hostCount && p.emptyHosts === p.hostCount && p.failedHosts === 0 && p.rejectedHosts === 0 && p.freeformHosts === 0)) {
+			if (resolution.progress.emptyHosts === 0) {
 				const diagnostics = this.toLookupDiagnostics(resolution);
 				this.captureLookupFailure("outpoint", "lookup-incomplete", diagnostics, startedAt);
 				throw new UMPTokenLookupError("lookup-incomplete", diagnostics);