@arkade-os/sdk 0.5.0-rc.2 → 0.5.0-rc.4

package/dist/{chunk-ZRNQV6HV.js → chunk-PYTAH2NY.js}

@@ -1,7 +1,6 @@
-import { AssetId, AssetGroup, AssetInput, AssetOutput, Metadata, Packet, BufferReader, BufferWriter, AssetRef, RestIndexerProvider } from './chunk-4PKLULWT.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-3R476TDV.js';
-import { VtxoScript, Transaction, isRecoverable, CSVMultisigTapscript, DEFAULT_NETWORK, resolveEmulatorPubkey, hasTerminalSpend, 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, getNetwork, MultisigTapscript, isEventSourceError, isEventSourceUnavailableError, isRetryableProviderError, getAllNormalizedVtxos, DEFAULT_PAGE_SIZE, RestArkProvider, networkFromArkadeInfo, toVirtualStatus, ArkError, TapTreeCoder, resolveTimeHeight, canSpendOffchain, parseLegacyExpiry, isExpired, INFO_FETCH_TIMEOUT_MS, PrevoutTxField, ProviderUnavailableError, DEFAULT_ARKADE_SERVER_URL, networks as networks$1, isPastExpiry, fetchVtxoCreatedAtByTxid } from './chunk-ISO4TI5J.js';
-import { __export } from './chunk-NSBPE2FW.js';
+import { AssetId, AssetGroup, AssetInput, AssetOutput, Metadata, Packet, BufferReader, BufferWriter, AssetRef, RestIndexerProvider } from './chunk-XHASFSDU.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-4EZOMPAO.js';
+import { VtxoScript, __export, Transaction, isVirtualCoin, canRecoverOnchain, CSVMultisigTapscript, DEFAULT_NETWORK, resolveEmulatorPubkey, hasTerminalSpend, getNormalizedVtxos, setArkPsbtField, PrevArkTxField, ConditionWitness, craftToSpendTx, ArkAddress, ServerResponseMismatchError, getArkPsbtFields, CosignerPublicKey, OP_RETURN_EMPTY_PKSCRIPT, canSweepOnchain, sequenceToTimelock, decodeTapscript, scriptFromTapLeafScript, CLTVMultisigTapscript, VtxoTaprootTree, timelockToSequence, normalizeVtxo, assertAllowedSighashTypes, baseFetch, Intent, rateGate, DEFAULT_NETWORK_NAME, formatSighash, getSequence, maybeArkError, isArkError, ArkErrorName, toOffchainInputFeeParams, getNetwork, MultisigTapscript, isEventSourceError, isEventSourceUnavailableError, isRetryableProviderError, getAllNormalizedVtxos, DEFAULT_PAGE_SIZE, RestArkProvider, DEFAULT_ARKADE_SERVER_URL, networkFromArkadeInfo, ArkError, TapTreeCoder, resolveTimeHeight, canSpendOffchain, INFO_FETCH_TIMEOUT_MS, PrevoutTxField, EXPIRY_MIN_PLAUSIBLE_MS, ProviderUnavailableError, networks as networks$1, isPastExpiry, fetchVtxoCreatedAtByTxid } from './chunk-GLZNJFAT.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 { hex, base58, base64, bech32m } from '@scure/base';
@@ -498,29 +497,17 @@ var SeedIdentity = class _SeedIdentity {
   async toReadonly() {
     return ReadonlyDescriptorIdentity.fromDescriptor(this.descriptor);
   }
-  /**
-   * Returns true when `descriptor` is derived from this identity's seed.
-   * HD descriptors match by account xpub; bare `tr(pubkey)` descriptors
-   * match by raw pubkey. See {@link descriptorIsOurs}.
-   *
-   * @deprecated Prefer `DescriptorProvider.isOurs()` via
-   * `HDDescriptorProvider` for rotating HD wallets or
-   * `StaticDescriptorProvider` for legacy single-key wallets.
-   */
-  isOurs(descriptor) {
+  /** Returns true when `descriptor` is derived from this identity's seed. */
+  ownsDescriptor(descriptor) {
     return descriptorIsOurs(descriptor, this.descriptor, pubSchnorr(this.derivedKey));
   }
   /**
    * Signs each request with the key derived from its descriptor.
-   * Each descriptor must share this identity's seed ({@link isOurs}).
-   *
-   * @deprecated Prefer `DescriptorProvider.signWithDescriptor()` via
-   * `HDDescriptorProvider` or `StaticDescriptorProvider`. Identities keep
-   * this method only as backing implementation for descriptor providers.
+   * Each descriptor must share this identity's seed ({@link ownsDescriptor}).
    */
-  async signWithDescriptor(requests) {
+  async signDescriptorTransactions(requests) {
     return requests.map((request) => {
-      if (!this.isOurs(request.descriptor)) {
+      if (!this.ownsDescriptor(request.descriptor)) {
         throw new Error(
           `Descriptor ${request.descriptor} does not belong to this identity`
         );
@@ -529,15 +516,9 @@ var SeedIdentity = class _SeedIdentity {
       return this.signTxWithKey(request.tx, key, request.inputIndexes);
     });
   }
-  /**
-   * Signs a message with the key derived from `descriptor`.
-   *
-   * @deprecated Prefer `DescriptorProvider.signMessageWithDescriptor()` via
-   * `HDDescriptorProvider` or `StaticDescriptorProvider`. Identities keep
-   * this method only as backing implementation for descriptor providers.
-   */
-  async signMessageWithDescriptor(descriptor, message, signatureType = "schnorr") {
-    if (!this.isOurs(descriptor)) {
+  /** Signs a message with the key derived from `descriptor`. */
+  async signDescriptorMessage(descriptor, message, signatureType = "schnorr") {
+    if (!this.ownsDescriptor(descriptor)) {
       throw new Error(`Descriptor ${descriptor} does not belong to this identity`);
     }
     const key = this.derivePrivateKeyForDescriptor(descriptor);
@@ -549,7 +530,7 @@ var SeedIdentity = class _SeedIdentity {
    * which swap preimage derivation reads through.
    */
   async signSchnorrDeterministicWithDescriptor(descriptor, messageHash) {
-    if (!this.isOurs(descriptor)) {
+    if (!this.ownsDescriptor(descriptor)) {
       throw new Error(`Descriptor ${descriptor} does not belong to this identity`);
     }
     const key = this.derivePrivateKeyForDescriptor(descriptor);
@@ -683,17 +664,8 @@ var ReadonlyDescriptorIdentity = class _ReadonlyDescriptorIdentity {
     }
     return bip32.publicKey;
   }
-  /**
-   * Returns true when `descriptor` derives from this identity's xpub.
-   * HD descriptors match by account xpub; bare `tr(pubkey)` descriptors
-   * fall back to comparing against the index-0 x-only pubkey. See
-   * {@link descriptorIsOurs}.
-   *
-   * @deprecated Prefer `DescriptorProvider.isOurs()` via
-   * `HDDescriptorProvider` for rotating HD wallets or
-   * `StaticDescriptorProvider` for legacy single-key wallets.
-   */
-  isOurs(descriptor) {
+  /** Returns true when `descriptor` derives from this identity's xpub. */
+  ownsDescriptor(descriptor) {
     return descriptorIsOurs(descriptor, this.descriptor, this.indexZero.pubkey);
   }
 };
@@ -783,25 +755,9 @@ function hydrateIdentity(s) {
       );
   }
 }
-var warnedLegacyShape = false;
 function normalizeSerializedIdentity(shape) {
-  if ("type" in shape) {
-    assertValidSerializedIdentity(shape);
-    return shape;
-  }
-  if (!warnedLegacyShape) {
-    warnedLegacyShape = true;
-    console.warn(
-      "[ts-sdk] Received legacy serialized identity shape (privateKey/publicKey). Upgrade the page build to the latest @arkade-os/sdk \u2014 this compatibility path will be removed in the next major."
-    );
-  }
-  if ("privateKey" in shape && typeof shape.privateKey === "string") {
-    return { type: "single-key", privateKey: shape.privateKey };
-  }
-  if ("publicKey" in shape && typeof shape.publicKey === "string") {
-    return { type: "readonly-single-key", publicKey: shape.publicKey };
-  }
-  throw new Error("Unrecognized serialized identity shape");
+  assertValidSerializedIdentity(shape);
+  return shape;
 }
 function assertValidSerializedIdentity(s) {
   const kind = s.type;
@@ -899,7 +855,7 @@ var DescriptorIdentity = class {
 function isHDCapableIdentity(value) {
   if (typeof value !== "object" || value === null) return false;
   const v = value;
-  return typeof v.descriptor === "string" && typeof v.isOurs === "function" && typeof v.signWithDescriptor === "function" && typeof v.signMessageWithDescriptor === "function";
+  return typeof v.descriptor === "string" && typeof v.ownsDescriptor === "function" && typeof v.signDescriptorTransactions === "function" && typeof v.signDescriptorMessage === "function";
 }
 
 // src/identity/index.ts
@@ -926,7 +882,12 @@ var WalletCannotAllocateAddressError = class extends Error {
   }
 };
 async function resolveDescriptorSigner(descriptor, identity, provider) {
-  const owner = provider?.isOurs(descriptor) ? provider : isHDCapableIdentity(identity) && identity.isOurs(descriptor) ? identity : void 0;
+  const providerOwner = provider?.isOurs(descriptor) ? provider : void 0;
+  const identityOwner = !providerOwner && isHDCapableIdentity(identity) && identity.ownsDescriptor(descriptor) ? {
+    signWithDescriptor: (requests) => identity.signDescriptorTransactions(requests),
+    signMessageWithDescriptor: (ownedDescriptor, message, signatureType) => identity.signDescriptorMessage(ownedDescriptor, message, signatureType)
+  } : void 0;
+  const owner = providerOwner ?? identityOwner;
   if (owner && parseHDDescriptor(descriptor)) {
     return new DescriptorIdentity({ descriptor, signer: owner, base: identity });
   }
@@ -1625,13 +1586,11 @@ var RestDelegateProvider = class {
     if (!isDelegateInfo(data)) {
       throw new Error("Invalid delegate info");
     }
-    const delegateAddress = typeof data.delegateAddress === "string" && data.delegateAddress !== "" ? data.delegateAddress : typeof data.delegatorAddress === "string" && data.delegatorAddress !== "" ? data.delegatorAddress : "";
-    return { ...data, delegateAddress };
+    return data;
   }
 };
-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 !== "");
+  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 !== "";
 }
 var ESPLORA_URL = {
   bitcoin: "https://mempool.arkade.sh/api",
@@ -2016,7 +1975,10 @@ var EsploraProvider = class {
     return { subscribers, teardown, started };
   }
   async getChainTip() {
-    const tipBlocks = await baseFetch(`${this.baseUrl}/blocks`);
+    let tipBlocks = await baseFetch(`${this.baseUrl}/blocks`);
+    if (tipBlocks.status === 404) {
+      tipBlocks = await baseFetch(`${this.baseUrl}/v1/blocks`);
+    }
     if (!tipBlocks.ok) {
       throw new Error(`Failed to get chain tip: ${tipBlocks.statusText}`);
     }
@@ -4096,10 +4058,6 @@ function deductOffchainOutputFee(subtotal, estimator, arkAddress) {
 }
 var DEFAULT_THRESHOLD_SECONDS = 259200;
 var DEFAULT_THRESHOLD_MS = DEFAULT_THRESHOLD_SECONDS * 1e3;
-var DEFAULT_RENEWAL_CONFIG = {
-  thresholdMs: DEFAULT_THRESHOLD_MS
-  // 3 days
-};
 var DEFAULT_SETTLEMENT_CONFIG = {
   vtxoThreshold: DEFAULT_THRESHOLD_SECONDS,
   boardingUtxoSweep: true,
@@ -4203,24 +4161,12 @@ function mergeSignerReports(...reportLists) {
   return Array.from(bySigner.values());
 }
 var VtxoManager = class _VtxoManager {
-  constructor(wallet, renewalConfig, settlementConfig) {
+  constructor(wallet, settlementConfig) {
     this.wallet = wallet;
-    this.renewalConfig = renewalConfig;
-    if (settlementConfig !== void 0) {
-      this.settlementConfig = settlementConfig;
-    } else if (renewalConfig && renewalConfig.enabled) {
-      this.settlementConfig = {
-        vtxoThreshold: renewalConfig.thresholdMs ? renewalConfig.thresholdMs / 1e3 : void 0
-      };
-    } else if (renewalConfig) {
-      this.settlementConfig = false;
-    } else {
-      this.settlementConfig = { ...DEFAULT_SETTLEMENT_CONFIG };
-    }
+    this.settlementConfig = settlementConfig !== void 0 ? settlementConfig : { ...DEFAULT_SETTLEMENT_CONFIG };
     this.contractEventsSubscriptionReady = this.initializeSubscription();
   }
   wallet;
-  renewalConfig;
   settlementConfig;
   contractEventsSubscriptionReady;
   disposePromise;
@@ -4525,7 +4471,7 @@ var VtxoManager = class _VtxoManager {
     } else if (this.settlementConfig !== false && this.settlementConfig && this.settlementConfig.vtxoThreshold !== void 0) {
       threshold = this.settlementConfig.vtxoThreshold * 1e3;
     } else {
-      threshold = this.renewalConfig?.thresholdMs ?? DEFAULT_RENEWAL_CONFIG.thresholdMs;
+      threshold = DEFAULT_THRESHOLD_MS;
     }
     return getExpiringAndRecoverableVtxos(
       vtxos,
@@ -4583,7 +4529,7 @@ var VtxoManager = class _VtxoManager {
       } else if (this.settlementConfig !== false && this.settlementConfig?.vtxoThreshold !== void 0) {
         threshold = this.settlementConfig.vtxoThreshold * 1e3;
       } else {
-        threshold = DEFAULT_RENEWAL_CONFIG.thresholdMs;
+        threshold = DEFAULT_THRESHOLD_MS;
       }
       const now = await fetchTimeHeight(this.wallet);
       let vtxos = await this.selectExpiringVtxos(threshold, now);
@@ -5029,7 +4975,7 @@ var VtxoManager = class _VtxoManager {
         awaitingSweepCount = spendable.length;
         awaitingSweepValue = value;
         for (const v of spendable) {
-          const exp = toBatchExpiry(v);
+          const exp = v.expiresAt?.getTime();
           if (exp !== void 0 && (nextSweepEta === void 0 || exp < nextSweepEta)) {
             nextSweepEta = exp;
           }
@@ -7494,7 +7440,7 @@ var DelegateManagerImpl = class {
         recoverableVtxos.push(vtxo);
         continue;
       }
-      const expiry = toBatchExpiry(vtxo);
+      const expiry = vtxo.expiresAt?.getTime();
       if (!expiry) continue;
       const dayKey = getDayTimestamp(expiry);
       groupByExpiry.set(dayKey, [...groupByExpiry.get(dayKey) ?? [], vtxo]);
@@ -7549,7 +7495,6 @@ var DelegateManagerImpl = class {
     return { delegated, failed };
   }
 };
-var DelegatorManagerImpl = DelegateManagerImpl;
 async function delegate(identity, delegateProvider, arkInfo, delegateInfo, vtxos, destinationScript, delegateAt) {
   if (vtxos.length === 0) {
     throw new Error("unable to delegate: no vtxos provided");
@@ -7559,7 +7504,10 @@ async function delegate(identity, delegateProvider, arkInfo, delegateInfo, vtxos
   }
   if (!delegateAt) {
     const now = { timestamp: /* @__PURE__ */ new Date() };
-    const expiryTimestamp = vtxos.filter((coin) => !canRecoverOnchain(coin, now) && toBatchExpiry(coin)).reduce((min, coin) => Math.min(min, toBatchExpiry(coin)), Number.MAX_SAFE_INTEGER);
+    const expiryTimestamp = vtxos.filter((coin) => !canRecoverOnchain(coin, now) && coin.expiresAt).reduce(
+      (min, coin) => Math.min(min, coin.expiresAt.getTime()),
+      Number.MAX_SAFE_INTEGER
+    );
     if (!expiryTimestamp || expiryTimestamp === Number.MAX_SAFE_INTEGER) {
       delegateAt = new Date(Date.now() + 1 * 60 * 1e3);
     } else {
@@ -8035,7 +7983,6 @@ var STORE_CONTRACTS = "contracts";
 var STORE_INTENTS = "intents";
 var STORE_VIRTUAL_TXS = "virtualTxs";
 var STORE_VTXO_BRANCHES = "vtxoBranches";
-var LEGACY_STORE_CONTRACT_COLLECTIONS = "contractsCollections";
 var DB_VERSION = 3;
 var INTENT_DB_VERSION = 5;
 function initDatabase(db, oldVersion, transaction) {
@@ -8059,11 +8006,6 @@ function initDatabase(db, oldVersion, transaction) {
         unique: false
       });
     }
-    if (!vtxosStore.indexNames.contains("virtualStatus")) {
-      vtxosStore.createIndex("virtualStatus", "virtualStatus", {
-        unique: false
-      });
-    }
     if (!vtxosStore.indexNames.contains("createdAt")) {
       vtxosStore.createIndex("createdAt", "createdAt", {
         unique: false
@@ -8176,11 +8118,6 @@ function initDatabase(db, oldVersion, transaction) {
       });
     }
   }
-  if (!db.objectStoreNames.contains(LEGACY_STORE_CONTRACT_COLLECTIONS)) {
-    db.createObjectStore(LEGACY_STORE_CONTRACT_COLLECTIONS, {
-      keyPath: "key"
-    });
-  }
   if (oldVersion >= 1 && oldVersion < 3 && transaction) {
     const vtxosStore = transaction.objectStore(STORE_VTXOS);
     if (!vtxosStore.indexNames.contains("script")) {
@@ -9717,8 +9654,7 @@ var ContractManager = class _ContractManager {
   async advanceLookAheadWatermark(index) {
     const lookAhead = this.config.lookAhead;
     if (!lookAhead) return;
-    const advance = lookAhead.advanceWatermark ?? lookAhead.onPromoted;
-    await advance?.(index);
+    await lookAhead.advanceWatermark?.(index);
   }
   /**
    * Promote every look-ahead entry funded by `vtxos` into a real repository
@@ -9927,7 +9863,7 @@ var ContractManager = class _ContractManager {
               );
             } catch (error) {
               probe.indeterminate.add(index);
-              probe.errors.set(index, { handler: h.type, index, error });
+              probe.errors.set(index, { handler: h.type, fromIndex: index, error });
             }
           })
         );
@@ -9939,7 +9875,7 @@ var ContractManager = class _ContractManager {
         for (const e of entries) probe.indeterminate.add(e.index);
         probe.errors.set(from, {
           handler: h.type,
-          index: from,
+          fromIndex: from,
           ...to > from && { toIndex: to },
           error
         });
@@ -10001,7 +9937,6 @@ var ContractManager = class _ContractManager {
       );
     }
     return {
-      lastIndexUsed: highestConfirmedUsedIndex,
       highestConfirmedUsedIndex,
       ...truncatedAt !== void 0 && { truncatedAt },
       handlerErrors
@@ -10079,8 +10014,8 @@ var ContractManager = class _ContractManager {
     );
   }
   /** @inheritdoc */
-  async assertSpendableNow(vtxos, walletPubKey) {
-    const refused = await this.unspendableNowReasons(vtxos, walletPubKey);
+  async assertSpendableNow(vtxos, walletDescriptor) {
+    const refused = await this.unspendableNowReasons(vtxos, walletDescriptor);
     if (refused.size === 0) return;
     if (refused.size === 1) throw new Error([...refused.values()][0]);
     throw new Error(
@@ -10088,7 +10023,7 @@ var ContractManager = class _ContractManager {
     );
   }
   /** @inheritdoc */
-  async unspendableNowReasons(vtxos, walletPubKey) {
+  async unspendableNowReasons(vtxos, walletDescriptor) {
     const refused = /* @__PURE__ */ new Map();
     if (vtxos.length === 0) return refused;
     const contracts = await this.config.contractRepository.getContracts({
@@ -10101,7 +10036,7 @@ var ContractManager = class _ContractManager {
     });
     if (asking.length === 0) return refused;
     const tip = await this.currentChainTip();
-    const walletKey = await walletPubKey?.();
+    const walletDescriptorValue = await walletDescriptor?.();
     for (const vtxo of asking) {
       const contract = byScript.get(vtxo.script);
       const handler = contractHandlers.get(contract.type);
@@ -10111,7 +10046,7 @@ var ContractManager = class _ContractManager {
         currentTime: Date.now(),
         blockHeight: tip?.height,
         chainTime: tip?.time,
-        walletPubKey: walletKey,
+        walletDescriptor: walletDescriptorValue,
         // `isVirtualCoin` alone is too weak here: it only asks for a
         // string `script`, which every AssertSpendableInput has, so a
         // bare outpoint would be published as a coin with no `status`.
@@ -10272,7 +10207,7 @@ var ContractManager = class _ContractManager {
    * @param options - Options for getting spendable paths
    */
   async getSpendablePaths(options) {
-    const { contractScript, collaborative = true, walletPubKey, vtxo } = options;
+    const { contractScript, collaborative = true, walletDescriptor, vtxo } = options;
     const [contract] = await this.getContracts({ script: contractScript });
     if (!contract) return [];
     const handler = contractHandlers.get(contract.type);
@@ -10284,7 +10219,7 @@ var ContractManager = class _ContractManager {
       currentTime: Date.now(),
       blockHeight: tip?.height,
       chainTime: tip?.time,
-      walletPubKey,
+      walletDescriptor,
       vtxo
     };
     return handler.getSpendablePaths(script, contract, context);
@@ -10300,7 +10235,7 @@ var ContractManager = class _ContractManager {
    * @param options - Options for getting spending paths
    */
   async getAllSpendingPaths(options) {
-    const { contractScript, collaborative = true, walletPubKey } = options;
+    const { contractScript, collaborative = true, walletDescriptor } = options;
     const [contract] = await this.getContracts({ script: contractScript });
     if (!contract) return [];
     const handler = contractHandlers.get(contract.type);
@@ -10309,7 +10244,7 @@ var ContractManager = class _ContractManager {
     const context = {
       collaborative,
       currentTime: Date.now(),
-      walletPubKey
+      walletDescriptor
     };
     return handler.getAllSpendingPaths(script, contract, context);
   }
@@ -10752,10 +10687,6 @@ var serializeUtxo = (u) => ({
   intentTapLeafScript: serializeTapLeaf(u.intentTapLeafScript),
   extraWitness: u.extraWitness?.map(hex.encode)
 });
-var serializeTransaction = (t) => ({
-  ...t,
-  assets: serializeAssets(t.assets)
-});
 var deserializeTapLeaf = (t) => {
   const cb = TaprootControlBlock.decode(hex.decode(t.cb));
   const s = hex.decode(t.s);
@@ -10777,10 +10708,6 @@ var deserializeUtxo = (o) => ({
   intentTapLeafScript: deserializeTapLeaf(o.intentTapLeafScript),
   extraWitness: o.extraWitness?.map(hex.decode)
 });
-var deserializeTransaction = (o) => ({
-  ...o,
-  assets: deserializeAssets(o.assets)
-});
 
 // src/repositories/indexedDB/contractRepository.ts
 var IndexedDBContractRepository = class {
@@ -10895,6 +10822,37 @@ function normalizeFilter(filter) {
   return res;
 }
 
+// src/repositories/legacyVtxoFacts.ts
+function parseLegacyExpiry(batchExpiry) {
+  if (typeof batchExpiry !== "number" || !Number.isFinite(batchExpiry) || batchExpiry <= 0) {
+    return {};
+  }
+  if (batchExpiry >= EXPIRY_MIN_PLAUSIBLE_MS) return { expiresAt: new Date(batchExpiry) };
+  return { expiresAtHeight: batchExpiry / 1e3 };
+}
+function legacyVtxoFacts(status) {
+  let blob = status;
+  if (typeof blob === "string") {
+    try {
+      blob = JSON.parse(blob);
+    } catch {
+      return void 0;
+    }
+  }
+  if (typeof blob !== "object" || blob === null) return void 0;
+  const { state, commitmentTxIds, batchExpiry } = blob;
+  if (state === void 0 && commitmentTxIds === void 0 && batchExpiry === void 0) {
+    return void 0;
+  }
+  return {
+    isSpent: state === "spent",
+    isSwept: state === "swept",
+    isPreconfirmed: state === "preconfirmed",
+    commitmentTxIds: Array.isArray(commitmentTxIds) ? commitmentTxIds : void 0,
+    ...parseLegacyExpiry(batchExpiry)
+  };
+}
+
 // src/repositories/indexedDB/walletRepository.ts
 var IndexedDBWalletRepository = class {
   version = 1;
@@ -11116,6 +11074,20 @@ function deserializeVtxoWithBackfill(o) {
   if (!o.script) {
     o = { ...o, script: scriptFromArkAddress(o.address) };
   }
+  if (o.isSwept === void 0 && o.isPreconfirmed === void 0) {
+    const facts = legacyVtxoFacts(o.virtualStatus);
+    if (facts) {
+      o = {
+        ...o,
+        isSpent: o.isSpent ?? facts.isSpent,
+        isSwept: facts.isSwept,
+        isPreconfirmed: facts.isPreconfirmed,
+        commitmentTxIds: o.commitmentTxIds ?? facts.commitmentTxIds,
+        expiresAt: o.expiresAt ?? facts.expiresAt,
+        expiresAtHeight: o.expiresAtHeight ?? facts.expiresAtHeight
+      };
+    }
+  }
   return deserializeVtxo(o);
 }
 function isCanonicalRow(row) {
@@ -11144,323 +11116,6 @@ function getLifecycleWeight(v) {
   if (v.arkTxId) weight += 2;
   return weight;
 }
-
-// src/repositories/migrations/walletRepositoryImpl.ts
-var getVtxosStorageKey = (address) => `vtxos:${address}`;
-var getUtxosStorageKey = (address) => `utxos:${address}`;
-var getTransactionsStorageKey = (address) => `tx:${address}`;
-var walletStateStorageKey = "wallet:state";
-var WalletRepositoryImpl = class {
-  version = 1;
-  storage;
-  constructor(storage) {
-    this.storage = storage;
-  }
-  async getVtxos(address) {
-    const stored = await this.storage.getItem(getVtxosStorageKey(address));
-    if (!stored) return [];
-    try {
-      const parsed = JSON.parse(stored);
-      return parsed.map(deserializeVtxo);
-    } catch (error) {
-      console.error(`Failed to parse VTXOs for address ${address}:`, error);
-      return [];
-    }
-  }
-  async saveVtxos(address, vtxos) {
-    const storedVtxos = await this.getVtxos(address);
-    for (const vtxo of vtxos) {
-      const existing = storedVtxos.findIndex(
-        (v) => v.txid === vtxo.txid && v.vout === vtxo.vout
-      );
-      if (existing !== -1) {
-        storedVtxos[existing] = vtxo;
-      } else {
-        storedVtxos.push(vtxo);
-      }
-    }
-    await this.storage.setItem(
-      getVtxosStorageKey(address),
-      JSON.stringify(storedVtxos.map(serializeVtxo))
-    );
-  }
-  async clearVtxos(address) {
-    return this.deleteVtxos(address);
-  }
-  async deleteVtxos(address) {
-    await this.storage.removeItem(getVtxosStorageKey(address));
-  }
-  async getUtxos(address) {
-    const stored = await this.storage.getItem(getUtxosStorageKey(address));
-    if (!stored) return [];
-    try {
-      const parsed = JSON.parse(stored);
-      return parsed.map(deserializeUtxo);
-    } catch (error) {
-      console.error(`Failed to parse UTXOs for address ${address}:`, error);
-      return [];
-    }
-  }
-  async saveUtxos(address, utxos) {
-    const storedUtxos = await this.getUtxos(address);
-    utxos.forEach((utxo) => {
-      const existing = storedUtxos.findIndex(
-        (u) => u.txid === utxo.txid && u.vout === utxo.vout
-      );
-      if (existing !== -1) {
-        storedUtxos[existing] = utxo;
-      } else {
-        storedUtxos.push(utxo);
-      }
-    });
-    await this.storage.setItem(
-      getUtxosStorageKey(address),
-      JSON.stringify(storedUtxos.map(serializeUtxo))
-    );
-  }
-  async clearUtxos(address) {
-    return this.deleteVtxos(address);
-  }
-  async deleteUtxos(address) {
-    await this.storage.removeItem(getUtxosStorageKey(address));
-  }
-  async getTransactionHistory(address) {
-    const storageKey = getTransactionsStorageKey(address);
-    const stored = await this.storage.getItem(storageKey);
-    if (!stored) return [];
-    try {
-      const parsed = JSON.parse(stored);
-      return parsed.map(deserializeTransaction);
-    } catch (error) {
-      console.error(`Failed to parse transactions for address ${address}:`, error);
-      return [];
-    }
-  }
-  async saveTransactions(address, txs) {
-    const storedTransactions = await this.getTransactionHistory(address);
-    for (const tx of txs) {
-      const existing = storedTransactions.findIndex(
-        (t) => t.key.boardingTxid === tx.key.boardingTxid && t.key.commitmentTxid === tx.key.commitmentTxid && t.key.arkTxid === tx.key.arkTxid
-      );
-      if (existing !== -1) {
-        storedTransactions[existing] = tx;
-      } else {
-        storedTransactions.push(tx);
-      }
-    }
-    await this.storage.setItem(
-      getTransactionsStorageKey(address),
-      JSON.stringify(storedTransactions.map(serializeTransaction))
-    );
-  }
-  async clearTransactions(address) {
-    return this.deleteTransactions(address);
-  }
-  async deleteTransactions(address) {
-    await this.storage.removeItem(getTransactionsStorageKey(address));
-  }
-  async getWalletState() {
-    const stored = await this.storage.getItem(walletStateStorageKey);
-    if (!stored) return null;
-    try {
-      const state = JSON.parse(stored);
-      return state;
-    } catch (error) {
-      console.error("Failed to parse wallet state:", error);
-      return null;
-    }
-  }
-  async saveWalletState(state) {
-    await this.storage.setItem(walletStateStorageKey, JSON.stringify(state));
-  }
-  // New method added in V2, not implemented for legacy
-  async clear() {
-    throw new Error("Method not implemented.");
-  }
-  async [Symbol.asyncDispose]() {
-    return;
-  }
-};
-
-// src/repositories/migrations/fromStorageAdapter.ts
-var MIGRATION_KEY = (repoType) => `migration-from-storage-adapter-${repoType}`;
-async function getMigrationStatus(repoType, storageAdapter) {
-  try {
-    const migration = await storageAdapter.getItem(MIGRATION_KEY(repoType));
-    if (migration === "done") return "done";
-    if (migration === "in-progress") return "in-progress";
-    return "pending";
-  } catch (e) {
-    if (e instanceof DOMException && e.name === "NotFoundError") return "not-needed";
-    throw e;
-  }
-}
-async function requiresMigration(repoType, storageAdapter) {
-  const status = await getMigrationStatus(repoType, storageAdapter);
-  return status === "pending" || status === "in-progress";
-}
-async function rollbackMigration(repoType, storageAdapter) {
-  await storageAdapter.removeItem(MIGRATION_KEY(repoType));
-}
-async function migrateWalletRepository(storageAdapter, fresh, addresses) {
-  const migrate = await requiresMigration("wallet", storageAdapter);
-  if (!migrate) return;
-  await storageAdapter.setItem(MIGRATION_KEY("wallet"), "in-progress");
-  const old = new WalletRepositoryImpl(storageAdapter);
-  const walletData = await old.getWalletState();
-  const onchainAddrData = await Promise.all(
-    addresses.onchain.map(async (address) => {
-      const utxos = await old.getUtxos(address);
-      return { address, utxos };
-    })
-  );
-  const offchainAddrData = await Promise.all(
-    addresses.offchain.map(async (address) => {
-      const vtxos = await old.getVtxos(address);
-      const txs = await old.getTransactionHistory(address);
-      return { address, vtxos, txs };
-    })
-  );
-  await Promise.all([
-    walletData && fresh.saveWalletState(walletData),
-    ...offchainAddrData.map(
-      (addressData) => Promise.all([
-        fresh.saveVtxos(addressData.address, addressData.vtxos),
-        fresh.saveTransactions(addressData.address, addressData.txs)
-      ])
-    ),
-    ...onchainAddrData.map(
-      (addressData) => fresh.saveUtxos(addressData.address, addressData.utxos)
-    )
-  ]);
-  await storageAdapter.setItem(MIGRATION_KEY("wallet"), "done");
-}
-
-// src/repositories/migrations/contractRepositoryImpl.ts
-var getContractStorageKey = (id, key) => `contract:${id}:${key}`;
-var getCollectionStorageKey = (type) => `collection:${type}`;
-var ContractRepositoryImpl = class {
-  storage;
-  constructor(storage) {
-    this.storage = storage;
-  }
-  get version() {
-    throw new TypeError(
-      "ContractRepositoryImpl is a migration shim and does not implement contract rows."
-    );
-  }
-  async getContractData(contractId, key) {
-    const stored = await this.storage.getItem(getContractStorageKey(contractId, key));
-    if (!stored) return null;
-    try {
-      const data = JSON.parse(stored);
-      return data;
-    } catch (error) {
-      console.error(`Failed to parse contract data for ${contractId}:${key}:`, error);
-      return null;
-    }
-  }
-  async setContractData(contractId, key, data) {
-    try {
-      await this.storage.setItem(
-        getContractStorageKey(contractId, key),
-        JSON.stringify(data)
-      );
-    } catch (error) {
-      console.error(`Failed to persist contract data for ${contractId}:${key}:`, error);
-      throw error;
-    }
-  }
-  async deleteContractData(contractId, key) {
-    try {
-      await this.storage.removeItem(getContractStorageKey(contractId, key));
-    } catch (error) {
-      console.error(`Failed to remove contract data for ${contractId}:${key}:`, error);
-      throw error;
-    }
-  }
-  async getContractCollection(contractType) {
-    const stored = await this.storage.getItem(getCollectionStorageKey(contractType));
-    if (!stored) return [];
-    try {
-      const collection = JSON.parse(stored);
-      return collection;
-    } catch (error) {
-      console.error(`Failed to parse contract collection ${contractType}:`, error);
-      return [];
-    }
-  }
-  async saveToContractCollection(contractType, item, idField) {
-    const collection = await this.getContractCollection(contractType);
-    const itemId = item[idField];
-    if (itemId === void 0 || itemId === null) {
-      throw new Error(`Item is missing required field '${String(idField)}'`);
-    }
-    const existingIndex = collection.findIndex((i) => i[idField] === itemId);
-    let newCollection;
-    if (existingIndex !== -1) {
-      newCollection = [
-        ...collection.slice(0, existingIndex),
-        item,
-        ...collection.slice(existingIndex + 1)
-      ];
-    } else {
-      newCollection = [...collection, item];
-    }
-    try {
-      await this.storage.setItem(
-        getCollectionStorageKey(contractType),
-        JSON.stringify(newCollection)
-      );
-    } catch (error) {
-      console.error(`Failed to persist contract collection ${contractType}:`, error);
-      throw error;
-    }
-  }
-  async removeFromContractCollection(contractType, id, idField) {
-    if (id === void 0 || id === null) {
-      throw new Error(`Invalid id provided for removal: ${String(id)}`);
-    }
-    const collection = await this.getContractCollection(contractType);
-    const filtered = collection.filter((item) => item[idField] !== id);
-    try {
-      await this.storage.setItem(
-        getCollectionStorageKey(contractType),
-        JSON.stringify(filtered)
-      );
-    } catch (error) {
-      console.error(
-        `Failed to persist contract collection removal for ${contractType}:`,
-        error
-      );
-      throw error;
-    }
-  }
-  // The following methods are implemented for compatibility with the new ContractRepository interface
-  // but aren't used.
-  async getContracts(_) {
-    throw new TypeError(
-      "Method not implemented, this is a legacy class and should only be used for migrating data."
-    );
-  }
-  async saveContract(_) {
-    throw new TypeError(
-      "Method not implemented, this is a legacy class and should only be used for migrating data."
-    );
-  }
-  async deleteContract(_) {
-    throw new TypeError(
-      "Method not implemented, this is a legacy class and should only be used for migrating data."
-    );
-  }
-  // used only for tests
-  async clear() {
-    await this.storage.clear();
-  }
-  async [Symbol.asyncDispose]() {
-    return;
-  }
-};
 var HD_SETTINGS_KEY = "hd";
 var HARDENED_INDEX_OFFSET = 2147483648;
 var HDDescriptorProvider = class _HDDescriptorProvider {
@@ -11547,7 +11202,7 @@ var HDDescriptorProvider = class _HDDescriptorProvider {
    * simple `tr(pubkey)` descriptors.
    */
   isOurs(descriptor) {
-    return this.identity.isOurs(descriptor);
+    return this.identity.ownsDescriptor(descriptor);
   }
   /**
    * Signs each request with the key derived from its descriptor. Delegates
@@ -11555,11 +11210,11 @@ var HDDescriptorProvider = class _HDDescriptorProvider {
    * holds the seed.
    */
   async signWithDescriptor(requests) {
-    return this.identity.signWithDescriptor(requests);
+    return this.identity.signDescriptorTransactions(requests);
   }
   /** Signs a message using the key derived from `descriptor`. */
   async signMessageWithDescriptor(descriptor, message, signatureType = "schnorr") {
-    return this.identity.signMessageWithDescriptor(descriptor, message, signatureType);
+    return this.identity.signDescriptorMessage(descriptor, message, signatureType);
   }
   /**
    * HD providers participate in receive rotation. The default
@@ -12233,7 +11888,6 @@ var InputSignerRouter = class {
 };
 
 // src/wallet/wallet.ts
-var getArkadeServerUrl = ({ arkServerUrl }) => arkServerUrl || DEFAULT_ARKADE_SERVER_URL;
 function intentProofJobs(coins) {
   if (coins.length === 0) return [];
   const coinJobs = coins.map((coin, i) => ({
@@ -12723,25 +12377,16 @@ var ReadonlyWallet = class _ReadonlyWallet {
    * Extracts common logic used by both ReadonlyWallet.create() and Wallet.create().
    */
   static async setupWalletConfig(config, pubKey) {
-    const arkadeServerUrl = getArkadeServerUrl(config);
-    const arkProvider = config.arkProvider || new RestArkProvider(arkadeServerUrl);
+    const arkProvider = config.arkProvider || new RestArkProvider();
     let indexerProvider = config.indexerProvider;
     if (!indexerProvider) {
-      let indexerUrl = config.indexerUrl;
-      if (!indexerUrl) {
-        if (config.arkProvider) {
-          const derived = extractArkProviderUrl(config.arkProvider);
-          if (!derived) {
-            throw new Error(
-              "indexerUrl is required when arkProvider is provided without a discoverable serverUrl"
-            );
-          }
-          indexerUrl = derived;
-        } else {
-          indexerUrl = arkadeServerUrl;
-        }
+      const derived = extractArkProviderUrl(arkProvider);
+      if (!derived && config.arkProvider) {
+        throw new Error(
+          "indexerProvider is required when arkProvider is provided without a discoverable serverUrl"
+        );
       }
-      indexerProvider = new RestIndexerProvider(indexerUrl);
+      indexerProvider = new RestIndexerProvider(derived ?? DEFAULT_ARKADE_SERVER_URL);
     }
     const walletRepository = config.storage?.walletRepository ?? new IndexedDBWalletRepository();
     const contractRepository = config.storage?.contractRepository ?? new IndexedDBContractRepository();
@@ -12766,8 +12411,7 @@ var ReadonlyWallet = class _ReadonlyWallet {
         );
       }
     }
-    const esploraUrl = config.esploraUrl || ESPLORA_URL[info.network];
-    const onchainProvider = config.onchainProvider || new EsploraProvider(esploraUrl);
+    const onchainProvider = config.onchainProvider || new EsploraProvider(ESPLORA_URL[info.network]);
     if (config.exitTimelock) {
       const { value, type } = config.exitTimelock;
       if (value < 512n && type !== "blocks" || value >= 512n && type !== "seconds") {
@@ -12791,7 +12435,7 @@ var ReadonlyWallet = class _ReadonlyWallet {
       type: info.boardingExitDelay < 512n ? "blocks" : "seconds"
     };
     const serverPubKey = toXOnly(hex.decode(info.signerPubkey), "ark signer key");
-    const delegatePubKey = config.delegateProvider ? await config.delegateProvider.getDelegateInfo().then((info2) => toXOnly(hex.decode(info2.pubkey), "delegate key")).catch(() => void 0) : config.delegatorProvider ? await config.delegatorProvider.getDelegateInfo().then((info2) => toXOnly(hex.decode(info2.pubkey), "delegate key")).catch(() => void 0) : void 0;
+    const delegatePubKey = config.delegateProvider ? await config.delegateProvider.getDelegateInfo().then((info2) => toXOnly(hex.decode(info2.pubkey), "delegate key")).catch(() => void 0) : void 0;
     const offchainOptions = {
       pubKey,
       serverPubKey,
@@ -12818,9 +12462,7 @@ var ReadonlyWallet = class _ReadonlyWallet {
       info,
       serverInfoSource,
       serverInfoLastOnlineAt,
-      delegateProvider: config.delegateProvider || config.delegatorProvider,
-      /** @deprecated alias for `delegateProvider` */
-      delegatorProvider: config.delegateProvider || config.delegatorProvider,
+      delegateProvider: config.delegateProvider,
       walletContractTimelocks
     };
   }
@@ -12848,7 +12490,7 @@ var ReadonlyWallet = class _ReadonlyWallet {
       setup.dustAmount,
       setup.walletRepository,
       setup.contractRepository,
-      setup.delegateProvider || setup.delegatorProvider,
+      setup.delegateProvider,
       config.watcherConfig,
       setup.walletContractTimelocks
     );
@@ -12936,7 +12578,7 @@ var ReadonlyWallet = class _ReadonlyWallet {
    * The raw reporting/recovery read: escrowed, locked and awaiting-recovery
    * funds are all present. Coin selection must use
    * {@link getSpendableVtxos} instead — feeding this straight into
-   * `settle({ inputs })` or `sendBitcoin({ selectedVtxos })` bypasses the
+   * `settle({ inputs })` or `send({ selectedVtxos })` bypasses the
    * generic-spending gate.
    *
    * @param filter - Optional flags controlling whether recoverable or unrolled VTXOs are included
@@ -13205,7 +12847,6 @@ var ReadonlyWallet = class _ReadonlyWallet {
               },
               isUnrolled: true,
               ...boardingFacts,
-              virtualStatus: toVirtualStatus(boardingFacts),
               spentBy: "",
               createdAt: tx.status.confirmed ? new Date(tx.status.block_time * 1e3) : /* @__PURE__ */ new Date(0),
               script: scriptHex
@@ -13683,7 +13324,7 @@ var ReadonlyWallet = class _ReadonlyWallet {
   }
 };
 var Wallet2 = class _Wallet extends ReadonlyWallet {
-  constructor(identity, network, onchainProvider, arkProvider, indexerProvider, arkServerPublicKey, offchainTapscript, boardingTapscript, serverUnrollScript, forfeitOutputScript, forfeitPubkey, dustAmount, walletRepository, contractRepository, renewalConfig, delegateProvider, watcherConfig, settlementConfig, walletContractTimelocks, receiveRotator, descriptorProvider, lookAheadWindow, batchExpiryPolicy, checkpointExitDelayPolicy) {
+  constructor(identity, network, onchainProvider, arkProvider, indexerProvider, arkServerPublicKey, offchainTapscript, boardingTapscript, serverUnrollScript, forfeitOutputScript, forfeitPubkey, dustAmount, walletRepository, contractRepository, delegateProvider, watcherConfig, settlementConfig, walletContractTimelocks, receiveRotator, descriptorProvider, lookAheadWindow, batchExpiryPolicy, checkpointExitDelayPolicy) {
     super(
       identity,
       network,
@@ -13705,22 +13346,7 @@ var Wallet2 = class _Wallet extends ReadonlyWallet {
     this.batchExpiryPolicy = batchExpiryPolicy;
     this.checkpointExitDelayPolicy = checkpointExitDelayPolicy;
     this.identity = identity;
-    this.renewalConfig = {
-      enabled: renewalConfig?.enabled ?? false,
-      ...DEFAULT_RENEWAL_CONFIG,
-      ...renewalConfig
-    };
-    if (settlementConfig !== void 0) {
-      this.settlementConfig = settlementConfig;
-    } else if (renewalConfig && this.renewalConfig.enabled) {
-      this.settlementConfig = {
-        vtxoThreshold: renewalConfig.thresholdMs ? renewalConfig.thresholdMs / 1e3 : void 0
-      };
-    } else if (renewalConfig) {
-      this.settlementConfig = false;
-    } else {
-      this.settlementConfig = { ...DEFAULT_SETTLEMENT_CONFIG };
-    }
+    this.settlementConfig = settlementConfig !== void 0 ? settlementConfig : { ...DEFAULT_SETTLEMENT_CONFIG };
     this._delegateManager = delegateProvider ? new DelegateManagerImpl(delegateProvider, arkProvider, identity) : void 0;
     this._serverUnrollScript = serverUnrollScript;
     this._receiveRotator = receiveRotator;
@@ -14405,7 +14031,7 @@ var Wallet2 = class _Wallet extends ReadonlyWallet {
   }
   /**
    * Async mutex that serializes all operations submitting VTXOs to the Arkade
-   * server (`settle`, `send`, `sendBitcoin`). This prevents VtxoManager's
+   * server (`settle`, `send`). This prevents VtxoManager's
    * background renewal from racing with user-initiated transactions for the
    * same VTXO inputs.
    */
@@ -14535,8 +14161,6 @@ var Wallet2 = class _Wallet extends ReadonlyWallet {
       );
     }
   }
-  /** @deprecated Use settlementConfig instead */
-  renewalConfig;
   settlementConfig;
   /**
    * Broadcast access bound to this wallet's server, so a plugin needs only
@@ -14565,7 +14189,7 @@ var Wallet2 = class _Wallet extends ReadonlyWallet {
       return this._vtxoManagerInitializing;
     }
     this._vtxoManagerInitializing = Promise.resolve(
-      new VtxoManager(this, this.renewalConfig, this.settlementConfig)
+      new VtxoManager(this, this.settlementConfig)
     );
     try {
       const manager = await this._vtxoManagerInitializing;
@@ -14661,8 +14285,7 @@ var Wallet2 = class _Wallet extends ReadonlyWallet {
       setup.dustAmount,
       setup.walletRepository,
       setup.contractRepository,
-      config.renewalConfig,
-      config.delegateProvider || config.delegatorProvider,
+      config.delegateProvider,
       config.watcherConfig,
       config.settlementConfig,
       setup.walletContractTimelocks,
@@ -14751,74 +14374,6 @@ var Wallet2 = class _Wallet extends ReadonlyWallet {
   async getDelegateManager() {
     return this._delegateManager;
   }
-  /** @deprecated alias for @see Wallet.getDelegateManager */
-  async getDelegatorManager() {
-    return this.getDelegateManager();
-  }
-  /**
-   * Send bitcoin to an Arkade address.
-   *
-   * @deprecated Use `send`.
-   * @param params - Send parameters
-   */
-  async sendBitcoin(params) {
-    if (params.amount <= 0) {
-      throw new Error("Amount must be positive");
-    }
-    if (!isValidArkAddress(params.address)) {
-      throw new Error("Invalid Arkade address " + params.address);
-    }
-    if (params.selectedVtxos && params.selectedVtxos.length > 0) {
-      void this.logUngatedInputs("sendBitcoin({ selectedVtxos })", params.selectedVtxos);
-      return this._withTxLock(async () => {
-        const offchainTapscript = this.offchainTapscript;
-        const serverPubKey = this.arkServerPublicKey;
-        const serverUnrollScript = this.serverUnrollScript;
-        const arkAddress = offchainTapscript.address(this.network.hrp, serverPubKey);
-        const selectedVtxoSum = params.selectedVtxos.map((v) => v.value).reduce((a, b) => a + b, 0);
-        if (selectedVtxoSum < params.amount) {
-          throw new Error("Selected VTXOs do not cover specified amount");
-        }
-        const changeAmount = selectedVtxoSum - params.amount;
-        const selected = {
-          inputs: params.selectedVtxos,
-          changeAmount: BigInt(changeAmount)
-        };
-        const outputAddress = ArkAddress.decode(params.address);
-        assertRecipientArkadeAddress(
-          params.address,
-          outputAddress,
-          this.recipientAddressContext(serverPubKey)
-        );
-        const outputScript = BigInt(params.amount) < this.dustAmount ? outputAddress.subdustPkScript : outputAddress.pkScript;
-        const outputs = [
-          {
-            script: outputScript,
-            amount: BigInt(params.amount)
-          }
-        ];
-        if (selected.changeAmount > 0n) {
-          const changeOutputScript = selected.changeAmount < this.dustAmount ? arkAddress.subdustPkScript : arkAddress.pkScript;
-          outputs.push({
-            script: changeOutputScript,
-            amount: BigInt(selected.changeAmount)
-          });
-        }
-        return this._submitOffchainSpend(selected.inputs, outputs, {
-          sentAmount: params.amount,
-          changeAmount: selected.changeAmount,
-          changeVout: selected.changeAmount > 0n ? outputs.length - 1 : 0,
-          offchainTapscript,
-          serverPubKey,
-          serverUnrollScript
-        });
-      });
-    }
-    return this.send({
-      address: params.address,
-      amount: params.amount
-    });
-  }
   /**
    * Settle boarding inputs and/or virtual outputs into a finalized mainnet transaction.
    *
@@ -16162,7 +15717,7 @@ var Wallet2 = class _Wallet extends ReadonlyWallet {
   }
   /**
    * Shared tail of every Ark-transaction spend path (`send`, selected-VTXO
-   * `sendBitcoin`, and {@link sendSelectedVtxosToSelf}): hide the inputs from
+   * `send`, and {@link sendSelectedVtxosToSelf}): hide the inputs from
    * concurrent `getVtxos()`, build+submit the offchain tx, persist the spent
    * inputs and any wallet-owned (change / self) output, then release the
    * pending-spend hold. Callers own coin selection, output construction, and
@@ -16377,14 +15932,13 @@ var Wallet2 = class _Wallet extends ReadonlyWallet {
         const spentBy = checkpointIdByOutpoint.get(`${vtxo.txid}:${vtxo.vout}`);
         spentVtxos.push({
           ...spentFacts,
-          virtualStatus: toVirtualStatus(spentFacts),
           ...spentBy ? { spentBy } : {},
           arkTxId: arkTxid
         });
         for (const id of vtxo.commitmentTxIds) {
           commitmentTxIds.add(id);
         }
-        const vtxoExpiry = toBatchExpiry(vtxo);
+        const vtxoExpiry = vtxo.expiresAt?.getTime();
         if (vtxoExpiry) {
           batchExpiry = Math.min(batchExpiry, vtxoExpiry);
         }
@@ -16397,7 +15951,7 @@ var Wallet2 = class _Wallet extends ReadonlyWallet {
           isSwept: false,
           isPreconfirmed: true,
           commitmentTxIds: Array.from(commitmentTxIds),
-          ...parseLegacyExpiry(batchExpiry)
+          expiresAt: new Date(batchExpiry)
         };
         changeVtxo = {
           txid: arkTxid,
@@ -16409,7 +15963,6 @@ var Wallet2 = class _Wallet extends ReadonlyWallet {
           tapTree: offchainTapscript.encode(),
           value: Number(changeAmount),
           ...changeFacts,
-          virtualStatus: toVirtualStatus(changeFacts),
           spentBy: "",
           status: {
             confirmed: false
@@ -16495,7 +16048,6 @@ var Wallet2 = class _Wallet extends ReadonlyWallet {
           const settledFacts = { ...vtxo, isSpent: true };
           spentVtxos.push({
             ...settledFacts,
-            virtualStatus: toVirtualStatus(settledFacts),
             settledBy: commitmentTxid
           });
         } else {
@@ -16560,8 +16112,8 @@ var Wallet2 = class _Wallet extends ReadonlyWallet {
 };
 function selectVirtualCoins(coins, targetAmount) {
   const sortedCoins = coins.map(normalizeVtxo).sort((a, b) => {
-    const expiryA = toBatchExpiry(a) || Number.MAX_SAFE_INTEGER;
-    const expiryB = toBatchExpiry(b) || Number.MAX_SAFE_INTEGER;
+    const expiryA = a.expiresAt?.getTime() || Number.MAX_SAFE_INTEGER;
+    const expiryB = b.expiresAt?.getTime() || Number.MAX_SAFE_INTEGER;
     if (expiryA !== expiryB) {
       return expiryA - expiryB;
     }
@@ -16936,16 +16488,16 @@ var MessageBus = class {
       contractRepository: this.contractRepository,
       ...this.intentRepository && { intentRepository: this.intentRepository }
     };
-    const delegateProvider = config.delegateUrl ? new RestDelegateProvider(config.delegateUrl) : config.delegatorUrl ? new RestDelegateProvider(config.delegatorUrl) : void 0;
+    const delegateProvider = config.delegateUrl ? new RestDelegateProvider(config.delegateUrl) : void 0;
+    const indexerProvider = new RestIndexerProvider(config.arkServer.url);
     const serialized = normalizeSerializedIdentity(config.wallet);
     if (isSigningSerialized(serialized)) {
       const identity2 = hydrateIdentity(serialized);
       const wallet = await Wallet2.create({
         identity: identity2,
-        arkServerUrl: config.arkServer.url,
+        arkProvider,
         arkServerPublicKey: config.arkServer.publicKey,
-        indexerUrl: config.indexerUrl,
-        esploraUrl: config.esploraUrl,
+        indexerProvider,
         storage,
         delegateProvider,
         settlementConfig: config.settlementConfig,
@@ -16960,10 +16512,9 @@ var MessageBus = class {
     const identity = hydrateIdentity(serialized);
     const readonlyWallet = await ReadonlyWallet.create({
       identity,
-      arkServerUrl: config.arkServer.url,
+      arkProvider,
       arkServerPublicKey: config.arkServer.publicKey,
-      indexerUrl: config.indexerUrl,
-      esploraUrl: config.esploraUrl,
+      indexerProvider,
       storage,
       delegateProvider,
       watcherConfig: config.watcherConfig
@@ -17502,7 +17053,6 @@ var DelegateNotConfiguredError = class extends Error {
     this.name = "DelegateNotConfiguredError";
   }
 };
-var DelegatorNotConfiguredError = DelegateNotConfiguredError;
 var DEFAULT_MESSAGE_TAG = "WALLET_UPDATER";
 var serializeMigrationVtxoRef = (ref) => ({
   txid: ref.txid,
@@ -17749,13 +17299,6 @@ var WalletMessageHandler = class {
             ...response
           });
         }
-        case "SEND_BITCOIN": {
-          const response = await this.handleSendBitcoin(message);
-          return this.tagged({
-            id,
-            ...response
-          });
-        }
         case "GET_ADDRESS": {
           const address = await this.readonlyWallet.getAddress();
           return this.tagged({
@@ -18075,8 +17618,9 @@ var WalletMessageHandler = class {
           });
         }
         case "SEND": {
+          const wallet = this.requireWallet();
           const { recipients, selectedVtxos } = message.payload;
-          const txid = await (selectedVtxos ? this.wallet.send({ recipients, selectedVtxos }) : this.wallet.send(...recipients));
+          const txid = await (selectedVtxos ? wallet.send({ recipients, selectedVtxos }) : wallet.send(...recipients));
           return this.tagged({
             id,
             type: "SEND_SUCCESS",
@@ -18094,7 +17638,7 @@ var WalletMessageHandler = class {
         }
         case "ISSUE": {
           const { params } = message.payload;
-          const result = await this.wallet.assetManager.issue(params);
+          const result = await this.requireWallet().assetManager.issue(params);
           return this.tagged({
             id,
             type: "ISSUE_SUCCESS",
@@ -18103,7 +17647,7 @@ var WalletMessageHandler = class {
         }
         case "REISSUE": {
           const { params } = message.payload;
-          const txid = await this.wallet.assetManager.reissue(params);
+          const txid = await this.requireWallet().assetManager.reissue(params);
           return this.tagged({
             id,
             type: "REISSUE_SUCCESS",
@@ -18112,7 +17656,7 @@ var WalletMessageHandler = class {
         }
         case "BURN": {
           const { params } = message.payload;
-          const txid = await this.wallet.assetManager.burn(params);
+          const txid = await this.requireWallet().assetManager.burn(params);
           return this.tagged({
             id,
             type: "BURN_SUCCESS",
@@ -18495,17 +18039,6 @@ var WalletMessageHandler = class {
     }
     return { type: "SETTLE_SUCCESS", payload: { txid } };
   }
-  async handleSendBitcoin(message) {
-    const wallet = this.requireWallet();
-    const txid = await wallet.sendBitcoin(message.payload);
-    if (!txid) {
-      throw new Error("Send bitcoin failed");
-    }
-    return {
-      type: "SEND_BITCOIN_SUCCESS",
-      payload: { txid }
-    };
-  }
   async handleSignTransaction(message) {
     const wallet = this.requireWallet();
     const { tx, inputIndexes } = message.payload;
@@ -18576,13 +18109,7 @@ var WalletMessageHandler = class {
       if (dustAmount != null && isSubdust(v, dustAmount)) {
         return false;
       }
-      if (isRecoverable(v)) {
-        return false;
-      }
-      if (isExpired(v)) {
-        return false;
-      }
-      return true;
+      return canSpendOffchain(v, { timestamp: /* @__PURE__ */ new Date() });
     });
   }
   /** Tear down handler subscriptions, then delegate the full wipe to the wallet. */
@@ -18762,7 +18289,6 @@ var DEFAULT_MESSAGE_TIMEOUTS = {
   // SETTLE / RECOVER_VTXOS / RENEW_VTXOS go through the streaming path and
   // are treated as long-running on both sides of the bus: the values below
   // are retained only for type completeness and are never enforced.
-  SEND_BITCOIN: 5e4,
   SEND: 5e4,
   SETTLE: 5e4,
   // Broadcast: the server round-trip a spend ends in, so it belongs
@@ -18928,13 +18454,8 @@ var ServiceWorkerReadonlyWallet = class _ServiceWorkerReadonlyWallet {
   // Denormalized from options so buildInitConfig() can rebuild the init
   // envelope on demand for SDK-factory-created wallets. `create()` sets
   // these immediately after construction.
-  arkServerUrl;
-  arkServerPublicKey;
+  arkServer;
   delegateUrl;
-  /** @deprecated alias for @see ServiceWorkerReadonlyWallet.delegateUrl */
-  delegatorUrl;
-  indexerUrl;
-  esploraUrl;
   watcherConfig;
   settlementConfig;
   reinitPromise = null;
@@ -18965,16 +18486,10 @@ var ServiceWorkerReadonlyWallet = class _ServiceWorkerReadonlyWallet {
       messageTag
     );
     const serializedWallet = await serializeReadonlyIdentity(options.identity);
-    const publicKey = await options.identity.compressedPublicKey().then(hex.encode);
+    const arkServer = options.arkServer ?? { url: "https://arkade.computer" };
     const initWalletPayload = {
-      key: { publicKey },
-      arkServerUrl: getArkadeServerUrl(options),
-      arkServerPublicKey: options.arkServerPublicKey,
-      delegateUrl: options.delegateUrl || options.delegatorUrl,
-      // Keep the deprecated field populated so pre-#519 service workers
-      // (which only read delegatorUrl) keep delegating until they activate
-      // a newer version.
-      delegatorUrl: options.delegateUrl || options.delegatorUrl
+      arkServerUrl: arkServer.url,
+      arkServerPublicKey: arkServer.publicKey
     };
     const messageTimeouts = options.messageTimeouts ? {
       ...DEFAULT_MESSAGE_TIMEOUTS,
@@ -18982,17 +18497,8 @@ var ServiceWorkerReadonlyWallet = class _ServiceWorkerReadonlyWallet {
     } : DEFAULT_MESSAGE_TIMEOUTS;
     const busInitConfig = {
       wallet: serializedWallet,
-      arkServer: {
-        url: getArkadeServerUrl(options),
-        publicKey: options.arkServerPublicKey
-      },
-      delegateUrl: options.delegateUrl || options.delegatorUrl,
-      // Keep the deprecated field populated so pre-#519 service workers
-      // (which only read delegatorUrl) keep delegating until they activate
-      // a newer version.
-      delegatorUrl: options.delegateUrl || options.delegatorUrl,
-      indexerUrl: options.indexerUrl,
-      esploraUrl: options.esploraUrl,
+      arkServer,
+      delegateUrl: options.delegateUrl,
       watcherConfig: options.watcherConfig,
       messageTimeouts
     };
@@ -19025,7 +18531,7 @@ var ServiceWorkerReadonlyWallet = class _ServiceWorkerReadonlyWallet {
    * ```typescript
    * const wallet = await ServiceWorkerReadonlyWallet.setup({
    *   serviceWorkerPath: '/service-worker.js',
-   *   arkServerUrl: 'https://arkade.computer',
+   *   arkServer: { url: 'https://arkade.computer' },
    *   identity: ReadonlySingleKey.fromPublicKey('your_public_key_hex')
    * });
    * ```
@@ -19194,23 +18700,14 @@ var ServiceWorkerReadonlyWallet = class _ServiceWorkerReadonlyWallet {
    */
   async buildInitConfig() {
     if (this.initConfig) return this.initConfig;
-    if (!this.arkServerUrl) {
+    if (!this.arkServer) {
       throw new Error("Cannot re-initialize: wallet was not initialized via the SDK factory");
     }
     const wallet = await this.serializeIdentity();
     this.initConfig = {
       wallet,
-      arkServer: {
-        url: this.arkServerUrl,
-        publicKey: this.arkServerPublicKey
-      },
-      delegateUrl: this.delegateUrl || this.delegatorUrl,
-      // Keep the deprecated field populated so pre-#519 service workers
-      // (which only read delegatorUrl) keep delegating until they activate
-      // a newer version.
-      delegatorUrl: this.delegateUrl || this.delegatorUrl,
-      indexerUrl: this.indexerUrl,
-      esploraUrl: this.esploraUrl,
+      arkServer: this.arkServer,
+      delegateUrl: this.delegateUrl,
       watcherConfig: this.watcherConfig,
       settlementConfig: this.settlementConfig
     };
@@ -19219,14 +18716,12 @@ var ServiceWorkerReadonlyWallet = class _ServiceWorkerReadonlyWallet {
   /** Minimal INIT_WALLET payload used on reinitialize when the cache is gone. */
   buildInitWalletPayload() {
     if (this.initWalletPayload) return this.initWalletPayload;
-    if (!this.arkServerUrl) {
+    if (!this.arkServer) {
       throw new Error("Cannot re-initialize: wallet was not initialized via the SDK factory");
     }
     this.initWalletPayload = {
-      // `key` is deprecated and ignored by the current handler.
-      key: {},
-      arkServerUrl: this.arkServerUrl,
-      arkServerPublicKey: this.arkServerPublicKey
+      arkServerUrl: this.arkServer.url,
+      arkServerPublicKey: this.arkServer.publicKey
     };
     return this.initWalletPayload;
   }
@@ -19840,18 +19335,12 @@ var ServiceWorkerWallet = class _ServiceWorkerWallet extends ServiceWorkerReadon
       walletRepository,
       contractRepository,
       messageTag,
-      !!(options.delegateUrl || options.delegatorUrl)
+      !!options.delegateUrl
     );
-    const legacyPrivateKey = serializedWallet.type === "single-key" ? serializedWallet.privateKey : null;
+    const arkServer = options.arkServer ?? { url: "https://arkade.computer" };
     const initWalletPayload = {
-      key: legacyPrivateKey ? { privateKey: legacyPrivateKey } : {},
-      arkServerUrl: getArkadeServerUrl(options),
-      arkServerPublicKey: options.arkServerPublicKey,
-      delegateUrl: options.delegateUrl || options.delegatorUrl,
-      // Keep the deprecated field populated so pre-#519 service workers
-      // (which only read delegatorUrl) keep delegating until they activate
-      // a newer version.
-      delegatorUrl: options.delegateUrl || options.delegatorUrl
+      arkServerUrl: arkServer.url,
+      arkServerPublicKey: arkServer.publicKey
     };
     const messageTimeouts = options.messageTimeouts ? {
       ...DEFAULT_MESSAGE_TIMEOUTS,
@@ -19859,17 +19348,8 @@ var ServiceWorkerWallet = class _ServiceWorkerWallet extends ServiceWorkerReadon
     } : DEFAULT_MESSAGE_TIMEOUTS;
     const busInitConfig = {
       wallet: serializedWallet,
-      arkServer: {
-        url: getArkadeServerUrl(options),
-        publicKey: options.arkServerPublicKey
-      },
-      delegateUrl: options.delegateUrl || options.delegatorUrl,
-      // Keep the deprecated field populated so pre-#519 service workers
-      // (which only read delegatorUrl) keep delegating until they activate
-      // a newer version.
-      delegatorUrl: options.delegateUrl || options.delegatorUrl,
-      indexerUrl: options.indexerUrl,
-      esploraUrl: options.esploraUrl,
+      arkServer,
+      delegateUrl: options.delegateUrl,
       settlementConfig: options.settlementConfig,
       walletMode: options.walletMode,
       watcherConfig: options.watcherConfig,
@@ -19905,7 +19385,7 @@ var ServiceWorkerWallet = class _ServiceWorkerWallet extends ServiceWorkerReadon
    * ```typescript
    * const wallet = await ServiceWorkerWallet.setup({
    *   serviceWorkerPath: '/service-worker.js',
-   *   arkServerUrl: 'https://arkade.computer',
+   *   arkServer: { url: 'https://arkade.computer' },
    *   identity: MnemonicIdentity.fromMnemonic('abandon abandon...')
    * });
    * ```
@@ -20068,20 +19548,6 @@ var ServiceWorkerWallet = class _ServiceWorkerWallet extends ServiceWorkerReadon
       }
     };
   }
-  async sendBitcoin(params) {
-    const message = {
-      id: getRandomId(),
-      tag: this.messageTag,
-      type: "SEND_BITCOIN",
-      payload: params
-    };
-    try {
-      const response = await this.sendMessage(message);
-      return response.payload.txid;
-    } catch (error) {
-      throw new Error(`Failed to send bitcoin: ${error}`);
-    }
-  }
   async settle(params, callback) {
     const message = {
       id: getRandomId(),
@@ -20199,10 +19665,6 @@ var ServiceWorkerWallet = class _ServiceWorkerWallet extends ServiceWorkerReadon
     };
     return manager;
   }
-  /** @deprecated alias for @see ServiceWorkerWallet.getDelegateManager */
-  async getDelegatorManager() {
-    return await this.getDelegateManager();
-  }
   async getVtxoManager() {
     const wallet = this;
     const messageTag = this.messageTag;
@@ -21863,8 +21325,7 @@ async function resolveUnilateralPath(params) {
     const paths = handler.getAllSpendingPaths(script, contract, {
       collaborative: false,
       currentTime: params.currentTime,
-      walletDescriptor: params.walletDescriptor,
-      walletPubKey: params.walletPubKeyHex
+      walletDescriptor: params.walletDescriptor
     }).filter((p) => p.sequence !== void 0);
     if (paths.length === 0) {
       throw new ExitPathError(
@@ -22113,7 +21574,6 @@ async function prepareUnrollTransaction(wallet, vtxoTxIds, outputAddress) {
       vtxo,
       scriptHex: hex.encode(VtxoScript.decode(vtxo.tapTree).pkScript),
       contractRepository: wallet.contractRepository,
-      walletPubKeyHex: hex.encode(await wallet.identity.xOnlyPublicKey()),
       currentTime: Date.now()
     });
     const spendingLeaf = resolved.selection.leaf;
@@ -22352,7 +21812,7 @@ async function computeExitLayout(opts, feeRate) {
     (s) => s.parent.id,
     (s) => parentInputTxids(s.parent)
   );
-  const walletPubKeyHex = hex.encode(await wallet.identity.xOnlyPublicKey());
+  const walletDescriptor = hex.encode(await wallet.identity.xOnlyPublicKey());
   const infos = [];
   const sweeps = [];
   for (const vtxo of vtxos) {
@@ -22362,7 +21822,7 @@ async function computeExitLayout(opts, feeRate) {
         vtxo,
         scriptHex: hex.encode(VtxoScript.decode(vtxo.tapTree).pkScript),
         contractRepository: wallet.contractRepository,
-        walletPubKeyHex,
+        walletDescriptor,
         currentTime: Date.now()
       });
       const sweepFee = sweepFeeFor(
@@ -23150,7 +22610,7 @@ function createArkadeBatchHandler(intentId, inputs, signer, signedProof, message
           boardingIndices.push(boardingIdx);
           continue;
         }
-        if (isRecoverable(input) || isSubdust(input, info.dust)) {
+        if (canRecoverOnchain(input, { timestamp: /* @__PURE__ */ new Date() }) || isSubdust(input, info.dust)) {
           continue;
         }
         if (connectorIndex >= connectorLeaves.length) {
@@ -24080,6 +23540,7 @@ function arkAssetRail() {
     }
   };
 }
+var walletFeeSource = (wallet) => async () => (await wallet.arkProvider.getInfo()).fees;
 var GROSS_UP_MAX_ROUNDS = 8;
 function grossUpOffboard(net, feeInfo, script) {
   const estimator = new Estimator(feeInfo?.intentFee ?? {});
@@ -24092,7 +23553,10 @@ function grossUpOffboard(net, feeInfo, script) {
   }
   return { gross, fee: gross - net };
 }
-function onchainRail() {
+function onchainRail(deps) {
+  if (typeof deps?.feeInfo !== "function") {
+    throw new Error("onchain rail: a feeInfo source is required");
+  }
   return {
     id: "onchain",
     match: (req) => btcTarget(req.raw) !== void 0,
@@ -24102,7 +23566,7 @@ function onchainRail() {
       assertNoAssets("onchain", req);
       const address = btcTarget(req.raw);
       const amt = resolveSendAmount("onchain", req.raw, req.amount);
-      const { fees } = await ctx.wallet.arkProvider.getInfo();
+      const fees = await deps.feeInfo();
       const script = hex.encode(offboardDestinationScript(address));
       const { gross, fee } = grossUpOffboard(amt, fees, script);
       return {
@@ -24130,7 +23594,7 @@ function createDefaultPaymentRouter(wallet) {
   return new PaymentRouter({
     wallet,
     prefs: { priority: ["ark", "ark-asset", "onchain"] }
-  }).use(arkRail()).use(arkAssetRail()).use(onchainRail());
+  }).use(arkRail()).use(arkAssetRail()).use(onchainRail({ feeInfo: walletFeeSource(wallet) }));
 }
 /*! Bundled license information:
 
@@ -24138,6 +23602,6 @@ function createDefaultPaymentRouter(wallet) {
   (*! 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, DB_VERSION, 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, 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, assertRecipientArkadeAddress, 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, 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, requiresMigration, resolveAssetAmount, resolveBatchExpiryPolicy, resolveCheckpointExitDelayPolicy, resolveDescriptorSigner, resolvePrevTxs, resolveSendAmount, rollbackMigration, saveVtxosForContract, scriptFromArkAddress, selectCoinsWithAsset, selectVirtualCoins, serializeAssets, serializeExitPackage, serializeUtxo, serializeVtxo, setupServiceWorker, signAndSubmitOffchainTx, signerSetFromInfo, signingDescriptorIndex, strictSigningDescriptorIndex, toXOnlySignerHex, tryResolveSendAmount, validateBatchRecipients, validateConnectorsTxGraph, validateVtxoTxGraph, verifyTapscriptSignatures, waitForIncomingFunds, warnAndFilterVtxosForScript, withPrevTxs };
-//# sourceMappingURL=chunk-ZRNQV6HV.js.map
-//# sourceMappingURL=chunk-ZRNQV6HV.js.map
+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, ContractWatcher, DEFAULT_MESSAGE_TIMEOUTS, DEFAULT_MIN_BATCH_EXPIRY_SECONDS, DEFAULT_MIN_CHECKPOINT_EXIT_DELAY_SECONDS, DatabaseUpgradeBlockedError, DelegateManagerImpl, DelegateNotConfiguredError, 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, MUTINYNET_MIN_CHECKPOINT_EXIT_DELAY_SECONDS, MessageBus, MessageBusInitializingError, MessageBusNotInitializedError, MissingSigningDescriptorError, MnemonicIdentity, OnchainWallet, P2A, PaymentRouter, PrevTxUnavailableError, REGTEST_MIN_BATCH_EXPIRY_SECONDS, REGTEST_MIN_CHECKPOINT_EXIT_DELAY_SECONDS, Ramps, ReadonlyAssetManager, ReadonlyDescriptorIdentity, ReadonlySingleKey, ReadonlyWallet, ReadonlyWalletError, RestDelegateProvider, 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, WsElectrumChainSource, adoptContractDescriptor, arkAssetRail, arkRail, arkTarget, arkade_exports, assertFinalCommitmentMatchesValidated, assertIntentIdUnique, assertNoAssets, assertRecipientArkadeAddress, 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, getRandomId, hasBoardingTxExpired, hasCandidates, intentMatchesFilter, intentPageBounds, invoiceTarget, isAddressAllocationCapable, isArkContract, isBatchSignable, isBtcAddress, isContractGenericallySpendable, isCooperativelyMigratable, isDeterministicSigner, isDiscoverable, isHDAllocationCapable, isHDDeterministicSignCapable, isHDWalletCapable, isLightningInvoice, isLnurl, isMessageBusInitializingError, isMessageBusNotInitializedError, isPerArtifactDescriptor, isSigningIdentity, isSubdust, isTerminalIntentState, isValidArkAddress, isVtxoExpiringSoon, isVtxoForScript, isWatchedContract, legacyVtxoFacts, logExcludedVtxos, makeHandle, matchServerCheckpoints, mergeChainedTxType, notifyExitObserved, onchainRail, openDatabase, outpointExclusion, outpointReasons, promisifyRequest, provisionClaimSecret, provisionRefundKey, resolveAssetAmount, resolveBatchExpiryPolicy, resolveCheckpointExitDelayPolicy, resolveDescriptorSigner, resolvePrevTxs, resolveSendAmount, saveVtxosForContract, scriptFromArkAddress, selectCoinsWithAsset, selectVirtualCoins, serializeAssets, serializeExitPackage, serializeUtxo, serializeVtxo, setupServiceWorker, signAndSubmitOffchainTx, signerSetFromInfo, signingDescriptorIndex, strictSigningDescriptorIndex, toXOnlySignerHex, tryResolveSendAmount, validateBatchRecipients, validateConnectorsTxGraph, validateVtxoTxGraph, verifyTapscriptSignatures, waitForIncomingFunds, walletFeeSource, warnAndFilterVtxosForScript, withPrevTxs };
+//# sourceMappingURL=chunk-PYTAH2NY.js.map
+//# sourceMappingURL=chunk-PYTAH2NY.js.map