@arkade-os/sdk 0.4.31 → 0.4.33

package/dist/{chunk-GPZH5QNA.cjs → chunk-7K3ROJF6.cjs}

@@ -1,7 +1,7 @@
 'use strict';
 
-var chunk6FLL2Q36_cjs = require('./chunk-6FLL2Q36.cjs');
-var chunkIEO3XDKI_cjs = require('./chunk-IEO3XDKI.cjs');
+var chunkSPDNHPM4_cjs = require('./chunk-SPDNHPM4.cjs');
+var chunkGYSK5R57_cjs = require('./chunk-GYSK5R57.cjs');
 var chunkWMIPYZSB_cjs = require('./chunk-WMIPYZSB.cjs');
 var utils_js = require('@scure/btc-signer/utils.js');
 var btcSigner = require('@scure/btc-signer');
@@ -181,7 +181,7 @@ var TreeSignerSession = class _TreeSignerSession {
     noncesByPubkey.set(base.hex.encode(myPublicKey.subarray(1)), myNonce);
     const tx = this.graph.find(txid);
     if (!tx) throw new Error(`missing tx for txid ${txid}`);
-    const cosigners = chunk6FLL2Q36_cjs.getArkPsbtFields(tx.root, 0, chunk6FLL2Q36_cjs.CosignerPublicKey).map(
+    const cosigners = chunkSPDNHPM4_cjs.getArkPsbtFields(tx.root, 0, chunkSPDNHPM4_cjs.CosignerPublicKey).map(
       (c) => base.hex.encode(c.key.subarray(1))
       // xonly pubkey
     );
@@ -233,7 +233,7 @@ var TreeSignerSession = class _TreeSignerSession {
     if (!aggNonce) throw new Error("missing aggregate nonce");
     const prevoutAmounts = [];
     const prevoutScripts = [];
-    const cosigners = chunk6FLL2Q36_cjs.getArkPsbtFields(g.root, 0, chunk6FLL2Q36_cjs.CosignerPublicKey).map((c) => c.key);
+    const cosigners = chunkSPDNHPM4_cjs.getArkPsbtFields(g.root, 0, chunkSPDNHPM4_cjs.CosignerPublicKey).map((c) => c.key);
     const { finalKey } = aggregateKeys(cosigners, true, {
       taprootTweak: this.scriptRoot
     });
@@ -411,7 +411,7 @@ var SeedIdentity = class _SeedIdentity {
     let network;
     if ("descriptor" in opts && typeof opts.descriptor === "string") {
       descriptor = opts.descriptor;
-      network = chunkIEO3XDKI_cjs.isMainnetDescriptor(descriptor) ? descriptorsScure.networks.bitcoin : descriptorsScure.networks.testnet;
+      network = chunkGYSK5R57_cjs.isMainnetDescriptor(descriptor) ? descriptorsScure.networks.bitcoin : descriptorsScure.networks.testnet;
     } else {
       network = opts.isMainnet ?? true ? descriptorsScure.networks.bitcoin : descriptorsScure.networks.testnet;
       descriptor = descriptorsScure.scriptExpressions.trBIP32({
@@ -496,7 +496,7 @@ var SeedIdentity = class _SeedIdentity {
    * `StaticDescriptorProvider` for legacy single-key wallets.
    */
   isOurs(descriptor) {
-    return chunkIEO3XDKI_cjs.descriptorIsOurs(descriptor, this.descriptor, utils_js.pubSchnorr(this.derivedKey));
+    return chunkGYSK5R57_cjs.descriptorIsOurs(descriptor, this.descriptor, utils_js.pubSchnorr(this.derivedKey));
   }
   /**
    * Signs each request with the key derived from its descriptor.
@@ -533,7 +533,7 @@ var SeedIdentity = class _SeedIdentity {
   }
   // ── internal helpers ─────────────────────────────────────────────
   derivePrivateKeyForDescriptor(descriptor) {
-    const network = chunkIEO3XDKI_cjs.isMainnetDescriptor(descriptor) ? descriptorsScure.networks.bitcoin : descriptorsScure.networks.testnet;
+    const network = chunkGYSK5R57_cjs.isMainnetDescriptor(descriptor) ? descriptorsScure.networks.bitcoin : descriptorsScure.networks.testnet;
     const expansion = descriptorsScure.expand({ descriptor, network });
     if (expansion.isRanged) {
       throw new Error(
@@ -619,7 +619,7 @@ var ReadonlyDescriptorIdentity = class _ReadonlyDescriptorIdentity {
    */
   descriptor;
   constructor(descriptor) {
-    const network = chunkIEO3XDKI_cjs.isMainnetDescriptor(descriptor) ? descriptorsScure.networks.bitcoin : descriptorsScure.networks.testnet;
+    const network = chunkGYSK5R57_cjs.isMainnetDescriptor(descriptor) ? descriptorsScure.networks.bitcoin : descriptorsScure.networks.testnet;
     let expansion;
     try {
       expansion = descriptorsScure.expand({ descriptor, network, index: 0 });
@@ -669,7 +669,7 @@ var ReadonlyDescriptorIdentity = class _ReadonlyDescriptorIdentity {
    * `StaticDescriptorProvider` for legacy single-key wallets.
    */
   isOurs(descriptor) {
-    return chunkIEO3XDKI_cjs.descriptorIsOurs(descriptor, this.descriptor, this.indexZero.pubkey);
+    return chunkGYSK5R57_cjs.descriptorIsOurs(descriptor, this.descriptor, this.indexZero.pubkey);
   }
 };
 function serializeSeedOwnedSigningIdentity(identity) {
@@ -987,7 +987,7 @@ var RestDelegateProvider = class {
       },
       body: JSON.stringify({
         intent: {
-          message: chunk6FLL2Q36_cjs.Intent.encodeMessage(intent.message),
+          message: chunkSPDNHPM4_cjs.Intent.encodeMessage(intent.message),
           proof: intent.proof
         },
         forfeit_txs: forfeitTxs,
@@ -1277,7 +1277,7 @@ function buildForfeitTx(inputs, forfeitPkScript, txLocktime) {
   );
 }
 function buildForfeitTxWithOutput(inputs, output, txLocktime) {
-  const tx = new chunk6FLL2Q36_cjs.Transaction({
+  const tx = new chunkSPDNHPM4_cjs.Transaction({
     version: 3,
     lockTime: txLocktime
   });
@@ -1353,7 +1353,7 @@ function validateVtxoTxGraph(graph, roundTransaction, sweepTapTreeRoot) {
       if (previousScriptKey.length !== 32) {
         throw new Error(`parent output ${childIndex} has invalid script`);
       }
-      const cosigners = chunk6FLL2Q36_cjs.getArkPsbtFields(child.root, 0, chunk6FLL2Q36_cjs.CosignerPublicKey);
+      const cosigners = chunkSPDNHPM4_cjs.getArkPsbtFields(child.root, 0, chunkSPDNHPM4_cjs.CosignerPublicKey);
       if (cosigners.length === 0) {
         throw ErrMissingCosignersPublicKeys;
       }
@@ -1453,7 +1453,7 @@ var Extension = class _Extension {
         `expected magic prefix ${base.hex.encode(ARKADE_MAGIC)}, got ${base.hex.encode(payload.slice(0, Math.min(payload.length, ARKADE_MAGIC.length)))}`
       );
     }
-    const reader = new chunk6FLL2Q36_cjs.BufferReader(payload.slice(ARKADE_MAGIC.length));
+    const reader = new chunkSPDNHPM4_cjs.BufferReader(payload.slice(ARKADE_MAGIC.length));
     const packets = [];
     while (reader.remaining() > 0) {
       const packetType = reader.readByte();
@@ -1527,7 +1527,7 @@ var Extension = class _Extension {
    */
   getAssetPacket() {
     for (const p of this.packets) {
-      if (p instanceof chunk6FLL2Q36_cjs.Packet) {
+      if (p instanceof chunkSPDNHPM4_cjs.Packet) {
         return p;
       }
     }
@@ -1535,8 +1535,8 @@ var Extension = class _Extension {
   }
 };
 function parsePacket(packetType, data) {
-  if (packetType === chunk6FLL2Q36_cjs.Packet.PACKET_TYPE) {
-    return chunk6FLL2Q36_cjs.Packet.fromBytes(data);
+  if (packetType === chunkSPDNHPM4_cjs.Packet.PACKET_TYPE) {
+    return chunkSPDNHPM4_cjs.Packet.fromBytes(data);
   }
   return new UnknownPacket(packetType, data);
 }
@@ -1727,7 +1727,7 @@ function createAssetPacket(assetInputs, receivers, changeReceiver) {
       const existing = inputsByAssetId.get(asset.assetId);
       inputsByAssetId.set(asset.assetId, [
         ...existing ?? [],
-        chunk6FLL2Q36_cjs.AssetInput.create(inputIndex, asset.amount)
+        chunkSPDNHPM4_cjs.AssetInput.create(inputIndex, asset.amount)
       ]);
     }
   }
@@ -1739,7 +1739,7 @@ function createAssetPacket(assetInputs, receivers, changeReceiver) {
         const existing = outputsByAssetId.get(asset.assetId);
         outputsByAssetId.set(asset.assetId, [
           ...existing ?? [],
-          chunk6FLL2Q36_cjs.AssetOutput.create(outputIndex, asset.amount)
+          chunkSPDNHPM4_cjs.AssetOutput.create(outputIndex, asset.amount)
         ]);
       }
     }
@@ -1750,7 +1750,7 @@ function createAssetPacket(assetInputs, receivers, changeReceiver) {
       const existing = outputsByAssetId.get(asset.assetId);
       outputsByAssetId.set(asset.assetId, [
         ...existing ?? [],
-        chunk6FLL2Q36_cjs.AssetOutput.create(outputIndex, asset.amount)
+        chunkSPDNHPM4_cjs.AssetOutput.create(outputIndex, asset.amount)
       ]);
     }
   }
@@ -1759,11 +1759,11 @@ function createAssetPacket(assetInputs, receivers, changeReceiver) {
   for (const assetIdStr of allAssetIds) {
     const inputs = inputsByAssetId.get(assetIdStr);
     const outputs = outputsByAssetId.get(assetIdStr);
-    const assetId = chunk6FLL2Q36_cjs.AssetId.fromString(assetIdStr);
-    const group = chunk6FLL2Q36_cjs.AssetGroup.create(assetId, null, inputs ?? [], outputs ?? [], []);
+    const assetId = chunkSPDNHPM4_cjs.AssetId.fromString(assetIdStr);
+    const group = chunkSPDNHPM4_cjs.AssetGroup.create(assetId, null, inputs ?? [], outputs ?? [], []);
     groups.push(group);
   }
-  return chunk6FLL2Q36_cjs.Packet.create(groups);
+  return chunkSPDNHPM4_cjs.Packet.create(groups);
 }
 function selectCoinsWithAsset(coins, assetId, requiredAmount) {
   const coinsWithAsset = coins.filter((coin) => coin.assets?.some((a) => a.assetId === assetId));
@@ -1841,7 +1841,7 @@ function buildVirtualTx(inputs, outputs) {
       }
     }
   }
-  const tx = new chunk6FLL2Q36_cjs.Transaction({
+  const tx = new chunkSPDNHPM4_cjs.Transaction({
     version: 3,
     lockTime: Number(lockTime)
   });
@@ -1856,7 +1856,7 @@ function buildVirtualTx(inputs, outputs) {
       },
       tapLeafScript: [input.tapLeafScript]
     });
-    chunk6FLL2Q36_cjs.setArkPsbtField(tx, i, chunk6FLL2Q36_cjs.VtxoTaprootTree, input.tapTree);
+    chunkSPDNHPM4_cjs.setArkPsbtField(tx, i, chunkSPDNHPM4_cjs.VtxoTaprootTree, input.tapTree);
   }
   for (const output of outputs) {
     tx.addOutput(output);
@@ -1988,12 +1988,22 @@ function verifyTapscriptSignatures(tx, inputIndex, requiredSigners, excludePubke
   }
 }
 function combineTapscriptSigs(signedTx, originalTx) {
+  if (signedTx.inputsLength !== originalTx.inputsLength) {
+    throw new Error(
+      `combineTapscriptSigs: input count mismatch (signedTx ${signedTx.inputsLength}, originalTx ${originalTx.inputsLength})`
+    );
+  }
   for (let i = 0; i < signedTx.inputsLength; i++) {
     const input = originalTx.getInput(i);
     const signedInput = signedTx.getInput(i);
-    if (!input.tapScriptSig) throw new Error("No tapScriptSig");
+    if (!input.tapScriptSig) {
+      throw new Error(`combineTapscriptSigs: originalTx input ${i} has no tapScriptSig`);
+    }
+    if (!signedInput.tapScriptSig) {
+      throw new Error(`combineTapscriptSigs: signedTx input ${i} has no tapScriptSig`);
+    }
     originalTx.updateInput(i, {
-      tapScriptSig: input.tapScriptSig?.concat(signedInput.tapScriptSig)
+      tapScriptSig: input.tapScriptSig.concat(signedInput.tapScriptSig)
     });
   }
   return originalTx;
@@ -2279,7 +2289,7 @@ function extendCoin(wallet, utxo) {
   };
 }
 function deriveContractTapscripts(contract) {
-  const handler = chunkIEO3XDKI_cjs.contractHandlers.get(contract.type);
+  const handler = chunkGYSK5R57_cjs.contractHandlers.get(contract.type);
   if (!handler) {
     throw new Error(`No handler for contract type '${contract.type}'`);
   }
@@ -2828,7 +2838,7 @@ var VtxoManager = class _VtxoManager {
         `Sweep not economical: output ${outputAmount} sats after ${fee} sats fee is below dust (${dustAmount} sats)`
       );
     }
-    const tx = new chunk6FLL2Q36_cjs.Transaction();
+    const tx = new chunkSPDNHPM4_cjs.Transaction();
     for (const utxo of expiredUtxos) {
       tx.addInput({
         txid: utxo.txid,
@@ -2989,7 +2999,7 @@ var VtxoManager = class _VtxoManager {
    * or doesn't carry the metadata.
    */
   extractSpentOutpoint(error) {
-    const ark = chunk6FLL2Q36_cjs.maybeArkError(error);
+    const ark = chunkSPDNHPM4_cjs.maybeArkError(error);
     if (!ark || ark.name !== "VTXO_ALREADY_SPENT") return void 0;
     const raw = ark.metadata?.vtxo_outpoint;
     if (typeof raw !== "string") return void 0;
@@ -3679,6 +3689,15 @@ var txKey = {
   boardingTxid: "",
   arkTxid: ""
 };
+function consumeBoardingReceive(boardingTxs, predicate) {
+  const index = boardingTxs.findIndex(predicate);
+  if (index === -1) return false;
+  boardingTxs.splice(index, 1);
+  return true;
+}
+function isSettledBoardingReceive(tx) {
+  return tx.type === "RECEIVED" /* TxReceived */ && tx.settled && tx.key.boardingTxid !== "";
+}
 function collectAssets(vtxos) {
   const map = /* @__PURE__ */ new Map();
   for (const vtxo of vtxos) {
@@ -3718,24 +3737,39 @@ function subtractAssets(spent, change) {
 }
 async function buildTransactionHistory(vtxos, allBoardingTxs, commitmentsToIgnore, getTxCreatedAt) {
   const fromOldestVtxo = [...vtxos].sort((a, b) => a.createdAt.getTime() - b.createdAt.getTime());
+  const unmatchedSettledBoardingTxs = allBoardingTxs.filter(isSettledBoardingReceive).sort((a, b) => a.createdAt - b.createdAt);
   const sent = [];
   let received = [];
   for (const vtxo of fromOldestVtxo) {
     if (vtxo.status.isLeaf) {
-      if (!commitmentsToIgnore.has(vtxo.virtualStatus.commitmentTxIds[0]) && fromOldestVtxo.filter((v) => v.settledBy === vtxo.virtualStatus.commitmentTxIds[0]).length === 0) {
-        const assets = collectAssets([vtxo]);
-        received.push({
-          key: {
-            ...txKey,
-            commitmentTxid: vtxo.virtualStatus.commitmentTxIds[0]
-          },
-          tag: "batch",
-          type: "RECEIVED" /* TxReceived */,
-          amount: vtxo.value,
-          settled: vtxo.status.isLeaf || vtxo.isSpent,
-          createdAt: vtxo.createdAt.getTime(),
-          ...assets && { assets }
-        });
+      const commitmentTxid = vtxo.virtualStatus.commitmentTxIds[0];
+      const vtxoCreatedAt = vtxo.createdAt.getTime();
+      const ignoredCommitment = commitmentsToIgnore.has(commitmentTxid) || !!vtxo.settledBy && commitmentsToIgnore.has(vtxo.settledBy);
+      if (ignoredCommitment) {
+        consumeBoardingReceive(
+          unmatchedSettledBoardingTxs,
+          (tx) => tx.createdAt <= vtxoCreatedAt && (tx.key.commitmentTxid === commitmentTxid || tx.key.commitmentTxid === vtxo.settledBy)
+        );
+      } else if (fromOldestVtxo.filter((v) => v.settledBy === vtxo.virtualStatus.commitmentTxIds[0]).length === 0) {
+        const duplicateBoardingReceive = consumeBoardingReceive(
+          unmatchedSettledBoardingTxs,
+          (tx) => tx.amount === vtxo.value && tx.createdAt <= vtxoCreatedAt
+        );
+        if (!duplicateBoardingReceive) {
+          const assets = collectAssets([vtxo]);
+          received.push({
+            key: {
+              ...txKey,
+              commitmentTxid
+            },
+            tag: "batch",
+            type: "RECEIVED" /* TxReceived */,
+            amount: vtxo.value,
+            settled: vtxo.status.isLeaf || vtxo.isSpent,
+            createdAt: vtxoCreatedAt,
+            ...assets && { assets }
+          });
+        }
       }
     } else if (fromOldestVtxo.filter((v) => v.arkTxId === vtxo.txid).length === 0) {
       const assets = collectAssets([vtxo]);
@@ -3860,7 +3894,7 @@ var AssetManager = class extends ReadonlyAssetManager {
     const virtualCoins = await this.wallet.getVtxos({
       withRecoverable: false
     });
-    const controlAssetRef = params.controlAssetId ? chunk6FLL2Q36_cjs.AssetRef.fromId(chunk6FLL2Q36_cjs.AssetId.fromString(params.controlAssetId)) : null;
+    const controlAssetRef = params.controlAssetId ? chunkSPDNHPM4_cjs.AssetRef.fromId(chunkSPDNHPM4_cjs.AssetId.fromString(params.controlAssetId)) : null;
     const coinSelection = selectVirtualCoins(virtualCoins, Number(this.wallet.dustAmount));
     let totalBtcSelected = 0n;
     const assetChanges = /* @__PURE__ */ new Map();
@@ -3873,8 +3907,8 @@ var AssetManager = class extends ReadonlyAssetManager {
       }
     }
     const groups = [];
-    const issuedAssetOutput = chunk6FLL2Q36_cjs.AssetOutput.create(0, params.amount);
-    const issuedAssetGroup = chunk6FLL2Q36_cjs.AssetGroup.create(
+    const issuedAssetOutput = chunkSPDNHPM4_cjs.AssetOutput.create(0, params.amount);
+    const issuedAssetGroup = chunkSPDNHPM4_cjs.AssetGroup.create(
       null,
       controlAssetRef,
       [],
@@ -3889,15 +3923,15 @@ var AssetManager = class extends ReadonlyAssetManager {
         for (const [inputIndex, assets] of assetInputs) {
           for (const asset of assets) {
             if (asset.assetId !== assetId) continue;
-            changeInputs.push(chunk6FLL2Q36_cjs.AssetInput.create(inputIndex, asset.amount));
+            changeInputs.push(chunkSPDNHPM4_cjs.AssetInput.create(inputIndex, asset.amount));
           }
         }
         groups.push(
-          chunk6FLL2Q36_cjs.AssetGroup.create(
-            chunk6FLL2Q36_cjs.AssetId.fromString(assetId),
+          chunkSPDNHPM4_cjs.AssetGroup.create(
+            chunkSPDNHPM4_cjs.AssetId.fromString(assetId),
             null,
             changeInputs,
-            [chunk6FLL2Q36_cjs.AssetOutput.create(0, amount)],
+            [chunkSPDNHPM4_cjs.AssetOutput.create(0, amount)],
             []
           )
         );
@@ -3910,7 +3944,7 @@ var AssetManager = class extends ReadonlyAssetManager {
         script: outputAddress.pkScript,
         amount: BigInt(totalBtcSelected)
       },
-      Extension.create([chunk6FLL2Q36_cjs.Packet.create(groups)]).txOut()
+      Extension.create([chunkSPDNHPM4_cjs.Packet.create(groups)]).txOut()
     ];
     const { arkTxid } = await this.wallet.buildAndSubmitOffchainTx(
       coinSelection.inputs,
@@ -3918,7 +3952,7 @@ var AssetManager = class extends ReadonlyAssetManager {
     );
     return {
       arkTxId: arkTxid,
-      assetId: chunk6FLL2Q36_cjs.AssetId.create(arkTxid, 0).toString()
+      assetId: chunkSPDNHPM4_cjs.AssetId.create(arkTxid, 0).toString()
     };
   }
   /**
@@ -3990,16 +4024,16 @@ var AssetManager = class extends ReadonlyAssetManager {
     for (const [inputIndex, assets] of assetInputs) {
       for (const asset of assets) {
         if (asset.assetId !== params.assetId) continue;
-        reissueInputs.push(chunk6FLL2Q36_cjs.AssetInput.create(inputIndex, asset.amount));
+        reissueInputs.push(chunkSPDNHPM4_cjs.AssetInput.create(inputIndex, asset.amount));
       }
     }
     const totalAssetAmount = assetToReissueAmount + params.amount;
-    const reissueAssetIdObj = chunk6FLL2Q36_cjs.AssetId.fromString(params.assetId);
-    const reissueAssetGroup = chunk6FLL2Q36_cjs.AssetGroup.create(
+    const reissueAssetIdObj = chunkSPDNHPM4_cjs.AssetId.fromString(params.assetId);
+    const reissueAssetGroup = chunkSPDNHPM4_cjs.AssetGroup.create(
       reissueAssetIdObj,
       null,
       reissueInputs,
-      [chunk6FLL2Q36_cjs.AssetOutput.create(0, totalAssetAmount)],
+      [chunkSPDNHPM4_cjs.AssetOutput.create(0, totalAssetAmount)],
       []
     );
     const groups = [reissueAssetGroup];
@@ -4008,15 +4042,15 @@ var AssetManager = class extends ReadonlyAssetManager {
       for (const [inputIndex, assets] of assetInputs) {
         for (const asset of assets) {
           if (asset.assetId !== assetId) continue;
-          changeInputs.push(chunk6FLL2Q36_cjs.AssetInput.create(inputIndex, asset.amount));
+          changeInputs.push(chunkSPDNHPM4_cjs.AssetInput.create(inputIndex, asset.amount));
         }
       }
       groups.push(
-        chunk6FLL2Q36_cjs.AssetGroup.create(
-          chunk6FLL2Q36_cjs.AssetId.fromString(assetId),
+        chunkSPDNHPM4_cjs.AssetGroup.create(
+          chunkSPDNHPM4_cjs.AssetId.fromString(assetId),
           null,
           changeInputs,
-          [chunk6FLL2Q36_cjs.AssetOutput.create(0, amount)],
+          [chunkSPDNHPM4_cjs.AssetOutput.create(0, amount)],
           []
         )
       );
@@ -4028,7 +4062,7 @@ var AssetManager = class extends ReadonlyAssetManager {
         script: outputAddress.pkScript,
         amount: BigInt(totalBtcSelected)
       },
-      Extension.create([chunk6FLL2Q36_cjs.Packet.create(groups)]).txOut()
+      Extension.create([chunkSPDNHPM4_cjs.Packet.create(groups)]).txOut()
     ];
     const { arkTxid } = await this.wallet.buildAndSubmitOffchainTx(selectedCoins, outputs);
     return arkTxid;
@@ -4095,15 +4129,15 @@ var AssetManager = class extends ReadonlyAssetManager {
       for (const [inputIndex, assets] of assetInputs) {
         for (const asset of assets) {
           if (asset.assetId !== assetId) continue;
-          changeInputs.push(chunk6FLL2Q36_cjs.AssetInput.create(inputIndex, asset.amount));
+          changeInputs.push(chunkSPDNHPM4_cjs.AssetInput.create(inputIndex, asset.amount));
         }
       }
       groups.push(
-        chunk6FLL2Q36_cjs.AssetGroup.create(
-          chunk6FLL2Q36_cjs.AssetId.fromString(assetId),
+        chunkSPDNHPM4_cjs.AssetGroup.create(
+          chunkSPDNHPM4_cjs.AssetId.fromString(assetId),
           null,
           changeInputs,
-          amount > 0n ? [chunk6FLL2Q36_cjs.AssetOutput.create(0, amount)] : [],
+          amount > 0n ? [chunkSPDNHPM4_cjs.AssetOutput.create(0, amount)] : [],
           []
         )
       );
@@ -4115,7 +4149,7 @@ var AssetManager = class extends ReadonlyAssetManager {
         script: outputAddress.pkScript,
         amount: BigInt(totalBtcSelected)
       },
-      Extension.create([chunk6FLL2Q36_cjs.Packet.create(groups)]).txOut()
+      Extension.create([chunkSPDNHPM4_cjs.Packet.create(groups)]).txOut()
     ];
     const { arkTxid } = await this.wallet.buildAndSubmitOffchainTx(selectedCoins, outputs);
     return arkTxid;
@@ -4140,7 +4174,7 @@ function castMetadata(metadata) {
     } else {
       throw new Error("Invalid metadata value type");
     }
-    md.push(chunk6FLL2Q36_cjs.Metadata.create(textEncoder.encode(key), valueBytes));
+    md.push(chunkSPDNHPM4_cjs.Metadata.create(textEncoder.encode(key), valueBytes));
   }
   return md;
 }
@@ -4425,7 +4459,7 @@ async function makeSignedDelegateIntent(identity, coins, outputs, onchainOutputs
     expire_at: 0,
     cosigners_public_keys: cosignerPubKeys
   };
-  const proof = chunk6FLL2Q36_cjs.Intent.create(message, coins, outputs);
+  const proof = chunkSPDNHPM4_cjs.Intent.create(message, coins, outputs);
   const signedProof = await identity.sign(proof);
   return {
     proof: base.base64.encode(signedProof.toPSBT()),
@@ -6165,7 +6199,7 @@ var ContractWatcher = class {
       this.connectionState = "connected";
       this.reconnectAttempts = 0;
       this.listenLoop().catch((e) => {
-        if (chunk6FLL2Q36_cjs.isEventSourceError(e)) {
+        if (chunkSPDNHPM4_cjs.isEventSourceError(e)) {
           console.debug("ContractWatcher subscription disconnected; reconnecting");
         } else {
           console.error(e);
@@ -6605,7 +6639,7 @@ var ContractManager = class _ContractManager {
    * `persisted` is `true`.
    */
   async upsertContract(params) {
-    const handler = chunkIEO3XDKI_cjs.contractHandlers.get(params.type);
+    const handler = chunkGYSK5R57_cjs.contractHandlers.get(params.type);
     if (!handler) {
       throw new Error(`No handler registered for contract type '${params.type}'`);
     }
@@ -6666,7 +6700,7 @@ var ContractManager = class _ContractManager {
         `scanContracts: gapLimit must be a positive integer (got ${String(opts.gapLimit)})`
       );
     }
-    const discoverables = chunkIEO3XDKI_cjs.contractHandlers.getRegisteredTypes().map((t) => chunkIEO3XDKI_cjs.contractHandlers.get(t)).filter(isDiscoverable);
+    const discoverables = chunkGYSK5R57_cjs.contractHandlers.getRegisteredTypes().map((t) => chunkGYSK5R57_cjs.contractHandlers.get(t)).filter(isDiscoverable);
     const maxIdx = opts.hd ? SCAN_MAX_INDEX : 0;
     const handlerErrors = [];
     let lastIndexUsed = -1;
@@ -6822,7 +6856,7 @@ var ContractManager = class _ContractManager {
     const { contractScript, collaborative = true, walletPubKey, vtxo } = options;
     const [contract] = await this.getContracts({ script: contractScript });
     if (!contract) return [];
-    const handler = chunkIEO3XDKI_cjs.contractHandlers.get(contract.type);
+    const handler = chunkGYSK5R57_cjs.contractHandlers.get(contract.type);
     if (!handler) return [];
     const script = handler.createScript(contract.params);
     const context = {
@@ -6842,7 +6876,7 @@ var ContractManager = class _ContractManager {
     const { contractScript, collaborative = true, walletPubKey } = options;
     const [contract] = await this.getContracts({ script: contractScript });
     if (!contract) return [];
-    const handler = chunkIEO3XDKI_cjs.contractHandlers.get(contract.type);
+    const handler = chunkGYSK5R57_cjs.contractHandlers.get(contract.type);
     if (!handler) return [];
     const script = handler.createScript(contract.params);
     const context = {
@@ -7252,7 +7286,7 @@ var HDDescriptorProvider = class _HDDescriptorProvider {
    */
   materializeDescriptorAt(index) {
     const descriptor = this.identity.descriptor;
-    const network = chunkIEO3XDKI_cjs.isMainnetDescriptor(descriptor) ? descriptorsScure.networks.bitcoin : descriptorsScure.networks.testnet;
+    const network = chunkGYSK5R57_cjs.isMainnetDescriptor(descriptor) ? descriptorsScure.networks.bitcoin : descriptorsScure.networks.testnet;
     const expansion = descriptorsScure.expand({ descriptor, network, index });
     const keyInfo = expansion.expansionMap?.["@0"];
     if (!keyInfo?.keyExpression) {
@@ -7395,7 +7429,7 @@ var WalletReceiveRotator = class _WalletReceiveRotator {
     const provider = await resolveDescriptorProvider(config, setup.walletRepository);
     if (!provider) return void 0;
     const allowSilentFallback = (config.walletMode ?? "auto") === "auto";
-    const expectedContractType = setup.offchainTapscript instanceof chunkIEO3XDKI_cjs.DelegateVtxo.Script ? "delegate" : "default";
+    const expectedContractType = setup.offchainTapscript instanceof chunkGYSK5R57_cjs.DelegateVtxo.Script ? "delegate" : "default";
     const factoryOpts = {
       walletRepository: setup.walletRepository,
       contractRepository: setup.contractRepository,
@@ -7557,7 +7591,7 @@ var WalletReceiveRotator = class _WalletReceiveRotator {
     const newScript = base.hex.encode(newTapscript.pkScript);
     const newAddress = newTapscript.address(wallet.network.hrp, wallet.arkServerPublicKey).encode();
     const manager = await wallet.getContractManager();
-    const csvTimelock = newTapscript.options.csvTimelock ?? chunkIEO3XDKI_cjs.DefaultVtxo.Script.DEFAULT_TIMELOCK;
+    const csvTimelock = newTapscript.options.csvTimelock;
     const csvTimelockStr = chunkWMIPYZSB_cjs.timelockToSequence(csvTimelock).toString();
     const serverPubKeyHex = base.hex.encode(newTapscript.options.serverPubKey);
     const baseParams = {
@@ -7572,11 +7606,11 @@ var WalletReceiveRotator = class _WalletReceiveRotator {
       // produce unsigned PSBTs that the server rejects with
       // `INVALID_PSBT_INPUT (5): missing tapscript spend sig`.
       metadata: {
-        source: chunkIEO3XDKI_cjs.WALLET_RECEIVE_SOURCE,
+        source: chunkGYSK5R57_cjs.WALLET_RECEIVE_SOURCE,
         signingDescriptor: descriptor
       }
     };
-    if (newTapscript instanceof chunkIEO3XDKI_cjs.DelegateVtxo.Script) {
+    if (newTapscript instanceof chunkGYSK5R57_cjs.DelegateVtxo.Script) {
       await manager.createContract({
         ...baseParams,
         type: "delegate",
@@ -7608,7 +7642,7 @@ var WalletReceiveRotator = class _WalletReceiveRotator {
 };
 function deriveLeafPubkey(descriptor) {
   try {
-    return chunkIEO3XDKI_cjs.deriveDescriptorLeafPubKey(descriptor);
+    return chunkGYSK5R57_cjs.deriveDescriptorLeafPubKey(descriptor);
   } catch (e) {
     throw new NonRangeableDescriptorError(
       "Cannot derive leaf pubkey: descriptor is not a materialized, parsable tr(...) shape.",
@@ -7617,10 +7651,10 @@ function deriveLeafPubkey(descriptor) {
   }
 }
 function rebuildTapscript(current, pubKey) {
-  if (current instanceof chunkIEO3XDKI_cjs.DelegateVtxo.Script) {
-    return new chunkIEO3XDKI_cjs.DelegateVtxo.Script({ ...current.options, pubKey });
+  if (current instanceof chunkGYSK5R57_cjs.DelegateVtxo.Script) {
+    return new chunkGYSK5R57_cjs.DelegateVtxo.Script({ ...current.options, pubKey });
   }
-  return new chunkIEO3XDKI_cjs.DefaultVtxo.Script({ ...current.options, pubKey });
+  return new chunkGYSK5R57_cjs.DefaultVtxo.Script({ ...current.options, pubKey });
 }
 async function pickActiveReceive(contractRepository, serverPubKey, expectedType) {
   const candidates = await contractRepository.getContracts({
@@ -7629,7 +7663,7 @@ async function pickActiveReceive(contractRepository, serverPubKey, expectedType)
   });
   const serverPubKeyHex = base.hex.encode(serverPubKey);
   const matching = candidates.filter(
-    (c) => c.params.serverPubKey === serverPubKeyHex && c.metadata?.source === chunkIEO3XDKI_cjs.WALLET_RECEIVE_SOURCE
+    (c) => c.params.serverPubKey === serverPubKeyHex && c.metadata?.source === chunkGYSK5R57_cjs.WALLET_RECEIVE_SOURCE
   ).sort((a, b) => {
     if (b.createdAt !== a.createdAt) return b.createdAt - a.createdAt;
     return signingDescriptorIndex(b.metadata?.signingDescriptor) - signingDescriptorIndex(a.metadata?.signingDescriptor);
@@ -7690,8 +7724,24 @@ var InputSignerRouter = class {
   constructor(deps) {
     this.deps = deps;
   }
-  async sign(tx, jobs) {
-    if (jobs.length === 0) return tx;
+  /**
+   * Resolve each job to its target signer without invoking signing. The
+   * returned plan is the single source of truth for both {@link sign} and
+   * the batch-eligibility predicate {@link canBatch} — callers that want
+   * to pre-flight a batch path call {@link canBatch} (which delegates
+   * here) so the routing rules never live in two places.
+   *
+   * Throws {@link MissingSigningDescriptorError} for a non-baseline
+   * default/delegate contract whose `metadata.signingDescriptor` is
+   * missing — the same condition that would later abort signing. Failing
+   * here moves the failure earlier, before any PSBT is mutated.
+   */
+  async classify(jobs) {
+    const identityIndexes = [];
+    const descriptorGroups = /* @__PURE__ */ new Map();
+    if (jobs.length === 0) {
+      return { identityIndexes, descriptorGroups };
+    }
     const distinctScripts = Array.from(new Set(jobs.map((j) => base.hex.encode(j.lookupScript))));
     const contracts = await this.deps.contractRepository.getContracts({
       script: distinctScripts
@@ -7704,8 +7754,6 @@ var InputSignerRouter = class {
     }
     const baselinePubKeyHex = base.hex.encode(await this.deps.identity.xOnlyPublicKey());
     const boardingScriptHex = base.hex.encode(this.deps.boardingPkScript);
-    const identityIndexes = [];
-    const descriptorGroups = /* @__PURE__ */ new Map();
     for (const job of jobs) {
       const scriptHex = base.hex.encode(job.lookupScript);
       const contract = scriptToContract.get(scriptHex);
@@ -7738,6 +7786,31 @@ var InputSignerRouter = class {
         descriptorGroups.set(descriptor, [job.index]);
       }
     }
+    return { identityIndexes, descriptorGroups };
+  }
+  /**
+   * Returns `true` when every signable input across all `jobSets` resolves
+   * to the baseline {@link Identity} key — i.e. the descriptor provider
+   * would not be invoked. Used by the wallet's send/recovery paths to
+   * pre-flight the {@link BatchSignableIdentity.signMultiple} fast path,
+   * which can only fold work a single identity key can sign.
+   *
+   * Accepts several job sets (e.g. an arkTx's jobs plus one set per
+   * checkpoint) and classifies their union in a single pass. Eligibility
+   * is monotonic — the union routes entirely to the baseline key iff every
+   * set does — so this returns the same answer as ANDing the per-set
+   * results, but with one {@link classify} (one repo round-trip + one
+   * `xOnlyPublicKey` call) instead of one per set. Only the routing buckets
+   * matter here, so the input-index collisions produced by flattening jobs
+   * from different transactions are irrelevant.
+   */
+  async canBatch(...jobSets) {
+    const plan = await this.classify(jobSets.flat());
+    return plan.descriptorGroups.size === 0;
+  }
+  async sign(tx, jobs) {
+    if (jobs.length === 0) return tx;
+    const { identityIndexes, descriptorGroups } = await this.classify(jobs);
     let signed = tx;
     if (identityIndexes.length > 0) {
       signed = await this.deps.identity.sign(signed, identityIndexes);
@@ -7795,6 +7868,20 @@ function dedupeTimelocks(timelocks) {
   }
   return deduped;
 }
+function areSameScriptBaselineTypesCompatible(existingType, requestedType) {
+  if (existingType === requestedType) return true;
+  return existingType === "default" && requestedType === "boarding" || existingType === "boarding" && requestedType === "default";
+}
+async function ensureWalletContract(manager, params) {
+  const [existing] = await manager.getContracts({ script: params.script });
+  if (existing && existing.type !== params.type && areSameScriptBaselineTypesCompatible(existing.type, params.type)) {
+    if (params.type === "default" && existing.type === "boarding") {
+      await manager.updateContract(params.script, { type: "default" });
+    }
+    return;
+  }
+  await manager.createContract(params);
+}
 function hasToReadonly(identity) {
   return typeof identity === "object" && identity !== null && "toReadonly" in identity && typeof identity.toReadonly === "function";
 }
@@ -7823,9 +7910,7 @@ var ReadonlyWallet = class _ReadonlyWallet {
     this._offchainTapscript = offchainTapscript;
     this.watcherConfig = watcherConfig;
     this._assetManager = new ReadonlyAssetManager(this.indexerProvider);
-    this.walletContractTimelocks = walletContractTimelocks && walletContractTimelocks.length > 0 ? dedupeTimelocks(walletContractTimelocks) : [
-      this.offchainTapscript.options.csvTimelock ?? chunkIEO3XDKI_cjs.DefaultVtxo.Script.DEFAULT_TIMELOCK
-    ];
+    this.walletContractTimelocks = walletContractTimelocks && walletContractTimelocks.length > 0 ? dedupeTimelocks(walletContractTimelocks) : [this.offchainTapscript.options.csvTimelock];
   }
   _contractManager;
   _contractManagerInitializing;
@@ -7863,7 +7948,7 @@ var ReadonlyWallet = class _ReadonlyWallet {
    */
   static async setupWalletConfig(config, pubKey) {
     const arkadeServerUrl = getArkadeServerUrl(config);
-    const arkProvider = config.arkProvider || new chunk6FLL2Q36_cjs.RestArkProvider(arkadeServerUrl);
+    const arkProvider = config.arkProvider || new chunkSPDNHPM4_cjs.RestArkProvider(arkadeServerUrl);
     let indexerProvider = config.indexerProvider;
     if (!indexerProvider) {
       let indexerUrl = config.indexerUrl;
@@ -7880,7 +7965,7 @@ var ReadonlyWallet = class _ReadonlyWallet {
           indexerUrl = arkadeServerUrl;
         }
       }
-      indexerProvider = new chunk6FLL2Q36_cjs.RestIndexerProvider(indexerUrl);
+      indexerProvider = new chunkSPDNHPM4_cjs.RestIndexerProvider(indexerUrl);
     }
     const info = await arkProvider.getInfo();
     const network = chunkWMIPYZSB_cjs.getNetwork(info.network);
@@ -7930,10 +8015,11 @@ var ReadonlyWallet = class _ReadonlyWallet {
       serverPubKey,
       csvTimelock: exitTimelock
     };
-    const offchainTapscript = !delegatePubKey ? new chunkIEO3XDKI_cjs.DefaultVtxo.Script(offchainOptions) : new chunkIEO3XDKI_cjs.DelegateVtxo.Script({ ...offchainOptions, delegatePubKey });
-    const boardingTapscript = new chunkIEO3XDKI_cjs.DefaultVtxo.Script({
-      ...offchainOptions,
-      csvTimelock: boardingTimelock
+    const offchainTapscript = !delegatePubKey ? new chunkGYSK5R57_cjs.DefaultVtxo.Script(offchainOptions) : new chunkGYSK5R57_cjs.DelegateVtxo.Script({ ...offchainOptions, delegatePubKey });
+    const boardingTapscript = chunkGYSK5R57_cjs.BoardingContractHandler.createScript({
+      pubKey: base.hex.encode(pubKey),
+      serverPubKey: base.hex.encode(serverPubKey),
+      csvTimelock: chunkWMIPYZSB_cjs.timelockToSequence(boardingTimelock).toString()
     });
     const walletRepository = config.storage?.walletRepository ?? new IndexedDBWalletRepository();
     const contractRepository = config.storage?.contractRepository ?? new IndexedDBContractRepository();
@@ -8142,7 +8228,7 @@ var ReadonlyWallet = class _ReadonlyWallet {
       const tx = {
         key: {
           boardingTxid: utxo.txid,
-          commitmentTxid: "",
+          commitmentTxid: utxo.virtualStatus.commitmentTxIds?.[0] ?? "",
           arkTxid: ""
         },
         amount: utxo.value,
@@ -8273,7 +8359,7 @@ var ReadonlyWallet = class _ReadonlyWallet {
     });
     for (const contract of contracts) {
       if (map.has(contract.script)) continue;
-      const handler = chunkIEO3XDKI_cjs.contractHandlers.get(contract.type);
+      const handler = chunkGYSK5R57_cjs.contractHandlers.get(contract.type);
       if (handler) {
         const script = handler.createScript(contract.params);
         map.set(contract.script, script);
@@ -8340,13 +8426,13 @@ var ReadonlyWallet = class _ReadonlyWallet {
     const baselinePubkey = await this.identity.xOnlyPublicKey();
     for (const csvTimelock of this.walletContractTimelocks) {
       const csvTimelockStr = chunkWMIPYZSB_cjs.timelockToSequence(csvTimelock).toString();
-      const defaultScript = new chunkIEO3XDKI_cjs.DefaultVtxo.Script({
+      const defaultScript = new chunkGYSK5R57_cjs.DefaultVtxo.Script({
         pubKey: baselinePubkey,
         serverPubKey: this.offchainTapscript.options.serverPubKey,
         csvTimelock
       });
       const defaultScriptHex = base.hex.encode(defaultScript.pkScript);
-      await manager.createContract({
+      await ensureWalletContract(manager, {
         type: "default",
         params: {
           pubKey: base.hex.encode(defaultScript.options.pubKey),
@@ -8357,8 +8443,8 @@ var ReadonlyWallet = class _ReadonlyWallet {
         address: defaultScript.address(this.network.hrp, this.arkServerPublicKey).encode(),
         state: "active"
       });
-      if (this.offchainTapscript instanceof chunkIEO3XDKI_cjs.DelegateVtxo.Script) {
-        const delegateScript = new chunkIEO3XDKI_cjs.DelegateVtxo.Script({
+      if (this.offchainTapscript instanceof chunkGYSK5R57_cjs.DelegateVtxo.Script) {
+        const delegateScript = new chunkGYSK5R57_cjs.DelegateVtxo.Script({
           pubKey: baselinePubkey,
           serverPubKey: this.offchainTapscript.options.serverPubKey,
           delegatePubKey: this.offchainTapscript.options.delegatePubKey,
@@ -8379,6 +8465,19 @@ var ReadonlyWallet = class _ReadonlyWallet {
         });
       }
     }
+    const boardingScriptHex = base.hex.encode(this.boardingTapscript.pkScript);
+    const boardingCsvTimelock = this.boardingTapscript.options.csvTimelock ?? chunkGYSK5R57_cjs.DefaultVtxo.Script.DEFAULT_TIMELOCK;
+    await ensureWalletContract(manager, {
+      type: "boarding",
+      params: {
+        pubKey: base.hex.encode(this.boardingTapscript.options.pubKey),
+        serverPubKey: base.hex.encode(this.boardingTapscript.options.serverPubKey),
+        csvTimelock: chunkWMIPYZSB_cjs.timelockToSequence(boardingCsvTimelock).toString()
+      },
+      script: boardingScriptHex,
+      address: this.boardingTapscript.address(this.network.hrp, this.arkServerPublicKey).encode(),
+      state: "active"
+    });
     return manager;
   }
   /** Dispose wallet-owned managers and release background resources. */
@@ -8559,7 +8658,7 @@ var Wallet2 = class _Wallet extends ReadonlyWallet {
     const hd = provider instanceof HDDescriptorProvider;
     const staticDescriptor = hd ? void 0 : `tr(${base.hex.encode(await this.identity.xOnlyPublicKey())})`;
     const materialize = (index) => hd ? provider.materializeDescriptorAt(index) : staticDescriptor;
-    const delegatePubKey = this.offchainTapscript instanceof chunkIEO3XDKI_cjs.DelegateVtxo.Script ? this.offchainTapscript.options.delegatePubKey : void 0;
+    const delegatePubKey = this.offchainTapscript instanceof chunkGYSK5R57_cjs.DelegateVtxo.Script ? this.offchainTapscript.options.delegatePubKey : void 0;
     const deps = {
       indexerProvider: this.indexerProvider,
       onchainProvider: this.onchainProvider,
@@ -9228,7 +9327,7 @@ var Wallet2 = class _Wallet extends ReadonlyWallet {
     try {
       return await this.arkProvider.registerIntent(intent);
     } catch (error) {
-      if (error instanceof chunk6FLL2Q36_cjs.ArkError && error.code === 0 && error.message.includes("duplicated input")) {
+      if (error instanceof chunkSPDNHPM4_cjs.ArkError && error.code === 0 && error.message.includes("duplicated input")) {
         const deleteIntent = await this.makeDeleteIntentSignature(inputs);
         await this.arkProvider.deleteIntent(deleteIntent);
         return this.arkProvider.registerIntent(intent);
@@ -9244,7 +9343,7 @@ var Wallet2 = class _Wallet extends ReadonlyWallet {
       expire_at: 0,
       cosigners_public_keys: cosignerPubKeys
     };
-    const proof = chunk6FLL2Q36_cjs.Intent.create(message, coins, outputs);
+    const proof = chunkSPDNHPM4_cjs.Intent.create(message, coins, outputs);
     const signedProof = await this._signerRouter.sign(proof, intentProofJobs(coins));
     return {
       proof: base.base64.encode(signedProof.toPSBT()),
@@ -9256,7 +9355,7 @@ var Wallet2 = class _Wallet extends ReadonlyWallet {
       type: "delete",
       expire_at: 0
     };
-    const proof = chunk6FLL2Q36_cjs.Intent.create(message, coins, []);
+    const proof = chunkSPDNHPM4_cjs.Intent.create(message, coins, []);
     const signedProof = await this._signerRouter.sign(proof, intentProofJobs(coins));
     return {
       proof: base.base64.encode(signedProof.toPSBT()),
@@ -9268,7 +9367,7 @@ var Wallet2 = class _Wallet extends ReadonlyWallet {
       type: "get-pending-tx",
       expire_at: 0
     };
-    const proof = chunk6FLL2Q36_cjs.Intent.create(message, coins, []);
+    const proof = chunkSPDNHPM4_cjs.Intent.create(message, coins, []);
     const signedProof = await this._signerRouter.sign(proof, intentProofJobs(coins));
     return {
       proof: base.base64.encode(signedProof.toPSBT()),
@@ -9328,16 +9427,38 @@ var Wallet2 = class _Wallet extends ReadonlyWallet {
           seen.add(pendingTx.arkTxid);
           batchPending.push(pendingTx.arkTxid);
           try {
-            const finalCheckpoints = await Promise.all(
-              pendingTx.signedCheckpointTxs.map(async (c) => {
-                const tx = btcSigner.Transaction.fromPSBT(base.base64.decode(c));
-                const signedCheckpoint = await this._signerRouter.sign(
-                  tx,
-                  this.inputSigningJobsFromWitnessUtxos(tx)
-                );
-                return base.base64.encode(signedCheckpoint.toPSBT());
-              })
+            const checkpointTxs = pendingTx.signedCheckpointTxs.map(
+              (c) => btcSigner.Transaction.fromPSBT(base.base64.decode(c))
+            );
+            const checkpointJobs = checkpointTxs.map(
+              (tx) => this.inputSigningJobsFromWitnessUtxos(tx)
             );
+            const identity = this.identity;
+            const batchEligible = isBatchSignable(identity) && await this._signerRouter.canBatch(...checkpointJobs);
+            let finalCheckpoints;
+            if (batchEligible) {
+              const requests = checkpointTxs.map((tx, i) => ({
+                tx,
+                inputIndexes: checkpointJobs[i].map((j) => j.index)
+              }));
+              const signed = await identity.signMultiple(requests);
+              if (signed.length !== requests.length) {
+                throw new Error(
+                  `signMultiple returned ${signed.length} transactions, expected ${requests.length}`
+                );
+              }
+              finalCheckpoints = signed.map((tx) => base.base64.encode(tx.toPSBT()));
+            } else {
+              finalCheckpoints = await Promise.all(
+                checkpointTxs.map(async (tx, i) => {
+                  const signedCheckpoint = await this._signerRouter.sign(
+                    tx,
+                    checkpointJobs[i]
+                  );
+                  return base.base64.encode(signedCheckpoint.toPSBT());
+                })
+              );
+            }
             await this.arkProvider.finalizeTx(pendingTx.arkTxid, finalCheckpoints);
             batchFinalized.push(pendingTx.arkTxid);
           } catch (error) {
@@ -9565,22 +9686,65 @@ var Wallet2 = class _Wallet extends ReadonlyWallet {
       index,
       lookupScript: chunkWMIPYZSB_cjs.VtxoScript.decode(input.tapTree).pkScript
     }));
-    const signedVirtualTx = await this._signerRouter.sign(offchainTx.arkTx, arkTxJobs);
+    const checkpointJobs = offchainTx.checkpoints.map(
+      (c) => this.inputSigningJobsFromWitnessUtxos(c)
+    );
+    let signedVirtualTx;
+    let userSignedCheckpoints;
+    const identity = this.identity;
+    const batchEligible = isBatchSignable(identity) && await this._signerRouter.canBatch(arkTxJobs, ...checkpointJobs);
+    if (batchEligible) {
+      const requests = [
+        {
+          tx: offchainTx.arkTx.clone(),
+          inputIndexes: arkTxJobs.map((j) => j.index)
+        },
+        ...offchainTx.checkpoints.map((c, i) => ({
+          tx: c.clone(),
+          inputIndexes: checkpointJobs[i].map((j) => j.index)
+        }))
+      ];
+      const signed = await identity.signMultiple(requests);
+      if (signed.length !== requests.length) {
+        throw new Error(
+          `signMultiple returned ${signed.length} transactions, expected ${requests.length}`
+        );
+      }
+      const [firstSignedTx, ...signedCheckpoints] = signed;
+      signedVirtualTx = firstSignedTx;
+      userSignedCheckpoints = signedCheckpoints;
+    } else {
+      signedVirtualTx = await this._signerRouter.sign(offchainTx.arkTx, arkTxJobs);
+    }
     await this.setPendingTxFlag(true);
     const { arkTxid, signedCheckpointTxs } = await this.arkProvider.submitTx(
       base.base64.encode(signedVirtualTx.toPSBT()),
       offchainTx.checkpoints.map((c) => base.base64.encode(c.toPSBT()))
     );
-    const finalCheckpoints = await Promise.all(
-      signedCheckpointTxs.map(async (c) => {
-        const tx = btcSigner.Transaction.fromPSBT(base.base64.decode(c));
-        const signedCheckpoint = await this._signerRouter.sign(
-          tx,
-          this.inputSigningJobsFromWitnessUtxos(tx)
+    let finalCheckpoints;
+    if (userSignedCheckpoints) {
+      if (signedCheckpointTxs.length !== userSignedCheckpoints.length) {
+        throw new Error(
+          `submitTx returned ${signedCheckpointTxs.length} checkpoints, expected ${userSignedCheckpoints.length}`
         );
-        return base.base64.encode(signedCheckpoint.toPSBT());
-      })
-    );
+      }
+      finalCheckpoints = signedCheckpointTxs.map((c, i) => {
+        const serverSigned = btcSigner.Transaction.fromPSBT(base.base64.decode(c));
+        combineTapscriptSigs(userSignedCheckpoints[i], serverSigned);
+        return base.base64.encode(serverSigned.toPSBT());
+      });
+    } else {
+      finalCheckpoints = await Promise.all(
+        signedCheckpointTxs.map(async (c) => {
+          const tx = btcSigner.Transaction.fromPSBT(base.base64.decode(c));
+          const signedCheckpoint = await this._signerRouter.sign(
+            tx,
+            this.inputSigningJobsFromWitnessUtxos(tx)
+          );
+          return base.base64.encode(signedCheckpoint.toPSBT());
+        })
+      );
+    }
     await this.arkProvider.finalizeTx(arkTxid, finalCheckpoints);
     try {
       await this.setPendingTxFlag(false);
@@ -9830,12 +9994,17 @@ function selectVirtualCoins(coins, targetAmount) {
 }
 async function waitForIncomingFunds(wallet) {
   let stopFunc;
+  let settled = false;
   return new Promise((resolve) => {
-    wallet.notifyIncomingFunds((coins) => {
-      resolve(coins);
-      if (stopFunc) stopFunc();
+    wallet.notifyIncomingFunds((funds) => {
+      const hasFunds = funds.type === "utxo" ? funds.coins.length > 0 : funds.newVtxos.length > 0;
+      if (settled || !hasFunds) return;
+      settled = true;
+      resolve(funds);
+      stopFunc?.();
     }).then((stop) => {
       stopFunc = stop;
+      if (settled) stop();
     });
   });
 }
@@ -9992,7 +10161,7 @@ var MessageBus = class {
     this.initialized = true;
   }
   async buildServices(config) {
-    const arkProvider = new chunk6FLL2Q36_cjs.RestArkProvider(config.arkServer.url);
+    const arkProvider = new chunkSPDNHPM4_cjs.RestArkProvider(config.arkServer.url);
     const storage = {
       walletRepository: this.walletRepository,
       contractRepository: this.contractRepository
@@ -11035,7 +11204,7 @@ var WalletMessageHandler = class {
   // Wallet methods
   async handleInitWallet({ payload }) {
     const { arkServerUrl } = payload;
-    this.indexerProvider = new chunk6FLL2Q36_cjs.RestIndexerProvider(arkServerUrl);
+    this.indexerProvider = new chunkSPDNHPM4_cjs.RestIndexerProvider(arkServerUrl);
     await this.onWalletInitialized();
   }
   async handleGetBalance() {
@@ -12779,7 +12948,7 @@ var OnchainWallet = class _OnchainWallet {
     if (!inputs) {
       throw new Error("Fee estimation failed");
     }
-    let tx = new chunk6FLL2Q36_cjs.Transaction();
+    let tx = new chunkSPDNHPM4_cjs.Transaction();
     for (const input of inputs) {
       tx.addInput({
         txid: input.txid,
@@ -12810,7 +12979,7 @@ var OnchainWallet = class _OnchainWallet {
    */
   async bumpP2A(parent) {
     const parentVsize = parent.vsize;
-    let child = new chunk6FLL2Q36_cjs.Transaction({
+    let child = new chunkSPDNHPM4_cjs.Transaction({
       version: 3,
       allowLegacyWitnessUtxo: true
     });
@@ -13567,7 +13736,7 @@ exports.BIP322 = void 0;
   async function sign2(message, identity, network) {
     const xOnlyPubKey = await identity.xOnlyPublicKey();
     const payment = btcSigner.p2tr(xOnlyPubKey, void 0, network);
-    const toSpend = chunk6FLL2Q36_cjs.craftToSpendTx(message, payment.script, TAG_BIP322);
+    const toSpend = chunkSPDNHPM4_cjs.craftToSpendTx(message, payment.script, TAG_BIP322);
     const toSign = craftBIP322ToSignP2TR(toSpend, payment.script, xOnlyPubKey);
     const signed = await identity.sign(toSign, [0]);
     signed.finalizeIdx(0);
@@ -13625,7 +13794,7 @@ function verifyP2TR(message, witnessItems, pkScript, pubkey) {
   if (sighashType !== btcSigner.SigHash.DEFAULT && sighashType !== btcSigner.SigHash.ALL) {
     return false;
   }
-  const toSpend = chunk6FLL2Q36_cjs.craftToSpendTx(message, pkScript, TAG_BIP322);
+  const toSpend = chunkSPDNHPM4_cjs.craftToSpendTx(message, pkScript, TAG_BIP322);
   const toSign = craftBIP322ToSignP2TR(toSpend, pkScript, pubkey);
   const sighash = toSign.preimageWitnessV1(0, [pkScript], sighashType, [0n]);
   const rawSig = sig.length === 65 ? sig.subarray(0, 64) : sig;
@@ -13646,7 +13815,7 @@ function verifyP2WPKH(message, witnessItems, pkScript, addressHash) {
   }
   const sighashType = sigWithHash[sigWithHash.length - 1];
   const derSig = sigWithHash.subarray(0, sigWithHash.length - 1);
-  const toSpend = chunk6FLL2Q36_cjs.craftToSpendTx(message, pkScript, TAG_BIP322);
+  const toSpend = chunkSPDNHPM4_cjs.craftToSpendTx(message, pkScript, TAG_BIP322);
   const toSign = craftBIP322ToSignSimple(toSpend, pkScript);
   const scriptCode = btcSigner.OutScript.encode({ type: "pkh", hash: addressHash });
   const sighash = toSign.preimageWitnessV0(0, scriptCode, sighashType, 0n);
@@ -13699,7 +13868,7 @@ function encodeCompactSize(n) {
   return buf;
 }
 function craftBIP322ToSignP2TR(toSpend, pkScript, tapInternalKey) {
-  const tx = new chunk6FLL2Q36_cjs.Transaction({ version: 0 });
+  const tx = new chunkSPDNHPM4_cjs.Transaction({ version: 0 });
   tx.addInput({
     txid: toSpend.id,
     index: 0,
@@ -13713,12 +13882,12 @@ function craftBIP322ToSignP2TR(toSpend, pkScript, tapInternalKey) {
   });
   tx.addOutput({
     amount: 0n,
-    script: chunk6FLL2Q36_cjs.OP_RETURN_EMPTY_PKSCRIPT
+    script: chunkSPDNHPM4_cjs.OP_RETURN_EMPTY_PKSCRIPT
   });
   return tx;
 }
 function craftBIP322ToSignSimple(toSpend, pkScript) {
-  const tx = new chunk6FLL2Q36_cjs.Transaction({ version: 0 });
+  const tx = new chunkSPDNHPM4_cjs.Transaction({ version: 0 });
   tx.addInput({
     txid: toSpend.id,
     index: 0,
@@ -13730,7 +13899,7 @@ function craftBIP322ToSignSimple(toSpend, pkScript) {
   });
   tx.addOutput({
     amount: 0n,
-    script: chunk6FLL2Q36_cjs.OP_RETURN_EMPTY_PKSCRIPT
+    script: chunkSPDNHPM4_cjs.OP_RETURN_EMPTY_PKSCRIPT
   });
   return tx;
 }
@@ -13791,7 +13960,7 @@ exports.Unroll = void 0;
       if (virtualTxs.txs.length === 0) {
         throw new Error(`Tx ${nextTxToBroadcast.txid} not found`);
       }
-      const tx = chunk6FLL2Q36_cjs.Transaction.fromPSBT(base.base64.decode(virtualTxs.txs[0]));
+      const tx = chunkSPDNHPM4_cjs.Transaction.fromPSBT(base.base64.decode(virtualTxs.txs[0]));
       if (nextTxToBroadcast.type === "INDEXER_CHAINED_TX_TYPE_TREE" /* TREE */) {
         const input = tx.getInput(0);
         if (!input) {
@@ -13891,7 +14060,7 @@ async function prepareUnrollTransaction(wallet, vtxoTxIds, outputAddress) {
       btcSigner.TaprootControlBlock.encode(spendingLeaf[0]).length
     );
   }
-  const tx = new chunk6FLL2Q36_cjs.Transaction({ version: 2 });
+  const tx = new chunkSPDNHPM4_cjs.Transaction({ version: 2 });
   for (const input of inputs) {
     tx.addInput(input);
   }
@@ -13977,7 +14146,7 @@ function decodeArkContract(encoded) {
 }
 function contractFromArkContract(encoded, options = {}) {
   const parsed = decodeArkContract(encoded);
-  const handler = chunkIEO3XDKI_cjs.contractHandlers.get(parsed.type);
+  const handler = chunkGYSK5R57_cjs.contractHandlers.get(parsed.type);
   if (!handler) {
     throw new Error(`No handler registered for contract type '${parsed.type}'`);
   }
@@ -13993,7 +14162,7 @@ function contractFromArkContract(encoded, options = {}) {
 }
 function contractFromArkContractWithAddress(encoded, serverPubKey, addressPrefix = chunkWMIPYZSB_cjs.DEFAULT_NETWORK.hrp, options = {}) {
   const parsed = decodeArkContract(encoded);
-  const handler = chunkIEO3XDKI_cjs.contractHandlers.getOrThrow(parsed.type);
+  const handler = chunkGYSK5R57_cjs.contractHandlers.getOrThrow(parsed.type);
   const params = parsed.data;
   const vtxoScript = handler.createScript(params);
   return {
@@ -14105,5 +14274,5 @@ exports.validateVtxoTxGraph = validateVtxoTxGraph;
 exports.verifyTapscriptSignatures = verifyTapscriptSignatures;
 exports.waitForIncomingFunds = waitForIncomingFunds;
 exports.warnAndFilterVtxosForScript = warnAndFilterVtxosForScript;
-//# sourceMappingURL=chunk-GPZH5QNA.cjs.map
-//# sourceMappingURL=chunk-GPZH5QNA.cjs.map
+//# sourceMappingURL=chunk-7K3ROJF6.cjs.map
+//# sourceMappingURL=chunk-7K3ROJF6.cjs.map