@arkade-os/sdk 0.4.77 → 0.4.79

package/dist/{chunk-MLOZHTBN.js → chunk-YPQ37P3H.js}

@@ -1,16 +1,16 @@
-import { AssetId, AssetGroup, AssetInput, AssetOutput, Metadata, Packet, BufferReader, BufferWriter, AssetRef, RestIndexerProvider } from './chunk-HKOFYHZP.js';
-import { witnessRefToBytes, validateProgram, toASM, stringifyArtifact, serializeArkadeContractParams, resolveAsm, parseArtifact, getOpcodeValue, getOpcodeName, fromASM, deserializeArkadeContractParams, computeArkadeScriptPublicKey, bytesToASM, asmToBytes, arkadeWitnessHash, arkadeScriptHash, SUPPORTED_PROGRAM_VERSION, OPCODE_VALUES, OPCODE_NAMES, bignum_exports, ArkadeScript, ArkadeProgramScript, ARKADE_OPS, ARKADE_OPCODE_VALUES, ARKADE_OPCODE_NAMES, ARKADE_OPCODES, ARKADE_OP, toXOnly, inputName, contractHandlers, isMainnetDescriptor, descriptorIsOurs, deriveDescriptorLeafPubKey, deriveDescriptorLeafCompressedPubKey, parseHDDescriptor, identityDescriptor, DefaultVtxo, speculativeReceiveMetadata, DelegateVtxo, WALLET_RECEIVE_SOURCE, BoardingContractHandler } from './chunk-ACPANSOX.js';
-import { VtxoScript, Transaction, isRecoverable, CSVMultisigTapscript, networks, getNetwork, DEFAULT_NETWORK, resolveEmulatorPubkey, isVtxoSpent, getNormalizedVtxos, setArkPsbtField, PrevArkTxField, ConditionWitness, craftToSpendTx, ArkAddress, isVirtualCoin, getArkPsbtFields, CosignerPublicKey, ServerResponseMismatchError, OP_RETURN_EMPTY_PKSCRIPT, canSweepOnchain, sequenceToTimelock, decodeTapscript, scriptFromTapLeafScript, CLTVMultisigTapscript, VtxoTaprootTree, timelockToSequence, assertAllowedSighashTypes, baseFetch, Intent, rateGate, DEFAULT_NETWORK_NAME, formatSighash, normalizeVtxo, getSequence, toBatchExpiry, maybeArkError, isArkError, ArkErrorName, toOffchainInputFeeParams, canRecoverOnchain, MultisigTapscript, isEventSourceError, isEventSourceUnavailableError, getAllNormalizedVtxos, isPastExpiry, isRetryableProviderError, DEFAULT_PAGE_SIZE, RestArkProvider, toVirtualStatus, ArkError, TapTreeCoder, resolveTimeHeight, canSpendOffchain, parseLegacyExpiry, isExpired, PrevoutTxField, fetchVtxoCreatedAtByTxid, DEFAULT_ARKADE_SERVER_URL, ProviderUnavailableError } from './chunk-52OA3UIC.js';
+import { AssetId, AssetGroup, AssetInput, AssetOutput, Metadata, Packet, BufferReader, BufferWriter, AssetRef, RestIndexerProvider } from './chunk-QDXOTONI.js';
+import { witnessRefToBytes, validateProgram, toASM, stringifyArtifact, serializeArkadeContractParams, resolveAsm, parseArtifact, getOpcodeValue, getOpcodeName, fromASM, deserializeArkadeContractParams, computeArkadeScriptPublicKey, bytesToASM, asmToBytes, arkadeWitnessHash, arkadeScriptHash, SUPPORTED_PROGRAM_VERSION, OPCODE_VALUES, OPCODE_NAMES, bignum_exports, ArkadeScript, ArkadeProgramScript, ARKADE_OPS, ARKADE_OPCODE_VALUES, ARKADE_OPCODE_NAMES, ARKADE_OPCODES, ARKADE_OP, toXOnly, inputName, contractHandlers, isMainnetDescriptor, descriptorIsOurs, deriveDescriptorLeafPubKey, deriveDescriptorLeafCompressedPubKey, parseHDDescriptor, identityDescriptor, DefaultVtxo, speculativeReceiveMetadata, DelegateVtxo, WALLET_RECEIVE_SOURCE, BoardingContractHandler } from './chunk-4MXW2NDN.js';
+import { VtxoScript, Transaction, requiresForfeit, CSVMultisigTapscript, networks, getNetwork, DEFAULT_NETWORK, resolveEmulatorPubkey, isVtxoSpent, getNormalizedVtxos, setArkPsbtField, PrevArkTxField, ConditionWitness, craftToSpendTx, ArkAddress, isVirtualCoin, getArkPsbtFields, CosignerPublicKey, ServerResponseMismatchError, OP_RETURN_EMPTY_PKSCRIPT, canSweepOnchain, sequenceToTimelock, timelockToSequence, decodeTapscript, scriptFromTapLeafScript, CLTVMultisigTapscript, VtxoTaprootTree, assertAllowedSighashTypes, baseFetch, Intent, rateGate, DEFAULT_NETWORK_NAME, formatSighash, normalizeVtxo, getSequence, toBatchExpiry, maybeArkError, isArkError, ArkErrorName, toOffchainInputFeeParams, canRecoverOnchain, MultisigTapscript, isEventSourceError, isEventSourceUnavailableError, getAllNormalizedVtxos, isPastExpiry, isRetryableProviderError, DEFAULT_PAGE_SIZE, RestArkProvider, toVirtualStatus, ArkError, toBIP371TapTree, resolveTimeHeight, canSpendOffchain, parseLegacyExpiry, isRecoverable, isExpired, PrevoutTxField, fetchVtxoCreatedAtByTxid, DEFAULT_ARKADE_SERVER_URL, ProviderUnavailableError } from './chunk-JCPVP7TJ.js';
 import { __export } from './chunk-NSBPE2FW.js';
 import { sha256 as sha256$1, equalBytes, hash160, sha256x2, concatBytes, randomPrivateKeyBytes, pubECDSA, pubSchnorr } from '@scure/btc-signer/utils.js';
-import { SigHash, Script, OP, OutScript, Address, RawWitness, p2tr, p2wpkh, TaprootControlBlock, DEFAULT_SEQUENCE, Transaction as Transaction$2 } from '@scure/btc-signer';
+import { SigHash, Script, OP, OutScript, Address, RawWitness, p2tr, p2wpkh, TaprootControlBlock, DEFAULT_SEQUENCE, Transaction as Transaction$1 } from '@scure/btc-signer';
 import { hex, base58, base64, bech32m } from '@scure/base';
 import * as musig2 from '@scure/btc-signer/musig2.js';
 import { equalBytes as equalBytes$1, bytesToNumberBE } from '@noble/curves/utils.js';
 import { signAsync, schnorr as schnorr$1, Point } from '@noble/secp256k1';
 import { secp256k1, schnorr } from '@noble/curves/secp256k1.js';
 import { Script as Script$1 } from '@scure/btc-signer/script.js';
-import { Transaction as Transaction$1, SigHash as SigHash$1 } from '@scure/btc-signer/transaction.js';
+import { SigHash as SigHash$1 } from '@scure/btc-signer/transaction.js';
 import { mnemonicToSeedSync, validateMnemonic } from '@scure/bip39';
 import { wordlist } from '@scure/bip39/wordlists/english.js';
 import { networks as networks$1, scriptExpressions, HDKey, expand } from '@bitcoinerlab/descriptors-scure';
@@ -954,33 +954,62 @@ function isAddressAllocationCapable(value) {
   return typeof value.getNewAddresses === "function";
 }
 
+// ../../node_modules/@noble/hashes/_u64.js
+var fromNumH = (n) => n / 2 ** 32 | 0;
+var fromNumL = (n) => n >>> 0;
+function setU64FromNum(view, byteOffset, n, isLE) {
+  const h = fromNumH(n);
+  const l = fromNumL(n);
+  view.setUint32(byteOffset, isLE ? l : h, isLE);
+  view.setUint32(byteOffset + 4, isLE ? h : l, isLE);
+}
+
 // ../../node_modules/@noble/hashes/utils.js
 function isBytes(a) {
-  return a instanceof Uint8Array || ArrayBuffer.isView(a) && a.constructor.name === "Uint8Array";
+  return a instanceof Uint8Array || ArrayBuffer.isView(a) && a.constructor.name === "Uint8Array" && "BYTES_PER_ELEMENT" in a && a.BYTES_PER_ELEMENT === 1;
+}
+var atitle = (title) => title ? `"${title}" ` : "";
+function anumber(n, title = "") {
+  if (typeof n !== "number")
+    throw new TypeError(atitle(title) + "expected number, got " + typeof n);
+  if (!Number.isSafeInteger(n) || n < 0)
+    throw new RangeError(atitle(title) + "expected integer >= 0, got " + n);
+  return n;
 }
 function abytes(value, length, title = "") {
+  if (isBytes(value) && (length === void 0))
+    return value;
   const bytes = isBytes(value);
-  const len = value?.length;
-  const needsLen = length !== void 0;
-  if (!bytes || needsLen) {
-    const prefix = title && `"${title}" `;
-    const ofLen = "";
-    const got = bytes ? `length=${len}` : `type=${typeof value}`;
-    throw new Error(prefix + "expected Uint8Array" + ofLen + ", got " + got);
-  }
-  return value;
-}
+  const ofLen = "";
+  const got = bytes ? `length=${value.length}` : `type=${typeof value}`;
+  const message = atitle(title) + "expected Uint8Array" + ofLen + ", got " + got;
+  if (!bytes)
+    throw new TypeError(message);
+  throw new RangeError(message);
+}
+var aobject = (value, label) => {
+  if (value === null || typeof value !== "object" || Array.isArray(value))
+    throw new TypeError((label === "object" ? "" : `"${label}" `) + "expected object, got type=" + typeof value);
+};
+var aopts = (value, label) => {
+  aobject(value, label);
+  const proto = Object.getPrototypeOf(value);
+  if (proto !== Object.prototype && proto !== null)
+    throw new TypeError(`"${label}" expected plain object`);
+  if (Object.hasOwn(value, "__proto__"))
+    throw new TypeError(`"${label}.__proto__" is not allowed`);
+};
 function aexists(instance, checkFinished = true) {
   if (instance.destroyed)
-    throw new Error("Hash instance has been destroyed");
+    throw new Error("hash was destroyed");
   if (checkFinished && instance.finished)
-    throw new Error("Hash#digest() has already been called");
+    throw new Error("digest() was already called");
 }
 function aoutput(out, instance) {
-  abytes(out, void 0, "digestInto() output");
+  abytes(out, void 0, "output");
   const min = instance.outputLen;
-  if (out.length < min) {
-    throw new Error('"digestInto() output" expected to be of length >=' + min);
+  if (!(out.length >= min)) {
+    throw new RangeError('"output" expected length >= ' + min);
   }
 }
 function clean(...arrays) {
@@ -994,22 +1023,38 @@ function createView(arr) {
 function rotr(word, shift) {
   return word << 32 - shift | word >>> shift;
 }
+function checkOpts(defaults, opts, title = "opts") {
+  aopts(defaults, "defaults");
+  if (opts !== void 0)
+    aopts(opts, title);
+  const merged = Object.assign(/* @__PURE__ */ Object.create(null), defaults, opts);
+  return merged;
+}
 function createHasher(hashCons, info = {}) {
+  if (typeof hashCons !== "function")
+    throw new TypeError('"hashCons" expected function, got type=' + typeof hashCons);
+  info = checkOpts({}, info, "info");
   const hashC = (msg, opts) => hashCons(opts).update(msg).digest();
   const tmp = hashCons(void 0);
   hashC.outputLen = tmp.outputLen;
   hashC.blockLen = tmp.blockLen;
+  hashC.canXOF = tmp.canXOF;
   hashC.create = (opts) => hashCons(opts);
   Object.assign(hashC, info);
   return Object.freeze(hashC);
 }
 function randomBytes(bytesLength = 32) {
+  anumber(bytesLength, "bytesLength");
   const cr = typeof globalThis === "object" ? globalThis.crypto : null;
   if (typeof cr?.getRandomValues !== "function")
     throw new Error("crypto.getRandomValues must be defined");
+  if (bytesLength > 65536)
+    throw new RangeError(`"bytesLength" expected <= 65536, got ${bytesLength}`);
   return cr.getRandomValues(new Uint8Array(bytesLength));
 }
 var oidNist = (suffix) => ({
+  // Current NIST hashAlgs suffixes used here fit in one DER subidentifier octet.
+  // Larger suffix values would need base-128 OID encoding and a different length byte.
   oid: Uint8Array.from([6, 9, 96, 134, 72, 1, 101, 3, 4, 2, suffix])
 });
 
@@ -1023,6 +1068,7 @@ function Maj(a, b, c) {
 var HashMD = class {
   blockLen;
   outputLen;
+  canXOF = false;
   padOffset;
   isLE;
   // For partial updates less than block size
@@ -1045,24 +1091,28 @@ var HashMD = class {
     abytes(data);
     const { view, buffer, blockLen } = this;
     const len = data.length;
+    let processed = false;
     for (let pos = 0; pos < len; ) {
       const take = Math.min(blockLen - this.pos, len - pos);
       if (take === blockLen) {
         const dataView = createView(data);
         for (; blockLen <= len - pos; pos += blockLen)
           this.process(dataView, pos);
+        processed = true;
         continue;
       }
-      buffer.set(data.subarray(pos, pos + take), this.pos);
+      buffer.set(pos === 0 && take === len ? data : data.subarray(pos, pos + take), this.pos);
       this.pos += take;
       pos += take;
       if (this.pos === blockLen) {
         this.process(view, 0);
         this.pos = 0;
+        processed = true;
       }
     }
     this.length += data.length;
-    this.roundClean();
+    if (processed)
+      this.roundClean();
     return this;
   }
   digestInto(out) {
@@ -1072,23 +1122,20 @@ var HashMD = class {
     const { buffer, view, blockLen, isLE } = this;
     let { pos } = this;
     buffer[pos++] = 128;
-    clean(this.buffer.subarray(pos));
+    buffer.fill(0, pos);
     if (this.padOffset > blockLen - pos) {
       this.process(view, 0);
-      pos = 0;
+      buffer.fill(0);
     }
-    for (let i = pos; i < blockLen; i++)
-      buffer[i] = 0;
-    view.setBigUint64(blockLen - 8, BigInt(this.length * 8), isLE);
+    setU64FromNum(view, blockLen - 8, this.length * 8, isLE);
     this.process(view, 0);
-    const oview = createView(out);
+    this.roundClean();
+    const oview = out === buffer ? view : createView(out);
     const len = this.outputLen;
-    if (len % 4)
-      throw new Error("_sha2: outputLen must be aligned to 32bit");
     const outLen = len / 4;
     const state = this.get();
-    if (outLen > state.length)
-      throw new Error("_sha2: outputLen bigger than state");
+    if (len % 4 || outLen > state.length)
+      throw new Error("invalid outputLen");
     for (let i = 0; i < outLen; i++)
       oview.setUint32(4 * i, state[i], isLE);
   }
@@ -1099,15 +1146,13 @@ var HashMD = class {
     this.destroy();
     return res;
   }
-  _cloneInto(to) {
-    to ||= new this.constructor();
-    to.set(...this.get());
-    const { blockLen, buffer, length, finished, destroyed, pos } = this;
+  _cloneIntoMeta(to) {
+    const { buffer, length, finished, destroyed, pos } = this;
     to.destroyed = destroyed;
     to.finished = finished;
     to.length = length;
     to.pos = pos;
-    if (length % blockLen)
+    if (pos)
       to.buffer.set(buffer);
     return to;
   }
@@ -1195,8 +1240,28 @@ var SHA256_K = /* @__PURE__ */ Uint32Array.from([
 ]);
 var SHA256_W = /* @__PURE__ */ new Uint32Array(64);
 var SHA2_32B = class extends HashMD {
-  constructor(outputLen) {
+  // We cannot use array here since array allows indexing by variable
+  // which means optimizer/compiler cannot use registers.
+  // Numeric initializers matter: starting the fields as `undefined` changes
+  // V8's field representation and makes sha256 3x slower (measured).
+  A = 0;
+  B = 0;
+  C = 0;
+  D = 0;
+  E = 0;
+  F = 0;
+  G = 0;
+  H = 0;
+  constructor(outputLen, IV) {
     super(64, outputLen, 8, false);
+    this.A = IV[0] | 0;
+    this.B = IV[1] | 0;
+    this.C = IV[2] | 0;
+    this.D = IV[3] | 0;
+    this.E = IV[4] | 0;
+    this.F = IV[5] | 0;
+    this.G = IV[6] | 0;
+    this.H = IV[7] | 0;
   }
   get() {
     const { A, B, C, D, E, F, G, H } = this;
@@ -1213,6 +1278,10 @@ var SHA2_32B = class extends HashMD {
     this.G = G | 0;
     this.H = H | 0;
   }
+  _cloneInto(to) {
+    (to ||= new this.constructor()).set(...this.get());
+    return this._cloneIntoMeta(to);
+  }
   process(view, offset) {
     for (let i = 0; i < 16; i++, offset += 4)
       SHA256_W[i] = view.getUint32(offset, false);
@@ -1252,23 +1321,14 @@ var SHA2_32B = class extends HashMD {
     clean(SHA256_W);
   }
   destroy() {
+    this.destroyed = true;
     this.set(0, 0, 0, 0, 0, 0, 0, 0);
     clean(this.buffer);
   }
 };
 var _SHA256 = class extends SHA2_32B {
-  // We cannot use array here since array allows indexing by variable
-  // which means optimizer/compiler cannot use registers.
-  A = SHA256_IV[0] | 0;
-  B = SHA256_IV[1] | 0;
-  C = SHA256_IV[2] | 0;
-  D = SHA256_IV[3] | 0;
-  E = SHA256_IV[4] | 0;
-  F = SHA256_IV[5] | 0;
-  G = SHA256_IV[6] | 0;
-  H = SHA256_IV[7] | 0;
   constructor() {
-    super(32);
+    super(32, SHA256_IV);
   }
 };
 var sha256 = /* @__PURE__ */ createHasher(
@@ -2314,7 +2374,7 @@ function validateConnectorsTxGraph(settlementTxB64, connectorsGraph) {
   connectorsGraph.validate();
   if (connectorsGraph.root.inputsLength !== 1) throw ErrNumberOfInputs;
   const rootInput = connectorsGraph.root.getInput(0);
-  const settlementTx = Transaction$1.fromPSBT(base64.decode(settlementTxB64));
+  const settlementTx = Transaction.fromPSBT(base64.decode(settlementTxB64));
   if (settlementTx.outputsLength <= BATCH_OUTPUT_CONNECTORS_INDEX)
     throw ErrInvalidSettlementTxOutputs;
   const expectedRootTxid = settlementTx.id;
@@ -5957,8 +6017,8 @@ function noteTapscript(preimageHash) {
   return Script.encode(["SHA256", preimageHash, "EQUAL"]);
 }
 var ArkadeCash = class _ArkadeCash {
-  constructor(privateKey, serverPubKey, csvTimelock, hrp = _ArkadeCash.DefaultHRP) {
-    this.csvTimelock = csvTimelock;
+  constructor(privateKey, serverPubKey, csvTimelock2, hrp = _ArkadeCash.DefaultHRP) {
+    this.csvTimelock = csvTimelock2;
     this.hrp = hrp;
     if (privateKey.length !== 32) {
       throw new Error(
@@ -5998,8 +6058,8 @@ var ArkadeCash = class _ArkadeCash {
   get publicKey() {
     return this._publicKey.slice();
   }
-  static generate(serverPubKey, csvTimelock, hrp) {
-    return new _ArkadeCash(randomPrivateKeyBytes(), serverPubKey, csvTimelock, hrp);
+  static generate(serverPubKey, csvTimelock2, hrp) {
+    return new _ArkadeCash(randomPrivateKeyBytes(), serverPubKey, csvTimelock2, hrp);
   }
   static fromString(encoded) {
     const decoded = bech32m.decodeUnsafe(encoded.trim().toLowerCase(), 1023);
@@ -6019,8 +6079,8 @@ 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 = sequenceToTimelock(sequence);
-    return new _ArkadeCash(privateKey, serverPubKey, csvTimelock, decoded.prefix);
+    const csvTimelock2 = sequenceToTimelock(sequence);
+    return new _ArkadeCash(privateKey, serverPubKey, csvTimelock2, decoded.prefix);
   }
   toString() {
     const data = new Uint8Array(_ArkadeCash.PayloadLength);
@@ -6935,7 +6995,7 @@ function buildGraph(rootTxid, chunksByTxid) {
   return new TxTree(rootTx, children);
 }
 function decodeNode(chunk) {
-  const tx = Transaction$1.fromPSBT(base64.decode(chunk.tx));
+  const tx = Transaction.fromPSBT(base64.decode(chunk.tx));
   return { tx, children: chunk.children };
 }
 var Batch;
@@ -7803,7 +7863,7 @@ async function delegate(identity, delegateProvider, arkInfo, delegateInfo, vtxos
     Address(getNetwork(network)).decode(forfeitAddress)
   );
   const forfeits = await Promise.all(
-    vtxos.filter((v) => !canRecoverOnchain(v, { timestamp: /* @__PURE__ */ new Date() })).map(async (coin) => {
+    vtxos.filter((v) => requiresForfeit(v)).map(async (coin) => {
       const forfeit = await makeDelegateForfeitTx(
         coin,
         dust,
@@ -8703,9 +8763,10 @@ function validateVtxosForScript(vtxos, script, context) {
     `${context}: refusing to persist ${mismatches.length} VTXO(s) whose script does not match ${script}: ${detail}`
   );
 }
-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(normalizeVtxo);
+async function getVtxosForContract(repo, contract, options) {
+  const vtxos = options?.unspentOnly && repo.getVtxosForScripts ? await repo.getVtxosForScripts([contract.script], options) : repo.getVtxosForScript ? await repo.getVtxosForScript(contract.script) : filterVtxosForScript(await repo.getVtxos(contract.address), contract.script);
+  const normalized = vtxos.map(normalizeVtxo);
+  return options?.unspentOnly ? normalized.filter((vtxo) => !isVtxoSpent(vtxo)) : normalized;
 }
 function hasRecordedSpend(vtxo) {
   return vtxo.isSpent === true && (!!vtxo.spentBy || !!vtxo.arkTxId || !!vtxo.settledBy);
@@ -12523,7 +12584,7 @@ function buildReceiveContract(current, descriptor, hrp, tagSource) {
   const pubKey = deriveLeafPubkey(descriptor);
   const tapscript = rebuildTapscript(current, pubKey);
   const serverPubKey = tapscript.options.serverPubKey;
-  const csvTimelock = timelockToSequence(tapscript.options.csvTimelock).toString();
+  const csvTimelock2 = timelockToSequence(tapscript.options.csvTimelock).toString();
   const base = {
     script: hex.encode(tapscript.pkScript),
     address: tapscript.address(hrp, serverPubKey).encode(),
@@ -12545,7 +12606,7 @@ function buildReceiveContract(current, descriptor, hrp, tagSource) {
       pubKey: hex.encode(pubKey),
       serverPubKey: hex.encode(serverPubKey),
       delegatePubKey: hex.encode(tapscript.options.delegatePubKey),
-      csvTimelock
+      csvTimelock: csvTimelock2
     }
   } : {
     ...base,
@@ -12553,7 +12614,7 @@ function buildReceiveContract(current, descriptor, hrp, tagSource) {
     params: {
       pubKey: hex.encode(pubKey),
       serverPubKey: hex.encode(serverPubKey),
-      csvTimelock
+      csvTimelock: csvTimelock2
     }
   };
   return { tapscript, params };
@@ -12908,6 +12969,34 @@ function filterSnapshotVtxos(snapshot, filter, pendingSpendOutpoints) {
     return true;
   });
 }
+async function refreshSweptStateOfExpiredInputs(wallet, inputs) {
+  const candidates = inputs.filter(isVirtualCoin).map(normalizeVtxo).filter((v) => !v.isSwept);
+  if (candidates.length === 0) return inputs;
+  const now = candidates.some((v) => v.expiresAtHeight !== void 0) ? await resolveTimeHeight(wallet.onchainProvider) : { timestamp: /* @__PURE__ */ new Date() };
+  const suspects = candidates.filter(
+    (v) => isPastExpiry(v, now) || v.expiresAtHeight !== void 0 && now.height === void 0
+  );
+  if (suspects.length === 0) return inputs;
+  let sweptNow;
+  try {
+    const manager = await wallet.getContractManager();
+    await manager.refreshOutpoints(suspects.map(({ txid, vout }) => ({ txid, vout })));
+    const suspectKeys = new Set(suspects.map((v) => `${v.txid}:${v.vout}`));
+    const fresh = await wallet.getVtxos({ withRecoverable: true });
+    sweptNow = new Set(
+      fresh.filter((v) => v.isSwept && suspectKeys.has(`${v.txid}:${v.vout}`)).map((v) => `${v.txid}:${v.vout}`)
+    );
+  } catch (e) {
+    const message = "could not confirm the swept state of expired settlement inputs; retry the settlement";
+    throw isRetryableProviderError(e) ? new ProviderUnavailableError(message, { cause: e }) : new Error(message, { cause: e });
+  }
+  if (sweptNow.size === 0) return inputs;
+  return inputs.map((input) => {
+    if (!isVirtualCoin(input) || !sweptNow.has(`${input.txid}:${input.vout}`)) return input;
+    const swept = { ...normalizeVtxo(input), isSwept: true };
+    return { ...swept, virtualStatus: toVirtualStatus(swept) };
+  });
+}
 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) {
@@ -13407,7 +13496,8 @@ var ReadonlyWallet = class _ReadonlyWallet {
   async getBalance() {
     const [boardingUtxos, snapshot] = await Promise.all([
       this.getBoardingUtxos(),
-      this.contractSnapshot()
+      // The bucketer drops every spent coin and the gate reads contracts only.
+      this.contractSnapshot(void 0, { unspentOnly: true })
     ]);
     const vtxos = filterSnapshotVtxos(
       snapshot,
@@ -13460,7 +13550,8 @@ var ReadonlyWallet = class _ReadonlyWallet {
    */
   async getVtxos(filter) {
     return filterSnapshotVtxos(
-      await this.contractSnapshot(),
+      // Only an unrolled coin is returned spent, so no other read needs spent rows.
+      await this.contractSnapshot(void 0, { unspentOnly: !filter?.withUnrolled }),
       filter,
       this._pendingSpendOutpoints
     );
@@ -14140,12 +14231,12 @@ var ReadonlyWallet = class _ReadonlyWallet {
     ];
     const seenBaselineScripts = /* @__PURE__ */ new Set();
     for (const serverPubKey of baselineSigners) {
-      for (const csvTimelock of this.walletContractTimelocks) {
-        const csvTimelockStr = timelockToSequence(csvTimelock).toString();
+      for (const csvTimelock2 of this.walletContractTimelocks) {
+        const csvTimelockStr = timelockToSequence(csvTimelock2).toString();
         const defaultScript = new DefaultVtxo.Script({
           pubKey: baselinePubkey,
           serverPubKey,
-          csvTimelock
+          csvTimelock: csvTimelock2
         });
         const defaultScriptHex = hex.encode(defaultScript.pkScript);
         if (!seenBaselineScripts.has(defaultScriptHex)) {
@@ -14167,7 +14258,7 @@ var ReadonlyWallet = class _ReadonlyWallet {
             pubKey: baselinePubkey,
             serverPubKey,
             delegatePubKey,
-            csvTimelock
+            csvTimelock: csvTimelock2
           });
           const delegateScriptHex = hex.encode(delegateScript.pkScript);
           if (seenBaselineScripts.has(delegateScriptHex)) continue;
@@ -14712,7 +14803,7 @@ var Wallet2 = class _Wallet extends ReadonlyWallet {
       ...this._boardingTapscript.options,
       pubKey
     });
-    const csvTimelock = tapscript.options.csvTimelock ?? DefaultVtxo.Script.DEFAULT_TIMELOCK;
+    const csvTimelock2 = tapscript.options.csvTimelock ?? DefaultVtxo.Script.DEFAULT_TIMELOCK;
     return {
       tapscript,
       params: {
@@ -14720,7 +14811,7 @@ var Wallet2 = class _Wallet extends ReadonlyWallet {
         params: {
           pubKey: hex.encode(pubKey),
           serverPubKey: hex.encode(tapscript.options.serverPubKey),
-          csvTimelock: timelockToSequence(csvTimelock).toString()
+          csvTimelock: timelockToSequence(csvTimelock2).toString()
         },
         script: hex.encode(tapscript.pkScript),
         address: tapscript.address(this.network.hrp, this.arkServerPublicKey).encode(),
@@ -15456,6 +15547,10 @@ var Wallet2 = class _Wallet extends ReadonlyWallet {
         outputs: [output]
       };
     }
+    params = {
+      ...params,
+      inputs: await refreshSweptStateOfExpiredInputs(this, params.inputs)
+    };
     const onchainOutputIndexes = [];
     const outputs = [];
     let hasOffchainOutputs = false;
@@ -15536,7 +15631,7 @@ var Wallet2 = class _Wallet extends ReadonlyWallet {
     ]);
     let intentTxId;
     try {
-      intentTxId = Transaction$2.fromPSBT(base64.decode(intent.proof)).id;
+      intentTxId = Transaction.fromPSBT(base64.decode(intent.proof)).id;
     } catch {
       intentTxId = params.inputs.map((i) => `${i.txid}:${i.vout}`).sort().join("|");
     }
@@ -15677,7 +15772,7 @@ var Wallet2 = class _Wallet extends ReadonlyWallet {
   }
   async handleSettlementFinalizationEvent(event, inputs, forfeitOutputScript, expectedRecipients, connectorsGraph, validatedCommitmentTxid) {
     const signedForfeits = [];
-    let settlementPsbt = Transaction$2.fromPSBT(base64.decode(event.commitmentTx));
+    let settlementPsbt = Transaction.fromPSBT(base64.decode(event.commitmentTx));
     assertFinalCommitmentMatchesValidated(
       settlementPsbt,
       validatedCommitmentTxid,
@@ -15728,7 +15823,7 @@ var Wallet2 = class _Wallet extends ReadonlyWallet {
         }
         continue;
       }
-      if (canRecoverOnchain(input, { timestamp: /* @__PURE__ */ new Date() }) || isSubdust({ value: input.value }, this.dustAmount)) {
+      if (!requiresForfeit(input) || isSubdust({ value: input.value }, this.dustAmount)) {
         continue;
       }
       if (connectorsLeaves.length === 0) {
@@ -15855,7 +15950,7 @@ var Wallet2 = class _Wallet extends ReadonlyWallet {
         if (!xOnlyPublicKeys.includes(hex.encode(xonlySignerPublicKey))) {
           return { skip: true };
         }
-        const commitmentTx = Transaction$2.fromPSBT(
+        const commitmentTx = Transaction.fromPSBT(
           base64.decode(event.unsignedCommitmentTx)
         );
         validateVtxoTxGraph(vtxoTree, commitmentTx, sweepTapTreeRoot);
@@ -16080,7 +16175,7 @@ var Wallet2 = class _Wallet extends ReadonlyWallet {
           batchPending.push(pendingTx.arkTxid);
           try {
             const checkpointTxs = pendingTx.signedCheckpointTxs.map((c) => {
-              const tx = Transaction$2.fromPSBT(base64.decode(c));
+              const tx = Transaction.fromPSBT(base64.decode(c));
               assertAllowedSighashTypes(tx);
               return tx;
             });
@@ -16414,7 +16509,7 @@ var Wallet2 = class _Wallet extends ReadonlyWallet {
     for (const pendingTx of pendingTxs) {
       try {
         const checkpointTxs = pendingTx.signedCheckpointTxs.map((checkpoint) => {
-          const tx = Transaction$2.fromPSBT(base64.decode(checkpoint));
+          const tx = Transaction.fromPSBT(base64.decode(checkpoint));
           assertAllowedSighashTypes(tx);
           return tx;
         });
@@ -16455,7 +16550,7 @@ var Wallet2 = class _Wallet extends ReadonlyWallet {
   }
   /** Sum the outputs of an ark tx PSBT that pay the given scriptPubKey. */
   arkTxAmountPaidTo(arkTxPsbt, pkScriptHex) {
-    const arkTx = Transaction$2.fromPSBT(base64.decode(arkTxPsbt));
+    const arkTx = Transaction.fromPSBT(base64.decode(arkTxPsbt));
     let total = 0;
     for (let i = 0; i < arkTx.outputsLength; i++) {
       const output = arkTx.getOutput(i);
@@ -16626,7 +16721,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: TapTreeCoder.decode(recipient.tapTree) } : {}
+      ...recipient.tapTree ? { tapTree: toBIP371TapTree(recipient.tapTree) } : {}
     }));
     const totalBtcOutput = outputs.reduce((sum, o) => sum + Number(o.amount), 0);
     let changeAmount = totalBtcSelected - totalBtcOutput;
@@ -16967,7 +17062,7 @@ var Wallet2 = class _Wallet extends ReadonlyWallet {
       }
       const checkpointIdByOutpoint = /* @__PURE__ */ new Map();
       for (const encoded of signedCheckpointTxs) {
-        const checkpoint = Transaction$2.fromPSBT(base64.decode(encoded));
+        const checkpoint = Transaction.fromPSBT(base64.decode(encoded));
         for (let i = 0; i < checkpoint.inputsLength; i++) {
           const input = checkpoint.getInput(i);
           if (!input.txid) continue;
@@ -19000,7 +19095,8 @@ var WalletMessageHandler = class {
   async handleGetBalance() {
     const [boardingUtxos, { snapshot, vtxos: allVtxos }] = await Promise.all([
       this.getAllBoardingUtxos(),
-      this.repoSnapshot()
+      // The bucketer drops every spent coin and the gate reads contracts only.
+      this.repoSnapshot({ unspentOnly: true })
     ]);
     const pendingOutpoints = this.readonlyWallet?.pendingRecoveryOutpointsIn(snapshot) ?? /* @__PURE__ */ new Set();
     let confirmed = 0;
@@ -19267,9 +19363,9 @@ var WalletMessageHandler = class {
     if (!this.readonlyWallet) {
       throw new WalletNotInitializedError();
     }
-    const allVtxos = await this.getVtxosFromRepo();
-    const dustAmount = this.readonlyWallet.dustAmount;
     const withUnrolled = message.payload.filter?.withUnrolled ?? false;
+    const allVtxos = await this.getVtxosFromRepo({ unspentOnly: !withUnrolled });
+    const dustAmount = this.readonlyWallet.dustAmount;
     const includeRecoverable = message.payload.filter?.withRecoverable ?? false;
     return allVtxos.filter((v) => {
       if (v.isUnrolled) {
@@ -19319,8 +19415,8 @@ var WalletMessageHandler = class {
    * Read all virtual outputs from the repository, aggregated across all contract
    * addresses and the wallet's primary address, with deduplication.
    */
-  async getVtxosFromRepo() {
-    return (await this.repoSnapshot()).vtxos;
+  async getVtxosFromRepo(options) {
+    return (await this.repoSnapshot(options)).vtxos;
   }
   /**
    * The worker's equivalent of `ReadonlyWallet.contractSnapshot`: contracts
@@ -19335,7 +19431,7 @@ var WalletMessageHandler = class {
    * what it knows is closed — so the coins of a just-registered escrowed
    * contract would count as available until the next poll.
    */
-  async repoSnapshot() {
+  async repoSnapshot(options) {
     if (!this.walletRepository || !this.readonlyWallet) return { snapshot: [], vtxos: [] };
     const seen = /* @__PURE__ */ new Set();
     const allVtxos = [];
@@ -19357,7 +19453,9 @@ var WalletMessageHandler = class {
     for (const contract of contracts) {
       snapshot.push({
         contract,
-        vtxos: addVtxos(await getVtxosForContract(this.walletRepository, contract))
+        vtxos: addVtxos(
+          await getVtxosForContract(this.walletRepository, contract, options)
+        )
       });
     }
     const walletAddress = await this.readonlyWallet.getAddress();
@@ -19370,10 +19468,11 @@ var WalletMessageHandler = class {
       );
     }
     addVtxos(
-      await getVtxosForContract(this.walletRepository, {
-        script: walletScript,
-        address: walletAddress
-      })
+      await getVtxosForContract(
+        this.walletRepository,
+        { script: walletScript, address: walletAddress },
+        options
+      )
     );
     return { snapshot, vtxos: allVtxos };
   }
@@ -21571,7 +21670,7 @@ var WsElectrumChainSource = class {
     );
     const txs = await this.fetchTransactions(unspentsFromElectrum.map((u) => u.tx_hash));
     return unspentsFromElectrum.map((u, index) => {
-      const tx = Transaction$2.fromRaw(hex.decode(txs[index].hex), {
+      const tx = Transaction$1.fromRaw(hex.decode(txs[index].hex), {
         allowUnknownOutputs: true
       });
       const output = tx.getOutput(u.tx_pos);
@@ -21666,7 +21765,7 @@ var ElectrumOnchainProvider = class {
   }
   async getTxOutspends(txid) {
     const [txResult] = await this.chain.fetchTransactions([txid]);
-    const tx = Transaction$2.fromRaw(hex.decode(txResult.hex), {
+    const tx = Transaction$1.fromRaw(hex.decode(txResult.hex), {
       allowUnknownOutputs: true
     });
     const outputCount = tx.outputsLength;
@@ -21734,7 +21833,7 @@ var ElectrumOnchainProvider = class {
         for (const candidateTxid of ambiguousCandidates[j]) {
           const rawHex = txMap.get(candidateTxid);
           if (!rawHex) continue;
-          const candidateTx = Transaction$2.fromRaw(hex.decode(rawHex), {
+          const candidateTx = Transaction$1.fromRaw(hex.decode(rawHex), {
             allowUnknownOutputs: true,
             allowUnknownInputs: true
           });
@@ -21810,7 +21909,7 @@ var ElectrumOnchainProvider = class {
     if (rawHex) {
       let tx;
       try {
-        tx = Transaction$2.fromRaw(hex.decode(rawHex), {
+        tx = Transaction$1.fromRaw(hex.decode(rawHex), {
           allowUnknownOutputs: true,
           allowUnknownInputs: true
         });
@@ -22006,7 +22105,7 @@ function isTxNotInBlockError(err) {
   return normalized.includes("notyetinablock") || normalized.includes("notinablock") || normalized.includes("notinblock") || normalized.includes("noconfirmedtransaction");
 }
 function childTxidFromHex(txHex) {
-  const tx = Transaction$2.fromRaw(hex.decode(txHex), {
+  const tx = Transaction$1.fromRaw(hex.decode(txHex), {
     allowUnknownOutputs: true,
     allowUnknownInputs: true
   });
@@ -22254,7 +22353,7 @@ function verifyP2TR(message, witnessItems, pkScript, pubkey) {
     return false;
   }
   const toSpend = craftToSpendTx(message, pkScript, TAG_BIP322);
-  const toSign = craftBIP322ToSignP2TR(toSpend, pkScript, pubkey);
+  const toSign = craftBIP322ToSignP2TR(toSpend, pkScript);
   const sighash = toSign.preimageWitnessV1(0, [pkScript], sighashType, [0n]);
   const rawSig = sig.length === 65 ? sig.subarray(0, 64) : sig;
   return schnorr.verify(rawSig, sighash, pubkey);
@@ -23837,7 +23936,7 @@ function createArkadeBatchHandler(intentId, inputs, signer, signedProof, message
           boardingIndices.push(boardingIdx);
           continue;
         }
-        if (isRecoverable(input) || isSubdust(input, info.dust)) {
+        if (!requiresForfeit(input) || isSubdust(input, info.dust)) {
           continue;
         }
         if (connectorIndex >= connectorLeaves.length) {
@@ -24048,6 +24147,14 @@ function providedWitness(witness) {
     return !item.injected && item.type !== "signature";
   });
 }
+function csvTimelock(leafName, operand) {
+  if (typeof operand === "string") return { type: "blocks", value: operand };
+  const timelock = operand >= 0n && operand < 0x80000000n ? sequenceToTimelock(Number(operand)) : void 0;
+  if (!timelock || BigInt(timelockToSequence(timelock)) !== operand) {
+    fail(`leaf '${leafName}': CSV literal ${operand} is not a canonical BIP68 sequence`);
+  }
+  return timelock;
+}
 function parseLeaf(leaf, hasCovenant, instantiations, extras) {
   const asm = leaf.asm;
   let index = 0;
@@ -24062,7 +24169,7 @@ function parseLeaf(leaf, hasCovenant, instantiations, extras) {
   let cltv;
   if (asm.length >= index + 3 && asm[index + 2] === "OP_DROP") {
     const operand = asm[index].startsWith("<") && asm[index].endsWith(">") ? `$${asm[index].slice(1, -1)}` : BigInt(asm[index]);
-    if (asm[index + 1] === "OP_CHECKSEQUENCEVERIFY") csv = { type: "blocks", value: operand };
+    if (asm[index + 1] === "OP_CHECKSEQUENCEVERIFY") csv = csvTimelock(leaf.name, operand);
     else if (asm[index + 1] === "OP_CHECKLOCKTIMEVERIFY") cltv = operand;
     else fail(`leaf '${leaf.name}': unexpected timelock opcode ${asm[index + 1]}`);
     index += 3;
@@ -25107,12 +25214,7 @@ function createDefaultPaymentRouter(wallet) {
     prefs: { priority: ["ark", "ark-asset", "lightning", "onchain"] }
   }).use(arkRail()).use(arkAssetRail()).use(onchainRail({ feeInfo: walletFeeSource(wallet) }));
 }
-/*! Bundled license information:
-
-@noble/hashes/utils.js:
-  (*! noble-hashes - MIT License (c) 2022 Paul Miller (paulmillr.com) *)
-*/
 
 export { ARKADE_MAGIC, ARKADE_SALTED_PREIMAGE_TAG, ARKADE_SWAP_PREIMAGE_TAG, ASSET_CARRIER_SATS, AbortError, ActivityRegistry, AmbiguousRouteError, ArkNote, ArkadeCash, ArkadeCashCreateError, AssetManager, BIP21, BIP21Error, BIP322, BLOCKED_UPGRADE_TIMEOUT_MS, Batch, CachingArkProvider, ChainedTxType, ConnectionDisposedError, ContractManager, ContractRepositoryImpl, ContractWatcher, DEFAULT_MESSAGE_TIMEOUTS, DEFAULT_MIN_BATCH_EXPIRY_SECONDS, DEFAULT_MIN_CHECKPOINT_EXIT_DELAY_SECONDS, DatabaseUpgradeBlockedError, DelegateManagerImpl, DelegateNotConfiguredError, DelegatorManagerImpl, DelegatorNotConfiguredError, DescriptorIdentity, DescriptorSigningProviderMissingError, DustChangeError, ELECTRUM_TCP_HOST, ELECTRUM_WS_URL, ESPLORA_URL, ElectrumOnchainProvider, EmulatorPacket, EsploraProvider, Estimator, Extension, ExtensionNotFoundError, ForeignDescriptorError, HDDescriptorProvider, INTENT_TERMINAL_STATES, InMemoryContractRepository, InMemoryIntentRepository, InMemoryVirtualTxRepository, InMemoryWalletRepository, IndexedDBContractRepository, IndexedDBIntentRepository, IndexedDBVirtualTxRepository, IndexedDBWalletRepository, MAX_USED_SIGNING_DESCRIPTORS_LOOK_AHEAD, MESSAGE_BUS_INITIALIZING, MESSAGE_BUS_NOT_INITIALIZED, MIGRATION_KEY, MUTINYNET_MIN_CHECKPOINT_EXIT_DELAY_SECONDS, MessageBus, MessageBusInitializingError, MessageBusNotInitializedError, MissingSigningDescriptorError, MnemonicIdentity, OnchainWallet, OversizedChangeError, P2A, PaymentRouter, PrevTxUnavailableError, REGTEST_MIN_BATCH_EXPIRY_SECONDS, REGTEST_MIN_CHECKPOINT_EXIT_DELAY_SECONDS, Ramps, ReadonlyAssetManager, ReadonlyDescriptorIdentity, ReadonlySingleKey, ReadonlyWallet, ReadonlyWalletError, RestDelegateProvider, RestDelegatorProvider, RestEmulatorProvider, SIGNET_MIN_CHECKPOINT_EXIT_DELAY_SECONDS, SeedIdentity, ServiceWorkerReadonlyWallet, ServiceWorkerTimeoutError, ServiceWorkerWallet, SingleKey, TxTree, TxType, TxWeightEstimator, UnannotatableInputError, UnilateralExit, UnknownPacket, Unroll, VtxoManager, Wallet2 as Wallet, WalletCannotAllocateAddressError, WalletCannotSignError, WalletMessageHandler, WalletNotInitializedError, WalletRepositoryImpl, WsElectrumChainSource, adoptContractDescriptor, arkAssetRail, arkRail, arkTarget, arkade_exports, assertFinalCommitmentMatchesValidated, assertIntentIdUnique, assertNoAssets, assertNoSelection, assertSendableAmount, assertSubmittedArkTxid, assertValidBatchExpiry, assertValidServerUnrollScript, assetMintResolver, assetsOf, attachPrevArkTxs, attachPrevoutTxs, awaitTransaction, boardingResolver, btcTarget, buildForfeitTx, buildOffchainTx, buildPreimageMessage, buildSaltedPreimageMessage, claimWithPreimageIdentity, classifyAgainstSignerSet, classifyContractSigner, closeDatabase, collabExitResolver, combineTapscriptSigs, contractFromArkContract, contractFromArkContractWithAddress, contractPreimage, contractSigner, createAssetPacket, createDefaultActivityRegistry, createDefaultPaymentRouter, createExitChainResolver, createManagedConnection, decodeArkContract, defaultBatchExpiryPolicy, defaultCheckpointExitDelayPolicy, deleteByIndex, deserializeAssets, deserializeExitPackage, deserializeUtxo, deserializeVtxo, encodeArkContract, exitObserverFor, extendVirtualCoinForContract, extractArkProviderUrl, gateExclusion, gatedContracts, getAllByIndexValues, getMigrationStatus, getRandomId, hasBoardingTxExpired, hasCandidates, intentMatchesFilter, intentPageBounds, invoiceTarget, isAddressAllocationCapable, isArkContract, isBatchSignable, isBtcAddress, isContractGenericallySpendable, isContractVtxoEvent, isCooperativelyMigratable, isDeterministicSigner, isDiscoverable, isHDAllocationCapable, isHDDeterministicSignCapable, isHDWalletCapable, isLightningInvoice, isLnurl, isMessageBusInitializingError, isMessageBusNotInitializedError, isPerArtifactDescriptor, isSigningIdentity, isSubdust, isTerminalIntentState, isValidArkAddress, isVtxoExpiringSoon, isVtxoForScript, isWatchedContract, logExcludedVtxos, makeHandle, matchServerCheckpoints, mergeChainedTxType, migrateWalletRepository, notifyExitObserved, onchainRail, openDatabase, outpointExclusion, outpointReasons, promisifyRequest, provisionClaimSecret, provisionRefundKey, registerWalletRestoreHook, requiresMigration, resolveAssetAmount, resolveBatchExpiryPolicy, resolveCheckpointExitDelayPolicy, resolveDescriptorSigner, resolvePrevTxs, resolveSendAmount, rollbackMigration, saveVtxosForContract, scriptFromArkAddress, selectCoinsWithAsset, selectVirtualCoins, selectionOf, serializeAssets, serializeExitPackage, serializeUtxo, serializeVtxo, setupServiceWorker, signAndSubmitOffchainTx, signerSetFromInfo, signingDescriptorIndex, strictSigningDescriptorIndex, toXOnlySignerHex, tryResolveSendAmount, validateBatchRecipients, validateConnectorsTxGraph, validateVtxoTxGraph, verifyTapscriptSignatures, waitForIncomingFunds, walletFeeSource, warnAndFilterVtxosForScript, withPrevTxs };
-//# sourceMappingURL=chunk-MLOZHTBN.js.map
-//# sourceMappingURL=chunk-MLOZHTBN.js.map
+//# sourceMappingURL=chunk-YPQ37P3H.js.map
+//# sourceMappingURL=chunk-YPQ37P3H.js.map