@bsv/wallet-toolbox-client 2.1.23 → 2.1.25

package/out/src/storage/methods/createAction.js

@@ -18,14 +18,16 @@ function setDisableDoubleSpendCheckForTest(v) {
 }
 async function createAction(storage, auth, vargs, originator) {
     const logger = vargs.logger;
-    logger === null || logger === void 0 ? void 0 : logger.group(`storage createAction`);
-    //stampLog(vargs, `start storage createTransactionSdk`)
+    logger === null || logger === void 0 ? void 0 : logger.group('storage createAction');
+    // stampLog(vargs, `start storage createTransactionSdk`)
     if (vargs.isTestWerrReviewActions)
         (0, Wallet_1.throwDummyReviewActions)();
-    if (!vargs.isNewTx)
-        // The purpose of this function is to create the initial storage records associated
-        // with a new transaction. It's an error if we have no new inputs or outputs...
+    if (!vargs.isNewTx) 
+    // The purpose of this function is to create the initial storage records associated
+    // with a new transaction. It's an error if we have no new inputs or outputs...
+    {
         throw new WERR_errors_1.WERR_INTERNAL();
+    }
     /**
      * Steps to create a transaction:
      * - Verify that all inputs either have proof in vargs.inputBEEF or that options.trustSelf === 'known' and input txid.vout are known valid to storage.
@@ -59,7 +61,7 @@ async function createAction(storage, auth, vargs, originator) {
     await preflightInsufficientFundsFastPath(vargs, xinputs, xoutputs, noSendChangeIn, availableChangeCount, feeModel);
     logger === null || logger === void 0 ? void 0 : logger.log('passed insufficient-funds preflight');
     const newTx = await createNewTxRecord(storage, userId, vargs, storageBeef);
-    logger === null || logger === void 0 ? void 0 : logger.log(`created new transaction record`);
+    logger === null || logger === void 0 ? void 0 : logger.log('created new transaction record');
     const ctx = {
         xinputs,
         xoutputs,
@@ -70,23 +72,23 @@ async function createAction(storage, auth, vargs, originator) {
         transactionId: newTx.transactionId
     };
     const { allocatedChange, changeOutputs, derivationPrefix, maxPossibleSatoshisAdjustment } = await fundNewTransactionSdk(storage, userId, vargs, ctx);
-    logger === null || logger === void 0 ? void 0 : logger.log(`funded new transaction`);
-    if (maxPossibleSatoshisAdjustment) {
+    logger === null || logger === void 0 ? void 0 : logger.log('funded new transaction');
+    if (maxPossibleSatoshisAdjustment != null) {
         const a = maxPossibleSatoshisAdjustment;
         if (ctx.xoutputs[a.fixedOutputIndex].satoshis !== generateChange_1.maxPossibleSatoshis)
             throw new WERR_errors_1.WERR_INTERNAL();
         ctx.xoutputs[a.fixedOutputIndex].satoshis = a.satoshis;
-        logger === null || logger === void 0 ? void 0 : logger.log(`adjusted change outputs to max possible`);
+        logger === null || logger === void 0 ? void 0 : logger.log('adjusted change outputs to max possible');
     }
     // The satoshis of the transaction is the satoshis we get back in change minus the satoshis we spend.
     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);
-    logger === null || logger === void 0 ? void 0 : logger.log(`created new output records`);
+    logger === null || logger === void 0 ? void 0 : logger.log('created new output records');
     const inputBeef = await mergeAllocatedChangeBeefs(storage, userId, vargs, allocatedChange, beef);
-    logger === null || logger === void 0 ? void 0 : logger.log(`merged allocated change beefs`);
+    logger === null || logger === void 0 ? void 0 : logger.log('merged allocated change beefs');
     const inputs = await createNewInputs(storage, userId, vargs, ctx, allocatedChange);
-    logger === null || logger === void 0 ? void 0 : logger.log(`created new inputs`);
+    logger === null || logger === void 0 ? void 0 : logger.log('created new inputs');
     const r = {
         reference: newTx.reference,
         version: newTx.version,
@@ -108,7 +110,7 @@ function makeDefaultOutput(userId, transactionId, satoshis, vout) {
         outputId: 0,
         userId,
         transactionId,
-        satoshis: satoshis,
+        satoshis,
         vout,
         basketId: undefined,
         change: false,
@@ -128,115 +130,162 @@ function makeDefaultOutput(userId, transactionId, satoshis, vout) {
     };
     return output;
 }
+/** Check known outputs for double-spend, mark them spent, return competing txid if found. */
+async function markKnownInputsSpent(storage, knownInputRows, transactionId) {
+    let doubleSpendTxid;
+    await storage.transaction(async (trx) => {
+        const outputIds = knownInputRows.map(ni => (0, utilityHelpers_1.verifyId)(ni.o.outputId));
+        const knownOutputsById = await storage.findOutputsByIds(outputIds, trx);
+        for (const ni of knownInputRows) {
+            const { i, o } = ni;
+            const o2 = knownOutputsById[(0, utilityHelpers_1.verifyId)(o.outputId)];
+            if (!o2)
+                throw new WERR_errors_1.WERR_INTERNAL(`missing outputId ${o.outputId}`);
+            if (o2.spentBy !== undefined) {
+                const spendingTx = await storage.findTransactionById((0, utilityHelpers_1.verifyId)(o2.spentBy), trx);
+                if (spendingTx === null || spendingTx === void 0 ? void 0 : spendingTx.txid) {
+                    doubleSpendTxid = spendingTx.txid;
+                    return;
+                }
+            }
+            if (!o2.spendable) {
+                throw new WERR_errors_1.WERR_INVALID_PARAMETER(`inputs[${i.vin}]`, `spendable output. output ${o.txid}:${o.vout} appears to have been spent (spendable=${o2.spendable}).`);
+            }
+            await storage.updateOutput((0, utilityHelpers_1.verifyId)(o.outputId), { spendable: false, spentBy: transactionId, spendingDescription: i.inputDescription }, trx);
+            o.spendable = false;
+            o.spentBy = transactionId;
+            o.spendingDescription = i.inputDescription;
+        }
+    });
+    return doubleSpendTxid;
+}
+/** Build an SDK input record for a new-input row that has a backing output. */
+async function buildSdkInputFromOutput(storage, vargs, vin, i, o, unlockLen) {
+    if ((i == null) && !unlockLen)
+        throw new WERR_errors_1.WERR_INTERNAL(`vin ${vin} non-fixedInput without unlockLen`);
+    const sourceTransaction = vargs.includeAllSourceTransactions && vargs.isSignAction
+        ? await storage.getRawTxOfKnownValidTransaction(o.txid)
+        : undefined;
+    return {
+        vin,
+        sourceTxid: o.txid,
+        sourceVout: o.vout,
+        sourceSatoshis: o.satoshis,
+        sourceLockingScript: (0, utilityHelpers_noBuffer_1.asString)(o.lockingScript),
+        sourceTransaction,
+        unlockingScriptLength: unlockLen || i.unlockingScriptLength,
+        providedBy: (i != null) && o.providedBy === 'storage' ? 'you-and-storage' : o.providedBy,
+        type: o.type,
+        spendingDescription: o.spendingDescription || undefined,
+        derivationPrefix: o.derivationPrefix || undefined,
+        derivationSuffix: o.derivationSuffix || undefined,
+        senderIdentityKey: o.senderIdentityKey || undefined
+    };
+}
+/** Build an SDK input record for a user-specified input with no corresponding stored output. */
+function buildSdkInputFromXInput(vin, i) {
+    return {
+        vin,
+        sourceTxid: i.outpoint.txid,
+        sourceVout: i.outpoint.vout,
+        sourceSatoshis: i.satoshis,
+        sourceLockingScript: i.lockingScript.toHex(),
+        unlockingScriptLength: i.unlockingScriptLength,
+        providedBy: 'you',
+        type: 'custom',
+        spendingDescription: undefined,
+        derivationPrefix: undefined,
+        derivationSuffix: undefined,
+        senderIdentityKey: undefined
+    };
+}
 async function createNewInputs(storage, userId, vargs, ctx, allocatedChange) {
     const r = [];
     const newInputs = [];
-    for (const i of ctx.xinputs) {
-        const o = i.output;
-        newInputs.push({ i, o });
-    }
-    const knownInputRows = newInputs.filter((ni) => !!ni.i && !!ni.o);
+    for (const i of ctx.xinputs)
+        newInputs.push({ i, o: i.output });
+    const knownInputRows = newInputs.filter((ni) => ni.i != null && ni.o != null);
     if (knownInputRows.length > 0) {
-        let doubleSpendTxid;
-        await storage.transaction(async (trx) => {
-            const outputIds = knownInputRows.map(ni => (0, utilityHelpers_1.verifyId)(ni.o.outputId));
-            const knownOutputsById = await storage.findOutputsByIds(outputIds, trx);
-            for (const ni of knownInputRows) {
-                const { i, o } = ni;
-                const o2 = knownOutputsById[(0, utilityHelpers_1.verifyId)(o.outputId)];
-                if (!o2)
-                    throw new WERR_errors_1.WERR_INTERNAL(`missing outputId ${o.outputId}`);
-                if (o2.spentBy !== undefined) {
-                    const spendingTx = await storage.findTransactionById((0, utilityHelpers_1.verifyId)(o2.spentBy), trx);
-                    if (spendingTx === null || spendingTx === void 0 ? void 0 : spendingTx.txid) {
-                        doubleSpendTxid = spendingTx.txid;
-                        return;
-                    }
-                }
-                if (o2.spendable != true) {
-                    throw new WERR_errors_1.WERR_INVALID_PARAMETER(`inputs[${i.vin}]`, `spendable output. output ${o.txid}:${o.vout} appears to have been spent (spendable=${o2.spendable}).`);
-                }
-                await storage.updateOutput((0, utilityHelpers_1.verifyId)(o.outputId), {
-                    spendable: false,
-                    spentBy: ctx.transactionId,
-                    spendingDescription: i.inputDescription
-                }, trx);
-                o.spendable = false;
-                o.spentBy = ctx.transactionId;
-                o.spendingDescription = i.inputDescription;
-            }
-        });
+        const doubleSpendTxid = await markKnownInputsSpent(storage, knownInputRows, ctx.transactionId);
         if (doubleSpendTxid) {
             const beef = await storage.getBeefForTransaction(doubleSpendTxid, {});
-            const rar = {
-                txid: '',
-                status: 'doubleSpend',
-                competingTxs: [doubleSpendTxid],
-                competingBeef: beef.toBinary()
-            };
-            throw new WERR_errors_1.WERR_REVIEW_ACTIONS([rar], []);
+            throw new WERR_errors_1.WERR_REVIEW_ACTIONS([{ txid: '', status: 'doubleSpend', competingTxs: [doubleSpendTxid], competingBeef: beef.toBinary() }], []);
         }
     }
-    for (const o of allocatedChange) {
+    for (const o of allocatedChange)
         newInputs.push({ o, unlockLen: 107 });
-    }
     let vin = -1;
     for (const { i, o, unlockLen } of newInputs) {
         vin++;
-        if (o) {
-            if (!i && !unlockLen)
-                throw new WERR_errors_1.WERR_INTERNAL(`vin ${vin} non-fixedInput without unlockLen`);
-            const sourceTransaction = vargs.includeAllSourceTransactions && vargs.isSignAction
-                ? await storage.getRawTxOfKnownValidTransaction(o.txid)
-                : undefined;
-            const ri = {
-                vin,
-                sourceTxid: o.txid,
-                sourceVout: o.vout,
-                sourceSatoshis: o.satoshis,
-                sourceLockingScript: (0, utilityHelpers_noBuffer_1.asString)(o.lockingScript),
-                sourceTransaction,
-                unlockingScriptLength: unlockLen ? unlockLen : i.unlockingScriptLength,
-                providedBy: i && o.providedBy === 'storage' ? 'you-and-storage' : o.providedBy,
-                type: o.type,
-                spendingDescription: o.spendingDescription || undefined,
-                derivationPrefix: o.derivationPrefix || undefined,
-                derivationSuffix: o.derivationSuffix || undefined,
-                senderIdentityKey: o.senderIdentityKey || undefined
-            };
-            r.push(ri);
+        if (o != null) {
+            r.push(await buildSdkInputFromOutput(storage, vargs, vin, i, o, unlockLen));
         }
         else {
-            if (!i)
+            if (i == null)
                 throw new WERR_errors_1.WERR_INTERNAL(`vin ${vin} without output or xinput`);
-            // user specified input with no corresponding output being spent.
-            const ri = {
-                vin,
-                sourceTxid: i.outpoint.txid,
-                sourceVout: i.outpoint.vout,
-                sourceSatoshis: i.satoshis,
-                sourceLockingScript: i.lockingScript.toHex(),
-                unlockingScriptLength: i.unlockingScriptLength,
-                providedBy: 'you',
-                type: 'custom',
-                spendingDescription: undefined,
-                derivationPrefix: undefined,
-                derivationSuffix: undefined,
-                senderIdentityKey: undefined
-            };
-            r.push(ri);
+            r.push(buildSdkInputFromXInput(vin, i));
         }
     }
     return r;
 }
-async function createNewOutputs(storage, userId, vargs, ctx, changeOutputs) {
+/** Randomly reassign vout values across newOutputs using either the provided randomVals or crypto-random bytes. */
+function randomizeOutputVouts(newOutputs, randomVals) {
+    const vals = [...(randomVals || [])];
+    const nextRandom = () => {
+        if (vals.length > 0) {
+            const v = vals.shift();
+            vals.push(v);
+            return v;
+        }
+        const bytes = (0, sdk_1.Random)(4);
+        return (((bytes[0] << 24) | (bytes[1] << 16) | (bytes[2] << 8) | bytes[3]) >>> 0) / 0x100000000;
+    };
+    const newVouts = Array.from({ length: newOutputs.length }, (_, i) => i);
+    for (let cur = newVouts.length; cur > 0; cur--) {
+        const rnd = Math.floor(nextRandom() * cur);
+        [newVouts[cur - 1], newVouts[rnd]] = [newVouts[rnd], newVouts[cur - 1]];
+    }
+    let vout = -1;
+    for (const no of newOutputs) {
+        vout++;
+        if (no.o.vout !== vout)
+            throw new WERR_errors_1.WERR_INTERNAL(`new output ${vout} has out of order vout ${no.o.vout}`);
+        no.o.vout = newVouts[vout];
+    }
+}
+/** Insert the output and attach its tags; return the SDK output descriptor. */
+async function persistNewOutput(storage, o, tags, txTags, txBaskets) {
     var _a;
-    const outputs = [];
-    // Lookup output baskets
+    o.outputId = await storage.insertOutput(o);
+    const changeVout = (o.change && o.purpose === 'change' && o.providedBy === 'storage') ? o.vout : undefined;
+    for (const tagName of new Set(tags)) {
+        const tag = txTags[tagName];
+        await storage.insertOutputTagMap({
+            outputId: (0, utilityHelpers_1.verifyId)(o.outputId),
+            outputTagId: (0, utilityHelpers_1.verifyId)(tag.outputTagId),
+            created_at: new Date(),
+            updated_at: new Date(),
+            isDeleted: false
+        });
+    }
+    const ro = {
+        vout: (0, utilityHelpers_1.verifyInteger)(o.vout),
+        satoshis: sdk_1.Validation.validateSatoshis(o.satoshis, 'o.satoshis'),
+        lockingScript: (o.lockingScript == null) ? '' : (0, utilityHelpers_noBuffer_1.asString)(o.lockingScript),
+        providedBy: (0, utilityHelpers_1.verifyTruthy)(o.providedBy),
+        purpose: o.purpose || undefined,
+        basket: (_a = Object.values(txBaskets).find(b => b.basketId === o.basketId)) === null || _a === void 0 ? void 0 : _a.name,
+        tags,
+        outputDescription: o.outputDescription,
+        derivationSuffix: o.derivationSuffix,
+        customInstructions: o.customInstructions
+    };
+    return { changeVout, ro };
+}
+async function createNewOutputs(storage, userId, vargs, ctx, changeOutputs) {
     const txBaskets = {};
     const basketNames = [...new Set(ctx.xoutputs.map(x => x.basket).filter((v) => !!v))];
     Object.assign(txBaskets, await storage.findOrInsertOutputBasketsBulk(userId, basketNames));
-    // Lookup output tags
     const txTags = {};
     const tagNames = [...new Set(ctx.xoutputs.flatMap(x => x.tags))];
     Object.assign(txTags, await storage.findOrInsertOutputTagsBulk(userId, tagNames));
@@ -245,17 +294,7 @@ async function createNewOutputs(storage, userId, vargs, ctx, changeOutputs) {
         const lockingScript = (0, utilityHelpers_noBuffer_1.asArray)(xo.lockingScript);
         if (xo.purpose === 'service-charge') {
             const now = new Date();
-            await storage.insertCommission({
-                userId,
-                transactionId: ctx.transactionId,
-                lockingScript,
-                satoshis: xo.satoshis,
-                isRedeemed: false,
-                keyOffset: (0, utilityHelpers_1.verifyTruthy)(xo.keyOffset),
-                created_at: now,
-                updated_at: now,
-                commissionId: 0
-            });
+            await storage.insertCommission({ userId, transactionId: ctx.transactionId, lockingScript, satoshis: xo.satoshis, isRedeemed: false, keyOffset: (0, utilityHelpers_1.verifyTruthy)(xo.keyOffset), created_at: now, updated_at: now, commissionId: 0 });
             const o = makeDefaultOutput(userId, ctx.transactionId, xo.satoshis, xo.vout);
             o.lockingScript = lockingScript;
             o.providedBy = 'storage';
@@ -265,11 +304,9 @@ async function createNewOutputs(storage, userId, vargs, ctx, changeOutputs) {
             newOutputs.push({ o, tags: [] });
         }
         else {
-            // The user wants tracking if they put their output in a basket
-            const basketId = !xo.basket ? undefined : txBaskets[xo.basket].basketId;
             const o = makeDefaultOutput(userId, ctx.transactionId, xo.satoshis, xo.vout);
             o.lockingScript = lockingScript;
-            o.basketId = basketId;
+            o.basketId = xo.basket ? txBaskets[xo.basket].basketId : undefined;
             o.customInstructions = xo.customInstructions;
             o.outputDescription = xo.outputDescription;
             o.providedBy = xo.providedBy;
@@ -282,74 +319,14 @@ async function createNewOutputs(storage, userId, vargs, ctx, changeOutputs) {
         o.spendable = true;
         newOutputs.push({ o, tags: [] });
     }
-    if (vargs.options.randomizeOutputs) {
-        const randomVals = [];
-        const nextRandomVal = () => {
-            let val = 0;
-            if (!randomVals || randomVals.length === 0) {
-                const bytes = (0, sdk_1.Random)(4);
-                val = (((bytes[0] << 24) | (bytes[1] << 16) | (bytes[2] << 8) | bytes[3]) >>> 0) / 0x100000000;
-            }
-            else {
-                val = randomVals.shift() || 0;
-                randomVals.push(val);
-            }
-            return val;
-        };
-        /** In-place array shuffle */
-        const shuffleArray = (array) => {
-            let currentIndex = array.length;
-            let temporaryValue;
-            let randomIndex;
-            while (currentIndex !== 0) {
-                randomIndex = Math.floor(nextRandomVal() * currentIndex);
-                currentIndex -= 1;
-                temporaryValue = array[currentIndex];
-                array[currentIndex] = array[randomIndex];
-                array[randomIndex] = temporaryValue;
-            }
-            return array;
-        };
-        let vout = -1;
-        const newVouts = Array(newOutputs.length);
-        for (let i = 0; i < newVouts.length; i++)
-            newVouts[i] = i;
-        shuffleArray(newVouts);
-        for (const no of newOutputs) {
-            vout++;
-            if (no.o.vout !== vout)
-                throw new WERR_errors_1.WERR_INTERNAL(`new output ${vout} has out of order vout ${no.o.vout}`);
-            no.o.vout = newVouts[vout];
-        }
-    }
+    if (vargs.options.randomizeOutputs)
+        randomizeOutputVouts(newOutputs, vargs.randomVals);
+    const outputs = [];
     const changeVouts = [];
     for (const { o, tags } of newOutputs) {
-        o.outputId = await storage.insertOutput(o);
-        if (o.change && o.purpose === 'change' && o.providedBy === 'storage')
-            changeVouts.push(o.vout);
-        // Add tags to the output
-        for (const tagName of [...new Set(tags)]) {
-            const tag = txTags[tagName];
-            await storage.insertOutputTagMap({
-                outputId: (0, utilityHelpers_1.verifyId)(o.outputId),
-                outputTagId: (0, utilityHelpers_1.verifyId)(tag.outputTagId),
-                created_at: new Date(),
-                updated_at: new Date(),
-                isDeleted: false
-            });
-        }
-        const ro = {
-            vout: (0, utilityHelpers_1.verifyInteger)(o.vout),
-            satoshis: sdk_1.Validation.validateSatoshis(o.satoshis, 'o.satoshis'),
-            lockingScript: !o.lockingScript ? '' : (0, utilityHelpers_noBuffer_1.asString)(o.lockingScript),
-            providedBy: (0, utilityHelpers_1.verifyTruthy)(o.providedBy),
-            purpose: o.purpose || undefined,
-            basket: (_a = Object.values(txBaskets).find(b => b.basketId === o.basketId)) === null || _a === void 0 ? void 0 : _a.name,
-            tags: tags,
-            outputDescription: o.outputDescription,
-            derivationSuffix: o.derivationSuffix,
-            customInstructions: o.customInstructions
-        };
+        const { changeVout, ro } = await persistNewOutput(storage, o, tags, txTags, txBaskets);
+        if (changeVout !== undefined)
+            changeVouts.push(changeVout);
         outputs.push(ro);
     }
     return { outputs, changeVouts };
@@ -455,11 +432,11 @@ function validateRequiredOutputs(storage, userId, vargs) {
  * @returns {xinputs} extended validated required inputs.
  */
 async function validateRequiredInputs(storage, userId, vargs) {
-    //stampLog(vargs, `start storage verifyInputBeef`)
+    // stampLog(vargs, `start storage verifyInputBeef`)
     const beef = new sdk_1.Beef();
     if (vargs.inputs.length === 0)
         return { storageBeef: beef, beef, xinputs: [] };
-    if (vargs.inputBEEF)
+    if (vargs.inputBEEF != null)
         beef.mergeBeef(vargs.inputBEEF);
     const xinputs = vargs.inputs.map((input, vin) => ({
         ...input,
@@ -472,98 +449,78 @@ async function validateRequiredInputs(storage, userId, vargs) {
     const inputTxids = {};
     for (const input of xinputs)
         inputTxids[input.outpoint.txid] = true;
-    // Check beef from user that either there are no txidOnly entries,
-    // or that we can trust storage data and it does indeed vouch
-    // for any txidOnly entries
+    await validateBeefTxidOnlyEntries(beef, inputTxids, trustSelf, storage);
+    await ensureBeefContainsAllInputTxids(beef, inputTxids, trustSelf, storage);
+    if (!(await beef.verify(await storage.getServices().getChainTracker(), true))) {
+        console.log(`verifyInputBeef failed, inputBEEF failed to verify.\n${beef.toLogString()}\n`);
+        throw new WERR_errors_1.WERR_INVALID_PARAMETER('inputBEEF', 'valid Beef when factoring options.trustSelf');
+    }
+    const storageBeef = beef.clone();
+    const preloadedOutputsByOutpoint = await storage.findOutputsByOutpoints(userId, xinputs.map(i => ({ txid: i.outpoint.txid, vout: i.outpoint.vout })));
+    for (const input of xinputs) {
+        await resolveInputScript(storage, userId, vargs, input, beef, preloadedOutputsByOutpoint);
+    }
+    return { beef, storageBeef, xinputs };
+}
+/** Check all txidOnly entries in beef: require either trustSelf vouch or throw. */
+async function validateBeefTxidOnlyEntries(beef, inputTxids, trustSelf, storage) {
     for (const btx of beef.txs) {
-        if (btx.isTxidOnly) {
-            if (!trustSelf)
-                throw new WERR_errors_1.WERR_INVALID_PARAMETER('inputBEEF', `valid and contain complete proof data for ${btx.txid}`);
-            if (!inputTxids[btx.txid]) {
-                // inputTxids are checked next
-                const isKnown = await storage.verifyKnownValidTransaction(btx.txid);
-                if (!isKnown)
-                    throw new WERR_errors_1.WERR_INVALID_PARAMETER('inputBEEF', `valid and contain complete proof data for unknown ${btx.txid}`);
-            }
+        if (!btx.isTxidOnly)
+            continue;
+        if (!trustSelf)
+            throw new WERR_errors_1.WERR_INVALID_PARAMETER('inputBEEF', `valid and contain complete proof data for ${btx.txid}`);
+        if (!inputTxids[btx.txid]) {
+            const isKnown = await storage.verifyKnownValidTransaction(btx.txid);
+            if (!isKnown)
+                throw new WERR_errors_1.WERR_INVALID_PARAMETER('inputBEEF', `valid and contain complete proof data for unknown ${btx.txid}`);
         }
     }
-    // Make sure that there's an entry for all inputs txid values:
+}
+/** Ensure beef has an entry (or txidOnly) for every input txid. */
+async function ensureBeefContainsAllInputTxids(beef, inputTxids, trustSelf, storage) {
     for (const txid of Object.keys(inputTxids)) {
         let btx = beef.findTxid(txid);
-        if (!btx && trustSelf) {
+        if (btx == null && trustSelf) {
             if (await storage.verifyKnownValidTransaction(txid))
                 btx = beef.mergeTxidOnly(txid);
         }
-        if (!btx) {
+        if (btx == null) {
             throw new WERR_errors_1.WERR_INVALID_PARAMETER('inputBEEF', `valid and contain proof data for possibly known ${txid}, beef ${beef.toLogString()}`);
         }
     }
-    if (!(await beef.verify(await storage.getServices().getChainTracker(), true))) {
-        console.log(`verifyInputBeef failed, inputBEEF failed to verify.\n${beef.toLogString()}\n`);
-        //console.log(`verifyInputBeef failed, inputBEEF failed to verify.\n${stampLogFormat(vargs.log)}\n${beef.toLogString()}\n`)
-        throw new WERR_errors_1.WERR_INVALID_PARAMETER('inputBEEF', 'valid Beef when factoring options.trustSelf');
-    }
-    // beef may now be trusted and has a BeefTx for every input txid.
-    const storageBeef = beef.clone();
-    const preloadedOutputsByOutpoint = await storage.findOutputsByOutpoints(userId, xinputs.map(i => ({ txid: i.outpoint.txid, vout: i.outpoint.vout })));
-    for (const input of xinputs) {
-        const { txid, vout } = input.outpoint;
-        let output = preloadedOutputsByOutpoint[`${txid}.${vout}`];
-        if (!output)
-            output = (0, utilityHelpers_1.verifyOneOrNone)(await storage.findOutputs({ partial: { userId, txid, vout } }));
-        if (output) {
-            if (output.change) {
-                throw new WERR_errors_1.WERR_INVALID_PARAMETER(`inputs[${input.vin}]`, 'an unmanaged input. Change outputs are managed by your wallet.');
-            }
-            input.output = output;
-            if (!Array.isArray(output.lockingScript) || !Number.isInteger(output.satoshis))
-                throw new WERR_errors_1.WERR_INVALID_PARAMETER(`${txid}.${vout}`, 'output with valid lockingScript and satoshis');
-            if (!disableDoubleSpendCheckForTest && !output.spendable && !vargs.isNoSend)
-                throw new WERR_errors_1.WERR_INVALID_PARAMETER(`${txid}.${vout}`, 'spendable output unless noSend is true');
-            // input is spending an existing user output which has an lockingScript
-            input.satoshis = sdk_1.Validation.validateSatoshis(output.satoshis, 'output.satoshis');
-            input.lockingScript = sdk_1.Script.fromBinary((0, utilityHelpers_noBuffer_1.asArray)(output.lockingScript));
-        }
-        else {
-            let btx = beef.findTxid(txid);
-            if (btx.isTxidOnly) {
-                const { rawTx, proven } = await storage.getProvenOrRawTx(txid);
-                //stampLog(vargs, `... storage verifyInputBeef getProvenOrRawTx ${txid} ${proven ? 'proven' : rawTx ? 'rawTx' : 'unknown'}`)
-                if (!rawTx)
-                    throw new WERR_errors_1.WERR_INVALID_PARAMETER('inputBEEF', `valid and contain proof data for ${txid}`);
-                btx = beef.mergeRawTx((0, utilityHelpers_noBuffer_1.asArray)(rawTx));
-                if (proven)
-                    beef.mergeBump(new EntityProvenTx_1.EntityProvenTx(proven).getMerklePath());
-            }
-            // btx is valid has parsed transaction data.
-            if (vout >= btx.tx.outputs.length)
-                throw new WERR_errors_1.WERR_INVALID_PARAMETER(`${txid}.${vout}`, 'valid outpoint');
-            const so = btx.tx.outputs[vout];
-            input.satoshis = sdk_1.Validation.validateSatoshis(so.satoshis, 'so.satoshis');
-            input.lockingScript = so.lockingScript;
-        }
-    }
-    return { beef, storageBeef, xinputs };
 }
-async function verifyBeefFixOrhpans(beef, storage) {
-    const r = beef.verifyValid();
-    if (!r.valid) {
-        // Beef is structurally invalid.
-        return false;
+/** Resolve satoshis and lockingScript for one xinput from either storage or the beef. */
+async function resolveInputScript(storage, userId, vargs, input, beef, preloadedOutputsByOutpoint) {
+    const { txid, vout } = input.outpoint;
+    let output = preloadedOutputsByOutpoint[`${txid}.${vout}`];
+    output !== null && output !== void 0 ? output : (output = (0, utilityHelpers_1.verifyOneOrNone)(await storage.findOutputs({ partial: { userId, txid, vout } })));
+    if (output != null) {
+        if (output.change)
+            throw new WERR_errors_1.WERR_INVALID_PARAMETER(`inputs[${input.vin}]`, 'an unmanaged input. Change outputs are managed by your wallet.');
+        input.output = output;
+        if (!Array.isArray(output.lockingScript) || !Number.isInteger(output.satoshis))
+            throw new WERR_errors_1.WERR_INVALID_PARAMETER(`${txid}.${vout}`, 'output with valid lockingScript and satoshis');
+        if (!disableDoubleSpendCheckForTest && !output.spendable && !vargs.isNoSend)
+            throw new WERR_errors_1.WERR_INVALID_PARAMETER(`${txid}.${vout}`, 'spendable output unless noSend is true');
+        input.satoshis = sdk_1.Validation.validateSatoshis(output.satoshis, 'output.satoshis');
+        input.lockingScript = sdk_1.Script.fromBinary((0, utilityHelpers_noBuffer_1.asArray)(output.lockingScript));
     }
-    const heights = Object.keys(r.roots);
-    const services = storage.getServices();
-    const chainTracker = await services.getChainTracker();
-    let rootsAreValid = true;
-    for (const height of heights) {
-        const isValid = await chainTracker.isValidRootForHeight(r.roots[height], Number(height));
-        if (isValid)
-            continue;
-        // The original block may have been orphaned, check for a new proof.
-        const mp = beef.bumps.find(b => b.blockHeight === Number(height));
-        //const p = await services.getMerklePath()
+    else {
+        let btx = beef.findTxid(txid);
+        if (btx.isTxidOnly) {
+            const { rawTx, proven } = await storage.getProvenOrRawTx(txid);
+            if (rawTx == null)
+                throw new WERR_errors_1.WERR_INVALID_PARAMETER('inputBEEF', `valid and contain proof data for ${txid}`);
+            btx = beef.mergeRawTx((0, utilityHelpers_noBuffer_1.asArray)(rawTx));
+            if (proven != null)
+                beef.mergeBump(new EntityProvenTx_1.EntityProvenTx(proven).getMerklePath());
+        }
+        if (vout >= btx.tx.outputs.length)
+            throw new WERR_errors_1.WERR_INVALID_PARAMETER(`${txid}.${vout}`, 'valid outpoint');
+        const so = btx.tx.outputs[vout];
+        input.satoshis = sdk_1.Validation.validateSatoshis(so.satoshis, 'so.satoshis');
+        input.lockingScript = so.lockingScript;
     }
-    return false;
 }
 async function validateNoSendChange(storage, userId, vargs, changeBasket) {
     const r = [];
@@ -576,17 +533,19 @@ async function validateNoSendChange(storage, userId, vargs, changeBasket) {
                 partial: { userId, txid: op.txid, vout: op.vout }
             }));
             // noSendChange is not marked spendable until sent, may not already be spent, and must have a valid greater than zero satoshis
-            if (!output ||
-                output.providedBy !== 'storage' ||
+            if ((output === null || output === void 0 ? void 0 : output.providedBy) !== 'storage' ||
                 output.purpose !== 'change' ||
-                output.spendable === false ||
+                !output.spendable ||
                 Number.isInteger(output.spentBy) ||
                 !(0, utilityHelpers_1.verifyNumber)(output.satoshis) ||
-                output.basketId !== changeBasket.basketId)
+                output.basketId !== changeBasket.basketId) {
                 throw new WERR_errors_1.WERR_INVALID_PARAMETER('noSendChange outpoint', 'valid');
-            if (-1 < r.findIndex(o => o.outputId === output.outputId))
-                // noSendChange duplicate OutPoints are not allowed.
+            }
+            if (r.some(o => o.outputId === output.outputId)) 
+            // noSendChange duplicate OutPoints are not allowed.
+            {
                 throw new WERR_errors_1.WERR_INVALID_PARAMETER('noSendChange outpoint', 'unique. Duplicates are not allowed.');
+            }
             r.push(output);
         }
     }
@@ -652,7 +611,7 @@ async function fundNewTransactionSdk(storage, userId, vargs, ctx) {
         }
         const basketId = ctx.changeBasket.basketId;
         const o = await storage.allocateChangeInput(userId, basketId, targetSatoshis, exactSatoshis, !vargs.isDelayed, ctx.transactionId);
-        if (!o)
+        if (o == null)
             return undefined;
         outputs[o.outputId] = o;
         const r = {
@@ -663,7 +622,7 @@ async function fundNewTransactionSdk(storage, userId, vargs, ctx) {
     };
     const releaseChangeInput = async (outputId) => {
         const nsco = ctx.noSendChangeIn.find(o => o.outputId === outputId);
-        if (nsco) {
+        if (nsco != null) {
             noSendChange.push(nsco);
             return;
         }
@@ -675,7 +634,7 @@ async function fundNewTransactionSdk(storage, userId, vargs, ctx) {
     const gcr = await (0, generateChange_1.generateChangeSdk)(params, allocateChangeInput, releaseChangeInput, vargs.logger);
     const nextRandomVal = () => {
         let val = 0;
-        if (!vargs.randomVals || vargs.randomVals.length === 0) {
+        if ((vargs.randomVals == null) || vargs.randomVals.length === 0) {
             const bytes = (0, sdk_1.Random)(4);
             val = (((bytes[0] << 24) | (bytes[1] << 16) | (bytes[2] << 8) | bytes[3]) >>> 0) / 0x100000000;
         }
@@ -695,7 +654,7 @@ async function fundNewTransactionSdk(storage, userId, vargs, ctx) {
     };
     const randomDerivation = (count) => {
         let val = [];
-        if (!vargs.randomVals || vargs.randomVals.length === 0) {
+        if ((vargs.randomVals == null) || vargs.randomVals.length === 0) {
             val = (0, sdk_1.Random)(count);
         }
         else {
@@ -757,6 +716,7 @@ function trimInputBeef(beef, vargs) {
     return beef.toBinary();
 }
 async function mergeAllocatedChangeBeefs(storage, userId, vargs, allocatedChange, beef) {
+    var _a;
     const options = {
         trustSelf: undefined,
         knownTxids: vargs.options.knownTxids,
@@ -769,7 +729,7 @@ async function mergeAllocatedChangeBeefs(storage, userId, vargs, allocatedChange
     if (vargs.options.returnTXIDOnly)
         return undefined;
     for (const o of allocatedChange) {
-        if (!beef.findTxid(o.txid) && !(vargs.options.knownTxids || []).find(txid => txid === o.txid)) {
+        if ((beef.findTxid(o.txid) == null) && !((_a = vargs.options.knownTxids) !== null && _a !== void 0 ? _a : []).some(txid => txid === o.txid)) {
             await storage.getBeefForTransaction(o.txid, options);
         }
     }