@arkade-os/sdk 0.4.66 → 0.4.68

package/dist/{chunk-5E6IZNRG.cjs → chunk-WCJVKFAP.cjs}

@@ -1,8 +1,8 @@
 'use strict';
 
-var chunk3S3JZUEN_cjs = require('./chunk-3S3JZUEN.cjs');
-var chunkPXPPZF5K_cjs = require('./chunk-PXPPZF5K.cjs');
-var chunkZIRFXBKL_cjs = require('./chunk-ZIRFXBKL.cjs');
+var chunkPJR63FTK_cjs = require('./chunk-PJR63FTK.cjs');
+var chunk6YUACVX4_cjs = require('./chunk-6YUACVX4.cjs');
+var chunkEJOFL5WH_cjs = require('./chunk-EJOFL5WH.cjs');
 var chunk5BLDMQED_cjs = require('./chunk-5BLDMQED.cjs');
 var utils_js = require('@scure/btc-signer/utils.js');
 var btcSigner = require('@scure/btc-signer');
@@ -188,7 +188,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 = chunkZIRFXBKL_cjs.getArkPsbtFields(tx.root, 0, chunkZIRFXBKL_cjs.CosignerPublicKey).map(
+    const cosigners = chunkEJOFL5WH_cjs.getArkPsbtFields(tx.root, 0, chunkEJOFL5WH_cjs.CosignerPublicKey).map(
       (c) => base.hex.encode(c.key.subarray(1))
       // xonly pubkey
     );
@@ -240,7 +240,7 @@ var TreeSignerSession = class _TreeSignerSession {
     if (!aggNonce) throw new Error("missing aggregate nonce");
     const prevoutAmounts = [];
     const prevoutScripts = [];
-    const cosigners = chunkZIRFXBKL_cjs.getArkPsbtFields(g.root, 0, chunkZIRFXBKL_cjs.CosignerPublicKey).map((c) => c.key);
+    const cosigners = chunkEJOFL5WH_cjs.getArkPsbtFields(g.root, 0, chunkEJOFL5WH_cjs.CosignerPublicKey).map((c) => c.key);
     const { finalKey } = aggregateKeys(cosigners, true, {
       taprootTweak: this.scriptRoot
     });
@@ -294,7 +294,7 @@ function getPrevOutput(finalKey, graph, sharedOutputAmount, tx) {
     script: pkScript
   };
 }
-var ALL_SIGHASH = Object.values(btcSigner.SigHash).filter((x) => typeof x === "number");
+var ALLOWED_SIGHASH = [btcSigner.SigHash.DEFAULT, btcSigner.SigHash.ALL, btcSigner.SigHash.ALL_ANYONECANPAY];
 var SingleKey = class _SingleKey {
   key;
   constructor(key) {
@@ -323,8 +323,9 @@ var SingleKey = class _SingleKey {
   async sign(tx, inputIndexes) {
     const txCpy = tx.clone();
     if (!inputIndexes) {
+      chunkEJOFL5WH_cjs.assertAllowedSighashTypes(txCpy, ALLOWED_SIGHASH);
       try {
-        if (!txCpy.sign(this.key, ALL_SIGHASH)) {
+        if (!txCpy.sign(this.key, ALLOWED_SIGHASH)) {
           throw new Error("Failed to sign transaction");
         }
       } catch (e) {
@@ -335,7 +336,7 @@ var SingleKey = class _SingleKey {
       return txCpy;
     }
     for (const inputIndex of inputIndexes) {
-      if (!txCpy.signIdx(this.key, inputIndex, ALL_SIGHASH)) {
+      if (!txCpy.signIdx(this.key, inputIndex, ALLOWED_SIGHASH)) {
         throw new Error(`Failed to sign input #${inputIndex}`);
       }
     }
@@ -400,7 +401,7 @@ var ReadonlySingleKey = class _ReadonlySingleKey {
     return Promise.resolve(this.publicKey);
   }
 };
-var ALL_SIGHASH2 = Object.values(btcSigner.SigHash).filter((x) => typeof x === "number");
+var ALLOWED_SIGHASH2 = [btcSigner.SigHash.DEFAULT, btcSigner.SigHash.ALL, btcSigner.SigHash.ALL_ANYONECANPAY];
 var seedBytes = /* @__PURE__ */ new WeakMap();
 var mnemonicMeta = /* @__PURE__ */ new WeakMap();
 var SeedIdentity = class _SeedIdentity {
@@ -431,7 +432,7 @@ var SeedIdentity = class _SeedIdentity {
     let network;
     if ("descriptor" in opts && typeof opts.descriptor === "string") {
       descriptor = opts.descriptor;
-      network = chunkPXPPZF5K_cjs.isMainnetDescriptor(descriptor) ? descriptorsScure.networks.bitcoin : descriptorsScure.networks.testnet;
+      network = chunk6YUACVX4_cjs.isMainnetDescriptor(descriptor) ? descriptorsScure.networks.bitcoin : descriptorsScure.networks.testnet;
     } else {
       network = opts.isMainnet ?? true ? descriptorsScure.networks.bitcoin : descriptorsScure.networks.testnet;
       descriptor = descriptorsScure.scriptExpressions.trBIP32({
@@ -529,7 +530,7 @@ var SeedIdentity = class _SeedIdentity {
    * `StaticDescriptorProvider` for legacy single-key wallets.
    */
   isOurs(descriptor) {
-    return chunkPXPPZF5K_cjs.descriptorIsOurs(descriptor, this.descriptor, utils_js.pubSchnorr(this.derivedKey));
+    return chunk6YUACVX4_cjs.descriptorIsOurs(descriptor, this.descriptor, utils_js.pubSchnorr(this.derivedKey));
   }
   /**
    * Signs each request with the key derived from its descriptor.
@@ -578,7 +579,7 @@ var SeedIdentity = class _SeedIdentity {
   }
   // ── internal helpers ─────────────────────────────────────────────
   derivePrivateKeyForDescriptor(descriptor) {
-    const network = chunkPXPPZF5K_cjs.isMainnetDescriptor(descriptor) ? descriptorsScure.networks.bitcoin : descriptorsScure.networks.testnet;
+    const network = chunk6YUACVX4_cjs.isMainnetDescriptor(descriptor) ? descriptorsScure.networks.bitcoin : descriptorsScure.networks.testnet;
     const expansion = descriptorsScure.expand({ descriptor, network });
     if (expansion.isRanged) {
       throw new Error(
@@ -603,8 +604,9 @@ var SeedIdentity = class _SeedIdentity {
   signTxWithKey(tx, key, inputIndexes) {
     const txCpy = tx.clone();
     if (!inputIndexes) {
+      chunkEJOFL5WH_cjs.assertAllowedSighashTypes(txCpy, ALLOWED_SIGHASH2);
       try {
-        if (!txCpy.sign(key, ALL_SIGHASH2)) {
+        if (!txCpy.sign(key, ALLOWED_SIGHASH2)) {
           throw new Error("Failed to sign transaction");
         }
       } catch (e) {
@@ -614,7 +616,7 @@ var SeedIdentity = class _SeedIdentity {
       }
     } else {
       for (const idx of inputIndexes) {
-        if (!txCpy.signIdx(key, idx, ALL_SIGHASH2)) {
+        if (!txCpy.signIdx(key, idx, ALLOWED_SIGHASH2)) {
           throw new Error(`Failed to sign input #${idx}`);
         }
       }
@@ -664,7 +666,7 @@ var ReadonlyDescriptorIdentity = class _ReadonlyDescriptorIdentity {
    */
   descriptor;
   constructor(descriptor) {
-    const network = chunkPXPPZF5K_cjs.isMainnetDescriptor(descriptor) ? descriptorsScure.networks.bitcoin : descriptorsScure.networks.testnet;
+    const network = chunk6YUACVX4_cjs.isMainnetDescriptor(descriptor) ? descriptorsScure.networks.bitcoin : descriptorsScure.networks.testnet;
     let expansion;
     try {
       expansion = descriptorsScure.expand({ descriptor, network, index: 0 });
@@ -714,7 +716,7 @@ var ReadonlyDescriptorIdentity = class _ReadonlyDescriptorIdentity {
    * `StaticDescriptorProvider` for legacy single-key wallets.
    */
   isOurs(descriptor) {
-    return chunkPXPPZF5K_cjs.descriptorIsOurs(descriptor, this.descriptor, this.indexZero.pubkey);
+    return chunk6YUACVX4_cjs.descriptorIsOurs(descriptor, this.descriptor, this.indexZero.pubkey);
   }
 };
 function serializeSeedOwnedSigningIdentity(identity) {
@@ -876,10 +878,10 @@ var DescriptorIdentity = class {
     this.base = base;
   }
   async xOnlyPublicKey() {
-    return chunkPXPPZF5K_cjs.deriveDescriptorLeafPubKey(this.descriptor);
+    return chunk6YUACVX4_cjs.deriveDescriptorLeafPubKey(this.descriptor);
   }
   async compressedPublicKey() {
-    return chunkPXPPZF5K_cjs.deriveDescriptorLeafCompressedPubKey(this.descriptor);
+    return chunk6YUACVX4_cjs.deriveDescriptorLeafCompressedPubKey(this.descriptor);
   }
   async sign(tx, inputIndexes) {
     const [signed] = await this.signer.signWithDescriptor([
@@ -939,14 +941,20 @@ var ForeignDescriptorError = class extends Error {
   descriptor;
   name = "ForeignDescriptorError";
 };
+var WalletCannotAllocateAddressError = class extends Error {
+  name = "WalletCannotAllocateAddressError";
+  constructor(reason, options) {
+    super(`cannot allocate a fresh address: ${reason}`, options);
+  }
+};
 async function resolveDescriptorSigner(descriptor, identity, provider) {
   const owner = provider?.isOurs(descriptor) ? provider : isHDCapableIdentity(identity) && identity.isOurs(descriptor) ? identity : void 0;
-  if (owner && chunkPXPPZF5K_cjs.parseHDDescriptor(descriptor)) {
+  if (owner && chunk6YUACVX4_cjs.parseHDDescriptor(descriptor)) {
     return new DescriptorIdentity({ descriptor, signer: owner, base: identity });
   }
   let key;
   try {
-    key = chunkPXPPZF5K_cjs.deriveDescriptorLeafPubKey(descriptor);
+    key = chunk6YUACVX4_cjs.deriveDescriptorLeafPubKey(descriptor);
   } catch {
     throw new ForeignDescriptorError(descriptor);
   }
@@ -963,6 +971,10 @@ function isHDAllocationCapable(value) {
   const v = value;
   return typeof v.getNextSigningDescriptor === "function" && typeof v.advanceSigningDescriptorWatermark === "function";
 }
+function isAddressAllocationCapable(value) {
+  if (typeof value !== "object" || value === null) return false;
+  return typeof value.getNewAddresses === "function";
+}
 
 // ../../node_modules/@noble/hashes/utils.js
 function isBytes(a) {
@@ -1317,22 +1329,33 @@ function buildSaltedPreimageMessage(xonly, salt) {
 }
 var PREIMAGE_INDEX = 0;
 function isPerArtifactDescriptor(descriptor) {
-  return chunkPXPPZF5K_cjs.parseHDDescriptor(descriptor) !== null;
+  return chunk6YUACVX4_cjs.parseHDDescriptor(descriptor) !== null;
 }
 async function provisionDescriptor(wallet) {
   const allocated = isHDAllocationCapable(wallet) ? await wallet.getNextSigningDescriptor() : void 0;
-  return allocated ?? await chunkPXPPZF5K_cjs.identityDescriptor(wallet.identity);
+  return allocated ?? await chunk6YUACVX4_cjs.identityDescriptor(wallet.identity);
 }
 async function provisionRefundKey(wallet) {
-  const descriptor = await provisionDescriptor(wallet);
+  const descriptor = await chunk6YUACVX4_cjs.identityDescriptor(wallet.identity);
   const signer = await contractSigner(wallet, descriptor);
-  return { descriptor, pubkey: await signer.xOnlyPublicKey() };
+  const pubkey = await signer.xOnlyPublicKey();
+  const identityPubkey = await wallet.identity.xOnlyPublicKey();
+  if (!utils_js.equalBytes(pubkey, identityPubkey)) {
+    throw new Error(
+      "provisionRefundKey: descriptor pubkey does not match wallet identity \u2014 the refund key and the refund address would be on different keys"
+    );
+  }
+  const address = await wallet.getAddress();
+  const { pkScript } = chunkEJOFL5WH_cjs.ArkAddress.decode(address);
+  return { descriptor, pubkey, pkScript, address };
 }
 async function provisionClaimSecret(wallet, opts = {}) {
   if (opts.preimage && opts.preimage.length !== 32) {
     throw new Error(`preimage must be 32 bytes, got ${opts.preimage.length}`);
   }
-  const { descriptor, pubkey } = await provisionRefundKey(wallet);
+  const descriptor = await provisionDescriptor(wallet);
+  const signer = await contractSigner(wallet, descriptor);
+  const pubkey = await signer.xOnlyPublicKey();
   const claim = async () => {
     if (opts.preimage) return { preimage: opts.preimage, mustPersistPreimage: true };
     if (isPerArtifactDescriptor(descriptor)) {
@@ -1369,7 +1392,7 @@ async function contractSigner(wallet, descriptor) {
   const signer = isHDWalletCapable(wallet) ? await wallet.signerForDescriptor(descriptor) : wallet.identity;
   let expected;
   try {
-    expected = chunkPXPPZF5K_cjs.deriveDescriptorLeafPubKey(descriptor);
+    expected = chunk6YUACVX4_cjs.deriveDescriptorLeafPubKey(descriptor);
   } catch (cause) {
     throw new ForeignDescriptorError(descriptor, { cause });
   }
@@ -1588,14 +1611,14 @@ var RestDelegateProvider = class {
    */
   async delegate(intent, forfeitTxs, options) {
     const url = `${this.url}/v1/delegate`;
-    const response = await chunkZIRFXBKL_cjs.baseFetch(url, {
+    const response = await chunkEJOFL5WH_cjs.baseFetch(url, {
       method: "POST",
       headers: {
         "Content-Type": "application/json"
       },
       body: JSON.stringify({
         intent: {
-          message: chunkZIRFXBKL_cjs.Intent.encodeMessage(intent.message),
+          message: chunkEJOFL5WH_cjs.Intent.encodeMessage(intent.message),
           proof: intent.proof
         },
         forfeit_txs: forfeitTxs,
@@ -1615,7 +1638,7 @@ var RestDelegateProvider = class {
    */
   async getDelegateInfo() {
     const url = `${this.url}/v1/delegator/info`;
-    const response = await chunkZIRFXBKL_cjs.rateGate.runHttp(url, () => chunkZIRFXBKL_cjs.baseFetch(url));
+    const response = await chunkEJOFL5WH_cjs.rateGate.runHttp(url, () => chunkEJOFL5WH_cjs.baseFetch(url));
     if (!response.ok) {
       const errorText2 = await response.text();
       throw new Error(`Failed to get delegate info: ${errorText2}`);
@@ -1632,8 +1655,6 @@ var RestDelegatorProvider = RestDelegateProvider;
 function isDelegateInfo(data) {
   return !!data && typeof data === "object" && "pubkey" in data && "fee" in data && typeof data.pubkey === "string" && typeof data.fee === "string" && data.pubkey !== "" && data.fee !== "" && (typeof data.delegateAddress === "string" && data.delegateAddress !== "" || typeof data.delegatorAddress === "string" && data.delegatorAddress !== "");
 }
-
-// src/providers/onchain.ts
 var ESPLORA_URL = {
   bitcoin: "https://mempool.arkade.sh/api",
   testnet: "https://mempool.space/testnet/api",
@@ -1642,7 +1663,7 @@ var ESPLORA_URL = {
   regtest: "http://localhost:3000/api"
 };
 var EsploraProvider = class {
-  constructor(baseUrl = ESPLORA_URL[chunkZIRFXBKL_cjs.DEFAULT_NETWORK_NAME], opts) {
+  constructor(baseUrl = ESPLORA_URL[chunkEJOFL5WH_cjs.DEFAULT_NETWORK_NAME], opts) {
     this.baseUrl = baseUrl;
     this.pollingInterval = opts?.pollingInterval ?? 15e3;
     this.forcePolling = opts?.forcePolling ?? false;
@@ -1651,14 +1672,14 @@ var EsploraProvider = class {
   pollingInterval;
   forcePolling;
   async getCoins(address) {
-    const response = await chunkZIRFXBKL_cjs.baseFetch(`${this.baseUrl}/address/${address}/utxo`);
+    const response = await chunkEJOFL5WH_cjs.baseFetch(`${this.baseUrl}/address/${address}/utxo`);
     if (!response.ok) {
       throw new Error(`Failed to fetch UTXOs: ${response.statusText}`);
     }
     return response.json();
   }
   async getFeeRate() {
-    const response = await chunkZIRFXBKL_cjs.baseFetch(`${this.baseUrl}/fee-estimates`);
+    const response = await chunkEJOFL5WH_cjs.baseFetch(`${this.baseUrl}/fee-estimates`);
     if (response.status === 404) {
       return void 0;
     }
@@ -1679,7 +1700,7 @@ var EsploraProvider = class {
     }
   }
   async getTxOutspends(txid) {
-    const response = await chunkZIRFXBKL_cjs.baseFetch(`${this.baseUrl}/tx/${txid}/outspends`);
+    const response = await chunkEJOFL5WH_cjs.baseFetch(`${this.baseUrl}/tx/${txid}/outspends`);
     if (!response.ok) {
       const error = await response.text();
       throw new Error(`Failed to get transaction outspends: ${error}`);
@@ -1687,15 +1708,23 @@ var EsploraProvider = class {
     return response.json();
   }
   async getTransactions(address) {
-    const response = await chunkZIRFXBKL_cjs.baseFetch(`${this.baseUrl}/address/${address}/txs`);
+    const response = await chunkEJOFL5WH_cjs.baseFetch(`${this.baseUrl}/address/${address}/txs`);
     if (!response.ok) {
       const error = await response.text();
       throw new Error(`Failed to get transactions: ${error}`);
     }
     return response.json();
   }
+  async getRawTransaction(txid) {
+    const response = await chunkEJOFL5WH_cjs.baseFetch(`${this.baseUrl}/tx/${txid}/hex`);
+    if (!response.ok) {
+      const error = await response.text();
+      throw new Error(`Failed to get raw transaction ${txid}: ${error}`);
+    }
+    return base.hex.decode((await response.text()).trim());
+  }
   async getTxStatus(txid) {
-    const txresponse = await chunkZIRFXBKL_cjs.baseFetch(`${this.baseUrl}/tx/${txid}`);
+    const txresponse = await chunkEJOFL5WH_cjs.baseFetch(`${this.baseUrl}/tx/${txid}`);
     if (!txresponse.ok) {
       throw new Error(txresponse.statusText);
     }
@@ -1703,7 +1732,7 @@ var EsploraProvider = class {
     if (!tx.status.confirmed) {
       return { confirmed: false };
     }
-    const response = await chunkZIRFXBKL_cjs.baseFetch(`${this.baseUrl}/tx/${txid}/status`);
+    const response = await chunkEJOFL5WH_cjs.baseFetch(`${this.baseUrl}/tx/${txid}/status`);
     if (!response.ok) {
       throw new Error(`Failed to get transaction status: ${response.statusText}`);
     }
@@ -1787,7 +1816,7 @@ var EsploraProvider = class {
     return stopFunc;
   }
   async getChainTip() {
-    const tipBlocks = await chunkZIRFXBKL_cjs.baseFetch(`${this.baseUrl}/blocks`);
+    const tipBlocks = await chunkEJOFL5WH_cjs.baseFetch(`${this.baseUrl}/blocks`);
     if (!tipBlocks.ok) {
       throw new Error(`Failed to get chain tip: ${tipBlocks.statusText}`);
     }
@@ -1806,7 +1835,7 @@ var EsploraProvider = class {
     };
   }
   async broadcastPackage(parent, child) {
-    const response = await chunkZIRFXBKL_cjs.baseFetch(`${this.baseUrl}/txs/package`, {
+    const response = await chunkEJOFL5WH_cjs.baseFetch(`${this.baseUrl}/txs/package`, {
       method: "POST",
       headers: {
         "Content-Type": "application/json"
@@ -1817,10 +1846,12 @@ var EsploraProvider = class {
       const error = await response.text();
       throw new Error(`Failed to broadcast package: ${error}`);
     }
-    return response.json();
+    const result = await response.json();
+    assertPackageAccepted(result);
+    return result;
   }
   async broadcastTx(tx) {
-    const response = await chunkZIRFXBKL_cjs.baseFetch(`${this.baseUrl}/tx`, {
+    const response = await chunkEJOFL5WH_cjs.baseFetch(`${this.baseUrl}/tx`, {
       method: "POST",
       headers: {
         "Content-Type": "text/plain"
@@ -1834,6 +1865,24 @@ var EsploraProvider = class {
     return response.text();
   }
 };
+function assertPackageAccepted(result) {
+  if (!result || typeof result !== "object") return;
+  const r = result;
+  const msg = typeof r.package_msg === "string" ? r.package_msg : void 0;
+  if (msg === void 0 || msg === "success") return;
+  const reasons = [];
+  const results = r["tx-results"];
+  if (results && typeof results === "object") {
+    for (const entry of Object.values(results)) {
+      if (!entry || typeof entry !== "object" || entry.error === void 0) continue;
+      const txid = typeof entry.txid === "string" ? entry.txid : "unknown tx";
+      reasons.push(`${txid}: ${String(entry.error)}`);
+    }
+  }
+  throw new Error(
+    reasons.length > 0 ? `Package rejected (${msg}) \u2014 ${reasons.join("; ")}` : `Package rejected (${msg})`
+  );
+}
 function isValidBlocksTip(tip) {
   return Array.isArray(tip) && tip.every((t) => {
     return t && typeof t === "object" && typeof t.id === "string" && t.id.length > 0 && typeof t.height === "number" && t.height >= 0 && typeof t.mediantime === "number" && t.mediantime > 0;
@@ -1982,7 +2031,7 @@ function findP2AOutput(tx) {
 var CHILD_DUST_AMOUNT = 546;
 function buildAnchorChild(params) {
   const { parent, feeRate, fundingCoins, changeAddress, tapInternalKey, network } = params;
-  const child = new chunkZIRFXBKL_cjs.Transaction({ version: 3, allowLegacyWitnessUtxo: true });
+  const child = new chunkEJOFL5WH_cjs.Transaction({ version: 3, allowLegacyWitnessUtxo: true });
   child.addInput(findP2AOutput(parent));
   const estimator = TxWeightEstimator.create().addP2AInput();
   for (const _ of fundingCoins) {
@@ -2030,7 +2079,7 @@ function buildForfeitTx(inputs, forfeitPkScript, txLocktime) {
   );
 }
 function buildForfeitTxWithOutput(inputs, output, txLocktime) {
-  const tx = new chunkZIRFXBKL_cjs.Transaction({
+  const tx = new chunkEJOFL5WH_cjs.Transaction({
     version: 3,
     lockTime: txLocktime
   });
@@ -2106,7 +2155,7 @@ function validateVtxoTxGraph(graph, roundTransaction, sweepTapTreeRoot) {
       if (previousScriptKey.length !== 32) {
         throw new Error(`parent output ${childIndex} has invalid script`);
       }
-      const cosigners = chunkZIRFXBKL_cjs.getArkPsbtFields(child.root, 0, chunkZIRFXBKL_cjs.CosignerPublicKey);
+      const cosigners = chunkEJOFL5WH_cjs.getArkPsbtFields(child.root, 0, chunkEJOFL5WH_cjs.CosignerPublicKey);
       if (cosigners.length === 0) {
         throw ErrMissingCosignersPublicKeys;
       }
@@ -2164,7 +2213,7 @@ var EmulatorPacket = class _EmulatorPacket {
     return new _EmulatorPacket(entries);
   }
   static fromBytes(data) {
-    const reader = new chunk3S3JZUEN_cjs.BufferReader(data);
+    const reader = new chunkPJR63FTK_cjs.BufferReader(data);
     const entryCount = reader.readCompactSize();
     const entries = [];
     for (let i = 0; i < entryCount; i++) {
@@ -2182,7 +2231,7 @@ var EmulatorPacket = class _EmulatorPacket {
     return _EmulatorPacket.PACKET_TYPE;
   }
   serialize() {
-    const writer = new chunk3S3JZUEN_cjs.BufferWriter();
+    const writer = new chunkPJR63FTK_cjs.BufferWriter();
     writer.writeCompactSize(this.entries.length);
     for (const entry of this.entries) {
       writer.writeUint16LE(entry.vin);
@@ -2269,7 +2318,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 chunk3S3JZUEN_cjs.BufferReader(payload.slice(ARKADE_MAGIC.length));
+    const reader = new chunkPJR63FTK_cjs.BufferReader(payload.slice(ARKADE_MAGIC.length));
     const packets = [];
     while (reader.remaining() > 0) {
       const packetType = reader.readByte();
@@ -2343,7 +2392,7 @@ var Extension = class _Extension {
    */
   getAssetPacket() {
     for (const p of this.packets) {
-      if (p instanceof chunk3S3JZUEN_cjs.Packet) {
+      if (p instanceof chunkPJR63FTK_cjs.Packet) {
         return p;
       }
     }
@@ -2381,8 +2430,8 @@ var Extension = class _Extension {
 };
 function parsePacket(packetType, data) {
   switch (packetType) {
-    case chunk3S3JZUEN_cjs.Packet.PACKET_TYPE:
-      return chunk3S3JZUEN_cjs.Packet.fromBytes(data);
+    case chunkPJR63FTK_cjs.Packet.PACKET_TYPE:
+      return chunkPJR63FTK_cjs.Packet.fromBytes(data);
     case EmulatorPacket.PACKET_TYPE:
       return EmulatorPacket.fromBytes(data);
     default:
@@ -2429,16 +2478,16 @@ function buildOpReturnScript(data) {
   }
   return script;
 }
-var ErrOffchainOutputNotFound = (address) => new chunkZIRFXBKL_cjs.ServerResponseMismatchError(`offchain send output not found: ${address}`);
-var ErrInvalidAssetOutputAmount = (got, want, assetId) => new chunkZIRFXBKL_cjs.ServerResponseMismatchError(
+var ErrOffchainOutputNotFound = (address) => new chunkEJOFL5WH_cjs.ServerResponseMismatchError(`offchain send output not found: ${address}`);
+var ErrInvalidAssetOutputAmount = (got, want, assetId) => new chunkEJOFL5WH_cjs.ServerResponseMismatchError(
   `invalid asset output amount for ${assetId}: got ${got}, want ${want}`
 );
-var ErrAssetGroupNotFound = (assetId) => new chunkZIRFXBKL_cjs.ServerResponseMismatchError(`asset group not found in batch leaf: ${assetId}`);
-var ErrAssetOutputNotFound = (assetId, outputIndex) => new chunkZIRFXBKL_cjs.ServerResponseMismatchError(
+var ErrAssetGroupNotFound = (assetId) => new chunkEJOFL5WH_cjs.ServerResponseMismatchError(`asset group not found in batch leaf: ${assetId}`);
+var ErrAssetOutputNotFound = (assetId, outputIndex) => new chunkEJOFL5WH_cjs.ServerResponseMismatchError(
   `asset output not found in asset group ${assetId} at index ${outputIndex}`
 );
-var ErrOnchainOutputNotFound = (address) => new chunkZIRFXBKL_cjs.ServerResponseMismatchError(`onchain output not found: ${address}`);
-var ErrUnvalidatedOffchainOutput = (address) => new chunkZIRFXBKL_cjs.ServerResponseMismatchError(
+var ErrOnchainOutputNotFound = (address) => new chunkEJOFL5WH_cjs.ServerResponseMismatchError(`onchain output not found: ${address}`);
+var ErrUnvalidatedOffchainOutput = (address) => new chunkEJOFL5WH_cjs.ServerResponseMismatchError(
   `offchain output ${address} cannot be validated: virtual output tree signing did not run`
 );
 var ErrInvalidOnchainOutputAmount = (address) => new Error(`invalid onchain output amount: ${address}`);
@@ -2447,7 +2496,7 @@ var ErrInvalidOffchainOutputAmount = (address) => new Error(`invalid offchain ou
 function assertFinalCommitmentMatchesValidated(finalCommitmentTx, validatedCommitmentTxid, context) {
   if (!validatedCommitmentTxid) return;
   if (finalCommitmentTx.id === validatedCommitmentTxid) return;
-  throw new chunkZIRFXBKL_cjs.ServerResponseMismatchError(
+  throw new chunkEJOFL5WH_cjs.ServerResponseMismatchError(
     `${context}: finalization commitment tx ${finalCommitmentTx.id} differs from the validated commitment tx ${validatedCommitmentTxid}`
   );
 }
@@ -2457,7 +2506,7 @@ function validateBatchRecipients(commitmentTx, vtxoTreeLeaves, recipients, netwo
   for (const recipient of recipients) {
     let arkAddress;
     try {
-      arkAddress = chunkZIRFXBKL_cjs.ArkAddress.decode(recipient.address);
+      arkAddress = chunkEJOFL5WH_cjs.ArkAddress.decode(recipient.address);
     } catch {
       validateOnchainRecipient(commitmentTx, recipient, network, usedOnchainOutputs);
       continue;
@@ -2469,7 +2518,7 @@ function validateBatchRecipientsWithoutTree(commitmentTx, recipients, network) {
   const usedOnchainOutputs = /* @__PURE__ */ new Set();
   for (const recipient of recipients) {
     try {
-      chunkZIRFXBKL_cjs.ArkAddress.decode(recipient.address);
+      chunkEJOFL5WH_cjs.ArkAddress.decode(recipient.address);
     } catch {
       validateOnchainRecipient(commitmentTx, recipient, network, usedOnchainOutputs);
       continue;
@@ -2702,7 +2751,7 @@ function assetMintResolver() {
       if (!tx.assets?.length || !tx.key.arkTxid) return void 0;
       const minted = tx.assets.filter((a) => {
         try {
-          return base.hex.encode(chunk3S3JZUEN_cjs.AssetId.fromString(a.assetId).txid) === tx.key.arkTxid;
+          return base.hex.encode(chunkPJR63FTK_cjs.AssetId.fromString(a.assetId).txid) === tx.key.arkTxid;
         } catch {
           return false;
         }
@@ -2745,7 +2794,7 @@ function createAssetPacket(assetInputs, receivers, changeReceiver) {
       const existing = inputsByAssetId.get(asset.assetId);
       inputsByAssetId.set(asset.assetId, [
         ...existing ?? [],
-        chunk3S3JZUEN_cjs.AssetInput.create(inputIndex, asset.amount)
+        chunkPJR63FTK_cjs.AssetInput.create(inputIndex, asset.amount)
       ]);
     }
   }
@@ -2757,7 +2806,7 @@ function createAssetPacket(assetInputs, receivers, changeReceiver) {
         const existing = outputsByAssetId.get(asset.assetId);
         outputsByAssetId.set(asset.assetId, [
           ...existing ?? [],
-          chunk3S3JZUEN_cjs.AssetOutput.create(outputIndex, asset.amount)
+          chunkPJR63FTK_cjs.AssetOutput.create(outputIndex, asset.amount)
         ]);
       }
     }
@@ -2768,7 +2817,7 @@ function createAssetPacket(assetInputs, receivers, changeReceiver) {
       const existing = outputsByAssetId.get(asset.assetId);
       outputsByAssetId.set(asset.assetId, [
         ...existing ?? [],
-        chunk3S3JZUEN_cjs.AssetOutput.create(outputIndex, asset.amount)
+        chunkPJR63FTK_cjs.AssetOutput.create(outputIndex, asset.amount)
       ]);
     }
   }
@@ -2777,11 +2826,11 @@ function createAssetPacket(assetInputs, receivers, changeReceiver) {
   for (const assetIdStr of allAssetIds) {
     const inputs = inputsByAssetId.get(assetIdStr);
     const outputs = outputsByAssetId.get(assetIdStr);
-    const assetId = chunk3S3JZUEN_cjs.AssetId.fromString(assetIdStr);
-    const group = chunk3S3JZUEN_cjs.AssetGroup.create(assetId, null, inputs ?? [], outputs ?? [], []);
+    const assetId = chunkPJR63FTK_cjs.AssetId.fromString(assetIdStr);
+    const group = chunkPJR63FTK_cjs.AssetGroup.create(assetId, null, inputs ?? [], outputs ?? [], []);
     groups.push(group);
   }
-  return chunk3S3JZUEN_cjs.Packet.create(groups);
+  return chunkPJR63FTK_cjs.Packet.create(groups);
 }
 function selectCoinsWithAsset(coins, assetId, requiredAmount) {
   const coinsWithAsset = coins.filter((coin) => coin.assets?.some((a) => a.assetId === assetId));
@@ -2818,7 +2867,7 @@ function selectedCoinsToAssetInputs(selectedCoins) {
 }
 function toXOnlySignerHex(pubkeyHex) {
   const bytes = base.hex.decode(pubkeyHex);
-  if (bytes.length === 32 || bytes.length === 33) return base.hex.encode(chunkPXPPZF5K_cjs.toXOnly(bytes, "signer key"));
+  if (bytes.length === 32 || bytes.length === 33) return base.hex.encode(chunk6YUACVX4_cjs.toXOnly(bytes, "signer key"));
   throw new Error(`invalid signer pubkey length: expected 32 or 33 bytes, got ${bytes.length}`);
 }
 function signerSetFromInfo(info) {
@@ -2865,13 +2914,13 @@ var toTimelock = (value) => ({
 var toSeconds = (t) => t.type === "seconds" ? t.value : t.value * NOMINAL_BLOCK_SECONDS;
 function assertTimelockInPolicy(timelock, policy, label, overrideOption) {
   if (policy.requireSeconds && timelock.type === "blocks") {
-    throw new chunkZIRFXBKL_cjs.ServerResponseMismatchError(
+    throw new chunkEJOFL5WH_cjs.ServerResponseMismatchError(
       `${label} rejected: block-typed timelocks are not accepted (got ${timelock.value})`
     );
   }
   const seconds = toSeconds(timelock);
   if (seconds < policy.minSeconds) {
-    throw new chunkZIRFXBKL_cjs.ServerResponseMismatchError(
+    throw new chunkEJOFL5WH_cjs.ServerResponseMismatchError(
       `${label} rejected: ${timelock.value} ${timelock.type} is below the ${policy.minSeconds}s floor; pass ${overrideOption}: ${seconds}n to Wallet.create to lower it`
     );
   }
@@ -2892,7 +2941,7 @@ function resolveBatchExpiryPolicy(network, overrides) {
 }
 function assertValidBatchExpiry(batchExpiry, policy) {
   if (policy.advertisedVtxoTreeExpiry !== void 0 && batchExpiry !== policy.advertisedVtxoTreeExpiry) {
-    throw new chunkZIRFXBKL_cjs.ServerResponseMismatchError(
+    throw new chunkEJOFL5WH_cjs.ServerResponseMismatchError(
       `batch expiry rejected: ${batchExpiry} does not match the advertised vtxoTreeExpiry ${policy.advertisedVtxoTreeExpiry}`
     );
   }
@@ -2922,21 +2971,21 @@ function resolveCheckpointExitDelayPolicy(network, overrides) {
 function assertValidServerUnrollScript(checkpointTapscript, policy) {
   let script;
   try {
-    script = chunkZIRFXBKL_cjs.CSVMultisigTapscript.decode(base.hex.decode(checkpointTapscript));
+    script = chunkEJOFL5WH_cjs.CSVMultisigTapscript.decode(base.hex.decode(checkpointTapscript));
   } catch (e) {
-    throw new chunkZIRFXBKL_cjs.ServerResponseMismatchError(
+    throw new chunkEJOFL5WH_cjs.ServerResponseMismatchError(
       `checkpoint exit delay rejected: invalid checkpointTapscript from server (${e instanceof Error ? e.message : String(e)})`
     );
   }
   if (policy.advertisedForfeitPubkey !== void 0) {
     const { pubkeys } = script.params;
     if (pubkeys.length !== 1) {
-      throw new chunkZIRFXBKL_cjs.ServerResponseMismatchError(
+      throw new chunkEJOFL5WH_cjs.ServerResponseMismatchError(
         `checkpoint exit delay rejected: checkpointTapscript must commit to exactly one pubkey, got ${pubkeys.length} [${pubkeys.map(base.hex.encode).join(", ")}]`
       );
     }
     if (!utils_js.equalBytes(pubkeys[0], policy.advertisedForfeitPubkey)) {
-      throw new chunkZIRFXBKL_cjs.ServerResponseMismatchError(
+      throw new chunkEJOFL5WH_cjs.ServerResponseMismatchError(
         `checkpoint exit delay rejected: checkpointTapscript pubkey ${base.hex.encode(pubkeys[0])} does not match the advertised forfeitPubkey ${base.hex.encode(policy.advertisedForfeitPubkey)}`
       );
     }
@@ -2980,8 +3029,8 @@ function buildOffchainTx(inputs, outputs, serverUnrollScript) {
 function buildVirtualTx(inputs, outputs) {
   let lockTime = 0n;
   for (const input of inputs) {
-    const tapscript = chunkZIRFXBKL_cjs.decodeTapscript(chunkZIRFXBKL_cjs.scriptFromTapLeafScript(input.tapLeafScript));
-    if (chunkZIRFXBKL_cjs.CLTVMultisigTapscript.is(tapscript)) {
+    const tapscript = chunkEJOFL5WH_cjs.decodeTapscript(chunkEJOFL5WH_cjs.scriptFromTapLeafScript(input.tapLeafScript));
+    if (chunkEJOFL5WH_cjs.CLTVMultisigTapscript.is(tapscript)) {
       if (lockTime !== 0n) {
         if (isSeconds(lockTime) !== isSeconds(tapscript.params.absoluteTimelock)) {
           throw new Error("cannot mix seconds and blocks locktime");
@@ -2992,7 +3041,7 @@ function buildVirtualTx(inputs, outputs) {
       }
     }
   }
-  const tx = new chunkZIRFXBKL_cjs.Transaction({
+  const tx = new chunkEJOFL5WH_cjs.Transaction({
     version: 3,
     lockTime: Number(lockTime)
   });
@@ -3002,12 +3051,12 @@ function buildVirtualTx(inputs, outputs) {
       index: input.vout,
       sequence: lockTime ? btcSigner.DEFAULT_SEQUENCE - 1 : void 0,
       witnessUtxo: {
-        script: chunkZIRFXBKL_cjs.VtxoScript.decode(input.tapTree).pkScript,
+        script: chunkEJOFL5WH_cjs.VtxoScript.decode(input.tapTree).pkScript,
         amount: BigInt(input.value)
       },
       tapLeafScript: [input.tapLeafScript]
     });
-    chunkZIRFXBKL_cjs.setArkPsbtField(tx, i, chunkZIRFXBKL_cjs.VtxoTaprootTree, input.tapTree);
+    chunkEJOFL5WH_cjs.setArkPsbtField(tx, i, chunkEJOFL5WH_cjs.VtxoTaprootTree, input.tapTree);
   }
   for (const output of outputs) {
     tx.addOutput(output);
@@ -3016,8 +3065,8 @@ function buildVirtualTx(inputs, outputs) {
   return tx;
 }
 function buildCheckpointTx(vtxo, serverUnrollScript) {
-  const collaborativeClosure = chunkZIRFXBKL_cjs.decodeTapscript(chunkZIRFXBKL_cjs.scriptFromTapLeafScript(vtxo.tapLeafScript));
-  const checkpointVtxoScript = new chunkZIRFXBKL_cjs.VtxoScript([
+  const collaborativeClosure = chunkEJOFL5WH_cjs.decodeTapscript(chunkEJOFL5WH_cjs.scriptFromTapLeafScript(vtxo.tapLeafScript));
+  const checkpointVtxoScript = new chunkEJOFL5WH_cjs.VtxoScript([
     serverUnrollScript.script,
     collaborativeClosure.script
   ]);
@@ -3060,9 +3109,6 @@ function hasBoardingTxExpired(coin, boardingTimelock, chainTipHeight) {
   const blockTime = BigInt(Math.floor(coin.status.block_time));
   return blockTime + boardingTimelock.value <= now;
 }
-function formatSighash(type) {
-  return `0x${type.toString(16).padStart(2, "0")}`;
-}
 function verifyTapscriptSignatures(tx, inputIndex, requiredSigners, excludePubkeys = [], allowedSighashTypes = [btcSigner.SigHash.DEFAULT], expectedLeafHash) {
   const input = tx.getInput(inputIndex);
   const prevoutScripts = [];
@@ -3096,7 +3142,7 @@ function verifyTapscriptSignatures(tx, inputIndex, requiredSigners, excludePubke
     const sighashType = signature.length === 65 ? signature[64] : btcSigner.SigHash.DEFAULT;
     const sig = signature.subarray(0, 64);
     if (!allowedSighashTypes.includes(sighashType)) {
-      const sighashName = formatSighash(sighashType);
+      const sighashName = chunkEJOFL5WH_cjs.formatSighash(sighashType);
       throw new Error(
         `Unallowed sighash type ${sighashName} for input ${inputIndex}, pubkey ${pubKeyHex}.`
       );
@@ -3170,7 +3216,7 @@ function combineTapscriptSigs(signedTx, originalTx) {
 }
 function isValidArkAddress(address) {
   try {
-    chunkZIRFXBKL_cjs.ArkAddress.decode(address);
+    chunkEJOFL5WH_cjs.ArkAddress.decode(address);
     return true;
   } catch (e) {
     return false;
@@ -3178,16 +3224,16 @@ function isValidArkAddress(address) {
 }
 function matchServerCheckpoints(serverCheckpointTxs, expectedCheckpoints, context) {
   if (serverCheckpointTxs.length !== expectedCheckpoints.length) {
-    throw new chunkZIRFXBKL_cjs.ServerResponseMismatchError(
+    throw new chunkEJOFL5WH_cjs.ServerResponseMismatchError(
       `${context} returned ${serverCheckpointTxs.length} checkpoints, expected ${expectedCheckpoints.length}`
     );
   }
   const byTxid = new Map(expectedCheckpoints.map((c) => [c.id, c]));
   return serverCheckpointTxs.map((encoded, index) => {
-    const server = chunkZIRFXBKL_cjs.Transaction.fromPSBT(base.base64.decode(encoded));
+    const server = chunkEJOFL5WH_cjs.Transaction.fromPSBT(base.base64.decode(encoded));
     const local = byTxid.get(server.id);
     if (!local) {
-      throw new chunkZIRFXBKL_cjs.ServerResponseMismatchError(
+      throw new chunkEJOFL5WH_cjs.ServerResponseMismatchError(
         `${context} checkpoint ${index} txid ${server.id} does not match any submitted checkpoint`
       );
     }
@@ -3197,14 +3243,14 @@ function matchServerCheckpoints(serverCheckpointTxs, expectedCheckpoints, contex
 }
 function assertSubmittedArkTxid(response, signedArkTx, context) {
   if (response.arkTxid !== signedArkTx.id) {
-    throw new chunkZIRFXBKL_cjs.ServerResponseMismatchError(
+    throw new chunkEJOFL5WH_cjs.ServerResponseMismatchError(
       `${context} returned ark txid ${response.arkTxid}, expected ${signedArkTx.id}`
     );
   }
   if (response.finalArkTx === void 0) return;
-  const finalTxid = chunkZIRFXBKL_cjs.Transaction.fromPSBT(base.base64.decode(response.finalArkTx)).id;
+  const finalTxid = chunkEJOFL5WH_cjs.Transaction.fromPSBT(base.base64.decode(response.finalArkTx)).id;
   if (finalTxid !== signedArkTx.id) {
-    throw new chunkZIRFXBKL_cjs.ServerResponseMismatchError(
+    throw new chunkEJOFL5WH_cjs.ServerResponseMismatchError(
       `${context} returned final ark tx ${finalTxid}, expected ${signedArkTx.id}`
     );
   }
@@ -3223,10 +3269,10 @@ function assertServerSignedLeaf(serverTx, localTx, inputIndex, serverPubkeyHex,
       [serverPubkeyHex],
       void 0,
       void 0,
-      payment_js.tapLeafHash(chunkZIRFXBKL_cjs.scriptFromTapLeafScript(leaf))
+      payment_js.tapLeafHash(chunkEJOFL5WH_cjs.scriptFromTapLeafScript(leaf))
     );
   } catch (error) {
-    throw new chunkZIRFXBKL_cjs.ServerResponseMismatchError(
+    throw new chunkEJOFL5WH_cjs.ServerResponseMismatchError(
       `${context}: input ${inputIndex} is not signed by the server on the leaf being spent (${error instanceof Error ? error.message : String(error)})`
     );
   }
@@ -3235,20 +3281,20 @@ function assertCheckpointsMatchInputs(checkpoints, inputs, unrollCandidates, con
   const byOutpoint = new Map(inputs.map((input) => [`${input.txid}:${input.vout}`, input]));
   for (const [index, checkpoint] of checkpoints.entries()) {
     if (checkpoint.inputsLength !== 1) {
-      throw new chunkZIRFXBKL_cjs.ServerResponseMismatchError(
+      throw new chunkEJOFL5WH_cjs.ServerResponseMismatchError(
         `${context}: checkpoint ${index} spends ${checkpoint.inputsLength} inputs, expected 1`
       );
     }
     const spent = checkpoint.getInput(0);
     if (!spent.txid || spent.index === void 0) {
-      throw new chunkZIRFXBKL_cjs.ServerResponseMismatchError(
+      throw new chunkEJOFL5WH_cjs.ServerResponseMismatchError(
         `${context}: checkpoint ${index} has no input outpoint`
       );
     }
     const outpoint = `${base.hex.encode(spent.txid)}:${spent.index}`;
     const input = byOutpoint.get(outpoint);
     if (!input) {
-      throw new chunkZIRFXBKL_cjs.ServerResponseMismatchError(
+      throw new chunkEJOFL5WH_cjs.ServerResponseMismatchError(
         `${context}: checkpoint ${index} spends ${outpoint}, which is not one of the requested virtual outputs`
       );
     }
@@ -3256,7 +3302,7 @@ function assertCheckpointsMatchInputs(checkpoints, inputs, unrollCandidates, con
       (unroll) => buildCheckpointTx(input, unroll).tx.id === checkpoint.id
     );
     if (!rebuilt) {
-      throw new chunkZIRFXBKL_cjs.ServerResponseMismatchError(
+      throw new chunkEJOFL5WH_cjs.ServerResponseMismatchError(
         `${context}: checkpoint ${index} txid ${checkpoint.id} differs from the checkpoint built locally for ${outpoint}`
       );
     }
@@ -3280,15 +3326,24 @@ async function submitOffchainTx(provider, offchainTx, signer, hooks, options) {
   assertSubmittedArkTxid(response, signedArkTx, "submitTx");
   const { arkTxid, signedCheckpointTxs } = response;
   const matched = matchServerCheckpoints(signedCheckpointTxs, offchainTx.checkpoints, "submitTx");
+  matched.forEach(({ server }, index) => {
+    try {
+      chunkEJOFL5WH_cjs.assertAllowedSighashTypes(server);
+    } catch (error) {
+      throw new chunkEJOFL5WH_cjs.ServerResponseMismatchError(
+        `submitTx checkpoint ${index}: ${error instanceof Error ? error.message : String(error)}`
+      );
+    }
+  });
   const verify = options?.verifyServerSignatures;
   if (verify) {
     if (response.finalArkTx === void 0) {
-      throw new chunkZIRFXBKL_cjs.ServerResponseMismatchError(
+      throw new chunkEJOFL5WH_cjs.ServerResponseMismatchError(
         "submitTx: server returned no final ark tx to verify its signatures against"
       );
     }
-    const finalArkTx = chunkZIRFXBKL_cjs.Transaction.fromPSBT(base.base64.decode(response.finalArkTx));
-    const serverPubkeyHex = base.hex.encode(chunkPXPPZF5K_cjs.toXOnly(verify.serverPubkey, "server key"));
+    const finalArkTx = chunkEJOFL5WH_cjs.Transaction.fromPSBT(base.base64.decode(response.finalArkTx));
+    const serverPubkeyHex = base.hex.encode(chunk6YUACVX4_cjs.toXOnly(verify.serverPubkey, "server key"));
     for (let i = 0; i < offchainTx.arkTx.inputsLength; i++) {
       assertServerSignedLeaf(
         finalArkTx,
@@ -3344,12 +3399,12 @@ function claimWithPreimageIdentity(identity, preimage) {
   return {
     ...identity,
     sign: async (tx, inputIndexes) => {
-      const signed = chunkZIRFXBKL_cjs.Transaction.fromPSBT(
+      const signed = chunkEJOFL5WH_cjs.Transaction.fromPSBT(
         (await identity.sign(tx.clone(), inputIndexes)).toPSBT()
       );
       const indexes = inputIndexes ?? Array.from({ length: signed.inputsLength }, (_, i) => i);
       for (const index of indexes) {
-        chunkZIRFXBKL_cjs.setArkPsbtField(signed, index, chunkZIRFXBKL_cjs.ConditionWitness, [preimage]);
+        chunkEJOFL5WH_cjs.setArkPsbtField(signed, index, chunkEJOFL5WH_cjs.ConditionWitness, [preimage]);
       }
       return signed;
     }
@@ -3541,7 +3596,7 @@ function extendCoinWithTapscript(boardingTapscript, utxo) {
   };
 }
 function deriveContractTapscripts(contract) {
-  const handler = chunkPXPPZF5K_cjs.contractHandlers.get(contract.type);
+  const handler = chunk6YUACVX4_cjs.contractHandlers.get(contract.type);
   if (!handler) {
     throw new Error(`No handler for contract type '${contract.type}'`);
   }
@@ -3612,7 +3667,7 @@ function getRandomId() {
 }
 function isValidArkAddress2(address) {
   try {
-    chunkZIRFXBKL_cjs.ArkAddress.decode(address);
+    chunkEJOFL5WH_cjs.ArkAddress.decode(address);
     return true;
   } catch (e) {
     return false;
@@ -3640,7 +3695,7 @@ function assertRecipientArkAddress(encoded, address, context) {
 function assertTapTreeDerivesAddress(encoded, tapTree, address) {
   let derived;
   try {
-    derived = chunkZIRFXBKL_cjs.VtxoScript.decode(tapTree).pkScript;
+    derived = chunkEJOFL5WH_cjs.VtxoScript.decode(tapTree).pkScript;
   } catch (e) {
     throw new Error(
       `Invalid tapTree for ${encoded}: ${e instanceof Error ? e.message : String(e)}`
@@ -3657,7 +3712,7 @@ function validateRecipients(recipients, dustAmount, context) {
   for (const recipient of recipients) {
     let address;
     try {
-      address = chunkZIRFXBKL_cjs.ArkAddress.decode(recipient.address);
+      address = chunkEJOFL5WH_cjs.ArkAddress.decode(recipient.address);
     } catch (e) {
       throw new Error(`Invalid Arkade address: ${recipient.address}`);
     }
@@ -3682,7 +3737,7 @@ function validateRecipients(recipients, dustAmount, context) {
 
 // src/contracts/spendability.ts
 function isContractGenericallySpendable(contract) {
-  return chunkPXPPZF5K_cjs.contractHandlers.get(contract.type)?.isGenericallySpendable?.(contract) === true;
+  return chunk6YUACVX4_cjs.contractHandlers.get(contract.type)?.isGenericallySpendable?.(contract) === true;
 }
 function gatedContracts(contracts) {
   const gated = /* @__PURE__ */ new Map();
@@ -3695,7 +3750,7 @@ function gateExclusion(gated) {
   return (vtxo) => {
     const type = vtxo.script === void 0 ? void 0 : gated.get(vtxo.script);
     if (type === void 0) return void 0;
-    if (!chunkPXPPZF5K_cjs.contractHandlers.has(type)) {
+    if (!chunk6YUACVX4_cjs.contractHandlers.has(type)) {
       return `at ${vtxo.script} (contract type '${type}') has no handler registered in this build`;
     }
     return `at ${vtxo.script} (contract type '${type}') is not generically spendable`;
@@ -3731,7 +3786,9 @@ function selectPendingRecoveryOutpoints(contractsWithVtxos, signerSet, nowSecond
       continue;
     }
     for (const v of vtxos) {
-      if (!chunkZIRFXBKL_cjs.hasTerminalSpend(v) && !v.isSwept) out.add(`${v.txid}:${v.vout}`);
+      if (!chunkEJOFL5WH_cjs.hasTerminalSpend(v) && !v.isSwept && !v.isUnrolled) {
+        out.add(`${v.txid}:${v.vout}`);
+      }
     }
   }
   return out;
@@ -3764,10 +3821,10 @@ function byValueDescending(vtxos) {
   return [...vtxos].sort((a, b) => b.value - a.value);
 }
 async function fetchTimeHeight(wallet) {
-  return chunkZIRFXBKL_cjs.resolveTimeHeight(wallet.onchainProvider);
+  return chunkEJOFL5WH_cjs.resolveTimeHeight(wallet.onchainProvider);
 }
 function canMigrateBySend(vtxo, now) {
-  if (!chunkZIRFXBKL_cjs.canSpendOffchain(vtxo, now)) return false;
+  if (!chunkEJOFL5WH_cjs.canSpendOffchain(vtxo, now)) return false;
   return vtxo.expiresAt !== void 0 || vtxo.expiresAtHeight !== void 0;
 }
 function byExpiryAscending(vtxos, now) {
@@ -3775,7 +3832,7 @@ function byExpiryAscending(vtxos, now) {
     if (vtxo.isSwept) return -Infinity;
     if (vtxo.expiresAt !== void 0) return vtxo.expiresAt.getTime();
     if (vtxo.expiresAtHeight !== void 0) {
-      return chunkZIRFXBKL_cjs.isPastExpiry(vtxo, now) ? -Infinity : Infinity;
+      return chunkEJOFL5WH_cjs.isPastExpiry(vtxo, now) ? -Infinity : Infinity;
     }
     return Infinity;
   };
@@ -3802,7 +3859,7 @@ function priceSettlementInputs(vtxos, estimator) {
   const payable = [];
   const net = /* @__PURE__ */ new Map();
   for (const vtxo of vtxos) {
-    const inputFee = estimator.evalOffchainInput(chunkZIRFXBKL_cjs.toOffchainInputFeeParams(vtxo));
+    const inputFee = estimator.evalOffchainInput(chunkEJOFL5WH_cjs.toOffchainInputFeeParams(vtxo));
     if (inputFee.satoshis >= vtxo.value) {
       continue;
     }
@@ -3828,7 +3885,7 @@ function deductOffchainOutputFee(subtotal, estimator, arkAddress) {
   }
   const outputFee = estimator.evalOffchainOutput({
     amount: subtotal,
-    script: base.hex.encode(chunkZIRFXBKL_cjs.ArkAddress.decode(arkAddress).pkScript)
+    script: base.hex.encode(chunkEJOFL5WH_cjs.ArkAddress.decode(arkAddress).pkScript)
   });
   return subtotal - BigInt(outputFee.satoshis);
 }
@@ -3846,10 +3903,10 @@ var DEFAULT_SETTLEMENT_CONFIG = {
 };
 function getRecoverableVtxos(vtxos, dustAmount, now) {
   return vtxos.filter((vtxo) => {
-    if (chunkZIRFXBKL_cjs.canRecoverOnchain(vtxo, now)) {
+    if (chunkEJOFL5WH_cjs.canRecoverOnchain(vtxo, now)) {
       return true;
     }
-    if (chunkZIRFXBKL_cjs.canSpendOffchain(vtxo, now) && vtxo.isPreconfirmed && isSubdust(vtxo, dustAmount)) {
+    if (chunkEJOFL5WH_cjs.canSpendOffchain(vtxo, now) && vtxo.isPreconfirmed && isSubdust(vtxo, dustAmount)) {
       return true;
     }
     return false;
@@ -3879,8 +3936,9 @@ function getRecoverableWithSubdust(vtxos, dustAmount, now) {
   };
 }
 function isVtxoExpiringSoon(vtxo, thresholdMs) {
+  if (vtxo.isUnrolled) return false;
   const realThresholdMs = thresholdMs <= 100 ? DEFAULT_THRESHOLD_MS : thresholdMs;
-  const expiresAt = chunkZIRFXBKL_cjs.normalizeVtxo(vtxo).expiresAt;
+  const expiresAt = chunkEJOFL5WH_cjs.normalizeVtxo(vtxo).expiresAt;
   if (expiresAt === void 0) return false;
   const now = Date.now();
   const batchExpiry = expiresAt.getTime();
@@ -3889,7 +3947,9 @@ function isVtxoExpiringSoon(vtxo, thresholdMs) {
 }
 function getExpiringAndRecoverableVtxos(vtxos, thresholdMs, dustAmount, now) {
   return vtxos.filter(
-    (vtxo) => isVtxoExpiringSoon(vtxo, thresholdMs) || chunkZIRFXBKL_cjs.canRecoverOnchain(vtxo, now) || isSubdust(vtxo, dustAmount)
+    // The leading exclusion covers the `isSubdust` arm too, which is a value
+    // property and would otherwise re-admit an exited coin on its own.
+    (vtxo) => !vtxo.isUnrolled && (isVtxoExpiringSoon(vtxo, thresholdMs) || chunkEJOFL5WH_cjs.canRecoverOnchain(vtxo, now) || isSubdust(vtxo, dustAmount))
   );
 }
 function isMigrationCapable(wallet) {
@@ -4488,11 +4548,11 @@ var VtxoManager = class _VtxoManager {
         `Sweep not economical: output ${outputAmount} sats after ${fee} sats fee is below dust (${dustAmount} sats)`
       );
     }
-    const tx = new chunkZIRFXBKL_cjs.Transaction();
+    const tx = new chunkEJOFL5WH_cjs.Transaction();
     for (const utxo of expiredUtxos) {
-      const utxoScript = chunkZIRFXBKL_cjs.VtxoScript.decode(utxo.tapTree);
+      const utxoScript = chunkEJOFL5WH_cjs.VtxoScript.decode(utxo.tapTree);
       const utxoExitLeaf = utxoScript.leaves.find(
-        (leaf) => chunkZIRFXBKL_cjs.CSVMultisigTapscript.isScriptValid(chunkZIRFXBKL_cjs.scriptFromTapLeafScript(leaf)) === true
+        (leaf) => chunkEJOFL5WH_cjs.CSVMultisigTapscript.isScriptValid(chunkEJOFL5WH_cjs.scriptFromTapLeafScript(leaf)) === true
       );
       if (!utxoExitLeaf) {
         throw new Error(
@@ -4507,7 +4567,7 @@ var VtxoManager = class _VtxoManager {
           amount: BigInt(utxo.value)
         },
         tapLeafScript: [utxoExitLeaf],
-        sequence: chunkZIRFXBKL_cjs.getSequence(utxoExitLeaf)
+        sequence: chunkEJOFL5WH_cjs.getSequence(utxoExitLeaf)
       });
     }
     tx.addOutputAddress(boardingAddress, outputAmount, this.getNetwork());
@@ -4540,6 +4600,7 @@ var VtxoManager = class _VtxoManager {
   async getDeprecatedSignerStatus() {
     const wallet = this.requireMigrationCapableWallet();
     const info = await wallet.arkProvider.getInfo();
+    await wallet.settleServerInfoChanges?.();
     const { reports: vtxoReports } = await this.classifyDeprecatedSignerContracts(info);
     const { reports: boardingReports } = await this.classifyDeprecatedSignerBoarding(info);
     return mergeSignerReports(vtxoReports, boardingReports);
@@ -4553,26 +4614,33 @@ var VtxoManager = class _VtxoManager {
    */
   async migrateCore(options) {
     const wallet = this.requireMigrationCapableWallet();
+    const signerBeforeRefresh = base.hex.encode(wallet.arkServerPublicKey);
     const info = await wallet.arkProvider.getInfo();
+    await wallet.settleServerInfoChanges?.();
+    const rotatedOnRefresh = signerBeforeRefresh !== base.hex.encode(wallet.arkServerPublicKey);
     wallet.refreshDeprecatedSigners(info);
     const signerSet = signerSetFromInfo(info);
     const nowSeconds = Math.floor(Date.now() / 1e3);
     const walletSignerHex = base.hex.encode(wallet.arkServerPublicKey);
     const walletClass = classifyAgainstSignerSet(walletSignerHex, signerSet, nowSeconds);
     if (signerSet.deprecated.size === 0 && walletClass.status === "CURRENT") {
-      return { rotated: false, expired: [], signers: [] };
+      return { rotated: rotatedOnRefresh, expired: [], signers: [] };
     }
     if (walletClass.status === "UNKNOWN_SIGNER") {
       const { reports: vtxoReports2 } = await this.classifyDeprecatedSignerContracts(info);
       const { reports: boardingReports2 } = await this.classifyDeprecatedSignerBoarding(info);
       return {
-        rotated: false,
+        // Normally false here — a drained rotation targets the active
+        // signer, which classifies CURRENT, not UNKNOWN. It is true only
+        // when a second rotation landed inside the drain, leaving us on a
+        // signer newer than `info`: still a rotation this pass applied.
+        rotated: rotatedOnRefresh,
         expired: [],
         signers: mergeSignerReports(vtxoReports2, boardingReports2),
         skipped: "unknown-wallet-signer"
       };
     }
-    const rotated = await this.ensureReceiveOnActiveSigner(info);
+    const rotated = await this.ensureReceiveOnActiveSigner(info) || rotatedOnRefresh;
     const {
       reports: vtxoReports,
       migratable: vtxoMigratable,
@@ -4741,8 +4809,9 @@ var VtxoManager = class _VtxoManager {
       if (!serverPubKey) continue;
       const cls = classifyAgainstSignerSet(serverPubKey, signerSet, nowSeconds);
       if (cls.status === "CURRENT") continue;
-      const recoverable = vtxos.filter((v) => v.isSwept && !chunkZIRFXBKL_cjs.hasTerminalSpend(v));
-      const spendable = vtxos.filter((v) => !chunkZIRFXBKL_cjs.hasTerminalSpend(v) && !v.isSwept);
+      const live = vtxos.filter((v) => !v.isUnrolled);
+      const recoverable = live.filter((v) => v.isSwept && !chunkEJOFL5WH_cjs.hasTerminalSpend(v));
+      const spendable = live.filter((v) => !chunkEJOFL5WH_cjs.hasTerminalSpend(v) && !v.isSwept);
       const value = spendable.reduce((sum, v) => sum + v.value, 0);
       let recoverableCount = 0;
       let recoverableValue = 0;
@@ -4755,7 +4824,7 @@ var VtxoManager = class _VtxoManager {
         awaitingSweepCount = spendable.length;
         awaitingSweepValue = value;
         for (const v of spendable) {
-          const exp = chunkZIRFXBKL_cjs.toBatchExpiry(v);
+          const exp = chunkEJOFL5WH_cjs.toBatchExpiry(v);
           if (exp !== void 0 && (nextSweepEta === void 0 || exp < nextSweepEta)) {
             nextSweepEta = exp;
           }
@@ -5016,7 +5085,7 @@ var VtxoManager = class _VtxoManager {
   /** Decodes the boarding tapscript exit path to extract the CSV timelock. */
   getBoardingTimelock() {
     const wallet = this.getSweepWallet();
-    const exitScript = chunkZIRFXBKL_cjs.CSVMultisigTapscript.decode(
+    const exitScript = chunkEJOFL5WH_cjs.CSVMultisigTapscript.decode(
       base.hex.decode(wallet.boardingTapscript.exitScript)
     );
     return exitScript.params.timelock;
@@ -5147,8 +5216,8 @@ var VtxoManager = class _VtxoManager {
    * or doesn't carry the metadata.
    */
   extractSpentOutpoint(error) {
-    const ark = chunkZIRFXBKL_cjs.maybeArkError(error);
-    if (!chunkZIRFXBKL_cjs.isArkError(ark, chunkZIRFXBKL_cjs.ArkErrorName.VTXO_ALREADY_SPENT)) return void 0;
+    const ark = chunkEJOFL5WH_cjs.maybeArkError(error);
+    if (!chunkEJOFL5WH_cjs.isArkError(ark, chunkEJOFL5WH_cjs.ArkErrorName.VTXO_ALREADY_SPENT)) return void 0;
     const raw = ark.metadata?.vtxo_outpoint;
     if (typeof raw !== "string") return void 0;
     const [txid, voutStr] = raw.split(":");
@@ -5338,7 +5407,7 @@ var VtxoManager = class _VtxoManager {
       if (filteredVtxos.length >= MAX_VTXOS_PER_SETTLEMENT) {
         break;
       }
-      const inputFee = estimator.evalOffchainInput(chunkZIRFXBKL_cjs.toOffchainInputFeeParams(v));
+      const inputFee = estimator.evalOffchainInput(chunkEJOFL5WH_cjs.toOffchainInputFeeParams(v));
       if (inputFee.satoshis >= v.value) {
         continue;
       }
@@ -5358,7 +5427,7 @@ var VtxoManager = class _VtxoManager {
     const arkAddress = await this.wallet.getAddress();
     const outputFee = estimator.evalOffchainOutput({
       amount: totalAmount,
-      script: base.hex.encode(chunkZIRFXBKL_cjs.ArkAddress.decode(arkAddress).pkScript)
+      script: base.hex.encode(chunkEJOFL5WH_cjs.ArkAddress.decode(arkAddress).pkScript)
     });
     totalAmount -= BigInt(outputFee.satoshis);
     if (totalAmount < dustAmount) return;
@@ -5438,7 +5507,7 @@ var ArkNote = class _ArkNote {
     this.value = value;
     this.HRP = HRP;
     const preimageHash = utils_js.sha256(this.preimage);
-    this.vtxoScript = new chunkZIRFXBKL_cjs.VtxoScript([noteTapscript(preimageHash)]);
+    this.vtxoScript = new chunkEJOFL5WH_cjs.VtxoScript([noteTapscript(preimageHash)]);
     const leaf = this.vtxoScript.leaves[0];
     this.txid = base.hex.encode(new Uint8Array(preimageHash).reverse());
     this.tapTree = this.vtxoScript.encode();
@@ -5605,7 +5674,7 @@ var ArkadeCash = class _ArkadeCash {
     const privateKey = data.slice(1, 33);
     const serverPubKey = data.slice(33, 65);
     const sequence = new DataView(data.buffer, data.byteOffset + 65, 4).getUint32(0, false);
-    const csvTimelock = chunkZIRFXBKL_cjs.sequenceToTimelock(sequence);
+    const csvTimelock = chunkEJOFL5WH_cjs.sequenceToTimelock(sequence);
     return new _ArkadeCash(privateKey, serverPubKey, csvTimelock, decoded.prefix);
   }
   toString() {
@@ -5613,7 +5682,7 @@ var ArkadeCash = class _ArkadeCash {
     data[0] = _ArkadeCash.Version;
     data.set(this._privateKey, 1);
     data.set(this._serverPubKey, 33);
-    const sequence = chunkZIRFXBKL_cjs.timelockToSequence(this.csvTimelock);
+    const sequence = chunkEJOFL5WH_cjs.timelockToSequence(this.csvTimelock);
     new DataView(data.buffer, data.byteOffset + 65, 4).setUint32(0, sequence, false);
     const words = base.bech32m.toWords(data);
     return base.bech32m.encode(this.hrp, words, 1023);
@@ -5622,7 +5691,7 @@ var ArkadeCash = class _ArkadeCash {
     return SingleKey.fromPrivateKey(this._privateKey);
   }
   get vtxoScript() {
-    return new chunkPXPPZF5K_cjs.DefaultVtxo.Script({
+    return new chunk6YUACVX4_cjs.DefaultVtxo.Script({
       pubKey: this._publicKey,
       serverPubKey: this._serverPubKey,
       csvTimelock: this.csvTimelock
@@ -5883,7 +5952,7 @@ async function captureExitBranch(params) {
     const nonCommitment = ordered.filter((c) => chainTxTypeToChainedExit(c.type) !== 1 /* Commitment */).map((c) => c.txid);
     if (nonCommitment.length > 0) {
       for (const psbt of await resolver.getVirtualTxs(nonCommitment)) {
-        psbtByTxid.set(chunkZIRFXBKL_cjs.Transaction.fromPSBT(base.base64.decode(psbt)).id, psbt);
+        psbtByTxid.set(chunkEJOFL5WH_cjs.Transaction.fromPSBT(base.base64.decode(psbt)).id, psbt);
       }
     }
   }
@@ -5926,10 +5995,10 @@ var IndexerExitDataSource = class {
     while (hasMore) {
       const { chain: page, page: meta } = await this.indexer.getVtxoChain(
         { txid: vtxo.txid, vout: vtxo.vout },
-        { pageIndex, pageSize: chunkZIRFXBKL_cjs.DEFAULT_PAGE_SIZE }
+        { pageIndex, pageSize: chunkEJOFL5WH_cjs.DEFAULT_PAGE_SIZE }
       );
       chain.push(...page);
-      hasMore = meta ? page.length === chunkZIRFXBKL_cjs.DEFAULT_PAGE_SIZE : false;
+      hasMore = meta ? page.length === chunkEJOFL5WH_cjs.DEFAULT_PAGE_SIZE : false;
       pageIndex++;
     }
     return chain;
@@ -5941,12 +6010,12 @@ var IndexerExitDataSource = class {
     while (hasMore) {
       const { txs, page } = await this.indexer.getVirtualTxs(txids, {
         pageIndex,
-        pageSize: chunkZIRFXBKL_cjs.DEFAULT_PAGE_SIZE
+        pageSize: chunkEJOFL5WH_cjs.DEFAULT_PAGE_SIZE
       });
       for (const psbt of txs) {
-        out.set(chunkZIRFXBKL_cjs.Transaction.fromPSBT(base.base64.decode(psbt)).id, psbt);
+        out.set(chunkEJOFL5WH_cjs.Transaction.fromPSBT(base.base64.decode(psbt)).id, psbt);
       }
-      hasMore = page ? txs.length === chunkZIRFXBKL_cjs.DEFAULT_PAGE_SIZE : false;
+      hasMore = page ? txs.length === chunkEJOFL5WH_cjs.DEFAULT_PAGE_SIZE : false;
       pageIndex++;
     }
     return out;
@@ -5967,7 +6036,7 @@ function chainedTxTypeToChainTxType(t) {
   }
 }
 function psbtInputTxids(psbtBase64) {
-  const tx = chunkZIRFXBKL_cjs.Transaction.fromPSBT(base.base64.decode(psbtBase64));
+  const tx = chunkEJOFL5WH_cjs.Transaction.fromPSBT(base.base64.decode(psbtBase64));
   const ids = [];
   for (let i = 0; i < tx.inputsLength; i++) {
     const txid = tx.getInput(i).txid;
@@ -6326,10 +6395,10 @@ async function resolveArkInfo(arkProvider, walletRepository) {
   try {
     info = await arkProvider.getInfo();
   } catch (err) {
-    if (!chunkZIRFXBKL_cjs.isRetryableProviderError(err)) throw err;
+    if (!chunkEJOFL5WH_cjs.isRetryableProviderError(err)) throw err;
     const snapshot = await loadArkInfoSnapshot(walletRepository);
     if (!snapshot) {
-      throw new chunkZIRFXBKL_cjs.ProviderUnavailableError(
+      throw new chunkEJOFL5WH_cjs.ProviderUnavailableError(
         "Arkade server info is unavailable and no cached snapshot exists",
         { cause: err }
       );
@@ -6412,6 +6481,13 @@ var TxTree = class {
     if (nbOfInputs !== 1) {
       throw new Error(`unexpected number of inputs: ${nbOfInputs}, expected 1`);
     }
+    if (this.root.lockTime !== 0) {
+      throw new Error(`unexpected locktime: ${this.root.lockTime}, expected 0`);
+    }
+    const sequence = this.root.getInput(0).sequence;
+    if (sequence !== void 0 && sequence !== btcSigner.DEFAULT_SEQUENCE) {
+      throw new Error(`unexpected sequence: ${sequence}, expected ${btcSigner.DEFAULT_SEQUENCE}`);
+    }
     if (this.children.size > nbOfOutputs - 1) {
       throw new Error(
         `unexpected number of children: ${this.children.size}, expected maximum ${nbOfOutputs - 1}`
@@ -6712,7 +6788,7 @@ function collectArkTxidsNeedingCreatedAt(vtxos) {
   return [...txids];
 }
 async function buildTransactionHistory(vtxos, allBoardingTxs, commitmentsToIgnore, resolveTxCreatedAt) {
-  const fromOldestVtxo = vtxos.map(chunkZIRFXBKL_cjs.normalizeVtxo).sort((a, b) => a.createdAt.getTime() - b.createdAt.getTime());
+  const fromOldestVtxo = vtxos.map(chunkEJOFL5WH_cjs.normalizeVtxo).sort((a, b) => a.createdAt.getTime() - b.createdAt.getTime());
   const txidsNeedingCreatedAt = resolveTxCreatedAt ? collectArkTxidsNeedingCreatedAt(fromOldestVtxo) : [];
   const resolvedCreatedAt = resolveTxCreatedAt && txidsNeedingCreatedAt.length > 0 ? await resolveTxCreatedAt(txidsNeedingCreatedAt) : /* @__PURE__ */ new Map();
   const unmatchedSettledBoardingTxs = allBoardingTxs.filter(isSettledBoardingReceive).sort((a, b) => a.createdAt - b.createdAt);
@@ -6876,7 +6952,7 @@ var AssetManager = class extends ReadonlyAssetManager {
     const virtualCoins = await this.wallet.getSpendableVtxos({
       withRecoverable: false
     });
-    const controlAssetRef = params.controlAssetId ? chunk3S3JZUEN_cjs.AssetRef.fromId(chunk3S3JZUEN_cjs.AssetId.fromString(params.controlAssetId)) : null;
+    const controlAssetRef = params.controlAssetId ? chunkPJR63FTK_cjs.AssetRef.fromId(chunkPJR63FTK_cjs.AssetId.fromString(params.controlAssetId)) : null;
     const coinSelection = selectVirtualCoins(virtualCoins, Number(this.wallet.dustAmount));
     let totalBtcSelected = 0n;
     const assetChanges = /* @__PURE__ */ new Map();
@@ -6889,8 +6965,8 @@ var AssetManager = class extends ReadonlyAssetManager {
       }
     }
     const groups = [];
-    const issuedAssetOutput = chunk3S3JZUEN_cjs.AssetOutput.create(0, params.amount);
-    const issuedAssetGroup = chunk3S3JZUEN_cjs.AssetGroup.create(
+    const issuedAssetOutput = chunkPJR63FTK_cjs.AssetOutput.create(0, params.amount);
+    const issuedAssetGroup = chunkPJR63FTK_cjs.AssetGroup.create(
       null,
       controlAssetRef,
       [],
@@ -6905,28 +6981,28 @@ var AssetManager = class extends ReadonlyAssetManager {
         for (const [inputIndex, assets] of assetInputs) {
           for (const asset of assets) {
             if (asset.assetId !== assetId) continue;
-            changeInputs.push(chunk3S3JZUEN_cjs.AssetInput.create(inputIndex, asset.amount));
+            changeInputs.push(chunkPJR63FTK_cjs.AssetInput.create(inputIndex, asset.amount));
           }
         }
         groups.push(
-          chunk3S3JZUEN_cjs.AssetGroup.create(
-            chunk3S3JZUEN_cjs.AssetId.fromString(assetId),
+          chunkPJR63FTK_cjs.AssetGroup.create(
+            chunkPJR63FTK_cjs.AssetId.fromString(assetId),
             null,
             changeInputs,
-            [chunk3S3JZUEN_cjs.AssetOutput.create(0, amount)],
+            [chunkPJR63FTK_cjs.AssetOutput.create(0, amount)],
             []
           )
         );
       }
     }
     const address = await this.wallet.getAddress();
-    const outputAddress = chunkZIRFXBKL_cjs.ArkAddress.decode(address);
+    const outputAddress = chunkEJOFL5WH_cjs.ArkAddress.decode(address);
     const outputs = [
       {
         script: outputAddress.pkScript,
         amount: BigInt(totalBtcSelected)
       },
-      Extension.create([chunk3S3JZUEN_cjs.Packet.create(groups)]).txOut()
+      Extension.create([chunkPJR63FTK_cjs.Packet.create(groups)]).txOut()
     ];
     const { arkTxid } = await this.wallet.buildAndSubmitOffchainTx(
       coinSelection.inputs,
@@ -6934,7 +7010,7 @@ var AssetManager = class extends ReadonlyAssetManager {
     );
     return {
       arkTxId: arkTxid,
-      assetId: chunk3S3JZUEN_cjs.AssetId.create(arkTxid, 0).toString()
+      assetId: chunkPJR63FTK_cjs.AssetId.create(arkTxid, 0).toString()
     };
   }
   /**
@@ -7006,16 +7082,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(chunk3S3JZUEN_cjs.AssetInput.create(inputIndex, asset.amount));
+        reissueInputs.push(chunkPJR63FTK_cjs.AssetInput.create(inputIndex, asset.amount));
       }
     }
     const totalAssetAmount = assetToReissueAmount + params.amount;
-    const reissueAssetIdObj = chunk3S3JZUEN_cjs.AssetId.fromString(params.assetId);
-    const reissueAssetGroup = chunk3S3JZUEN_cjs.AssetGroup.create(
+    const reissueAssetIdObj = chunkPJR63FTK_cjs.AssetId.fromString(params.assetId);
+    const reissueAssetGroup = chunkPJR63FTK_cjs.AssetGroup.create(
       reissueAssetIdObj,
       null,
       reissueInputs,
-      [chunk3S3JZUEN_cjs.AssetOutput.create(0, totalAssetAmount)],
+      [chunkPJR63FTK_cjs.AssetOutput.create(0, totalAssetAmount)],
       []
     );
     const groups = [reissueAssetGroup];
@@ -7024,27 +7100,27 @@ var AssetManager = class extends ReadonlyAssetManager {
       for (const [inputIndex, assets] of assetInputs) {
         for (const asset of assets) {
           if (asset.assetId !== assetId) continue;
-          changeInputs.push(chunk3S3JZUEN_cjs.AssetInput.create(inputIndex, asset.amount));
+          changeInputs.push(chunkPJR63FTK_cjs.AssetInput.create(inputIndex, asset.amount));
         }
       }
       groups.push(
-        chunk3S3JZUEN_cjs.AssetGroup.create(
-          chunk3S3JZUEN_cjs.AssetId.fromString(assetId),
+        chunkPJR63FTK_cjs.AssetGroup.create(
+          chunkPJR63FTK_cjs.AssetId.fromString(assetId),
           null,
           changeInputs,
-          [chunk3S3JZUEN_cjs.AssetOutput.create(0, amount)],
+          [chunkPJR63FTK_cjs.AssetOutput.create(0, amount)],
           []
         )
       );
     }
     const address = await this.wallet.getAddress();
-    const outputAddress = chunkZIRFXBKL_cjs.ArkAddress.decode(address);
+    const outputAddress = chunkEJOFL5WH_cjs.ArkAddress.decode(address);
     const outputs = [
       {
         script: outputAddress.pkScript,
         amount: BigInt(totalBtcSelected)
       },
-      Extension.create([chunk3S3JZUEN_cjs.Packet.create(groups)]).txOut()
+      Extension.create([chunkPJR63FTK_cjs.Packet.create(groups)]).txOut()
     ];
     const { arkTxid } = await this.wallet.buildAndSubmitOffchainTx(selectedCoins, outputs);
     return arkTxid;
@@ -7111,27 +7187,27 @@ var AssetManager = class extends ReadonlyAssetManager {
       for (const [inputIndex, assets] of assetInputs) {
         for (const asset of assets) {
           if (asset.assetId !== assetId) continue;
-          changeInputs.push(chunk3S3JZUEN_cjs.AssetInput.create(inputIndex, asset.amount));
+          changeInputs.push(chunkPJR63FTK_cjs.AssetInput.create(inputIndex, asset.amount));
         }
       }
       groups.push(
-        chunk3S3JZUEN_cjs.AssetGroup.create(
-          chunk3S3JZUEN_cjs.AssetId.fromString(assetId),
+        chunkPJR63FTK_cjs.AssetGroup.create(
+          chunkPJR63FTK_cjs.AssetId.fromString(assetId),
           null,
           changeInputs,
-          amount > 0n ? [chunk3S3JZUEN_cjs.AssetOutput.create(0, amount)] : [],
+          amount > 0n ? [chunkPJR63FTK_cjs.AssetOutput.create(0, amount)] : [],
           []
         )
       );
     }
     const address = await this.wallet.getAddress();
-    const outputAddress = chunkZIRFXBKL_cjs.ArkAddress.decode(address);
+    const outputAddress = chunkEJOFL5WH_cjs.ArkAddress.decode(address);
     const outputs = [
       {
         script: outputAddress.pkScript,
         amount: BigInt(totalBtcSelected)
       },
-      Extension.create([chunk3S3JZUEN_cjs.Packet.create(groups)]).txOut()
+      Extension.create([chunkPJR63FTK_cjs.Packet.create(groups)]).txOut()
     ];
     const { arkTxid } = await this.wallet.buildAndSubmitOffchainTx(selectedCoins, outputs);
     return arkTxid;
@@ -7156,7 +7232,7 @@ function castMetadata(metadata) {
     } else {
       throw new Error("Invalid metadata value type");
     }
-    md.push(chunk3S3JZUEN_cjs.Metadata.create(textEncoder.encode(key), valueBytes));
+    md.push(chunkPJR63FTK_cjs.Metadata.create(textEncoder.encode(key), valueBytes));
   }
   return md;
 }
@@ -7177,10 +7253,10 @@ var DelegateManagerImpl = class {
     if (vtxos.length === 0) {
       return { delegated: [], failed: [] };
     }
-    const destinationScript = chunkZIRFXBKL_cjs.ArkAddress.decode(destination).pkScript;
+    const destinationScript = chunkEJOFL5WH_cjs.ArkAddress.decode(destination).pkScript;
     const arkInfo = await this.arkInfoProvider.getInfo();
     const delegateInfo = await this.delegateProvider.getDelegateInfo();
-    const eligible = vtxos.map(chunkZIRFXBKL_cjs.normalizeVtxo).filter(
+    const eligible = vtxos.map(chunkEJOFL5WH_cjs.normalizeVtxo).filter(
       (v) => isAnnotated(v) && findDelegateTapLeaf(v, delegateInfo.pubkey) !== void 0
     );
     if (eligible.length === 0) {
@@ -7209,11 +7285,11 @@ var DelegateManagerImpl = class {
     const groupByExpiry = /* @__PURE__ */ new Map();
     let recoverableVtxos = [];
     for (const vtxo of eligible) {
-      if (chunkZIRFXBKL_cjs.canRecoverOnchain(vtxo, now)) {
+      if (chunkEJOFL5WH_cjs.canRecoverOnchain(vtxo, now)) {
         recoverableVtxos.push(vtxo);
         continue;
       }
-      const expiry = chunkZIRFXBKL_cjs.toBatchExpiry(vtxo);
+      const expiry = chunkEJOFL5WH_cjs.toBatchExpiry(vtxo);
       if (!expiry) continue;
       const dayKey = getDayTimestamp(expiry);
       groupByExpiry.set(dayKey, [...groupByExpiry.get(dayKey) ?? [], vtxo]);
@@ -7278,7 +7354,7 @@ async function delegate(identity, delegateProvider, arkInfo, delegateInfo, vtxos
   }
   if (!delegateAt) {
     const now = { timestamp: /* @__PURE__ */ new Date() };
-    const expiryTimestamp = vtxos.filter((coin) => !chunkZIRFXBKL_cjs.canRecoverOnchain(coin, now) && chunkZIRFXBKL_cjs.toBatchExpiry(coin)).reduce((min, coin) => Math.min(min, chunkZIRFXBKL_cjs.toBatchExpiry(coin)), Number.MAX_SAFE_INTEGER);
+    const expiryTimestamp = vtxos.filter((coin) => !chunkEJOFL5WH_cjs.canRecoverOnchain(coin, now) && chunkEJOFL5WH_cjs.toBatchExpiry(coin)).reduce((min, coin) => Math.min(min, chunkEJOFL5WH_cjs.toBatchExpiry(coin)), Number.MAX_SAFE_INTEGER);
     if (!expiryTimestamp || expiryTimestamp === Number.MAX_SAFE_INTEGER) {
       delegateAt = new Date(Date.now() + 1 * 60 * 1e3);
     } else {
@@ -7307,7 +7383,7 @@ async function delegate(identity, delegateProvider, arkInfo, delegateInfo, vtxos
   let amount = 0n;
   for (const coin of vtxos) {
     const inputFee = estimator.evalOffchainInput({
-      ...chunkZIRFXBKL_cjs.toOffchainInputFeeParams(coin),
+      ...chunkEJOFL5WH_cjs.toOffchainInputFeeParams(coin),
       type: "vtxo"
     });
     if (inputFee.value >= coin.value) {
@@ -7321,7 +7397,7 @@ async function delegate(identity, delegateProvider, arkInfo, delegateInfo, vtxos
   const delegateFee = BigInt(Number(fee));
   if (delegateFee > 0n) {
     outputs.push({
-      script: chunkZIRFXBKL_cjs.ArkAddress.decode(delegateAddress).pkScript,
+      script: chunkEJOFL5WH_cjs.ArkAddress.decode(delegateAddress).pkScript,
       amount: delegateFee
     });
   }
@@ -7354,10 +7430,10 @@ async function delegate(identity, delegateProvider, arkInfo, delegateInfo, vtxos
     destinationScript
   );
   const forfeitOutputScript = btcSigner.OutScript.encode(
-    btcSigner.Address(chunkZIRFXBKL_cjs.getNetwork(network)).decode(forfeitAddress)
+    btcSigner.Address(chunkEJOFL5WH_cjs.getNetwork(network)).decode(forfeitAddress)
   );
   const forfeits = await Promise.all(
-    vtxos.filter((v) => !chunkZIRFXBKL_cjs.canRecoverOnchain(v, { timestamp: /* @__PURE__ */ new Date() })).map(async (coin) => {
+    vtxos.filter((v) => !chunkEJOFL5WH_cjs.canRecoverOnchain(v, { timestamp: /* @__PURE__ */ new Date() })).map(async (coin) => {
       const forfeit = await makeDelegateForfeitTx(
         coin,
         dust,
@@ -7382,7 +7458,7 @@ async function makeDelegateForfeitTx(input, connectorAmount, delegatePubkey, for
         index: input.vout,
         witnessUtxo: {
           amount: BigInt(input.value),
-          script: chunkZIRFXBKL_cjs.VtxoScript.decode(input.tapTree).pkScript
+          script: chunkEJOFL5WH_cjs.VtxoScript.decode(input.tapTree).pkScript
         },
         sighashType: btcSigner.SigHash.ALL_ANYONECANPAY,
         tapLeafScript: [delegateTapLeaf]
@@ -7440,7 +7516,7 @@ async function makeSignedDelegateIntent(identity, coins, outputs, onchainOutputs
     expire_at: 0,
     cosigners_public_keys: cosignerPubKeys
   };
-  const proof = chunkZIRFXBKL_cjs.Intent.create(message, coins, outputs);
+  const proof = chunkEJOFL5WH_cjs.Intent.create(message, coins, outputs);
   const signedProof = await identity.sign(proof);
   return {
     proof: base.base64.encode(signedProof.toPSBT()),
@@ -7458,10 +7534,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 = chunkZIRFXBKL_cjs.VtxoScript.decode(vtxo.tapTree);
+  const vtxoScript = chunkEJOFL5WH_cjs.VtxoScript.decode(vtxo.tapTree);
   return vtxoScript.leaves.find((tapLeaf) => {
-    const arkTapscript = chunkZIRFXBKL_cjs.decodeTapscript(chunkZIRFXBKL_cjs.scriptFromTapLeafScript(tapLeaf));
-    if (!chunkZIRFXBKL_cjs.MultisigTapscript.is(arkTapscript)) return false;
+    const arkTapscript = chunkEJOFL5WH_cjs.decodeTapscript(chunkEJOFL5WH_cjs.scriptFromTapLeafScript(tapLeaf));
+    if (!chunkEJOFL5WH_cjs.MultisigTapscript.is(arkTapscript)) return false;
     return arkTapscript.params.pubkeys.map(base.hex.encode).includes(pk);
   });
 }
@@ -7742,7 +7818,7 @@ function createManagedConnection(dbName, version, initDatabase2) {
   };
 }
 function scriptFromArkAddress(address) {
-  return base.hex.encode(chunkZIRFXBKL_cjs.ArkAddress.decode(address).pkScript);
+  return base.hex.encode(chunkEJOFL5WH_cjs.ArkAddress.decode(address).pkScript);
 }
 
 // src/repositories/indexedDB/schema.ts
@@ -8237,7 +8313,7 @@ function validateVtxosForScript(vtxos, script, context) {
 }
 async function getVtxosForContract(repo, contract) {
   const vtxos = repo.getVtxosForScript ? await repo.getVtxosForScript(contract.script) : filterVtxosForScript(await repo.getVtxos(contract.address), contract.script);
-  return vtxos.map(chunkZIRFXBKL_cjs.normalizeVtxo);
+  return vtxos.map(chunkEJOFL5WH_cjs.normalizeVtxo);
 }
 async function saveVtxosForContract(repo, contract, vtxos) {
   if (repo.saveVtxosForScript) {
@@ -8379,7 +8455,7 @@ function decodeArkContract(encoded) {
 }
 function contractFromArkContract(encoded, options = {}) {
   const parsed = decodeArkContract(encoded);
-  const handler = chunkPXPPZF5K_cjs.contractHandlers.get(parsed.type);
+  const handler = chunk6YUACVX4_cjs.contractHandlers.get(parsed.type);
   if (!handler) {
     throw new Error(`No handler registered for contract type '${parsed.type}'`);
   }
@@ -8393,9 +8469,9 @@ function contractFromArkContract(encoded, options = {}) {
     metadata: options.metadata
   };
 }
-function contractFromArkContractWithAddress(encoded, serverPubKey, addressPrefix = chunkZIRFXBKL_cjs.DEFAULT_NETWORK.hrp, options = {}) {
+function contractFromArkContractWithAddress(encoded, serverPubKey, addressPrefix = chunkEJOFL5WH_cjs.DEFAULT_NETWORK.hrp, options = {}) {
   const parsed = decodeArkContract(encoded);
-  const handler = chunkPXPPZF5K_cjs.contractHandlers.getOrThrow(parsed.type);
+  const handler = chunk6YUACVX4_cjs.contractHandlers.getOrThrow(parsed.type);
   const params = parsed.data;
   const vtxoScript = handler.createScript(params);
   return {
@@ -8649,9 +8725,9 @@ var ContractWatcher = class {
       this.connectionState = "connected";
       this.reconnectAttempts = 0;
       this.listenLoop().catch((e) => {
-        if (chunkZIRFXBKL_cjs.isEventSourceError(e)) {
+        if (chunkEJOFL5WH_cjs.isEventSourceError(e)) {
           console.debug("ContractWatcher subscription disconnected; reconnecting");
-        } else if (!chunkZIRFXBKL_cjs.isEventSourceUnavailableError(e)) {
+        } else if (!chunkEJOFL5WH_cjs.isEventSourceUnavailableError(e)) {
           console.error(e);
         }
         this.connectionState = "disconnected";
@@ -8663,7 +8739,7 @@ var ContractWatcher = class {
         this.scheduleReconnect();
       });
     } catch (error) {
-      if (!chunkZIRFXBKL_cjs.isEventSourceUnavailableError(error)) {
+      if (!chunkEJOFL5WH_cjs.isEventSourceUnavailableError(error)) {
         console.error("ContractWatcher connection failed:", error);
       }
       this.connectionState = "disconnected";
@@ -8689,7 +8765,7 @@ var ContractWatcher = class {
    * slower; what it loses is push latency.
    */
   reportEventSourceUnavailable(error) {
-    if (!chunkZIRFXBKL_cjs.isEventSourceUnavailableError(error)) return false;
+    if (!chunkEJOFL5WH_cjs.isEventSourceUnavailableError(error)) return false;
     if (!this.eventSourceReported) {
       this.eventSourceReported = true;
       console.warn(
@@ -8905,14 +8981,14 @@ var ContractWatcher = class {
     const timestamp = Date.now();
     if (update.newVtxos?.length) {
       this.processSubscriptionVtxos(
-        update.newVtxos.map(chunkZIRFXBKL_cjs.normalizeVtxo),
+        update.newVtxos.map(chunkEJOFL5WH_cjs.normalizeVtxo),
         "vtxo_received",
         timestamp
       );
     }
     if (update.spentVtxos?.length) {
       this.processSubscriptionVtxos(
-        update.spentVtxos.map(chunkZIRFXBKL_cjs.normalizeVtxo),
+        update.spentVtxos.map(chunkEJOFL5WH_cjs.normalizeVtxo),
         "vtxo_spent",
         timestamp
       );
@@ -9007,7 +9083,7 @@ var NON_TERMINAL_INTENT_STATES = ALL_INTENT_STATES.filter(
   (s) => !isTerminalIntentState(s)
 );
 function isConsumed(vtxo) {
-  return vtxo !== void 0 && (vtxo.isSpent === true || vtxo.settledBy !== void 0);
+  return vtxo !== void 0 && chunkEJOFL5WH_cjs.hasTerminalSpend(vtxo);
 }
 async function classifyIntent(intent, vtxosByOutpoint, now) {
   if (isTerminalIntentState(intent.state)) return void 0;
@@ -9017,6 +9093,11 @@ async function classifyIntent(intent, vtxosByOutpoint, now) {
     const commitmentTransactionId = intent.commitmentTransactionId ?? consumed.map((v) => v?.settledBy).find((s) => !!s);
     return terminal(intent, "batch_succeeded", now, { commitmentTransactionId });
   }
+  if (consumed.some((vtxo) => vtxo?.isUnrolled)) {
+    return terminal(intent, "cancelled", now, {
+      cancellationReason: "reconciliation: an input was unilaterally exited"
+    });
+  }
   if (intent.state === "waiting_to_submit") {
     return terminal(intent, "cancelled", now, {
       cancellationReason: "reconciliation: intent was never submitted before restart"
@@ -9045,7 +9126,7 @@ async function reconcileIntents(deps) {
   let vtxosByOutpoint = /* @__PURE__ */ new Map();
   if (outpoints.length > 0) {
     try {
-      const { vtxos } = await chunkZIRFXBKL_cjs.getNormalizedVtxos(deps.indexerProvider, { outpoints });
+      const { vtxos } = await chunkEJOFL5WH_cjs.getNormalizedVtxos(deps.indexerProvider, { outpoints });
       vtxosByOutpoint = new Map(vtxos.map((v) => [outpointKey(v), v]));
     } catch (e) {
       console.error("reconcileIntents: failed to fetch input VTXO state", e);
@@ -9219,7 +9300,7 @@ var ContractManager = class _ContractManager {
       await this.reconcileWatched();
       this.markSyncOnline();
     } catch (err) {
-      if (!chunkZIRFXBKL_cjs.isRetryableProviderError(err)) throw err;
+      if (!chunkEJOFL5WH_cjs.isRetryableProviderError(err)) throw err;
       this.markSyncDegraded(err);
     }
     this.initialized = true;
@@ -9351,7 +9432,7 @@ var ContractManager = class _ContractManager {
     const from = Math.max(0, watermark - lookAhead.size);
     const to = watermark + lookAhead.size;
     const deps = lookAhead.candidateDeps();
-    const handlers = chunkPXPPZF5K_cjs.contractHandlers.getRegisteredTypes().map((t) => chunkPXPPZF5K_cjs.contractHandlers.get(t)).filter(hasCandidates);
+    const handlers = chunk6YUACVX4_cjs.contractHandlers.getRegisteredTypes().map((t) => chunk6YUACVX4_cjs.contractHandlers.get(t)).filter(hasCandidates);
     const band = /* @__PURE__ */ new Map();
     for (let index = from; index <= to; index++) {
       const descriptor = lookAhead.materialize(index);
@@ -9362,7 +9443,7 @@ var ContractManager = class _ContractManager {
             index,
             params: {
               ...candidate,
-              ...chunkPXPPZF5K_cjs.speculativeReceiveMetadata(descriptor)
+              ...chunk6YUACVX4_cjs.speculativeReceiveMetadata(descriptor)
             }
           });
         }
@@ -9424,7 +9505,7 @@ var ContractManager = class _ContractManager {
       });
       for (const entry of pending) entry.catchUpPending = false;
     } catch (err) {
-      if (!chunkZIRFXBKL_cjs.isRetryableProviderError(err)) throw err;
+      if (!chunkEJOFL5WH_cjs.isRetryableProviderError(err)) throw err;
       this.markSyncDegraded(err);
     }
   }
@@ -9474,7 +9555,7 @@ var ContractManager = class _ContractManager {
         await this.fetchContractVxosFromIndexer([contract]);
         this.markSyncOnline();
       } catch (err) {
-        if (!chunkZIRFXBKL_cjs.isRetryableProviderError(err)) throw err;
+        if (!chunkEJOFL5WH_cjs.isRetryableProviderError(err)) throw err;
         this.markSyncDegraded(err);
       }
       await this.watcher.addContract(contract);
@@ -9511,7 +9592,7 @@ var ContractManager = class _ContractManager {
     return result;
   }
   async upsertContractRow(params) {
-    const handler = chunkPXPPZF5K_cjs.contractHandlers.get(params.type);
+    const handler = chunk6YUACVX4_cjs.contractHandlers.get(params.type);
     if (!handler) {
       throw new Error(`No handler registered for contract type '${params.type}'`);
     }
@@ -9611,7 +9692,7 @@ var ContractManager = class _ContractManager {
         `scanContracts: batchSize must be a positive integer (got ${String(opts.batchSize)})`
       );
     }
-    const registered = chunkPXPPZF5K_cjs.contractHandlers.getRegisteredTypes().map((t) => chunkPXPPZF5K_cjs.contractHandlers.get(t)).filter(isDiscoverable);
+    const registered = chunk6YUACVX4_cjs.contractHandlers.getRegisteredTypes().map((t) => chunk6YUACVX4_cjs.contractHandlers.get(t)).filter(isDiscoverable);
     const discoverables = [
       ...registered.filter((h) => h.type === "boarding"),
       ...registered.filter((h) => h.type !== "boarding")
@@ -9746,7 +9827,7 @@ var ContractManager = class _ContractManager {
       await this.syncContracts({ contracts, pageSize });
       this.markSyncOnline();
     } catch (err) {
-      if (!chunkZIRFXBKL_cjs.isRetryableProviderError(err)) throw err;
+      if (!chunkEJOFL5WH_cjs.isRetryableProviderError(err)) throw err;
       this.markSyncDegraded(err);
     }
     const vtxos = await this.getVtxosForContracts(contracts);
@@ -9767,7 +9848,7 @@ var ContractManager = class _ContractManager {
     }
     const tapscriptCache = tapscripts ?? /* @__PURE__ */ new Map();
     return vtxos.map(
-      (vtxo) => extendVirtualCoinForContract(chunkZIRFXBKL_cjs.normalizeVtxo(vtxo), byScript, tapscriptCache)
+      (vtxo) => extendVirtualCoinForContract(chunkEJOFL5WH_cjs.normalizeVtxo(vtxo), byScript, tapscriptCache)
     );
   }
   /** @inheritdoc */
@@ -9811,14 +9892,14 @@ var ContractManager = class _ContractManager {
     const byScript = new Map(contracts.map((contract) => [contract.script, contract]));
     const asking = vtxos.filter((vtxo) => {
       const contract = byScript.get(vtxo.script);
-      return contract !== void 0 && chunkPXPPZF5K_cjs.contractHandlers.get(contract.type)?.assertSpendableNow !== void 0;
+      return contract !== void 0 && chunk6YUACVX4_cjs.contractHandlers.get(contract.type)?.assertSpendableNow !== void 0;
     });
     if (asking.length === 0) return refused;
     const tip = await this.currentChainTip();
     const walletKey = await walletPubKey?.();
     for (const vtxo of asking) {
       const contract = byScript.get(vtxo.script);
-      const handler = chunkPXPPZF5K_cjs.contractHandlers.get(contract.type);
+      const handler = chunk6YUACVX4_cjs.contractHandlers.get(contract.type);
       if (!handler?.assertSpendableNow) continue;
       const context = {
         collaborative: true,
@@ -9833,7 +9914,7 @@ var ContractManager = class _ContractManager {
         // the next handler to answer a CSV question would meet a
         // TypeError instead of a `false`. Carry the coin only when it
         // really is one.
-        vtxo: chunkZIRFXBKL_cjs.isVirtualCoin(vtxo) && "status" in vtxo ? vtxo : void 0
+        vtxo: chunkEJOFL5WH_cjs.isVirtualCoin(vtxo) && "status" in vtxo ? vtxo : void 0
       };
       try {
         await handler.assertSpendableNow(
@@ -9989,7 +10070,7 @@ var ContractManager = class _ContractManager {
     const { contractScript, collaborative = true, walletPubKey, vtxo } = options;
     const [contract] = await this.getContracts({ script: contractScript });
     if (!contract) return [];
-    const handler = chunkPXPPZF5K_cjs.contractHandlers.get(contract.type);
+    const handler = chunk6YUACVX4_cjs.contractHandlers.get(contract.type);
     if (!handler) return [];
     const script = handler.createScript(contract.params);
     const tip = await this.currentChainTip();
@@ -10017,7 +10098,7 @@ var ContractManager = class _ContractManager {
     const { contractScript, collaborative = true, walletPubKey } = options;
     const [contract] = await this.getContracts({ script: contractScript });
     if (!contract) return [];
-    const handler = chunkPXPPZF5K_cjs.contractHandlers.get(contract.type);
+    const handler = chunk6YUACVX4_cjs.contractHandlers.get(contract.type);
     if (!handler) return [];
     const script = handler.createScript(contract.params);
     const context = {
@@ -10073,7 +10154,7 @@ var ContractManager = class _ContractManager {
   }
   async refreshOutpoints(outpoints) {
     if (outpoints.length === 0) return;
-    const { vtxos } = await chunkZIRFXBKL_cjs.getNormalizedVtxos(this.config.indexerProvider, {
+    const { vtxos } = await chunkEJOFL5WH_cjs.getNormalizedVtxos(this.config.indexerProvider, {
       outpoints
     });
     if (vtxos.length === 0) return;
@@ -10152,7 +10233,7 @@ var ContractManager = class _ContractManager {
           break;
       }
     } catch (err) {
-      if (!chunkZIRFXBKL_cjs.isRetryableProviderError(err)) throw err;
+      if (!chunkEJOFL5WH_cjs.isRetryableProviderError(err)) throw err;
       this.markSyncDegraded(err);
     }
     this.emitEvent(event);
@@ -10231,7 +10312,7 @@ var ContractManager = class _ContractManager {
    */
   async reconcilePendingFrontier(contracts) {
     const scriptToContract = new Map(contracts.map((c) => [c.script, c]));
-    const vtxos = await chunkZIRFXBKL_cjs.getAllNormalizedVtxos(
+    const vtxos = await chunkEJOFL5WH_cjs.getAllNormalizedVtxos(
       this.config.indexerProvider,
       contracts.map((c) => c.script),
       { pendingOnly: true }
@@ -10314,7 +10395,7 @@ var ContractManager = class _ContractManager {
     }
     return result;
   }
-  async fetchContractVtxosBulk(contracts, pageSize = chunkZIRFXBKL_cjs.DEFAULT_PAGE_SIZE, syncWindow) {
+  async fetchContractVtxosBulk(contracts, pageSize = chunkEJOFL5WH_cjs.DEFAULT_PAGE_SIZE, syncWindow) {
     if (contracts.length === 0) {
       return { vtxosByScript: /* @__PURE__ */ new Map(), promoted: /* @__PURE__ */ new Map() };
     }
@@ -10330,7 +10411,7 @@ var ContractManager = class _ContractManager {
         before: syncWindow.before
       }
     } : {};
-    const vtxos = await chunkZIRFXBKL_cjs.getAllNormalizedVtxos(
+    const vtxos = await chunkEJOFL5WH_cjs.getAllNormalizedVtxos(
       this.config.indexerProvider,
       contracts.map((c) => c.script),
       { ...windowOpts, pageSize }
@@ -10475,7 +10556,7 @@ var deserializeTapLeaf = (t) => {
   const s = base.hex.decode(t.s);
   return [cb, s];
 };
-var deserializeVtxo = (o) => chunkZIRFXBKL_cjs.normalizeVtxo({
+var deserializeVtxo = (o) => chunkEJOFL5WH_cjs.normalizeVtxo({
   ...o,
   createdAt: new Date(o.createdAt),
   tapTree: base.hex.decode(o.tapTree),
@@ -11298,7 +11379,7 @@ var HDDescriptorProvider = class _HDDescriptorProvider {
    */
   materializeDescriptorAt(index) {
     const descriptor = this.identity.descriptor;
-    const network = chunkPXPPZF5K_cjs.isMainnetDescriptor(descriptor) ? descriptorsScure.networks.bitcoin : descriptorsScure.networks.testnet;
+    const network = chunk6YUACVX4_cjs.isMainnetDescriptor(descriptor) ? descriptorsScure.networks.bitcoin : descriptorsScure.networks.testnet;
     const expansion = descriptorsScure.expand({ descriptor, network, index });
     const keyInfo = expansion.expansionMap?.["@0"];
     if (!keyInfo?.keyExpression) {
@@ -11446,7 +11527,7 @@ var WalletReceiveRotator = class _WalletReceiveRotator {
     const provider = await resolveDescriptorProvider(config, setup.walletRepository);
     if (!provider) return void 0;
     const allowSilentFallback = (config.walletMode ?? "auto") === "auto";
-    const expectedContractType = setup.offchainTapscript instanceof chunkPXPPZF5K_cjs.DelegateVtxo.Script ? "delegate" : "default";
+    const expectedContractType = setup.offchainTapscript instanceof chunk6YUACVX4_cjs.DelegateVtxo.Script ? "delegate" : "default";
     const factoryOpts = {
       walletRepository: setup.walletRepository,
       contractRepository: setup.contractRepository,
@@ -11626,7 +11707,9 @@ var WalletReceiveRotator = class _WalletReceiveRotator {
     const { tapscript: newTapscript, params } = buildReceiveContract(
       wallet.offchainTapscript,
       descriptor,
-      wallet.network.hrp);
+      wallet.network.hrp,
+      true
+    );
     const newScript = params.script;
     const manager = await wallet.getContractManager();
     await manager.createContract(params);
@@ -11645,7 +11728,7 @@ var WalletReceiveRotator = class _WalletReceiveRotator {
 };
 function deriveLeafPubkey(descriptor) {
   try {
-    return chunkPXPPZF5K_cjs.deriveDescriptorLeafPubKey(descriptor);
+    return chunk6YUACVX4_cjs.deriveDescriptorLeafPubKey(descriptor);
   } catch (e) {
     throw new NonRangeableDescriptorError(
       "Cannot derive leaf pubkey: descriptor is not a materialized, parsable tr(...) shape.",
@@ -11657,7 +11740,7 @@ function buildReceiveContract(current, descriptor, hrp, tagSource) {
   const pubKey = deriveLeafPubkey(descriptor);
   const tapscript = rebuildTapscript(current, pubKey);
   const serverPubKey = tapscript.options.serverPubKey;
-  const csvTimelock = chunkZIRFXBKL_cjs.timelockToSequence(tapscript.options.csvTimelock).toString();
+  const csvTimelock = chunkEJOFL5WH_cjs.timelockToSequence(tapscript.options.csvTimelock).toString();
   const base$1 = {
     script: base.hex.encode(tapscript.pkScript),
     address: tapscript.address(hrp, serverPubKey).encode(),
@@ -11668,11 +11751,11 @@ function buildReceiveContract(current, descriptor, hrp, tagSource) {
     // index-0 key. Without it, spends produce unsigned PSBTs that the
     // server rejects with `INVALID_PSBT_INPUT (5): missing tapscript spend sig`.
     metadata: {
-      ...{ source: chunkPXPPZF5K_cjs.WALLET_RECEIVE_SOURCE },
+      ...tagSource && { source: chunk6YUACVX4_cjs.WALLET_RECEIVE_SOURCE },
       signingDescriptor: descriptor
     }
   };
-  const params = tapscript instanceof chunkPXPPZF5K_cjs.DelegateVtxo.Script ? {
+  const params = tapscript instanceof chunk6YUACVX4_cjs.DelegateVtxo.Script ? {
     ...base$1,
     type: "delegate",
     params: {
@@ -11693,10 +11776,10 @@ function buildReceiveContract(current, descriptor, hrp, tagSource) {
   return { tapscript, params };
 }
 function rebuildTapscript(current, pubKey) {
-  if (current instanceof chunkPXPPZF5K_cjs.DelegateVtxo.Script) {
-    return new chunkPXPPZF5K_cjs.DelegateVtxo.Script({ ...current.options, pubKey });
+  if (current instanceof chunk6YUACVX4_cjs.DelegateVtxo.Script) {
+    return new chunk6YUACVX4_cjs.DelegateVtxo.Script({ ...current.options, pubKey });
   }
-  return new chunkPXPPZF5K_cjs.DefaultVtxo.Script({ ...current.options, pubKey });
+  return new chunk6YUACVX4_cjs.DefaultVtxo.Script({ ...current.options, pubKey });
 }
 async function pickActiveReceive(contractRepository, serverPubKey, expectedType) {
   const candidates = await contractRepository.getContracts({
@@ -11705,7 +11788,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 === chunkPXPPZF5K_cjs.WALLET_RECEIVE_SOURCE
+    (c) => c.params.serverPubKey === serverPubKeyHex && c.metadata?.source === chunk6YUACVX4_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);
@@ -11752,6 +11835,7 @@ function computeOffchainBalance(vtxos, caps) {
   let intentLocked = 0;
   let recoverable = 0;
   let pendingRecovery = 0;
+  let unrolled = 0;
   const owned = /* @__PURE__ */ new Map();
   const spendable = /* @__PURE__ */ new Map();
   const addAssets = (into, vtxo) => {
@@ -11760,17 +11844,21 @@ function computeOffchainBalance(vtxos, caps) {
     }
   };
   for (const vtxo of vtxos) {
-    if (chunkZIRFXBKL_cjs.hasTerminalSpend(vtxo)) continue;
+    if (chunkEJOFL5WH_cjs.hasTerminalSpend(vtxo)) continue;
     addAssets(owned, vtxo);
+    if (vtxo.isUnrolled) {
+      unrolled += vtxo.value;
+      continue;
+    }
     if (isPendingRecovery(vtxo)) {
       pendingRecovery += vtxo.value;
       continue;
     }
-    if (chunkZIRFXBKL_cjs.canRecoverOnchain(vtxo, now)) {
+    if (chunkEJOFL5WH_cjs.canRecoverOnchain(vtxo, now)) {
       recoverable += vtxo.value;
       continue;
     }
-    if (!chunkZIRFXBKL_cjs.canSpendOffchain(vtxo, now)) continue;
+    if (!chunkEJOFL5WH_cjs.canSpendOffchain(vtxo, now)) continue;
     if (vtxo.isPreconfirmed) {
       preconfirmed += vtxo.value;
     } else {
@@ -11794,7 +11882,8 @@ function computeOffchainBalance(vtxos, caps) {
     intentLocked,
     recoverable,
     pendingRecovery,
-    total: settled + preconfirmed + recoverable + pendingRecovery,
+    unrolled,
+    total: settled + preconfirmed + recoverable + pendingRecovery + unrolled,
     assets: toAssets(owned),
     availableAssets: toAssets(spendable)
   };
@@ -11939,12 +12028,12 @@ var InputSignerRouter = class {
 };
 
 // src/wallet/wallet.ts
-var getArkadeServerUrl = ({ arkServerUrl }) => arkServerUrl || chunkZIRFXBKL_cjs.DEFAULT_ARKADE_SERVER_URL;
+var getArkadeServerUrl = ({ arkServerUrl }) => arkServerUrl || chunkEJOFL5WH_cjs.DEFAULT_ARKADE_SERVER_URL;
 function intentProofJobs(coins) {
   if (coins.length === 0) return [];
   const coinJobs = coins.map((coin, i) => ({
     index: i + 1,
-    lookupScript: chunkZIRFXBKL_cjs.VtxoScript.decode(coin.tapTree).pkScript
+    lookupScript: chunkEJOFL5WH_cjs.VtxoScript.decode(coin.tapTree).pkScript
   }));
   return [{ index: 0, lookupScript: coinJobs[0].lookupScript }, ...coinJobs];
 }
@@ -11976,7 +12065,7 @@ function dedupeTimelocks(timelocks) {
   const seen = /* @__PURE__ */ new Set();
   const deduped = [];
   for (const timelock of timelocks) {
-    const sequence = chunkZIRFXBKL_cjs.timelockToSequence(timelock).toString();
+    const sequence = chunkEJOFL5WH_cjs.timelockToSequence(timelock).toString();
     if (seen.has(sequence)) continue;
     seen.add(sequence);
     deduped.push(timelock);
@@ -11993,7 +12082,7 @@ async function resolveBoardingBootTapscript(contractRepository, serverPubKey, ba
     state: "active"
   });
   const newest = candidates.filter(
-    (c) => c.params.serverPubKey === serverPubKeyHex && c.metadata?.source === chunkPXPPZF5K_cjs.WALLET_RECEIVE_SOURCE
+    (c) => c.params.serverPubKey === serverPubKeyHex && c.metadata?.source === chunk6YUACVX4_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);
@@ -12001,7 +12090,7 @@ async function resolveBoardingBootTapscript(contractRepository, serverPubKey, ba
   if (!newest?.params.pubKey) return baseline;
   try {
     const pubKey = base.hex.decode(newest.params.pubKey);
-    return new chunkPXPPZF5K_cjs.DefaultVtxo.Script({ ...baseline.options, pubKey });
+    return new chunk6YUACVX4_cjs.DefaultVtxo.Script({ ...baseline.options, pubKey });
   } catch (e) {
     console.warn("Skipping malformed boarding contract at boot", newest.script, e);
     return baseline;
@@ -12017,16 +12106,20 @@ function filterSnapshotVtxos(snapshot, filter, pendingSpendOutpoints) {
     if (pendingSpendOutpoints.has(`${vtxo.txid}:${vtxo.vout}`)) {
       return false;
     }
-    if (!chunkZIRFXBKL_cjs.hasTerminalSpend(vtxo)) {
-      if (!f.withRecoverable && chunkZIRFXBKL_cjs.canRecoverOnchain(vtxo, now)) {
-        return false;
-      }
-      return true;
+    if (vtxo.isUnrolled) {
+      return !!f.withUnrolled;
+    }
+    if (chunkEJOFL5WH_cjs.hasTerminalSpend(vtxo)) {
+      return false;
+    }
+    if (!f.withRecoverable && chunkEJOFL5WH_cjs.canRecoverOnchain(vtxo, now)) {
+      return false;
     }
-    return !!(f.withUnrolled && vtxo.isUnrolled);
+    return true;
   });
 }
 var PENDING_RECOVERY_REASON = "is past its operator signer's rotation cutoff \u2014 the operator will not co-sign it until it recovers";
+var UNROLLED_REASON = "was unilaterally exited and lives onchain \u2014 `Unroll.completeUnroll` is the only spend that reaches it";
 function omittedOutpoints(before, after) {
   if (before.length === after.length) return /* @__PURE__ */ new Set();
   const kept = new Set(after.map((vtxo) => `${vtxo.txid}:${vtxo.vout}`));
@@ -12359,7 +12452,7 @@ var ReadonlyWallet = class _ReadonlyWallet {
    */
   static async setupWalletConfig(config, pubKey) {
     const arkadeServerUrl = getArkadeServerUrl(config);
-    const arkProvider = config.arkProvider || new chunkZIRFXBKL_cjs.RestArkProvider(arkadeServerUrl);
+    const arkProvider = config.arkProvider || new chunkEJOFL5WH_cjs.RestArkProvider(arkadeServerUrl);
     let indexerProvider = config.indexerProvider;
     if (!indexerProvider) {
       let indexerUrl = config.indexerUrl;
@@ -12376,7 +12469,7 @@ var ReadonlyWallet = class _ReadonlyWallet {
           indexerUrl = arkadeServerUrl;
         }
       }
-      indexerProvider = new chunk3S3JZUEN_cjs.RestIndexerProvider(indexerUrl);
+      indexerProvider = new chunkPJR63FTK_cjs.RestIndexerProvider(indexerUrl);
     }
     const walletRepository = config.storage?.walletRepository ?? new IndexedDBWalletRepository();
     const contractRepository = config.storage?.contractRepository ?? new IndexedDBContractRepository();
@@ -12385,7 +12478,7 @@ var ReadonlyWallet = class _ReadonlyWallet {
       source: serverInfoSource,
       lastOnlineAt: serverInfoLastOnlineAt
     } = await resolveArkInfo(arkProvider, walletRepository);
-    const network = chunkZIRFXBKL_cjs.getNetwork(info.network);
+    const network = chunkEJOFL5WH_cjs.getNetwork(info.network);
     if ("descriptor" in config.identity) {
       const descriptor = config.identity.descriptor;
       const identityIsMainnet = !descriptor.includes("tpub");
@@ -12425,18 +12518,18 @@ var ReadonlyWallet = class _ReadonlyWallet {
       value: info.boardingExitDelay,
       type: info.boardingExitDelay < 512n ? "blocks" : "seconds"
     };
-    const serverPubKey = chunkPXPPZF5K_cjs.toXOnly(base.hex.decode(info.signerPubkey), "ark signer key");
-    const delegatePubKey = config.delegateProvider ? await config.delegateProvider.getDelegateInfo().then((info2) => chunkPXPPZF5K_cjs.toXOnly(base.hex.decode(info2.pubkey), "delegate key")).catch(() => void 0) : config.delegatorProvider ? await config.delegatorProvider.getDelegateInfo().then((info2) => chunkPXPPZF5K_cjs.toXOnly(base.hex.decode(info2.pubkey), "delegate key")).catch(() => void 0) : void 0;
+    const serverPubKey = chunk6YUACVX4_cjs.toXOnly(base.hex.decode(info.signerPubkey), "ark signer key");
+    const delegatePubKey = config.delegateProvider ? await config.delegateProvider.getDelegateInfo().then((info2) => chunk6YUACVX4_cjs.toXOnly(base.hex.decode(info2.pubkey), "delegate key")).catch(() => void 0) : config.delegatorProvider ? await config.delegatorProvider.getDelegateInfo().then((info2) => chunk6YUACVX4_cjs.toXOnly(base.hex.decode(info2.pubkey), "delegate key")).catch(() => void 0) : void 0;
     const offchainOptions = {
       pubKey,
       serverPubKey,
       csvTimelock: exitTimelock
     };
-    const offchainTapscript = !delegatePubKey ? new chunkPXPPZF5K_cjs.DefaultVtxo.Script(offchainOptions) : new chunkPXPPZF5K_cjs.DelegateVtxo.Script({ ...offchainOptions, delegatePubKey });
-    const boardingTapscript = chunkPXPPZF5K_cjs.BoardingContractHandler.createScript({
+    const offchainTapscript = !delegatePubKey ? new chunk6YUACVX4_cjs.DefaultVtxo.Script(offchainOptions) : new chunk6YUACVX4_cjs.DelegateVtxo.Script({ ...offchainOptions, delegatePubKey });
+    const boardingTapscript = chunk6YUACVX4_cjs.BoardingContractHandler.createScript({
       pubKey: base.hex.encode(pubKey),
       serverPubKey: base.hex.encode(serverPubKey),
-      csvTimelock: chunkZIRFXBKL_cjs.timelockToSequence(boardingTimelock).toString()
+      csvTimelock: chunkEJOFL5WH_cjs.timelockToSequence(boardingTimelock).toString()
     });
     return {
       arkProvider,
@@ -12526,7 +12619,11 @@ var ReadonlyWallet = class _ReadonlyWallet {
       this.getBoardingUtxos(),
       this.contractSnapshot()
     ]);
-    const vtxos = filterSnapshotVtxos(snapshot, void 0, this._pendingSpendOutpoints);
+    const vtxos = filterSnapshotVtxos(
+      snapshot,
+      { withRecoverable: true, withUnrolled: true },
+      this._pendingSpendOutpoints
+    );
     let confirmed = 0;
     let unconfirmed = 0;
     for (const utxo of boardingUtxos) {
@@ -12554,6 +12651,7 @@ var ReadonlyWallet = class _ReadonlyWallet {
       intentLocked: offchain.intentLocked,
       recoverable: offchain.recoverable,
       pendingRecovery: offchain.pendingRecovery,
+      unrolled: offchain.unrolled,
       total: totalBoarding + offchain.total,
       assets: offchain.assets,
       availableAssets: offchain.availableAssets
@@ -12594,6 +12692,13 @@ var ReadonlyWallet = class _ReadonlyWallet {
         "is locked by an in-flight settlement intent"
       )
     ]);
+    if (!filter?.withUnrolled) {
+      logExcludedVtxos(
+        "getSpendableVtxos",
+        snapshot.flatMap((contract) => contract.vtxos).filter((vtxo) => vtxo.isUnrolled && !chunkEJOFL5WH_cjs.hasTerminalSpend(vtxo)),
+        [() => UNROLLED_REASON]
+      );
+    }
     return unlocked;
   }
   /**
@@ -12733,7 +12838,7 @@ var ReadonlyWallet = class _ReadonlyWallet {
     const response = await contractManager.getContractsWithVtxos();
     const allVtxos = response.flatMap((_) => _.vtxos);
     const { boardingTxs, commitmentsToIgnore } = await this.getBoardingTxs();
-    const resolveTxCreatedAt = (txids) => chunkZIRFXBKL_cjs.fetchVtxoCreatedAtByTxid(this.indexerProvider, txids);
+    const resolveTxCreatedAt = (txids) => chunkEJOFL5WH_cjs.fetchVtxoCreatedAtByTxid(this.indexerProvider, txids);
     return buildTransactionHistory(
       allVtxos,
       boardingTxs,
@@ -12827,7 +12932,7 @@ var ReadonlyWallet = class _ReadonlyWallet {
               },
               isUnrolled: true,
               ...boardingFacts,
-              virtualStatus: chunkZIRFXBKL_cjs.toVirtualStatus(boardingFacts),
+              virtualStatus: chunkEJOFL5WH_cjs.toVirtualStatus(boardingFacts),
               spentBy: "",
               createdAt: tx.status.confirmed ? new Date(tx.status.block_time * 1e3) : /* @__PURE__ */ new Date(0),
               script: scriptHex
@@ -12883,9 +12988,9 @@ var ReadonlyWallet = class _ReadonlyWallet {
   async getBoardingTapscripts(allowedSigners) {
     const byScript = /* @__PURE__ */ new Map();
     const add = (s) => byScript.set(base.hex.encode(s.pkScript), s);
-    const boardingCsv = this.boardingTapscript.options.csvTimelock ?? chunkPXPPZF5K_cjs.DefaultVtxo.Script.DEFAULT_TIMELOCK;
+    const boardingCsv = this.boardingTapscript.options.csvTimelock ?? chunk6YUACVX4_cjs.DefaultVtxo.Script.DEFAULT_TIMELOCK;
     add(
-      new chunkPXPPZF5K_cjs.DefaultVtxo.Script({
+      new chunk6YUACVX4_cjs.DefaultVtxo.Script({
         pubKey: await this.identity.xOnlyPublicKey(),
         serverPubKey: this.boardingTapscript.options.serverPubKey,
         csvTimelock: boardingCsv
@@ -12900,7 +13005,7 @@ var ReadonlyWallet = class _ReadonlyWallet {
     for (const c of boardingContracts) {
       if (!allowed.has(toXOnlySignerHex(c.params.serverPubKey))) continue;
       try {
-        add(chunkPXPPZF5K_cjs.BoardingContractHandler.createScript(c.params));
+        add(chunk6YUACVX4_cjs.BoardingContractHandler.createScript(c.params));
       } catch (e) {
         console.warn("Skipping malformed boarding contract", c.script, e);
       }
@@ -12938,7 +13043,7 @@ var ReadonlyWallet = class _ReadonlyWallet {
         // Per-row CSV delay decoded from THIS tapscript's exit leaf —
         // not the wallet's current boarding timelock, which a signer
         // rotation may have changed.
-        csvTimelock: chunkZIRFXBKL_cjs.CSVMultisigTapscript.decode(base.hex.decode(tapscript.exitScript)).params.timelock,
+        csvTimelock: chunkEJOFL5WH_cjs.CSVMultisigTapscript.decode(base.hex.decode(tapscript.exitScript)).params.timelock,
         coins: utxos
       });
     }
@@ -13071,7 +13176,7 @@ var ReadonlyWallet = class _ReadonlyWallet {
   /** Fetch Arkade transaction ids that are still pending final settlement. */
   async fetchPendingTxs() {
     const scripts = await this.getWalletScripts();
-    const vtxos = await chunkZIRFXBKL_cjs.getAllNormalizedVtxos(this.indexerProvider, scripts);
+    const vtxos = await chunkEJOFL5WH_cjs.getAllNormalizedVtxos(this.indexerProvider, scripts);
     return vtxos.filter(
       (vtxo) => (vtxo.isSpent || vtxo.isPreconfirmed && !vtxo.isSwept) && vtxo.arkTxId !== void 0
     ).map((_) => _.arkTxId);
@@ -13102,7 +13207,7 @@ var ReadonlyWallet = class _ReadonlyWallet {
     });
     for (const contract of contracts) {
       if (map.has(contract.script)) continue;
-      const handler = chunkPXPPZF5K_cjs.contractHandlers.get(contract.type);
+      const handler = chunk6YUACVX4_cjs.contractHandlers.get(contract.type);
       if (handler) {
         const script = handler.createScript(contract.params);
         map.set(contract.script, script);
@@ -13214,7 +13319,7 @@ var ReadonlyWallet = class _ReadonlyWallet {
       }
     });
     const baselinePubkey = await this.identity.xOnlyPublicKey();
-    const delegatePubKey = this.offchainTapscript instanceof chunkPXPPZF5K_cjs.DelegateVtxo.Script ? this.offchainTapscript.options.delegatePubKey : void 0;
+    const delegatePubKey = this.offchainTapscript instanceof chunk6YUACVX4_cjs.DelegateVtxo.Script ? this.offchainTapscript.options.delegatePubKey : void 0;
     const baselineSigners = [
       this.offchainTapscript.options.serverPubKey,
       ...[...this._deprecatedSigners.keys()].map((h) => base.hex.decode(h))
@@ -13222,8 +13327,8 @@ var ReadonlyWallet = class _ReadonlyWallet {
     const seenBaselineScripts = /* @__PURE__ */ new Set();
     for (const serverPubKey of baselineSigners) {
       for (const csvTimelock of this.walletContractTimelocks) {
-        const csvTimelockStr = chunkZIRFXBKL_cjs.timelockToSequence(csvTimelock).toString();
-        const defaultScript = new chunkPXPPZF5K_cjs.DefaultVtxo.Script({
+        const csvTimelockStr = chunkEJOFL5WH_cjs.timelockToSequence(csvTimelock).toString();
+        const defaultScript = new chunk6YUACVX4_cjs.DefaultVtxo.Script({
           pubKey: baselinePubkey,
           serverPubKey,
           csvTimelock
@@ -13244,7 +13349,7 @@ var ReadonlyWallet = class _ReadonlyWallet {
           });
         }
         if (delegatePubKey) {
-          const delegateScript = new chunkPXPPZF5K_cjs.DelegateVtxo.Script({
+          const delegateScript = new chunk6YUACVX4_cjs.DelegateVtxo.Script({
             pubKey: baselinePubkey,
             serverPubKey,
             delegatePubKey,
@@ -13268,9 +13373,9 @@ var ReadonlyWallet = class _ReadonlyWallet {
         }
       }
     }
-    const boardingCsvTimelock = this.boardingTapscript.options.csvTimelock ?? chunkPXPPZF5K_cjs.DefaultVtxo.Script.DEFAULT_TIMELOCK;
+    const boardingCsvTimelock = this.boardingTapscript.options.csvTimelock ?? chunk6YUACVX4_cjs.DefaultVtxo.Script.DEFAULT_TIMELOCK;
     for (const serverPubKey of baselineSigners) {
-      const baselineBoarding = new chunkPXPPZF5K_cjs.DefaultVtxo.Script({
+      const baselineBoarding = new chunk6YUACVX4_cjs.DefaultVtxo.Script({
         pubKey: baselinePubkey,
         serverPubKey,
         csvTimelock: boardingCsvTimelock
@@ -13283,7 +13388,7 @@ var ReadonlyWallet = class _ReadonlyWallet {
         params: {
           pubKey: base.hex.encode(baselineBoarding.options.pubKey),
           serverPubKey: base.hex.encode(serverPubKey),
-          csvTimelock: chunkZIRFXBKL_cjs.timelockToSequence(boardingCsvTimelock).toString()
+          csvTimelock: chunkEJOFL5WH_cjs.timelockToSequence(boardingCsvTimelock).toString()
         },
         script: boardingScriptHex,
         address: baselineBoarding.address(this.network.hrp, serverPubKey).encode(),
@@ -13413,6 +13518,27 @@ var Wallet2 = class _Wallet extends ReadonlyWallet {
       console.warn("server-signer rotation on info change failed", e);
     }
   }
+  /**
+   * Await an `onServerInfoChanged` handler still applying a rotation.
+   *
+   * The provider emits synchronously but {@link handleServerInfoChanged} runs
+   * off the emit, so between the two a caller can observe a half-applied
+   * rotation: {@link rotateServerSigner} persists the active signer's contract
+   * rows *before* committing the tapscripts, so `arkServerPublicKey` still
+   * reads the old key while the new key's rows are already in the repository.
+   * A path that refreshes server info and then reads signer-derived state must
+   * drain the chain first, or it both reads that torn state and races the
+   * handler for the rotation itself.
+   *
+   * Resolves once the chain is idle; a handler that threw already logged, and
+   * its rejection is swallowed here.
+   *
+   * @internal Invoked by {@link dispose} and the {@link VtxoManager} migration
+   * pass; not part of the stable public API.
+   */
+  async settleServerInfoChanges() {
+    await this._serverInfoInFlight?.catch(() => void 0);
+  }
   _receiveRotatorInstalled = false;
   /**
    * Descriptor-aware signer used by {@link _signerRouter} to sign
@@ -13462,7 +13588,7 @@ var Wallet2 = class _Wallet extends ReadonlyWallet {
       serverPubKey: this.offchainTapscript.options.serverPubKey,
       deprecatedSignerPubKeys: [...this._deprecatedSigners.keys()].map((h) => base.hex.decode(h)),
       csvTimelocks: this.walletContractTimelocks,
-      delegatePubKey: this.offchainTapscript instanceof chunkPXPPZF5K_cjs.DelegateVtxo.Script ? this.offchainTapscript.options.delegatePubKey : void 0
+      delegatePubKey: this.offchainTapscript instanceof chunk6YUACVX4_cjs.DelegateVtxo.Script ? this.offchainTapscript.options.delegatePubKey : void 0
     };
   }
   _signerRouter;
@@ -13547,43 +13673,250 @@ var Wallet2 = class _Wallet extends ReadonlyWallet {
    * 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).
+   *
+   * **Behaviour change.** A wallet configured with a custom
+   * {@link DescriptorProvider} (`walletMode: <provider>`) now rotates here.
+   * It previously did not: allocation went through the contract manager,
+   * which only wires an `allocate` hook for {@link HDDescriptorProvider}, so
+   * such a wallet read as "declined to allocate" and silently kept its
+   * index-0 boarding address forever. Those wallets now burn an index per
+   * call — including via {@link maybeRotateBoardingAfterBoard}, which fires
+   * on every settle that consumes a boarding UTXO. Funds at retired
+   * addresses stay reachable: each rotation persists its `boarding` contract
+   * before swapping, and {@link getBoardingUtxos} fans out over the full
+   * historical set.
+   *
+   * @deprecated Use {@link getNewAddresses} — it mints any combination of
+   * address types at one shared index, and reports the contract row behind
+   * each. Note the difference in display behaviour: this method *swaps* the
+   * advertised boarding address, where `getNewAddresses` mints side
+   * addresses and leaves {@link getBoardingAddress} alone. To keep this
+   * method's behaviour, keep calling this method.
    */
   async getNewBoardingAddress() {
-    const provider = this._descriptorProvider;
-    if (!provider) {
-      return this.getBoardingAddress();
+    const [minted] = await this.allocateAddresses(["boarding"], false, true);
+    if (!minted?.allocated) return this.getBoardingAddress();
+    if (minted.type === "boarding") this.setBoardingTapscriptForRotation(minted.tapscript);
+    return minted.address;
+  }
+  /**
+   * Allocate a *fresh* address of each requested type, all derived from one
+   * newly allocated HD index.
+   *
+   * This is the explicit allocator the receive path otherwise lacks:
+   * {@link getAddress} and {@link getBoardingAddress} are stable reads of the
+   * wallet's display addresses, and the display receive address only advances
+   * when a payment arrives ({@link WalletReceiveRotator} rotates on
+   * `vtxo_received`). Issuing a second address before the first is paid — one
+   * invoice for Alice, another for Bob — has to go through here.
+   *
+   * Each call:
+   *
+   * - allocates **one** index from the shared HD stream, however many types
+   *   were asked for, so a `default` + `boarding` pair are siblings rather
+   *   than two burnt indices;
+   * - builds each requested script at that index, preserving every other
+   *   option of the wallet's current script for that flavour (including a
+   *   delegate wallet's `delegate` shape);
+   * - persists each as an `active` contract carrying its `signingDescriptor`,
+   *   so the ContractWatcher monitors it, the balance counts it, and
+   *   {@link signerForDescriptor} can recover the key;
+   * - slides the look-ahead band, since the watermark moved past indices an
+   *   external issuer may still be handing out.
+   *
+   * The minted rows are deliberately left **untagged**: the boot lookups
+   * adopt the newest {@link WALLET_RECEIVE_SOURCE}-tagged row as the display
+   * address, and a side address issued to one counterparty must not become
+   * the address the wallet advertises to everyone else. {@link getAddress}
+   * and {@link getBoardingAddress} are unchanged by this call.
+   *
+   * A wallet with no HD stream (`walletMode: 'static'` / `'auto'`) has one
+   * address per flavour for its lifetime. Without `forceNew` it returns those
+   * — the real persisted rows, no index burned; with `forceNew` it throws
+   * {@link WalletCannotAllocateAddressError} rather than hand back an address
+   * that is not in fact fresh.
+   *
+   * @example
+   * ```typescript
+   * const [invoice] = await wallet.getNewAddresses({ forceNew: true });
+   * // hand `invoice.address` to Alice, keep the descriptor with the invoice
+   * const signer = await wallet.signerForDescriptor(invoice.signingDescriptor);
+   * ```
+   */
+  async getNewAddresses(opts) {
+    const minted = await this.allocateAddresses(
+      opts?.types ?? ["default"],
+      opts?.forceNew ?? false,
+      false
+    );
+    return minted.map(({ address, signingDescriptor, contract }) => ({
+      address,
+      signingDescriptor,
+      contract
+    }));
+  }
+  /**
+   * Shared allocation core behind {@link getNewAddresses} and the deprecated
+   * {@link getNewBoardingAddress}, so the two cannot drift on what an
+   * allocation costs or what gets persisted.
+   *
+   * @param tagSource - Tag the persisted rows {@link WALLET_RECEIVE_SOURCE},
+   * making the next boot adopt them as the display address. Only the
+   * deprecated boarding allocator passes `true`; `getNewAddresses` mints side
+   * addresses and must not hijack what the wallet advertises.
+   */
+  async allocateAddresses(types, forceNew, tagSource) {
+    if (types.length === 0) {
+      throw new Error("getNewAddresses: `types` must name at least one address type");
     }
     const manager = await this.getContractManager();
-    const descriptor = await manager.getNextSigningDescriptor();
-    if (!descriptor) return this.getBoardingAddress();
-    const pubKey = chunkPXPPZF5K_cjs.deriveDescriptorLeafPubKey(descriptor);
-    const newBoarding = new chunkPXPPZF5K_cjs.DefaultVtxo.Script({
+    const provider = this._descriptorProvider;
+    const descriptor = !provider ? void 0 : provider instanceof HDDescriptorProvider ? await manager.getNextSigningDescriptor() : await provider.getNextSigningDescriptor();
+    if (!descriptor) {
+      if (forceNew) {
+        throw new WalletCannotAllocateAddressError(
+          provider ? "the descriptor provider declined to allocate an index" : "this wallet has no HD stream (walletMode 'static' / 'auto')"
+        );
+      }
+      return this.currentAddresses(manager, types);
+    }
+    const allocated = [];
+    try {
+      for (const type of types) {
+        allocated.push(await this.mintAddress(manager, type, descriptor, tagSource, true));
+      }
+    } finally {
+      try {
+        await manager.refillLookAhead();
+      } catch (e) {
+        console.warn("look-ahead refill after address allocation failed", e);
+      }
+    }
+    return allocated;
+  }
+  /**
+   * The wallet's existing display addresses, as persisted contract rows —
+   * the honest answer for a wallet with no index to burn.
+   *
+   * Each type is minted from the descriptor that already owns its display
+   * script ({@link displayDescriptor}), not from the identity key, so the
+   * returned `signingDescriptor` is the one that signs for the returned
+   * `address` even on a wallet that has rotated.
+   */
+  async currentAddresses(manager, types) {
+    const out = [];
+    for (const type of types) {
+      const descriptor = await this.displayDescriptor(manager, type);
+      out.push(await this.mintAddress(manager, type, descriptor, false, false));
+    }
+    return out;
+  }
+  /**
+   * The descriptor that owns the wallet's current display script for `type`,
+   * read off the row the wallet persisted when it adopted that script.
+   *
+   * Deriving it from the identity instead is only correct for a wallet that
+   * never rotates. On one that has — an HD wallet whose provider later
+   * declines to allocate — the display script belongs to an HD child, and
+   * pairing its address with the identity descriptor hands the caller a
+   * {@link NewAddress} whose `signingDescriptor` resolves, via
+   * {@link signerForDescriptor}, to a signer holding the wrong key.
+   *
+   * Falls back to the identity's pathless `tr(pubkey)` when no row carries a
+   * descriptor: the static / `auto` case, where the identity key genuinely
+   * owns the display script and this is what `getNextSigningDescriptor`
+   * answers too. (The index-0 baselines registered at construction carry no
+   * `signingDescriptor` metadata, so those wallets take this path.)
+   */
+  async displayDescriptor(manager, type) {
+    const display = type === "boarding" ? this._boardingTapscript : this.offchainTapscript;
+    const [row] = await manager.getContracts({ script: base.hex.encode(display.pkScript) });
+    const persisted = row?.metadata?.signingDescriptor;
+    if (typeof persisted === "string") return persisted;
+    return chunk6YUACVX4_cjs.identityDescriptor(this.identity);
+  }
+  /**
+   * Build, persist and shape one address of `type` owned by `descriptor` —
+   * the single build-and-register path behind both {@link allocateAddresses}
+   * and {@link currentAddresses}, so a freshly allocated address and a
+   * re-registered display address cannot disagree on what gets written.
+   *
+   * The descriptor is the sole source of the script's owner key in both
+   * branches. Deriving one flavour from the descriptor and the other from a
+   * tapscript field is what lets `address` and `signingDescriptor` drift
+   * apart.
+   */
+  async mintAddress(manager, type, descriptor, tagSource, allocated) {
+    if (type === "boarding") {
+      const built2 = this.buildBoardingContract(
+        chunk6YUACVX4_cjs.deriveDescriptorLeafPubKey(descriptor),
+        descriptor,
+        tagSource
+      );
+      const contract2 = await manager.createContract(built2.params);
+      return {
+        type,
+        // `built.tapscript` is a `DefaultVtxo.Script` here without a
+        // cast — the branch, not a widened local, does the narrowing.
+        tapscript: built2.tapscript,
+        // A boarding row persists the *ark* encoding of its script, so
+        // `contract.address` is unusable for an onchain sender: the
+        // onchain form has to be re-derived.
+        address: built2.tapscript.onchainAddress(this.network),
+        signingDescriptor: descriptor,
+        contract: contract2,
+        allocated
+      };
+    }
+    const built = buildReceiveContract(
+      this.offchainTapscript,
+      descriptor,
+      this.network.hrp,
+      tagSource
+    );
+    const contract = await manager.createContract(built.params);
+    return {
+      type,
+      tapscript: built.tapscript,
+      // Offchain rows already store the address they advertise, and
+      // reading it back keeps a coalesced row (`createContract` is
+      // first-wins on script) honest about what was actually persisted.
+      address: contract.address,
+      signingDescriptor: descriptor,
+      contract,
+      allocated
+    };
+  }
+  /**
+   * Build the boarding contract owned by `pubKey`, keeping every other option
+   * of the wallet's current boarding tapscript (notably the boarding-exit
+   * CSV, which is index-independent). The offchain analogue lives in
+   * {@link buildReceiveContract}.
+   */
+  buildBoardingContract(pubKey, descriptor, tagSource) {
+    const tapscript = new chunk6YUACVX4_cjs.DefaultVtxo.Script({
       ...this._boardingTapscript.options,
       pubKey
     });
-    const csvTimelock = newBoarding.options.csvTimelock ?? chunkPXPPZF5K_cjs.DefaultVtxo.Script.DEFAULT_TIMELOCK;
-    await manager.createContract({
-      type: "boarding",
+    const csvTimelock = tapscript.options.csvTimelock ?? chunk6YUACVX4_cjs.DefaultVtxo.Script.DEFAULT_TIMELOCK;
+    return {
+      tapscript,
       params: {
-        pubKey: base.hex.encode(pubKey),
-        serverPubKey: base.hex.encode(newBoarding.options.serverPubKey),
-        csvTimelock: chunkZIRFXBKL_cjs.timelockToSequence(csvTimelock).toString()
-      },
-      script: base.hex.encode(newBoarding.pkScript),
-      address: newBoarding.address(this.network.hrp, this.arkServerPublicKey).encode(),
-      state: "active",
-      metadata: {
-        source: chunkPXPPZF5K_cjs.WALLET_RECEIVE_SOURCE,
-        signingDescriptor: descriptor
+        type: "boarding",
+        params: {
+          pubKey: base.hex.encode(pubKey),
+          serverPubKey: base.hex.encode(tapscript.options.serverPubKey),
+          csvTimelock: chunkEJOFL5WH_cjs.timelockToSequence(csvTimelock).toString()
+        },
+        script: base.hex.encode(tapscript.pkScript),
+        address: tapscript.address(this.network.hrp, this.arkServerPublicKey).encode(),
+        state: "active",
+        metadata: {
+          ...tagSource && { source: chunk6YUACVX4_cjs.WALLET_RECEIVE_SOURCE },
+          signingDescriptor: descriptor
+        }
       }
-    });
-    this.setBoardingTapscriptForRotation(newBoarding);
-    try {
-      await manager.refillLookAhead();
-    } catch (e) {
-      console.warn("look-ahead refill after boarding allocation failed", e);
-    }
-    return newBoarding.onchainAddress(this.network);
+    };
   }
   /**
    * @see HDWalletCapable.getCurrentSigningDescriptor
@@ -13608,7 +13941,7 @@ var Wallet2 = class _Wallet extends ReadonlyWallet {
     if (this._descriptorProvider instanceof HDDescriptorProvider) {
       return (await this.getContractManager()).getNextSigningDescriptor();
     }
-    return chunkPXPPZF5K_cjs.identityDescriptor(this.identity);
+    return chunk6YUACVX4_cjs.identityDescriptor(this.identity);
   }
   /**
    * @see HDAllocationCapable.advanceSigningDescriptorWatermark
@@ -13704,7 +14037,7 @@ var Wallet2 = class _Wallet extends ReadonlyWallet {
    * the stable public API.
    */
   async rotateServerSigner(newServerPubKey, checkpointTapscript) {
-    const xonly = chunkPXPPZF5K_cjs.toXOnly(newServerPubKey, "ark signer key");
+    const xonly = chunk6YUACVX4_cjs.toXOnly(newServerPubKey, "ark signer key");
     const newServerUnrollScript = assertValidServerUnrollScript(
       checkpointTapscript,
       resolveCheckpointExitDelayPolicy(this.network, this.checkpointExitDelayPolicy)
@@ -13733,21 +14066,21 @@ var Wallet2 = class _Wallet extends ReadonlyWallet {
     const [currentBoardingRow] = await manager.getContracts({
       script: currentBoardingScript
     });
-    const newOffchain = this.offchainTapscript instanceof chunkPXPPZF5K_cjs.DelegateVtxo.Script ? new chunkPXPPZF5K_cjs.DelegateVtxo.Script({
+    const newOffchain = this.offchainTapscript instanceof chunk6YUACVX4_cjs.DelegateVtxo.Script ? new chunk6YUACVX4_cjs.DelegateVtxo.Script({
       ...this.offchainTapscript.options,
       serverPubKey: xonly
-    }) : new chunkPXPPZF5K_cjs.DefaultVtxo.Script({
+    }) : new chunk6YUACVX4_cjs.DefaultVtxo.Script({
       ...this.offchainTapscript.options,
       serverPubKey: xonly
     });
-    const newBoarding = new chunkPXPPZF5K_cjs.DefaultVtxo.Script({
+    const newBoarding = new chunk6YUACVX4_cjs.DefaultVtxo.Script({
       ...this._boardingTapscript.options,
       serverPubKey: xonly
     });
-    const offchainCsv = chunkZIRFXBKL_cjs.timelockToSequence(newOffchain.options.csvTimelock).toString();
+    const offchainCsv = chunkEJOFL5WH_cjs.timelockToSequence(newOffchain.options.csvTimelock).toString();
     const newOffchainScript = base.hex.encode(newOffchain.pkScript);
     const newOffchainAddress = newOffchain.address(this.network.hrp, xonly).encode();
-    if (newOffchain instanceof chunkPXPPZF5K_cjs.DelegateVtxo.Script) {
+    if (newOffchain instanceof chunk6YUACVX4_cjs.DelegateVtxo.Script) {
       await manager.createContract({
         type: "delegate",
         params: {
@@ -13775,13 +14108,13 @@ var Wallet2 = class _Wallet extends ReadonlyWallet {
         metadata: currentOffchainRow?.metadata
       });
     }
-    const boardingCsv = newBoarding.options.csvTimelock ?? chunkPXPPZF5K_cjs.DefaultVtxo.Script.DEFAULT_TIMELOCK;
+    const boardingCsv = newBoarding.options.csvTimelock ?? chunk6YUACVX4_cjs.DefaultVtxo.Script.DEFAULT_TIMELOCK;
     await manager.createContract({
       type: "boarding",
       params: {
         pubKey: base.hex.encode(newBoarding.options.pubKey),
         serverPubKey: base.hex.encode(xonly),
-        csvTimelock: chunkZIRFXBKL_cjs.timelockToSequence(boardingCsv).toString()
+        csvTimelock: chunkEJOFL5WH_cjs.timelockToSequence(boardingCsv).toString()
       },
       script: base.hex.encode(newBoarding.pkScript),
       address: newBoarding.address(this.network.hrp, xonly).encode(),
@@ -13814,14 +14147,14 @@ var Wallet2 = class _Wallet extends ReadonlyWallet {
   _restoreInFlight;
   _addPendingSpends(inputs) {
     for (const input of inputs) {
-      if (chunkZIRFXBKL_cjs.isVirtualCoin(input)) {
+      if (chunkEJOFL5WH_cjs.isVirtualCoin(input)) {
         this._pendingSpendOutpoints.add(`${input.txid}:${input.vout}`);
       }
     }
   }
   _removePendingSpends(inputs) {
     for (const input of inputs) {
-      if (chunkZIRFXBKL_cjs.isVirtualCoin(input)) {
+      if (chunkEJOFL5WH_cjs.isVirtualCoin(input)) {
         this._pendingSpendOutpoints.delete(`${input.txid}:${input.vout}`);
       }
     }
@@ -13879,13 +14212,13 @@ var Wallet2 = class _Wallet extends ReadonlyWallet {
     const manager = await this.getContractManager();
     const provider = this._descriptorProvider;
     const hd = provider instanceof HDDescriptorProvider;
-    const staticDescriptor = hd ? void 0 : await chunkPXPPZF5K_cjs.identityDescriptor(this.identity);
+    const staticDescriptor = hd ? void 0 : await chunk6YUACVX4_cjs.identityDescriptor(this.identity);
     const materialize = (index) => hd ? provider.materializeDescriptorAt(index) : staticDescriptor;
-    const delegatePubKey = this.offchainTapscript instanceof chunkPXPPZF5K_cjs.DelegateVtxo.Script ? this.offchainTapscript.options.delegatePubKey : void 0;
+    const delegatePubKey = this.offchainTapscript instanceof chunk6YUACVX4_cjs.DelegateVtxo.Script ? this.offchainTapscript.options.delegatePubKey : void 0;
     const arkInfo = await this.arkProvider.getInfo();
-    const currentSignerPubKey = chunkPXPPZF5K_cjs.toXOnly(base.hex.decode(arkInfo.signerPubkey), "ark signer key");
+    const currentSignerPubKey = chunk6YUACVX4_cjs.toXOnly(base.hex.decode(arkInfo.signerPubkey), "ark signer key");
     const deprecatedSignerPubKeys = arkInfo.deprecatedSigners.map(
-      (s) => chunkPXPPZF5K_cjs.toXOnly(base.hex.decode(s.pubkey), "deprecated signer key")
+      (s) => chunk6YUACVX4_cjs.toXOnly(base.hex.decode(s.pubkey), "deprecated signer key")
     );
     const deps = {
       indexerProvider: this.indexerProvider,
@@ -13900,7 +14233,7 @@ var Wallet2 = class _Wallet extends ReadonlyWallet {
       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 ?? chunkPXPPZF5K_cjs.DefaultVtxo.Script.DEFAULT_TIMELOCK,
+      boardingTimelock: this.boardingTapscript.options.csvTimelock ?? chunk6YUACVX4_cjs.DefaultVtxo.Script.DEFAULT_TIMELOCK,
       delegatePubKey
     };
     const result = await manager.scanContracts({
@@ -13968,7 +14301,7 @@ var Wallet2 = class _Wallet extends ReadonlyWallet {
     await this._restoreInFlight?.catch(() => void 0);
     this._serverInfoUnsub?.();
     this._serverInfoUnsub = void 0;
-    await this._serverInfoInFlight?.catch(() => void 0);
+    await this.settleServerInfoChanges();
     let rotatorError;
     try {
       await this._receiveRotator?.dispose();
@@ -14014,7 +14347,7 @@ var Wallet2 = class _Wallet extends ReadonlyWallet {
       throw new Error("Invalid configured public key");
     }
     const setup = await ReadonlyWallet.setupWalletConfig(config, pubkey);
-    const forfeitPubkey = chunkPXPPZF5K_cjs.toXOnly(base.hex.decode(setup.info.forfeitPubkey), "forfeit key");
+    const forfeitPubkey = chunk6YUACVX4_cjs.toXOnly(base.hex.decode(setup.info.forfeitPubkey), "forfeit key");
     const forfeitAddress = btcSigner.Address(setup.network).decode(setup.info.forfeitAddress);
     const forfeitOutputScript = btcSigner.OutScript.encode(forfeitAddress);
     const checkpointExitDelayOverrides = {
@@ -14163,7 +14496,7 @@ var Wallet2 = class _Wallet extends ReadonlyWallet {
           inputs: params.selectedVtxos,
           changeAmount: BigInt(changeAmount)
         };
-        const outputAddress = chunkZIRFXBKL_cjs.ArkAddress.decode(params.address);
+        const outputAddress = chunkEJOFL5WH_cjs.ArkAddress.decode(params.address);
         assertRecipientArkAddress(
           params.address,
           outputAddress,
@@ -14229,13 +14562,13 @@ var Wallet2 = class _Wallet extends ReadonlyWallet {
       void this.logUngatedInputs("settle({ inputs })", params.inputs);
     }
     const offchainAddress = await this.getAddress();
-    const offchainPkScript = chunkZIRFXBKL_cjs.ArkAddress.decode(offchainAddress).pkScript;
+    const offchainPkScript = chunkEJOFL5WH_cjs.ArkAddress.decode(offchainAddress).pkScript;
     const offchainOutputScript = base.hex.encode(offchainPkScript);
     if (!params) {
       const { fees, vtxoMaxAmount } = await this.arkProvider.getInfo();
       const estimator = new Estimator(fees.intentFee);
       let amount = 0;
-      const exitScript = chunkZIRFXBKL_cjs.CSVMultisigTapscript.decode(
+      const exitScript = chunkEJOFL5WH_cjs.CSVMultisigTapscript.decode(
         base.hex.decode(this.boardingTapscript.exitScript)
       );
       const boardingTimelock = exitScript.params.timelock;
@@ -14264,7 +14597,7 @@ var Wallet2 = class _Wallet extends ReadonlyWallet {
         if (filteredVtxos.length >= MAX_VTXOS_PER_SETTLEMENT) {
           break;
         }
-        const inputFee = estimator.evalOffchainInput(chunkZIRFXBKL_cjs.toOffchainInputFeeParams(vtxo));
+        const inputFee = estimator.evalOffchainInput(chunkEJOFL5WH_cjs.toOffchainInputFeeParams(vtxo));
         if (inputFee.satoshis >= vtxo.value) {
           continue;
         }
@@ -14311,7 +14644,7 @@ var Wallet2 = class _Wallet extends ReadonlyWallet {
       let script;
       let arkAddress;
       try {
-        arkAddress = chunkZIRFXBKL_cjs.ArkAddress.decode(output.address);
+        arkAddress = chunkEJOFL5WH_cjs.ArkAddress.decode(output.address);
       } catch {
         arkAddress = void 0;
       }
@@ -14401,7 +14734,7 @@ var Wallet2 = class _Wallet extends ReadonlyWallet {
     const abortController = new AbortController();
     let stream;
     let committedTxid;
-    const settleInputVtxos = params.inputs.filter(chunkZIRFXBKL_cjs.isVirtualCoin);
+    const settleInputVtxos = params.inputs.filter(chunkEJOFL5WH_cjs.isVirtualCoin);
     const contractManager = await this.getContractManager();
     await contractManager.assertAnnotatable(settleInputVtxos);
     await contractManager.assertSpendableNow?.(
@@ -14500,7 +14833,10 @@ var Wallet2 = class _Wallet extends ReadonlyWallet {
    * `typeof` guard skips the arknote strings settle also accepts.
    *
    * No-ops for static / `auto` wallets (no descriptor provider — boarding
-   * stays on its fixed index-0 address). Best-effort and non-fatal: the
+   * stays on its fixed index-0 address). Wallets on a custom
+   * {@link DescriptorProvider} DO rotate here now, where they previously
+   * no-opped — see the behaviour-change note on {@link
+   * getNewBoardingAddress}. 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`
@@ -14510,7 +14846,7 @@ var Wallet2 = class _Wallet extends ReadonlyWallet {
   async maybeRotateBoardingAfterBoard(inputs) {
     if (!this._descriptorProvider) return;
     const consumedBoarding = inputs.some(
-      (input) => typeof input !== "string" && !chunkZIRFXBKL_cjs.isVirtualCoin(input)
+      (input) => typeof input !== "string" && !chunkEJOFL5WH_cjs.isVirtualCoin(input)
     );
     if (!consumedBoarding) return;
     try {
@@ -14534,7 +14870,7 @@ var Wallet2 = class _Wallet extends ReadonlyWallet {
     let connectorIndex = 0;
     const connectorsLeaves = connectorsGraph?.leaves() || [];
     for (const input of inputs) {
-      if (!chunkZIRFXBKL_cjs.isVirtualCoin(input)) {
+      if (!chunkEJOFL5WH_cjs.isVirtualCoin(input)) {
         for (let i = 0; i < settlementPsbt.inputsLength; i++) {
           const settlementInput = settlementPsbt.getInput(i);
           if (!settlementInput.txid || settlementInput.index === void 0) {
@@ -14565,7 +14901,7 @@ var Wallet2 = class _Wallet extends ReadonlyWallet {
         }
         continue;
       }
-      if (chunkZIRFXBKL_cjs.canRecoverOnchain(input, { timestamp: /* @__PURE__ */ new Date() }) || isSubdust({ value: input.value }, this.dustAmount)) {
+      if (chunkEJOFL5WH_cjs.canRecoverOnchain(input, { timestamp: /* @__PURE__ */ new Date() }) || isSubdust({ value: input.value }, this.dustAmount)) {
         continue;
       }
       if (connectorsLeaves.length === 0) {
@@ -14593,7 +14929,7 @@ var Wallet2 = class _Wallet extends ReadonlyWallet {
             index: input.vout,
             witnessUtxo: {
               amount: BigInt(input.value),
-              script: chunkZIRFXBKL_cjs.VtxoScript.decode(input.tapTree).pkScript
+              script: chunkEJOFL5WH_cjs.VtxoScript.decode(input.tapTree).pkScript
             },
             sighashType: btcSigner.SigHash.DEFAULT,
             tapLeafScript: [input.forfeitTapLeafScript]
@@ -14612,7 +14948,7 @@ var Wallet2 = class _Wallet extends ReadonlyWallet {
       forfeitTx = await this._signerRouter.sign(forfeitTx, [
         {
           index: 0,
-          lookupScript: chunkZIRFXBKL_cjs.VtxoScript.decode(input.tapTree).pkScript
+          lookupScript: chunkEJOFL5WH_cjs.VtxoScript.decode(input.tapTree).pkScript
         }
       ]);
       signedForfeits.push(base.base64.encode(forfeitTx.toPSBT()));
@@ -14670,7 +15006,7 @@ var Wallet2 = class _Wallet extends ReadonlyWallet {
           resolveBatchExpiryPolicy(this.network, this.batchExpiryPolicy)
         );
         await this.arkProvider.confirmRegistration(intentId);
-        const sweepTapscript = chunkZIRFXBKL_cjs.CSVMultisigTapscript.encode({
+        const sweepTapscript = chunkEJOFL5WH_cjs.CSVMultisigTapscript.encode({
           timelock,
           pubkeys: [this.forfeitPubkey]
         }).script;
@@ -14685,10 +15021,10 @@ var Wallet2 = class _Wallet extends ReadonlyWallet {
           throw new Error("Sweep tap tree root not set");
         }
         const xOnlyPublicKeys = event.cosignersPublicKeys.map(
-          (k) => base.hex.encode(chunkPXPPZF5K_cjs.toXOnly(base.hex.decode(k), "cosigner key"))
+          (k) => base.hex.encode(chunk6YUACVX4_cjs.toXOnly(base.hex.decode(k), "cosigner key"))
         );
         const signerPublicKey = await session.getPublicKey();
-        const xonlySignerPublicKey = chunkPXPPZF5K_cjs.toXOnly(signerPublicKey, "signer key");
+        const xonlySignerPublicKey = chunk6YUACVX4_cjs.toXOnly(signerPublicKey, "signer key");
         if (!xOnlyPublicKeys.includes(base.hex.encode(xonlySignerPublicKey))) {
           return { skip: true };
         }
@@ -14778,9 +15114,9 @@ var Wallet2 = class _Wallet extends ReadonlyWallet {
         ...existing ?? {},
         intentTxId,
         registerProof: intent.proof,
-        registerProofMessage: chunkZIRFXBKL_cjs.Intent.encodeMessage(intent.message),
+        registerProofMessage: chunkEJOFL5WH_cjs.Intent.encodeMessage(intent.message),
         deleteProof: deleteIntent.proof,
-        deleteProofMessage: chunkZIRFXBKL_cjs.Intent.encodeMessage(deleteIntent.message),
+        deleteProofMessage: chunkEJOFL5WH_cjs.Intent.encodeMessage(deleteIntent.message),
         intentVtxos: inputs.map((i) => ({
           txid: i.txid,
           vout: i.vout
@@ -14812,7 +15148,7 @@ var Wallet2 = class _Wallet extends ReadonlyWallet {
     try {
       return await this.arkProvider.registerIntent(intent);
     } catch (error) {
-      if (error instanceof chunkZIRFXBKL_cjs.ArkError && error.code === 0 && error.message.includes("duplicated input")) {
+      if (error instanceof chunkEJOFL5WH_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);
@@ -14828,7 +15164,7 @@ var Wallet2 = class _Wallet extends ReadonlyWallet {
       expire_at: 0,
       cosigners_public_keys: cosignerPubKeys
     };
-    const proof = chunkZIRFXBKL_cjs.Intent.create(message, coins, outputs);
+    const proof = chunkEJOFL5WH_cjs.Intent.create(message, coins, outputs);
     const signedProof = await this._signerRouter.sign(proof, intentProofJobs(coins));
     return {
       proof: base.base64.encode(signedProof.toPSBT()),
@@ -14840,7 +15176,7 @@ var Wallet2 = class _Wallet extends ReadonlyWallet {
       type: "delete",
       expire_at: 0
     };
-    const proof = chunkZIRFXBKL_cjs.Intent.create(message, coins, []);
+    const proof = chunkEJOFL5WH_cjs.Intent.create(message, coins, []);
     const signedProof = await this._signerRouter.sign(proof, intentProofJobs(coins));
     return {
       proof: base.base64.encode(signedProof.toPSBT()),
@@ -14852,7 +15188,7 @@ var Wallet2 = class _Wallet extends ReadonlyWallet {
       type: "get-pending-tx",
       expire_at: 0
     };
-    const proof = chunkZIRFXBKL_cjs.Intent.create(message, coins, []);
+    const proof = chunkEJOFL5WH_cjs.Intent.create(message, coins, []);
     const signedProof = await this._signerRouter.sign(proof, intentProofJobs(coins));
     return {
       proof: base.base64.encode(signedProof.toPSBT()),
@@ -14873,7 +15209,7 @@ var Wallet2 = class _Wallet extends ReadonlyWallet {
     if (!vtxos || vtxos.length === 0) {
       const scriptMap = await this.getScriptMap();
       const allExtended = [];
-      const fetchedVtxos = await chunkZIRFXBKL_cjs.getAllNormalizedVtxos(this.indexerProvider, [
+      const fetchedVtxos = await chunkEJOFL5WH_cjs.getAllNormalizedVtxos(this.indexerProvider, [
         ...scriptMap.keys()
       ]);
       for (const vtxo of fetchedVtxos) {
@@ -14915,9 +15251,11 @@ var Wallet2 = class _Wallet extends ReadonlyWallet {
           seen.add(pendingTx.arkTxid);
           batchPending.push(pendingTx.arkTxid);
           try {
-            const checkpointTxs = pendingTx.signedCheckpointTxs.map(
-              (c) => btcSigner.Transaction.fromPSBT(base.base64.decode(c))
-            );
+            const checkpointTxs = pendingTx.signedCheckpointTxs.map((c) => {
+              const tx = btcSigner.Transaction.fromPSBT(base.base64.decode(c));
+              chunkEJOFL5WH_cjs.assertAllowedSighashTypes(tx);
+              return tx;
+            });
             assertCheckpointsMatchInputs(
               checkpointTxs,
               checkpointInputs,
@@ -14987,11 +15325,11 @@ var Wallet2 = class _Wallet extends ReadonlyWallet {
    * against the current key alone would leave it pending forever.
    */
   checkpointUnrollCandidates(info) {
-    const current = chunkZIRFXBKL_cjs.CSVMultisigTapscript.decode(base.hex.decode(info.checkpointTapscript));
+    const current = chunkEJOFL5WH_cjs.CSVMultisigTapscript.decode(base.hex.decode(info.checkpointTapscript));
     const candidates = [this._serverUnrollScript, current];
     for (const deprecated of signerSetFromInfo(info).deprecated.keys()) {
       candidates.push(
-        chunkZIRFXBKL_cjs.CSVMultisigTapscript.encode({
+        chunkEJOFL5WH_cjs.CSVMultisigTapscript.encode({
           ...current.params,
           pubkeys: [base.hex.decode(deprecated)]
         })
@@ -15082,10 +15420,12 @@ var Wallet2 = class _Wallet extends ReadonlyWallet {
     if (vtxos.length === 0) {
       throw new Error("No VTXOs found for this arkadeCash");
     }
-    const myPkScript = chunkZIRFXBKL_cjs.ArkAddress.decode(await this.getAddress()).pkScript;
+    const myPkScript = chunkEJOFL5WH_cjs.ArkAddress.decode(await this.getAddress()).pkScript;
     let { spendable, unclaimed } = this.classifyCashVtxos(vtxos);
     let swept = 0;
-    const drainable = vtxos.filter((vtxo) => !isSubdust(vtxo, this.dustAmount));
+    const drainable = vtxos.filter(
+      (vtxo) => !isSubdust(vtxo, this.dustAmount) && !vtxo.isUnrolled
+    );
     if (drainable.length > 0) {
       let drained = { count: 0, swept: 0, claimed: /* @__PURE__ */ new Set() };
       try {
@@ -15156,8 +15496,10 @@ var Wallet2 = class _Wallet extends ReadonlyWallet {
     const spendable = [];
     const unclaimed = [];
     for (const vtxo of vtxos) {
-      if (chunkZIRFXBKL_cjs.hasTerminalSpend(vtxo)) {
+      if (chunkEJOFL5WH_cjs.hasTerminalSpend(vtxo)) {
         unclaimed.push(cashReport(vtxo, "already-spent"));
+      } else if (vtxo.isUnrolled) {
+        unclaimed.push(cashReport(vtxo, "exited"));
       } else if (isSubdust(vtxo, this.dustAmount)) {
         unclaimed.push(cashReport(vtxo, "subdust"));
       } else if (vtxo.isSwept) {
@@ -15176,7 +15518,7 @@ var Wallet2 = class _Wallet extends ReadonlyWallet {
     const all = [];
     const seen = /* @__PURE__ */ new Set();
     for (let pageIndex = 0; ; pageIndex++) {
-      const { vtxos, page } = await chunkZIRFXBKL_cjs.getNormalizedVtxos(this.indexerProvider, {
+      const { vtxos, page } = await chunkEJOFL5WH_cjs.getNormalizedVtxos(this.indexerProvider, {
         scripts,
         pageIndex,
         pageSize
@@ -15223,7 +15565,7 @@ var Wallet2 = class _Wallet extends ReadonlyWallet {
     for (let i = 0; i < inputs.length; i += MAX_INPUTS_PER_INTENT) {
       const batch = inputs.slice(i, i + MAX_INPUTS_PER_INTENT);
       const message = { type: "get-pending-tx", expire_at: 0 };
-      const proof = chunkZIRFXBKL_cjs.Intent.create(message, batch, []);
+      const proof = chunkEJOFL5WH_cjs.Intent.create(message, batch, []);
       const signedProof = await identity.sign(
         proof,
         Array.from({ length: batch.length + 1 }, (_, j) => j)
@@ -15243,9 +15585,11 @@ var Wallet2 = class _Wallet extends ReadonlyWallet {
     const unrollCandidates = this.checkpointUnrollCandidates(await this.arkProvider.getInfo());
     for (const pendingTx of pendingTxs) {
       try {
-        const checkpointTxs = pendingTx.signedCheckpointTxs.map(
-          (checkpoint) => btcSigner.Transaction.fromPSBT(base.base64.decode(checkpoint))
-        );
+        const checkpointTxs = pendingTx.signedCheckpointTxs.map((checkpoint) => {
+          const tx = btcSigner.Transaction.fromPSBT(base.base64.decode(checkpoint));
+          chunkEJOFL5WH_cjs.assertAllowedSighashTypes(tx);
+          return tx;
+        });
         assertCheckpointsMatchInputs(
           checkpointTxs,
           inputs.map((input) => ({
@@ -15442,7 +15786,7 @@ var Wallet2 = class _Wallet extends ReadonlyWallet {
       script: recipient.script,
       amount: BigInt(recipient.amount),
       // Already checked against the recipient address in `validateRecipients`.
-      ...recipient.tapTree ? { tapTree: chunkZIRFXBKL_cjs.TapTreeCoder.decode(recipient.tapTree) } : {}
+      ...recipient.tapTree ? { tapTree: chunkEJOFL5WH_cjs.TapTreeCoder.decode(recipient.tapTree) } : {}
     }));
     const totalBtcOutput = outputs.reduce((sum, o) => sum + Number(o.amount), 0);
     let changeAmount = totalBtcSelected - totalBtcOutput;
@@ -15586,10 +15930,10 @@ var Wallet2 = class _Wallet extends ReadonlyWallet {
       const serverPubKey = this.arkServerPublicKey;
       const serverUnrollScript = this.serverUnrollScript;
       const arkAddress = offchainTapscript.address(this.network.hrp, serverPubKey);
-      const normalizedInputs = inputs.map(chunkZIRFXBKL_cjs.normalizeVtxo);
-      const at = now ?? await chunkZIRFXBKL_cjs.resolveTimeHeight(this.onchainProvider);
+      const normalizedInputs = inputs.map(chunkEJOFL5WH_cjs.normalizeVtxo);
+      const at = now ?? await chunkEJOFL5WH_cjs.resolveTimeHeight(this.onchainProvider);
       for (const input of normalizedInputs) {
-        if (!chunkZIRFXBKL_cjs.canSpendOffchain(input, at)) {
+        if (!chunkEJOFL5WH_cjs.canSpendOffchain(input, at)) {
           throw new Error(
             `sendSelectedVtxosToSelf: input ${input.txid}:${input.vout} is not cooperatively spendable`
           );
@@ -15659,7 +16003,7 @@ var Wallet2 = class _Wallet extends ReadonlyWallet {
     );
     const arkTxJobs = inputs.map((input, index) => ({
       index,
-      lookupScript: chunkZIRFXBKL_cjs.VtxoScript.decode(input.tapTree).pkScript
+      lookupScript: chunkEJOFL5WH_cjs.VtxoScript.decode(input.tapTree).pkScript
     }));
     const identity = this.identity;
     const signer = {
@@ -15745,14 +16089,14 @@ var Wallet2 = class _Wallet extends ReadonlyWallet {
         const spentBy = checkpointIdByOutpoint.get(`${vtxo.txid}:${vtxo.vout}`);
         spentVtxos.push({
           ...spentFacts,
-          virtualStatus: chunkZIRFXBKL_cjs.toVirtualStatus(spentFacts),
+          virtualStatus: chunkEJOFL5WH_cjs.toVirtualStatus(spentFacts),
           ...spentBy ? { spentBy } : {},
           arkTxId: arkTxid
         });
         for (const id of vtxo.commitmentTxIds) {
           commitmentTxIds.add(id);
         }
-        const vtxoExpiry = chunkZIRFXBKL_cjs.toBatchExpiry(vtxo);
+        const vtxoExpiry = chunkEJOFL5WH_cjs.toBatchExpiry(vtxo);
         if (vtxoExpiry) {
           batchExpiry = Math.min(batchExpiry, vtxoExpiry);
         }
@@ -15765,7 +16109,7 @@ var Wallet2 = class _Wallet extends ReadonlyWallet {
           isSwept: false,
           isPreconfirmed: true,
           commitmentTxIds: Array.from(commitmentTxIds),
-          ...chunkZIRFXBKL_cjs.parseLegacyExpiry(batchExpiry)
+          ...chunkEJOFL5WH_cjs.parseLegacyExpiry(batchExpiry)
         };
         changeVtxo = {
           txid: arkTxid,
@@ -15777,7 +16121,7 @@ var Wallet2 = class _Wallet extends ReadonlyWallet {
           tapTree: offchainTapscript.encode(),
           value: Number(changeAmount),
           ...changeFacts,
-          virtualStatus: chunkZIRFXBKL_cjs.toVirtualStatus(changeFacts),
+          virtualStatus: chunkEJOFL5WH_cjs.toVirtualStatus(changeFacts),
           spentBy: "",
           status: {
             confirmed: false
@@ -15846,12 +16190,12 @@ var Wallet2 = class _Wallet extends ReadonlyWallet {
       const spentVtxos = [];
       const inputArkTxIds = /* @__PURE__ */ new Set();
       const boardingRemovalsByAddress = /* @__PURE__ */ new Map();
-      const vtxoInputs = inputs.filter(chunkZIRFXBKL_cjs.isVirtualCoin);
+      const vtxoInputs = inputs.filter(chunkEJOFL5WH_cjs.isVirtualCoin);
       const cm = await this.getContractManager();
       const annotatedVtxos = await cm.annotateVtxos(vtxoInputs);
       const annotatedByKey = new Map(annotatedVtxos.map((v) => [`${v.txid}:${v.vout}`, v]));
       for (const input of inputs) {
-        if (chunkZIRFXBKL_cjs.isVirtualCoin(input)) {
+        if (chunkEJOFL5WH_cjs.isVirtualCoin(input)) {
           const outpoint = `${input.txid}:${input.vout}`;
           const vtxo = annotatedByKey.get(outpoint);
           if (!vtxo) {
@@ -15863,13 +16207,13 @@ var Wallet2 = class _Wallet extends ReadonlyWallet {
           const settledFacts = { ...vtxo, isSpent: true };
           spentVtxos.push({
             ...settledFacts,
-            virtualStatus: chunkZIRFXBKL_cjs.toVirtualStatus(settledFacts),
+            virtualStatus: chunkEJOFL5WH_cjs.toVirtualStatus(settledFacts),
             settledBy: commitmentTxid
           });
         } else {
           let sourceAddress;
           try {
-            sourceAddress = chunkZIRFXBKL_cjs.VtxoScript.decode(input.tapTree).onchainAddress(
+            sourceAddress = chunkEJOFL5WH_cjs.VtxoScript.decode(input.tapTree).onchainAddress(
               this.network
             );
           } catch {
@@ -15927,9 +16271,9 @@ var Wallet2 = class _Wallet extends ReadonlyWallet {
   }
 };
 function selectVirtualCoins(coins, targetAmount) {
-  const sortedCoins = coins.map(chunkZIRFXBKL_cjs.normalizeVtxo).sort((a, b) => {
-    const expiryA = chunkZIRFXBKL_cjs.toBatchExpiry(a) || Number.MAX_SAFE_INTEGER;
-    const expiryB = chunkZIRFXBKL_cjs.toBatchExpiry(b) || Number.MAX_SAFE_INTEGER;
+  const sortedCoins = coins.map(chunkEJOFL5WH_cjs.normalizeVtxo).sort((a, b) => {
+    const expiryA = chunkEJOFL5WH_cjs.toBatchExpiry(a) || Number.MAX_SAFE_INTEGER;
+    const expiryB = chunkEJOFL5WH_cjs.toBatchExpiry(b) || Number.MAX_SAFE_INTEGER;
     if (expiryA !== expiryB) {
       return expiryA - expiryB;
     }
@@ -16048,6 +16392,11 @@ var MessageBus = class {
   buildServicesFn;
   boundOnMessage = this.onMessage.bind(this);
   intentRepository;
+  /** Pending broadcasts, drained FIFO by a single {@link drain} loop. */
+  broadcastQueue = [];
+  draining = false;
+  /** Bumped wherever the generation owning the queued broadcasts ends. */
+  broadcastEpoch = 0;
   /** Start the message bus and attach service-worker event listeners. */
   async start() {
     if (this.running) return;
@@ -16070,6 +16419,7 @@ var MessageBus = class {
     this.running = false;
     this.tickInProgress = false;
     this.initialized = false;
+    this.invalidateBroadcasts();
     if (this.tickTimeout !== null) {
       self.clearTimeout(this.tickTimeout);
       this.tickTimeout = null;
@@ -16082,6 +16432,78 @@ var MessageBus = class {
     self.removeEventListener("message", this.boundOnMessage);
     await Promise.all(Array.from(this.handlers.values()).map((updater) => updater.stop()));
   }
+  /** Invalidate every broadcast belonging to the outgoing generation. */
+  invalidateBroadcasts() {
+    this.broadcastEpoch++;
+    this.broadcastQueue.length = 0;
+  }
+  broadcastToClients(responses) {
+    this.broadcastQueue.push(...responses);
+    void this.drain();
+  }
+  /**
+   * Single fan-out loop, so pushes and tick responses keep one FIFO order.
+   * A helper posting per response would race: `clients.matchAll()` gives no
+   * cross-call resolution order, and it would de-batch `runTick`.
+   */
+  async drain() {
+    if (this.draining) return;
+    this.draining = true;
+    try {
+      while (this.broadcastQueue.length) {
+        const epoch = this.broadcastEpoch;
+        const batch = this.broadcastQueue.splice(0);
+        if (!this.running) {
+          this.logDroppedBroadcasts(batch, "bus stopped");
+          return;
+        }
+        let clients;
+        try {
+          clients = await self.clients.matchAll({
+            includeUncontrolled: true,
+            type: "window"
+          });
+        } catch (err) {
+          this.logDroppedBroadcasts(batch, "clients.matchAll failed", err);
+          continue;
+        }
+        if (!this.running) {
+          this.logDroppedBroadcasts(batch, "bus stopped during matchAll");
+          return;
+        }
+        if (this.broadcastEpoch !== epoch) {
+          this.logDroppedBroadcasts(batch, "re-init landed during matchAll");
+          continue;
+        }
+        for (const message of batch) {
+          for (const client of clients) {
+            try {
+              client.postMessage(message);
+            } catch (err) {
+              if (this.debug)
+                console.warn(`[${message.tag}] broadcast to client failed`, err);
+            }
+          }
+        }
+      }
+    } catch {
+    } finally {
+      this.draining = false;
+      if (this.running && this.broadcastQueue.length) void this.drain();
+    }
+  }
+  /**
+   * A dropped batch has no periodic recovery to fall back on now that events
+   * no longer ride the tick, so name the loss under {@link Options.debug}.
+   */
+  logDroppedBroadcasts(batch, reason, ...error) {
+    if (!this.debug) return;
+    console.warn(
+      `dropping ${batch.length} broadcast(s): ${reason}`,
+      batch.map((response) => response.tag),
+      ...error
+    );
+  }
   scheduleNextTick() {
     if (!this.running) return;
     if (this.tickTimeout !== null) return;
@@ -16110,16 +16532,7 @@ var MessageBus = class {
           if (this.debug)
             console.log(`[${updater.messageTag}] outgoing tick response:`, response);
           if (response && response.length > 0) {
-            self.clients.matchAll({
-              includeUncontrolled: true,
-              type: "window"
-            }).then((clients) => {
-              for (const message of response) {
-                clients.forEach((client) => {
-                  client.postMessage(message);
-                });
-              }
-            });
+            this.broadcastToClients(response);
           }
         } catch (err) {
           if (this.debug) console.error(`[${updater.messageTag}] tick failed`, err);
@@ -16158,6 +16571,14 @@ var MessageBus = class {
       self.clearTimeout(this.tickTimeout);
       this.tickTimeout = null;
     }
+    this.invalidateBroadcasts();
+    const epoch = this.broadcastEpoch;
+    const channel = {
+      broadcast: (response) => {
+        if (epoch !== this.broadcastEpoch) return;
+        this.broadcastToClients([response]);
+      }
+    };
     if (this.initialized) {
       this.initialized = false;
       await Promise.all(
@@ -16174,9 +16595,7 @@ var MessageBus = class {
     try {
       for (const updater of this.handlers.values()) {
         if (this.debug) console.log(`Starting updater: ${updater.messageTag}`);
-        await updater.start(services, {
-          walletRepository: this.walletRepository
-        });
+        await updater.start(services, { walletRepository: this.walletRepository }, channel);
         started.push(updater);
       }
     } catch (err) {
@@ -16189,7 +16608,7 @@ var MessageBus = class {
     this.initialized = true;
   }
   async buildServices(config) {
-    const arkProvider = new chunkZIRFXBKL_cjs.RestArkProvider(config.arkServer.url);
+    const arkProvider = new chunkEJOFL5WH_cjs.RestArkProvider(config.arkServer.url);
     const storage = {
       walletRepository: this.walletRepository,
       contractRepository: this.contractRepository,
@@ -16531,7 +16950,7 @@ var offboardNetworkNames = [
 function offboardDestinationScript(destinationAddress) {
   for (const networkName of offboardNetworkNames) {
     try {
-      const network = chunkZIRFXBKL_cjs.networks[networkName];
+      const network = chunkEJOFL5WH_cjs.networks[networkName];
       const addr = btcSigner.Address(network).decode(destinationAddress);
       return btcSigner.OutScript.encode(addr);
     } catch {
@@ -16595,7 +17014,7 @@ var Ramps = class {
     }
     amount = amount ?? totalAmount;
     const offchainAddress = await this.wallet.getAddress();
-    const offchainAddr = chunkZIRFXBKL_cjs.ArkAddress.decode(offchainAddress);
+    const offchainAddr = chunkEJOFL5WH_cjs.ArkAddress.decode(offchainAddress);
     const offchainScript = base.hex.encode(offchainAddr.pkScript);
     const outputFee = estimator.evalOffchainOutput({
       amount,
@@ -16655,7 +17074,7 @@ var Ramps = class {
     const filteredVtxos = [];
     let totalAmount = 0n;
     for (const vtxo of vtxos) {
-      const inputFee = estimator.evalOffchainInput(chunkZIRFXBKL_cjs.toOffchainInputFeeParams(vtxo));
+      const inputFee = estimator.evalOffchainInput(chunkEJOFL5WH_cjs.toOffchainInputFeeParams(vtxo));
       if (inputFee.satoshis >= vtxo.value) {
         continue;
       }
@@ -16846,6 +17265,17 @@ var WalletMessageHandler = class {
   incomingFundsSubscription;
   contractEventsSubscription;
   onNextTick = [];
+  channel;
+  // One counter per subscription field, bumped exactly where that field is
+  // dropped — never where a neighbour's is. They cannot be merged:
+  // `onWalletInitialized` re-subscribes incoming funds while
+  // `ensureContractEventBroadcasting` deliberately keeps its subscription, so
+  // a shared bump would leave the live contract-event emitter permanently
+  // stale, and folding requests in would truncate an in-flight settle.
+  incomingFundsEpoch = 0;
+  contractEventsEpoch = 0;
+  /** Per-request progress callbacks: ends with the handler, not with a re-init. */
+  requestEpoch = 0;
   /**
    * Instantiate a new WalletUpdater.
    * Can override the default `messageTag` allowing more than one updater to run in parallel.
@@ -16856,13 +17286,20 @@ var WalletMessageHandler = class {
   }
   // lifecycle methods
   async start(...params) {
-    const [services, repositories] = params;
+    const [services, repositories, channel] = params;
     this.readonlyWallet = services.readonlyWallet;
     this.wallet = services.wallet;
     this.arkProvider = services.arkProvider;
     this.walletRepository = repositories.walletRepository;
+    this.channel = channel;
+    this.onNextTick = [];
   }
   async stop() {
+    this.requestEpoch++;
+    this.incomingFundsEpoch++;
+    this.contractEventsEpoch++;
+    this.channel = void 0;
+    this.onNextTick = [];
     if (this.incomingFundsSubscription) {
       this.incomingFundsSubscription();
       this.incomingFundsSubscription = void 0;
@@ -16885,8 +17322,8 @@ var WalletMessageHandler = class {
     this.indexerProvider = void 0;
   }
   async tick(_now) {
-    const results = await Promise.allSettled(this.onNextTick.map((fn) => fn()));
-    this.onNextTick = [];
+    const pending = this.onNextTick.splice(0);
+    const results = await Promise.allSettled(pending.map((fn) => fn()));
     return results.map((result) => {
       if (result.status === "fulfilled") {
         return result.value;
@@ -16896,8 +17333,46 @@ var WalletMessageHandler = class {
       }
     }).filter((response) => response !== null);
   }
-  scheduleForNextTick(callback) {
-    this.onNextTick.push(callback);
+  epochOf(scope) {
+    switch (scope) {
+      case "incomingFunds":
+        return this.incomingFundsEpoch;
+      case "contractEvents":
+        return this.contractEventsEpoch;
+      case "request":
+        return this.requestEpoch;
+      default: {
+        const _exhaustive = scope;
+        throw new Error(`Unknown scope: ${_exhaustive}`);
+      }
+    }
+  }
+  newGeneration(scope) {
+    const born = this.epochOf(scope);
+    const stale = () => born !== this.epochOf(scope);
+    return {
+      get stale() {
+        return stale();
+      }
+    };
+  }
+  /**
+   * A handle rather than a `broadcast(response, epoch)` call, because it can
+   * only be written where the closure it guards is created — an epoch passed
+   * at the call site reads identically whether it guards anything or not.
+   */
+  newEmitter(scope) {
+    const gen = this.newGeneration(scope);
+    return {
+      get stale() {
+        return gen.stale;
+      },
+      emit: (response) => {
+        if (!response || gen.stale) return;
+        if (this.channel) return this.channel.broadcast(response);
+        this.onNextTick.push(() => response);
+      }
+    };
   }
   requireWallet() {
     if (!this.wallet) {
@@ -16926,6 +17401,7 @@ var WalletMessageHandler = class {
   }
   async handleMessage(message) {
     const id = message.id;
+    const emitter = this.newEmitter("request");
     if (message.type === "INIT_WALLET") {
       await this.handleInitWallet(message);
       return this.tagged({
@@ -17194,6 +17670,18 @@ var WalletMessageHandler = class {
             payload: { descriptor }
           });
         }
+        case "GET_NEW_ADDRESSES": {
+          const wallet = this.wallet;
+          if (!wallet) throw new WalletNotInitializedError();
+          const addresses = await wallet.getNewAddresses(
+            message.payload
+          );
+          return this.tagged({
+            id,
+            type: "NEW_ADDRESSES",
+            payload: { addresses }
+          });
+        }
         case "GET_USED_SIGNING_DESCRIPTORS": {
           const wallet = this.wallet;
           const descriptors = isHDWalletCapable(wallet) ? await wallet.getUsedSigningDescriptors(
@@ -17284,8 +17772,8 @@ var WalletMessageHandler = class {
           const wallet = this.requireWallet();
           const vtxoManager = await wallet.getVtxoManager();
           const txid = await vtxoManager.recoverVtxos((e) => {
-            this.scheduleForNextTick(
-              () => this.tagged({
+            emitter.emit(
+              this.tagged({
                 id,
                 type: "RECOVER_VTXOS_EVENT",
                 payload: e
@@ -17329,8 +17817,8 @@ var WalletMessageHandler = class {
           const wallet = this.requireWallet();
           const vtxoManager = await wallet.getVtxoManager();
           const txid = await vtxoManager.renewVtxos((e) => {
-            this.scheduleForNextTick(
-              () => this.tagged({
+            emitter.emit(
+              this.tagged({
                 id,
                 type: "RENEW_VTXOS_EVENT",
                 payload: e
@@ -17368,8 +17856,8 @@ var WalletMessageHandler = class {
           const vtxoManager = await wallet.getVtxoManager();
           const report = await vtxoManager.migrateDeprecatedSignerVtxos({
             eventCallback: (e) => {
-              this.scheduleForNextTick(
-                () => this.tagged({
+              emitter.emit(
+                this.tagged({
                   id,
                   type: "MIGRATE_DEPRECATED_SIGNER_VTXOS_EVENT",
                   payload: e
@@ -17422,7 +17910,7 @@ var WalletMessageHandler = class {
   // Wallet methods
   async handleInitWallet({ payload }) {
     const { arkServerUrl } = payload;
-    this.indexerProvider = new chunk3S3JZUEN_cjs.RestIndexerProvider(arkServerUrl);
+    this.indexerProvider = new chunkPJR63FTK_cjs.RestIndexerProvider(arkServerUrl);
     await this.onWalletInitialized();
   }
   /**
@@ -17472,6 +17960,7 @@ var WalletMessageHandler = class {
       intentLocked: offchain.intentLocked,
       recoverable: offchain.recoverable,
       pendingRecovery: offchain.pendingRecovery,
+      unrolled: offchain.unrolled,
       total: totalBoarding + offchain.total,
       assets: offchain.assets,
       availableAssets: offchain.availableAssets
@@ -17482,11 +17971,15 @@ var WalletMessageHandler = class {
     return this.readonlyWallet.getBoardingUtxos();
   }
   async onWalletInitialized() {
-    if (!this.readonlyWallet || !this.arkProvider || !this.indexerProvider || !this.walletRepository) {
+    const wallet = this.readonlyWallet;
+    if (!wallet || !this.arkProvider || !this.indexerProvider || !this.walletRepository) {
       return;
     }
+    const init = this.newGeneration("incomingFunds");
     await this.ensureContractEventBroadcasting();
+    if (init.stale) return;
     await this.refreshCachedData();
+    if (init.stale) return;
     if (this.wallet) {
       try {
         const vtxos = await this.getVtxosFromRepo();
@@ -17499,72 +17992,81 @@ var WalletMessageHandler = class {
       } catch (error) {
         console.error("Error recovering pending transactions:", error);
       }
+      if (init.stale) return;
     }
     if (this.incomingFundsSubscription) this.incomingFundsSubscription();
-    const address = await this.readonlyWallet.getAddress();
-    this.incomingFundsSubscription = await this.readonlyWallet.notifyIncomingFunds(
-      async (funds) => {
-        if (funds.type === "vtxo") {
-          const { newVtxos, spentVtxos } = funds;
-          if (newVtxos.length + spentVtxos.length === 0) return;
-          const byScript = /* @__PURE__ */ new Map();
-          for (const v of [...newVtxos, ...spentVtxos]) {
-            if (!v.script) {
-              console.warn(
-                `WalletMessageHandler.notifyIncomingFunds: dropping VTXO without script ${v.txid}:${v.vout}`
-              );
-              continue;
-            }
-            const arr = byScript.get(v.script) ?? [];
-            arr.push(v);
-            byScript.set(v.script, arr);
-          }
-          let walletScript;
-          try {
-            walletScript = scriptFromArkAddress(address);
-          } catch {
-            walletScript = void 0;
-          }
-          const cm = await this.readonlyWallet.getContractManager();
-          const contracts = await cm.getContracts();
-          const addrByScript = new Map(contracts.map((c) => [c.script, c.address]));
-          for (const [script, vtxos] of byScript) {
-            const filtered = warnAndFilterVtxosForScript(
-              vtxos,
-              script,
-              "WalletMessageHandler.notifyIncomingFunds"
+    this.incomingFundsSubscription = void 0;
+    this.incomingFundsEpoch++;
+    const emitter = this.newEmitter("incomingFunds");
+    const address = await wallet.getAddress();
+    const unsubscribe = await wallet.notifyIncomingFunds(async (funds) => {
+      if (emitter.stale) return;
+      if (funds.type === "vtxo") {
+        const { newVtxos, spentVtxos } = funds;
+        if (newVtxos.length + spentVtxos.length === 0) return;
+        const byScript = /* @__PURE__ */ new Map();
+        for (const v of [...newVtxos, ...spentVtxos]) {
+          if (!v.script) {
+            console.warn(
+              `WalletMessageHandler.notifyIncomingFunds: dropping VTXO without script ${v.txid}:${v.vout}`
             );
-            if (filtered.length === 0) continue;
-            const targetAddress = script === walletScript ? address : addrByScript.get(script);
-            if (!targetAddress) continue;
-            if (this.walletRepository) {
-              await saveVtxosForContract(
-                this.walletRepository,
-                { script, address: targetAddress },
-                filtered
-              );
-            }
+            continue;
           }
-          this.scheduleForNextTick(
-            () => this.tagged({
-              type: "VTXO_UPDATE",
-              broadcast: true,
-              payload: { newVtxos, spentVtxos }
-            })
-          );
+          const arr = byScript.get(v.script) ?? [];
+          arr.push(v);
+          byScript.set(v.script, arr);
         }
-        if (funds.type === "utxo") {
-          const utxos = await this.readonlyWallet.getBoardingUtxos();
-          this.scheduleForNextTick(
-            () => this.tagged({
-              type: "UTXO_UPDATE",
-              broadcast: true,
-              payload: { coins: utxos }
-            })
+        let walletScript;
+        try {
+          walletScript = scriptFromArkAddress(address);
+        } catch {
+          walletScript = void 0;
+        }
+        const cm = await wallet.getContractManager();
+        if (emitter.stale) return;
+        const contracts = await cm.getContracts();
+        if (emitter.stale) return;
+        const addrByScript = new Map(contracts.map((c) => [c.script, c.address]));
+        for (const [script, vtxos] of byScript) {
+          const filtered = warnAndFilterVtxosForScript(
+            vtxos,
+            script,
+            "WalletMessageHandler.notifyIncomingFunds"
           );
+          if (filtered.length === 0) continue;
+          const targetAddress = script === walletScript ? address : addrByScript.get(script);
+          if (!targetAddress) continue;
+          if (this.walletRepository) {
+            if (emitter.stale) return;
+            await saveVtxosForContract(
+              this.walletRepository,
+              { script, address: targetAddress },
+              filtered
+            );
+          }
         }
+        emitter.emit(
+          this.tagged({
+            type: "VTXO_UPDATE",
+            broadcast: true,
+            payload: { newVtxos, spentVtxos }
+          })
+        );
       }
-    );
+      if (funds.type === "utxo") {
+        if (emitter.stale) return;
+        const utxos = await wallet.getBoardingUtxos();
+        emitter.emit(
+          this.tagged({
+            type: "UTXO_UPDATE",
+            broadcast: true,
+            payload: { coins: utxos }
+          })
+        );
+      }
+    });
+    if (emitter.stale) return unsubscribe();
+    this.incomingFundsSubscription = unsubscribe;
     if (this.wallet) {
       try {
         await this.wallet.getVtxoManager();
@@ -17609,10 +18111,11 @@ var WalletMessageHandler = class {
     await this.refreshCachedData();
   }
   async handleSettle(message) {
+    const emitter = this.newEmitter("request");
     const wallet = this.requireWallet();
     const txid = await wallet.settle(message.payload.params, (e) => {
-      this.scheduleForNextTick(
-        () => this.tagged({
+      emitter.emit(
+        this.tagged({
           id: message.id,
           type: "SETTLE_EVENT",
           payload: e
@@ -17689,30 +18192,39 @@ var WalletMessageHandler = class {
       throw new WalletNotInitializedError();
     }
     const allVtxos = await this.getVtxosFromRepo();
-    const vtxos = allVtxos.filter((v) => !chunkZIRFXBKL_cjs.hasTerminalSpend(v));
     const dustAmount = this.readonlyWallet.dustAmount;
+    const withUnrolled = message.payload.filter?.withUnrolled ?? false;
     const includeRecoverable = message.payload.filter?.withRecoverable ?? false;
-    const filteredVtxos = includeRecoverable ? vtxos : vtxos.filter((v) => {
+    return allVtxos.filter((v) => {
+      if (v.isUnrolled) {
+        return withUnrolled;
+      }
+      if (chunkEJOFL5WH_cjs.hasTerminalSpend(v)) {
+        return false;
+      }
+      if (includeRecoverable) {
+        return true;
+      }
       if (dustAmount != null && isSubdust(v, dustAmount)) {
         return false;
       }
-      if (chunkZIRFXBKL_cjs.isRecoverable(v)) {
+      if (chunkEJOFL5WH_cjs.isRecoverable(v)) {
         return false;
       }
-      if (chunkZIRFXBKL_cjs.isExpired(v)) {
+      if (chunkEJOFL5WH_cjs.isExpired(v)) {
         return false;
       }
       return true;
     });
-    if (!message.payload.filter?.withUnrolled) {
-      return filteredVtxos;
-    }
-    return filteredVtxos.concat(allVtxos.filter((v) => chunkZIRFXBKL_cjs.hasTerminalSpend(v) && v.isUnrolled));
   }
   /** Tear down handler subscriptions, then delegate the full wipe to the wallet. */
   async clear() {
     const wallet = this.wallet ?? this.readonlyWallet;
     if (!wallet) return;
+    this.requestEpoch++;
+    this.incomingFundsEpoch++;
+    this.contractEventsEpoch++;
+    this.onNextTick = [];
     if (this.incomingFundsSubscription) {
       this.incomingFundsSubscription();
       this.incomingFundsSubscription = void 0;
@@ -17797,17 +18309,21 @@ var WalletMessageHandler = class {
     if (!this.readonlyWallet) return null;
     const { boardingTxs, commitmentsToIgnore } = await this.readonlyWallet.getBoardingTxs();
     const indexerProvider = this.indexerProvider;
-    const resolveTxCreatedAt = indexerProvider ? (txids) => chunkZIRFXBKL_cjs.fetchVtxoCreatedAtByTxid(indexerProvider, txids) : void 0;
+    const resolveTxCreatedAt = indexerProvider ? (txids) => chunkEJOFL5WH_cjs.fetchVtxoCreatedAtByTxid(indexerProvider, txids) : void 0;
     return buildTransactionHistory(vtxos, boardingTxs, commitmentsToIgnore, resolveTxCreatedAt);
   }
   async ensureContractEventBroadcasting() {
-    if (!this.readonlyWallet) return;
+    const wallet = this.readonlyWallet;
+    if (!wallet) return;
     if (this.contractEventsSubscription) return;
+    const gen = this.newGeneration("contractEvents");
     try {
-      const manager = await this.readonlyWallet.getContractManager();
+      const manager = await wallet.getContractManager();
+      if (gen.stale || this.contractEventsSubscription) return;
+      const emitter = this.newEmitter("contractEvents");
       this.contractEventsSubscription = manager.onContractEvent((event) => {
-        this.scheduleForNextTick(
-          () => this.tagged({
+        emitter.emit(
+          this.tagged({
             type: "CONTRACT_EVENT",
             broadcast: true,
             payload: { event }
@@ -17838,6 +18354,9 @@ var DEFAULT_MESSAGE_TIMEOUTS = {
   // Allocation is a local repository write plus a fire-and-forget band
   // slide — no indexer round trip on the request path.
   GET_NEXT_SIGNING_DESCRIPTOR: 1e4,
+  // Same shape as the bare allocation above, plus one contract write per
+  // requested type — still local, still no indexer round trip.
+  GET_NEW_ADDRESSES: 1e4,
   GET_USED_SIGNING_DESCRIPTORS: 2e4,
   ADVANCE_SIGNING_DESCRIPTOR_WATERMARK: 1e4,
   // Medium reads — may involve indexer queries
@@ -18486,7 +19005,7 @@ var ServiceWorkerReadonlyWallet = class _ServiceWorkerReadonlyWallet {
     };
     try {
       const response = await this.sendMessage(message);
-      return response.payload.vtxos.map(chunkZIRFXBKL_cjs.normalizeVtxo);
+      return response.payload.vtxos.map(chunkEJOFL5WH_cjs.normalizeVtxo);
     } catch (error) {
       throw new Error(`Failed to get vtxos: ${error}`);
     }
@@ -18511,7 +19030,7 @@ var ServiceWorkerReadonlyWallet = class _ServiceWorkerReadonlyWallet {
     };
     try {
       const response = await this.sendMessage(message);
-      return response.payload.vtxos.map(chunkZIRFXBKL_cjs.normalizeVtxo);
+      return response.payload.vtxos.map(chunkEJOFL5WH_cjs.normalizeVtxo);
     } catch (error) {
       throw new Error(`Failed to get spendable vtxos: ${error}`);
     }
@@ -18642,7 +19161,7 @@ var ServiceWorkerReadonlyWallet = class _ServiceWorkerReadonlyWallet {
         };
         try {
           const response = await sendContractMessage(message);
-          return response.payload.vtxos.map(chunkZIRFXBKL_cjs.normalizeVtxo);
+          return response.payload.vtxos.map(chunkEJOFL5WH_cjs.normalizeVtxo);
         } catch (e) {
           throw new Error("Failed to annotate vtxos");
         }
@@ -18983,6 +19502,35 @@ var ServiceWorkerWallet = class _ServiceWorkerWallet extends ServiceWorkerReadon
       throw new Error(`Failed to allocate next signing descriptor: ${error}`);
     }
   }
+  /**
+   * @see Wallet.getNewAddresses
+   *
+   * Proxied as a single request rather than rebuilt page-side out of
+   * {@link getNextSigningDescriptor}: the worker owns the HD watermark *and*
+   * the contract repository, so splitting the operation would let a page burn
+   * an index and then fail to register the script, leaving an address nothing
+   * watches.
+   *
+   * Note the error shape — `WalletCannotAllocateAddressError` is thrown
+   * worker-side and cannot cross the message boundary as a class, so a
+   * `forceNew` refusal surfaces here as a plain `Error` carrying its message
+   * (and the worker-side error as `cause`). Callers that must branch on the
+   * refusal match the message rather than `instanceof`.
+   */
+  async getNewAddresses(opts) {
+    const message = {
+      id: getRandomId(),
+      tag: this.messageTag,
+      type: "GET_NEW_ADDRESSES",
+      ...opts ? { payload: opts } : {}
+    };
+    try {
+      const response = await this.sendMessage(message);
+      return response.payload.addresses;
+    } catch (error) {
+      throw new Error(`Failed to allocate new addresses: ${error}`, { cause: error });
+    }
+  }
   /** @see HDWalletCapable.getUsedSigningDescriptors */
   async getUsedSigningDescriptors(opts) {
     const message = {
@@ -19214,7 +19762,7 @@ var ServiceWorkerWallet = class _ServiceWorkerWallet extends ServiceWorkerReadon
         };
         try {
           const response = await wallet.sendMessage(message);
-          return response.payload.vtxos.map(chunkZIRFXBKL_cjs.normalizeVtxo);
+          return response.payload.vtxos.map(chunkEJOFL5WH_cjs.normalizeVtxo);
         } catch (e) {
           throw new Error(`Failed to get expiring vtxos: ${e}`);
         }
@@ -19326,12 +19874,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 = chunkZIRFXBKL_cjs.DEFAULT_NETWORK_NAME, provider) {
+  static async create(identity, networkName = chunkEJOFL5WH_cjs.DEFAULT_NETWORK_NAME, provider) {
     const pubkey = await identity.xOnlyPublicKey();
     if (!pubkey) {
       throw new Error("Invalid configured public key");
     }
-    const network = chunkZIRFXBKL_cjs.getNetwork(networkName);
+    const network = chunkEJOFL5WH_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);
@@ -19437,7 +19985,7 @@ var OnchainWallet = class _OnchainWallet {
     if (!inputs) {
       throw new Error("Fee estimation failed");
     }
-    let tx = new chunkZIRFXBKL_cjs.Transaction();
+    let tx = new chunkEJOFL5WH_cjs.Transaction();
     for (const input of inputs) {
       tx.addInput({
         txid: input.txid,
@@ -19495,7 +20043,7 @@ var OnchainWallet = class _OnchainWallet {
    * @throws If the parent has no anchor, or funding cannot be selected/signed
    */
   async bumpAnchor(parentHex, feeRate) {
-    const parent = chunkZIRFXBKL_cjs.Transaction.fromRaw(base.hex.decode(parentHex));
+    const parent = chunkEJOFL5WH_cjs.Transaction.fromRaw(base.hex.decode(parentHex));
     const coins = (await this.getCoins()).filter((c) => c.status.confirmed);
     const child = await this.buildBumpPackage(parent, feeRate, coins);
     return [parent.hex, child.hex];
@@ -19949,6 +20497,10 @@ var ElectrumOnchainProvider = class {
     }
     throw new Error("Only 1 or 1P1C package can be broadcast");
   }
+  async getRawTransaction(txid) {
+    const [tx] = await this.chain.fetchTransactions([txid]);
+    return base.hex.decode(tx.hex);
+  }
   async getTxOutspends(txid) {
     const [txResult] = await this.chain.fetchTransactions([txid]);
     const tx = btcSigner.Transaction.fromRaw(base.hex.decode(txResult.hex), {
@@ -20254,13 +20806,190 @@ function childTxidFromHex(txHex) {
   });
   return tx.id;
 }
+
+// src/providers/cachingArk.ts
+var DEFAULT_TTL_MS = 6e4;
+var CachingArkProvider = class {
+  constructor(inner, ttlMs = DEFAULT_TTL_MS) {
+    this.inner = inner;
+    this.ttlMs = ttlMs;
+    this.unsubscribe = inner.onServerInfoChanged?.((info) => {
+      this.cached = info;
+      this.expiresAt = Date.now() + this.ttlMs;
+      this.generation++;
+    }) ?? (() => {
+    });
+  }
+  inner;
+  ttlMs;
+  cached;
+  expiresAt = 0;
+  inflight;
+  /** Bumped on every event-driven cache write; see {@link getInfo}. */
+  generation = 0;
+  unsubscribe;
+  /** Releases the inner provider's server-info subscription. */
+  dispose() {
+    this.unsubscribe();
+  }
+  get serverUrl() {
+    const url = this.inner.serverUrl;
+    return typeof url === "string" ? url : void 0;
+  }
+  async getInfo() {
+    if (this.cached && Date.now() < this.expiresAt) return this.cached;
+    if (!this.inflight) {
+      const generation = this.generation;
+      this.inflight = this.inner.getInfo().then((info) => {
+        if (this.generation !== generation) return this.cached ?? info;
+        this.cached = info;
+        this.expiresAt = Date.now() + this.ttlMs;
+        return info;
+      }).finally(() => {
+        this.inflight = void 0;
+      });
+    }
+    return this.inflight;
+  }
+  submitTx(signedArkTx, checkpointTxs) {
+    return this.inner.submitTx(signedArkTx, checkpointTxs);
+  }
+  finalizeTx(arkTxid, finalCheckpointTxs) {
+    return this.inner.finalizeTx(arkTxid, finalCheckpointTxs);
+  }
+  registerIntent(intent) {
+    return this.inner.registerIntent(intent);
+  }
+  deleteIntent(intent) {
+    return this.inner.deleteIntent(intent);
+  }
+  confirmRegistration(intentId) {
+    return this.inner.confirmRegistration(intentId);
+  }
+  submitTreeNonces(batchId, pubkey, nonces) {
+    return this.inner.submitTreeNonces(batchId, pubkey, nonces);
+  }
+  submitTreeSignatures(batchId, pubkey, signatures) {
+    return this.inner.submitTreeSignatures(batchId, pubkey, signatures);
+  }
+  submitSignedForfeitTxs(signedForfeitTxs, signedCommitmentTx) {
+    return this.inner.submitSignedForfeitTxs(signedForfeitTxs, signedCommitmentTx);
+  }
+  getEventStream(signal, topics) {
+    return this.inner.getEventStream(signal, topics);
+  }
+  getTransactionsStream(signal) {
+    return this.inner.getTransactionsStream(signal);
+  }
+  getPendingTxs(intent) {
+    return this.inner.getPendingTxs(intent);
+  }
+  onServerInfoChanged(listener) {
+    return this.inner.onServerInfoChanged?.(listener) ?? (() => {
+    });
+  }
+};
+var PrevTxUnavailableError = class extends Error {
+  constructor(message, txids = []) {
+    super(message);
+    this.txids = txids;
+    this.name = "PrevTxUnavailableError";
+  }
+  txids;
+};
+async function resolvePrevTxs(txids, source, onchain) {
+  const resolved = /* @__PURE__ */ new Map();
+  const wanted = [...new Set(txids)];
+  if (wanted.length === 0) return resolved;
+  try {
+    const { txs } = await source.getVirtualTxs(wanted);
+    for (const psbt of txs) {
+      const tx = chunkEJOFL5WH_cjs.Transaction.fromPSBT(base.base64.decode(psbt));
+      resolved.set(tx.id, tx.toBytes());
+    }
+  } catch (err) {
+    if (!onchain) throw err;
+  }
+  let missing = wanted.filter((txid) => !resolved.has(txid));
+  if (missing.length > 0 && onchain) {
+    const raw = await Promise.all(
+      missing.map(async (txid) => {
+        try {
+          return await onchain.getRawTransaction(txid);
+        } catch {
+          return void 0;
+        }
+      })
+    );
+    for (const [i, bytes] of raw.entries()) {
+      if (bytes) resolved.set(missing[i], bytes);
+    }
+    missing = missing.filter((txid) => !resolved.has(txid));
+  }
+  if (missing.length > 0) {
+    throw new PrevTxUnavailableError(
+      `cannot resolve the previous transaction of ${missing.join(", ")}` + (onchain ? "" : " (no onchain source configured)"),
+      missing
+    );
+  }
+  return resolved;
+}
+async function attachPrevArkTxs(tx, txids, source, onchain) {
+  const pending = [];
+  for (let i = 0; i < tx.inputsLength; i++) {
+    if (chunkEJOFL5WH_cjs.getArkPsbtFields(tx, i, chunkEJOFL5WH_cjs.PrevArkTxField).length === 0) pending.push(i);
+  }
+  if (pending.length === 0) return;
+  const resolved = await resolvePrevTxs(
+    pending.map((i) => txidAt(txids, i)),
+    source,
+    onchain
+  );
+  for (const i of pending) {
+    chunkEJOFL5WH_cjs.setArkPsbtField(tx, i, chunkEJOFL5WH_cjs.PrevArkTxField, resolved.get(txidAt(txids, i)));
+  }
+}
+async function attachPrevoutTxs(tx, source) {
+  const pending = [];
+  for (let i = 0; i < tx.inputsLength; i++) {
+    if (chunkEJOFL5WH_cjs.getArkPsbtFields(tx, i, chunkEJOFL5WH_cjs.PrevoutTxField).length > 0) continue;
+    const input = tx.getInput(i);
+    if (!input?.txid) throw new PrevTxUnavailableError(`input ${i} has no outpoint`);
+    pending.push({ index: i, txid: base.hex.encode(input.txid) });
+  }
+  if (pending.length === 0) return;
+  const resolved = /* @__PURE__ */ new Map();
+  for (const txid of new Set(pending.map((p) => p.txid))) {
+    resolved.set(txid, await source.getRawTransaction(txid));
+  }
+  for (const { index, txid } of pending) {
+    chunkEJOFL5WH_cjs.setArkPsbtField(tx, index, chunkEJOFL5WH_cjs.PrevoutTxField, resolved.get(txid));
+  }
+}
+async function withPrevTxs(coins, source, onchain) {
+  const pending = coins.filter((c) => !c.prevTx);
+  if (pending.length === 0) return coins;
+  const resolved = await resolvePrevTxs(
+    pending.map((c) => c.txid),
+    source,
+    onchain
+  );
+  return coins.map((c) => c.prevTx ? c : { ...c, prevTx: resolved.get(c.txid) });
+}
+function txidAt(txids, index) {
+  const txid = txids[index];
+  if (txid === void 0) {
+    throw new PrevTxUnavailableError(`no source txid supplied for input ${index}`);
+  }
+  return txid;
+}
 var TAG_BIP322 = "BIP0322-signed-message";
 exports.BIP322 = void 0;
 ((BIP3222) => {
   async function sign2(message, identity, network) {
     const xOnlyPubKey = await identity.xOnlyPublicKey();
     const payment = btcSigner.p2tr(xOnlyPubKey, void 0, network);
-    const toSpend = chunkZIRFXBKL_cjs.craftToSpendTx(message, payment.script, TAG_BIP322);
+    const toSpend = chunkEJOFL5WH_cjs.craftToSpendTx(message, payment.script, TAG_BIP322);
     const toSign = craftBIP322ToSignP2TR(toSpend, payment.script, xOnlyPubKey);
     const signed = await identity.sign(toSign, [0]);
     signed.finalizeIdx(0);
@@ -20318,7 +21047,7 @@ function verifyP2TR(message, witnessItems, pkScript, pubkey) {
   if (sighashType !== btcSigner.SigHash.DEFAULT && sighashType !== btcSigner.SigHash.ALL) {
     return false;
   }
-  const toSpend = chunkZIRFXBKL_cjs.craftToSpendTx(message, pkScript, TAG_BIP322);
+  const toSpend = chunkEJOFL5WH_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;
@@ -20339,7 +21068,7 @@ function verifyP2WPKH(message, witnessItems, pkScript, addressHash) {
   }
   const sighashType = sigWithHash[sigWithHash.length - 1];
   const derSig = sigWithHash.subarray(0, sigWithHash.length - 1);
-  const toSpend = chunkZIRFXBKL_cjs.craftToSpendTx(message, pkScript, TAG_BIP322);
+  const toSpend = chunkEJOFL5WH_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);
@@ -20392,7 +21121,7 @@ function encodeCompactSize(n) {
   return buf;
 }
 function craftBIP322ToSignP2TR(toSpend, pkScript, tapInternalKey) {
-  const tx = new chunkZIRFXBKL_cjs.Transaction({ version: 0 });
+  const tx = new chunkEJOFL5WH_cjs.Transaction({ version: 0 });
   tx.addInput({
     txid: toSpend.id,
     index: 0,
@@ -20406,12 +21135,12 @@ function craftBIP322ToSignP2TR(toSpend, pkScript, tapInternalKey) {
   });
   tx.addOutput({
     amount: 0n,
-    script: chunkZIRFXBKL_cjs.OP_RETURN_EMPTY_PKSCRIPT
+    script: chunkEJOFL5WH_cjs.OP_RETURN_EMPTY_PKSCRIPT
   });
   return tx;
 }
 function craftBIP322ToSignSimple(toSpend, pkScript) {
-  const tx = new chunkZIRFXBKL_cjs.Transaction({ version: 0 });
+  const tx = new chunkEJOFL5WH_cjs.Transaction({ version: 0 });
   tx.addInput({
     txid: toSpend.id,
     index: 0,
@@ -20423,7 +21152,7 @@ function craftBIP322ToSignSimple(toSpend, pkScript) {
   });
   tx.addOutput({
     amount: 0n,
-    script: chunkZIRFXBKL_cjs.OP_RETURN_EMPTY_PKSCRIPT
+    script: chunkEJOFL5WH_cjs.OP_RETURN_EMPTY_PKSCRIPT
   });
   return tx;
 }
@@ -20554,7 +21283,7 @@ var RestEmulatorProvider = class {
   }
 };
 function finalizeVirtualTx(type, psbtBase64) {
-  const tx = chunkZIRFXBKL_cjs.Transaction.fromPSBT(base.base64.decode(psbtBase64));
+  const tx = chunkEJOFL5WH_cjs.Transaction.fromPSBT(base.base64.decode(psbtBase64));
   if (type === "INDEXER_CHAINED_TX_TYPE_TREE" /* TREE */) {
     const input = tx.getInput(0);
     if (!input) {
@@ -20581,14 +21310,14 @@ var ExitPathError = class extends Error {
   reason;
 };
 function delayWeight(sequence) {
-  const t = chunkZIRFXBKL_cjs.sequenceToTimelock(sequence);
+  const t = chunkEJOFL5WH_cjs.sequenceToTimelock(sequence);
   return t.type === "blocks" ? Number(t.value) : Number(t.value) / 600;
 }
 async function resolveUnilateralPath(params) {
   const { vtxo, scriptHex, contractRepository } = params;
   const contract = contractRepository ? (await contractRepository.getContracts({ script: scriptHex }))[0] : void 0;
   if (contract) {
-    const handler = chunkPXPPZF5K_cjs.contractHandlers.get(contract.type);
+    const handler = chunk6YUACVX4_cjs.contractHandlers.get(contract.type);
     if (!handler) {
       throw new ExitPathError(
         "no-handler",
@@ -20611,12 +21340,12 @@ async function resolveUnilateralPath(params) {
     paths.sort((a, b) => delayWeight(a.sequence) - delayWeight(b.sequence));
     return { selection: paths[0], label: `${contract.type}:unilateral` };
   }
-  const decoded = chunkZIRFXBKL_cjs.VtxoScript.decode(vtxo.tapTree);
+  const decoded = chunkEJOFL5WH_cjs.VtxoScript.decode(vtxo.tapTree);
   let best;
   for (const exit of decoded.exitPaths()) {
     const leaf = decoded.findLeaf(base.hex.encode(exit.script));
     if (!leaf) continue;
-    const sequence = chunkZIRFXBKL_cjs.timelockToSequence(exit.params.timelock);
+    const sequence = chunkEJOFL5WH_cjs.timelockToSequence(exit.params.timelock);
     const weight = delayWeight(sequence);
     if (!best || weight < best.weight) {
       best = { selection: { leaf, sequence }, weight };
@@ -20631,6 +21360,22 @@ async function resolveUnilateralPath(params) {
   return { selection: best.selection, label: "default:exit" };
 }
 
+// src/wallet/exitObserver.ts
+function exitObserverFor(manager) {
+  return (outpoint) => manager.refreshOutpoints([outpoint]);
+}
+async function notifyExitObserved(onExitObserved, outpoint) {
+  if (!onExitObserved) return;
+  try {
+    await onExitObserved(outpoint);
+  } catch (e) {
+    console.error(
+      `exit observer failed for ${outpoint.txid}:${outpoint.vout} \u2014 the exit is unaffected`,
+      e
+    );
+  }
+}
+
 // src/wallet/unroll.ts
 function chainTxTypeToChainedExit2(t) {
   switch (t) {
@@ -20655,27 +21400,30 @@ exports.Unroll = void 0;
   })(Unroll2.StepType || (Unroll2.StepType = {}));
   class Session2 {
     /** Create an unroll session from a virtual output outpoint and its dependency chain. */
-    constructor(toUnroll, bumper, explorer, indexer, virtualTxRepository) {
+    constructor(toUnroll, bumper, explorer, indexer, virtualTxRepository, onExitObserved) {
       this.toUnroll = toUnroll;
       this.bumper = bumper;
       this.explorer = explorer;
       this.indexer = indexer;
       this.virtualTxRepository = virtualTxRepository;
+      this.onExitObserved = onExitObserved;
     }
     toUnroll;
     bumper;
     explorer;
     indexer;
     virtualTxRepository;
+    onExitObserved;
     /** Create an unroll session by loading the virtual output chain from the indexer. */
-    static async create(toUnroll, bumper, explorer, indexer, virtualTxRepository) {
+    static async create(toUnroll, bumper, explorer, indexer, virtualTxRepository, onExitObserved) {
       const { chain } = await indexer.getVtxoChain(toUnroll);
       return new Session2(
         { ...toUnroll, chain },
         bumper,
         explorer,
         indexer,
-        virtualTxRepository
+        virtualTxRepository,
+        onExitObserved
       );
     }
     /**
@@ -20711,6 +21459,14 @@ exports.Unroll = void 0;
     }
     /**
      * Get the next step to be executed
+     *
+     * @remarks
+     * `do()` is the step, not a formality: every effect lives there, and at
+     * `StepType.DONE` that includes firing {@link onExitObserved}. A caller
+     * driving `next()` by hand must always await it — the async iterator
+     * below does. Reading `type` and skipping `do()` leaves the exit
+     * unobserved, and on the other step kinds unbroadcast.
+     *
      * @returns The next step to be executed + the function to execute it
      */
     async next() {
@@ -20739,7 +21495,12 @@ exports.Unroll = void 0;
         return {
           type: 2 /* DONE */,
           vtxoTxid: this.toUnroll.txid,
-          do: () => Promise.resolve()
+          // The observation rides on `do` rather than the iterator so
+          // a caller driving `next()` by hand fires it too.
+          do: () => notifyExitObserved(this.onExitObserved, {
+            txid: this.toUnroll.txid,
+            vout: this.toUnroll.vout
+          })
         };
       }
       const virtualTxBase64 = await this.resolveVirtualTxBase64(nextTxToBroadcast);
@@ -20773,9 +21534,22 @@ exports.Unroll = void 0;
     }
   }
   Unroll2.Session = Session2;
+  async function sessionFor(wallet, toUnroll, bumper) {
+    const manager = await wallet.getContractManager();
+    return Session2.create(
+      toUnroll,
+      bumper,
+      wallet.onchainProvider,
+      wallet.indexerProvider,
+      wallet.virtualTxRepository,
+      exitObserverFor(manager)
+    );
+  }
+  Unroll2.sessionFor = sessionFor;
   async function completeUnroll(wallet, vtxoTxids, outputAddress) {
     const signedTx = await prepareUnrollTransaction(wallet, vtxoTxids, outputAddress);
     await wallet.onchainProvider.broadcastTransaction(signedTx.hex);
+    await refreshSpentExitOutputs(wallet, signedTx);
     return signedTx.id;
   }
   Unroll2.completeUnroll = completeUnroll;
@@ -20791,9 +21565,9 @@ async function prepareUnrollTransaction(wallet, vtxoTxIds, outputAddress) {
   let totalAmount = 0n;
   const txWeightEstimator = TxWeightEstimator.create();
   for (const vtxo of vtxos) {
-    if (!vtxo.isUnrolled) {
+    if (!chunkEJOFL5WH_cjs.canSweepOnchain(vtxo)) {
       throw new Error(
-        `Vtxo ${vtxo.txid}:${vtxo.vout} is not fully unrolled, use unroll first`
+        `Vtxo ${vtxo.txid}:${vtxo.vout} cannot be swept onchain: it is not fully unrolled (use unroll first), or its exit output was already spent`
       );
     }
     const txStatus = await wallet.onchainProvider.getTxStatus(vtxo.txid);
@@ -20802,14 +21576,14 @@ async function prepareUnrollTransaction(wallet, vtxoTxIds, outputAddress) {
     }
     const resolved = await resolveUnilateralPath({
       vtxo,
-      scriptHex: base.hex.encode(chunkZIRFXBKL_cjs.VtxoScript.decode(vtxo.tapTree).pkScript),
+      scriptHex: base.hex.encode(chunkEJOFL5WH_cjs.VtxoScript.decode(vtxo.tapTree).pkScript),
       contractRepository: wallet.contractRepository,
       walletPubKeyHex: base.hex.encode(await wallet.identity.xOnlyPublicKey()),
       currentTime: Date.now()
     });
     const spendingLeaf = resolved.selection.leaf;
     const sequence = resolved.selection.sequence;
-    const timelock = chunkZIRFXBKL_cjs.sequenceToTimelock(sequence);
+    const timelock = chunkEJOFL5WH_cjs.sequenceToTimelock(sequence);
     const elapsed = timelock.type === "blocks" ? chainTip.height >= txStatus.blockHeight + Number(timelock.value) : chainTip.time >= txStatus.blockTime + Number(timelock.value);
     if (!elapsed) {
       throw new Error(`no available exit path found for vtxo ${vtxo.txid}:${vtxo.vout}`);
@@ -20822,7 +21596,7 @@ async function prepareUnrollTransaction(wallet, vtxoTxIds, outputAddress) {
       sequence,
       witnessUtxo: {
         amount: BigInt(vtxo.value),
-        script: chunkZIRFXBKL_cjs.VtxoScript.decode(vtxo.tapTree).pkScript
+        script: chunkEJOFL5WH_cjs.VtxoScript.decode(vtxo.tapTree).pkScript
       },
       sighashType: btcSigner.SigHash.DEFAULT
     });
@@ -20832,7 +21606,7 @@ async function prepareUnrollTransaction(wallet, vtxoTxIds, outputAddress) {
       btcSigner.TaprootControlBlock.encode(spendingLeaf[0]).length
     );
   }
-  const tx = new chunkZIRFXBKL_cjs.Transaction({ version: 2 });
+  const tx = new chunkEJOFL5WH_cjs.Transaction({ version: 2 });
   for (const input of inputs) {
     tx.addInput(input);
   }
@@ -20854,6 +21628,22 @@ async function prepareUnrollTransaction(wallet, vtxoTxIds, outputAddress) {
   signedTx.finalize();
   return signedTx;
 }
+async function refreshSpentExitOutputs(wallet, signedTx) {
+  const outpoints = [];
+  for (let i = 0; i < signedTx.inputsLength; i++) {
+    const input = signedTx.getInput(i);
+    if (input.txid && input.index !== void 0) {
+      outpoints.push({ txid: base.hex.encode(input.txid), vout: input.index });
+    }
+  }
+  if (outpoints.length === 0) return;
+  try {
+    const manager = await wallet.getContractManager();
+    await manager.refreshOutpoints(outpoints);
+  } catch (e) {
+    console.error("completeUnroll: failed to refresh the spent exit outputs", e);
+  }
+}
 function sleep2(ms) {
   return new Promise((resolve) => setTimeout(resolve, ms));
 }
@@ -20899,7 +21689,7 @@ async function buildSignedSweep(params) {
       `uneconomic vtxo ${vtxo.txid}:${vtxo.vout}: value ${vtxo.value} - fee ${fee} < dust`
     );
   }
-  const tx = new chunkZIRFXBKL_cjs.Transaction({ version: 2 });
+  const tx = new chunkEJOFL5WH_cjs.Transaction({ version: 2 });
   tx.addInput({
     txid: vtxo.txid,
     index: vtxo.vout,
@@ -20924,7 +21714,7 @@ async function buildSignedSweep(params) {
     finalScriptWitness: [
       tapScriptSig[0][1],
       ...path.extraWitness,
-      chunkZIRFXBKL_cjs.scriptFromTapLeafScript(path.leaf),
+      chunkEJOFL5WH_cjs.scriptFromTapLeafScript(path.leaf),
       btcSigner.TaprootControlBlock.encode(controlBlock)
     ]
   });
@@ -20932,7 +21722,7 @@ async function buildSignedSweep(params) {
 }
 
 // src/wallet/exit/estimate.ts
-var CHILD_OUTPUT_DUST = 546;
+var CHILD_OUTPUT_DUST = CHILD_DUST_AMOUNT;
 function stepFundingAmount(stepFee) {
   return stepFee + CHILD_OUTPUT_DUST;
 }
@@ -20954,7 +21744,7 @@ async function resolveFeeRate(opts) {
 }
 async function selectExitVtxos(opts) {
   if (!opts.vtxos) return opts.wallet.getVtxos();
-  const res = await chunkZIRFXBKL_cjs.getNormalizedVtxos(opts.wallet.indexerProvider, { outpoints: opts.vtxos });
+  const res = await chunkEJOFL5WH_cjs.getNormalizedVtxos(opts.wallet.indexerProvider, { outpoints: opts.vtxos });
   const tapTrees = /* @__PURE__ */ new Map();
   const out = [];
   for (const vtxo of res.vtxos) {
@@ -20969,7 +21759,7 @@ async function selectExitVtxos(opts) {
           `no contract registered for vtxo script ${vtxo.script} \u2014 register the contract before exiting`
         );
       }
-      const handler = chunkPXPPZF5K_cjs.contractHandlers.get(contract.type);
+      const handler = chunk6YUACVX4_cjs.contractHandlers.get(contract.type);
       if (!handler) {
         throw new Error(`no contract handler registered for type '${contract.type}'`);
       }
@@ -20999,7 +21789,7 @@ async function computeExitLayout(opts, feeRate) {
   if (pendingNodes.length > 0) {
     const txs = await resolver.getVirtualTxs(pendingNodes.map((n) => n.txid));
     for (const psbt of txs) {
-      psbts.set(chunkZIRFXBKL_cjs.Transaction.fromPSBT(base.base64.decode(psbt)).id, psbt);
+      psbts.set(chunkEJOFL5WH_cjs.Transaction.fromPSBT(base.base64.decode(psbt)).id, psbt);
     }
   }
   const childVsize = Number(
@@ -21035,7 +21825,7 @@ async function computeExitLayout(opts, feeRate) {
     try {
       const resolved = await resolveUnilateralPath({
         vtxo,
-        scriptHex: base.hex.encode(chunkZIRFXBKL_cjs.VtxoScript.decode(vtxo.tapTree).pkScript),
+        scriptHex: base.hex.encode(chunkEJOFL5WH_cjs.VtxoScript.decode(vtxo.tapTree).pkScript),
         contractRepository: wallet.contractRepository,
         walletPubKeyHex,
         currentTime: Date.now()
@@ -21054,7 +21844,7 @@ async function computeExitLayout(opts, feeRate) {
         });
         continue;
       }
-      const t = chunkZIRFXBKL_cjs.sequenceToTimelock(resolved.selection.sequence);
+      const t = chunkEJOFL5WH_cjs.sequenceToTimelock(resolved.selection.sequence);
       const delay = { type: t.type, value: Number(t.value) };
       infos.push({ outpoint, value: vtxo.value, sweepFee, path: resolved.label, delay });
       sweeps.push({ vtxo, resolved, sweepFee, delay });
@@ -21093,10 +21883,18 @@ async function computeExitLayout(opts, feeRate) {
     // splitter. funded: + 1 splitter tx and pre-signed children.
     txCount: (graph ? 0 : steps.length > 0 ? 1 : 0) + steps.length * 2 + sweeps.length,
     totalFeeSats: splitterFee + stepFees + sweepFees,
-    // graph funding is what the executor sends to its own fee address:
-    // just the CPFP fees (change recycles); funded also locks the
-    // per-child dust into the splitter.
-    fundingRequiredSats: graph ? stepFees : splitterFee + fundingTotal,
+    // graph funding is what the executor sends to its own fee address: the
+    // CPFP fees, plus one dust floor. Change recycles through that single
+    // address, so each bump hands its remainder to the next and only the
+    // *final* change has to clear `CHILD_DUST_AMOUNT` — but it does have to,
+    // and `buildAnchorChild` throws rather than absorbing a short remainder
+    // into the fee. Quoting bare fees quotes an amount that strands the last
+    // bump and every sweep behind it.
+    //
+    // funded reserves the same floor per step instead of once overall (see
+    // `stepFundingAmount`), because it pre-funds each child separately
+    // through the splitter rather than recycling one output.
+    fundingRequiredSats: graph ? steps.length > 0 ? stepFees + CHILD_OUTPUT_DUST : 0 : splitterFee + fundingTotal,
     recoveredSats: sweeps.reduce((s, x) => s + (x.vtxo.value - x.sweepFee), 0)
   };
   const expiries = pendingNodes.map((n) => n.expiresAt).filter((x) => x !== void 0);
@@ -21156,12 +21954,32 @@ var Executor = class {
     this.pollIntervalMs = opts?.pollIntervalMs ?? 5e3;
     this.feeWallet = opts?.feeWallet;
     this.signal = opts?.signal;
+    this.onExitObserved = opts?.onExitObserved;
   }
   pkg;
   provider;
   pollIntervalMs;
   feeWallet;
   signal;
+  onExitObserved;
+  /**
+   * Per-VTXO branch progress, which the executor otherwise does not track:
+   * `dead` / `done` are per-step, and a VTXO is only onchain once EVERY
+   * `package`/`bump` step naming it has confirmed. (`broadcast` — the funding
+   * splitter — carries no `forVtxos` and serves no single VTXO.)
+   */
+  branchSteps() {
+    const byVtxo = /* @__PURE__ */ new Map();
+    this.pkg.steps.forEach((step, i) => {
+      if (step.kind !== "package" && step.kind !== "bump") return;
+      for (const vtxo of step.forVtxos) {
+        let steps = byVtxo.get(vtxo);
+        if (!steps) byVtxo.set(vtxo, steps = /* @__PURE__ */ new Set());
+        steps.add(i);
+      }
+    });
+    return byVtxo;
+  }
   /**
    * Poll delay. Nearly all wall-clock time is spent here, so it must be the
    * thing that reacts to abort — checking only between polls would leave
@@ -21201,6 +22019,19 @@ var Executor = class {
   async *[Symbol.asyncIterator]() {
     throwIfAborted(this.signal);
     const dead = /* @__PURE__ */ new Set();
+    const branchSteps = this.branchSteps();
+    const onchainSteps = /* @__PURE__ */ new Set();
+    const branchObserved = /* @__PURE__ */ new Set();
+    const observeBranch = async (stepIndex, forVtxos) => {
+      onchainSteps.add(stepIndex);
+      for (const vtxo of forVtxos ?? []) {
+        if (branchObserved.has(vtxo)) continue;
+        const steps = branchSteps.get(vtxo);
+        if (!steps || ![...steps].every((i) => onchainSteps.has(i))) continue;
+        branchObserved.add(vtxo);
+        await this.observe(vtxo);
+      }
+    };
     if (this.pkg.validUntil && Date.now() / 1e3 > this.pkg.validUntil) {
       yield {
         stepIndex: -1,
@@ -21230,6 +22061,7 @@ var Executor = class {
       const anchorTxid = step.kind === "package" || step.kind === "bump" ? step.parentTxid : step.txid;
       const existing = await this.status(anchorTxid);
       if (existing?.confirmed) {
+        await observeBranch(i, forVtxos);
         yield {
           stepIndex: i,
           kind: step.kind,
@@ -21285,6 +22117,7 @@ var Executor = class {
         }
       }
       await this.waitConfirmed(anchorTxid);
+      await observeBranch(i, forVtxos);
       yield {
         stepIndex: i,
         kind: step.kind,
@@ -21315,6 +22148,7 @@ var Executor = class {
         const swept = await this.status(step.txid);
         if (swept?.confirmed) {
           done.add(index);
+          await this.observe(step.vtxo);
           yield {
             stepIndex: index,
             kind: "sweep",
@@ -21371,7 +22205,25 @@ var Executor = class {
       if (done.size < pending.length) await this.sleep();
     }
   }
+  /** `"txid:vout"` -> outpoint, then hand it to the hook. A malformed entry is skipped. */
+  async observe(outpoint) {
+    if (!this.onExitObserved) return;
+    const sep = outpoint.lastIndexOf(":");
+    const rest = outpoint.slice(sep + 1);
+    const vout = Number(rest);
+    if (sep <= 0 || rest === "" || !Number.isInteger(vout)) return;
+    await notifyExitObserved(this.onExitObserved, { txid: outpoint.slice(0, sep), vout });
+  }
 };
+
+// src/wallet/exit/execute.ts
+async function execute(wallet, pkg, opts) {
+  const manager = await wallet.getContractManager();
+  return new Executor(pkg, opts?.provider ?? wallet.onchainProvider, {
+    ...opts,
+    onExitObserved: opts?.onExitObserved ?? exitObserverFor(manager)
+  });
+}
 async function prepare(opts) {
   const { wallet, onchainWallet } = opts;
   const feeRate = await resolveFeeRate(opts);
@@ -21393,7 +22245,7 @@ async function prepare(opts) {
           txid: sweep.vtxo.txid,
           vout: sweep.vtxo.vout,
           value: sweep.vtxo.value,
-          pkScript: chunkZIRFXBKL_cjs.VtxoScript.decode(sweep.vtxo.tapTree).pkScript
+          pkScript: chunkEJOFL5WH_cjs.VtxoScript.decode(sweep.vtxo.tapTree).pkScript
         },
         path: sweep.resolved.selection,
         outputAddress: opts.sweepAddress,
@@ -21446,7 +22298,10 @@ async function prepare(opts) {
       totals: {
         txCount: bumpSteps.length * 2 + sweepSteps.length,
         totalFeeSats: stepFees2 + sweepFees2,
-        fundingRequiredSats: stepFees2,
+        // Fees plus the single dust floor the recycling change output
+        // must keep clear; see the note in `estimate.ts`. Must match
+        // the quote `estimate` gives for the same package.
+        fundingRequiredSats: bumpSteps.length > 0 ? stepFees2 + CHILD_OUTPUT_DUST : 0,
         recoveredSats: recovered2
       },
       vtxos: layout.infos,
@@ -21478,7 +22333,7 @@ async function prepare(opts) {
       if (newFee <= splitterFee) break;
       splitterFee = newFee;
     }
-    const splitter = new chunkZIRFXBKL_cjs.Transaction({ version: 2 });
+    const splitter = new chunkEJOFL5WH_cjs.Transaction({ version: 2 });
     for (const coin of selected.inputs) {
       splitter.addInput({
         txid: coin.txid,
@@ -21615,47 +22470,48 @@ function isValidStep(step) {
 var UnilateralExit = {
   estimate,
   prepare,
+  execute,
   Executor
 };
 
 // src/arkade/index.ts
 var arkade_exports = {};
 chunk5BLDMQED_cjs.__export(arkade_exports, {
-  ARKADE_OP: () => chunkPXPPZF5K_cjs.ARKADE_OP,
-  ARKADE_OPCODES: () => chunkPXPPZF5K_cjs.ARKADE_OPCODES,
-  ARKADE_OPCODE_NAMES: () => chunkPXPPZF5K_cjs.ARKADE_OPCODE_NAMES,
-  ARKADE_OPCODE_VALUES: () => chunkPXPPZF5K_cjs.ARKADE_OPCODE_VALUES,
-  ARKADE_OPS: () => chunkPXPPZF5K_cjs.ARKADE_OPS,
+  ARKADE_OP: () => chunk6YUACVX4_cjs.ARKADE_OP,
+  ARKADE_OPCODES: () => chunk6YUACVX4_cjs.ARKADE_OPCODES,
+  ARKADE_OPCODE_NAMES: () => chunk6YUACVX4_cjs.ARKADE_OPCODE_NAMES,
+  ARKADE_OPCODE_VALUES: () => chunk6YUACVX4_cjs.ARKADE_OPCODE_VALUES,
+  ARKADE_OPS: () => chunk6YUACVX4_cjs.ARKADE_OPS,
   Arkade: () => Arkade,
   ArkadeContract: () => ArkadeContract,
-  ArkadeProgramScript: () => chunkPXPPZF5K_cjs.ArkadeProgramScript,
-  ArkadeScript: () => chunkPXPPZF5K_cjs.ArkadeScript,
+  ArkadeProgramScript: () => chunk6YUACVX4_cjs.ArkadeProgramScript,
+  ArkadeScript: () => chunk6YUACVX4_cjs.ArkadeScript,
   ArkadeTransactionBuilder: () => ArkadeTransactionBuilder,
-  BigNum: () => chunkPXPPZF5K_cjs.bignum_exports,
+  BigNum: () => chunk6YUACVX4_cjs.bignum_exports,
   OP: () => btcSigner.OP,
-  OPCODE_NAMES: () => chunkPXPPZF5K_cjs.OPCODE_NAMES,
-  OPCODE_VALUES: () => chunkPXPPZF5K_cjs.OPCODE_VALUES,
-  SUPPORTED_PROGRAM_VERSION: () => chunkPXPPZF5K_cjs.SUPPORTED_PROGRAM_VERSION,
+  OPCODE_NAMES: () => chunk6YUACVX4_cjs.OPCODE_NAMES,
+  OPCODE_VALUES: () => chunk6YUACVX4_cjs.OPCODE_VALUES,
+  SUPPORTED_PROGRAM_VERSION: () => chunk6YUACVX4_cjs.SUPPORTED_PROGRAM_VERSION,
   Script: () => btcSigner.Script,
-  arkadeScriptHash: () => chunkPXPPZF5K_cjs.arkadeScriptHash,
-  arkadeWitnessHash: () => chunkPXPPZF5K_cjs.arkadeWitnessHash,
-  asmToBytes: () => chunkPXPPZF5K_cjs.asmToBytes,
-  bytesToASM: () => chunkPXPPZF5K_cjs.bytesToASM,
-  computeArkadeScriptPublicKey: () => chunkPXPPZF5K_cjs.computeArkadeScriptPublicKey,
+  arkadeScriptHash: () => chunk6YUACVX4_cjs.arkadeScriptHash,
+  arkadeWitnessHash: () => chunk6YUACVX4_cjs.arkadeWitnessHash,
+  asmToBytes: () => chunk6YUACVX4_cjs.asmToBytes,
+  bytesToASM: () => chunk6YUACVX4_cjs.bytesToASM,
+  computeArkadeScriptPublicKey: () => chunk6YUACVX4_cjs.computeArkadeScriptPublicKey,
   createArkadeBatchHandler: () => createArkadeBatchHandler,
-  deserializeArkadeContractParams: () => chunkPXPPZF5K_cjs.deserializeArkadeContractParams,
-  fromASM: () => chunkPXPPZF5K_cjs.fromASM,
-  getOpcodeName: () => chunkPXPPZF5K_cjs.getOpcodeName,
-  getOpcodeValue: () => chunkPXPPZF5K_cjs.getOpcodeValue,
-  parseArtifact: () => chunkPXPPZF5K_cjs.parseArtifact,
-  resolveAsm: () => chunkPXPPZF5K_cjs.resolveAsm,
-  serializeArkadeContractParams: () => chunkPXPPZF5K_cjs.serializeArkadeContractParams,
-  stringifyArtifact: () => chunkPXPPZF5K_cjs.stringifyArtifact,
-  toASM: () => chunkPXPPZF5K_cjs.toASM,
-  validateProgram: () => chunkPXPPZF5K_cjs.validateProgram,
-  witnessRefToBytes: () => chunkPXPPZF5K_cjs.witnessRefToBytes
+  deserializeArkadeContractParams: () => chunk6YUACVX4_cjs.deserializeArkadeContractParams,
+  fromASM: () => chunk6YUACVX4_cjs.fromASM,
+  getOpcodeName: () => chunk6YUACVX4_cjs.getOpcodeName,
+  getOpcodeValue: () => chunk6YUACVX4_cjs.getOpcodeValue,
+  parseArtifact: () => chunk6YUACVX4_cjs.parseArtifact,
+  resolveAsm: () => chunk6YUACVX4_cjs.resolveAsm,
+  serializeArkadeContractParams: () => chunk6YUACVX4_cjs.serializeArkadeContractParams,
+  stringifyArtifact: () => chunk6YUACVX4_cjs.stringifyArtifact,
+  toASM: () => chunk6YUACVX4_cjs.toASM,
+  validateProgram: () => chunk6YUACVX4_cjs.validateProgram,
+  witnessRefToBytes: () => chunk6YUACVX4_cjs.witnessRefToBytes
 });
-var isVtxoCoin = (input) => chunkZIRFXBKL_cjs.isVirtualCoin(input);
+var isVtxoCoin = (input) => chunkEJOFL5WH_cjs.isVirtualCoin(input);
 function createArkadeBatchHandler(intentId, inputs, signer, signedProof, message, session, arkProvider, emulator, network, recipients, batchExpiryPolicy) {
   let batchId;
   let sweepTapTreeRoot;
@@ -21676,23 +22532,23 @@ function createArkadeBatchHandler(intentId, inputs, signer, signedProof, message
       );
       await arkProvider.confirmRegistration(intentId);
       batchId = event.id;
-      const sweepTapscript = chunkZIRFXBKL_cjs.CSVMultisigTapscript.encode({
+      const sweepTapscript = chunkEJOFL5WH_cjs.CSVMultisigTapscript.encode({
         timelock,
-        pubkeys: [chunkPXPPZF5K_cjs.toXOnly(base.hex.decode(info.forfeitPubkey), "forfeit key")]
+        pubkeys: [chunk6YUACVX4_cjs.toXOnly(base.hex.decode(info.forfeitPubkey), "forfeit key")]
       }).script;
       sweepTapTreeRoot = payment_js.tapLeafHash(sweepTapscript);
       return { skip: false };
     },
     onTreeSigningStarted: async (event, vtxoTree) => {
       const signerPubKey = await session.getPublicKey();
-      const xonlySignerPubKey = chunkPXPPZF5K_cjs.toXOnly(signerPubKey, "signer key");
+      const xonlySignerPubKey = chunk6YUACVX4_cjs.toXOnly(signerPubKey, "signer key");
       const xOnlyPubkeys = event.cosignersPublicKeys.map(
-        (k) => base.hex.encode(chunkPXPPZF5K_cjs.toXOnly(base.hex.decode(k), "cosigner key"))
+        (k) => base.hex.encode(chunk6YUACVX4_cjs.toXOnly(base.hex.decode(k), "cosigner key"))
       );
       if (!xOnlyPubkeys.includes(base.hex.encode(xonlySignerPubKey))) {
         return { skip: true };
       }
-      const commitmentTx = chunkZIRFXBKL_cjs.Transaction.fromPSBT(base.base64.decode(event.unsignedCommitmentTx));
+      const commitmentTx = chunkEJOFL5WH_cjs.Transaction.fromPSBT(base.base64.decode(event.unsignedCommitmentTx));
       validateVtxoTxGraph(vtxoTree, commitmentTx, sweepTapTreeRoot);
       if (recipients && recipients.length > 0) {
         validateBatchRecipients(commitmentTx, vtxoTree.leaves(), recipients, network);
@@ -21724,7 +22580,7 @@ function createArkadeBatchHandler(intentId, inputs, signer, signedProof, message
       if (connectorTree) {
         validateConnectorsTxGraph(event.commitmentTx, connectorTree);
       }
-      let commitmentPsbt = chunkZIRFXBKL_cjs.Transaction.fromPSBT(base.base64.decode(event.commitmentTx));
+      let commitmentPsbt = chunkEJOFL5WH_cjs.Transaction.fromPSBT(base.base64.decode(event.commitmentTx));
       assertFinalCommitmentMatchesValidated(
         commitmentPsbt,
         validatedCommitmentTxid,
@@ -21759,7 +22615,7 @@ function createArkadeBatchHandler(intentId, inputs, signer, signedProof, message
           boardingIndices.push(boardingIdx);
           continue;
         }
-        if (chunkZIRFXBKL_cjs.isRecoverable(input) || isSubdust(input, info.dust)) {
+        if (chunkEJOFL5WH_cjs.isRecoverable(input) || isSubdust(input, info.dust)) {
           continue;
         }
         if (connectorIndex >= connectorLeaves.length) {
@@ -21780,7 +22636,7 @@ function createArkadeBatchHandler(intentId, inputs, signer, signedProof, message
               index: input.vout,
               witnessUtxo: {
                 amount: BigInt(input.value),
-                script: chunkZIRFXBKL_cjs.VtxoScript.decode(input.tapTree).pkScript
+                script: chunkEJOFL5WH_cjs.VtxoScript.decode(input.tapTree).pkScript
               },
               sighashType: btcSigner.SigHash.DEFAULT,
               tapLeafScript: [input.forfeitTapLeafScript]
@@ -21871,16 +22727,16 @@ var Arkade = class _Arkade {
   /** Connect and resolve the server key, checkpoint closure and (if present) the co-signer key. */
   static async connect(opts) {
     const info = await opts.arkade.getInfo();
-    const serverKey = chunkPXPPZF5K_cjs.toXOnly(base.hex.decode(info.signerPubkey), "ark signer key");
-    const checkpoint = chunkZIRFXBKL_cjs.CSVMultisigTapscript.decode(base.hex.decode(info.checkpointTapscript));
-    const network = opts.network ?? chunkZIRFXBKL_cjs.DEFAULT_NETWORK;
+    const serverKey = chunk6YUACVX4_cjs.toXOnly(base.hex.decode(info.signerPubkey), "ark signer key");
+    const checkpoint = chunkEJOFL5WH_cjs.CSVMultisigTapscript.decode(base.hex.decode(info.checkpointTapscript));
+    const network = opts.network ?? chunkEJOFL5WH_cjs.DEFAULT_NETWORK;
     let emulatorKey;
     if (opts.emulator) {
-      emulatorKey = base.hex.decode(chunkZIRFXBKL_cjs.resolveEmulatorPubkey(network, opts.emulatorPubkey));
+      emulatorKey = base.hex.decode(chunkEJOFL5WH_cjs.resolveEmulatorPubkey(network, opts.emulatorPubkey));
     }
     let userKey;
     if (opts.identity) {
-      userKey = chunkPXPPZF5K_cjs.toXOnly(await opts.identity.xOnlyPublicKey(), "identity key");
+      userKey = chunk6YUACVX4_cjs.toXOnly(await opts.identity.xOnlyPublicKey(), "identity key");
     }
     return new _Arkade({
       arkProvider: opts.arkade,
@@ -21906,7 +22762,7 @@ var Arkade = class _Arkade {
    * key respectively; explicit args always win.
    */
   contract(program, args = {}) {
-    const declared = (program.params ?? []).map(chunkPXPPZF5K_cjs.inputName);
+    const declared = (program.params ?? []).map(chunk6YUACVX4_cjs.inputName);
     if (declared.includes("server") && args.server === void 0) {
       args = { ...args, server: this.serverKey };
     }
@@ -21926,7 +22782,7 @@ var ArkadeContract = class _ArkadeContract {
       userKey: client.userKey,
       emulatorKey: client.emulatorKey
     };
-    this.vtxoScript = new chunkPXPPZF5K_cjs.ArkadeProgramScript(program, args, this.keys);
+    this.vtxoScript = new chunk6YUACVX4_cjs.ArkadeProgramScript(program, args, this.keys);
     this.tapTree = this.vtxoScript.encode();
     this.compiled = this.vtxoScript.compiled;
   }
@@ -21954,7 +22810,7 @@ var ArkadeContract = class _ArkadeContract {
         `ArkadeContract.fromContract: expected contract type 'arkade', got '${contract.type}'`
       );
     }
-    const typed = chunkPXPPZF5K_cjs.deserializeArkadeContractParams(contract.params);
+    const typed = chunk6YUACVX4_cjs.deserializeArkadeContractParams(contract.params);
     return new _ArkadeContract(client, typed.program, typed.args, {
       serverKey: typed.serverKey,
       userKey: typed.userKey,
@@ -21995,7 +22851,7 @@ var ArkadeContract = class _ArkadeContract {
   toContractParams() {
     return {
       type: "arkade",
-      params: chunkPXPPZF5K_cjs.serializeArkadeContractParams({
+      params: chunk6YUACVX4_cjs.serializeArkadeContractParams({
         program: this.program,
         args: this.args,
         serverKey: this.keys.serverKey,
@@ -22032,6 +22888,10 @@ var ArkadeContract = class _ArkadeContract {
    * When a `contractManager` is configured and this contract is registered,
    * reads the repository-backed state (offline-first, kept fresh by the
    * contract watcher). Otherwise falls back to a direct indexer query.
+   *
+   * Both branches refuse a spent or unilaterally exited output. They are not
+   * otherwise interchangeable: the fallback asks `spendableOnly`, which also
+   * drops swept coins — the manager branch keeps those.
    */
   async getUtxos() {
     const manager = this.client.contractManager;
@@ -22040,17 +22900,19 @@ var ArkadeContract = class _ArkadeContract {
       const [registered] = await manager.getContracts({ script: scriptHex });
       if (registered) {
         const [withVtxos] = await manager.getContractsWithVtxos({ script: scriptHex });
-        return (withVtxos?.vtxos ?? []).filter((v) => !chunkZIRFXBKL_cjs.hasTerminalSpend(v));
+        return (withVtxos?.vtxos ?? []).filter(
+          (v) => !chunkEJOFL5WH_cjs.hasTerminalSpend(v) && !v.isUnrolled
+        );
       }
     }
     if (!this.client.indexer) {
       throw new Error("ArkadeContract.getUtxos: an indexer is required");
     }
-    const { vtxos } = await chunkZIRFXBKL_cjs.getNormalizedVtxos(this.client.indexer, {
+    const { vtxos } = await chunkEJOFL5WH_cjs.getNormalizedVtxos(this.client.indexer, {
       scripts: [scriptHex],
       spendableOnly: true
     });
-    return vtxos;
+    return vtxos.filter((v) => !chunkEJOFL5WH_cjs.hasTerminalSpend(v) && !v.isUnrolled);
   }
   /** Total spendable balance (requires an indexer). */
   async getBalance() {
@@ -22148,12 +23010,25 @@ var ArkadeTransactionBuilder = class {
       this.contract.client.checkpoint
     );
     if (coin.sourceTx) {
-      chunkZIRFXBKL_cjs.setArkPsbtField(arkTx, 0, chunkZIRFXBKL_cjs.PrevArkTxField, coin.sourceTx);
+      chunkEJOFL5WH_cjs.setArkPsbtField(arkTx, 0, chunkEJOFL5WH_cjs.PrevArkTxField, coin.sourceTx);
+    }
+    if (this.fn.arkadeScript) {
+      const indexer = this.contract.client.indexer;
+      if (!indexer) {
+        throw new PrevTxUnavailableError(
+          "covenant spends require an `indexer` on the Arkade client to resolve the previous ark tx of each input"
+        );
+      }
+      await attachPrevArkTxs(
+        arkTx,
+        [coin.txid, ...this.fundingCoins.map((c) => c.txid)],
+        indexer
+      );
     }
     const condition = (def.tapscript.witness ?? []).map((w) => this.witnessBytes(w));
     if (condition.length > 0) {
-      chunkZIRFXBKL_cjs.setArkPsbtField(arkTx, 0, chunkZIRFXBKL_cjs.ConditionWitness, condition);
-      chunkZIRFXBKL_cjs.setArkPsbtField(checkpoints[0], 0, chunkZIRFXBKL_cjs.ConditionWitness, condition);
+      chunkEJOFL5WH_cjs.setArkPsbtField(arkTx, 0, chunkEJOFL5WH_cjs.ConditionWitness, condition);
+      chunkEJOFL5WH_cjs.setArkPsbtField(checkpoints[0], 0, chunkEJOFL5WH_cjs.ConditionWitness, condition);
     }
     const packets = [];
     if (this.assetSpecs.length > 0) {
@@ -22192,7 +23067,7 @@ var ArkadeTransactionBuilder = class {
         base.base64.encode(signedArk2.toPSBT()),
         signedCps.map((c) => base.base64.encode(c.toPSBT()))
       );
-      const txid = chunkZIRFXBKL_cjs.Transaction.fromPSBT(base.base64.decode(res2.signedArkTx)).id;
+      const txid = chunkEJOFL5WH_cjs.Transaction.fromPSBT(base.base64.decode(res2.signedArkTx)).id;
       return {
         txid,
         signedArkTx: res2.signedArkTx,
@@ -22251,23 +23126,23 @@ var ArkadeTransactionBuilder = class {
   }
   buildAssetPacket() {
     const groups = this.assetSpecs.map((s) => {
-      const id = typeof s.assetId === "string" ? chunk3S3JZUEN_cjs.AssetId.fromString(s.assetId) : chunk3S3JZUEN_cjs.AssetId.fromBytes(s.assetId);
-      return chunk3S3JZUEN_cjs.AssetGroup.create(
+      const id = typeof s.assetId === "string" ? chunkPJR63FTK_cjs.AssetId.fromString(s.assetId) : chunkPJR63FTK_cjs.AssetId.fromBytes(s.assetId);
+      return chunkPJR63FTK_cjs.AssetGroup.create(
         id,
         null,
-        s.inputs.map((i) => chunk3S3JZUEN_cjs.AssetInput.create(i.vin, i.amount)),
-        s.outputs.map((o) => chunk3S3JZUEN_cjs.AssetOutput.create(o.vout, o.amount)),
-        (s.metadata ?? []).map((m) => chunk3S3JZUEN_cjs.Metadata.create(m.key, m.value))
+        s.inputs.map((i) => chunkPJR63FTK_cjs.AssetInput.create(i.vin, i.amount)),
+        s.outputs.map((o) => chunkPJR63FTK_cjs.AssetOutput.create(o.vout, o.amount)),
+        (s.metadata ?? []).map((m) => chunkPJR63FTK_cjs.Metadata.create(m.key, m.value))
       );
     });
-    return chunk3S3JZUEN_cjs.Packet.create(groups);
+    return chunkPJR63FTK_cjs.Packet.create(groups);
   }
   witnessBytes(ref) {
-    return chunkPXPPZF5K_cjs.witnessRefToBytes(ref, this.args, this.contract.args);
+    return chunk6YUACVX4_cjs.witnessRefToBytes(ref, this.args, this.contract.args);
   }
 };
 function bindInputs(fn, callArgs) {
-  const names = (fn.def.inputs ?? []).map(chunkPXPPZF5K_cjs.inputName);
+  const names = (fn.def.inputs ?? []).map(chunk6YUACVX4_cjs.inputName);
   if (callArgs.length !== names.length) {
     throw new Error(`${fn.name}: expected ${names.length} argument(s), got ${callArgs.length}`);
   }
@@ -22667,6 +23542,7 @@ exports.AssetManager = AssetManager;
 exports.BIP21 = BIP21;
 exports.BIP21Error = BIP21Error;
 exports.BLOCKED_UPGRADE_TIMEOUT_MS = BLOCKED_UPGRADE_TIMEOUT_MS;
+exports.CachingArkProvider = CachingArkProvider;
 exports.ChainedTxType = ChainedTxType;
 exports.ConnectionDisposedError = ConnectionDisposedError;
 exports.ContractManager = ContractManager;
@@ -22717,6 +23593,7 @@ exports.MnemonicIdentity = MnemonicIdentity;
 exports.OnchainWallet = OnchainWallet;
 exports.P2A = P2A;
 exports.PaymentRouter = PaymentRouter;
+exports.PrevTxUnavailableError = PrevTxUnavailableError;
 exports.REGTEST_MIN_BATCH_EXPIRY_SECONDS = REGTEST_MIN_BATCH_EXPIRY_SECONDS;
 exports.REGTEST_MIN_CHECKPOINT_EXIT_DELAY_SECONDS = REGTEST_MIN_CHECKPOINT_EXIT_DELAY_SECONDS;
 exports.Ramps = Ramps;
@@ -22742,6 +23619,7 @@ exports.UnilateralExit = UnilateralExit;
 exports.UnknownPacket = UnknownPacket;
 exports.VtxoManager = VtxoManager;
 exports.Wallet = Wallet2;
+exports.WalletCannotAllocateAddressError = WalletCannotAllocateAddressError;
 exports.WalletCannotSignError = WalletCannotSignError;
 exports.WalletMessageHandler = WalletMessageHandler;
 exports.WalletNotInitializedError = WalletNotInitializedError;
@@ -22758,6 +23636,8 @@ exports.assertSubmittedArkTxid = assertSubmittedArkTxid;
 exports.assertValidBatchExpiry = assertValidBatchExpiry;
 exports.assertValidServerUnrollScript = assertValidServerUnrollScript;
 exports.assetMintResolver = assetMintResolver;
+exports.attachPrevArkTxs = attachPrevArkTxs;
+exports.attachPrevoutTxs = attachPrevoutTxs;
 exports.awaitTransaction = awaitTransaction;
 exports.boardingResolver = boardingResolver;
 exports.btcTarget = btcTarget;
@@ -22789,7 +23669,9 @@ exports.deserializeExitPackage = deserializeExitPackage;
 exports.deserializeUtxo = deserializeUtxo;
 exports.deserializeVtxo = deserializeVtxo;
 exports.encodeArkContract = encodeArkContract;
+exports.exitObserverFor = exitObserverFor;
 exports.extendVirtualCoinForContract = extendVirtualCoinForContract;
+exports.extractArkProviderUrl = extractArkProviderUrl;
 exports.gateExclusion = gateExclusion;
 exports.gatedContracts = gatedContracts;
 exports.getAllByIndexValues = getAllByIndexValues;
@@ -22800,6 +23682,7 @@ exports.hasCandidates = hasCandidates;
 exports.intentMatchesFilter = intentMatchesFilter;
 exports.intentPageBounds = intentPageBounds;
 exports.invoiceTarget = invoiceTarget;
+exports.isAddressAllocationCapable = isAddressAllocationCapable;
 exports.isArkContract = isArkContract;
 exports.isBatchSignable = isBatchSignable;
 exports.isBtcAddress = isBtcAddress;
@@ -22827,6 +23710,7 @@ exports.makeHandle = makeHandle;
 exports.matchServerCheckpoints = matchServerCheckpoints;
 exports.mergeChainedTxType = mergeChainedTxType;
 exports.migrateWalletRepository = migrateWalletRepository;
+exports.notifyExitObserved = notifyExitObserved;
 exports.onchainRail = onchainRail;
 exports.openDatabase = openDatabase;
 exports.outpointExclusion = outpointExclusion;
@@ -22838,6 +23722,7 @@ exports.requiresMigration = requiresMigration;
 exports.resolveBatchExpiryPolicy = resolveBatchExpiryPolicy;
 exports.resolveCheckpointExitDelayPolicy = resolveCheckpointExitDelayPolicy;
 exports.resolveDescriptorSigner = resolveDescriptorSigner;
+exports.resolvePrevTxs = resolvePrevTxs;
 exports.resolveSendAmount = resolveSendAmount;
 exports.rollbackMigration = rollbackMigration;
 exports.saveVtxosForContract = saveVtxosForContract;
@@ -22861,5 +23746,6 @@ exports.validateVtxoTxGraph = validateVtxoTxGraph;
 exports.verifyTapscriptSignatures = verifyTapscriptSignatures;
 exports.waitForIncomingFunds = waitForIncomingFunds;
 exports.warnAndFilterVtxosForScript = warnAndFilterVtxosForScript;
-//# sourceMappingURL=chunk-5E6IZNRG.cjs.map
-//# sourceMappingURL=chunk-5E6IZNRG.cjs.map
+exports.withPrevTxs = withPrevTxs;
+//# sourceMappingURL=chunk-WCJVKFAP.cjs.map
+//# sourceMappingURL=chunk-WCJVKFAP.cjs.map