@arkade-os/swap 0.1.0-rc.4 → 0.1.0-rc.5

package/dist/advanced.cjs

@@ -1149,6 +1149,7 @@ var swap_want_btc_program_default = {
 
 // src/coverage.ts
 var RETIRABLE = ["fulfilled", "cancelled"];
+var LOCKUP_RETIRABLE = ["settled", "refunded"];
 var issuedAt = /* @__PURE__ */ new Map();
 var inFlight = /* @__PURE__ */ new Map();
 async function serialize(script, task) {
@@ -3911,6 +3912,7 @@ var rfqRecordOf = (record) => ({
   updatedAt: record.updatedAt,
   ...record.refundTxid === void 0 ? {} : { refundTxid: record.refundTxid },
   ...record.lockupSpendTxids?.length ? { lockupSpendTxids: [...record.lockupSpendTxids] } : {},
+  ...record.settlementPreimageHex === void 0 ? {} : { settlementPreimageHex: record.settlementPreimageHex },
   ...record.failure === void 0 ? {} : { failure: record.failure },
   ...record.claimFailure === void 0 ? {} : { claimFailure: record.claimFailure },
   ...record.blockedReason === void 0 ? {} : { blockedReason: record.blockedReason }
@@ -3919,6 +3921,7 @@ var withRfqState = (record, state) => {
   const {
     refundTxid: _refundTxid,
     lockupSpendTxids: _lockupSpendTxids,
+    settlementPreimageHex: _settlementPreimageHex,
     failure: _failure,
     claimFailure: _claimFailure,
     blockedReason: _blockedReason,
@@ -3931,6 +3934,7 @@ var withRfqState = (record, state) => {
     updatedAt: state.updatedAt,
     ...state.refundTxid === void 0 ? {} : { refundTxid: state.refundTxid },
     ...state.lockupSpendTxids?.length ? { lockupSpendTxids: [...state.lockupSpendTxids] } : {},
+    ...state.settlementPreimageHex === void 0 ? {} : { settlementPreimageHex: state.settlementPreimageHex },
     ...state.failure === void 0 ? {} : { failure: state.failure },
     ...state.claimFailure === void 0 ? {} : { claimFailure: state.claimFailure },
     ...state.blockedReason === void 0 ? {} : { blockedReason: state.blockedReason }
@@ -4163,7 +4167,7 @@ var retireOfferScripts = async (wallet, repository, record) => {
 var isMissingVtxo = (error) => error instanceof NoSpendableDepositError;
 
 // src/client/drive.ts
-var import_sdk22 = require("@arkade-os/sdk");
+var import_sdk23 = require("@arkade-os/sdk");
 var import_base17 = require("@scure/base");
 
 // src/claim.ts
@@ -4340,6 +4344,7 @@ var managerState = (swap) => ({
   updatedAt: swap.updatedAt,
   ...swap.refundTxid ? { refundTxid: swap.refundTxid } : {},
   ...swap.lockupSpendTxids?.length ? { lockupSpendTxids: [...swap.lockupSpendTxids] } : {},
+  ...swap.settlementPreimageHex ? { settlementPreimageHex: swap.settlementPreimageHex } : {},
   ...swap.failure ? { failure: swap.failure } : {},
   ...swap.claimFailure ? { claimFailure: swap.claimFailure } : {},
   ...swap.blockedReason ? { blockedReason: swap.blockedReason } : {}
@@ -4375,6 +4380,7 @@ function updateRfqSwapRecord(record, swap) {
   const {
     refundTxid: _refundTxid,
     lockupSpendTxids: _lockupSpendTxids,
+    settlementPreimageHex: _settlementPreimageHex,
     failure: _failure,
     claimFailure: _claimFailure,
     blockedReason: _blockedReason,
@@ -4422,6 +4428,7 @@ function rebuildRfqSwap(record, params) {
     updatedAt: stored.updatedAt,
     ...stored.refundTxid ? { refundTxid: stored.refundTxid } : {},
     ...stored.lockupSpendTxids?.length ? { lockupSpendTxids: [...stored.lockupSpendTxids] } : {},
+    ...stored.settlementPreimageHex ? { settlementPreimageHex: stored.settlementPreimageHex } : {},
     ...stored.failure ? { failure: stored.failure } : {},
     ...stored.claimFailure ? { claimFailure: stored.claimFailure } : {},
     ...stored.blockedReason ? { blockedReason: stored.blockedReason } : {}
@@ -4440,6 +4447,7 @@ function shouldRetainRfqSwap(record, now) {
 
 // src/swapManager.ts
 var import_base15 = require("@scure/base");
+var import_sdk21 = require("@arkade-os/sdk");
 init_onchainHtlc();
 init_lockupContract();
 function nextOnchainAction(input) {
@@ -4938,6 +4946,7 @@ var RfqSwapManager = class {
         });
         return;
       }
+      if (!(0, import_sdk21.isContractVtxoEvent)(event)) return;
       const swap = this.byLockupScript.get(event.contractScript);
       if (!swap) return;
       void this.pollSwap(swap).catch(() => {
@@ -5011,6 +5020,7 @@ var RfqSwapManager = class {
    * script for its whole life. Best-effort — the swap is over either way. */
   retireContract(swap) {
     if (!this.deps.contracts || !this.registered.get(swap.rfqId)) return;
+    if (!LOCKUP_RETIRABLE.includes(swap.state)) return;
     void this.deps.contracts.setContractWatchState(import_base15.hex.encode(swap.lockupPkScript), "retained").catch((error) => this.emitFailed(swap, error));
   }
   arm() {
@@ -5050,6 +5060,7 @@ var RfqSwapManager = class {
     }
     if (fate.fate === "claimed" || fate.fate === "returned") {
       this.stampLockupSpends(swap, fate.spends);
+      if (fate.fate === "claimed") this.stampSettlementPreimage(swap, fate.preimage);
       this.setState(swap, fate.fate === "claimed" ? "settled" : "refunded");
       return;
     }
@@ -5348,6 +5359,19 @@ var RfqSwapManager = class {
     swap.lockupSpendTxids = txids;
     this.touch(swap);
   }
+  /**
+   * Keep the preimage that settled a Lightning send.
+   *
+   * Only that leg. A receive's `claimed` verdict reveals the wallet's own
+   * claim secret and an onchain send's reveals the one it minted — both
+   * already recoverable from `profile`, so stamping either would be a second
+   * home for a secret that has one.
+   */
+  stampSettlementPreimage(swap, preimage) {
+    if (swap.kind !== "lightning_send") return;
+    swap.settlementPreimageHex = import_base15.hex.encode(preimage);
+    this.touch(swap);
+  }
   touch(swap) {
     swap.updatedAt = this.config.now();
     this.dirty.add(swap.rfqId);
@@ -5483,7 +5507,7 @@ var outpointKey = (vtxo) => `${vtxo.txid}:${vtxo.vout}`;
 
 // src/watch.ts
 var import_base16 = require("@scure/base");
-var import_sdk21 = require("@arkade-os/sdk");
+var import_sdk22 = require("@arkade-os/sdk");
 var TERMINAL = ["fulfilled", "cancelled", "recoverable"];
 var assetSwapSource = (repository) => ({
   list: () => getAssetSwaps(repository),
@@ -5515,7 +5539,7 @@ async function watchOfferSwaps({
     wallet.getAddress(),
     wallet.getArkadeReader()
   ]);
-  const operatorPubkey = import_sdk21.ArkAddress.decode(address).serverPubKey;
+  const operatorPubkey = import_sdk22.ArkAddress.decode(address).serverPubKey;
   let queue = Promise.resolve();
   const enqueue = (task) => {
     queue = queue.then(task).catch(() => {
@@ -5530,7 +5554,7 @@ async function watchOfferSwaps({
       return classifyDepositSpend(
         decodeOffer(import_base16.hex.decode(swap.offerHex)),
         operatorPubkey,
-        txs.map((psbt) => import_sdk21.Transaction.fromPSBT(import_base16.base64.decode(psbt))),
+        txs.map((psbt) => import_sdk22.Transaction.fromPSBT(import_base16.base64.decode(psbt))),
         { txid: vtxo.txid, vout: vtxo.vout }
       );
     } catch {
@@ -5558,7 +5582,7 @@ async function watchOfferSwaps({
     }
   };
   const unsubscribe = manager.onContractEvent((event) => {
-    if (event.type !== "vtxo_spent") return;
+    if (!(0, import_sdk22.isContractVtxoEvent)(event) || event.type !== "vtxo_spent") return;
     enqueue(() => handleSpend(event));
   });
   return {
@@ -5741,7 +5765,7 @@ var createSwapDrive = (config) => {
       const secret = rfqClaimSecretOf(record);
       if (!secret) throw new Error(`rfq swap ${swap.rfqId} carries no claim secret`);
       const preimage = await preimageForSwapRecord(wallet, secret);
-      const signer = await (0, import_sdk22.contractSigner)(wallet, await (0, import_sdk22.identityDescriptor)(wallet.identity));
+      const signer = await (0, import_sdk23.contractSigner)(wallet, await (0, import_sdk23.identityDescriptor)(wallet.identity));
       const claimKey = record.profile.claimKey;
       if (typeof claimKey === "string") {
         const held = import_base17.hex.encode(await signer.xOnlyPublicKey());
@@ -5799,10 +5823,10 @@ var createSwapDrive = (config) => {
     return track(
       pushClaim(operator, {
         contract: script,
-        receiver: await (0, import_sdk22.contractSigner)(wallet, secret.signingDescriptor),
+        receiver: await (0, import_sdk23.contractSigner)(wallet, secret.signingDescriptor),
         preimage: await preimageForSwapRecord(wallet, secret),
         vtxos,
-        destinationPkScript: import_sdk22.ArkAddress.decode(payoutAddress).pkScript,
+        destinationPkScript: import_sdk23.ArkAddress.decode(payoutAddress).pkScript,
         // Passed straight through, both of them: the manager's own value
         // check decides WHEN to act, `pushClaim`'s decides whether `P` is
         // published, and it is the one with nothing between it and the
@@ -5882,7 +5906,7 @@ var createSwapDrive = (config) => {
       ...tx.createdAt ? { createdAt: Math.floor(tx.createdAt / 1e3) } : {}
     }));
     const { restored, scannedTxids } = await restoreAssetSwaps(indexer, txs, /* @__PURE__ */ new Set(), {
-      operatorPubkey: import_sdk22.ArkAddress.decode(address).serverPubKey,
+      operatorPubkey: import_sdk23.ArkAddress.decode(address).serverPubKey,
       scanned
     });
     const byDeposit = new Map(restored.map((s) => [`${s.swapPkScript}:${s.fundingTxid}`, s]));
@@ -6581,17 +6605,17 @@ var verifyPlanLegs = (plan, legs, give) => {
 // src/client/quoteRfq.ts
 var import_base18 = require("@scure/base");
 var import_secp256k12 = require("@noble/curves/secp256k1.js");
-var import_sdk25 = require("@arkade-os/sdk");
+var import_sdk26 = require("@arkade-os/sdk");
 init_claimPacket();
 init_onchainHtlc();
 init_onchainHtlc();
 
 // src/payment/onchainSwap.ts
-var import_sdk24 = require("@arkade-os/sdk");
+var import_sdk25 = require("@arkade-os/sdk");
 init_onchainHtlc();
 
 // src/payment/swapRail.ts
-var import_sdk23 = require("@arkade-os/sdk");
+var import_sdk24 = require("@arkade-os/sdk");
 
 // src/client/sats.ts
 var satsOf = (value, field) => {
@@ -6642,14 +6666,14 @@ var parseRfqQuote = (quote) => ({
 
 // src/client/quoteRfq.ts
 var covenantInputs = (input) => {
-  const network = (0, import_sdk25.networkFromArkadeInfo)(input.info);
+  const network = (0, import_sdk26.networkFromArkadeInfo)(input.info);
   const arkade2 = input.corridors.get("arkade").deps;
   return {
-    operatorPubkey: (0, import_sdk25.toXOnly)(import_base18.hex.decode(input.info.signerPubkey), "ark signer key"),
+    operatorPubkey: (0, import_sdk26.toXOnly)(import_base18.hex.decode(input.info.signerPubkey), "ark signer key"),
     // The per-network pin the arkade module already resolved, never a key
     // the operator reports about itself: this one ends up in a covenant leaf
     // that decides who can move the funds.
-    emulatorPubkey: (0, import_sdk25.toXOnly)(import_base18.hex.decode(arkade2.emulatorPubkey), "emulator signer key"),
+    emulatorPubkey: (0, import_sdk26.toXOnly)(import_base18.hex.decode(arkade2.emulatorPubkey), "emulator signer key"),
     claimDelay: unilateralClaimDelay(Number(input.info.unilateralExitDelay)),
     hrp: network.hrp
   };
@@ -6695,7 +6719,7 @@ var quoteLightningSend = async (input) => {
   }
   const pair = rfqPairFor(input.legs.give, input.legs.take);
   const rfqId = newRfqId();
-  const secrets = await (0, import_sdk25.provisionRefundKey)(input.wallet);
+  const secrets = await (0, import_sdk26.provisionRefundKey)(input.wallet);
   const wire = await input.transport.requestQuote(
     lightningSendRequest({
       rfqId,
@@ -6767,7 +6791,7 @@ var quoteLightningReceive = async (input) => {
   const pinned = pinnedFor(input);
   const pair = rfqPairFor(input.legs.give, input.legs.take);
   const rfqId = newRfqId();
-  const secrets = await (0, import_sdk25.provisionClaimSecret)(input.wallet);
+  const secrets = await (0, import_sdk26.provisionClaimSecret)(input.wallet);
   const paymentHash = import_base18.hex.encode(secrets.paymentHash);
   const payoutAddress = await input.wallet.getAddress();
   const lightning = input.corridors.get("lightning").deps;
@@ -6892,8 +6916,8 @@ var quoteOnchainSend = async (input) => {
     claimVsize: onchain.claimVsize
   }) : void 0;
   const quoted = claimFee === void 0 ? pinned : { on: pinned.on, value: pinned.value + claimFee, source: pinned.source };
-  const secrets = await (0, import_sdk25.provisionClaimSecret)(input.wallet);
-  const payoutKey = await (0, import_sdk25.provisionRefundKey)(input.wallet);
+  const secrets = await (0, import_sdk26.provisionClaimSecret)(input.wallet);
+  const payoutKey = await (0, import_sdk26.provisionRefundKey)(input.wallet);
   const paymentHash = import_base18.hex.encode(secrets.paymentHash);
   const wire = await input.transport.requestQuote(
     withCanonicalAmount(
@@ -7000,7 +7024,7 @@ var quoteOnchainSend = async (input) => {
 };
 
 // src/client/verbs.ts
-var import_sdk26 = require("@arkade-os/sdk");
+var import_sdk27 = require("@arkade-os/sdk");
 var enforceFeeCeiling = (quote, call, policy) => {
   let ceiling;
   for (const [source, limit] of [
@@ -7025,9 +7049,9 @@ var settle = async (deps, input, maxFee) => {
   return deps.accept(quote);
 };
 var pay = async (deps, destination, options = {}) => {
-  const arkade2 = (0, import_sdk26.arkTarget)(destination);
+  const arkade2 = (0, import_sdk27.arkTarget)(destination);
   if (arkade2 !== void 0) {
-    const amount = (0, import_sdk26.resolveSendAmount)(
+    const amount = (0, import_sdk27.resolveSendAmount)(
       "ark",
       destination,
       options.amount === void 0 ? void 0 : satsOf(options.amount, "amount")
@@ -7347,7 +7371,7 @@ var createSwapClient = (config) => {
 var import_base20 = require("@scure/base");
 var import_legacy4 = require("@noble/hashes/legacy.js");
 var import_sha26 = require("@noble/hashes/sha2.js");
-var import_sdk27 = require("@arkade-os/sdk");
+var import_sdk28 = require("@arkade-os/sdk");
 init_claimPacket();
 var CovclaimdRevealError = class extends Error {
   name = "CovclaimdRevealError";
@@ -7452,7 +7476,7 @@ function revealFieldsFromScript(script) {
 }
 async function revealClaimPacket(client, input) {
   const fields = revealFieldsFromScript(input.script);
-  if (import_base20.hex.encode(import_sdk27.ArkAddress.decode(input.address).pkScript) !== import_base20.hex.encode(input.script.pkScript)) {
+  if (import_base20.hex.encode(import_sdk28.ArkAddress.decode(input.address).pkScript) !== import_base20.hex.encode(input.script.pkScript)) {
     throw new Error("address does not belong to this covenant");
   }
   if (import_base20.hex.encode((0, import_legacy4.ripemd160)((0, import_sha26.sha256)(input.preimage))) !== import_base20.hex.encode(input.script.options.preimageHash)) {

package/dist/advanced.d.cts

@@ -1,13 +1,13 @@
-import { A as AssetAliasTable, C as CorridorFactory, a as ArkadeCorridorDeps, L as LightningCorridorDeps, O as OnchainCorridorDeps, b as CorridorSet, D as DiscoveryIndex, S as SwapPolicy, c as DiscoveryLeg, M as MarketCandidate, d as DiscoverySnapshot } from './errors-DwF4nDkm.cjs';
-export { e as AcceptConflict, f as AcceptInput, g as AmbiguousDestination, h as AmountEncodingUnsupported, i as AmountMismatch, j as AttestingRfqTransport, k as CORRIDOR_FACTORIES, l as CancelInput, m as CancelOutcome, n as ClaimedDestination, o as ClientDisposed, p as CorridorBase, q as CorridorClaim, r as CorridorCovenant, s as CorridorDeadline, t as CorridorDeps, u as CorridorDepsByCorridor, v as CorridorDrive, w as CorridorLockup, x as CorridorModule, y as CorridorOverrides, z as CorridorPass, B as DiscoveryConfig, E as DiscoveryIndexInput, F as DiscoverySnapshotUnavailable, G as DriveMode, H as DriveRefusal, I as ExchangeOptions, J as FEED_TTL_MS, K as FeeCeiling, N as FeedFetch, P as FeedQuoteInput, Q as INDEXED_NETWORKS, R as InconsistentRoute, T as InsufficientFunds, U as LockupOwner, V as Market, W as MaxFeeExceeded, X as MissingCorridorDep, Y as NotCancellable, Z as ONCHAIN_CLAIM_FEE_RATE_SATVB, _ as ObservationSeam, $ as OfferPreparation, a0 as OnchainClaim, a1 as OperatorUnreachable, a2 as ParsedRfqQuote, a3 as PayOptions, a4 as PayResult, a5 as QuoteCheck, a6 as QuoteExpired, a7 as QuotePreparation, a8 as QuoteVerificationFailed, a9 as REGISTRY_URL, aa as ReceiveArtifact, ab as ReceiveOptions, ac as ReceiveRequest, ad as RecoveryResult, ae as RegisteredAsset, af as RfqAuctionPolicy, ag as RfqPreparation, ah as RfqQuoteInput, ai as RfqRendezvous, aj as RfqTransportFactory, ak as RouteSide, al as SWAP_ERROR_NAMES, am as SwapClient, an as SwapClientConfig, ao as SwapDrive, ap as SwapDriveConfig, aq as SwapDriveRefusedError, ar as SwapError, as as SwapErrorName, at as SwapFilter, au as UnsupportedRoute, av as VerbDeps, aw as acceptQuote, ax as attesting, ay as cancelSwap, az as canonicalAssetId, aA as cardMarketOf, aB as chooseMarket, aC as conflictingFields, aD as corridorSet, aE as createSwapClient, aF as createSwapDrive, aG as discoveryIndex, aH as eligibleMarkets, aI as enforceFeeCeiling, aJ as exchange, aK as feedFetch, aL as isAddressable, aM as isCardMarket, aN as isIndexedNetwork, aO as isSwapError, aP as isUsableCard, aQ as liveArkadeInfo, aR as marketBackendOf, aS as marketKeyOf, aT as marketRefOf, aU as nostrTransportFactory, aV as parseRfqQuote, aW as pay, aX as quoteFromFeed, aY as quoteViaRfq, aZ as readableRecord, a_ as receive, a$ as resolveCorridorBase, b0 as resolveCorridorDeps, b1 as rfqLeg, b2 as rfqPairFor, b3 as swapRecordOf, b4 as toDiscoveryLeg, b5 as usableMarkets, b6 as withCanonicalAmount } from './errors-DwF4nDkm.cjs';
+import { A as AssetAliasTable, C as CorridorFactory, a as ArkadeCorridorDeps, L as LightningCorridorDeps, O as OnchainCorridorDeps, b as CorridorSet, D as DiscoveryIndex, S as SwapPolicy, c as DiscoveryLeg, M as MarketCandidate, d as DiscoverySnapshot } from './errors-DUTOiyH2.cjs';
+export { e as AcceptConflict, f as AcceptInput, g as AmbiguousDestination, h as AmountEncodingUnsupported, i as AmountMismatch, j as AttestingRfqTransport, k as CORRIDOR_FACTORIES, l as CancelInput, m as CancelOutcome, n as ClaimedDestination, o as ClientDisposed, p as CorridorBase, q as CorridorClaim, r as CorridorCovenant, s as CorridorDeadline, t as CorridorDeps, u as CorridorDepsByCorridor, v as CorridorDrive, w as CorridorLockup, x as CorridorModule, y as CorridorOverrides, z as CorridorPass, B as DiscoveryConfig, E as DiscoveryIndexInput, F as DiscoverySnapshotUnavailable, G as DriveMode, H as DriveRefusal, I as ExchangeOptions, J as FEED_TTL_MS, K as FeeCeiling, N as FeedFetch, P as FeedQuoteInput, Q as INDEXED_NETWORKS, R as InconsistentRoute, T as InsufficientFunds, U as LockupOwner, V as Market, W as MaxFeeExceeded, X as MissingCorridorDep, Y as NotCancellable, Z as ONCHAIN_CLAIM_FEE_RATE_SATVB, _ as ObservationSeam, $ as OfferPreparation, a0 as OnchainClaim, a1 as OperatorUnreachable, a2 as ParsedRfqQuote, a3 as PayOptions, a4 as PayResult, a5 as QuoteCheck, a6 as QuoteExpired, a7 as QuotePreparation, a8 as QuoteVerificationFailed, a9 as REGISTRY_URL, aa as ReceiveArtifact, ab as ReceiveOptions, ac as ReceiveRequest, ad as RecoveryResult, ae as RegisteredAsset, af as RfqAuctionPolicy, ag as RfqPreparation, ah as RfqQuoteInput, ai as RfqRendezvous, aj as RfqTransportFactory, ak as RouteSide, al as SWAP_ERROR_NAMES, am as SwapClient, an as SwapClientConfig, ao as SwapDrive, ap as SwapDriveConfig, aq as SwapDriveRefusedError, ar as SwapError, as as SwapErrorName, at as SwapFilter, au as UnsupportedRoute, av as VerbDeps, aw as acceptQuote, ax as attesting, ay as cancelSwap, az as canonicalAssetId, aA as cardMarketOf, aB as chooseMarket, aC as conflictingFields, aD as corridorSet, aE as createSwapClient, aF as createSwapDrive, aG as discoveryIndex, aH as eligibleMarkets, aI as enforceFeeCeiling, aJ as exchange, aK as feedFetch, aL as isAddressable, aM as isCardMarket, aN as isIndexedNetwork, aO as isSwapError, aP as isUsableCard, aQ as liveArkadeInfo, aR as marketBackendOf, aS as marketKeyOf, aT as marketRefOf, aU as nostrTransportFactory, aV as parseRfqQuote, aW as pay, aX as quoteFromFeed, aY as quoteViaRfq, aZ as readableRecord, a_ as receive, a$ as resolveCorridorBase, b0 as resolveCorridorDeps, b1 as rfqLeg, b2 as rfqPairFor, b3 as swapRecordOf, b4 as toDiscoveryLeg, b5 as usableMarkets, b6 as withCanonicalAmount } from './errors-DUTOiyH2.cjs';
 import { DiscoveredMarket } from '@arkade-os/solver-discovery';
-import { N as NetworkRef, C as Corridor, A as AssetId, R as Rail, a as RfqSwapRecordStore, b as CorridorSwapRecord, Q as QuoteId, S as SwapRecord, O as OfferSwapRecord, c as AssetSwapRepository, d as RfqSwapRecord, L as LockupSpendIndexer, e as AssetSwapStatus, f as RouteResolution, g as ResolvedEndpoint, P as PinnedAmount, I as Instrument, h as Route, i as QuoteInput, j as Pubkey } from './repository-C7wOrIpV.cjs';
-export { k as ACTIVITY_TOKEN, l as ARKADE_ASSET_NAMESPACE, m as Amount, n as AmountFormatError, o as AmountOn, p as AmountRefusal, q as Artifact, r as AssetIdError, s as AssetIdRefusal, t as AssetNamespace, u as AssetOn, v as AssetPart, w as AssetRef, x as AssetScale, y as AssetSwapId, z as AtomicDecimal, B as AuctionMarketRef, D as AuctionProvenance, E as BITCOIN_RAILS, F as BTC_ASSET_PART, G as BitcoinRail, H as CORRIDORS, J as CORRIDOR_PASS, K as CardMarketRef, M as CorridorId, T as CorridorKind, U as DepositArtifact, V as DisplayDecimal, W as Endpoint, X as Ep, Y as Hex, Z as LOCKUP_OWNER, _ as MarketBackend, $ as MarketRef, a0 as OFFER_SWAP_ID_PREFIX, a1 as Outcome, a2 as ParsedAssetId, a3 as Quote, a4 as QuoteLeg, a5 as RAILS, a6 as RFQ_SWAP_ID_PREFIX, a7 as RailOf, a8 as RankedBid, a9 as RawState, aa as RecordedArtifact, ab as RecordedEndpoint, ac as RecordedInstrument, ad as RecordedLeg, ae as RfqAmountSide, af as SnapshotRef, ag as Swap, ah as SwapFamily, ai as SwapRecordCommon, aj as SwapUpdate, ak as Unsubscribe, al as arkadeAsset, am as artifactOf, an as assetPartOf, ao as assetSwapIdOf, ap as bitcoinNetworkOf, aq as btcOn, ar as corridorOfRail, as as corridorOutcome, at as decodeRfqAmount, au as encodeRfqAmount, av as familyOfSwapId, aw as formatAssetId, ax as fromAtomicDecimal, ay as fromRfqAmountSide, az as fundsFromWallet, aA as instrumentOf, aB as isAssetId, aC as isAtomicDecimal, aD as isNetworkRef, aE as issuanceOf, aF as legOf, aG as offerOutcome, aH as parseAssetId, aI as quoteIdOfSwapId, aJ as railOf, aK as railOfCorridor, aL as readsChain, aM as recordArtifact, aN as recordEndpoint, aO as recordInstrument, aP as recordLeg, aQ as recordOutcome, aR as sameAsset, aS as swapOf, aT as toAtomicDecimal, aU as toRfqAmountSide, aV as toSafeNumber } from './repository-C7wOrIpV.cjs';
+import { N as NetworkRef, C as Corridor, A as AssetId, R as Rail, a as RfqSwapRecordStore, b as CorridorSwapRecord, Q as QuoteId, S as SwapRecord, O as OfferSwapRecord, c as AssetSwapRepository, d as RfqSwapRecord, L as LockupSpendIndexer, e as AssetSwapStatus, f as RouteResolution, g as ResolvedEndpoint, P as PinnedAmount, I as Instrument, h as Route, i as QuoteInput, j as Pubkey } from './repository-CDlK003C.cjs';
+export { k as ACTIVITY_TOKEN, l as ARKADE_ASSET_NAMESPACE, m as Amount, n as AmountFormatError, o as AmountOn, p as AmountRefusal, q as Artifact, r as AssetIdError, s as AssetIdRefusal, t as AssetNamespace, u as AssetOn, v as AssetPart, w as AssetRef, x as AssetScale, y as AssetSwapId, z as AtomicDecimal, B as AuctionMarketRef, D as AuctionProvenance, E as BITCOIN_RAILS, F as BTC_ASSET_PART, G as BitcoinRail, H as CORRIDORS, J as CORRIDOR_PASS, K as CardMarketRef, M as CorridorId, T as CorridorKind, U as DepositArtifact, V as DisplayDecimal, W as Endpoint, X as Ep, Y as Hex, Z as LOCKUP_OWNER, _ as MarketBackend, $ as MarketRef, a0 as OFFER_SWAP_ID_PREFIX, a1 as Outcome, a2 as ParsedAssetId, a3 as Quote, a4 as QuoteLeg, a5 as RAILS, a6 as RFQ_SWAP_ID_PREFIX, a7 as RailOf, a8 as RankedBid, a9 as RawState, aa as RecordedArtifact, ab as RecordedEndpoint, ac as RecordedInstrument, ad as RecordedLeg, ae as RfqAmountSide, af as SnapshotRef, ag as Swap, ah as SwapFamily, ai as SwapRecordCommon, aj as SwapUpdate, ak as Unsubscribe, al as arkadeAsset, am as artifactOf, an as assetPartOf, ao as assetSwapIdOf, ap as bitcoinNetworkOf, aq as btcOn, ar as corridorOfRail, as as corridorOutcome, at as decodeRfqAmount, au as encodeRfqAmount, av as familyOfSwapId, aw as formatAssetId, ax as fromAtomicDecimal, ay as fromRfqAmountSide, az as fundsFromWallet, aA as instrumentOf, aB as isAssetId, aC as isAtomicDecimal, aD as isNetworkRef, aE as issuanceOf, aF as legOf, aG as offerOutcome, aH as parseAssetId, aI as quoteIdOfSwapId, aJ as railOf, aK as railOfCorridor, aL as readsChain, aM as recordArtifact, aN as recordEndpoint, aO as recordInstrument, aP as recordLeg, aQ as recordOutcome, aR as sameAsset, aS as swapOf, aT as toAtomicDecimal, aU as toRfqAmountSide, aV as toSafeNumber } from './repository-CDlK003C.cjs';
 import { I as InvoiceFacts, C as ChainSource, R as RfqQuote } from './rfq-RONK76D7.cjs';
 export { S as SwapRefusal } from './rfq-RONK76D7.cjs';
 import * as btc from '@scure/btc-signer';
 import { OnchainProvider, NetworkName, IWallet, VHTLC } from '@arkade-os/sdk';
-import { O as OfferSpendChanges, a as OfferSwapFacts, b as OfferSwapSource } from './watch-C3hv5rOW.cjs';
+import { O as OfferSpendChanges, a as OfferSwapFacts, b as OfferSwapSource } from './watch-JawNDXBr.cjs';
 
 /**
  * The alias table, filled from discovery.

package/dist/advanced.d.ts

@@ -1,13 +1,13 @@
-import { A as AssetAliasTable, C as CorridorFactory, a as ArkadeCorridorDeps, L as LightningCorridorDeps, O as OnchainCorridorDeps, b as CorridorSet, D as DiscoveryIndex, S as SwapPolicy, c as DiscoveryLeg, M as MarketCandidate, d as DiscoverySnapshot } from './errors-C-jdh0_4.js';
-export { e as AcceptConflict, f as AcceptInput, g as AmbiguousDestination, h as AmountEncodingUnsupported, i as AmountMismatch, j as AttestingRfqTransport, k as CORRIDOR_FACTORIES, l as CancelInput, m as CancelOutcome, n as ClaimedDestination, o as ClientDisposed, p as CorridorBase, q as CorridorClaim, r as CorridorCovenant, s as CorridorDeadline, t as CorridorDeps, u as CorridorDepsByCorridor, v as CorridorDrive, w as CorridorLockup, x as CorridorModule, y as CorridorOverrides, z as CorridorPass, B as DiscoveryConfig, E as DiscoveryIndexInput, F as DiscoverySnapshotUnavailable, G as DriveMode, H as DriveRefusal, I as ExchangeOptions, J as FEED_TTL_MS, K as FeeCeiling, N as FeedFetch, P as FeedQuoteInput, Q as INDEXED_NETWORKS, R as InconsistentRoute, T as InsufficientFunds, U as LockupOwner, V as Market, W as MaxFeeExceeded, X as MissingCorridorDep, Y as NotCancellable, Z as ONCHAIN_CLAIM_FEE_RATE_SATVB, _ as ObservationSeam, $ as OfferPreparation, a0 as OnchainClaim, a1 as OperatorUnreachable, a2 as ParsedRfqQuote, a3 as PayOptions, a4 as PayResult, a5 as QuoteCheck, a6 as QuoteExpired, a7 as QuotePreparation, a8 as QuoteVerificationFailed, a9 as REGISTRY_URL, aa as ReceiveArtifact, ab as ReceiveOptions, ac as ReceiveRequest, ad as RecoveryResult, ae as RegisteredAsset, af as RfqAuctionPolicy, ag as RfqPreparation, ah as RfqQuoteInput, ai as RfqRendezvous, aj as RfqTransportFactory, ak as RouteSide, al as SWAP_ERROR_NAMES, am as SwapClient, an as SwapClientConfig, ao as SwapDrive, ap as SwapDriveConfig, aq as SwapDriveRefusedError, ar as SwapError, as as SwapErrorName, at as SwapFilter, au as UnsupportedRoute, av as VerbDeps, aw as acceptQuote, ax as attesting, ay as cancelSwap, az as canonicalAssetId, aA as cardMarketOf, aB as chooseMarket, aC as conflictingFields, aD as corridorSet, aE as createSwapClient, aF as createSwapDrive, aG as discoveryIndex, aH as eligibleMarkets, aI as enforceFeeCeiling, aJ as exchange, aK as feedFetch, aL as isAddressable, aM as isCardMarket, aN as isIndexedNetwork, aO as isSwapError, aP as isUsableCard, aQ as liveArkadeInfo, aR as marketBackendOf, aS as marketKeyOf, aT as marketRefOf, aU as nostrTransportFactory, aV as parseRfqQuote, aW as pay, aX as quoteFromFeed, aY as quoteViaRfq, aZ as readableRecord, a_ as receive, a$ as resolveCorridorBase, b0 as resolveCorridorDeps, b1 as rfqLeg, b2 as rfqPairFor, b3 as swapRecordOf, b4 as toDiscoveryLeg, b5 as usableMarkets, b6 as withCanonicalAmount } from './errors-C-jdh0_4.js';
+import { A as AssetAliasTable, C as CorridorFactory, a as ArkadeCorridorDeps, L as LightningCorridorDeps, O as OnchainCorridorDeps, b as CorridorSet, D as DiscoveryIndex, S as SwapPolicy, c as DiscoveryLeg, M as MarketCandidate, d as DiscoverySnapshot } from './errors-BVhyWIM0.js';
+export { e as AcceptConflict, f as AcceptInput, g as AmbiguousDestination, h as AmountEncodingUnsupported, i as AmountMismatch, j as AttestingRfqTransport, k as CORRIDOR_FACTORIES, l as CancelInput, m as CancelOutcome, n as ClaimedDestination, o as ClientDisposed, p as CorridorBase, q as CorridorClaim, r as CorridorCovenant, s as CorridorDeadline, t as CorridorDeps, u as CorridorDepsByCorridor, v as CorridorDrive, w as CorridorLockup, x as CorridorModule, y as CorridorOverrides, z as CorridorPass, B as DiscoveryConfig, E as DiscoveryIndexInput, F as DiscoverySnapshotUnavailable, G as DriveMode, H as DriveRefusal, I as ExchangeOptions, J as FEED_TTL_MS, K as FeeCeiling, N as FeedFetch, P as FeedQuoteInput, Q as INDEXED_NETWORKS, R as InconsistentRoute, T as InsufficientFunds, U as LockupOwner, V as Market, W as MaxFeeExceeded, X as MissingCorridorDep, Y as NotCancellable, Z as ONCHAIN_CLAIM_FEE_RATE_SATVB, _ as ObservationSeam, $ as OfferPreparation, a0 as OnchainClaim, a1 as OperatorUnreachable, a2 as ParsedRfqQuote, a3 as PayOptions, a4 as PayResult, a5 as QuoteCheck, a6 as QuoteExpired, a7 as QuotePreparation, a8 as QuoteVerificationFailed, a9 as REGISTRY_URL, aa as ReceiveArtifact, ab as ReceiveOptions, ac as ReceiveRequest, ad as RecoveryResult, ae as RegisteredAsset, af as RfqAuctionPolicy, ag as RfqPreparation, ah as RfqQuoteInput, ai as RfqRendezvous, aj as RfqTransportFactory, ak as RouteSide, al as SWAP_ERROR_NAMES, am as SwapClient, an as SwapClientConfig, ao as SwapDrive, ap as SwapDriveConfig, aq as SwapDriveRefusedError, ar as SwapError, as as SwapErrorName, at as SwapFilter, au as UnsupportedRoute, av as VerbDeps, aw as acceptQuote, ax as attesting, ay as cancelSwap, az as canonicalAssetId, aA as cardMarketOf, aB as chooseMarket, aC as conflictingFields, aD as corridorSet, aE as createSwapClient, aF as createSwapDrive, aG as discoveryIndex, aH as eligibleMarkets, aI as enforceFeeCeiling, aJ as exchange, aK as feedFetch, aL as isAddressable, aM as isCardMarket, aN as isIndexedNetwork, aO as isSwapError, aP as isUsableCard, aQ as liveArkadeInfo, aR as marketBackendOf, aS as marketKeyOf, aT as marketRefOf, aU as nostrTransportFactory, aV as parseRfqQuote, aW as pay, aX as quoteFromFeed, aY as quoteViaRfq, aZ as readableRecord, a_ as receive, a$ as resolveCorridorBase, b0 as resolveCorridorDeps, b1 as rfqLeg, b2 as rfqPairFor, b3 as swapRecordOf, b4 as toDiscoveryLeg, b5 as usableMarkets, b6 as withCanonicalAmount } from './errors-BVhyWIM0.js';
 import { DiscoveredMarket } from '@arkade-os/solver-discovery';
-import { N as NetworkRef, C as Corridor, A as AssetId, R as Rail, a as RfqSwapRecordStore, b as CorridorSwapRecord, Q as QuoteId, S as SwapRecord, O as OfferSwapRecord, c as AssetSwapRepository, d as RfqSwapRecord, L as LockupSpendIndexer, e as AssetSwapStatus, f as RouteResolution, g as ResolvedEndpoint, P as PinnedAmount, I as Instrument, h as Route, i as QuoteInput, j as Pubkey } from './repository-CToRX7Gj.js';
-export { k as ACTIVITY_TOKEN, l as ARKADE_ASSET_NAMESPACE, m as Amount, n as AmountFormatError, o as AmountOn, p as AmountRefusal, q as Artifact, r as AssetIdError, s as AssetIdRefusal, t as AssetNamespace, u as AssetOn, v as AssetPart, w as AssetRef, x as AssetScale, y as AssetSwapId, z as AtomicDecimal, B as AuctionMarketRef, D as AuctionProvenance, E as BITCOIN_RAILS, F as BTC_ASSET_PART, G as BitcoinRail, H as CORRIDORS, J as CORRIDOR_PASS, K as CardMarketRef, M as CorridorId, T as CorridorKind, U as DepositArtifact, V as DisplayDecimal, W as Endpoint, X as Ep, Y as Hex, Z as LOCKUP_OWNER, _ as MarketBackend, $ as MarketRef, a0 as OFFER_SWAP_ID_PREFIX, a1 as Outcome, a2 as ParsedAssetId, a3 as Quote, a4 as QuoteLeg, a5 as RAILS, a6 as RFQ_SWAP_ID_PREFIX, a7 as RailOf, a8 as RankedBid, a9 as RawState, aa as RecordedArtifact, ab as RecordedEndpoint, ac as RecordedInstrument, ad as RecordedLeg, ae as RfqAmountSide, af as SnapshotRef, ag as Swap, ah as SwapFamily, ai as SwapRecordCommon, aj as SwapUpdate, ak as Unsubscribe, al as arkadeAsset, am as artifactOf, an as assetPartOf, ao as assetSwapIdOf, ap as bitcoinNetworkOf, aq as btcOn, ar as corridorOfRail, as as corridorOutcome, at as decodeRfqAmount, au as encodeRfqAmount, av as familyOfSwapId, aw as formatAssetId, ax as fromAtomicDecimal, ay as fromRfqAmountSide, az as fundsFromWallet, aA as instrumentOf, aB as isAssetId, aC as isAtomicDecimal, aD as isNetworkRef, aE as issuanceOf, aF as legOf, aG as offerOutcome, aH as parseAssetId, aI as quoteIdOfSwapId, aJ as railOf, aK as railOfCorridor, aL as readsChain, aM as recordArtifact, aN as recordEndpoint, aO as recordInstrument, aP as recordLeg, aQ as recordOutcome, aR as sameAsset, aS as swapOf, aT as toAtomicDecimal, aU as toRfqAmountSide, aV as toSafeNumber } from './repository-CToRX7Gj.js';
+import { N as NetworkRef, C as Corridor, A as AssetId, R as Rail, a as RfqSwapRecordStore, b as CorridorSwapRecord, Q as QuoteId, S as SwapRecord, O as OfferSwapRecord, c as AssetSwapRepository, d as RfqSwapRecord, L as LockupSpendIndexer, e as AssetSwapStatus, f as RouteResolution, g as ResolvedEndpoint, P as PinnedAmount, I as Instrument, h as Route, i as QuoteInput, j as Pubkey } from './repository-D3A1amV_.js';
+export { k as ACTIVITY_TOKEN, l as ARKADE_ASSET_NAMESPACE, m as Amount, n as AmountFormatError, o as AmountOn, p as AmountRefusal, q as Artifact, r as AssetIdError, s as AssetIdRefusal, t as AssetNamespace, u as AssetOn, v as AssetPart, w as AssetRef, x as AssetScale, y as AssetSwapId, z as AtomicDecimal, B as AuctionMarketRef, D as AuctionProvenance, E as BITCOIN_RAILS, F as BTC_ASSET_PART, G as BitcoinRail, H as CORRIDORS, J as CORRIDOR_PASS, K as CardMarketRef, M as CorridorId, T as CorridorKind, U as DepositArtifact, V as DisplayDecimal, W as Endpoint, X as Ep, Y as Hex, Z as LOCKUP_OWNER, _ as MarketBackend, $ as MarketRef, a0 as OFFER_SWAP_ID_PREFIX, a1 as Outcome, a2 as ParsedAssetId, a3 as Quote, a4 as QuoteLeg, a5 as RAILS, a6 as RFQ_SWAP_ID_PREFIX, a7 as RailOf, a8 as RankedBid, a9 as RawState, aa as RecordedArtifact, ab as RecordedEndpoint, ac as RecordedInstrument, ad as RecordedLeg, ae as RfqAmountSide, af as SnapshotRef, ag as Swap, ah as SwapFamily, ai as SwapRecordCommon, aj as SwapUpdate, ak as Unsubscribe, al as arkadeAsset, am as artifactOf, an as assetPartOf, ao as assetSwapIdOf, ap as bitcoinNetworkOf, aq as btcOn, ar as corridorOfRail, as as corridorOutcome, at as decodeRfqAmount, au as encodeRfqAmount, av as familyOfSwapId, aw as formatAssetId, ax as fromAtomicDecimal, ay as fromRfqAmountSide, az as fundsFromWallet, aA as instrumentOf, aB as isAssetId, aC as isAtomicDecimal, aD as isNetworkRef, aE as issuanceOf, aF as legOf, aG as offerOutcome, aH as parseAssetId, aI as quoteIdOfSwapId, aJ as railOf, aK as railOfCorridor, aL as readsChain, aM as recordArtifact, aN as recordEndpoint, aO as recordInstrument, aP as recordLeg, aQ as recordOutcome, aR as sameAsset, aS as swapOf, aT as toAtomicDecimal, aU as toRfqAmountSide, aV as toSafeNumber } from './repository-D3A1amV_.js';
 import { I as InvoiceFacts, C as ChainSource, R as RfqQuote } from './rfq-RONK76D7.js';
 export { S as SwapRefusal } from './rfq-RONK76D7.js';
 import * as btc from '@scure/btc-signer';
 import { OnchainProvider, NetworkName, IWallet, VHTLC } from '@arkade-os/sdk';
-import { O as OfferSpendChanges, a as OfferSwapFacts, b as OfferSwapSource } from './watch-mIKau97G.js';
+import { O as OfferSpendChanges, a as OfferSwapFacts, b as OfferSwapSource } from './watch-BJ-KKgwU.js';
 
 /**
  * The alias table, filled from discovery.

package/dist/advanced.js

@@ -133,7 +133,7 @@ import {
   withCanonicalAmount,
   withOfferStatus,
   withRfqState
-} from "./chunk-2QQYOW46.js";
+} from "./chunk-O3XMAZXS.js";
 import {
   ACTIVITY_TOKEN,
   CORRIDOR_PASS,
@@ -148,7 +148,7 @@ import {
   onchainCorridor,
   readsChain,
   recordOutcome
-} from "./chunk-4L2CNVXB.js";
+} from "./chunk-BQLGQ4WB.js";
 import {
   SwapRefusal,
   sealClaimPacket

package/dist/{chunk-4L2CNVXB.js → chunk-BQLGQ4WB.js}

@@ -212,6 +212,7 @@ var swap_want_btc_program_default = {
 
 // src/coverage.ts
 var RETIRABLE = ["fulfilled", "cancelled"];
+var LOCKUP_RETIRABLE = ["settled", "refunded"];
 var issuedAt = /* @__PURE__ */ new Map();
 var inFlight = /* @__PURE__ */ new Map();
 async function serialize(script, task) {
@@ -1852,6 +1853,7 @@ var managerState = (swap) => ({
   updatedAt: swap.updatedAt,
   ...swap.refundTxid ? { refundTxid: swap.refundTxid } : {},
   ...swap.lockupSpendTxids?.length ? { lockupSpendTxids: [...swap.lockupSpendTxids] } : {},
+  ...swap.settlementPreimageHex ? { settlementPreimageHex: swap.settlementPreimageHex } : {},
   ...swap.failure ? { failure: swap.failure } : {},
   ...swap.claimFailure ? { claimFailure: swap.claimFailure } : {},
   ...swap.blockedReason ? { blockedReason: swap.blockedReason } : {}
@@ -1887,6 +1889,7 @@ function updateRfqSwapRecord(record, swap) {
   const {
     refundTxid: _refundTxid,
     lockupSpendTxids: _lockupSpendTxids,
+    settlementPreimageHex: _settlementPreimageHex,
     failure: _failure,
     claimFailure: _claimFailure,
     blockedReason: _blockedReason,
@@ -1934,6 +1937,7 @@ function rebuildRfqSwap(record, params) {
     updatedAt: stored.updatedAt,
     ...stored.refundTxid ? { refundTxid: stored.refundTxid } : {},
     ...stored.lockupSpendTxids?.length ? { lockupSpendTxids: [...stored.lockupSpendTxids] } : {},
+    ...stored.settlementPreimageHex ? { settlementPreimageHex: stored.settlementPreimageHex } : {},
     ...stored.failure ? { failure: stored.failure } : {},
     ...stored.claimFailure ? { claimFailure: stored.claimFailure } : {},
     ...stored.blockedReason ? { blockedReason: stored.blockedReason } : {}
@@ -1952,6 +1956,9 @@ function shouldRetainRfqSwap(record, now) {
 
 // src/swapManager.ts
 import { hex as hex8 } from "@scure/base";
+import {
+  isContractVtxoEvent
+} from "@arkade-os/sdk";
 function nextOnchainAction(input) {
   switch (input.phase.phase) {
     case "unfunded":
@@ -2448,6 +2455,7 @@ var RfqSwapManager = class {
         });
         return;
       }
+      if (!isContractVtxoEvent(event)) return;
       const swap = this.byLockupScript.get(event.contractScript);
       if (!swap) return;
       void this.pollSwap(swap).catch(() => {
@@ -2521,6 +2529,7 @@ var RfqSwapManager = class {
    * script for its whole life. Best-effort — the swap is over either way. */
   retireContract(swap) {
     if (!this.deps.contracts || !this.registered.get(swap.rfqId)) return;
+    if (!LOCKUP_RETIRABLE.includes(swap.state)) return;
     void this.deps.contracts.setContractWatchState(hex8.encode(swap.lockupPkScript), "retained").catch((error) => this.emitFailed(swap, error));
   }
   arm() {
@@ -2560,6 +2569,7 @@ var RfqSwapManager = class {
     }
     if (fate.fate === "claimed" || fate.fate === "returned") {
       this.stampLockupSpends(swap, fate.spends);
+      if (fate.fate === "claimed") this.stampSettlementPreimage(swap, fate.preimage);
       this.setState(swap, fate.fate === "claimed" ? "settled" : "refunded");
       return;
     }
@@ -2858,6 +2868,19 @@ var RfqSwapManager = class {
     swap.lockupSpendTxids = txids;
     this.touch(swap);
   }
+  /**
+   * Keep the preimage that settled a Lightning send.
+   *
+   * Only that leg. A receive's `claimed` verdict reveals the wallet's own
+   * claim secret and an onchain send's reveals the one it minted — both
+   * already recoverable from `profile`, so stamping either would be a second
+   * home for a secret that has one.
+   */
+  stampSettlementPreimage(swap, preimage) {
+    if (swap.kind !== "lightning_send") return;
+    swap.settlementPreimageHex = hex8.encode(preimage);
+    this.touch(swap);
+  }
   touch(swap) {
     swap.updatedAt = this.config.now();
     this.dirty.add(swap.rfqId);
@@ -2995,6 +3018,7 @@ var outpointKey = (vtxo) => `${vtxo.txid}:${vtxo.vout}`;
 import { base64 as base643, hex as hex9 } from "@scure/base";
 import {
   ArkAddress as ArkAddress3,
+  isContractVtxoEvent as isContractVtxoEvent2,
   Transaction as Transaction3
 } from "@arkade-os/sdk";
 var TERMINAL = ["fulfilled", "cancelled", "recoverable"];
@@ -3071,7 +3095,7 @@ async function watchOfferSwaps({
     }
   };
   const unsubscribe = manager.onContractEvent((event) => {
-    if (event.type !== "vtxo_spent") return;
+    if (!isContractVtxoEvent2(event) || event.type !== "vtxo_spent") return;
     enqueue(() => handleSpend(event));
   });
   return {

package/dist/{chunk-2QQYOW46.js → chunk-O3XMAZXS.js}

@@ -41,7 +41,7 @@ import {
   spendTxidsOf,
   walletOperator,
   watchOfferSwaps
-} from "./chunk-4L2CNVXB.js";
+} from "./chunk-BQLGQ4WB.js";
 import {
   ARKADE_BTC,
   AddressMismatch,
@@ -1469,6 +1469,7 @@ var rfqRecordOf = (record) => ({
   updatedAt: record.updatedAt,
   ...record.refundTxid === void 0 ? {} : { refundTxid: record.refundTxid },
   ...record.lockupSpendTxids?.length ? { lockupSpendTxids: [...record.lockupSpendTxids] } : {},
+  ...record.settlementPreimageHex === void 0 ? {} : { settlementPreimageHex: record.settlementPreimageHex },
   ...record.failure === void 0 ? {} : { failure: record.failure },
   ...record.claimFailure === void 0 ? {} : { claimFailure: record.claimFailure },
   ...record.blockedReason === void 0 ? {} : { blockedReason: record.blockedReason }
@@ -1477,6 +1478,7 @@ var withRfqState = (record, state) => {
   const {
     refundTxid: _refundTxid,
     lockupSpendTxids: _lockupSpendTxids,
+    settlementPreimageHex: _settlementPreimageHex,
     failure: _failure,
     claimFailure: _claimFailure,
     blockedReason: _blockedReason,
@@ -1489,6 +1491,7 @@ var withRfqState = (record, state) => {
     updatedAt: state.updatedAt,
     ...state.refundTxid === void 0 ? {} : { refundTxid: state.refundTxid },
     ...state.lockupSpendTxids?.length ? { lockupSpendTxids: [...state.lockupSpendTxids] } : {},
+    ...state.settlementPreimageHex === void 0 ? {} : { settlementPreimageHex: state.settlementPreimageHex },
     ...state.failure === void 0 ? {} : { failure: state.failure },
     ...state.claimFailure === void 0 ? {} : { claimFailure: state.claimFailure },
     ...state.blockedReason === void 0 ? {} : { blockedReason: state.blockedReason }

package/dist/{errors-C-jdh0_4.d.ts → errors-BVhyWIM0.d.ts}

@@ -1,5 +1,5 @@
 import { IWallet, NetworkName, Network, SignerSet, ArkadeInfo, VHTLC, ProvisionedKey, ProvisionedClaimSecret } from '@arkade-os/sdk';
-import { a$ as SwapOperator, c as AssetSwapRepository, j as Pubkey, b1 as RfqSwapManagerCallbacks, C as Corridor, I as Instrument, b2 as RfqSwapActionName, N as NetworkRef, A as AssetId, af as SnapshotRef, _ as MarketBackend, K as CardMarketRef, $ as MarketRef, w as AssetRef, o as AmountOn, ag as Swap, M as CorridorId, U as DepositArtifact, i as QuoteInput, a3 as Quote, a8 as RankedBid, aj as SwapUpdate, ak as Unsubscribe, S as SwapRecord, Q as QuoteId, a1 as Outcome, L as LockupSpendIndexer, a_ as SwapContractRegistry, g as ResolvedEndpoint, P as PinnedAmount, O as OfferSwapRecord, y as AssetSwapId, ah as SwapFamily, f as RouteResolution } from './repository-CToRX7Gj.js';
+import { a$ as SwapOperator, c as AssetSwapRepository, j as Pubkey, b1 as RfqSwapManagerCallbacks, C as Corridor, I as Instrument, b2 as RfqSwapActionName, N as NetworkRef, A as AssetId, af as SnapshotRef, _ as MarketBackend, K as CardMarketRef, $ as MarketRef, w as AssetRef, o as AmountOn, ag as Swap, M as CorridorId, U as DepositArtifact, i as QuoteInput, a3 as Quote, a8 as RankedBid, aj as SwapUpdate, ak as Unsubscribe, S as SwapRecord, Q as QuoteId, a1 as Outcome, L as LockupSpendIndexer, a_ as SwapContractRegistry, g as ResolvedEndpoint, P as PinnedAmount, O as OfferSwapRecord, y as AssetSwapId, ah as SwapFamily, f as RouteResolution } from './repository-D3A1amV_.js';
 import { I as InvoiceFacts, C as ChainSource, R as RfqQuote, a as RfqTransport, L as LightningSendContractParams, b as LightningReceiveContractParams, O as OnchainHtlc, c as OnchainHtlcParams, d as OnchainNetwork, S as SwapRefusal } from './rfq-RONK76D7.js';
 import { Network as Network$1, LocalCardInput, DiscoveredMarket, Side, OfferPlan } from '@arkade-os/solver-discovery';
 

package/dist/{errors-DwF4nDkm.d.cts → errors-DUTOiyH2.d.cts}

@@ -1,5 +1,5 @@
 import { IWallet, NetworkName, Network, SignerSet, ArkadeInfo, VHTLC, ProvisionedKey, ProvisionedClaimSecret } from '@arkade-os/sdk';
-import { a$ as SwapOperator, c as AssetSwapRepository, j as Pubkey, b1 as RfqSwapManagerCallbacks, C as Corridor, I as Instrument, b2 as RfqSwapActionName, N as NetworkRef, A as AssetId, af as SnapshotRef, _ as MarketBackend, K as CardMarketRef, $ as MarketRef, w as AssetRef, o as AmountOn, ag as Swap, M as CorridorId, U as DepositArtifact, i as QuoteInput, a3 as Quote, a8 as RankedBid, aj as SwapUpdate, ak as Unsubscribe, S as SwapRecord, Q as QuoteId, a1 as Outcome, L as LockupSpendIndexer, a_ as SwapContractRegistry, g as ResolvedEndpoint, P as PinnedAmount, O as OfferSwapRecord, y as AssetSwapId, ah as SwapFamily, f as RouteResolution } from './repository-C7wOrIpV.cjs';
+import { a$ as SwapOperator, c as AssetSwapRepository, j as Pubkey, b1 as RfqSwapManagerCallbacks, C as Corridor, I as Instrument, b2 as RfqSwapActionName, N as NetworkRef, A as AssetId, af as SnapshotRef, _ as MarketBackend, K as CardMarketRef, $ as MarketRef, w as AssetRef, o as AmountOn, ag as Swap, M as CorridorId, U as DepositArtifact, i as QuoteInput, a3 as Quote, a8 as RankedBid, aj as SwapUpdate, ak as Unsubscribe, S as SwapRecord, Q as QuoteId, a1 as Outcome, L as LockupSpendIndexer, a_ as SwapContractRegistry, g as ResolvedEndpoint, P as PinnedAmount, O as OfferSwapRecord, y as AssetSwapId, ah as SwapFamily, f as RouteResolution } from './repository-CDlK003C.cjs';
 import { I as InvoiceFacts, C as ChainSource, R as RfqQuote, a as RfqTransport, L as LightningSendContractParams, b as LightningReceiveContractParams, O as OnchainHtlc, c as OnchainHtlcParams, d as OnchainNetwork, S as SwapRefusal } from './rfq-RONK76D7.cjs';
 import { Network as Network$1, LocalCardInput, DiscoveredMarket, Side, OfferPlan } from '@arkade-os/solver-discovery';