@arkade-os/sdk 0.4.33 → 0.4.34

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

@@ -1,8 +1,8 @@
 'use strict';
 
-var chunkSPDNHPM4_cjs = require('./chunk-SPDNHPM4.cjs');
-var chunkGYSK5R57_cjs = require('./chunk-GYSK5R57.cjs');
-var chunkWMIPYZSB_cjs = require('./chunk-WMIPYZSB.cjs');
+var chunkFSAXPBGP_cjs = require('./chunk-FSAXPBGP.cjs');
+var chunkGUTKJMSF_cjs = require('./chunk-GUTKJMSF.cjs');
+var chunkCMPJR3HS_cjs = require('./chunk-CMPJR3HS.cjs');
 var utils_js = require('@scure/btc-signer/utils.js');
 var btcSigner = require('@scure/btc-signer');
 var base = require('@scure/base');
@@ -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 = chunkSPDNHPM4_cjs.getArkPsbtFields(tx.root, 0, chunkSPDNHPM4_cjs.CosignerPublicKey).map(
+    const cosigners = chunkFSAXPBGP_cjs.getArkPsbtFields(tx.root, 0, chunkFSAXPBGP_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 = chunkSPDNHPM4_cjs.getArkPsbtFields(g.root, 0, chunkSPDNHPM4_cjs.CosignerPublicKey).map((c) => c.key);
+    const cosigners = chunkFSAXPBGP_cjs.getArkPsbtFields(g.root, 0, chunkFSAXPBGP_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 = chunkGYSK5R57_cjs.isMainnetDescriptor(descriptor) ? descriptorsScure.networks.bitcoin : descriptorsScure.networks.testnet;
+      network = chunkGUTKJMSF_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 chunkGYSK5R57_cjs.descriptorIsOurs(descriptor, this.descriptor, utils_js.pubSchnorr(this.derivedKey));
+    return chunkGUTKJMSF_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 = chunkGYSK5R57_cjs.isMainnetDescriptor(descriptor) ? descriptorsScure.networks.bitcoin : descriptorsScure.networks.testnet;
+    const network = chunkGUTKJMSF_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 = chunkGYSK5R57_cjs.isMainnetDescriptor(descriptor) ? descriptorsScure.networks.bitcoin : descriptorsScure.networks.testnet;
+    const network = chunkGUTKJMSF_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 chunkGYSK5R57_cjs.descriptorIsOurs(descriptor, this.descriptor, this.indexZero.pubkey);
+    return chunkGUTKJMSF_cjs.descriptorIsOurs(descriptor, this.descriptor, this.indexZero.pubkey);
   }
 };
 function serializeSeedOwnedSigningIdentity(identity) {
@@ -987,7 +987,7 @@ var RestDelegateProvider = class {
       },
       body: JSON.stringify({
         intent: {
-          message: chunkSPDNHPM4_cjs.Intent.encodeMessage(intent.message),
+          message: chunkFSAXPBGP_cjs.Intent.encodeMessage(intent.message),
           proof: intent.proof
         },
         forfeit_txs: forfeitTxs,
@@ -1031,10 +1031,10 @@ var ESPLORA_URL = {
   testnet: "https://mempool.space/testnet/api",
   signet: "https://mempool.signet.arkade.sh/api",
   mutinynet: "https://mempool.mutinynet.arkade.sh/api",
-  regtest: "http://localhost:3000"
+  regtest: "http://localhost:3000/api"
 };
 var EsploraProvider = class {
-  constructor(baseUrl = ESPLORA_URL[chunkWMIPYZSB_cjs.DEFAULT_NETWORK_NAME], opts) {
+  constructor(baseUrl = ESPLORA_URL[chunkCMPJR3HS_cjs.DEFAULT_NETWORK_NAME], opts) {
     this.baseUrl = baseUrl;
     this.pollingInterval = opts?.pollingInterval ?? 15e3;
     this.forcePolling = opts?.forcePolling ?? false;
@@ -1050,6 +1050,9 @@ var EsploraProvider = class {
   }
   async getFeeRate() {
     const response = await fetch(`${this.baseUrl}/fee-estimates`);
+    if (response.status === 404) {
+      return void 0;
+    }
     if (!response.ok) {
       throw new Error(`Failed to fetch fee rate: ${response.statusText}`);
     }
@@ -1175,7 +1178,7 @@ var EsploraProvider = class {
     return stopFunc;
   }
   async getChainTip() {
-    const tipBlocks = await fetch(`${this.baseUrl}/blocks/tip`);
+    const tipBlocks = await fetch(`${this.baseUrl}/blocks`);
     if (!tipBlocks.ok) {
       throw new Error(`Failed to get chain tip: ${tipBlocks.statusText}`);
     }
@@ -1277,7 +1280,7 @@ function buildForfeitTx(inputs, forfeitPkScript, txLocktime) {
   );
 }
 function buildForfeitTxWithOutput(inputs, output, txLocktime) {
-  const tx = new chunkSPDNHPM4_cjs.Transaction({
+  const tx = new chunkFSAXPBGP_cjs.Transaction({
     version: 3,
     lockTime: txLocktime
   });
@@ -1353,7 +1356,7 @@ function validateVtxoTxGraph(graph, roundTransaction, sweepTapTreeRoot) {
       if (previousScriptKey.length !== 32) {
         throw new Error(`parent output ${childIndex} has invalid script`);
       }
-      const cosigners = chunkSPDNHPM4_cjs.getArkPsbtFields(child.root, 0, chunkSPDNHPM4_cjs.CosignerPublicKey);
+      const cosigners = chunkFSAXPBGP_cjs.getArkPsbtFields(child.root, 0, chunkFSAXPBGP_cjs.CosignerPublicKey);
       if (cosigners.length === 0) {
         throw ErrMissingCosignersPublicKeys;
       }
@@ -1453,7 +1456,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 chunkSPDNHPM4_cjs.BufferReader(payload.slice(ARKADE_MAGIC.length));
+    const reader = new chunkFSAXPBGP_cjs.BufferReader(payload.slice(ARKADE_MAGIC.length));
     const packets = [];
     while (reader.remaining() > 0) {
       const packetType = reader.readByte();
@@ -1527,7 +1530,7 @@ var Extension = class _Extension {
    */
   getAssetPacket() {
     for (const p of this.packets) {
-      if (p instanceof chunkSPDNHPM4_cjs.Packet) {
+      if (p instanceof chunkFSAXPBGP_cjs.Packet) {
         return p;
       }
     }
@@ -1535,8 +1538,8 @@ var Extension = class _Extension {
   }
 };
 function parsePacket(packetType, data) {
-  if (packetType === chunkSPDNHPM4_cjs.Packet.PACKET_TYPE) {
-    return chunkSPDNHPM4_cjs.Packet.fromBytes(data);
+  if (packetType === chunkFSAXPBGP_cjs.Packet.PACKET_TYPE) {
+    return chunkFSAXPBGP_cjs.Packet.fromBytes(data);
   }
   return new UnknownPacket(packetType, data);
 }
@@ -1594,7 +1597,7 @@ function validateBatchRecipients(commitmentTx, vtxoTreeLeaves, recipients, netwo
   for (const recipient of recipients) {
     let arkAddress;
     try {
-      arkAddress = chunkWMIPYZSB_cjs.ArkAddress.decode(recipient.address);
+      arkAddress = chunkCMPJR3HS_cjs.ArkAddress.decode(recipient.address);
     } catch {
       validateOnchainRecipient(commitmentTx, recipient, network, usedOnchainOutputs);
       continue;
@@ -1727,7 +1730,7 @@ function createAssetPacket(assetInputs, receivers, changeReceiver) {
       const existing = inputsByAssetId.get(asset.assetId);
       inputsByAssetId.set(asset.assetId, [
         ...existing ?? [],
-        chunkSPDNHPM4_cjs.AssetInput.create(inputIndex, asset.amount)
+        chunkFSAXPBGP_cjs.AssetInput.create(inputIndex, asset.amount)
       ]);
     }
   }
@@ -1739,7 +1742,7 @@ function createAssetPacket(assetInputs, receivers, changeReceiver) {
         const existing = outputsByAssetId.get(asset.assetId);
         outputsByAssetId.set(asset.assetId, [
           ...existing ?? [],
-          chunkSPDNHPM4_cjs.AssetOutput.create(outputIndex, asset.amount)
+          chunkFSAXPBGP_cjs.AssetOutput.create(outputIndex, asset.amount)
         ]);
       }
     }
@@ -1750,7 +1753,7 @@ function createAssetPacket(assetInputs, receivers, changeReceiver) {
       const existing = outputsByAssetId.get(asset.assetId);
       outputsByAssetId.set(asset.assetId, [
         ...existing ?? [],
-        chunkSPDNHPM4_cjs.AssetOutput.create(outputIndex, asset.amount)
+        chunkFSAXPBGP_cjs.AssetOutput.create(outputIndex, asset.amount)
       ]);
     }
   }
@@ -1759,11 +1762,11 @@ function createAssetPacket(assetInputs, receivers, changeReceiver) {
   for (const assetIdStr of allAssetIds) {
     const inputs = inputsByAssetId.get(assetIdStr);
     const outputs = outputsByAssetId.get(assetIdStr);
-    const assetId = chunkSPDNHPM4_cjs.AssetId.fromString(assetIdStr);
-    const group = chunkSPDNHPM4_cjs.AssetGroup.create(assetId, null, inputs ?? [], outputs ?? [], []);
+    const assetId = chunkFSAXPBGP_cjs.AssetId.fromString(assetIdStr);
+    const group = chunkFSAXPBGP_cjs.AssetGroup.create(assetId, null, inputs ?? [], outputs ?? [], []);
     groups.push(group);
   }
-  return chunkSPDNHPM4_cjs.Packet.create(groups);
+  return chunkFSAXPBGP_cjs.Packet.create(groups);
 }
 function selectCoinsWithAsset(coins, assetId, requiredAmount) {
   const coinsWithAsset = coins.filter((coin) => coin.assets?.some((a) => a.assetId === assetId));
@@ -1829,8 +1832,8 @@ function buildOffchainTx(inputs, outputs, serverUnrollScript) {
 function buildVirtualTx(inputs, outputs) {
   let lockTime = 0n;
   for (const input of inputs) {
-    const tapscript = chunkWMIPYZSB_cjs.decodeTapscript(chunkWMIPYZSB_cjs.scriptFromTapLeafScript(input.tapLeafScript));
-    if (chunkWMIPYZSB_cjs.CLTVMultisigTapscript.is(tapscript)) {
+    const tapscript = chunkCMPJR3HS_cjs.decodeTapscript(chunkCMPJR3HS_cjs.scriptFromTapLeafScript(input.tapLeafScript));
+    if (chunkCMPJR3HS_cjs.CLTVMultisigTapscript.is(tapscript)) {
       if (lockTime !== 0n) {
         if (isSeconds(lockTime) !== isSeconds(tapscript.params.absoluteTimelock)) {
           throw new Error("cannot mix seconds and blocks locktime");
@@ -1841,7 +1844,7 @@ function buildVirtualTx(inputs, outputs) {
       }
     }
   }
-  const tx = new chunkSPDNHPM4_cjs.Transaction({
+  const tx = new chunkFSAXPBGP_cjs.Transaction({
     version: 3,
     lockTime: Number(lockTime)
   });
@@ -1851,12 +1854,12 @@ function buildVirtualTx(inputs, outputs) {
       index: input.vout,
       sequence: lockTime ? btcSigner.DEFAULT_SEQUENCE - 1 : void 0,
       witnessUtxo: {
-        script: chunkWMIPYZSB_cjs.VtxoScript.decode(input.tapTree).pkScript,
+        script: chunkCMPJR3HS_cjs.VtxoScript.decode(input.tapTree).pkScript,
         amount: BigInt(input.value)
       },
       tapLeafScript: [input.tapLeafScript]
     });
-    chunkSPDNHPM4_cjs.setArkPsbtField(tx, i, chunkSPDNHPM4_cjs.VtxoTaprootTree, input.tapTree);
+    chunkFSAXPBGP_cjs.setArkPsbtField(tx, i, chunkFSAXPBGP_cjs.VtxoTaprootTree, input.tapTree);
   }
   for (const output of outputs) {
     tx.addOutput(output);
@@ -1865,8 +1868,8 @@ function buildVirtualTx(inputs, outputs) {
   return tx;
 }
 function buildCheckpointTx(vtxo, serverUnrollScript) {
-  const collaborativeClosure = chunkWMIPYZSB_cjs.decodeTapscript(chunkWMIPYZSB_cjs.scriptFromTapLeafScript(vtxo.tapLeafScript));
-  const checkpointVtxoScript = new chunkWMIPYZSB_cjs.VtxoScript([
+  const collaborativeClosure = chunkCMPJR3HS_cjs.decodeTapscript(chunkCMPJR3HS_cjs.scriptFromTapLeafScript(vtxo.tapLeafScript));
+  const checkpointVtxoScript = new chunkCMPJR3HS_cjs.VtxoScript([
     serverUnrollScript.script,
     collaborativeClosure.script
   ]);
@@ -2010,7 +2013,7 @@ function combineTapscriptSigs(signedTx, originalTx) {
 }
 function isValidArkAddress(address) {
   try {
-    chunkWMIPYZSB_cjs.ArkAddress.decode(address);
+    chunkCMPJR3HS_cjs.ArkAddress.decode(address);
     return true;
   } catch (e) {
     return false;
@@ -2280,16 +2283,16 @@ var FALLBACK_WALLET_DUST_AMOUNT = 330n;
 function getDustAmount(wallet) {
   return "dustAmount" in wallet ? wallet.dustAmount : FALLBACK_WALLET_DUST_AMOUNT;
 }
-function extendCoin(wallet, utxo) {
+function extendCoinWithTapscript(boardingTapscript, utxo) {
   return {
     ...utxo,
-    forfeitTapLeafScript: wallet.boardingTapscript.forfeit(),
-    intentTapLeafScript: wallet.boardingTapscript.forfeit(),
-    tapTree: wallet.boardingTapscript.encode()
+    forfeitTapLeafScript: boardingTapscript.forfeit(),
+    intentTapLeafScript: boardingTapscript.forfeit(),
+    tapTree: boardingTapscript.encode()
   };
 }
 function deriveContractTapscripts(contract) {
-  const handler = chunkGYSK5R57_cjs.contractHandlers.get(contract.type);
+  const handler = chunkGUTKJMSF_cjs.contractHandlers.get(contract.type);
   if (!handler) {
     throw new Error(`No handler for contract type '${contract.type}'`);
   }
@@ -2359,7 +2362,7 @@ function validateRecipients(recipients, dustAmount) {
   for (const recipient of recipients) {
     let address;
     try {
-      address = chunkWMIPYZSB_cjs.ArkAddress.decode(recipient.address);
+      address = chunkCMPJR3HS_cjs.ArkAddress.decode(recipient.address);
     } catch (e) {
       throw new Error(`Invalid Arkade address: ${recipient.address}`);
     }
@@ -2379,12 +2382,12 @@ function validateRecipients(recipients, dustAmount) {
 
 // src/wallet/vtxo-manager.ts
 function isSweepCapable(wallet) {
-  return "boardingTapscript" in wallet && "onchainProvider" in wallet && "arkProvider" in wallet && "network" in wallet;
+  return "boardingTapscript" in wallet && "onchainProvider" in wallet && "arkProvider" in wallet && "network" in wallet && "signOnchainBoardingTx" in wallet;
 }
 function assertSweepCapable(wallet) {
   if (!isSweepCapable(wallet)) {
     throw new Error(
-      "Boarding UTXO sweep requires a Wallet instance with boardingTapscript, onchainProvider, arkProvider, and network"
+      "Boarding UTXO sweep requires a Wallet instance with boardingTapscript, onchainProvider, arkProvider, network, and signOnchainBoardingTx"
     );
   }
 }
@@ -2400,6 +2403,21 @@ async function runWithCrossInstanceLock(name, fn) {
     await fn();
   });
 }
+var MAX_VTXOS_PER_SETTLEMENT = 50;
+function byValueDescending(vtxos) {
+  return [...vtxos].sort((a, b) => b.value - a.value);
+}
+function byExpiryAscending(vtxos) {
+  const expiryKey = (vtxo) => {
+    if (isRecoverable(vtxo)) return -Infinity;
+    const batchExpiry = vtxo.virtualStatus.batchExpiry;
+    if (isExpired(vtxo)) return batchExpiry ?? -Infinity;
+    if (!batchExpiry) return Infinity;
+    if (new Date(batchExpiry).getFullYear() < 2025) return Infinity;
+    return batchExpiry;
+  };
+  return [...vtxos].sort((a, b) => expiryKey(a) - expiryKey(b));
+}
 var DEFAULT_THRESHOLD_SECONDS = 259200;
 var DEFAULT_THRESHOLD_MS = DEFAULT_THRESHOLD_SECONDS * 1e3;
 var DEFAULT_RENEWAL_CONFIG = {
@@ -2559,10 +2577,20 @@ var VtxoManager = class _VtxoManager {
       withUnrolled: false
     });
     const dustAmount = getDustAmount(this.wallet);
-    const { vtxosToRecover, totalAmount } = getRecoverableWithSubdust(allVtxos, dustAmount);
+    let { vtxosToRecover, totalAmount } = getRecoverableWithSubdust(allVtxos, dustAmount);
     if (vtxosToRecover.length === 0) {
       throw new Error("No recoverable VTXOs found");
     }
+    if (vtxosToRecover.length > MAX_VTXOS_PER_SETTLEMENT) {
+      const recoverableCount = vtxosToRecover.length;
+      const capped = byValueDescending(vtxosToRecover).slice(0, MAX_VTXOS_PER_SETTLEMENT);
+      ({ vtxosToRecover, totalAmount } = getRecoverableWithSubdust(capped, dustAmount));
+      if (vtxosToRecover.length === 0) {
+        throw new Error(
+          `Capped recovery batch (highest-value ${MAX_VTXOS_PER_SETTLEMENT} of ${recoverableCount} recoverable VTXOs) is below the dust threshold ${dustAmount}`
+        );
+      }
+    }
     const arkAddress = await this.wallet.getAddress();
     return this.wallet.settle(
       {
@@ -2712,6 +2740,9 @@ var VtxoManager = class _VtxoManager {
       if (vtxos.length === 0) {
         throw new Error("No VTXOs available to renew");
       }
+      if (vtxos.length > MAX_VTXOS_PER_SETTLEMENT) {
+        vtxos = byExpiryAscending(vtxos).slice(0, MAX_VTXOS_PER_SETTLEMENT);
+      }
       const totalAmount = vtxos.reduce((sum, vtxo) => sum + vtxo.value, 0);
       const dustAmount = getDustAmount(this.wallet);
       if (BigInt(totalAmount) < dustAmount) {
@@ -2819,7 +2850,6 @@ var VtxoManager = class _VtxoManager {
     const boardingAddress = await this.wallet.getBoardingAddress();
     const feeRate = await this.getOnchainProvider().getFeeRate() ?? 1;
     const exitTapLeafScript = this.getBoardingExitLeaf();
-    const sequence = chunkWMIPYZSB_cjs.getSequence(exitTapLeafScript);
     const leafScript = exitTapLeafScript[1];
     const leafScriptSize = leafScript.length - 1;
     const controlBlockSize = exitTapLeafScript[0].merklePath.length * 32;
@@ -2838,21 +2868,30 @@ var VtxoManager = class _VtxoManager {
         `Sweep not economical: output ${outputAmount} sats after ${fee} sats fee is below dust (${dustAmount} sats)`
       );
     }
-    const tx = new chunkSPDNHPM4_cjs.Transaction();
+    const tx = new chunkFSAXPBGP_cjs.Transaction();
     for (const utxo of expiredUtxos) {
+      const utxoScript = chunkCMPJR3HS_cjs.VtxoScript.decode(utxo.tapTree);
+      const utxoExitLeaf = utxoScript.leaves.find(
+        (leaf) => chunkCMPJR3HS_cjs.CSVMultisigTapscript.isScriptValid(chunkCMPJR3HS_cjs.scriptFromTapLeafScript(leaf)) === true
+      );
+      if (!utxoExitLeaf) {
+        throw new Error(
+          `Boarding sweep: no CSV exit leaf for UTXO ${utxo.txid}:${utxo.vout}`
+        );
+      }
       tx.addInput({
         txid: utxo.txid,
         index: utxo.vout,
         witnessUtxo: {
-          script: this.getBoardingOutputScript(),
+          script: utxoScript.pkScript,
           amount: BigInt(utxo.value)
         },
-        tapLeafScript: [exitTapLeafScript],
-        sequence
+        tapLeafScript: [utxoExitLeaf],
+        sequence: chunkCMPJR3HS_cjs.getSequence(utxoExitLeaf)
       });
     }
     tx.addOutputAddress(boardingAddress, outputAmount, this.getNetwork());
-    const signedTx = await this.getIdentity().sign(tx);
+    const signedTx = await this.getSweepWallet().signOnchainBoardingTx(tx);
     signedTx.finalize();
     const txid = await this.getOnchainProvider().broadcastTransaction(signedTx.hex);
     for (const u of expiredUtxos) {
@@ -2870,7 +2909,7 @@ var VtxoManager = class _VtxoManager {
   /** Decodes the boarding tapscript exit path to extract the CSV timelock. */
   getBoardingTimelock() {
     const wallet = this.getSweepWallet();
-    const exitScript = chunkWMIPYZSB_cjs.CSVMultisigTapscript.decode(
+    const exitScript = chunkCMPJR3HS_cjs.CSVMultisigTapscript.decode(
       base.hex.decode(wallet.boardingTapscript.exitScript)
     );
     return exitScript.params.timelock;
@@ -2879,10 +2918,6 @@ var VtxoManager = class _VtxoManager {
   getBoardingExitLeaf() {
     return this.getSweepWallet().boardingTapscript.exit();
   }
-  /** Returns the pkScript (output script) of the boarding tapscript. */
-  getBoardingOutputScript() {
-    return this.getSweepWallet().boardingTapscript.pkScript;
-  }
   /** Returns the onchain provider for fee estimation and broadcasting. */
   getOnchainProvider() {
     return this.getSweepWallet().onchainProvider;
@@ -2895,10 +2930,6 @@ var VtxoManager = class _VtxoManager {
   getNetwork() {
     return this.getSweepWallet().network;
   }
-  /** Returns the wallet's identity for transaction signing. */
-  getIdentity() {
-    return this.wallet.identity;
-  }
   async initializeSubscription() {
     if (this.settlementConfig === false) {
       return void 0;
@@ -2999,7 +3030,7 @@ var VtxoManager = class _VtxoManager {
    * or doesn't carry the metadata.
    */
   extractSpentOutpoint(error) {
-    const ark = chunkSPDNHPM4_cjs.maybeArkError(error);
+    const ark = chunkFSAXPBGP_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;
@@ -3179,7 +3210,10 @@ var VtxoManager = class _VtxoManager {
       totalAmount += BigInt(u.value) - BigInt(inputFee.satoshis);
     }
     const filteredVtxos = [];
-    for (const v of expiringVtxos) {
+    for (const v of byExpiryAscending(expiringVtxos)) {
+      if (filteredVtxos.length >= MAX_VTXOS_PER_SETTLEMENT) {
+        break;
+      }
       const inputFee = estimator.evalOffchainInput({
         amount: BigInt(v.value),
         type: v.virtualStatus.state === "swept" ? "recoverable" : "vtxo",
@@ -3199,7 +3233,7 @@ var VtxoManager = class _VtxoManager {
     const arkAddress = await this.wallet.getAddress();
     const outputFee = estimator.evalOffchainOutput({
       amount: totalAmount,
-      script: base.hex.encode(chunkWMIPYZSB_cjs.ArkAddress.decode(arkAddress).pkScript)
+      script: base.hex.encode(chunkCMPJR3HS_cjs.ArkAddress.decode(arkAddress).pkScript)
     });
     totalAmount -= BigInt(outputFee.satoshis);
     if (totalAmount < dustAmount) return;
@@ -3280,7 +3314,7 @@ var ArkNote = class _ArkNote {
     this.value = value;
     this.HRP = HRP;
     const preimageHash = utils_js.sha256(this.preimage);
-    this.vtxoScript = new chunkWMIPYZSB_cjs.VtxoScript([noteTapscript(preimageHash)]);
+    this.vtxoScript = new chunkCMPJR3HS_cjs.VtxoScript([noteTapscript(preimageHash)]);
     const leaf = this.vtxoScript.leaves[0];
     this.txid = base.hex.encode(new Uint8Array(preimageHash).reverse());
     this.tapTree = this.vtxoScript.encode();
@@ -3894,7 +3928,7 @@ var AssetManager = class extends ReadonlyAssetManager {
     const virtualCoins = await this.wallet.getVtxos({
       withRecoverable: false
     });
-    const controlAssetRef = params.controlAssetId ? chunkSPDNHPM4_cjs.AssetRef.fromId(chunkSPDNHPM4_cjs.AssetId.fromString(params.controlAssetId)) : null;
+    const controlAssetRef = params.controlAssetId ? chunkFSAXPBGP_cjs.AssetRef.fromId(chunkFSAXPBGP_cjs.AssetId.fromString(params.controlAssetId)) : null;
     const coinSelection = selectVirtualCoins(virtualCoins, Number(this.wallet.dustAmount));
     let totalBtcSelected = 0n;
     const assetChanges = /* @__PURE__ */ new Map();
@@ -3907,8 +3941,8 @@ var AssetManager = class extends ReadonlyAssetManager {
       }
     }
     const groups = [];
-    const issuedAssetOutput = chunkSPDNHPM4_cjs.AssetOutput.create(0, params.amount);
-    const issuedAssetGroup = chunkSPDNHPM4_cjs.AssetGroup.create(
+    const issuedAssetOutput = chunkFSAXPBGP_cjs.AssetOutput.create(0, params.amount);
+    const issuedAssetGroup = chunkFSAXPBGP_cjs.AssetGroup.create(
       null,
       controlAssetRef,
       [],
@@ -3923,28 +3957,28 @@ var AssetManager = class extends ReadonlyAssetManager {
         for (const [inputIndex, assets] of assetInputs) {
           for (const asset of assets) {
             if (asset.assetId !== assetId) continue;
-            changeInputs.push(chunkSPDNHPM4_cjs.AssetInput.create(inputIndex, asset.amount));
+            changeInputs.push(chunkFSAXPBGP_cjs.AssetInput.create(inputIndex, asset.amount));
           }
         }
         groups.push(
-          chunkSPDNHPM4_cjs.AssetGroup.create(
-            chunkSPDNHPM4_cjs.AssetId.fromString(assetId),
+          chunkFSAXPBGP_cjs.AssetGroup.create(
+            chunkFSAXPBGP_cjs.AssetId.fromString(assetId),
             null,
             changeInputs,
-            [chunkSPDNHPM4_cjs.AssetOutput.create(0, amount)],
+            [chunkFSAXPBGP_cjs.AssetOutput.create(0, amount)],
             []
           )
         );
       }
     }
     const address = await this.wallet.getAddress();
-    const outputAddress = chunkWMIPYZSB_cjs.ArkAddress.decode(address);
+    const outputAddress = chunkCMPJR3HS_cjs.ArkAddress.decode(address);
     const outputs = [
       {
         script: outputAddress.pkScript,
         amount: BigInt(totalBtcSelected)
       },
-      Extension.create([chunkSPDNHPM4_cjs.Packet.create(groups)]).txOut()
+      Extension.create([chunkFSAXPBGP_cjs.Packet.create(groups)]).txOut()
     ];
     const { arkTxid } = await this.wallet.buildAndSubmitOffchainTx(
       coinSelection.inputs,
@@ -3952,7 +3986,7 @@ var AssetManager = class extends ReadonlyAssetManager {
     );
     return {
       arkTxId: arkTxid,
-      assetId: chunkSPDNHPM4_cjs.AssetId.create(arkTxid, 0).toString()
+      assetId: chunkFSAXPBGP_cjs.AssetId.create(arkTxid, 0).toString()
     };
   }
   /**
@@ -4024,16 +4058,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(chunkSPDNHPM4_cjs.AssetInput.create(inputIndex, asset.amount));
+        reissueInputs.push(chunkFSAXPBGP_cjs.AssetInput.create(inputIndex, asset.amount));
       }
     }
     const totalAssetAmount = assetToReissueAmount + params.amount;
-    const reissueAssetIdObj = chunkSPDNHPM4_cjs.AssetId.fromString(params.assetId);
-    const reissueAssetGroup = chunkSPDNHPM4_cjs.AssetGroup.create(
+    const reissueAssetIdObj = chunkFSAXPBGP_cjs.AssetId.fromString(params.assetId);
+    const reissueAssetGroup = chunkFSAXPBGP_cjs.AssetGroup.create(
       reissueAssetIdObj,
       null,
       reissueInputs,
-      [chunkSPDNHPM4_cjs.AssetOutput.create(0, totalAssetAmount)],
+      [chunkFSAXPBGP_cjs.AssetOutput.create(0, totalAssetAmount)],
       []
     );
     const groups = [reissueAssetGroup];
@@ -4042,27 +4076,27 @@ var AssetManager = class extends ReadonlyAssetManager {
       for (const [inputIndex, assets] of assetInputs) {
         for (const asset of assets) {
           if (asset.assetId !== assetId) continue;
-          changeInputs.push(chunkSPDNHPM4_cjs.AssetInput.create(inputIndex, asset.amount));
+          changeInputs.push(chunkFSAXPBGP_cjs.AssetInput.create(inputIndex, asset.amount));
         }
       }
       groups.push(
-        chunkSPDNHPM4_cjs.AssetGroup.create(
-          chunkSPDNHPM4_cjs.AssetId.fromString(assetId),
+        chunkFSAXPBGP_cjs.AssetGroup.create(
+          chunkFSAXPBGP_cjs.AssetId.fromString(assetId),
           null,
           changeInputs,
-          [chunkSPDNHPM4_cjs.AssetOutput.create(0, amount)],
+          [chunkFSAXPBGP_cjs.AssetOutput.create(0, amount)],
           []
         )
       );
     }
     const address = await this.wallet.getAddress();
-    const outputAddress = chunkWMIPYZSB_cjs.ArkAddress.decode(address);
+    const outputAddress = chunkCMPJR3HS_cjs.ArkAddress.decode(address);
     const outputs = [
       {
         script: outputAddress.pkScript,
         amount: BigInt(totalBtcSelected)
       },
-      Extension.create([chunkSPDNHPM4_cjs.Packet.create(groups)]).txOut()
+      Extension.create([chunkFSAXPBGP_cjs.Packet.create(groups)]).txOut()
     ];
     const { arkTxid } = await this.wallet.buildAndSubmitOffchainTx(selectedCoins, outputs);
     return arkTxid;
@@ -4129,27 +4163,27 @@ var AssetManager = class extends ReadonlyAssetManager {
       for (const [inputIndex, assets] of assetInputs) {
         for (const asset of assets) {
           if (asset.assetId !== assetId) continue;
-          changeInputs.push(chunkSPDNHPM4_cjs.AssetInput.create(inputIndex, asset.amount));
+          changeInputs.push(chunkFSAXPBGP_cjs.AssetInput.create(inputIndex, asset.amount));
         }
       }
       groups.push(
-        chunkSPDNHPM4_cjs.AssetGroup.create(
-          chunkSPDNHPM4_cjs.AssetId.fromString(assetId),
+        chunkFSAXPBGP_cjs.AssetGroup.create(
+          chunkFSAXPBGP_cjs.AssetId.fromString(assetId),
           null,
           changeInputs,
-          amount > 0n ? [chunkSPDNHPM4_cjs.AssetOutput.create(0, amount)] : [],
+          amount > 0n ? [chunkFSAXPBGP_cjs.AssetOutput.create(0, amount)] : [],
           []
         )
       );
     }
     const address = await this.wallet.getAddress();
-    const outputAddress = chunkWMIPYZSB_cjs.ArkAddress.decode(address);
+    const outputAddress = chunkCMPJR3HS_cjs.ArkAddress.decode(address);
     const outputs = [
       {
         script: outputAddress.pkScript,
         amount: BigInt(totalBtcSelected)
       },
-      Extension.create([chunkSPDNHPM4_cjs.Packet.create(groups)]).txOut()
+      Extension.create([chunkFSAXPBGP_cjs.Packet.create(groups)]).txOut()
     ];
     const { arkTxid } = await this.wallet.buildAndSubmitOffchainTx(selectedCoins, outputs);
     return arkTxid;
@@ -4174,7 +4208,7 @@ function castMetadata(metadata) {
     } else {
       throw new Error("Invalid metadata value type");
     }
-    md.push(chunkSPDNHPM4_cjs.Metadata.create(textEncoder.encode(key), valueBytes));
+    md.push(chunkFSAXPBGP_cjs.Metadata.create(textEncoder.encode(key), valueBytes));
   }
   return md;
 }
@@ -4192,7 +4226,7 @@ var DelegateManagerImpl = class {
     if (vtxos.length === 0) {
       return { delegated: [], failed: [] };
     }
-    const destinationScript = chunkWMIPYZSB_cjs.ArkAddress.decode(destination).pkScript;
+    const destinationScript = chunkCMPJR3HS_cjs.ArkAddress.decode(destination).pkScript;
     const arkInfo = await this.arkInfoProvider.getInfo();
     const delegateInfo = await this.delegateProvider.getDelegateInfo();
     const eligible = vtxos.filter(
@@ -4340,7 +4374,7 @@ async function delegate(identity, delegateProvider, arkInfo, delegateInfo, vtxos
   const delegateFee = BigInt(Number(fee));
   if (delegateFee > 0n) {
     outputs.push({
-      script: chunkWMIPYZSB_cjs.ArkAddress.decode(delegateAddress).pkScript,
+      script: chunkCMPJR3HS_cjs.ArkAddress.decode(delegateAddress).pkScript,
       amount: delegateFee
     });
   }
@@ -4373,7 +4407,7 @@ async function delegate(identity, delegateProvider, arkInfo, delegateInfo, vtxos
     destinationScript
   );
   const forfeitOutputScript = btcSigner.OutScript.encode(
-    btcSigner.Address(chunkWMIPYZSB_cjs.getNetwork(network)).decode(forfeitAddress)
+    btcSigner.Address(chunkCMPJR3HS_cjs.getNetwork(network)).decode(forfeitAddress)
   );
   const forfeits = await Promise.all(
     vtxos.filter((v) => !isRecoverable(v)).map(async (coin) => {
@@ -4401,7 +4435,7 @@ async function makeDelegateForfeitTx(input, connectorAmount, delegatePubkey, for
         index: input.vout,
         witnessUtxo: {
           amount: BigInt(input.value),
-          script: chunkWMIPYZSB_cjs.VtxoScript.decode(input.tapTree).pkScript
+          script: chunkCMPJR3HS_cjs.VtxoScript.decode(input.tapTree).pkScript
         },
         sighashType: btcSigner.SigHash.ALL_ANYONECANPAY,
         tapLeafScript: [delegateTapLeaf]
@@ -4459,7 +4493,7 @@ async function makeSignedDelegateIntent(identity, coins, outputs, onchainOutputs
     expire_at: 0,
     cosigners_public_keys: cosignerPubKeys
   };
-  const proof = chunkSPDNHPM4_cjs.Intent.create(message, coins, outputs);
+  const proof = chunkFSAXPBGP_cjs.Intent.create(message, coins, outputs);
   const signedProof = await identity.sign(proof);
   return {
     proof: base.base64.encode(signedProof.toPSBT()),
@@ -4477,10 +4511,10 @@ function getDayTimestamp(timestamp) {
 function findDelegateTapLeaf(vtxo, delegatePubkey) {
   if (!vtxo.tapTree) return void 0;
   const pk = delegatePubkey.length === 66 ? delegatePubkey.slice(2) : delegatePubkey;
-  const vtxoScript = chunkWMIPYZSB_cjs.VtxoScript.decode(vtxo.tapTree);
+  const vtxoScript = chunkCMPJR3HS_cjs.VtxoScript.decode(vtxo.tapTree);
   return vtxoScript.leaves.find((tapLeaf) => {
-    const arkTapscript = chunkWMIPYZSB_cjs.decodeTapscript(chunkWMIPYZSB_cjs.scriptFromTapLeafScript(tapLeaf));
-    if (!chunkWMIPYZSB_cjs.MultisigTapscript.is(arkTapscript)) return false;
+    const arkTapscript = chunkCMPJR3HS_cjs.decodeTapscript(chunkCMPJR3HS_cjs.scriptFromTapLeafScript(tapLeaf));
+    if (!chunkCMPJR3HS_cjs.MultisigTapscript.is(arkTapscript)) return false;
     return arkTapscript.params.pubkeys.map(base.hex.encode).includes(pk);
   });
 }
@@ -4684,7 +4718,7 @@ var InMemoryContractRepository = class {
   }
 };
 function scriptFromArkAddress(address) {
-  return base.hex.encode(chunkWMIPYZSB_cjs.ArkAddress.decode(address).pkScript);
+  return base.hex.encode(chunkCMPJR3HS_cjs.ArkAddress.decode(address).pkScript);
 }
 
 // src/repositories/indexedDB/schema.ts
@@ -6199,7 +6233,7 @@ var ContractWatcher = class {
       this.connectionState = "connected";
       this.reconnectAttempts = 0;
       this.listenLoop().catch((e) => {
-        if (chunkSPDNHPM4_cjs.isEventSourceError(e)) {
+        if (chunkFSAXPBGP_cjs.isEventSourceError(e)) {
           console.debug("ContractWatcher subscription disconnected; reconnecting");
         } else {
           console.error(e);
@@ -6537,8 +6571,11 @@ function cursorCutoff(requestStartedAt) {
 }
 
 // src/contracts/contractManager.ts
-var DEFAULT_PAGE_SIZE = 500;
+function areCoalescibleContractTypes(a, b) {
+  return a === "default" && b === "boarding" || a === "boarding" && b === "default";
+}
 var SCAN_MAX_INDEX = 1e4;
+var DEFAULT_SCAN_BATCH = 10;
 var ContractManager = class _ContractManager {
   config;
   watcher;
@@ -6639,7 +6676,7 @@ var ContractManager = class _ContractManager {
    * `persisted` is `true`.
    */
   async upsertContract(params) {
-    const handler = chunkGYSK5R57_cjs.contractHandlers.get(params.type);
+    const handler = chunkGUTKJMSF_cjs.contractHandlers.get(params.type);
     if (!handler) {
       throw new Error(`No handler registered for contract type '${params.type}'`);
     }
@@ -6662,8 +6699,11 @@ var ContractManager = class _ContractManager {
     const [existing] = await this.getContracts({ script: params.script });
     if (existing) {
       if (existing.type === params.type) return { contract: existing, persisted: false };
+      if (areCoalescibleContractTypes(existing.type, params.type)) {
+        return { contract: existing, persisted: false };
+      }
       throw new Error(
-        `Contract with script ${params.script} already exists with with type ${existing.type}.`
+        `Contract with script ${params.script} already exists with type ${existing.type}.`
       );
     }
     const contract = {
@@ -6692,6 +6732,19 @@ var ContractManager = class _ContractManager {
    *   other handler hit it).
    * - `persistAndWatchContract` rejecting is operational/fatal and
    *   propagates (only `discoverAt` is guarded).
+   * - Within an index the handler probes run concurrently (independent
+   *   network reads); their hits are persisted sequentially in
+   *   `discoverables` order to preserve the first-wins collision tie-break.
+   * - Indices are probed `batchSize` at a time (a second concurrency layer
+   *   over the per-index probes), but each window is CAPPED to
+   *   `gapLimit - unused` indices — the most a serial scan could still reach
+   *   before the gap window is guaranteed to close. So every index probed in
+   *   a window is one a one-index-at-a-time scan would also reach: nothing is
+   *   over-scanned, nothing is discarded, and `materialize`/`discoverAt` are
+   *   invoked on exactly the same index set. The window's hits are still
+   *   processed strictly in ascending index order, so the discovered set,
+   *   persisted rows, `lastIndexUsed`, and `handlerErrors` are byte-for-byte
+   *   identical to the serial path — only the wall-clock differs.
    */
   async scanContracts(opts) {
     const gapLimit = opts.gapLimit ?? 20;
@@ -6700,35 +6753,69 @@ var ContractManager = class _ContractManager {
         `scanContracts: gapLimit must be a positive integer (got ${String(opts.gapLimit)})`
       );
     }
-    const discoverables = chunkGYSK5R57_cjs.contractHandlers.getRegisteredTypes().map((t) => chunkGYSK5R57_cjs.contractHandlers.get(t)).filter(isDiscoverable);
+    const batchSize = opts.batchSize ?? DEFAULT_SCAN_BATCH;
+    if (!Number.isInteger(batchSize) || batchSize <= 0) {
+      throw new Error(
+        `scanContracts: batchSize must be a positive integer (got ${String(opts.batchSize)})`
+      );
+    }
+    const registered = chunkGUTKJMSF_cjs.contractHandlers.getRegisteredTypes().map((t) => chunkGUTKJMSF_cjs.contractHandlers.get(t)).filter(isDiscoverable);
+    const discoverables = [
+      ...registered.filter((h) => h.type === "boarding"),
+      ...registered.filter((h) => h.type !== "boarding")
+    ];
     const maxIdx = opts.hd ? SCAN_MAX_INDEX : 0;
     const handlerErrors = [];
     let lastIndexUsed = -1;
     let unused = 0;
     let i = 0;
+    const probeIndex = async (index) => {
+      const descriptor = opts.materialize(index);
+      return Promise.all(
+        discoverables.map(async (h) => {
+          try {
+            return {
+              ok: true,
+              found: await h.discoverAt(index, descriptor, opts.deps)
+            };
+          } catch (error) {
+            return { ok: false, error };
+          }
+        })
+      );
+    };
     while (i <= maxIdx && unused < gapLimit) {
-      const descriptor = opts.materialize(i);
-      let hitAtThisIndex = false;
-      for (const h of discoverables) {
-        let found;
-        try {
-          found = await h.discoverAt(i, descriptor, opts.deps);
-        } catch (error) {
-          handlerErrors.push({ handler: h.type, index: i, error });
-          continue;
+      const windowEnd = Math.min(maxIdx, i + Math.min(batchSize, gapLimit - unused) - 1);
+      const windowIndices = [];
+      for (let idx = i; idx <= windowEnd; idx++) windowIndices.push(idx);
+      const windowProbes = await Promise.all(windowIndices.map(probeIndex));
+      for (let w = 0; w < windowIndices.length; w++) {
+        const index = windowIndices[w];
+        const probes = windowProbes[w];
+        let hitAtThisIndex = false;
+        for (let h = 0; h < discoverables.length; h++) {
+          const probe = probes[h];
+          if (!probe.ok) {
+            handlerErrors.push({
+              handler: discoverables[h].type,
+              index,
+              error: probe.error
+            });
+            continue;
+          }
+          for (const c of probe.found) {
+            await this.persistAndWatchContract(c);
+            hitAtThisIndex = true;
+          }
         }
-        for (const c of found) {
-          await this.persistAndWatchContract(c);
-          hitAtThisIndex = true;
+        if (hitAtThisIndex) {
+          lastIndexUsed = index;
+          unused = 0;
+        } else {
+          unused += 1;
         }
       }
-      if (hitAtThisIndex) {
-        lastIndexUsed = i;
-        unused = 0;
-      } else {
-        unused += 1;
-      }
-      i += 1;
+      i = windowEnd + 1;
     }
     if (opts.hd && i > maxIdx && unused < gapLimit) {
       throw new Error(
@@ -6856,7 +6943,7 @@ var ContractManager = class _ContractManager {
     const { contractScript, collaborative = true, walletPubKey, vtxo } = options;
     const [contract] = await this.getContracts({ script: contractScript });
     if (!contract) return [];
-    const handler = chunkGYSK5R57_cjs.contractHandlers.get(contract.type);
+    const handler = chunkGUTKJMSF_cjs.contractHandlers.get(contract.type);
     if (!handler) return [];
     const script = handler.createScript(contract.params);
     const context = {
@@ -6876,7 +6963,7 @@ var ContractManager = class _ContractManager {
     const { contractScript, collaborative = true, walletPubKey } = options;
     const [contract] = await this.getContracts({ script: contractScript });
     if (!contract) return [];
-    const handler = chunkGYSK5R57_cjs.contractHandlers.get(contract.type);
+    const handler = chunkGUTKJMSF_cjs.contractHandlers.get(contract.type);
     if (!handler) return [];
     const script = handler.createScript(contract.params);
     const context = {
@@ -7110,7 +7197,7 @@ var ContractManager = class _ContractManager {
     }
     return result;
   }
-  async fetchContractVtxosBulk(contracts, pageSize = DEFAULT_PAGE_SIZE, syncWindow) {
+  async fetchContractVtxosBulk(contracts, pageSize = chunkGUTKJMSF_cjs.DEFAULT_PAGE_SIZE, syncWindow) {
     if (contracts.length === 0) {
       return /* @__PURE__ */ new Map();
     }
@@ -7286,7 +7373,7 @@ var HDDescriptorProvider = class _HDDescriptorProvider {
    */
   materializeDescriptorAt(index) {
     const descriptor = this.identity.descriptor;
-    const network = chunkGYSK5R57_cjs.isMainnetDescriptor(descriptor) ? descriptorsScure.networks.bitcoin : descriptorsScure.networks.testnet;
+    const network = chunkGUTKJMSF_cjs.isMainnetDescriptor(descriptor) ? descriptorsScure.networks.bitcoin : descriptorsScure.networks.testnet;
     const expansion = descriptorsScure.expand({ descriptor, network, index });
     const keyInfo = expansion.expansionMap?.["@0"];
     if (!keyInfo?.keyExpression) {
@@ -7429,12 +7516,13 @@ 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 chunkGYSK5R57_cjs.DelegateVtxo.Script ? "delegate" : "default";
+    const expectedContractType = setup.offchainTapscript instanceof chunkGUTKJMSF_cjs.DelegateVtxo.Script ? "delegate" : "default";
     const factoryOpts = {
       walletRepository: setup.walletRepository,
       contractRepository: setup.contractRepository,
       serverPubKey: setup.serverPubKey,
-      expectedContractType
+      expectedContractType,
+      baselineReceivePubKey: setup.offchainTapscript.options.pubKey
     };
     let boot;
     try {
@@ -7479,14 +7567,17 @@ var WalletReceiveRotator = class _WalletReceiveRotator {
         receivePubkey: existing.pubKey
       };
     }
-    let descriptor;
-    if (hasPeekableDescriptor(provider)) {
-      descriptor = await provider.getCurrentSigningDescriptor();
+    const current = hasPeekableDescriptor(provider) ? await provider.getCurrentSigningDescriptor() : void 0;
+    if (current === void 0) {
+      const descriptor = await provider.getNextSigningDescriptor();
+      return {
+        rotator: new _WalletReceiveRotator(provider, void 0, opts.logger),
+        receivePubkey: deriveLeafPubkey(descriptor)
+      };
     }
-    descriptor ??= await provider.getNextSigningDescriptor();
     return {
       rotator: new _WalletReceiveRotator(provider, void 0, opts.logger),
-      receivePubkey: deriveLeafPubkey(descriptor)
+      receivePubkey: opts.baselineReceivePubKey ?? deriveLeafPubkey(current)
     };
   }
   /**
@@ -7592,7 +7683,7 @@ var WalletReceiveRotator = class _WalletReceiveRotator {
     const newAddress = newTapscript.address(wallet.network.hrp, wallet.arkServerPublicKey).encode();
     const manager = await wallet.getContractManager();
     const csvTimelock = newTapscript.options.csvTimelock;
-    const csvTimelockStr = chunkWMIPYZSB_cjs.timelockToSequence(csvTimelock).toString();
+    const csvTimelockStr = chunkCMPJR3HS_cjs.timelockToSequence(csvTimelock).toString();
     const serverPubKeyHex = base.hex.encode(newTapscript.options.serverPubKey);
     const baseParams = {
       script: newScript,
@@ -7606,11 +7697,11 @@ var WalletReceiveRotator = class _WalletReceiveRotator {
       // produce unsigned PSBTs that the server rejects with
       // `INVALID_PSBT_INPUT (5): missing tapscript spend sig`.
       metadata: {
-        source: chunkGYSK5R57_cjs.WALLET_RECEIVE_SOURCE,
+        source: chunkGUTKJMSF_cjs.WALLET_RECEIVE_SOURCE,
         signingDescriptor: descriptor
       }
     };
-    if (newTapscript instanceof chunkGYSK5R57_cjs.DelegateVtxo.Script) {
+    if (newTapscript instanceof chunkGUTKJMSF_cjs.DelegateVtxo.Script) {
       await manager.createContract({
         ...baseParams,
         type: "delegate",
@@ -7642,7 +7733,7 @@ var WalletReceiveRotator = class _WalletReceiveRotator {
 };
 function deriveLeafPubkey(descriptor) {
   try {
-    return chunkGYSK5R57_cjs.deriveDescriptorLeafPubKey(descriptor);
+    return chunkGUTKJMSF_cjs.deriveDescriptorLeafPubKey(descriptor);
   } catch (e) {
     throw new NonRangeableDescriptorError(
       "Cannot derive leaf pubkey: descriptor is not a materialized, parsable tr(...) shape.",
@@ -7651,10 +7742,10 @@ function deriveLeafPubkey(descriptor) {
   }
 }
 function rebuildTapscript(current, pubKey) {
-  if (current instanceof chunkGYSK5R57_cjs.DelegateVtxo.Script) {
-    return new chunkGYSK5R57_cjs.DelegateVtxo.Script({ ...current.options, pubKey });
+  if (current instanceof chunkGUTKJMSF_cjs.DelegateVtxo.Script) {
+    return new chunkGUTKJMSF_cjs.DelegateVtxo.Script({ ...current.options, pubKey });
   }
-  return new chunkGYSK5R57_cjs.DefaultVtxo.Script({ ...current.options, pubKey });
+  return new chunkGUTKJMSF_cjs.DefaultVtxo.Script({ ...current.options, pubKey });
 }
 async function pickActiveReceive(contractRepository, serverPubKey, expectedType) {
   const candidates = await contractRepository.getContracts({
@@ -7663,7 +7754,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 === chunkGYSK5R57_cjs.WALLET_RECEIVE_SOURCE
+    (c) => c.params.serverPubKey === serverPubKeyHex && c.metadata?.source === chunkGUTKJMSF_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);
@@ -7719,7 +7810,7 @@ var DescriptorSigningProviderMissingError = class extends Error {
 };
 
 // src/wallet/inputSignerRouter.ts
-var DESCRIPTOR_CAPABLE_CONTRACT_TYPES = /* @__PURE__ */ new Set(["default", "delegate"]);
+var DESCRIPTOR_CAPABLE_CONTRACT_TYPES = /* @__PURE__ */ new Set(["default", "delegate", "boarding"]);
 var InputSignerRouter = class {
   constructor(deps) {
     this.deps = deps;
@@ -7837,12 +7928,12 @@ var InputSignerRouter = class {
 };
 
 // src/wallet/wallet.ts
-var getArkadeServerUrl = ({ arkServerUrl }) => arkServerUrl || chunkWMIPYZSB_cjs.DEFAULT_ARKADE_SERVER_URL;
+var getArkadeServerUrl = ({ arkServerUrl }) => arkServerUrl || chunkCMPJR3HS_cjs.DEFAULT_ARKADE_SERVER_URL;
 function intentProofJobs(coins) {
   if (coins.length === 0) return [];
   const coinJobs = coins.map((coin, i) => ({
     index: i + 1,
-    lookupScript: chunkWMIPYZSB_cjs.VtxoScript.decode(coin.tapTree).pkScript
+    lookupScript: chunkCMPJR3HS_cjs.VtxoScript.decode(coin.tapTree).pkScript
   }));
   return [{ index: 0, lookupScript: coinJobs[0].lookupScript }, ...coinJobs];
 }
@@ -7851,6 +7942,11 @@ function extractArkProviderUrl(provider) {
   return typeof serverUrl === "string" && serverUrl.length > 0 ? serverUrl : void 0;
 }
 var MAINNET_UNILATERAL_EXIT_DELAY = 605184n;
+function toXOnlyPubKey(pubkey) {
+  if (pubkey.length === 33) return pubkey.slice(1);
+  if (pubkey.length === 32) return pubkey;
+  throw new Error(`invalid signer pubkey length: expected 32 or 33, got ${pubkey.length}`);
+}
 function delayToTimelock(delay) {
   return {
     value: delay,
@@ -7861,27 +7957,37 @@ function dedupeTimelocks(timelocks) {
   const seen = /* @__PURE__ */ new Set();
   const deduped = [];
   for (const timelock of timelocks) {
-    const sequence = chunkWMIPYZSB_cjs.timelockToSequence(timelock).toString();
+    const sequence = chunkCMPJR3HS_cjs.timelockToSequence(timelock).toString();
     if (seen.has(sequence)) continue;
     seen.add(sequence);
     deduped.push(timelock);
   }
   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);
 }
+async function resolveBoardingBootTapscript(contractRepository, serverPubKey, baseline) {
+  const serverPubKeyHex = base.hex.encode(serverPubKey);
+  const candidates = await contractRepository.getContracts({
+    type: ["boarding"],
+    state: "active"
+  });
+  const newest = candidates.filter(
+    (c) => c.params.serverPubKey === serverPubKeyHex && c.metadata?.source === chunkGUTKJMSF_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);
+  })[0];
+  if (!newest?.params.pubKey) return baseline;
+  try {
+    const pubKey = base.hex.decode(newest.params.pubKey);
+    return new chunkGUTKJMSF_cjs.DefaultVtxo.Script({ ...baseline.options, pubKey });
+  } catch (e) {
+    console.warn("Skipping malformed boarding contract at boot", newest.script, e);
+    return baseline;
+  }
+}
 function hasToReadonly(identity) {
   return typeof identity === "object" && identity !== null && "toReadonly" in identity && typeof identity.toReadonly === "function";
 }
@@ -7892,7 +7998,6 @@ var ReadonlyWallet = class _ReadonlyWallet {
     this.onchainProvider = onchainProvider;
     this.indexerProvider = indexerProvider;
     this.arkServerPublicKey = arkServerPublicKey;
-    this.boardingTapscript = boardingTapscript;
     this.dustAmount = dustAmount;
     this.walletRepository = walletRepository;
     this.contractRepository = contractRepository;
@@ -7908,6 +8013,7 @@ var ReadonlyWallet = class _ReadonlyWallet {
       }
     }
     this._offchainTapscript = offchainTapscript;
+    this._boardingTapscript = boardingTapscript;
     this.watcherConfig = watcherConfig;
     this._assetManager = new ReadonlyAssetManager(this.indexerProvider);
     this.walletContractTimelocks = walletContractTimelocks && walletContractTimelocks.length > 0 ? dedupeTimelocks(walletContractTimelocks) : [this.offchainTapscript.options.csvTimelock];
@@ -7934,6 +8040,17 @@ var ReadonlyWallet = class _ReadonlyWallet {
    * {@link WalletReceiveRotator.rotate} is the sole intended caller of.
    */
   _offchainTapscript;
+  /**
+   * Backing field for the current boarding tapscript (the QR / onboarding
+   * target). Read via the public `boardingTapscript` getter; written only
+   * by {@link Wallet.setBoardingTapscriptForRotation}, the sanctioned
+   * boarding-rotation write path (analogue of `_offchainTapscript`). It is
+   * a *current value*, not a fixed setup constant, because per-derivation
+   * boarding rotation (plan §6-II) swaps it when a fresh boarding address
+   * is explicitly allocated. Static / `auto` wallets never rotate it, so
+   * it stays the index-0 baseline for their lifetime.
+   */
+  _boardingTapscript;
   /**
    * Currently-active receive tapscript. Read-only from the outside;
    * mutated only via {@link Wallet.setOffchainTapscriptForRotation}
@@ -7942,13 +8059,59 @@ var ReadonlyWallet = class _ReadonlyWallet {
   get offchainTapscript() {
     return this._offchainTapscript;
   }
+  /**
+   * The wallet's current boarding tapscript (the on-chain onboarding
+   * target). Read-only from the outside; mutated only via
+   * {@link Wallet.setBoardingTapscriptForRotation} when a fresh boarding
+   * address is explicitly allocated. Single-valued for static / `auto`
+   * wallets.
+   */
+  get boardingTapscript() {
+    return this._boardingTapscript;
+  }
+  /**
+   * Listeners fired after the boarding tapscript rotates to a fresh index
+   * (see {@link Wallet.setBoardingTapscriptForRotation}). A live
+   * {@link notifyIncomingFunds} onchain watcher registers one so it can
+   * re-subscribe to include the newly allocated boarding address within the
+   * same session — without it, a deposit to the fresh address wouldn't fire
+   * a notification until the watcher's next re-init. Always empty for
+   * readonly / static / `auto` wallets, which never rotate boarding.
+   */
+  _boardingRotationListeners = /* @__PURE__ */ new Set();
+  /**
+   * Register a listener invoked synchronously after each boarding rotation.
+   * Returns an unsubscribe function. Protected: only internal subscribers
+   * (the incoming-funds watcher) participate.
+   */
+  onBoardingRotation(listener) {
+    this._boardingRotationListeners.add(listener);
+    return () => {
+      this._boardingRotationListeners.delete(listener);
+    };
+  }
+  /**
+   * Notify boarding-rotation listeners. Called by the boarding-rotation
+   * write path ({@link Wallet.setBoardingTapscriptForRotation}) once the new
+   * tapscript is in place. A throwing listener is isolated so it can neither
+   * break the rotation nor starve sibling listeners.
+   */
+  notifyBoardingRotation() {
+    for (const listener of this._boardingRotationListeners) {
+      try {
+        listener();
+      } catch (e) {
+        console.warn("Boarding-rotation listener failed", e);
+      }
+    }
+  }
   /**
    * Protected helper to set up shared wallet configuration.
    * Extracts common logic used by both ReadonlyWallet.create() and Wallet.create().
    */
   static async setupWalletConfig(config, pubKey) {
     const arkadeServerUrl = getArkadeServerUrl(config);
-    const arkProvider = config.arkProvider || new chunkSPDNHPM4_cjs.RestArkProvider(arkadeServerUrl);
+    const arkProvider = config.arkProvider || new chunkFSAXPBGP_cjs.RestArkProvider(arkadeServerUrl);
     let indexerProvider = config.indexerProvider;
     if (!indexerProvider) {
       let indexerUrl = config.indexerUrl;
@@ -7965,10 +8128,10 @@ var ReadonlyWallet = class _ReadonlyWallet {
           indexerUrl = arkadeServerUrl;
         }
       }
-      indexerProvider = new chunkSPDNHPM4_cjs.RestIndexerProvider(indexerUrl);
+      indexerProvider = new chunkFSAXPBGP_cjs.RestIndexerProvider(indexerUrl);
     }
     const info = await arkProvider.getInfo();
-    const network = chunkWMIPYZSB_cjs.getNetwork(info.network);
+    const network = chunkCMPJR3HS_cjs.getNetwork(info.network);
     if ("descriptor" in config.identity) {
       const descriptor = config.identity.descriptor;
       const identityIsMainnet = !descriptor.includes("tpub");
@@ -8015,11 +8178,11 @@ var ReadonlyWallet = class _ReadonlyWallet {
       serverPubKey,
       csvTimelock: exitTimelock
     };
-    const offchainTapscript = !delegatePubKey ? new chunkGYSK5R57_cjs.DefaultVtxo.Script(offchainOptions) : new chunkGYSK5R57_cjs.DelegateVtxo.Script({ ...offchainOptions, delegatePubKey });
-    const boardingTapscript = chunkGYSK5R57_cjs.BoardingContractHandler.createScript({
+    const offchainTapscript = !delegatePubKey ? new chunkGUTKJMSF_cjs.DefaultVtxo.Script(offchainOptions) : new chunkGUTKJMSF_cjs.DelegateVtxo.Script({ ...offchainOptions, delegatePubKey });
+    const boardingTapscript = chunkGUTKJMSF_cjs.BoardingContractHandler.createScript({
       pubKey: base.hex.encode(pubKey),
       serverPubKey: base.hex.encode(serverPubKey),
-      csvTimelock: chunkWMIPYZSB_cjs.timelockToSequence(boardingTimelock).toString()
+      csvTimelock: chunkCMPJR3HS_cjs.timelockToSequence(boardingTimelock).toString()
     });
     const walletRepository = config.storage?.walletRepository ?? new IndexedDBWalletRepository();
     const contractRepository = config.storage?.contractRepository ?? new IndexedDBContractRepository();
@@ -8182,43 +8345,59 @@ var ReadonlyWallet = class _ReadonlyWallet {
     await clearSyncCursor(this.walletRepository);
   }
   /**
-   * Build a transaction history view for the wallet's boarding address.
+   * The on-chain (P2TR) addresses of every boarding tapscript this wallet
+   * uses — the current address plus any historical rotated boarding
+   * addresses. The aggregating boarding readers (history, notifications) fan
+   * out over this set so deposits at previous boarding addresses are still
+   * surfaced (plan §6-IV); {@link getBoardingAddress} stays single-valued.
+   */
+  async getBoardingAddresses() {
+    const tapscripts = await this.getBoardingTapscripts();
+    return tapscripts.map((t) => t.onchainAddress(this.network));
+  }
+  /**
+   * Build a transaction history view across the wallet's boarding addresses
+   * (current + historical rotated; plan §6-IV.1).
    */
   async getBoardingTxs() {
     const utxos = [];
     const commitmentsToIgnore = /* @__PURE__ */ new Set();
-    const boardingAddress = await this.getBoardingAddress();
-    const txs = await this.onchainProvider.getTransactions(boardingAddress);
+    const tapscripts = await this.getBoardingTapscripts();
     const outspendCache = /* @__PURE__ */ new Map();
-    for (const tx of txs) {
-      for (let i = 0; i < tx.vout.length; i++) {
-        const vout = tx.vout[i];
-        if (vout.scriptpubkey_address === boardingAddress) {
-          let spentStatuses = outspendCache.get(tx.txid);
-          if (!spentStatuses) {
-            spentStatuses = await this.onchainProvider.getTxOutspends(tx.txid);
-            outspendCache.set(tx.txid, spentStatuses);
-          }
-          const spentStatus = spentStatuses[i];
-          if (spentStatus?.spent) {
-            commitmentsToIgnore.add(spentStatus.txid);
+    for (const tapscript of tapscripts) {
+      const boardingAddress = tapscript.onchainAddress(this.network);
+      const scriptHex = base.hex.encode(tapscript.pkScript);
+      const txs = await this.onchainProvider.getTransactions(boardingAddress);
+      for (const tx of txs) {
+        for (let i = 0; i < tx.vout.length; i++) {
+          const vout = tx.vout[i];
+          if (vout.scriptpubkey_address === boardingAddress) {
+            let spentStatuses = outspendCache.get(tx.txid);
+            if (!spentStatuses) {
+              spentStatuses = await this.onchainProvider.getTxOutspends(tx.txid);
+              outspendCache.set(tx.txid, spentStatuses);
+            }
+            const spentStatus = spentStatuses[i];
+            if (spentStatus?.spent) {
+              commitmentsToIgnore.add(spentStatus.txid);
+            }
+            utxos.push({
+              txid: tx.txid,
+              vout: i,
+              value: Number(vout.value),
+              status: {
+                confirmed: tx.status.confirmed,
+                block_time: tx.status.block_time
+              },
+              isUnrolled: true,
+              virtualStatus: {
+                state: spentStatus?.spent ? "spent" : "settled",
+                commitmentTxIds: spentStatus?.spent ? [spentStatus.txid] : void 0
+              },
+              createdAt: tx.status.confirmed ? new Date(tx.status.block_time * 1e3) : /* @__PURE__ */ new Date(0),
+              script: scriptHex
+            });
           }
-          utxos.push({
-            txid: tx.txid,
-            vout: i,
-            value: Number(vout.value),
-            status: {
-              confirmed: tx.status.confirmed,
-              block_time: tx.status.block_time
-            },
-            isUnrolled: true,
-            virtualStatus: {
-              state: spentStatus?.spent ? "spent" : "settled",
-              commitmentTxIds: spentStatus?.spent ? [spentStatus.txid] : void 0
-            },
-            createdAt: tx.status.confirmed ? new Date(tx.status.block_time * 1e3) : /* @__PURE__ */ new Date(0),
-            script: base.hex.encode(this.boardingTapscript.pkScript)
-          });
         }
       }
     }
@@ -8248,48 +8427,130 @@ var ReadonlyWallet = class _ReadonlyWallet {
     };
   }
   /**
-   * Fetch and cache onchain inputs (UTXOs) received at the boarding address.
+   * The set of boarding tapscripts whose on-chain UTXOs belong to this
+   * wallet — the current display tapscript plus every historical boarding
+   * address it has used. Under per-derivation rotation (plan §6-II) a wallet
+   * can hold unspent boarding UTXOs at several addresses at once, so fund
+   * discovery / spending must enumerate them all, not just the current one
+   * (plan §6-III.1). Deduplicated by scriptPubKey.
+   *
+   * Always includes the index-0 baseline (identity x-only key), which covers
+   * the degenerate equal-delay case where the index-0 boarding row is
+   * coalesced onto a `default` row and so isn't a `boarding`-typed contract.
    */
-  async getBoardingUtxos() {
-    const boardingAddress = await this.getBoardingAddress();
-    const boardingUtxos = await this.onchainProvider.getCoins(boardingAddress);
-    const utxos = boardingUtxos.map((utxo) => {
-      return extendCoin(this, utxo);
+  async getBoardingTapscripts() {
+    const byScript = /* @__PURE__ */ new Map();
+    const add = (s) => byScript.set(base.hex.encode(s.pkScript), s);
+    const boardingCsv = this.boardingTapscript.options.csvTimelock ?? chunkGUTKJMSF_cjs.DefaultVtxo.Script.DEFAULT_TIMELOCK;
+    add(
+      new chunkGUTKJMSF_cjs.DefaultVtxo.Script({
+        pubKey: await this.identity.xOnlyPublicKey(),
+        serverPubKey: this.boardingTapscript.options.serverPubKey,
+        csvTimelock: boardingCsv
+      })
+    );
+    add(this.boardingTapscript);
+    const serverPubKeyHex = base.hex.encode(this.boardingTapscript.options.serverPubKey);
+    const boardingContracts = await this.contractRepository.getContracts({
+      type: ["boarding"]
     });
-    await this.walletRepository.saveUtxos(boardingAddress, utxos);
-    return utxos;
+    for (const c of boardingContracts) {
+      if (c.params.serverPubKey !== serverPubKeyHex) continue;
+      try {
+        add(chunkGUTKJMSF_cjs.BoardingContractHandler.createScript(c.params));
+      } catch (e) {
+        console.warn("Skipping malformed boarding contract", c.script, e);
+      }
+    }
+    return [...byScript.values()];
+  }
+  /**
+   * Fetch and cache onchain inputs (UTXOs) received at the wallet's boarding
+   * addresses — the current address plus any historical rotated boarding
+   * addresses that still hold unspent UTXOs (plan §6-III.1). Each UTXO is
+   * annotated with the tapscript of the address it actually sits on, so the
+   * spending path forfeits / exits it with the correct per-index leaves.
+   */
+  async getBoardingUtxos() {
+    const tapscripts = await this.getBoardingTapscripts();
+    const all = [];
+    for (const tapscript of tapscripts) {
+      const address = tapscript.onchainAddress(this.network);
+      const coins = await this.onchainProvider.getCoins(address);
+      const utxos = coins.map((utxo) => extendCoinWithTapscript(tapscript, utxo));
+      await this.walletRepository.saveUtxos(address, utxos);
+      all.push(...utxos);
+    }
+    return all;
   }
   /**
    * Subscribe to onchain and offchain notifications for newly received funds.
    *
+   * The onchain watcher tracks the full boarding-address set (current +
+   * historical rotated). When boarding rotates *after* subscribing — e.g.
+   * rotate-on-board allocates a fresh address via
+   * {@link getNewBoardingAddress} — the watcher automatically re-subscribes
+   * to widen its set, so a deposit to the new address fires a notification
+   * within the same session (no watcher re-init required). The re-subscribe
+   * is driven by {@link onBoardingRotation}; static / `auto` / readonly
+   * wallets never rotate boarding, so it never fires for them.
+   *
    * @param eventCallback - Callback invoked when matching funds are detected
    * @returns A function that stops the subscriptions
    */
   async notifyIncomingFunds(eventCallback) {
     const arkAddress = await this.getAddress();
-    const boardingAddress = await this.getBoardingAddress();
     let onchainStopFunc;
     let indexerStopFunc;
-    if (this.onchainProvider && boardingAddress) {
-      const findVoutOnTx = (tx) => {
-        return tx.vout.findIndex((v) => v.scriptpubkey_address === boardingAddress);
-      };
-      onchainStopFunc = await this.onchainProvider.watchAddresses(
-        [boardingAddress],
-        (txs) => {
-          const coins = txs.filter((tx) => findVoutOnTx(tx) !== -1).map((tx) => {
-            const { txid, status } = tx;
-            const vout = findVoutOnTx(tx);
-            const value = Number(tx.vout[vout].value);
-            return { txid, vout, value, status };
-          });
-          eventCallback({
-            type: "utxo",
-            coins
-          });
+    let boardingRotationStopFunc;
+    let stopped = false;
+    let onchainChain = Promise.resolve();
+    const subscribeOnchain = () => {
+      onchainChain = onchainChain.then(async () => {
+        if (stopped || !this.onchainProvider) return;
+        const boardingAddresses = await this.getBoardingAddresses();
+        if (boardingAddresses.length === 0) return;
+        const boardingAddressSet = new Set(boardingAddresses);
+        const previousStop = onchainStopFunc;
+        const stop = await this.onchainProvider.watchAddresses(
+          boardingAddresses,
+          (txs) => {
+            const coins = txs.flatMap((tx) => {
+              const { txid, status } = tx;
+              const matched = [];
+              tx.vout.forEach((v, vout) => {
+                if (boardingAddressSet.has(v.scriptpubkey_address)) {
+                  matched.push({
+                    txid,
+                    vout,
+                    value: Number(v.value),
+                    status
+                  });
+                }
+              });
+              return matched;
+            });
+            eventCallback({
+              type: "utxo",
+              coins
+            });
+          }
+        );
+        if (stopped) {
+          stop();
+          return;
         }
-      );
-    }
+        onchainStopFunc = stop;
+        previousStop?.();
+      }).catch((e) => {
+        console.warn("Failed to (re)subscribe boarding-funds watcher", e);
+      });
+      return onchainChain;
+    };
+    boardingRotationStopFunc = this.onBoardingRotation(() => {
+      void subscribeOnchain();
+    });
+    await subscribeOnchain();
     if (this.indexerProvider && arkAddress) {
       const cm = await this.getContractManager();
       let annotationQueue = Promise.resolve();
@@ -8318,7 +8579,10 @@ var ReadonlyWallet = class _ReadonlyWallet {
       });
     }
     const stopFunc = () => {
+      stopped = true;
+      boardingRotationStopFunc?.();
       onchainStopFunc?.();
+      onchainStopFunc = void 0;
       indexerStopFunc?.();
     };
     return stopFunc;
@@ -8359,7 +8623,7 @@ var ReadonlyWallet = class _ReadonlyWallet {
     });
     for (const contract of contracts) {
       if (map.has(contract.script)) continue;
-      const handler = chunkGYSK5R57_cjs.contractHandlers.get(contract.type);
+      const handler = chunkGUTKJMSF_cjs.contractHandlers.get(contract.type);
       if (handler) {
         const script = handler.createScript(contract.params);
         map.set(contract.script, script);
@@ -8425,8 +8689,8 @@ 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 chunkGYSK5R57_cjs.DefaultVtxo.Script({
+      const csvTimelockStr = chunkCMPJR3HS_cjs.timelockToSequence(csvTimelock).toString();
+      const defaultScript = new chunkGUTKJMSF_cjs.DefaultVtxo.Script({
         pubKey: baselinePubkey,
         serverPubKey: this.offchainTapscript.options.serverPubKey,
         csvTimelock
@@ -8443,8 +8707,8 @@ var ReadonlyWallet = class _ReadonlyWallet {
         address: defaultScript.address(this.network.hrp, this.arkServerPublicKey).encode(),
         state: "active"
       });
-      if (this.offchainTapscript instanceof chunkGYSK5R57_cjs.DelegateVtxo.Script) {
-        const delegateScript = new chunkGYSK5R57_cjs.DelegateVtxo.Script({
+      if (this.offchainTapscript instanceof chunkGUTKJMSF_cjs.DelegateVtxo.Script) {
+        const delegateScript = new chunkGUTKJMSF_cjs.DelegateVtxo.Script({
           pubKey: baselinePubkey,
           serverPubKey: this.offchainTapscript.options.serverPubKey,
           delegatePubKey: this.offchainTapscript.options.delegatePubKey,
@@ -8465,17 +8729,21 @@ var ReadonlyWallet = class _ReadonlyWallet {
         });
       }
     }
-    const boardingScriptHex = base.hex.encode(this.boardingTapscript.pkScript);
-    const boardingCsvTimelock = this.boardingTapscript.options.csvTimelock ?? chunkGYSK5R57_cjs.DefaultVtxo.Script.DEFAULT_TIMELOCK;
+    const boardingCsvTimelock = this.boardingTapscript.options.csvTimelock ?? chunkGUTKJMSF_cjs.DefaultVtxo.Script.DEFAULT_TIMELOCK;
+    const baselineBoarding = new chunkGUTKJMSF_cjs.DefaultVtxo.Script({
+      pubKey: baselinePubkey,
+      serverPubKey: this.boardingTapscript.options.serverPubKey,
+      csvTimelock: boardingCsvTimelock
+    });
     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()
+        pubKey: base.hex.encode(baselineBoarding.options.pubKey),
+        serverPubKey: base.hex.encode(baselineBoarding.options.serverPubKey),
+        csvTimelock: chunkCMPJR3HS_cjs.timelockToSequence(boardingCsvTimelock).toString()
       },
-      script: boardingScriptHex,
-      address: this.boardingTapscript.address(this.network.hrp, this.arkServerPublicKey).encode(),
+      script: base.hex.encode(baselineBoarding.pkScript),
+      address: baselineBoarding.address(this.network.hrp, this.arkServerPublicKey).encode(),
       state: "active"
     });
     return manager;
@@ -8575,6 +8843,72 @@ var Wallet2 = class _Wallet extends ReadonlyWallet {
   setOffchainTapscriptForRotation(tapscript) {
     this._offchainTapscript = tapscript;
   }
+  /**
+   * @internal Sole write path for `boardingTapscript` after construction.
+   * Called by {@link Wallet.getNewBoardingAddress} once the rotated
+   * boarding contract has been persisted. External code must treat
+   * `boardingTapscript` as read-only.
+   */
+  setBoardingTapscriptForRotation(tapscript) {
+    this._boardingTapscript = tapscript;
+    this.notifyBoardingRotation();
+  }
+  /**
+   * Allocate and return a *fresh* on-chain boarding address, rotating the
+   * wallet's current boarding tapscript to a new HD index.
+   *
+   * This is the explicit boarding allocator — the analogue of dotnet's
+   * `GetNextContract(NextContractPurpose.Boarding)`. Unlike
+   * {@link getBoardingAddress} (a stable read of the current display
+   * address that never burns an index), each call here:
+   *
+   * - allocates the next index from the shared HD stream (so boarding and
+   *   L2 receive interleave on one monotonic index);
+   * - builds the boarding tapscript at that index with the boarding-exit
+   *   CSV;
+   * - persists an `active` `boarding` contract tagged
+   *   {@link WALLET_RECEIVE_SOURCE} (with its `signingDescriptor`) so the
+   *   ContractWatcher monitors it, boot can restore it as the current
+   *   boarding address, and descriptor-aware signing can recover the
+   *   per-index key;
+   * - swaps the wallet's current `boardingTapscript`.
+   *
+   * Gated by `walletMode`: a static / `auto` wallet has no descriptor
+   * provider and keeps a single index-0 boarding address for its lifetime,
+   * so this returns the existing {@link getBoardingAddress} unchanged
+   * (no rotation, no index burned).
+   */
+  async getNewBoardingAddress() {
+    const provider = this._descriptorProvider;
+    if (!provider) {
+      return this.getBoardingAddress();
+    }
+    const descriptor = await provider.getNextSigningDescriptor();
+    const pubKey = chunkGUTKJMSF_cjs.deriveDescriptorLeafPubKey(descriptor);
+    const newBoarding = new chunkGUTKJMSF_cjs.DefaultVtxo.Script({
+      ...this._boardingTapscript.options,
+      pubKey
+    });
+    const csvTimelock = newBoarding.options.csvTimelock ?? chunkGUTKJMSF_cjs.DefaultVtxo.Script.DEFAULT_TIMELOCK;
+    const manager = await this.getContractManager();
+    await manager.createContract({
+      type: "boarding",
+      params: {
+        pubKey: base.hex.encode(pubKey),
+        serverPubKey: base.hex.encode(newBoarding.options.serverPubKey),
+        csvTimelock: chunkCMPJR3HS_cjs.timelockToSequence(csvTimelock).toString()
+      },
+      script: base.hex.encode(newBoarding.pkScript),
+      address: newBoarding.address(this.network.hrp, this.arkServerPublicKey).encode(),
+      state: "active",
+      metadata: {
+        source: chunkGUTKJMSF_cjs.WALLET_RECEIVE_SOURCE,
+        signingDescriptor: descriptor
+      }
+    });
+    this.setBoardingTapscriptForRotation(newBoarding);
+    return newBoarding.onchainAddress(this.network);
+  }
   /**
    * Async mutex that serializes all operations submitting VTXOs to the Arkade
    * server (`settle`, `send`, `sendBitcoin`). This prevents VtxoManager's
@@ -8658,13 +8992,26 @@ 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 chunkGYSK5R57_cjs.DelegateVtxo.Script ? this.offchainTapscript.options.delegatePubKey : void 0;
+    const delegatePubKey = this.offchainTapscript instanceof chunkGUTKJMSF_cjs.DelegateVtxo.Script ? this.offchainTapscript.options.delegatePubKey : void 0;
+    const arkInfo = await this.arkProvider.getInfo();
+    const currentSignerPubKey = toXOnlyPubKey(base.hex.decode(arkInfo.signerPubkey));
+    const deprecatedSignerPubKeys = arkInfo.deprecatedSigners.map(
+      (s) => toXOnlyPubKey(base.hex.decode(s.pubkey))
+    );
     const deps = {
       indexerProvider: this.indexerProvider,
       onchainProvider: this.onchainProvider,
       network: { hrp: this.network.hrp },
-      serverPubKey: this.offchainTapscript.options.serverPubKey,
+      // Full network for the boarding on-chain (P2TR) probe — the
+      // `{ hrp }` shape above lacks the `bech32` data
+      // `VtxoScript.onchainAddress` needs (plan §6-I.1).
+      onchainNetwork: this.network,
+      serverPubKey: currentSignerPubKey,
+      deprecatedSignerPubKeys,
       csvTimelocks: this.walletContractTimelocks,
+      // Boarding-exit CSV so the boarding handler can build its
+      // candidate script (distinct from the unilateral-exit matrix).
+      boardingTimelock: this.boardingTapscript.options.csvTimelock ?? chunkGUTKJMSF_cjs.DefaultVtxo.Script.DEFAULT_TIMELOCK,
       delegatePubKey
     };
     const result = await manager.scanContracts({
@@ -8765,7 +9112,7 @@ var Wallet2 = class _Wallet extends ReadonlyWallet {
     let serverUnrollScript;
     try {
       const raw = base.hex.decode(setup.info.checkpointTapscript);
-      serverUnrollScript = chunkWMIPYZSB_cjs.CSVMultisigTapscript.decode(raw);
+      serverUnrollScript = chunkCMPJR3HS_cjs.CSVMultisigTapscript.decode(raw);
     } catch (e) {
       throw new Error("Invalid checkpointTapscript from server");
     }
@@ -8796,6 +9143,16 @@ var Wallet2 = class _Wallet extends ReadonlyWallet {
       boot?.rotator,
       boot?.provider
     );
+    if (boot?.provider) {
+      const resolvedBoarding = await resolveBoardingBootTapscript(
+        setup.contractRepository,
+        setup.serverPubKey,
+        setup.boardingTapscript
+      );
+      if (resolvedBoarding !== setup.boardingTapscript) {
+        wallet.setBoardingTapscriptForRotation(resolvedBoarding);
+      }
+    }
     await wallet.getVtxoManager();
     return wallet;
   }
@@ -8871,7 +9228,7 @@ var Wallet2 = class _Wallet extends ReadonlyWallet {
           inputs: params.selectedVtxos,
           changeAmount: BigInt(changeAmount)
         };
-        const outputAddress = chunkWMIPYZSB_cjs.ArkAddress.decode(params.address);
+        const outputAddress = chunkCMPJR3HS_cjs.ArkAddress.decode(params.address);
         const outputScript = BigInt(params.amount) < this.dustAmount ? outputAddress.subdustPkScript : outputAddress.pkScript;
         const outputs = [
           {
@@ -8938,7 +9295,7 @@ var Wallet2 = class _Wallet extends ReadonlyWallet {
       const { fees } = await this.arkProvider.getInfo();
       const estimator = new Estimator(fees.intentFee);
       let amount = 0;
-      const exitScript = chunkWMIPYZSB_cjs.CSVMultisigTapscript.decode(
+      const exitScript = chunkCMPJR3HS_cjs.CSVMultisigTapscript.decode(
         base.hex.decode(this.boardingTapscript.exitScript)
       );
       const boardingTimelock = exitScript.params.timelock;
@@ -8963,7 +9320,10 @@ var Wallet2 = class _Wallet extends ReadonlyWallet {
       }
       const vtxos = await this.getVtxos({ withRecoverable: true });
       const filteredVtxos = [];
-      for (const vtxo of vtxos) {
+      for (const vtxo of byValueDescending(vtxos)) {
+        if (filteredVtxos.length >= MAX_VTXOS_PER_SETTLEMENT) {
+          break;
+        }
         const inputFee = estimator.evalOffchainInput({
           amount: BigInt(vtxo.value),
           type: vtxo.virtualStatus.state === "swept" ? "recoverable" : "vtxo",
@@ -8987,7 +9347,7 @@ var Wallet2 = class _Wallet extends ReadonlyWallet {
       };
       const outputFee = estimator.evalOffchainOutput({
         amount: output.amount,
-        script: base.hex.encode(chunkWMIPYZSB_cjs.ArkAddress.decode(output.address).pkScript)
+        script: base.hex.encode(chunkCMPJR3HS_cjs.ArkAddress.decode(output.address).pkScript)
       });
       output.amount -= BigInt(outputFee.satoshis);
       if (output.amount <= this.dustAmount) {
@@ -9004,7 +9364,7 @@ var Wallet2 = class _Wallet extends ReadonlyWallet {
     for (const [index, output] of params.outputs.entries()) {
       let script;
       try {
-        const addr = chunkWMIPYZSB_cjs.ArkAddress.decode(output.address);
+        const addr = chunkCMPJR3HS_cjs.ArkAddress.decode(output.address);
         script = addr.pkScript;
         hasOffchainOutputs = true;
       } catch {
@@ -9027,7 +9387,7 @@ var Wallet2 = class _Wallet extends ReadonlyWallet {
       }
     }
     let outputAssets;
-    const destinationScript = chunkWMIPYZSB_cjs.ArkAddress.decode(await this.getAddress()).pkScript;
+    const destinationScript = chunkCMPJR3HS_cjs.ArkAddress.decode(await this.getAddress()).pkScript;
     const assetOutputIndex = findDestinationOutputIndex(outputs, destinationScript);
     if (assetInputs.size > 0) {
       if (assetOutputIndex === -1) {
@@ -9096,6 +9456,7 @@ var Wallet2 = class _Wallet extends ReadonlyWallet {
         eventCallback: eventCallback ? (event) => Promise.resolve(eventCallback(event)) : void 0
       });
       await this.updateDbAfterSettle(params.inputs, commitmentTxid);
+      await this.maybeRotateBoardingAfterBoard(params.inputs);
       return commitmentTxid;
     } catch (error) {
       const inputIds = params.inputs.map((i) => `${i.txid}:${i.vout}`).join(",");
@@ -9113,6 +9474,41 @@ var Wallet2 = class _Wallet extends ReadonlyWallet {
       });
     }
   }
+  /**
+   * Rotate the boarding address after a board (rotate-on-board trigger).
+   *
+   * Mirrors {@link WalletReceiveRotator}'s L2 rotation, but driven by a
+   * board instead of a `vtxo_received` event: when a settle consumes at
+   * least one boarding (on-chain) UTXO, the current boarding address has
+   * served its purpose, so we allocate a fresh one via
+   * {@link getNewBoardingAddress}. A settle that consumed only VTXOs (a
+   * renewal / offboard) is not a board and leaves the boarding address
+   * untouched.
+   *
+   * Boarding inputs are the non-VTXO coins (no `virtualStatus`), the same
+   * discriminator {@link handleSettlementFinalizationEvent} uses; the
+   * `typeof` guard skips arknote string inputs before the `in` test.
+   *
+   * No-ops for static / `auto` wallets (no descriptor provider — boarding
+   * stays on its fixed index-0 address). Best-effort and non-fatal: the
+   * settle has already committed and its txid must be returned, so a
+   * rotation failure is logged and swallowed rather than thrown. Funds at
+   * the retired boarding address remain discoverable — the old `boarding`
+   * contract stays active and {@link getBoardingUtxos} fans out over the
+   * full historical boarding set.
+   */
+  async maybeRotateBoardingAfterBoard(inputs) {
+    if (!this._descriptorProvider) return;
+    const consumedBoarding = inputs.some(
+      (input) => typeof input !== "string" && !("virtualStatus" in input)
+    );
+    if (!consumedBoarding) return;
+    try {
+      await this.getNewBoardingAddress();
+    } catch (e) {
+      console.warn("Failed to rotate boarding address after board", e);
+    }
+  }
   async handleSettlementFinalizationEvent(event, inputs, forfeitOutputScript, connectorsGraph) {
     const signedForfeits = [];
     const isVtxo = (input) => "virtualStatus" in input;
@@ -9177,7 +9573,7 @@ var Wallet2 = class _Wallet extends ReadonlyWallet {
             index: input.vout,
             witnessUtxo: {
               amount: BigInt(input.value),
-              script: chunkWMIPYZSB_cjs.VtxoScript.decode(input.tapTree).pkScript
+              script: chunkCMPJR3HS_cjs.VtxoScript.decode(input.tapTree).pkScript
             },
             sighashType: btcSigner.SigHash.DEFAULT,
             tapLeafScript: [input.forfeitTapLeafScript]
@@ -9196,7 +9592,7 @@ var Wallet2 = class _Wallet extends ReadonlyWallet {
       forfeitTx = await this._signerRouter.sign(forfeitTx, [
         {
           index: 0,
-          lookupScript: chunkWMIPYZSB_cjs.VtxoScript.decode(input.tapTree).pkScript
+          lookupScript: chunkCMPJR3HS_cjs.VtxoScript.decode(input.tapTree).pkScript
         }
       ]);
       signedForfeits.push(base.base64.encode(forfeitTx.toPSBT()));
@@ -9236,7 +9632,7 @@ var Wallet2 = class _Wallet extends ReadonlyWallet {
         if (skip) {
           return { skip };
         }
-        const sweepTapscript = chunkWMIPYZSB_cjs.CSVMultisigTapscript.encode({
+        const sweepTapscript = chunkCMPJR3HS_cjs.CSVMultisigTapscript.encode({
           timelock: {
             value: event.batchExpiry,
             type: event.batchExpiry >= 512n ? "seconds" : "blocks"
@@ -9323,11 +9719,24 @@ var Wallet2 = class _Wallet extends ReadonlyWallet {
     }
     return jobs;
   }
+  /**
+   * @internal Sign an on-chain boarding exit / sweep transaction, routing
+   * each input to the correct key by its `witnessUtxo.script`: the identity
+   * for index-0 / static boarding, the per-index descriptor for a rotated
+   * boarding UTXO (plan §6-III.3). Used by
+   * {@link VtxoManager.sweepExpiredBoardingUtxos}; without it, the
+   * unilateral exit of a rotated boarding UTXO would be signed with the
+   * wrong (index-0) key and rejected.
+   */
+  async signOnchainBoardingTx(tx) {
+    const signed = await this._signerRouter.sign(tx, this.inputSigningJobsFromWitnessUtxos(tx));
+    return signed;
+  }
   async safeRegisterIntent(intent, inputs) {
     try {
       return await this.arkProvider.registerIntent(intent);
     } catch (error) {
-      if (error instanceof chunkSPDNHPM4_cjs.ArkError && error.code === 0 && error.message.includes("duplicated input")) {
+      if (error instanceof chunkFSAXPBGP_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);
@@ -9343,7 +9752,7 @@ var Wallet2 = class _Wallet extends ReadonlyWallet {
       expire_at: 0,
       cosigners_public_keys: cosignerPubKeys
     };
-    const proof = chunkSPDNHPM4_cjs.Intent.create(message, coins, outputs);
+    const proof = chunkFSAXPBGP_cjs.Intent.create(message, coins, outputs);
     const signedProof = await this._signerRouter.sign(proof, intentProofJobs(coins));
     return {
       proof: base.base64.encode(signedProof.toPSBT()),
@@ -9355,7 +9764,7 @@ var Wallet2 = class _Wallet extends ReadonlyWallet {
       type: "delete",
       expire_at: 0
     };
-    const proof = chunkSPDNHPM4_cjs.Intent.create(message, coins, []);
+    const proof = chunkFSAXPBGP_cjs.Intent.create(message, coins, []);
     const signedProof = await this._signerRouter.sign(proof, intentProofJobs(coins));
     return {
       proof: base.base64.encode(signedProof.toPSBT()),
@@ -9367,7 +9776,7 @@ var Wallet2 = class _Wallet extends ReadonlyWallet {
       type: "get-pending-tx",
       expire_at: 0
     };
-    const proof = chunkSPDNHPM4_cjs.Intent.create(message, coins, []);
+    const proof = chunkFSAXPBGP_cjs.Intent.create(message, coins, []);
     const signedProof = await this._signerRouter.sign(proof, intentProofJobs(coins));
     return {
       proof: base.base64.encode(signedProof.toPSBT()),
@@ -9684,7 +10093,7 @@ var Wallet2 = class _Wallet extends ReadonlyWallet {
     );
     const arkTxJobs = inputs.map((input, index) => ({
       index,
-      lookupScript: chunkWMIPYZSB_cjs.VtxoScript.decode(input.tapTree).pkScript
+      lookupScript: chunkCMPJR3HS_cjs.VtxoScript.decode(input.tapTree).pkScript
     }));
     const checkpointJobs = offchainTx.checkpoints.map(
       (c) => this.inputSigningJobsFromWitnessUtxos(c)
@@ -9889,10 +10298,9 @@ var Wallet2 = class _Wallet extends ReadonlyWallet {
   // mark virtual outputs as spent/settled, remove boarding inputs
   async updateDbAfterSettle(inputs, commitmentTxid) {
     try {
-      const boardingAddress = await this.getBoardingAddress();
       const spentVtxos = [];
       const inputArkTxIds = /* @__PURE__ */ new Set();
-      const boardingUtxoToRemove = /* @__PURE__ */ new Set();
+      const boardingRemovalsByAddress = /* @__PURE__ */ new Map();
       const isVtxo = (input) => "virtualStatus" in input;
       const vtxoInputs = inputs.filter(isVtxo);
       const cm = await this.getContractManager();
@@ -9914,7 +10322,20 @@ var Wallet2 = class _Wallet extends ReadonlyWallet {
             isSpent: true
           });
         } else {
-          boardingUtxoToRemove.add(`${input.txid}:${input.vout}`);
+          let sourceAddress;
+          try {
+            sourceAddress = chunkCMPJR3HS_cjs.VtxoScript.decode(input.tapTree).onchainAddress(
+              this.network
+            );
+          } catch {
+            sourceAddress = this.boardingTapscript.onchainAddress(this.network);
+          }
+          let set = boardingRemovalsByAddress.get(sourceAddress);
+          if (!set) {
+            set = /* @__PURE__ */ new Set();
+            boardingRemovalsByAddress.set(sourceAddress, set);
+          }
+          set.add(`${input.txid}:${input.vout}`);
         }
       }
       if (spentVtxos.length > 0) {
@@ -9946,14 +10367,12 @@ var Wallet2 = class _Wallet extends ReadonlyWallet {
           );
         }
       }
-      if (boardingUtxoToRemove.size > 0) {
-        const currentUtxos = await this.walletRepository.getUtxos(boardingAddress);
-        const filtered = currentUtxos.filter(
-          (u) => !boardingUtxoToRemove.has(`${u.txid}:${u.vout}`)
-        );
-        await this.walletRepository.deleteUtxos(boardingAddress);
+      for (const [address, toRemove] of boardingRemovalsByAddress) {
+        const currentUtxos = await this.walletRepository.getUtxos(address);
+        const filtered = currentUtxos.filter((u) => !toRemove.has(`${u.txid}:${u.vout}`));
+        await this.walletRepository.deleteUtxos(address);
         if (filtered.length > 0) {
-          await this.walletRepository.saveUtxos(boardingAddress, filtered);
+          await this.walletRepository.saveUtxos(address, filtered);
         }
       }
     } catch (e) {
@@ -10161,7 +10580,7 @@ var MessageBus = class {
     this.initialized = true;
   }
   async buildServices(config) {
-    const arkProvider = new chunkSPDNHPM4_cjs.RestArkProvider(config.arkServer.url);
+    const arkProvider = new chunkFSAXPBGP_cjs.RestArkProvider(config.arkServer.url);
     const storage = {
       walletRepository: this.walletRepository,
       contractRepository: this.contractRepository
@@ -10537,7 +10956,7 @@ var Ramps = class {
     }
     amount = amount ?? totalAmount;
     const offchainAddress = await this.wallet.getAddress();
-    const offchainAddr = chunkWMIPYZSB_cjs.ArkAddress.decode(offchainAddress);
+    const offchainAddr = chunkCMPJR3HS_cjs.ArkAddress.decode(offchainAddress);
     const offchainScript = base.hex.encode(offchainAddr.pkScript);
     const outputFee = estimator.evalOffchainOutput({
       amount,
@@ -10635,7 +11054,7 @@ var Ramps = class {
     let destinationScript;
     for (const networkName of networkNames) {
       try {
-        const network = chunkWMIPYZSB_cjs.networks[networkName];
+        const network = chunkCMPJR3HS_cjs.networks[networkName];
         const addr = btcSigner.Address(network).decode(destinationAddress);
         destinationScript = btcSigner.OutScript.encode(addr);
         break;
@@ -11204,7 +11623,7 @@ var WalletMessageHandler = class {
   // Wallet methods
   async handleInitWallet({ payload }) {
     const { arkServerUrl } = payload;
-    this.indexerProvider = new chunkSPDNHPM4_cjs.RestIndexerProvider(arkServerUrl);
+    this.indexerProvider = new chunkFSAXPBGP_cjs.RestIndexerProvider(arkServerUrl);
     await this.onWalletInitialized();
   }
   async handleGetBalance() {
@@ -11353,9 +11772,7 @@ var WalletMessageHandler = class {
           );
         }
         if (funds.type === "utxo") {
-          const utxos = funds.coins.map((utxo) => extendCoin(this.readonlyWallet, utxo));
-          const boardingAddress = await this.readonlyWallet.getBoardingAddress();
-          await this.walletRepository?.saveUtxos(boardingAddress, utxos);
+          const utxos = await this.readonlyWallet.getBoardingUtxos();
           this.scheduleForNextTick(
             () => this.tagged({
               type: "UTXO_UPDATE",
@@ -11384,13 +11801,16 @@ var WalletMessageHandler = class {
       return;
     }
     const vtxos = await this.getVtxosFromRepo();
-    const boardingAddress = await this.readonlyWallet.getBoardingAddress();
-    const coins = await this.readonlyWallet.onchainProvider.getCoins(boardingAddress);
-    await this.walletRepository.deleteUtxos(boardingAddress);
-    await this.walletRepository.saveUtxos(
-      boardingAddress,
-      coins.map((utxo) => extendCoin(this.readonlyWallet, utxo))
-    );
+    const boardingAddresses = await this.readonlyWallet.getBoardingAddresses();
+    const fresh = await this.readonlyWallet.getBoardingUtxos();
+    const freshKeys = new Set(fresh.map((u) => `${u.txid}:${u.vout}`));
+    for (const addr of boardingAddresses) {
+      const cached = await this.walletRepository.getUtxos(addr);
+      const kept = cached.filter((u) => freshKeys.has(`${u.txid}:${u.vout}`));
+      if (kept.length === cached.length) continue;
+      await this.walletRepository.deleteUtxos(addr);
+      if (kept.length > 0) await this.walletRepository.saveUtxos(addr, kept);
+    }
     const address = await this.readonlyWallet.getAddress();
     const txs = await this.buildTransactionHistoryFromCache(vtxos);
     if (txs) await this.walletRepository.saveTransactions(address, txs);
@@ -12837,12 +13257,12 @@ var OnchainWallet = class _OnchainWallet {
    * @returns Configured onchain wallet
    * @throws Error if the configured identity cannot produce a valid x-only public key
    */
-  static async create(identity, networkName = chunkWMIPYZSB_cjs.DEFAULT_NETWORK_NAME, provider) {
+  static async create(identity, networkName = chunkCMPJR3HS_cjs.DEFAULT_NETWORK_NAME, provider) {
     const pubkey = await identity.xOnlyPublicKey();
     if (!pubkey) {
       throw new Error("Invalid configured public key");
     }
-    const network = chunkWMIPYZSB_cjs.getNetwork(networkName);
+    const network = chunkCMPJR3HS_cjs.getNetwork(networkName);
     const onchainProvider = provider || new EsploraProvider(ESPLORA_URL[networkName]);
     const onchainP2TR = btcSigner.p2tr(pubkey, void 0, network);
     return new _OnchainWallet(identity, network, onchainP2TR, onchainProvider);
@@ -12948,7 +13368,7 @@ var OnchainWallet = class _OnchainWallet {
     if (!inputs) {
       throw new Error("Fee estimation failed");
     }
-    let tx = new chunkSPDNHPM4_cjs.Transaction();
+    let tx = new chunkFSAXPBGP_cjs.Transaction();
     for (const input of inputs) {
       tx.addInput({
         txid: input.txid,
@@ -12979,7 +13399,7 @@ var OnchainWallet = class _OnchainWallet {
    */
   async bumpP2A(parent) {
     const parentVsize = parent.vsize;
-    let child = new chunkSPDNHPM4_cjs.Transaction({
+    let child = new chunkFSAXPBGP_cjs.Transaction({
       version: 3,
       allowLegacyWitnessUtxo: true
     });
@@ -13736,7 +14156,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 = chunkSPDNHPM4_cjs.craftToSpendTx(message, payment.script, TAG_BIP322);
+    const toSpend = chunkFSAXPBGP_cjs.craftToSpendTx(message, payment.script, TAG_BIP322);
     const toSign = craftBIP322ToSignP2TR(toSpend, payment.script, xOnlyPubKey);
     const signed = await identity.sign(toSign, [0]);
     signed.finalizeIdx(0);
@@ -13794,7 +14214,7 @@ function verifyP2TR(message, witnessItems, pkScript, pubkey) {
   if (sighashType !== btcSigner.SigHash.DEFAULT && sighashType !== btcSigner.SigHash.ALL) {
     return false;
   }
-  const toSpend = chunkSPDNHPM4_cjs.craftToSpendTx(message, pkScript, TAG_BIP322);
+  const toSpend = chunkFSAXPBGP_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;
@@ -13815,7 +14235,7 @@ function verifyP2WPKH(message, witnessItems, pkScript, addressHash) {
   }
   const sighashType = sigWithHash[sigWithHash.length - 1];
   const derSig = sigWithHash.subarray(0, sigWithHash.length - 1);
-  const toSpend = chunkSPDNHPM4_cjs.craftToSpendTx(message, pkScript, TAG_BIP322);
+  const toSpend = chunkFSAXPBGP_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);
@@ -13868,7 +14288,7 @@ function encodeCompactSize(n) {
   return buf;
 }
 function craftBIP322ToSignP2TR(toSpend, pkScript, tapInternalKey) {
-  const tx = new chunkSPDNHPM4_cjs.Transaction({ version: 0 });
+  const tx = new chunkFSAXPBGP_cjs.Transaction({ version: 0 });
   tx.addInput({
     txid: toSpend.id,
     index: 0,
@@ -13882,12 +14302,12 @@ function craftBIP322ToSignP2TR(toSpend, pkScript, tapInternalKey) {
   });
   tx.addOutput({
     amount: 0n,
-    script: chunkSPDNHPM4_cjs.OP_RETURN_EMPTY_PKSCRIPT
+    script: chunkFSAXPBGP_cjs.OP_RETURN_EMPTY_PKSCRIPT
   });
   return tx;
 }
 function craftBIP322ToSignSimple(toSpend, pkScript) {
-  const tx = new chunkSPDNHPM4_cjs.Transaction({ version: 0 });
+  const tx = new chunkFSAXPBGP_cjs.Transaction({ version: 0 });
   tx.addInput({
     txid: toSpend.id,
     index: 0,
@@ -13899,7 +14319,7 @@ function craftBIP322ToSignSimple(toSpend, pkScript) {
   });
   tx.addOutput({
     amount: 0n,
-    script: chunkSPDNHPM4_cjs.OP_RETURN_EMPTY_PKSCRIPT
+    script: chunkFSAXPBGP_cjs.OP_RETURN_EMPTY_PKSCRIPT
   });
   return tx;
 }
@@ -13960,7 +14380,7 @@ exports.Unroll = void 0;
       if (virtualTxs.txs.length === 0) {
         throw new Error(`Tx ${nextTxToBroadcast.txid} not found`);
       }
-      const tx = chunkSPDNHPM4_cjs.Transaction.fromPSBT(base.base64.decode(virtualTxs.txs[0]));
+      const tx = chunkFSAXPBGP_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) {
@@ -14037,12 +14457,12 @@ async function prepareUnrollTransaction(wallet, vtxoTxIds, outputAddress) {
     if (!exit) {
       throw new Error(`no available exit path found for vtxo ${vtxo.txid}:${vtxo.vout}`);
     }
-    const spendingLeaf = chunkWMIPYZSB_cjs.VtxoScript.decode(vtxo.tapTree).findLeaf(base.hex.encode(exit.script));
+    const spendingLeaf = chunkCMPJR3HS_cjs.VtxoScript.decode(vtxo.tapTree).findLeaf(base.hex.encode(exit.script));
     if (!spendingLeaf) {
       throw new Error(`spending leaf not found for vtxo ${vtxo.txid}:${vtxo.vout}`);
     }
     totalAmount += BigInt(vtxo.value);
-    const sequence = chunkWMIPYZSB_cjs.timelockToSequence(exit.params.timelock);
+    const sequence = chunkCMPJR3HS_cjs.timelockToSequence(exit.params.timelock);
     inputs.push({
       txid: vtxo.txid,
       index: vtxo.vout,
@@ -14050,7 +14470,7 @@ async function prepareUnrollTransaction(wallet, vtxoTxIds, outputAddress) {
       sequence,
       witnessUtxo: {
         amount: BigInt(vtxo.value),
-        script: chunkWMIPYZSB_cjs.VtxoScript.decode(vtxo.tapTree).pkScript
+        script: chunkCMPJR3HS_cjs.VtxoScript.decode(vtxo.tapTree).pkScript
       },
       sighashType: btcSigner.SigHash.DEFAULT
     });
@@ -14060,7 +14480,7 @@ async function prepareUnrollTransaction(wallet, vtxoTxIds, outputAddress) {
       btcSigner.TaprootControlBlock.encode(spendingLeaf[0]).length
     );
   }
-  const tx = new chunkSPDNHPM4_cjs.Transaction({ version: 2 });
+  const tx = new chunkFSAXPBGP_cjs.Transaction({ version: 2 });
   for (const input of inputs) {
     tx.addInput(input);
   }
@@ -14107,7 +14527,7 @@ function doWait(onchainProvider, txid) {
   };
 }
 function availableExitPath(confirmedAt, current, vtxo) {
-  const exits = chunkWMIPYZSB_cjs.VtxoScript.decode(vtxo.tapTree).exitPaths();
+  const exits = chunkCMPJR3HS_cjs.VtxoScript.decode(vtxo.tapTree).exitPaths();
   for (const exit of exits) {
     if (exit.params.timelock.type === "blocks") {
       if (current.height >= confirmedAt.height + Number(exit.params.timelock.value)) {
@@ -14146,7 +14566,7 @@ function decodeArkContract(encoded) {
 }
 function contractFromArkContract(encoded, options = {}) {
   const parsed = decodeArkContract(encoded);
-  const handler = chunkGYSK5R57_cjs.contractHandlers.get(parsed.type);
+  const handler = chunkGUTKJMSF_cjs.contractHandlers.get(parsed.type);
   if (!handler) {
     throw new Error(`No handler registered for contract type '${parsed.type}'`);
   }
@@ -14160,9 +14580,9 @@ function contractFromArkContract(encoded, options = {}) {
     metadata: options.metadata
   };
 }
-function contractFromArkContractWithAddress(encoded, serverPubKey, addressPrefix = chunkWMIPYZSB_cjs.DEFAULT_NETWORK.hrp, options = {}) {
+function contractFromArkContractWithAddress(encoded, serverPubKey, addressPrefix = chunkCMPJR3HS_cjs.DEFAULT_NETWORK.hrp, options = {}) {
   const parsed = decodeArkContract(encoded);
-  const handler = chunkGYSK5R57_cjs.contractHandlers.getOrThrow(parsed.type);
+  const handler = chunkGUTKJMSF_cjs.contractHandlers.getOrThrow(parsed.type);
   const params = parsed.data;
   const vtxoScript = handler.createScript(params);
   return {
@@ -14274,5 +14694,5 @@ exports.validateVtxoTxGraph = validateVtxoTxGraph;
 exports.verifyTapscriptSignatures = verifyTapscriptSignatures;
 exports.waitForIncomingFunds = waitForIncomingFunds;
 exports.warnAndFilterVtxosForScript = warnAndFilterVtxosForScript;
-//# sourceMappingURL=chunk-7K3ROJF6.cjs.map
-//# sourceMappingURL=chunk-7K3ROJF6.cjs.map
+//# sourceMappingURL=chunk-XCHBQVMK.cjs.map
+//# sourceMappingURL=chunk-XCHBQVMK.cjs.map