@bopen-io/wallet-toolbox 2.1.21-parity-fix.2 → 2.6.2-brc153.2

package/out/src/signer/methods/internalizeAction.js

@@ -16,27 +16,39 @@ const WERR_errors_1 = require("../../sdk/WERR_errors");
  * Processing starts with simple validation and then checks for a pre-existing transaction.
  * If the transaction is already known to the user, then the outputs are reviewed against the existing outputs treatment,
  * and merge rules are added to the arguments passed to the storage layer.
- * The existing transaction must be in the 'unproven' or 'completed' status. Any other status is an error.
+ *
+ * The existing transaction's `status` determines what the merge path does next:
+ *  - `'unproven'`, `'completed'`, or `'sending'`: outputs are merged; status is left as-is.
+ *    The `'sending'` case covers a transaction this wallet already signed and handed to broadcast processing, but
+ *    whose proven_tx_req has not yet been advanced by the normal monitor/posting flow.
+ *  - `'nosend'`: the `internalizeAction` call is treated as explicit authorization to advance the lifecycle.
+ *    `transactions.status` is promoted to `'completed'` (BUMP-bearing BEEF) or `'unproven'` (otherwise), and the
+ *    `proven_tx_req` is moved out of `'nosend'` so Monitor's proof-fetching flow can finalize it. See storage-layer
+ *    `internalizeAction` docs for the full rationale.
+ *  - Any other status: an error.
  *
  * When the transaction already exists, the description is updated. The isOutgoing sense is not changed.
  *
  * "basket insertion" Merge Rules:
  * 1. The "default" basket may not be specified as the insertion basket.
- * 2. A change output in the "default" basket may not be target of an insertion into a different basket.
- * 3. These baskets do not affect the wallet's balance and are typed "custom".
+ * 2. Managed change may not be reclassified as a basket insertion.
+ * 3. Basket insertions do not affect wallet balance and are typed "custom".
  *
  * "wallet payment" Merge Rules:
- * 1. Targetting an existing change "default" basket output results in a no-op. No error. No alterations made.
- * 2. Targetting a previously "custom" non-change output converts it into a change output. This alters the transaction's `amount`, and the wallet balance.
+ * 1. Targeting an existing managed output is idempotent.
+ * 2. Targeting a custom output converts it to managed BRC-29 change after
+ *    the locking script is verified. This is the only supported in-place
+ *    recovery path for a misclassified BRC-29 payment.
  *
  */
 async function internalizeAction(wallet, auth, args) {
     const vargs = sdk_1.Validation.validateInternalizeActionArgs(args);
-    const { ab, tx, txid } = await validateAtomicBeef();
+    const { tx } = await validateAtomicBeef();
     const brc29ProtocolID = [2, '3241645161d8'];
     for (const o of vargs.outputs) {
-        if (o.outputIndex < 0 || o.outputIndex >= tx.outputs.length)
+        if (o.outputIndex < 0 || o.outputIndex >= tx.outputs.length) {
             throw new WERR_errors_1.WERR_INVALID_PARAMETER('outputIndex', `a valid output index in range 0 to ${tx.outputs.length - 1}`);
+        }
         switch (o.protocol) {
             case 'basket insertion':
                 setupBasketInsertionForOutput(o, vargs);
@@ -50,21 +62,25 @@ async function internalizeAction(wallet, auth, args) {
     }
     const r = await wallet.storage.internalizeAction(args);
     return r;
-    function setupWalletPaymentForOutput(o, dargs) {
+    function setupWalletPaymentForOutput(o, _dargs) {
         const p = o.paymentRemittance;
         const output = tx.outputs[o.outputIndex];
-        if (!p)
+        if (p == null)
             throw new WERR_errors_1.WERR_INVALID_PARAMETER('paymentRemittance', `valid for protocol ${o.protocol}`);
         const keyID = `${p.derivationPrefix} ${p.derivationSuffix}`;
         const privKey = wallet.keyDeriver.derivePrivateKey(brc29ProtocolID, keyID, p.senderIdentityKey);
         const expectedLockScript = new sdk_1.P2PKH().lock(privKey.toAddress());
-        if (output.lockingScript.toHex() !== expectedLockScript.toHex())
-            throw new WERR_errors_1.WERR_INVALID_PARAMETER('paymentRemittance', `locked by script conforming to BRC-29`);
+        if (output.lockingScript.toHex() !== expectedLockScript.toHex()) {
+            throw new WERR_errors_1.WERR_INVALID_PARAMETER('paymentRemittance', 'locked by script conforming to BRC-29');
+        }
     }
-    function setupBasketInsertionForOutput(o, dargs) {
-        /*
-        No additional validations...
-        */
+    function setupBasketInsertionForOutput(o, _dargs) {
+        const insertion = o.insertionRemittance;
+        if (insertion == null)
+            throw new WERR_errors_1.WERR_INVALID_PARAMETER('insertionRemittance', `valid for protocol ${o.protocol}`);
+        if (insertion.basket === 'default') {
+            throw new WERR_errors_1.WERR_INVALID_PARAMETER('insertionRemittance.basket', 'a non-default basket');
+        }
     }
     /**
      * Verifies that the `tx` argument passed to internalizeAction is a valid AtomicBEEF,
@@ -75,8 +91,8 @@ async function internalizeAction(wallet, auth, args) {
      */
     async function validateAtomicBeef() {
         const ab = sdk_1.Beef.fromBinary(vargs.tx);
-        // TODO: Add support for known txids...which would speed up processing by avoiding a network call,
-        // unless a local chaintracker is used.
+        // Internalization is a trust boundary, so verify the AtomicBEEF against the
+        // configured chain tracker instead of accepting caller-supplied known txids.
         const txValid = await ab.verify(await wallet.getServices().getChainTracker(), false);
         if (!txValid || !ab.atomicTxid) {
             console.log(`internalizeAction beef is invalid: ${ab.toLogString()}`);
@@ -84,7 +100,7 @@ async function internalizeAction(wallet, auth, args) {
         }
         const txid = ab.atomicTxid;
         const btx = ab.findTxid(txid);
-        if (!btx)
+        if (btx == null)
             throw new WERR_errors_1.WERR_INVALID_PARAMETER('tx', `valid AtomicBEEF with newest txid of ${txid}`);
         const tx = btx.tx;
         return { ab, tx, txid };

package/out/src/signer/methods/internalizeAction.js.map

@@ -1 +1 @@
-{"version":3,"file":"internalizeAction.js","sourceRoot":"","sources":["../../../../src/signer/methods/internalizeAction.ts"],"names":[],"mappings":";;AAgCA,8CAyEC;AAzGD,kCAA4G;AAG5G,uDAA6E;AAE7E;;;;;;;;;;;;;;;;;;;;;;;;;;GA0BG;AACI,KAAK,UAAU,iBAAiB,CACrC,MAAc,EACd,IAAY,EACZ,IAA2B;IAE3B,MAAM,KAAK,GAAG,gBAAU,CAAC,6BAA6B,CAAC,IAAI,CAAC,CAAA;IAE5D,MAAM,EAAE,EAAE,EAAE,EAAE,EAAE,IAAI,EAAE,GAAG,MAAM,kBAAkB,EAAE,CAAA;IACnD,MAAM,eAAe,GAAmB,CAAC,CAAC,EAAE,cAAc,CAAC,CAAA;IAE3D,KAAK,MAAM,CAAC,IAAI,KAAK,CAAC,OAAO,EAAE,CAAC;QAC9B,IAAI,CAAC,CAAC,WAAW,GAAG,CAAC,IAAI,CAAC,CAAC,WAAW,IAAI,EAAE,CAAC,OAAO,CAAC,MAAM;YACzD,MAAM,IAAI,oCAAsB,CAAC,aAAa,EAAE,sCAAsC,EAAE,CAAC,OAAO,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC,CAAA;QAChH,QAAQ,CAAC,CAAC,QAAQ,EAAE,CAAC;YACnB,KAAK,kBAAkB;gBACrB,6BAA6B,CAAC,CAAC,EAAE,KAAK,CAAC,CAAA;gBACvC,MAAK;YACP,KAAK,gBAAgB;gBACnB,2BAA2B,CAAC,CAAC,EAAE,KAAK,CAAC,CAAA;gBACrC,MAAK;YACP;gBACE,MAAM,IAAI,2BAAa,CAAC,uBAAuB,CAAC,CAAC,QAAQ,EAAE,CAAC,CAAA;QAChE,CAAC;IACH,CAAC;IAED,MAAM,CAAC,GAAmC,MAAM,MAAM,CAAC,OAAO,CAAC,iBAAiB,CAAC,IAAI,CAAC,CAAA;IAEtF,OAAO,CAAC,CAAA;IAER,SAAS,2BAA2B,CAAC,CAAoB,EAAE,KAA4C;QACrG,MAAM,CAAC,GAAG,CAAC,CAAC,iBAAiB,CAAA;QAC7B,MAAM,MAAM,GAAG,EAAE,CAAC,OAAO,CAAC,CAAC,CAAC,WAAW,CAAC,CAAA;QACxC,IAAI,CAAC,CAAC;YAAE,MAAM,IAAI,oCAAsB,CAAC,mBAAmB,EAAE,sBAAsB,CAAC,CAAC,QAAQ,EAAE,CAAC,CAAA;QAEjG,MAAM,KAAK,GAAG,GAAG,CAAC,CAAC,gBAAgB,IAAI,CAAC,CAAC,gBAAgB,EAAE,CAAA;QAE3D,MAAM,OAAO,GAAG,MAAM,CAAC,UAAW,CAAC,gBAAgB,CAAC,eAAe,EAAE,KAAK,EAAE,CAAC,CAAC,iBAAiB,CAAC,CAAA;QAChG,MAAM,kBAAkB,GAAG,IAAI,WAAK,EAAE,CAAC,IAAI,CAAC,OAAO,CAAC,SAAS,EAAE,CAAC,CAAA;QAChE,IAAI,MAAM,CAAC,aAAa,CAAC,KAAK,EAAE,KAAK,kBAAkB,CAAC,KAAK,EAAE;YAC7D,MAAM,IAAI,oCAAsB,CAAC,mBAAmB,EAAE,uCAAuC,CAAC,CAAA;IAClG,CAAC;IAED,SAAS,6BAA6B,CAAC,CAAoB,EAAE,KAA4C;QACvG;;UAEE;IACJ,CAAC;IAED;;;;;;OAMG;IACH,KAAK,UAAU,kBAAkB;QAC/B,MAAM,EAAE,GAAG,UAAI,CAAC,UAAU,CAAC,KAAK,CAAC,EAAE,CAAC,CAAA;QAEpC,kGAAkG;QAClG,uCAAuC;QAEvC,MAAM,OAAO,GAAG,MAAM,EAAE,CAAC,MAAM,CAAC,MAAM,MAAM,CAAC,WAAW,EAAE,CAAC,eAAe,EAAE,EAAE,KAAK,CAAC,CAAA;QACpF,IAAI,CAAC,OAAO,IAAI,CAAC,EAAE,CAAC,UAAU,EAAE,CAAC;YAC/B,OAAO,CAAC,GAAG,CAAC,sCAAsC,EAAE,CAAC,WAAW,EAAE,EAAE,CAAC,CAAA;YACrE,MAAM,IAAI,oCAAsB,CAAC,IAAI,EAAE,kBAAkB,CAAC,CAAA;QAC5D,CAAC;QACD,MAAM,IAAI,GAAG,EAAE,CAAC,UAAU,CAAA;QAC1B,MAAM,GAAG,GAAG,EAAE,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAA;QAC7B,IAAI,CAAC,GAAG;YAAE,MAAM,IAAI,oCAAsB,CAAC,IAAI,EAAE,wCAAwC,IAAI,EAAE,CAAC,CAAA;QAChG,MAAM,EAAE,GAAG,GAAG,CAAC,EAAG,CAAA;QAElB,OAAO,EAAE,EAAE,EAAE,EAAE,EAAE,IAAI,EAAE,CAAA;IACzB,CAAC;AACH,CAAC"}
+{"version":3,"file":"internalizeAction.js","sourceRoot":"","sources":["../../../../src/signer/methods/internalizeAction.ts"],"names":[],"mappings":"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"}

package/out/src/signer/methods/proveCertificate.js

@@ -21,7 +21,7 @@ async function proveCertificate(wallet, auth, vargs) {
     };
     const lcr = await wallet.storage.listCertificates(lcargs);
     if (lcr.certificates.length != 1)
-        throw new WERR_errors_1.WERR_INVALID_PARAMETER('args', `a unique certificate match`);
+        throw new WERR_errors_1.WERR_INVALID_PARAMETER('args', 'a unique certificate match');
     const storageCert = lcr.certificates[0];
     const keyringForVerifier = await sdk_1.MasterCertificate.createKeyringForVerifier(wallet, storageCert.certifier, vargs.verifier, storageCert.fields, vargs.fieldsToReveal, storageCert.keyring, storageCert.serialNumber, vargs.privileged, vargs.privilegedReason);
     return { keyringForVerifier };

package/out/src/signer/methods/proveCertificate.js.map

@@ -1 +1 @@
-{"version":3,"file":"proveCertificate.js","sourceRoot":"","sources":["../../../../src/signer/methods/proveCertificate.ts"],"names":[],"mappings":";;AAKA,4CAqCC;AA1CD,kCAAgF;AAEhF,uDAA8D;AAGvD,KAAK,UAAU,gBAAgB,CACpC,MAAc,EACd,IAAY,EACZ,KAA2C;IAE3C,MAAM,MAAM,GAAyC;QACnD,OAAO,EAAE;YACP,IAAI,EAAE,KAAK,CAAC,IAAI;YAChB,YAAY,EAAE,KAAK,CAAC,YAAY;YAChC,SAAS,EAAE,KAAK,CAAC,SAAS;YAC1B,OAAO,EAAE,KAAK,CAAC,OAAO;YACtB,kBAAkB,EAAE,KAAK,CAAC,kBAAkB;YAC5C,SAAS,EAAE,KAAK,CAAC,SAAS;SAC3B;QACD,UAAU,EAAE,EAAE;QACd,KAAK,EAAE,EAAE;QACT,KAAK,EAAE,CAAC;QACR,MAAM,EAAE,CAAC;QACT,UAAU,EAAE,KAAK;KAClB,CAAA;IAED,MAAM,GAAG,GAAG,MAAM,MAAM,CAAC,OAAO,CAAC,gBAAgB,CAAC,MAAM,CAAC,CAAA;IACzD,IAAI,GAAG,CAAC,YAAY,CAAC,MAAM,IAAI,CAAC;QAAE,MAAM,IAAI,oCAAsB,CAAC,MAAM,EAAE,4BAA4B,CAAC,CAAA;IACxG,MAAM,WAAW,GAAG,GAAG,CAAC,YAAY,CAAC,CAAC,CAAC,CAAA;IACvC,MAAM,kBAAkB,GAAG,MAAM,uBAAiB,CAAC,wBAAwB,CACzE,MAAM,EACN,WAAW,CAAC,SAAS,EACrB,KAAK,CAAC,QAAQ,EACd,WAAW,CAAC,MAAM,EAClB,KAAK,CAAC,cAAc,EACpB,WAAW,CAAC,OAAQ,EACpB,WAAW,CAAC,YAAY,EACxB,KAAK,CAAC,UAAU,EAChB,KAAK,CAAC,gBAAgB,CACvB,CAAA;IAED,OAAO,EAAE,kBAAkB,EAAE,CAAA;AAC/B,CAAC"}
+{"version":3,"file":"proveCertificate.js","sourceRoot":"","sources":["../../../../src/signer/methods/proveCertificate.ts"],"names":[],"mappings":";;;AAAA,kCAAgF;AAEhF,uDAA8D;AAGvD,KAAK,2BACV,MAAc,EACd,IAAY,EACZ,KAA2C;IAE3C,MAAM,MAAM,GAAyC;QACnD,OAAO,EAAE;YACP,IAAI,EAAE,KAAK,CAAC,IAAI;YAChB,YAAY,EAAE,KAAK,CAAC,YAAY;YAChC,SAAS,EAAE,KAAK,CAAC,SAAS;YAC1B,OAAO,EAAE,KAAK,CAAC,OAAO;YACtB,kBAAkB,EAAE,KAAK,CAAC,kBAAkB;YAC5C,SAAS,EAAE,KAAK,CAAC,SAAS;SAC3B;QACD,UAAU,EAAE,EAAE;QACd,KAAK,EAAE,EAAE;QACT,KAAK,EAAE,CAAC;QACR,MAAM,EAAE,CAAC;QACT,UAAU,EAAE,KAAK;KAClB,CAAA;IAED,MAAM,GAAG,GAAG,MAAM,MAAM,CAAC,OAAO,CAAC,gBAAgB,CAAC,MAAM,CAAC,CAAA;IACzD,IAAI,GAAG,CAAC,YAAY,CAAC,MAAM,IAAI,CAAC;QAAE,MAAM,IAAI,oCAAsB,CAAC,MAAM,EAAE,4BAA4B,CAAC,CAAA;IACxG,MAAM,WAAW,GAAG,GAAG,CAAC,YAAY,CAAC,CAAC,CAAC,CAAA;IACvC,MAAM,kBAAkB,GAAG,MAAM,uBAAiB,CAAC,wBAAwB,CACzE,MAAM,EACN,WAAW,CAAC,SAAS,EACrB,KAAK,CAAC,QAAQ,EACd,WAAW,CAAC,MAAM,EAClB,KAAK,CAAC,cAAc,EACpB,WAAW,CAAC,OAAQ,EACpB,WAAW,CAAC,YAAY,EACxB,KAAK,CAAC,UAAU,EAChB,KAAK,CAAC,gBAAgB,CACvB,CAAA;IAED,OAAO,EAAE,kBAAkB,EAAE,CAAA;AAC/B,CAAC"}

package/out/src/signer/methods/resultBeef.d.ts

@@ -0,0 +1,4 @@
+import { Beef } from '@bsv/sdk';
+export declare function setResultBeef(result: object, beef: Beef): void;
+export declare function getResultBeef(result: object): Beef | undefined;
+//# sourceMappingURL=resultBeef.d.ts.map

package/out/src/signer/methods/resultBeef.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"resultBeef.d.ts","sourceRoot":"","sources":["../../../../src/signer/methods/resultBeef.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,MAAM,UAAU,CAAA;AAI/B,wBAAgB,aAAa,CAAE,MAAM,EAAE,MAAM,EAAE,IAAI,EAAE,IAAI,GAAG,IAAI,CAE/D;AAED,wBAAgB,aAAa,CAAE,MAAM,EAAE,MAAM,GAAG,IAAI,GAAG,SAAS,CAE/D"}

package/out/src/signer/methods/resultBeef.js

@@ -0,0 +1,12 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.setResultBeef = setResultBeef;
+exports.getResultBeef = getResultBeef;
+const resultBeefs = new WeakMap();
+function setResultBeef(result, beef) {
+    resultBeefs.set(result, beef);
+}
+function getResultBeef(result) {
+    return resultBeefs.get(result);
+}
+//# sourceMappingURL=resultBeef.js.map

package/out/src/signer/methods/resultBeef.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"resultBeef.js","sourceRoot":"","sources":["../../../../src/signer/methods/resultBeef.ts"],"names":[],"mappings":";;;;AAEA,MAAM,WAAW,GAAG,IAAI,OAAO,EAAgB,CAAA;AAE/C,uBAA+B,MAAc,EAAE,IAAU;IACvD,WAAW,CAAC,GAAG,CAAC,MAAM,EAAE,IAAI,CAAC,CAAA;AAC/B,CAAC;AAED,uBAA+B,MAAc;IAC3C,OAAO,WAAW,CAAC,GAAG,CAAC,MAAM,CAAC,CAAA;AAChC,CAAC"}

package/out/src/signer/methods/signAction.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"signAction.d.ts","sourceRoot":"","sources":["../../../../src/signer/methods/signAction.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAQ,cAAc,EAAE,cAAc,EAAE,gBAAgB,EAAE,aAAa,EAAc,MAAM,UAAU,CAAA;AAExH,OAAO,EAAE,MAAM,EAAE,kBAAkB,EAAE,MAAM,oCAAoC,CAAA;AAE/E,OAAO,EAAE,MAAM,EAAE,MAAM,cAAc,CAAA;AAGrC,MAAM,WAAW,iBAAkB,SAAQ,gBAAgB;IACzD,IAAI,CAAC,EAAE,aAAa,CAAA;IACpB,EAAE,CAAC,EAAE,UAAU,CAAA;IACf,eAAe,CAAC,EAAE,cAAc,EAAE,CAAA;IAClC,iBAAiB,CAAC,EAAE,kBAAkB,EAAE,CAAA;CACzC;AAED,wBAAsB,UAAU,CAAC,MAAM,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,cAAc,GAAG,OAAO,CAAC,iBAAiB,CAAC,CA0B/G"}
+{"version":3,"file":"signAction.d.ts","sourceRoot":"","sources":["../../../../src/signer/methods/signAction.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,UAAU,EAEV,cAAc,EACd,cAAc,EACd,gBAAgB,EAEhB,aAAa,EAEd,MAAM,UAAU,CAAA;AAEjB,OAAO,EAAE,MAAM,EAAE,kBAAkB,EAAE,MAAM,oCAAoC,CAAA;AAE/E,OAAO,EAAE,MAAM,EAAE,MAAM,cAAc,CAAA;AAIrC,MAAM,WAAW,iBAAkB,SAAQ,gBAAgB;IACzD,IAAI,CAAC,EAAE,aAAa,CAAA;IACpB,EAAE,CAAC,EAAE,UAAU,CAAA;IACf,eAAe,CAAC,EAAE,cAAc,EAAE,CAAA;IAClC,iBAAiB,CAAC,EAAE,kBAAkB,EAAE,CAAA;CACzC;AAED,wBAAsB,UAAU,CAAC,MAAM,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,cAAc,GAAG,OAAO,CAAC,iBAAiB,CAAC,CAmB/G"}

package/out/src/signer/methods/signAction.js

@@ -5,37 +5,64 @@ const sdk_1 = require("@bsv/sdk");
 const createAction_1 = require("./createAction");
 const completeSignedTransaction_1 = require("./completeSignedTransaction");
 const WERR_errors_1 = require("../../sdk/WERR_errors");
+const resultBeef_1 = require("./resultBeef");
 async function signAction(wallet, auth, args) {
+    if (!wallet.telemetry.enabled)
+        return await signActionCore(wallet, auth, args);
+    return await wallet.telemetry.withSpan('wallet.sign_action', {
+        component: 'wallet-toolbox',
+        carrier: args
+    }, async (span) => {
+        const result = await signActionCore(wallet, auth, args, span);
+        span.end({
+            attributes: {
+                'action.has_transaction': result.tx != null,
+                'action.send_result_count': result.sendWithResults?.length ?? 0
+            }
+        });
+        return result;
+    });
+}
+async function signActionCore(wallet, auth, args, parent) {
     const prior = wallet.pendingSignActions[args.reference];
-    if (!prior)
+    if (!prior) {
         throw new WERR_errors_1.WERR_NOT_IMPLEMENTED('recovery of out-of-session signAction reference data is not yet implemented.');
-    if (!prior.dcr.inputBeef)
+    }
+    if (prior.dcr.inputBeef == null)
         throw new WERR_errors_1.WERR_INTERNAL('prior.dcr.inputBeef must be valid');
     const vargs = mergePriorOptions(prior.args, args);
-    prior.tx = await (0, completeSignedTransaction_1.completeSignedTransaction)(prior, vargs.spends, wallet);
-    const { sendWithResults, notDelayedResults } = await (0, createAction_1.processAction)(prior, wallet, auth, vargs);
+    prior.tx = await traceSignActionStep(wallet, 'wallet.sign_action.complete_signing', parent, async () => await (0, completeSignedTransaction_1.completeSignedTransaction)(prior, vargs.spends, wallet));
+    const { sendWithResults, notDelayedResults } = await traceSignActionStep(wallet, 'wallet.sign_action.process', parent, async () => await (0, createAction_1.processAction)(prior, wallet, auth, vargs));
     const txid = prior.tx.id('hex');
-    const beef = sdk_1.Beef.fromBinary(prior.dcr.inputBeef);
+    const beef = prior.dcr.inputBeef instanceof Uint8Array
+        ? sdk_1.Beef.fromBinaryView(prior.dcr.inputBeef)
+        : sdk_1.Beef.fromBinary(prior.dcr.inputBeef);
     beef.mergeTransaction(prior.tx);
-    (0, completeSignedTransaction_1.verifyUnlockScripts)(txid, beef);
+    await traceSignActionStep(wallet, 'wallet.sign_action.verify_unlock_scripts', parent, async () => await (0, completeSignedTransaction_1.verifyUnlockScripts)(txid, beef, wallet.scriptVerifier));
     const r = {
         txid: prior.tx.id('hex'),
         tx: vargs.options.returnTXIDOnly ? undefined : beef.toBinaryAtomic(txid),
         sendWithResults,
         notDelayedResults
     };
+    beef.atomicTxid = txid;
+    (0, resultBeef_1.setResultBeef)(r, beef);
     return r;
 }
+async function traceSignActionStep(wallet, name, parent, callback) {
+    if (parent == null)
+        return await callback();
+    return await wallet.telemetry.withSpan(name, {
+        component: 'wallet-toolbox',
+        parent: parent.context
+    }, callback);
+}
 function mergePriorOptions(caVargs, saArgs) {
-    const saOptions = (saArgs.options || (saArgs.options = {}));
-    if (saOptions.acceptDelayedBroadcast === undefined)
-        saOptions.acceptDelayedBroadcast = caVargs.options.acceptDelayedBroadcast;
-    if (saOptions.returnTXIDOnly === undefined)
-        saOptions.returnTXIDOnly = caVargs.options.returnTXIDOnly;
-    if (saOptions.noSend === undefined)
-        saOptions.noSend = caVargs.options.noSend;
-    if (saOptions.sendWith === undefined)
-        saOptions.sendWith = caVargs.options.sendWith;
+    const saOptions = (saArgs.options ||= {});
+    saOptions.acceptDelayedBroadcast ??= caVargs.options.acceptDelayedBroadcast;
+    saOptions.returnTXIDOnly ??= caVargs.options.returnTXIDOnly;
+    saOptions.noSend ??= caVargs.options.noSend;
+    saOptions.sendWith ??= caVargs.options.sendWith;
     return sdk_1.Validation.validateSignActionArgs(saArgs);
 }
 //# sourceMappingURL=signAction.js.map

package/out/src/signer/methods/signAction.js.map

@@ -1 +1 @@
-{"version":3,"file":"signAction.js","sourceRoot":"","sources":["../../../../src/signer/methods/signAction.ts"],"names":[],"mappings":";;AAcA,gCA0BC;AAxCD,kCAAwH;AACxH,iDAA8C;AAE9C,2EAA4F;AAE5F,uDAA2E;AASpE,KAAK,UAAU,UAAU,CAAC,MAAc,EAAE,IAAY,EAAE,IAAoB;IACjF,MAAM,KAAK,GAAG,MAAM,CAAC,kBAAkB,CAAC,IAAI,CAAC,SAAS,CAAC,CAAA;IACvD,IAAI,CAAC,KAAK;QACR,MAAM,IAAI,kCAAoB,CAAC,8EAA8E,CAAC,CAAA;IAChH,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,SAAS;QAAE,MAAM,IAAI,2BAAa,CAAC,mCAAmC,CAAC,CAAA;IAEtF,MAAM,KAAK,GAAG,iBAAiB,CAAC,KAAK,CAAC,IAAI,EAAE,IAAI,CAAC,CAAA;IAEjD,KAAK,CAAC,EAAE,GAAG,MAAM,IAAA,qDAAyB,EAAC,KAAK,EAAE,KAAK,CAAC,MAAM,EAAE,MAAM,CAAC,CAAA;IAEvE,MAAM,EAAE,eAAe,EAAE,iBAAiB,EAAE,GAAG,MAAM,IAAA,4BAAa,EAAC,KAAK,EAAE,MAAM,EAAE,IAAI,EAAE,KAAK,CAAC,CAAA;IAE9F,MAAM,IAAI,GAAG,KAAK,CAAC,EAAE,CAAC,EAAE,CAAC,KAAK,CAAC,CAAA;IAC/B,MAAM,IAAI,GAAG,UAAI,CAAC,UAAU,CAAC,KAAK,CAAC,GAAG,CAAC,SAAS,CAAC,CAAA;IACjD,IAAI,CAAC,gBAAgB,CAAC,KAAK,CAAC,EAAE,CAAC,CAAA;IAE/B,IAAA,+CAAmB,EAAC,IAAI,EAAE,IAAI,CAAC,CAAA;IAE/B,MAAM,CAAC,GAAsB;QAC3B,IAAI,EAAE,KAAK,CAAC,EAAE,CAAC,EAAE,CAAC,KAAK,CAAC;QACxB,EAAE,EAAE,KAAK,CAAC,OAAO,CAAC,cAAc,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,IAAI,CAAC,cAAc,CAAC,IAAI,CAAC;QACxE,eAAe;QACf,iBAAiB;KAClB,CAAA;IAED,OAAO,CAAC,CAAA;AACV,CAAC;AAED,SAAS,iBAAiB,CACxB,OAAyC,EACzC,MAAsB;IAEtB,MAAM,SAAS,GAAG,CAAC,MAAM,CAAC,OAAO,KAAd,MAAM,CAAC,OAAO,GAAK,EAAE,EAAC,CAAA;IACzC,IAAI,SAAS,CAAC,sBAAsB,KAAK,SAAS;QAChD,SAAS,CAAC,sBAAsB,GAAG,OAAO,CAAC,OAAO,CAAC,sBAAsB,CAAA;IAC3E,IAAI,SAAS,CAAC,cAAc,KAAK,SAAS;QAAE,SAAS,CAAC,cAAc,GAAG,OAAO,CAAC,OAAO,CAAC,cAAc,CAAA;IACrG,IAAI,SAAS,CAAC,MAAM,KAAK,SAAS;QAAE,SAAS,CAAC,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC,MAAM,CAAA;IAC7E,IAAI,SAAS,CAAC,QAAQ,KAAK,SAAS;QAAE,SAAS,CAAC,QAAQ,GAAG,OAAO,CAAC,OAAO,CAAC,QAAQ,CAAA;IACnF,OAAO,gBAAU,CAAC,sBAAsB,CAAC,MAAM,CAAC,CAAA;AAClD,CAAC"}
+{"version":3,"file":"signAction.js","sourceRoot":"","sources":["../../../../src/signer/methods/signAction.ts"],"names":[],"mappings":"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"}

package/out/src/signer/methods/verifyUnlockScripts.d.ts

@@ -0,0 +1,17 @@
+import { Beef, type SpendVerifierInterface } from '@bsv/sdk';
+export interface UnlockScriptVerificationResult {
+    verifiedInputs: number;
+    skippedInputs: number;
+}
+/**
+ * Verifies every resolvable input from several transactions in one optional
+ * backend batch while preserving per-transaction verification counts.
+ */
+export declare function verifyUnlockScriptsBatch(txids: readonly string[], beef: Beef, verifier?: SpendVerifierInterface): Promise<UnlockScriptVerificationResult[]>;
+/**
+ * @param txid The TXID of a transaction in the beef for which all unlocking scripts must be valid.
+ * @param beef Must contain transactions for txid and all its inputs.
+ * @throws WERR_INVALID_PARAMETER if any unlocking script is invalid, if sourceTXID is invalid, if beef doesn't contain required transactions.
+ */
+export declare function verifyUnlockScripts(txid: string, beef: Beef, verifier?: SpendVerifierInterface): Promise<UnlockScriptVerificationResult>;
+//# sourceMappingURL=verifyUnlockScripts.d.ts.map

package/out/src/signer/methods/verifyUnlockScripts.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"verifyUnlockScripts.d.ts","sourceRoot":"","sources":["../../../../src/signer/methods/verifyUnlockScripts.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,IAAI,EAUJ,KAAK,sBAAsB,EAC5B,MAAM,UAAU,CAAA;AAGjB,MAAM,WAAW,8BAA8B;IAC7C,cAAc,EAAE,MAAM,CAAA;IACtB,aAAa,EAAE,MAAM,CAAA;CACtB;AA4YD;;;GAGG;AACH,wBAAsB,wBAAwB,CAC5C,KAAK,EAAE,SAAS,MAAM,EAAE,EACxB,IAAI,EAAE,IAAI,EACV,QAAQ,CAAC,EAAE,sBAAsB,GAChC,OAAO,CAAC,8BAA8B,EAAE,CAAC,CAwB3C;AAED;;;;GAIG;AACH,wBAAsB,mBAAmB,CACvC,IAAI,EAAE,MAAM,EACZ,IAAI,EAAE,IAAI,EACV,QAAQ,CAAC,EAAE,sBAAsB,GAChC,OAAO,CAAC,8BAA8B,CAAC,CAEzC"}