@bsv/wallet-toolbox-client 2.10.0 → 2.10.2

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, BeefTx, 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 { AuthFetch, BEEF_V1, BEEF_V2, Beef, BeefParty, BeefTx, 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, stringifyBRC100, 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";
@@ -196,7 +196,7 @@ var WERR_UTXO_REVIEW_INCONCLUSIVE = class extends WalletError {
 		obj.checked = this.checked;
 		obj.confirmedSpent = this.confirmedSpent;
 		obj.unknown = this.unknown;
-		return JSON.stringify(obj);
+		return stringifyBRC100(obj);
 	}
 };
 /**
@@ -214,7 +214,7 @@ var WERRActionBatchState = class extends WalletError {
 		const obj = JSON.parse(super.toJson());
 		obj.state = this.state;
 		obj.batchId = this.batchId;
-		return JSON.stringify(obj);
+		return stringifyBRC100(obj);
 	}
 };
 /**
@@ -240,7 +240,7 @@ var WERR_INVALID_PARAMETER = class extends WalletError {
 		const obj = JSON.parse(super.toJson());
 		obj.code = 6;
 		obj.parameter = this.parameter;
-		return JSON.stringify(obj);
+		return stringifyBRC100(obj);
 	}
 };
 /**
@@ -267,7 +267,7 @@ var WERR_INVALID_MERKLE_ROOT = class extends WalletError {
 		obj.blockHeight = this.blockHeight;
 		obj.merkleRoot = this.merkleRoot;
 		obj.txid = this.txid;
-		return JSON.stringify(obj);
+		return stringifyBRC100(obj);
 	}
 };
 /**
@@ -284,7 +284,7 @@ var WERR_MISSING_PARAMETER = class extends WalletError {
 	toJson() {
 		const obj = JSON.parse(super.toJson());
 		obj.parameter = this.parameter;
-		return JSON.stringify(obj);
+		return stringifyBRC100(obj);
 	}
 };
 /**
@@ -342,7 +342,7 @@ var WERR_INSUFFICIENT_FUNDS = class extends WalletError {
 		obj.code = 7;
 		obj.totalSatoshisNeeded = this.totalSatoshisNeeded;
 		obj.moreSatoshisNeeded = this.moreSatoshisNeeded;
-		return JSON.stringify(obj);
+		return stringifyBRC100(obj);
 	}
 };
 var WERR_INVALID_PUBLIC_KEY = class extends WalletError {
@@ -359,7 +359,7 @@ var WERR_INVALID_PUBLIC_KEY = class extends WalletError {
 	toJson() {
 		const obj = JSON.parse(super.toJson());
 		obj.key = this.key;
-		return JSON.stringify(obj);
+		return stringifyBRC100(obj);
 	}
 };
 /**
@@ -394,7 +394,7 @@ var WERR_REVIEW_ACTIONS = class extends WalletError {
 		obj.txid = this.txid;
 		obj.tx = this.tx;
 		obj.noSendChange = this.noSendChange;
-		return JSON.stringify(obj);
+		return stringifyBRC100(obj);
 	}
 };
 /**
@@ -7810,6 +7810,23 @@ function mergePriorOptions(caVargs, saArgs) {
 	return Validation.validateSignActionArgs(saArgs);
 }
 //#endregion
+//#region ../src/utility/canonicalizeAtomicBeef.ts
+/**
+* Restricts an AtomicBEEF envelope to the transaction named by its BRC-95
+* prefix and that transaction's recursive dependency closure.
+*
+* Older senders could serialize unrelated, otherwise valid BEEF branches into
+* an AtomicBEEF envelope. Those branches are not part of the payment proof and
+* must not influence internalization. Proof and transaction validation still
+* run against the returned closure at each wallet trust boundary.
+*/
+function canonicalizeAtomicBeef(bytes) {
+	const received = bytes instanceof Uint8Array ? Beef.fromBinaryView(bytes) : Beef.fromBinary(bytes);
+	const txid = received.atomicTxid;
+	if (txid == null || received.findTxid(txid) == null || received.isAtomic(txid)) return received;
+	return Beef.fromBinary(received.toBinaryAtomic(txid));
+}
+//#endregion
 //#region ../src/signer/methods/internalizeAction.ts
 /**
 * Internalize Action allows a wallet to take ownership of outputs in a pre-existing transaction.
@@ -7851,7 +7868,7 @@ function mergePriorOptions(caVargs, saArgs) {
 */
 async function internalizeAction$1(wallet, auth, args) {
 	const vargs = Validation.validateInternalizeActionArgs(args);
-	const { tx } = await validateAtomicBeef();
+	const { ab, tx, txid } = await validateAtomicBeef();
 	const brc29ProtocolID = [2, "3241645161d8"];
 	for (const o of vargs.outputs) {
 		if (o.outputIndex < 0 || o.outputIndex >= tx.outputs.length) throw new WERR_INVALID_PARAMETER("outputIndex", `a valid output index in range 0 to ${tx.outputs.length - 1}`);
@@ -7865,7 +7882,10 @@ async function internalizeAction$1(wallet, auth, args) {
 			default: throw new WERR_INTERNAL(`unexpected protocol ${o.protocol}`);
 		}
 	}
-	return await wallet.storage.internalizeAction(args);
+	return await wallet.storage.internalizeAction({
+		...args,
+		tx: ab.toBinaryAtomic(txid)
+	});
 	function setupWalletPaymentForOutput(o, _dargs) {
 		const p = o.paymentRemittance;
 		const output = tx.outputs[o.outputIndex];
@@ -7888,7 +7908,7 @@ async function internalizeAction$1(wallet, auth, args) {
 	* 2. That the proofs are for the same block as recorded in the wallet's configured storage in the event of a reorg.
 	*/
 	async function validateAtomicBeef() {
-		const ab = Beef.fromBinary(vargs.tx);
+		const ab = canonicalizeAtomicBeef(vargs.tx);
 		if (!await ab.verify(await wallet.getServices().getChainTracker(), false) || !ab.atomicTxid) {
 			console.log(`internalizeAction beef is invalid: ${ab.toLogString()}`);
 			throw new WERR_INVALID_PARAMETER("tx", "valid AtomicBEEF");
@@ -12421,7 +12441,7 @@ var InternalizeActionContext = class {
 	* @returns
 	*/
 	async validateAtomicBeef(atomicBeef) {
-		const ab = atomicBeef instanceof Uint8Array ? Beef.fromBinaryView(atomicBeef) : Beef.fromBinary(atomicBeef);
+		const ab = canonicalizeAtomicBeef(atomicBeef);
 		if (!await ab.verify(await this.storage.getServices().getChainTracker(), false) || !ab.atomicTxid) throw new WERR_INVALID_PARAMETER("tx", "valid AtomicBEEF");
 		const txid = ab.atomicTxid;
 		const btx = ab.findTxid(txid);
@@ -33174,7 +33194,7 @@ var WABTransport = class {
 	bodyFor(options, metadata) {
 		let body;
 		try {
-			body = options.body === void 0 ? void 0 : JSON.stringify(options.body);
+			body = options.body === void 0 ? void 0 : stringifyBRC100(options.body);
 		} catch (cause) {
 			const error = new WABClientError("WAB_INVALID_REQUEST", "WAB request encoding failed.", false, void 0, {
 				...metadata.errorContext,