@arkade-os/swap 0.0.20 → 0.0.22

package/dist/index.cjs

@@ -4204,30 +4204,26 @@ var LockupNeedsRecoveryError = class extends Error {
     this.recoverableAfter = recoverableAfter;
   }
 };
-async function findLockupVtxos(indexer, swapPkScript) {
-  const scripts = [import_base14.hex.encode(swapPkScript)];
-  const [spendable, recoverable] = await Promise.all([
-    indexer.getVtxos({ scripts, spendableOnly: true }),
-    indexer.getVtxos({ scripts, recoverableOnly: true })
-  ]);
+async function findLockupVtxos(contracts, swapPkScript) {
+  const [row] = await contracts.getContractsWithVtxos({
+    script: import_base14.hex.encode(swapPkScript)
+  });
   const seen = /* @__PURE__ */ new Set();
   const out = [];
-  for (const [vtxos, isRecoverable] of [
-    [spendable.vtxos ?? [], false],
-    [recoverable.vtxos ?? [], true]
-  ]) {
-    for (const vtxo of vtxos) {
-      if (vtxo.isUnrolled) continue;
-      const key = `${vtxo.txid}:${vtxo.vout}`;
-      if (seen.has(key)) continue;
-      seen.add(key);
-      out.push({
-        txid: vtxo.txid,
-        vout: vtxo.vout,
-        value: Number(vtxo.value),
-        recoverable: isRecoverable
-      });
-    }
+  for (const vtxo of row?.vtxos ?? []) {
+    if (vtxo.isUnrolled) continue;
+    if ((0, import_sdk16.hasTerminalSpend)(vtxo)) continue;
+    const key = `${vtxo.txid}:${vtxo.vout}`;
+    if (seen.has(key)) continue;
+    seen.add(key);
+    out.push({
+      txid: vtxo.txid,
+      vout: vtxo.vout,
+      value: Number(vtxo.value),
+      // The manager's canonical `isSwept` fact; no coercion, because the
+      // normalized row guarantees a boolean.
+      recoverable: vtxo.isSwept
+    });
   }
   return out;
 }
@@ -4339,7 +4335,7 @@ async function pushRefundWithoutReceiver(ark, input) {
   return { arkTxid: submitted.arkTxid, amount };
 }
 var REFUND_MTP_LAG_SECONDS = 2 * 60 * 60;
-async function refundIfUnresolved(transport, ark, indexer, input) {
+async function refundIfUnresolved(transport, ark, contracts, indexer, input) {
   const pollMs = input.pollMs ?? 5e3;
   const now = input.now ?? (() => Math.floor(Date.now() / 1e3));
   const attemptDeadline = input.attemptDeadline ?? input.refundLocktime + REFUND_MTP_LAG_SECONDS;
@@ -4362,7 +4358,7 @@ async function refundIfUnresolved(transport, ark, indexer, input) {
           status
         };
       }
-      const vtxos = await findLockupVtxos(indexer, input.script.pkScript);
+      const vtxos = await findLockupVtxos(contracts, input.script.pkScript);
       if (vtxos.length === 0) return { outcome: "nothing_to_refund", status };
       try {
         const pushed = await pushRefundWithoutReceiver(ark, {
@@ -4457,10 +4453,10 @@ async function pushClaim(ark, input) {
   });
   return { arkTxid, amount: locked };
 }
-async function awaitLockupFunding(indexer, swapPkScript, options = {}) {
+async function awaitLockupFunding(contracts, swapPkScript, options = {}) {
   const pollMs = options.pollMs ?? 5e3;
   for (; ; ) {
-    const vtxos = await findLockupVtxos(indexer, swapPkScript);
+    const vtxos = await findLockupVtxos(contracts, swapPkScript);
     if (vtxos.length > 0) return vtxos;
     if (options.deadline !== void 0 && Date.now() / 1e3 >= options.deadline) {
       const error = new Error("the lockup never appeared at the covenant script");
@@ -4470,8 +4466,8 @@ async function awaitLockupFunding(indexer, swapPkScript, options = {}) {
     await sleep3(pollMs);
   }
 }
-async function claimReceiveLockup(indexer, ark, input) {
-  const vtxos = await awaitLockupFunding(indexer, input.swapPkScript, {
+async function claimReceiveLockup(contracts, ark, input) {
+  const vtxos = await awaitLockupFunding(contracts, input.swapPkScript, {
     pollMs: input.pollMs,
     deadline: input.deadline
   });
@@ -4533,7 +4529,7 @@ function arkadeRefunder(deps) {
         `swap ${swap.rfqId} carries no lockup covenant, so its refund cannot be built`
       );
     }
-    const vtxos = await findLockupVtxos(deps.indexer, swap.lockupPkScript);
+    const vtxos = await findLockupVtxos(deps.contracts, swap.lockupPkScript);
     if (vtxos.length === 0) return null;
     const record = await deps.repository.getRfqSwap(swap.rfqId);
     if (!record) {
@@ -5156,7 +5152,10 @@ var RfqSwapManager = class {
       return;
     }
     if (swap.kind === "lightning_receive") {
-      return fate.fate === "exited" ? this.blockExitedLockup(swap, fate) : this.driveReceiveClaim(swap);
+      if (fate.fate === "exited") return this.blockExitedLockup(swap, fate);
+      if (fate.fate === "open") return this.driveReceiveClaim(swap);
+      if (this.config.now() >= swap.refundLocktime) return this.driveReceiveClaim(swap);
+      return;
     }
     if (swap.kind === "onchain_send" && swap.state !== "claimed") {
       if (await this.driveOnchain(swap) === "handled") return;
@@ -5211,7 +5210,7 @@ var RfqSwapManager = class {
     if (now < swap.refundLocktime) {
       let vtxos;
       try {
-        vtxos = await findLockupVtxos(this.deps.indexer, swap.lockupPkScript);
+        vtxos = await findLockupVtxos(this.deps.contracts, swap.lockupPkScript);
       } catch (error) {
         this.emitFailed(swap, error);
         return;
@@ -5277,6 +5276,11 @@ var RfqSwapManager = class {
       this.setState(swap, "claimed");
       this.emitAction(swap, "claimLockup");
     } catch (error) {
+      const ark = (0, import_sdk19.isArkError)(error) ? error : (0, import_sdk19.maybeArkError)(error);
+      if ((0, import_sdk19.isArkError)(ark, import_sdk19.ArkErrorName.VTXO_ALREADY_SPENT)) {
+        this.lastClaimError.delete(swap.rfqId);
+        return;
+      }
       this.lastClaimError.set(swap.rfqId, errorMessage(error));
       this.emitFailed(swap, error);
     }

package/dist/index.d.cts

@@ -1,6 +1,6 @@
 import { ProvisionedKey, ProvisionedClaimSecret, ArkTxInput, asset, RelativeTimelock, IWallet, EmulatorProvider, arkade, RestIndexerProvider, Transaction, IContractManager, OnchainProvider, PaymentRail, Asset, VHTLC, Identity, ActivityResolver } from '@arkade-os/sdk';
-import { S as SwapSecretsProjection, R as RfqSwapRecord, A as AssetSwapRepository, a as AssetSwap, M as MarketsCacheEntry, b as RefundArkProvider, c as RefundIndexer, L as LockupVtxo, d as RfqSwap, e as ArkadeRefundResult, f as LockupSpendIndexer, g as RfqSwapState } from './repository-Cop29z0c.cjs';
-export { h as AssetSwapStatus, i as AvailableRfqSwapManagerCallbacks, B as BTC_ASSET_ID, I as InMemoryAssetSwapRepository, j as LightningReceiveSwap, k as LightningSendSwap, l as LockupFate, m as LockupNeedsRecoveryError, n as LockupParams, o as LockupSpend, O as OnchainSendAction, p as OnchainSendSwap, P as PersistableRfqSwap, q as PreimageBlockedReason, r as PreimageNotRecoverableError, s as REFUND_MTP_LAG_SECONDS, t as RFQ_RESOLVED_STATES, u as RFQ_SWAP_RETENTION_SECONDS, v as RFQ_SWAP_TERMINAL_STATES, w as RefundOutcome, x as RfqRestoreFailure, y as RfqRestoreOptions, z as RfqRestoreResult, C as RfqSwapActionName, D as RfqSwapLockup, E as RfqSwapManager, F as RfqSwapManagerCallbacks, G as RfqSwapManagerConfig, H as RfqSwapManagerDeps, J as RfqSwapManagerEvents, K as RfqSwapOrigin, N as RfqSwapOriginRequired, Q as RfqSwapOutcome, T as RfqSwapRecordStore, U as SwapContractRegistry, V as addAssetSwap, W as awaitRfqResolution, X as createRfqSwapRecord, Y as findLockupVtxos, Z as getAssetSwaps, _ as getAssetSwapsOrThrow, $ as isRfqSwapTerminal, a0 as isRfqTerminal, a1 as nextOnchainAction, a2 as preimageForSwapRecord, a3 as pushRefundWithoutReceiver, a4 as readLockupFate, a5 as rebuildRfqSwap, a6 as refundIfUnresolved, a7 as rfqSwapOriginOf, a8 as shouldRetainRfqSwap, a9 as swapSecretsToRecord, aa as updateAssetSwap, ab as updateAssetSwapBestEffort, ac as updateRfqSwapRecord } from './repository-Cop29z0c.cjs';
+import { S as SwapSecretsProjection, R as RfqSwapRecord, A as AssetSwapRepository, a as AssetSwap, M as MarketsCacheEntry, b as RefundArkProvider, L as LockupContractSource, c as LockupVtxo, d as RfqSwap, e as ArkadeRefundResult, f as LockupSpendIndexer, g as RfqSwapState } from './repository-CZYc8Y38.cjs';
+export { h as AssetSwapStatus, i as AvailableRfqSwapManagerCallbacks, B as BTC_ASSET_ID, I as InMemoryAssetSwapRepository, j as LightningReceiveSwap, k as LightningSendSwap, l as LockupFate, m as LockupNeedsRecoveryError, n as LockupParams, o as LockupSpend, O as OnchainSendAction, p as OnchainSendSwap, P as PersistableRfqSwap, q as PreimageBlockedReason, r as PreimageNotRecoverableError, s as REFUND_MTP_LAG_SECONDS, t as RFQ_RESOLVED_STATES, u as RFQ_SWAP_RETENTION_SECONDS, v as RFQ_SWAP_TERMINAL_STATES, w as RefundOutcome, x as RfqRestoreFailure, y as RfqRestoreOptions, z as RfqRestoreResult, C as RfqSwapActionName, D as RfqSwapLockup, E as RfqSwapManager, F as RfqSwapManagerCallbacks, G as RfqSwapManagerConfig, H as RfqSwapManagerDeps, J as RfqSwapManagerEvents, K as RfqSwapOrigin, N as RfqSwapOriginRequired, Q as RfqSwapOutcome, T as RfqSwapRecordStore, U as SwapContractRegistry, V as addAssetSwap, W as awaitRfqResolution, X as createRfqSwapRecord, Y as findLockupVtxos, Z as getAssetSwaps, _ as getAssetSwapsOrThrow, $ as isRfqSwapTerminal, a0 as isRfqTerminal, a1 as nextOnchainAction, a2 as preimageForSwapRecord, a3 as pushRefundWithoutReceiver, a4 as readLockupFate, a5 as rebuildRfqSwap, a6 as refundIfUnresolved, a7 as rfqSwapOriginOf, a8 as shouldRetainRfqSwap, a9 as swapSecretsToRecord, aa as updateAssetSwap, ab as updateAssetSwapBestEffort, ac as updateRfqSwapRecord } from './repository-CZYc8Y38.cjs';
 import { Network, LocalCardInput, DiscoveredMarket, Side, OfferPlan } from '@arkade-os/solver-discovery';
 import { O as OnchainNetwork, a as OnchainHtlc, b as OnchainHtlcParams, C as ChainSource, R as RfqTransport, r as requestOnchainSend, I as InvoiceFacts, c as requestLightningSend } from './rfq-B95nPfaa.cjs';
 export { A as ARKADE_ASSET, d as ARKADE_BTC, e as AddressMismatch, f as ChainUtxo, H as HtlcUtxo, L as LIGHTNING_BTC, g as LIGHTNING_RECEIVE_PAIR, h as LIGHTNING_SEND_PAIR, i as LOCKTIME_THRESHOLD, j as LightningReceiveTreeParams, k as LightningSendTreeParams, M as MAX_MIN_CONFIRMATIONS, l as MIN_CLAIM_WINDOW_SECONDS, m as MIN_HEADROOM_SECONDS, n as ONCHAIN_BTC, o as ONCHAIN_CLAIM_MARGIN_SECONDS, p as ONCHAIN_DUST_SATS, q as ONCHAIN_ORDER_MARGIN_SECONDS, s as ONCHAIN_RECEIVE_PAIR, t as ONCHAIN_SECONDS_PER_BLOCK, u as ONCHAIN_SEND_PAIR, v as OnchainHtlcPhase, w as RFQ_REFUSAL_ERROR_CODES, x as RFQ_TERMINAL_STATES, y as RelaySocket, z as RfqQuote, B as RfqRefusalDetail, D as RfqRefusalErrorCode, E as RfqRefusalReason, F as RfqRefusalUnit, G as RfqStatus, S as SOLO_REFUND_HEADROOM_SECONDS, J as SwapRefusal, K as arkadeAssetLeg, N as arkadeSwapRequest, P as assertArkadeFundable, Q as assertFundable, T as assertReceivable, U as awaitOnchainFill, V as buildHtlcClaim, W as buildHtlcRefund, X as canonicalAssetAmount, Y as claimOnchainFill, Z as classifyOnchainHtlc, _ as deriveLightningReceive, $ as deriveOnchainReceive, a0 as deriveOnchainSend, a1 as extractPreimage, a2 as httpTransport, a3 as isRfqRefusalErrorCode, a4 as l1ScriptForAddress, a5 as lightningReceiveRequest, a6 as lightningSendRequest, a7 as lightningSendVtxoScript, a8 as newPreimage, a9 as newRfqId, aa as normalizeMakerPkScript, ab as normalizeMakerPublicKey, ac as offerTermsFromQuote, ad as onchainHtlcScript, ae as onchainReceiveRequest, af as onchainSendRequest, ag as paymentHashOf, ah as receiveVtxoScript, ai as relayTransport, aj as requestArkadeSwap, ak as requestLightningReceive, al as requestOnchainReceive, am as rfqPair, an as unilateralClaimDelay, ao as unilateralRefundDelay, ap as unilateralRefundWithoutReceiverDelay, aq as verifyLockupAddress, ar as verifyOfferAddress, as as verifyReceiveInvoice } from './rfq-B95nPfaa.cjs';
@@ -1241,7 +1241,7 @@ declare function pushClaim(ark: ClaimArkProvider, input: {
  * unix-seconds `deadline`, and a thrown error carrying a stable `reason` when
  * the deadline passes.
  */
-declare function awaitLockupFunding(indexer: RefundIndexer, swapPkScript: Uint8Array, options?: {
+declare function awaitLockupFunding(contracts: LockupContractSource, swapPkScript: Uint8Array, options?: {
     pollMs?: number;
     deadline?: number;
 }): Promise<readonly LockupVtxo[]>;
@@ -1258,7 +1258,7 @@ declare function awaitLockupFunding(indexer: RefundIndexer, swapPkScript: Uint8A
  * rest lands is safe — and that is also the answer to a genuinely underfunded
  * lockup, which never gets past the gate at all.
  */
-declare function claimReceiveLockup(indexer: RefundIndexer, ark: ClaimArkProvider, input: Parameters<typeof pushClaim>[1] & {
+declare function claimReceiveLockup(contracts: LockupContractSource, ark: ClaimArkProvider, input: Parameters<typeof pushClaim>[1] & {
     /** The covenant's scriptPubKey, from the request flow's `swapPkScript`. */
     swapPkScript: Uint8Array;
     pollMs?: number;
@@ -1332,7 +1332,14 @@ declare function senderIdentityForSwapRecord(wallet: IWallet, record: {
 
 interface ArkadeRefunderDeps {
     ark: RefundArkProvider;
-    indexer: RefundIndexer;
+    /**
+     * The wallet's contract manager. The lockup's row must be registered in
+     * it before this can see the funding — which is what
+     * `RfqSwapManager.ensureRegistered` does per pass, and what
+     * `requestLightningSend` / `requestOnchainSend` do up front. Prefer
+     * `await wallet.getContractManager()`.
+     */
+    contracts: LockupContractSource;
     /** Asked for the descriptor's signer; never asked to mint a key. */
     wallet: IWallet;
     /**
@@ -1347,7 +1354,7 @@ interface ArkadeRefunderDeps {
  *
  * @example
  * manager.setCallbacks({
- *     refundArkade: arkadeRefunder({ ark, indexer, wallet, repository }),
+ *     refundArkade: arkadeRefunder({ ark, contracts, wallet, repository }),
  *     saveSwap,
  * });
  */
@@ -1499,4 +1506,4 @@ interface RfqSwapActivityDeps {
  */
 declare function rfqSwapActivityInputs(deps: RfqSwapActivityDeps): Promise<SwapActivityInput[]>;
 
-export { ASSET_CARRIER_SATS, ArkadeRefundResult, type ArkadeRefunderDeps, AssetSwap, AssetSwapRepository, type AssetSwapRestoreChange, CLAIM_PACKET_TYPE, CROSS_ASSET_RAIL, ChainSource, type ClaimArkProvider, type ClaimPacketInput, type ClaimPacketShape, type CovclaimdClient, type CovclaimdInfo, CovclaimdRevealError, type CrossAssetPhase, type CrossAssetRailDeps, type CrossAssetSwap, type DiscoverMarketsOptions, type FillFunding, IndexedDbAssetSwapRepository, InvoiceFacts, type LightningReceiveProfile, type LightningSendProfile, LockupAmountMismatchError, LockupContractMissing, type LockupContractReader, type LockupContractWriter, LockupRegistrationFailed, LockupSpendIndexer, LockupVtxo, MARKET_CORRIDORS, type MarketCorridor, type MarketLike, MarketsCacheEntry, OFFER_PACKET_TYPE, type Offer, type OfferContractRetirer, type OfferSwapWatcher, OnchainHtlc, OnchainHtlcParams, OnchainNetwork, type OnchainSendProfile, type PlanError, QUOTE_OPTIONS, RefundArkProvider, type RefundBlockedReason, RefundIndexer, RefundNotLocallyPossibleError, type RegisterAssetSwapRestoreOptions, type RestoreAssetSwapRepositoryOptions, type RestoreAssetSwapRepositoryResult, type RestoreIndexer, type RevealParams, type RfqClaimSecretProjection, type RfqHashlockProjection, type RfqSignerProjection, RfqSwap, type RfqSwapActivityDeps, RfqSwapRecord, RfqSwapState, RfqTransport, SEALED_CIPHERTEXT_LENGTH, SOLVER_LIGHTNING_RAIL, SOLVER_ONCHAIN_RAIL, SWAP_LOCKUP_CONTRACT_KIND, SWAP_LOCKUP_CONTRACT_LABEL, SWAP_LOCKUP_CONTRACT_TYPE, type SealedClaimPacket, type SolverLightningRailDeps, type SolverLightningSend, type SolverOnchainRailDeps, type SolverOnchainSend, type SolverRendezvous, type SpendKind, type SwapActivityInput, SwapSecretsProjection, type Tx, type WatchOfferSwapsParams, appendArkadeScript, arkadeRefunder, awaitLockupFunding, cancelOffer, chainSourceFrom, claimPacketShape, claimReceiveLockup, classifyDepositSpend, classifySpend, covclaimdClient, createOffer, crossAssetRail, decodeOffer, discoverMarkets, encodeOffer, fillOffer, findMarket, isRfqMarket, lockupContractParams, makeCachedFeedFetch, marketAssetId, marketCorridor, marketPairLabel, offerVtxoScript, onchainSendProfile, pushClaim, registerAssetSwapRestore, registerLockupContract, requestLightningSend, requestOnchainSend, restoreAssetSwapRepository, restoreAssetSwaps, restoreOfferCoverage, retireSettledOfferContracts, revealClaimPacket, revealFieldsFromScript, rfqClaimSecretOf, rfqSecretsProfile, rfqSignerOf, rfqSwapActivityInputs, sealClaimPacket, senderIdentityForSwapRecord, solverLightningRail, solverLightningRendezvous, solverOnchainRail, solverOnchainRendezvous, solverRendezvous, spendTxidsOf, spendUpdate, swapActivityResolver, swapPrograms, validatePlan, watchOfferSwaps };
+export { ASSET_CARRIER_SATS, ArkadeRefundResult, type ArkadeRefunderDeps, AssetSwap, AssetSwapRepository, type AssetSwapRestoreChange, CLAIM_PACKET_TYPE, CROSS_ASSET_RAIL, ChainSource, type ClaimArkProvider, type ClaimPacketInput, type ClaimPacketShape, type CovclaimdClient, type CovclaimdInfo, CovclaimdRevealError, type CrossAssetPhase, type CrossAssetRailDeps, type CrossAssetSwap, type DiscoverMarketsOptions, type FillFunding, IndexedDbAssetSwapRepository, InvoiceFacts, type LightningReceiveProfile, type LightningSendProfile, LockupAmountMismatchError, LockupContractMissing, type LockupContractReader, LockupContractSource, type LockupContractWriter, LockupRegistrationFailed, LockupSpendIndexer, LockupVtxo, MARKET_CORRIDORS, type MarketCorridor, type MarketLike, MarketsCacheEntry, OFFER_PACKET_TYPE, type Offer, type OfferContractRetirer, type OfferSwapWatcher, OnchainHtlc, OnchainHtlcParams, OnchainNetwork, type OnchainSendProfile, type PlanError, QUOTE_OPTIONS, RefundArkProvider, type RefundBlockedReason, RefundNotLocallyPossibleError, type RegisterAssetSwapRestoreOptions, type RestoreAssetSwapRepositoryOptions, type RestoreAssetSwapRepositoryResult, type RestoreIndexer, type RevealParams, type RfqClaimSecretProjection, type RfqHashlockProjection, type RfqSignerProjection, RfqSwap, type RfqSwapActivityDeps, RfqSwapRecord, RfqSwapState, RfqTransport, SEALED_CIPHERTEXT_LENGTH, SOLVER_LIGHTNING_RAIL, SOLVER_ONCHAIN_RAIL, SWAP_LOCKUP_CONTRACT_KIND, SWAP_LOCKUP_CONTRACT_LABEL, SWAP_LOCKUP_CONTRACT_TYPE, type SealedClaimPacket, type SolverLightningRailDeps, type SolverLightningSend, type SolverOnchainRailDeps, type SolverOnchainSend, type SolverRendezvous, type SpendKind, type SwapActivityInput, SwapSecretsProjection, type Tx, type WatchOfferSwapsParams, appendArkadeScript, arkadeRefunder, awaitLockupFunding, cancelOffer, chainSourceFrom, claimPacketShape, claimReceiveLockup, classifyDepositSpend, classifySpend, covclaimdClient, createOffer, crossAssetRail, decodeOffer, discoverMarkets, encodeOffer, fillOffer, findMarket, isRfqMarket, lockupContractParams, makeCachedFeedFetch, marketAssetId, marketCorridor, marketPairLabel, offerVtxoScript, onchainSendProfile, pushClaim, registerAssetSwapRestore, registerLockupContract, requestLightningSend, requestOnchainSend, restoreAssetSwapRepository, restoreAssetSwaps, restoreOfferCoverage, retireSettledOfferContracts, revealClaimPacket, revealFieldsFromScript, rfqClaimSecretOf, rfqSecretsProfile, rfqSignerOf, rfqSwapActivityInputs, sealClaimPacket, senderIdentityForSwapRecord, solverLightningRail, solverLightningRendezvous, solverOnchainRail, solverOnchainRendezvous, solverRendezvous, spendTxidsOf, spendUpdate, swapActivityResolver, swapPrograms, validatePlan, watchOfferSwaps };

package/dist/index.d.ts

@@ -1,6 +1,6 @@
 import { ProvisionedKey, ProvisionedClaimSecret, ArkTxInput, asset, RelativeTimelock, IWallet, EmulatorProvider, arkade, RestIndexerProvider, Transaction, IContractManager, OnchainProvider, PaymentRail, Asset, VHTLC, Identity, ActivityResolver } from '@arkade-os/sdk';
-import { S as SwapSecretsProjection, R as RfqSwapRecord, A as AssetSwapRepository, a as AssetSwap, M as MarketsCacheEntry, b as RefundArkProvider, c as RefundIndexer, L as LockupVtxo, d as RfqSwap, e as ArkadeRefundResult, f as LockupSpendIndexer, g as RfqSwapState } from './repository-BrTpVPLy.js';
-export { h as AssetSwapStatus, i as AvailableRfqSwapManagerCallbacks, B as BTC_ASSET_ID, I as InMemoryAssetSwapRepository, j as LightningReceiveSwap, k as LightningSendSwap, l as LockupFate, m as LockupNeedsRecoveryError, n as LockupParams, o as LockupSpend, O as OnchainSendAction, p as OnchainSendSwap, P as PersistableRfqSwap, q as PreimageBlockedReason, r as PreimageNotRecoverableError, s as REFUND_MTP_LAG_SECONDS, t as RFQ_RESOLVED_STATES, u as RFQ_SWAP_RETENTION_SECONDS, v as RFQ_SWAP_TERMINAL_STATES, w as RefundOutcome, x as RfqRestoreFailure, y as RfqRestoreOptions, z as RfqRestoreResult, C as RfqSwapActionName, D as RfqSwapLockup, E as RfqSwapManager, F as RfqSwapManagerCallbacks, G as RfqSwapManagerConfig, H as RfqSwapManagerDeps, J as RfqSwapManagerEvents, K as RfqSwapOrigin, N as RfqSwapOriginRequired, Q as RfqSwapOutcome, T as RfqSwapRecordStore, U as SwapContractRegistry, V as addAssetSwap, W as awaitRfqResolution, X as createRfqSwapRecord, Y as findLockupVtxos, Z as getAssetSwaps, _ as getAssetSwapsOrThrow, $ as isRfqSwapTerminal, a0 as isRfqTerminal, a1 as nextOnchainAction, a2 as preimageForSwapRecord, a3 as pushRefundWithoutReceiver, a4 as readLockupFate, a5 as rebuildRfqSwap, a6 as refundIfUnresolved, a7 as rfqSwapOriginOf, a8 as shouldRetainRfqSwap, a9 as swapSecretsToRecord, aa as updateAssetSwap, ab as updateAssetSwapBestEffort, ac as updateRfqSwapRecord } from './repository-BrTpVPLy.js';
+import { S as SwapSecretsProjection, R as RfqSwapRecord, A as AssetSwapRepository, a as AssetSwap, M as MarketsCacheEntry, b as RefundArkProvider, L as LockupContractSource, c as LockupVtxo, d as RfqSwap, e as ArkadeRefundResult, f as LockupSpendIndexer, g as RfqSwapState } from './repository-PNlTFdsj.js';
+export { h as AssetSwapStatus, i as AvailableRfqSwapManagerCallbacks, B as BTC_ASSET_ID, I as InMemoryAssetSwapRepository, j as LightningReceiveSwap, k as LightningSendSwap, l as LockupFate, m as LockupNeedsRecoveryError, n as LockupParams, o as LockupSpend, O as OnchainSendAction, p as OnchainSendSwap, P as PersistableRfqSwap, q as PreimageBlockedReason, r as PreimageNotRecoverableError, s as REFUND_MTP_LAG_SECONDS, t as RFQ_RESOLVED_STATES, u as RFQ_SWAP_RETENTION_SECONDS, v as RFQ_SWAP_TERMINAL_STATES, w as RefundOutcome, x as RfqRestoreFailure, y as RfqRestoreOptions, z as RfqRestoreResult, C as RfqSwapActionName, D as RfqSwapLockup, E as RfqSwapManager, F as RfqSwapManagerCallbacks, G as RfqSwapManagerConfig, H as RfqSwapManagerDeps, J as RfqSwapManagerEvents, K as RfqSwapOrigin, N as RfqSwapOriginRequired, Q as RfqSwapOutcome, T as RfqSwapRecordStore, U as SwapContractRegistry, V as addAssetSwap, W as awaitRfqResolution, X as createRfqSwapRecord, Y as findLockupVtxos, Z as getAssetSwaps, _ as getAssetSwapsOrThrow, $ as isRfqSwapTerminal, a0 as isRfqTerminal, a1 as nextOnchainAction, a2 as preimageForSwapRecord, a3 as pushRefundWithoutReceiver, a4 as readLockupFate, a5 as rebuildRfqSwap, a6 as refundIfUnresolved, a7 as rfqSwapOriginOf, a8 as shouldRetainRfqSwap, a9 as swapSecretsToRecord, aa as updateAssetSwap, ab as updateAssetSwapBestEffort, ac as updateRfqSwapRecord } from './repository-PNlTFdsj.js';
 import { Network, LocalCardInput, DiscoveredMarket, Side, OfferPlan } from '@arkade-os/solver-discovery';
 import { O as OnchainNetwork, a as OnchainHtlc, b as OnchainHtlcParams, C as ChainSource, R as RfqTransport, r as requestOnchainSend, I as InvoiceFacts, c as requestLightningSend } from './rfq-B95nPfaa.js';
 export { A as ARKADE_ASSET, d as ARKADE_BTC, e as AddressMismatch, f as ChainUtxo, H as HtlcUtxo, L as LIGHTNING_BTC, g as LIGHTNING_RECEIVE_PAIR, h as LIGHTNING_SEND_PAIR, i as LOCKTIME_THRESHOLD, j as LightningReceiveTreeParams, k as LightningSendTreeParams, M as MAX_MIN_CONFIRMATIONS, l as MIN_CLAIM_WINDOW_SECONDS, m as MIN_HEADROOM_SECONDS, n as ONCHAIN_BTC, o as ONCHAIN_CLAIM_MARGIN_SECONDS, p as ONCHAIN_DUST_SATS, q as ONCHAIN_ORDER_MARGIN_SECONDS, s as ONCHAIN_RECEIVE_PAIR, t as ONCHAIN_SECONDS_PER_BLOCK, u as ONCHAIN_SEND_PAIR, v as OnchainHtlcPhase, w as RFQ_REFUSAL_ERROR_CODES, x as RFQ_TERMINAL_STATES, y as RelaySocket, z as RfqQuote, B as RfqRefusalDetail, D as RfqRefusalErrorCode, E as RfqRefusalReason, F as RfqRefusalUnit, G as RfqStatus, S as SOLO_REFUND_HEADROOM_SECONDS, J as SwapRefusal, K as arkadeAssetLeg, N as arkadeSwapRequest, P as assertArkadeFundable, Q as assertFundable, T as assertReceivable, U as awaitOnchainFill, V as buildHtlcClaim, W as buildHtlcRefund, X as canonicalAssetAmount, Y as claimOnchainFill, Z as classifyOnchainHtlc, _ as deriveLightningReceive, $ as deriveOnchainReceive, a0 as deriveOnchainSend, a1 as extractPreimage, a2 as httpTransport, a3 as isRfqRefusalErrorCode, a4 as l1ScriptForAddress, a5 as lightningReceiveRequest, a6 as lightningSendRequest, a7 as lightningSendVtxoScript, a8 as newPreimage, a9 as newRfqId, aa as normalizeMakerPkScript, ab as normalizeMakerPublicKey, ac as offerTermsFromQuote, ad as onchainHtlcScript, ae as onchainReceiveRequest, af as onchainSendRequest, ag as paymentHashOf, ah as receiveVtxoScript, ai as relayTransport, aj as requestArkadeSwap, ak as requestLightningReceive, al as requestOnchainReceive, am as rfqPair, an as unilateralClaimDelay, ao as unilateralRefundDelay, ap as unilateralRefundWithoutReceiverDelay, aq as verifyLockupAddress, ar as verifyOfferAddress, as as verifyReceiveInvoice } from './rfq-B95nPfaa.js';
@@ -1241,7 +1241,7 @@ declare function pushClaim(ark: ClaimArkProvider, input: {
  * unix-seconds `deadline`, and a thrown error carrying a stable `reason` when
  * the deadline passes.
  */
-declare function awaitLockupFunding(indexer: RefundIndexer, swapPkScript: Uint8Array, options?: {
+declare function awaitLockupFunding(contracts: LockupContractSource, swapPkScript: Uint8Array, options?: {
     pollMs?: number;
     deadline?: number;
 }): Promise<readonly LockupVtxo[]>;
@@ -1258,7 +1258,7 @@ declare function awaitLockupFunding(indexer: RefundIndexer, swapPkScript: Uint8A
  * rest lands is safe — and that is also the answer to a genuinely underfunded
  * lockup, which never gets past the gate at all.
  */
-declare function claimReceiveLockup(indexer: RefundIndexer, ark: ClaimArkProvider, input: Parameters<typeof pushClaim>[1] & {
+declare function claimReceiveLockup(contracts: LockupContractSource, ark: ClaimArkProvider, input: Parameters<typeof pushClaim>[1] & {
     /** The covenant's scriptPubKey, from the request flow's `swapPkScript`. */
     swapPkScript: Uint8Array;
     pollMs?: number;
@@ -1332,7 +1332,14 @@ declare function senderIdentityForSwapRecord(wallet: IWallet, record: {
 
 interface ArkadeRefunderDeps {
     ark: RefundArkProvider;
-    indexer: RefundIndexer;
+    /**
+     * The wallet's contract manager. The lockup's row must be registered in
+     * it before this can see the funding — which is what
+     * `RfqSwapManager.ensureRegistered` does per pass, and what
+     * `requestLightningSend` / `requestOnchainSend` do up front. Prefer
+     * `await wallet.getContractManager()`.
+     */
+    contracts: LockupContractSource;
     /** Asked for the descriptor's signer; never asked to mint a key. */
     wallet: IWallet;
     /**
@@ -1347,7 +1354,7 @@ interface ArkadeRefunderDeps {
  *
  * @example
  * manager.setCallbacks({
- *     refundArkade: arkadeRefunder({ ark, indexer, wallet, repository }),
+ *     refundArkade: arkadeRefunder({ ark, contracts, wallet, repository }),
  *     saveSwap,
  * });
  */
@@ -1499,4 +1506,4 @@ interface RfqSwapActivityDeps {
  */
 declare function rfqSwapActivityInputs(deps: RfqSwapActivityDeps): Promise<SwapActivityInput[]>;
 
-export { ASSET_CARRIER_SATS, ArkadeRefundResult, type ArkadeRefunderDeps, AssetSwap, AssetSwapRepository, type AssetSwapRestoreChange, CLAIM_PACKET_TYPE, CROSS_ASSET_RAIL, ChainSource, type ClaimArkProvider, type ClaimPacketInput, type ClaimPacketShape, type CovclaimdClient, type CovclaimdInfo, CovclaimdRevealError, type CrossAssetPhase, type CrossAssetRailDeps, type CrossAssetSwap, type DiscoverMarketsOptions, type FillFunding, IndexedDbAssetSwapRepository, InvoiceFacts, type LightningReceiveProfile, type LightningSendProfile, LockupAmountMismatchError, LockupContractMissing, type LockupContractReader, type LockupContractWriter, LockupRegistrationFailed, LockupSpendIndexer, LockupVtxo, MARKET_CORRIDORS, type MarketCorridor, type MarketLike, MarketsCacheEntry, OFFER_PACKET_TYPE, type Offer, type OfferContractRetirer, type OfferSwapWatcher, OnchainHtlc, OnchainHtlcParams, OnchainNetwork, type OnchainSendProfile, type PlanError, QUOTE_OPTIONS, RefundArkProvider, type RefundBlockedReason, RefundIndexer, RefundNotLocallyPossibleError, type RegisterAssetSwapRestoreOptions, type RestoreAssetSwapRepositoryOptions, type RestoreAssetSwapRepositoryResult, type RestoreIndexer, type RevealParams, type RfqClaimSecretProjection, type RfqHashlockProjection, type RfqSignerProjection, RfqSwap, type RfqSwapActivityDeps, RfqSwapRecord, RfqSwapState, RfqTransport, SEALED_CIPHERTEXT_LENGTH, SOLVER_LIGHTNING_RAIL, SOLVER_ONCHAIN_RAIL, SWAP_LOCKUP_CONTRACT_KIND, SWAP_LOCKUP_CONTRACT_LABEL, SWAP_LOCKUP_CONTRACT_TYPE, type SealedClaimPacket, type SolverLightningRailDeps, type SolverLightningSend, type SolverOnchainRailDeps, type SolverOnchainSend, type SolverRendezvous, type SpendKind, type SwapActivityInput, SwapSecretsProjection, type Tx, type WatchOfferSwapsParams, appendArkadeScript, arkadeRefunder, awaitLockupFunding, cancelOffer, chainSourceFrom, claimPacketShape, claimReceiveLockup, classifyDepositSpend, classifySpend, covclaimdClient, createOffer, crossAssetRail, decodeOffer, discoverMarkets, encodeOffer, fillOffer, findMarket, isRfqMarket, lockupContractParams, makeCachedFeedFetch, marketAssetId, marketCorridor, marketPairLabel, offerVtxoScript, onchainSendProfile, pushClaim, registerAssetSwapRestore, registerLockupContract, requestLightningSend, requestOnchainSend, restoreAssetSwapRepository, restoreAssetSwaps, restoreOfferCoverage, retireSettledOfferContracts, revealClaimPacket, revealFieldsFromScript, rfqClaimSecretOf, rfqSecretsProfile, rfqSignerOf, rfqSwapActivityInputs, sealClaimPacket, senderIdentityForSwapRecord, solverLightningRail, solverLightningRendezvous, solverOnchainRail, solverOnchainRendezvous, solverRendezvous, spendTxidsOf, spendUpdate, swapActivityResolver, swapPrograms, validatePlan, watchOfferSwaps };
+export { ASSET_CARRIER_SATS, ArkadeRefundResult, type ArkadeRefunderDeps, AssetSwap, AssetSwapRepository, type AssetSwapRestoreChange, CLAIM_PACKET_TYPE, CROSS_ASSET_RAIL, ChainSource, type ClaimArkProvider, type ClaimPacketInput, type ClaimPacketShape, type CovclaimdClient, type CovclaimdInfo, CovclaimdRevealError, type CrossAssetPhase, type CrossAssetRailDeps, type CrossAssetSwap, type DiscoverMarketsOptions, type FillFunding, IndexedDbAssetSwapRepository, InvoiceFacts, type LightningReceiveProfile, type LightningSendProfile, LockupAmountMismatchError, LockupContractMissing, type LockupContractReader, LockupContractSource, type LockupContractWriter, LockupRegistrationFailed, LockupSpendIndexer, LockupVtxo, MARKET_CORRIDORS, type MarketCorridor, type MarketLike, MarketsCacheEntry, OFFER_PACKET_TYPE, type Offer, type OfferContractRetirer, type OfferSwapWatcher, OnchainHtlc, OnchainHtlcParams, OnchainNetwork, type OnchainSendProfile, type PlanError, QUOTE_OPTIONS, RefundArkProvider, type RefundBlockedReason, RefundNotLocallyPossibleError, type RegisterAssetSwapRestoreOptions, type RestoreAssetSwapRepositoryOptions, type RestoreAssetSwapRepositoryResult, type RestoreIndexer, type RevealParams, type RfqClaimSecretProjection, type RfqHashlockProjection, type RfqSignerProjection, RfqSwap, type RfqSwapActivityDeps, RfqSwapRecord, RfqSwapState, RfqTransport, SEALED_CIPHERTEXT_LENGTH, SOLVER_LIGHTNING_RAIL, SOLVER_ONCHAIN_RAIL, SWAP_LOCKUP_CONTRACT_KIND, SWAP_LOCKUP_CONTRACT_LABEL, SWAP_LOCKUP_CONTRACT_TYPE, type SealedClaimPacket, type SolverLightningRailDeps, type SolverLightningSend, type SolverOnchainRailDeps, type SolverOnchainSend, type SolverRendezvous, type SpendKind, type SwapActivityInput, SwapSecretsProjection, type Tx, type WatchOfferSwapsParams, appendArkadeScript, arkadeRefunder, awaitLockupFunding, cancelOffer, chainSourceFrom, claimPacketShape, claimReceiveLockup, classifyDepositSpend, classifySpend, covclaimdClient, createOffer, crossAssetRail, decodeOffer, discoverMarkets, encodeOffer, fillOffer, findMarket, isRfqMarket, lockupContractParams, makeCachedFeedFetch, marketAssetId, marketCorridor, marketPairLabel, offerVtxoScript, onchainSendProfile, pushClaim, registerAssetSwapRestore, registerLockupContract, requestLightningSend, requestOnchainSend, restoreAssetSwapRepository, restoreAssetSwaps, restoreOfferCoverage, retireSettledOfferContracts, revealClaimPacket, revealFieldsFromScript, rfqClaimSecretOf, rfqSecretsProfile, rfqSignerOf, rfqSwapActivityInputs, sealClaimPacket, senderIdentityForSwapRecord, solverLightningRail, solverLightningRendezvous, solverOnchainRail, solverOnchainRendezvous, solverRendezvous, spendTxidsOf, spendUpdate, swapActivityResolver, swapPrograms, validatePlan, watchOfferSwaps };

package/dist/index.js

@@ -1792,30 +1792,26 @@ var LockupNeedsRecoveryError = class extends Error {
     this.recoverableAfter = recoverableAfter;
   }
 };
-async function findLockupVtxos(indexer, swapPkScript) {
-  const scripts = [hex8.encode(swapPkScript)];
-  const [spendable, recoverable] = await Promise.all([
-    indexer.getVtxos({ scripts, spendableOnly: true }),
-    indexer.getVtxos({ scripts, recoverableOnly: true })
-  ]);
+async function findLockupVtxos(contracts, swapPkScript) {
+  const [row] = await contracts.getContractsWithVtxos({
+    script: hex8.encode(swapPkScript)
+  });
   const seen = /* @__PURE__ */ new Set();
   const out = [];
-  for (const [vtxos, isRecoverable] of [
-    [spendable.vtxos ?? [], false],
-    [recoverable.vtxos ?? [], true]
-  ]) {
-    for (const vtxo of vtxos) {
-      if (vtxo.isUnrolled) continue;
-      const key = `${vtxo.txid}:${vtxo.vout}`;
-      if (seen.has(key)) continue;
-      seen.add(key);
-      out.push({
-        txid: vtxo.txid,
-        vout: vtxo.vout,
-        value: Number(vtxo.value),
-        recoverable: isRecoverable
-      });
-    }
+  for (const vtxo of row?.vtxos ?? []) {
+    if (vtxo.isUnrolled) continue;
+    if (hasTerminalSpend(vtxo)) continue;
+    const key = `${vtxo.txid}:${vtxo.vout}`;
+    if (seen.has(key)) continue;
+    seen.add(key);
+    out.push({
+      txid: vtxo.txid,
+      vout: vtxo.vout,
+      value: Number(vtxo.value),
+      // The manager's canonical `isSwept` fact; no coercion, because the
+      // normalized row guarantees a boolean.
+      recoverable: vtxo.isSwept
+    });
   }
   return out;
 }
@@ -1927,7 +1923,7 @@ async function pushRefundWithoutReceiver(ark, input) {
   return { arkTxid: submitted.arkTxid, amount };
 }
 var REFUND_MTP_LAG_SECONDS = 2 * 60 * 60;
-async function refundIfUnresolved(transport, ark, indexer, input) {
+async function refundIfUnresolved(transport, ark, contracts, indexer, input) {
   const pollMs = input.pollMs ?? 5e3;
   const now = input.now ?? (() => Math.floor(Date.now() / 1e3));
   const attemptDeadline = input.attemptDeadline ?? input.refundLocktime + REFUND_MTP_LAG_SECONDS;
@@ -1950,7 +1946,7 @@ async function refundIfUnresolved(transport, ark, indexer, input) {
           status
         };
       }
-      const vtxos = await findLockupVtxos(indexer, input.script.pkScript);
+      const vtxos = await findLockupVtxos(contracts, input.script.pkScript);
       if (vtxos.length === 0) return { outcome: "nothing_to_refund", status };
       try {
         const pushed = await pushRefundWithoutReceiver(ark, {
@@ -2045,10 +2041,10 @@ async function pushClaim(ark, input) {
   });
   return { arkTxid, amount: locked };
 }
-async function awaitLockupFunding(indexer, swapPkScript, options = {}) {
+async function awaitLockupFunding(contracts, swapPkScript, options = {}) {
   const pollMs = options.pollMs ?? 5e3;
   for (; ; ) {
-    const vtxos = await findLockupVtxos(indexer, swapPkScript);
+    const vtxos = await findLockupVtxos(contracts, swapPkScript);
     if (vtxos.length > 0) return vtxos;
     if (options.deadline !== void 0 && Date.now() / 1e3 >= options.deadline) {
       const error = new Error("the lockup never appeared at the covenant script");
@@ -2058,8 +2054,8 @@ async function awaitLockupFunding(indexer, swapPkScript, options = {}) {
     await sleep2(pollMs);
   }
 }
-async function claimReceiveLockup(indexer, ark, input) {
-  const vtxos = await awaitLockupFunding(indexer, input.swapPkScript, {
+async function claimReceiveLockup(contracts, ark, input) {
+  const vtxos = await awaitLockupFunding(contracts, input.swapPkScript, {
     pollMs: input.pollMs,
     deadline: input.deadline
   });
@@ -2125,7 +2121,7 @@ function arkadeRefunder(deps) {
         `swap ${swap.rfqId} carries no lockup covenant, so its refund cannot be built`
       );
     }
-    const vtxos = await findLockupVtxos(deps.indexer, swap.lockupPkScript);
+    const vtxos = await findLockupVtxos(deps.contracts, swap.lockupPkScript);
     if (vtxos.length === 0) return null;
     const record = await deps.repository.getRfqSwap(swap.rfqId);
     if (!record) {
@@ -2142,7 +2138,10 @@ function arkadeRefunder(deps) {
 // src/swapManager.ts
 import { hex as hex10 } from "@scure/base";
 import {
-  isContractVtxoEvent as isContractVtxoEvent2
+  ArkErrorName,
+  isArkError,
+  isContractVtxoEvent as isContractVtxoEvent2,
+  maybeArkError
 } from "@arkade-os/sdk";
 function nextOnchainAction(input) {
   switch (input.phase.phase) {
@@ -2750,7 +2749,10 @@ var RfqSwapManager = class {
       return;
     }
     if (swap.kind === "lightning_receive") {
-      return fate.fate === "exited" ? this.blockExitedLockup(swap, fate) : this.driveReceiveClaim(swap);
+      if (fate.fate === "exited") return this.blockExitedLockup(swap, fate);
+      if (fate.fate === "open") return this.driveReceiveClaim(swap);
+      if (this.config.now() >= swap.refundLocktime) return this.driveReceiveClaim(swap);
+      return;
     }
     if (swap.kind === "onchain_send" && swap.state !== "claimed") {
       if (await this.driveOnchain(swap) === "handled") return;
@@ -2805,7 +2807,7 @@ var RfqSwapManager = class {
     if (now < swap.refundLocktime) {
       let vtxos;
       try {
-        vtxos = await findLockupVtxos(this.deps.indexer, swap.lockupPkScript);
+        vtxos = await findLockupVtxos(this.deps.contracts, swap.lockupPkScript);
       } catch (error) {
         this.emitFailed(swap, error);
         return;
@@ -2871,6 +2873,11 @@ var RfqSwapManager = class {
       this.setState(swap, "claimed");
       this.emitAction(swap, "claimLockup");
     } catch (error) {
+      const ark = isArkError(error) ? error : maybeArkError(error);
+      if (isArkError(ark, ArkErrorName.VTXO_ALREADY_SPENT)) {
+        this.lastClaimError.delete(swap.rfqId);
+        return;
+      }
       this.lastClaimError.set(swap.rfqId, errorMessage(error));
       this.emitFailed(swap, error);
     }

package/dist/repositories/realm/index.d.cts

@@ -1,5 +1,5 @@
 import { RealmLike } from '@arkade-os/sdk/repositories/realm';
-import { A as AssetSwapRepository, a as AssetSwap, R as RfqSwapRecord, M as MarketsCacheEntry } from '../../repository-Cop29z0c.cjs';
+import { A as AssetSwapRepository, a as AssetSwap, R as RfqSwapRecord, M as MarketsCacheEntry } from '../../repository-CZYc8Y38.cjs';
 import '@arkade-os/solver-discovery';
 import '@arkade-os/sdk';
 import '../../rfq-B95nPfaa.cjs';

package/dist/repositories/realm/index.d.ts

@@ -1,5 +1,5 @@
 import { RealmLike } from '@arkade-os/sdk/repositories/realm';
-import { A as AssetSwapRepository, a as AssetSwap, R as RfqSwapRecord, M as MarketsCacheEntry } from '../../repository-BrTpVPLy.js';
+import { A as AssetSwapRepository, a as AssetSwap, R as RfqSwapRecord, M as MarketsCacheEntry } from '../../repository-PNlTFdsj.js';
 import '@arkade-os/solver-discovery';
 import '@arkade-os/sdk';
 import '../../rfq-B95nPfaa.js';

package/dist/repositories/sqlite/index.d.cts

@@ -1,5 +1,5 @@
 import { SQLExecutor } from '@arkade-os/sdk/repositories/sqlite';
-import { A as AssetSwapRepository, a as AssetSwap, R as RfqSwapRecord, M as MarketsCacheEntry } from '../../repository-Cop29z0c.cjs';
+import { A as AssetSwapRepository, a as AssetSwap, R as RfqSwapRecord, M as MarketsCacheEntry } from '../../repository-CZYc8Y38.cjs';
 import '@arkade-os/solver-discovery';
 import '@arkade-os/sdk';
 import '../../rfq-B95nPfaa.cjs';

package/dist/repositories/sqlite/index.d.ts

@@ -1,5 +1,5 @@
 import { SQLExecutor } from '@arkade-os/sdk/repositories/sqlite';
-import { A as AssetSwapRepository, a as AssetSwap, R as RfqSwapRecord, M as MarketsCacheEntry } from '../../repository-BrTpVPLy.js';
+import { A as AssetSwapRepository, a as AssetSwap, R as RfqSwapRecord, M as MarketsCacheEntry } from '../../repository-PNlTFdsj.js';
 import '@arkade-os/solver-discovery';
 import '@arkade-os/sdk';
 import '../../rfq-B95nPfaa.js';

package/dist/{repository-Cop29z0c.d.cts → repository-CZYc8Y38.d.cts}

@@ -1,5 +1,5 @@
 import { DiscoveredMarket } from '@arkade-os/solver-discovery';
-import { IWallet, ProvisionedKey, ProvisionedClaimSecret, RestArkProvider, RestIndexerProvider, VHTLC, Identity, IContractManager } from '@arkade-os/sdk';
+import { IWallet, ProvisionedKey, ProvisionedClaimSecret, RestArkProvider, IContractManager, RestIndexerProvider, VHTLC, Identity } from '@arkade-os/sdk';
 import { G as RfqStatus, R as RfqTransport, a as OnchainHtlc, f as ChainUtxo, C as ChainSource, v as OnchainHtlcPhase } from './rfq-B95nPfaa.cjs';
 
 type AssetSwapStatus = "pending" | "cancelling" | "fulfilled" | "cancelled" | "recoverable" | "awaiting_fill" | "claimable" | "claimed" | "refunded_l1";
@@ -213,8 +213,17 @@ declare function awaitRfqResolution(transport: RfqTransport, rfqId: string, opti
 /** The Ark surface the refund push needs — narrower than a full provider, and
  * satisfied by {@link RestArkProvider}. Same seam style as `RestoreIndexer`. */
 type RefundArkProvider = Pick<RestArkProvider, "getInfo" | "submitTx" | "finalizeTx">;
-/** The indexer surface the lockup lookup needs. */
-type RefundIndexer = Pick<RestIndexerProvider, "getVtxos">;
+/**
+ * The contract-manager surface the lockup lookup needs: the registered
+ * contract and its VTXOs, in one read.
+ *
+ * Satisfied structurally by a real `ContractManager`
+ * (`await wallet.getContractManager()`), whose `getContractsWithVtxos`
+ * performs a best-effort provider sync on every read and serves repository
+ * state only when that sync failed retryably — recorded in `getSyncState()`,
+ * never silently. {@link findLockupVtxos} trusts this read.
+ */
+type LockupContractSource = Pick<IContractManager, "getContractsWithVtxos">;
 /** A still-refundable virtual output sitting at the swap lockup. */
 interface LockupVtxo {
     txid: string;
@@ -309,14 +318,9 @@ declare class LockupNeedsRecoveryError extends Error {
  * send, and refunding only `vtxos[0]` returns part of the money and strands
  * the rest at a script whose other refund paths are all longer.
  *
- * BOTH queries, because they are disjoint sets and `spendableOnly` alone goes
- * blind at exactly the wrong moment. A lockup whose batch expiry passed is
- * swept into the recoverable set, and this function exists to serve swaps that
- * sat unresolved — which are precisely the ones most likely to have got there.
- * Reading only the spendable set would report `nothing_to_refund` over money
- * that is still sitting at the script, which is worse than an error: it looks
- * like a resolved swap. `packages/boltz-swap` merges the same two queries for
- * the same reason (`arkade-swaps.ts`'s `refundableVtxos`).
+ * ONE read from the registered contract row (getContractsWithVtxos), not from the indexer by script.
+ * The row's isSwept flag is the authority on which outputs are swept-but-recoverable versus live-spendable,
+ * and hasTerminalSpend prunes already-consumed outputs before they reach the caller.
  *
  * **Visible is not the same as refundable.** A `recoverable` output cannot be
  * spent offchain at all — see {@link LockupVtxo.recoverable} — so this set is
@@ -324,12 +328,13 @@ declare class LockupNeedsRecoveryError extends Error {
  * That function refuses the recoverable ones by name rather than submitting a
  * spend the server must reject.
  *
- * **Unrolled outputs are the one exception, and are dropped.** A unilaterally
+ * **Unrolled and terminally spent outputs are dropped.** A unilaterally
  * exited output lives onchain behind its CSV; no offchain spend of any leaf can
  * reach it, and `LockupVtxo` carries no field to say so, so a caller could not
- * tell it apart from a live one. Whether arkd returns such an output under
- * `spendableOnly` is not determinable from here, so the exclusion is made
- * defensively rather than assumed. It costs the two waiting callers nothing
+ * tell it apart from a live one. The manager's rows carry the canonical facts
+ * (`isUnrolled`, `isSpent`, `spentBy`, `settledBy`), so both exclusions are
+ * exact rather than defensive — the same predicate (`hasTerminalSpend`) the
+ * wallet's own spend gate uses. It costs the two waiting callers nothing
  * they wanted: `awaitLockupFunding` keeps waiting for a claimable lockup
  * instead of publishing `P` into a spend that cannot land, and
  * `refundIfUnresolved` reports rather than grinding a doomed push to its
@@ -341,23 +346,33 @@ declare class LockupNeedsRecoveryError extends Error {
  * This read — not the RFQ's reported state — is the authority on whether
  * there is anything left at the lockup.
  *
- * **Not replaced by the contract manager's VTXO state, deliberately.** Once a
- * lockup is registered (see `RfqSwapManagerDeps.contracts`) the wallet tracks
- * these same outputs, and `getContractsWithVtxos` plus `canSpendOffchain` /
- * `canRecoverOnchain` would classify them. That is a WEAKER answer here on two
- * counts: it serves the wallet REPOSITORY, which a degraded sync will happily
- * hand back stale (`getSyncState()` reports `degraded` and returns cached rows
- * rather than failing), and its height-based expiry test needs a chain tip this
- * module does not have. The two queries below ask the indexer itself and need
- * neither. Ask-the-indexer, don't-trust-local-state — the same posture
- * {@link readLockupFate} takes, and for the same reason: this decides money.
+ * **Read from the contract manager, and trust it.** The lookup no longer asks
+ * the indexer by script: it reads the lockup's REGISTERED contract row
+ * (`getContractsWithVtxos`, see {@link LockupContractSource}) and trusts the
+ * answer. Two things make that safe, and both are the manager's to hold:
+ * the row must exist — registration writes it before the address can be
+ * funded (`requestLightningSend` / `requestOnchainSend` up front,
+ * `RfqSwapManager`'s `ensureRegistered` per pass for records made before that
+ * existed) — and the read must be fresh, which the manager's per-read
+ * best-effort sync provides; when only the repository answers, `getSyncState()`
+ * loudly says `degraded` instead of hiding it. An empty row for an
+ * unregistered or unfunded lockup is honored as-is: this module does not fall
+ * back to a script query behind the manager's back, so `RfqSwapManager` (which
+ * supplies the seam via `RfqSwapManagerDeps.contracts`) and standalone callers
+ * of {@link refundIfUnresolved} / {@link claimReceiveLockup} own the
+ * registration.
+ *
+ * {@link readLockupFate} is the mirror image, and deliberately so: the fate
+ * question needs the spending TRANSACTIONS' witnesses, which the manager does
+ * not expose — so it stays a direct indexer read while the money question
+ * (what is left here) is the manager's.
  */
-declare function findLockupVtxos(indexer: RefundIndexer, swapPkScript: Uint8Array): Promise<LockupVtxo[]>;
+declare function findLockupVtxos(contracts: LockupContractSource, swapPkScript: Uint8Array): Promise<LockupVtxo[]>;
 /**
  * The indexer surface the lockup-spend read needs: the vtxo lookup, plus the
  * raw transactions those vtxos were spent by. Same narrow-seam style as
- * {@link RefundIndexer} and `restore.ts`'s `RestoreIndexer`, and satisfied by
- * {@link RestIndexerProvider}.
+ * a direct read of {@link RestIndexerProvider}, unlike
+ * {@link LockupContractSource}'s contract-manager read.
  */
 type LockupSpendIndexer = Pick<RestIndexerProvider, "getVtxos" | "getVirtualTxs">;
 /**
@@ -454,8 +469,10 @@ type LockupFate =
  * it is scanned across every output rather than in outpoint order, so which
  * output happens to come first cannot change the answer.
  *
- * Ask-the-indexer, don't-trust-local-state: read fresh on every poll, never
- * cached, the same posture {@link findLockupVtxos} already establishes.
+ * Read fresh on every poll, never cached. {@link findLockupVtxos} has since
+ * moved to the contract manager's read, but this question needs the spending
+ * transactions' witnesses, which the manager does not expose — so the indexer
+ * seam stays.
  */
 declare function readLockupFate(indexer: LockupSpendIndexer, input: {
     swapPkScript: Uint8Array;
@@ -619,7 +636,7 @@ type RefundOutcome =
  * well past the deadline skips straight to the push, and a lockup that is
  * already empty comes back as `nothing_to_refund` instead of an error.
  */
-declare function refundIfUnresolved(transport: RfqTransport, ark: RefundArkProvider, indexer: LockupSpendIndexer, input: {
+declare function refundIfUnresolved(transport: RfqTransport, ark: RefundArkProvider, contracts: LockupContractSource, indexer: LockupSpendIndexer, input: {
     rfqId: string;
     script: InstanceType<typeof VHTLC.ScriptV2>;
     /** @see pushRefundWithoutReceiver */
@@ -1115,7 +1132,7 @@ interface RfqSwapManagerConfig {
  * seam style as {@link LockupSpendIndexer} and `refund.ts`'s
  * {@link RefundArkProvider}, and satisfied structurally by a real
  * `ContractManager` (`await wallet.getContractManager()`). */
-type SwapContractRegistry = Pick<IContractManager, "createContract" | "getContracts" | "onContractEvent" | "setContractWatchState">;
+type SwapContractRegistry = Pick<IContractManager, "createContract" | "getContracts" | "getContractsWithVtxos" | "onContractEvent" | "setContractWatchState">;
 /**
  * The record store the manager writes to, narrowed to the four RFQ methods —
  * the same seam style as {@link LockupSpendIndexer} and
@@ -1216,22 +1233,16 @@ interface RfqSwapManagerDeps {
      */
     repository?: RfqSwapRecordStore;
     /**
-     * The wallet's contract manager, when there is one. Optional in the same
-     * way {@link chain} is: a caller with no wallet, or one that only wants the
-     * timer, still gets a fully working manager — the subscription is a
-     * LATENCY optimization and nothing depends on it.
-     *
-     * Supplying it buys two things. The lockup gets REGISTERED, which is what
-     * puts it in the wallet's own contract set at all — a prerequisite for
-     * anything that has to act on the lockup before its batch expires, since an
-     * expired lockup is swept and loses every cooperative path. And the indexer
-     * PUSHES its funding and its spend, so a settlement is noticed when it
-     * happens rather than up to `pollIntervalMs` later.
+     * The wallet's contract manager. REQUIRED, because under contract-manager
+     * sourcing it is no longer only registration and push: the lockup's own
+     * VTXO state is read through `getContractsWithVtxos`, so the claim and
+     * refund paths cannot work without it and its contract row. The manager
+     * registers that row per pass (`ensureRegistered`).
      *
-     * Prefer `await wallet.getContractManager()` over constructing one, the way
-     * `createOffer` does.
+     * Prefer `await wallet.getContractManager()` over constructing one, the
+     * way `createOffer` does.
      */
-    contracts?: SwapContractRegistry;
+    contracts: SwapContractRegistry;
 }
 /**
  * Watches a set of live RFQ swaps and drives each to its end.
@@ -1959,4 +1970,4 @@ declare class InMemoryAssetSwapRepository implements AssetSwapRepository {
     [Symbol.asyncDispose](): Promise<void>;
 }
 
-export { isRfqSwapTerminal as $, type AssetSwapRepository as A, BTC_ASSET_ID as B, type RfqSwapActionName as C, type RfqSwapLockup as D, RfqSwapManager as E, type RfqSwapManagerCallbacks as F, type RfqSwapManagerConfig as G, type RfqSwapManagerDeps as H, InMemoryAssetSwapRepository as I, type RfqSwapManagerEvents as J, type RfqSwapOrigin as K, type LockupVtxo as L, type MarketsCacheEntry as M, RfqSwapOriginRequired as N, type OnchainSendAction as O, type PersistableRfqSwap as P, type RfqSwapOutcome as Q, type RfqSwapRecord as R, type SwapSecretsProjection as S, type RfqSwapRecordStore as T, type SwapContractRegistry as U, addAssetSwap as V, awaitRfqResolution as W, createRfqSwapRecord as X, findLockupVtxos as Y, getAssetSwaps as Z, getAssetSwapsOrThrow as _, type AssetSwap as a, isRfqTerminal as a0, nextOnchainAction as a1, preimageForSwapRecord as a2, pushRefundWithoutReceiver as a3, readLockupFate as a4, rebuildRfqSwap as a5, refundIfUnresolved as a6, rfqSwapOriginOf as a7, shouldRetainRfqSwap as a8, swapSecretsToRecord as a9, updateAssetSwap as aa, updateAssetSwapBestEffort as ab, updateRfqSwapRecord as ac, type RefundArkProvider as b, type RefundIndexer as c, type RfqSwap as d, type ArkadeRefundResult as e, type LockupSpendIndexer as f, type RfqSwapState as g, type AssetSwapStatus as h, type AvailableRfqSwapManagerCallbacks as i, type LightningReceiveSwap as j, type LightningSendSwap as k, type LockupFate as l, LockupNeedsRecoveryError as m, type LockupParams as n, type LockupSpend as o, type OnchainSendSwap as p, type PreimageBlockedReason as q, PreimageNotRecoverableError as r, REFUND_MTP_LAG_SECONDS as s, RFQ_RESOLVED_STATES as t, RFQ_SWAP_RETENTION_SECONDS as u, RFQ_SWAP_TERMINAL_STATES as v, type RefundOutcome as w, type RfqRestoreFailure as x, type RfqRestoreOptions as y, type RfqRestoreResult as z };
+export { isRfqSwapTerminal as $, type AssetSwapRepository as A, BTC_ASSET_ID as B, type RfqSwapActionName as C, type RfqSwapLockup as D, RfqSwapManager as E, type RfqSwapManagerCallbacks as F, type RfqSwapManagerConfig as G, type RfqSwapManagerDeps as H, InMemoryAssetSwapRepository as I, type RfqSwapManagerEvents as J, type RfqSwapOrigin as K, type LockupContractSource as L, type MarketsCacheEntry as M, RfqSwapOriginRequired as N, type OnchainSendAction as O, type PersistableRfqSwap as P, type RfqSwapOutcome as Q, type RfqSwapRecord as R, type SwapSecretsProjection as S, type RfqSwapRecordStore as T, type SwapContractRegistry as U, addAssetSwap as V, awaitRfqResolution as W, createRfqSwapRecord as X, findLockupVtxos as Y, getAssetSwaps as Z, getAssetSwapsOrThrow as _, type AssetSwap as a, isRfqTerminal as a0, nextOnchainAction as a1, preimageForSwapRecord as a2, pushRefundWithoutReceiver as a3, readLockupFate as a4, rebuildRfqSwap as a5, refundIfUnresolved as a6, rfqSwapOriginOf as a7, shouldRetainRfqSwap as a8, swapSecretsToRecord as a9, updateAssetSwap as aa, updateAssetSwapBestEffort as ab, updateRfqSwapRecord as ac, type RefundArkProvider as b, type LockupVtxo as c, type RfqSwap as d, type ArkadeRefundResult as e, type LockupSpendIndexer as f, type RfqSwapState as g, type AssetSwapStatus as h, type AvailableRfqSwapManagerCallbacks as i, type LightningReceiveSwap as j, type LightningSendSwap as k, type LockupFate as l, LockupNeedsRecoveryError as m, type LockupParams as n, type LockupSpend as o, type OnchainSendSwap as p, type PreimageBlockedReason as q, PreimageNotRecoverableError as r, REFUND_MTP_LAG_SECONDS as s, RFQ_RESOLVED_STATES as t, RFQ_SWAP_RETENTION_SECONDS as u, RFQ_SWAP_TERMINAL_STATES as v, type RefundOutcome as w, type RfqRestoreFailure as x, type RfqRestoreOptions as y, type RfqRestoreResult as z };

package/dist/{repository-BrTpVPLy.d.ts → repository-PNlTFdsj.d.ts}

@@ -1,5 +1,5 @@
 import { DiscoveredMarket } from '@arkade-os/solver-discovery';
-import { IWallet, ProvisionedKey, ProvisionedClaimSecret, RestArkProvider, RestIndexerProvider, VHTLC, Identity, IContractManager } from '@arkade-os/sdk';
+import { IWallet, ProvisionedKey, ProvisionedClaimSecret, RestArkProvider, IContractManager, RestIndexerProvider, VHTLC, Identity } from '@arkade-os/sdk';
 import { G as RfqStatus, R as RfqTransport, a as OnchainHtlc, f as ChainUtxo, C as ChainSource, v as OnchainHtlcPhase } from './rfq-B95nPfaa.js';
 
 type AssetSwapStatus = "pending" | "cancelling" | "fulfilled" | "cancelled" | "recoverable" | "awaiting_fill" | "claimable" | "claimed" | "refunded_l1";
@@ -213,8 +213,17 @@ declare function awaitRfqResolution(transport: RfqTransport, rfqId: string, opti
 /** The Ark surface the refund push needs — narrower than a full provider, and
  * satisfied by {@link RestArkProvider}. Same seam style as `RestoreIndexer`. */
 type RefundArkProvider = Pick<RestArkProvider, "getInfo" | "submitTx" | "finalizeTx">;
-/** The indexer surface the lockup lookup needs. */
-type RefundIndexer = Pick<RestIndexerProvider, "getVtxos">;
+/**
+ * The contract-manager surface the lockup lookup needs: the registered
+ * contract and its VTXOs, in one read.
+ *
+ * Satisfied structurally by a real `ContractManager`
+ * (`await wallet.getContractManager()`), whose `getContractsWithVtxos`
+ * performs a best-effort provider sync on every read and serves repository
+ * state only when that sync failed retryably — recorded in `getSyncState()`,
+ * never silently. {@link findLockupVtxos} trusts this read.
+ */
+type LockupContractSource = Pick<IContractManager, "getContractsWithVtxos">;
 /** A still-refundable virtual output sitting at the swap lockup. */
 interface LockupVtxo {
     txid: string;
@@ -309,14 +318,9 @@ declare class LockupNeedsRecoveryError extends Error {
  * send, and refunding only `vtxos[0]` returns part of the money and strands
  * the rest at a script whose other refund paths are all longer.
  *
- * BOTH queries, because they are disjoint sets and `spendableOnly` alone goes
- * blind at exactly the wrong moment. A lockup whose batch expiry passed is
- * swept into the recoverable set, and this function exists to serve swaps that
- * sat unresolved — which are precisely the ones most likely to have got there.
- * Reading only the spendable set would report `nothing_to_refund` over money
- * that is still sitting at the script, which is worse than an error: it looks
- * like a resolved swap. `packages/boltz-swap` merges the same two queries for
- * the same reason (`arkade-swaps.ts`'s `refundableVtxos`).
+ * ONE read from the registered contract row (getContractsWithVtxos), not from the indexer by script.
+ * The row's isSwept flag is the authority on which outputs are swept-but-recoverable versus live-spendable,
+ * and hasTerminalSpend prunes already-consumed outputs before they reach the caller.
  *
  * **Visible is not the same as refundable.** A `recoverable` output cannot be
  * spent offchain at all — see {@link LockupVtxo.recoverable} — so this set is
@@ -324,12 +328,13 @@ declare class LockupNeedsRecoveryError extends Error {
  * That function refuses the recoverable ones by name rather than submitting a
  * spend the server must reject.
  *
- * **Unrolled outputs are the one exception, and are dropped.** A unilaterally
+ * **Unrolled and terminally spent outputs are dropped.** A unilaterally
  * exited output lives onchain behind its CSV; no offchain spend of any leaf can
  * reach it, and `LockupVtxo` carries no field to say so, so a caller could not
- * tell it apart from a live one. Whether arkd returns such an output under
- * `spendableOnly` is not determinable from here, so the exclusion is made
- * defensively rather than assumed. It costs the two waiting callers nothing
+ * tell it apart from a live one. The manager's rows carry the canonical facts
+ * (`isUnrolled`, `isSpent`, `spentBy`, `settledBy`), so both exclusions are
+ * exact rather than defensive — the same predicate (`hasTerminalSpend`) the
+ * wallet's own spend gate uses. It costs the two waiting callers nothing
  * they wanted: `awaitLockupFunding` keeps waiting for a claimable lockup
  * instead of publishing `P` into a spend that cannot land, and
  * `refundIfUnresolved` reports rather than grinding a doomed push to its
@@ -341,23 +346,33 @@ declare class LockupNeedsRecoveryError extends Error {
  * This read — not the RFQ's reported state — is the authority on whether
  * there is anything left at the lockup.
  *
- * **Not replaced by the contract manager's VTXO state, deliberately.** Once a
- * lockup is registered (see `RfqSwapManagerDeps.contracts`) the wallet tracks
- * these same outputs, and `getContractsWithVtxos` plus `canSpendOffchain` /
- * `canRecoverOnchain` would classify them. That is a WEAKER answer here on two
- * counts: it serves the wallet REPOSITORY, which a degraded sync will happily
- * hand back stale (`getSyncState()` reports `degraded` and returns cached rows
- * rather than failing), and its height-based expiry test needs a chain tip this
- * module does not have. The two queries below ask the indexer itself and need
- * neither. Ask-the-indexer, don't-trust-local-state — the same posture
- * {@link readLockupFate} takes, and for the same reason: this decides money.
+ * **Read from the contract manager, and trust it.** The lookup no longer asks
+ * the indexer by script: it reads the lockup's REGISTERED contract row
+ * (`getContractsWithVtxos`, see {@link LockupContractSource}) and trusts the
+ * answer. Two things make that safe, and both are the manager's to hold:
+ * the row must exist — registration writes it before the address can be
+ * funded (`requestLightningSend` / `requestOnchainSend` up front,
+ * `RfqSwapManager`'s `ensureRegistered` per pass for records made before that
+ * existed) — and the read must be fresh, which the manager's per-read
+ * best-effort sync provides; when only the repository answers, `getSyncState()`
+ * loudly says `degraded` instead of hiding it. An empty row for an
+ * unregistered or unfunded lockup is honored as-is: this module does not fall
+ * back to a script query behind the manager's back, so `RfqSwapManager` (which
+ * supplies the seam via `RfqSwapManagerDeps.contracts`) and standalone callers
+ * of {@link refundIfUnresolved} / {@link claimReceiveLockup} own the
+ * registration.
+ *
+ * {@link readLockupFate} is the mirror image, and deliberately so: the fate
+ * question needs the spending TRANSACTIONS' witnesses, which the manager does
+ * not expose — so it stays a direct indexer read while the money question
+ * (what is left here) is the manager's.
  */
-declare function findLockupVtxos(indexer: RefundIndexer, swapPkScript: Uint8Array): Promise<LockupVtxo[]>;
+declare function findLockupVtxos(contracts: LockupContractSource, swapPkScript: Uint8Array): Promise<LockupVtxo[]>;
 /**
  * The indexer surface the lockup-spend read needs: the vtxo lookup, plus the
  * raw transactions those vtxos were spent by. Same narrow-seam style as
- * {@link RefundIndexer} and `restore.ts`'s `RestoreIndexer`, and satisfied by
- * {@link RestIndexerProvider}.
+ * a direct read of {@link RestIndexerProvider}, unlike
+ * {@link LockupContractSource}'s contract-manager read.
  */
 type LockupSpendIndexer = Pick<RestIndexerProvider, "getVtxos" | "getVirtualTxs">;
 /**
@@ -454,8 +469,10 @@ type LockupFate =
  * it is scanned across every output rather than in outpoint order, so which
  * output happens to come first cannot change the answer.
  *
- * Ask-the-indexer, don't-trust-local-state: read fresh on every poll, never
- * cached, the same posture {@link findLockupVtxos} already establishes.
+ * Read fresh on every poll, never cached. {@link findLockupVtxos} has since
+ * moved to the contract manager's read, but this question needs the spending
+ * transactions' witnesses, which the manager does not expose — so the indexer
+ * seam stays.
  */
 declare function readLockupFate(indexer: LockupSpendIndexer, input: {
     swapPkScript: Uint8Array;
@@ -619,7 +636,7 @@ type RefundOutcome =
  * well past the deadline skips straight to the push, and a lockup that is
  * already empty comes back as `nothing_to_refund` instead of an error.
  */
-declare function refundIfUnresolved(transport: RfqTransport, ark: RefundArkProvider, indexer: LockupSpendIndexer, input: {
+declare function refundIfUnresolved(transport: RfqTransport, ark: RefundArkProvider, contracts: LockupContractSource, indexer: LockupSpendIndexer, input: {
     rfqId: string;
     script: InstanceType<typeof VHTLC.ScriptV2>;
     /** @see pushRefundWithoutReceiver */
@@ -1115,7 +1132,7 @@ interface RfqSwapManagerConfig {
  * seam style as {@link LockupSpendIndexer} and `refund.ts`'s
  * {@link RefundArkProvider}, and satisfied structurally by a real
  * `ContractManager` (`await wallet.getContractManager()`). */
-type SwapContractRegistry = Pick<IContractManager, "createContract" | "getContracts" | "onContractEvent" | "setContractWatchState">;
+type SwapContractRegistry = Pick<IContractManager, "createContract" | "getContracts" | "getContractsWithVtxos" | "onContractEvent" | "setContractWatchState">;
 /**
  * The record store the manager writes to, narrowed to the four RFQ methods —
  * the same seam style as {@link LockupSpendIndexer} and
@@ -1216,22 +1233,16 @@ interface RfqSwapManagerDeps {
      */
     repository?: RfqSwapRecordStore;
     /**
-     * The wallet's contract manager, when there is one. Optional in the same
-     * way {@link chain} is: a caller with no wallet, or one that only wants the
-     * timer, still gets a fully working manager — the subscription is a
-     * LATENCY optimization and nothing depends on it.
-     *
-     * Supplying it buys two things. The lockup gets REGISTERED, which is what
-     * puts it in the wallet's own contract set at all — a prerequisite for
-     * anything that has to act on the lockup before its batch expires, since an
-     * expired lockup is swept and loses every cooperative path. And the indexer
-     * PUSHES its funding and its spend, so a settlement is noticed when it
-     * happens rather than up to `pollIntervalMs` later.
+     * The wallet's contract manager. REQUIRED, because under contract-manager
+     * sourcing it is no longer only registration and push: the lockup's own
+     * VTXO state is read through `getContractsWithVtxos`, so the claim and
+     * refund paths cannot work without it and its contract row. The manager
+     * registers that row per pass (`ensureRegistered`).
      *
-     * Prefer `await wallet.getContractManager()` over constructing one, the way
-     * `createOffer` does.
+     * Prefer `await wallet.getContractManager()` over constructing one, the
+     * way `createOffer` does.
      */
-    contracts?: SwapContractRegistry;
+    contracts: SwapContractRegistry;
 }
 /**
  * Watches a set of live RFQ swaps and drives each to its end.
@@ -1959,4 +1970,4 @@ declare class InMemoryAssetSwapRepository implements AssetSwapRepository {
     [Symbol.asyncDispose](): Promise<void>;
 }
 
-export { isRfqSwapTerminal as $, type AssetSwapRepository as A, BTC_ASSET_ID as B, type RfqSwapActionName as C, type RfqSwapLockup as D, RfqSwapManager as E, type RfqSwapManagerCallbacks as F, type RfqSwapManagerConfig as G, type RfqSwapManagerDeps as H, InMemoryAssetSwapRepository as I, type RfqSwapManagerEvents as J, type RfqSwapOrigin as K, type LockupVtxo as L, type MarketsCacheEntry as M, RfqSwapOriginRequired as N, type OnchainSendAction as O, type PersistableRfqSwap as P, type RfqSwapOutcome as Q, type RfqSwapRecord as R, type SwapSecretsProjection as S, type RfqSwapRecordStore as T, type SwapContractRegistry as U, addAssetSwap as V, awaitRfqResolution as W, createRfqSwapRecord as X, findLockupVtxos as Y, getAssetSwaps as Z, getAssetSwapsOrThrow as _, type AssetSwap as a, isRfqTerminal as a0, nextOnchainAction as a1, preimageForSwapRecord as a2, pushRefundWithoutReceiver as a3, readLockupFate as a4, rebuildRfqSwap as a5, refundIfUnresolved as a6, rfqSwapOriginOf as a7, shouldRetainRfqSwap as a8, swapSecretsToRecord as a9, updateAssetSwap as aa, updateAssetSwapBestEffort as ab, updateRfqSwapRecord as ac, type RefundArkProvider as b, type RefundIndexer as c, type RfqSwap as d, type ArkadeRefundResult as e, type LockupSpendIndexer as f, type RfqSwapState as g, type AssetSwapStatus as h, type AvailableRfqSwapManagerCallbacks as i, type LightningReceiveSwap as j, type LightningSendSwap as k, type LockupFate as l, LockupNeedsRecoveryError as m, type LockupParams as n, type LockupSpend as o, type OnchainSendSwap as p, type PreimageBlockedReason as q, PreimageNotRecoverableError as r, REFUND_MTP_LAG_SECONDS as s, RFQ_RESOLVED_STATES as t, RFQ_SWAP_RETENTION_SECONDS as u, RFQ_SWAP_TERMINAL_STATES as v, type RefundOutcome as w, type RfqRestoreFailure as x, type RfqRestoreOptions as y, type RfqRestoreResult as z };
+export { isRfqSwapTerminal as $, type AssetSwapRepository as A, BTC_ASSET_ID as B, type RfqSwapActionName as C, type RfqSwapLockup as D, RfqSwapManager as E, type RfqSwapManagerCallbacks as F, type RfqSwapManagerConfig as G, type RfqSwapManagerDeps as H, InMemoryAssetSwapRepository as I, type RfqSwapManagerEvents as J, type RfqSwapOrigin as K, type LockupContractSource as L, type MarketsCacheEntry as M, RfqSwapOriginRequired as N, type OnchainSendAction as O, type PersistableRfqSwap as P, type RfqSwapOutcome as Q, type RfqSwapRecord as R, type SwapSecretsProjection as S, type RfqSwapRecordStore as T, type SwapContractRegistry as U, addAssetSwap as V, awaitRfqResolution as W, createRfqSwapRecord as X, findLockupVtxos as Y, getAssetSwaps as Z, getAssetSwapsOrThrow as _, type AssetSwap as a, isRfqTerminal as a0, nextOnchainAction as a1, preimageForSwapRecord as a2, pushRefundWithoutReceiver as a3, readLockupFate as a4, rebuildRfqSwap as a5, refundIfUnresolved as a6, rfqSwapOriginOf as a7, shouldRetainRfqSwap as a8, swapSecretsToRecord as a9, updateAssetSwap as aa, updateAssetSwapBestEffort as ab, updateRfqSwapRecord as ac, type RefundArkProvider as b, type LockupVtxo as c, type RfqSwap as d, type ArkadeRefundResult as e, type LockupSpendIndexer as f, type RfqSwapState as g, type AssetSwapStatus as h, type AvailableRfqSwapManagerCallbacks as i, type LightningReceiveSwap as j, type LightningSendSwap as k, type LockupFate as l, LockupNeedsRecoveryError as m, type LockupParams as n, type LockupSpend as o, type OnchainSendSwap as p, type PreimageBlockedReason as q, PreimageNotRecoverableError as r, REFUND_MTP_LAG_SECONDS as s, RFQ_RESOLVED_STATES as t, RFQ_SWAP_RETENTION_SECONDS as u, RFQ_SWAP_TERMINAL_STATES as v, type RefundOutcome as w, type RfqRestoreFailure as x, type RfqRestoreOptions as y, type RfqRestoreResult as z };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@arkade-os/swap",
-  "version": "0.0.20",
+  "version": "0.0.22",
   "type": "module",
   "description": "Client-side Arkade Intents asset swaps: discover markets, quote, create/track/cancel offers, restore from chain.",
   "repository": {
@@ -70,7 +70,7 @@
     "@noble/hashes": "2.0.1",
     "@scure/base": "2.0.0",
     "@scure/btc-signer": "2.0.1",
-    "@arkade-os/sdk": "0.4.74"
+    "@arkade-os/sdk": "0.4.76"
   },
   "peerDependencies": {
     "nostr-tools": "^2.12.0"