@arkade-os/swap 0.0.10 → 0.0.12

package/dist/index.cjs

@@ -66,6 +66,8 @@ __export(index_exports, {
   RfqSwapManager: () => RfqSwapManager,
   RfqSwapOriginRequired: () => RfqSwapOriginRequired,
   SOLO_REFUND_HEADROOM_SECONDS: () => SOLO_REFUND_HEADROOM_SECONDS,
+  SOLVER_LIGHTNING_RAIL: () => SOLVER_LIGHTNING_RAIL,
+  SOLVER_ONCHAIN_RAIL: () => SOLVER_ONCHAIN_RAIL,
   SWAP_LOCKUP_CONTRACT_KIND: () => SWAP_LOCKUP_CONTRACT_KIND,
   SWAP_LOCKUP_CONTRACT_LABEL: () => SWAP_LOCKUP_CONTRACT_LABEL,
   SWAP_LOCKUP_CONTRACT_TYPE: () => SWAP_LOCKUP_CONTRACT_TYPE,
@@ -82,6 +84,7 @@ __export(index_exports, {
   buildHtlcClaim: () => buildHtlcClaim,
   buildHtlcRefund: () => buildHtlcRefund,
   cancelOffer: () => cancelOffer,
+  chainSourceFrom: () => chainSourceFrom,
   claimOnchainFill: () => claimOnchainFill,
   claimReceiveLockup: () => claimReceiveLockup,
   classifyDepositSpend: () => classifyDepositSpend,
@@ -103,6 +106,7 @@ __export(index_exports, {
   httpTransport: () => httpTransport,
   isRfqSwapTerminal: () => isRfqSwapTerminal,
   isRfqTerminal: () => isRfqTerminal,
+  l1ScriptForAddress: () => l1ScriptForAddress,
   lightningReceiveRequest: () => lightningReceiveRequest,
   lightningSendRequest: () => lightningSendRequest,
   lightningSendVtxoScript: () => lightningSendVtxoScript,
@@ -142,6 +146,11 @@ __export(index_exports, {
   sealClaimPacket: () => sealClaimPacket,
   senderIdentityForSwapRecord: () => senderIdentityForSwapRecord,
   shouldRetainRfqSwap: () => shouldRetainRfqSwap,
+  solverLightningRail: () => solverLightningRail,
+  solverLightningRendezvous: () => solverLightningRendezvous,
+  solverOnchainRail: () => solverOnchainRail,
+  solverOnchainRendezvous: () => solverOnchainRendezvous,
+  solverRendezvous: () => solverRendezvous,
   spendTxidsOf: () => spendTxidsOf,
   spendUpdate: () => spendUpdate,
   swapActivityResolver: () => swapActivityResolver,
@@ -411,12 +420,30 @@ var swapPrograms = {
   wantAsset: import_sdk2.arkade.parseArtifact(swap_want_asset_program_default),
   wantBtc: import_sdk2.arkade.parseArtifact(swap_want_btc_program_default)
 };
+function withExitClosure(program, exit) {
+  if (!exit) return program;
+  return {
+    ...program,
+    // typed params are authoritative: an undeclared `$exitDelay` fails
+    // validateProgram instead of compiling against an unbound value
+    params: [...program.params ?? [], { name: "exitDelay", type: "int" }],
+    functions: {
+      ...program.functions,
+      exit: {
+        tapscript: { signers: ["$user"], csv: { type: exit.type, value: "$exitDelay" } }
+      }
+    }
+  };
+}
 function swapProgramBinding(offer, serverPubkey) {
   if (offer.makerPkScript.length !== FIELDS.makerPkScript.width) {
     throw new Error("makerPkScript is not a 34-byte taproot scriptPubKey");
   }
   return {
-    program: offer.wantAsset ? swapPrograms.wantAsset : swapPrograms.wantBtc,
+    program: withExitClosure(
+      offer.wantAsset ? swapPrograms.wantAsset : swapPrograms.wantBtc,
+      offer.exitDelay
+    ),
     args: {
       makerWP: offer.makerPkScript.subarray(2),
       wantAmount: offer.wantAmount,
@@ -426,7 +453,8 @@ function swapProgramBinding(offer, serverPubkey) {
       ...offer.wantAsset && {
         wantAssetTxid: offer.wantAsset.txid.slice().reverse(),
         wantAssetGroupIndex: offer.wantAsset.groupIndex
-      }
+      },
+      ...offer.exitDelay && { exitDelay: offer.exitDelay.value }
     },
     keys: {
       serverKey: serverPubkey,
@@ -447,9 +475,27 @@ var FIELDS = {
   makerPkScript: { tag: 5, width: 34 },
   makerPublicKey: { tag: 7, width: 32 },
   emulatorPubkey: { tag: 8, width: 32 },
-  offerAsset: { tag: 11, width: void 0 }
+  ratioNum: { tag: 9, width: 8 },
+  ratioDen: { tag: 10, width: 8 },
+  offerAsset: { tag: 11, width: void 0 },
+  exitTimelock: { tag: 12, width: 9 }
 };
+var EXIT_TYPES = ["blocks", "seconds"];
 var NAMES = Object.fromEntries(Object.entries(FIELDS).map(([k, f]) => [f.tag, k]));
+function u64(name, value) {
+  if (value < BigInt(0) || value >> BigInt(64) > BigInt(0)) {
+    throw new Error(`${name} does not fit the offer wire format (u64)`);
+  }
+  const out = new Uint8Array(FIELDS.wantAmount.width);
+  new DataView(out.buffer).setBigUint64(0, value, false);
+  return out;
+}
+var readU64 = (value) => new DataView(value.buffer, value.byteOffset).getBigUint64(0, false);
+var setRatio = (name, value) => {
+  if (value === void 0 || value === BigInt(0)) return void 0;
+  if (value < BigInt(0)) throw new Error(`${name} does not fit the offer wire format (u64)`);
+  return value;
+};
 function tlv(type, value) {
   if (value.length > 65535) throw new Error("TLV value exceeds the u16 length field");
   return (0, import_utils.concatBytes)(Uint8Array.of(type, value.length >> 8 & 255, value.length & 255), value);
@@ -468,24 +514,45 @@ function encodeOffer(offer) {
       throw new Error(`${name} must be ${FIELDS[name].width} bytes`);
     }
   }
-  if (offer.wantAmount < BigInt(0) || offer.wantAmount >> BigInt(64) > BigInt(0)) {
-    throw new Error("wantAmount does not fit the offer wire format (u64)");
+  const ratioNum = setRatio("ratioNum", offer.ratioNum);
+  const ratioDen = setRatio("ratioDen", offer.ratioDen);
+  if (ratioNum === void 0 !== (ratioDen === void 0)) {
+    throw new Error("offer must carry both ratioNum and ratioDen, or neither");
   }
-  const amount = new Uint8Array(FIELDS.wantAmount.width);
-  new DataView(amount.buffer).setBigUint64(0, offer.wantAmount, false);
   const recs = [
     tlv(FIELDS.swapPkScript.tag, offer.swapPkScript),
-    tlv(FIELDS.wantAmount.tag, amount)
+    tlv(FIELDS.wantAmount.tag, u64("wantAmount", offer.wantAmount))
   ];
   if (offer.wantAsset) recs.push(tlv(FIELDS.wantAsset.tag, offer.wantAsset.serialize()));
+  if (ratioNum !== void 0) recs.push(tlv(FIELDS.ratioNum.tag, u64("ratioNum", ratioNum)));
+  if (ratioDen !== void 0) recs.push(tlv(FIELDS.ratioDen.tag, u64("ratioDen", ratioDen)));
   if (offer.offerAsset) recs.push(tlv(FIELDS.offerAsset.tag, offer.offerAsset.serialize()));
   recs.push(
     tlv(FIELDS.makerPkScript.tag, offer.makerPkScript),
     tlv(FIELDS.makerPublicKey.tag, offer.makerPublicKey),
     tlv(FIELDS.emulatorPubkey.tag, offer.emulatorPubkey)
   );
+  if (offer.exitDelay) recs.push(tlv(FIELDS.exitTimelock.tag, encodeExitDelay(offer.exitDelay)));
   return (0, import_utils.concatBytes)(...recs);
 }
+function encodeExitDelay(exit) {
+  return (0, import_utils.concatBytes)(
+    Uint8Array.of(EXIT_TYPES.indexOf(assertExitDelay(exit).type)),
+    u64("exitDelay", exit.value)
+  );
+}
+function assertExitDelay(exit) {
+  if (EXIT_TYPES.indexOf(exit.type) < 0) {
+    throw new Error(`unknown exitDelay locktime type: ${exit.type}`);
+  }
+  if (exit.value <= BigInt(0)) {
+    throw new Error("exitDelay must be a positive relative locktime");
+  }
+  if (exit.value >> BigInt(32) > BigInt(0)) {
+    throw new Error("exitDelay does not fit the locktime field (u32)");
+  }
+  return exit;
+}
 function decodeOffer(data) {
   const fields = {};
   let off = 0;
@@ -505,6 +572,12 @@ function decodeOffer(data) {
   for (const name of ["wantAsset", "offerAsset"]) {
     if (fields[name]?.length === 0) throw new Error(`missing/invalid ${name}`);
   }
+  for (const [name, value] of Object.entries(fields)) {
+    const width = FIELDS[name].width;
+    if (width !== void 0 && value.length !== width) {
+      throw new Error(`missing/invalid ${name}`);
+    }
+  }
   const need = (name) => {
     const v = fields[name];
     const len = FIELDS[name].width;
@@ -516,16 +589,36 @@ function decodeOffer(data) {
   if (Boolean(fields.wantAsset) === Boolean(fields.offerAsset)) {
     throw new Error("offer must carry exactly one of wantAsset or offerAsset");
   }
+  const readRatio = (name) => {
+    const raw = fields[name];
+    if (!raw) return void 0;
+    const value = readU64(raw);
+    if (value === BigInt(0)) throw new Error(`missing/invalid ${name}`);
+    return value;
+  };
+  const ratioNum = readRatio("ratioNum");
+  const ratioDen = readRatio("ratioDen");
+  if (ratioNum === void 0 !== (ratioDen === void 0)) {
+    throw new Error("offer must carry both ratioNum and ratioDen, or neither");
+  }
   return {
     swapPkScript: need("swapPkScript"),
-    wantAmount: new DataView(amount.buffer, amount.byteOffset).getBigUint64(0, false),
+    wantAmount: readU64(amount),
     ...fields.wantAsset && { wantAsset: import_sdk2.asset.AssetId.fromBytes(fields.wantAsset) },
     ...fields.offerAsset && { offerAsset: import_sdk2.asset.AssetId.fromBytes(fields.offerAsset) },
     makerPkScript: need("makerPkScript"),
     makerPublicKey: need("makerPublicKey"),
-    emulatorPubkey: need("emulatorPubkey")
+    emulatorPubkey: need("emulatorPubkey"),
+    ...ratioNum !== void 0 && { ratioNum },
+    ...ratioDen !== void 0 && { ratioDen },
+    ...fields.exitTimelock && { exitDelay: decodeExitDelay(fields.exitTimelock) }
   };
 }
+function decodeExitDelay(value) {
+  const type = EXIT_TYPES[value[0]];
+  if (!type) throw new Error(`unknown exitDelay locktime type: 0x${value[0].toString(16)}`);
+  return { type, value: readU64(value.subarray(1)) };
+}
 var OFFER_CONTRACT_LABEL = "Arkade swap offer";
 var OFFER_CONTRACT_KIND = "asset-swap-offer";
 async function registerOfferContract(wallet, arkServerUrl, network, binding, serverPubkey, expectedPkScript) {
@@ -551,6 +644,14 @@ async function registerOfferContract(wallet, arkServerUrl, network, binding, ser
   });
   await promoteOfferContract(contractManager, import_base2.hex.encode(expectedPkScript));
 }
+function serverExitDelay(delay) {
+  if (typeof delay !== "bigint" || delay <= BigInt(0)) {
+    throw new Error(
+      "the server reports no usable unilateralExitDelay; pass `exitDelay` to set the offer's exit closure explicitly, or `noExit: true` to publish without one"
+    );
+  }
+  return assertExitDelay({ value: delay, type: delay < BigInt(512) ? "blocks" : "seconds" });
+}
 async function createOffer(wallet, arkServerUrl, params) {
   if (Boolean(params.wantAsset) === Boolean(params.offerAsset)) {
     throw new Error("set exactly one of wantAsset (BTC->asset) or offerAsset (asset->BTC)");
@@ -571,7 +672,11 @@ async function createOffer(wallet, arkServerUrl, params) {
     offerAsset: params.offerAsset,
     makerPkScript: import_sdk2.ArkAddress.decode(makerAddress).pkScript,
     makerPublicKey,
-    emulatorPubkey: emuKey
+    emulatorPubkey: emuKey,
+    // checked HERE, before the covenant is derived and registered below:
+    // deferring it to `encodeOffer` leaves a registered contract behind for
+    // an offer that then fails to encode. @see assertExitDelay
+    exitDelay: params.noExit ? void 0 : params.exitDelay ? assertExitDelay(params.exitDelay) : serverExitDelay(info.unilateralExitDelay)
   };
   const script = offerVtxoScript(binding, serverPubKey);
   const offer = { ...binding, swapPkScript: script.pkScript };
@@ -1062,6 +1167,7 @@ var L1_NETWORKS = {
   testnet: btc.TEST_NETWORK,
   regtest: { ...btc.TEST_NETWORK, bech32: "bcrt" }
 };
+var l1ScriptForAddress = (address, network) => btc.OutScript.encode(btc.Address(L1_NETWORKS[network]).decode(address));
 function onchainHtlcScript(params, network) {
   if (params.claimKey.length !== 32 || params.refundKey.length !== 32) {
     throw new Error("claimKey and refundKey must be 32-byte x-only keys");
@@ -1244,7 +1350,11 @@ async function classifyOnchainHtlc(chain, input) {
   const best = utxos.sort((a, b) => b.amount > a.amount ? 1 : -1)[0];
   if (!best) {
     if (!input.funding) return { phase: "unfunded" };
-    const spend = await chain.getSpendingTx(input.funding.txid, input.funding.vout);
+    const spend = await chain.getSpendingTx(
+      input.funding.txid,
+      input.funding.vout,
+      input.htlc.pkScript
+    );
     if (!spend) return { phase: "unfunded" };
     const preimage = extractPreimage(spend.txHex, input.htlc.paymentHash);
     const txid = btc.Transaction.fromRaw(import_base3.hex.decode(spend.txHex), {
@@ -1303,7 +1413,8 @@ function onchainSendProfile(result) {
     htlcLocktime: result.htlcParams.refundLocktime,
     network: result.l1Network,
     htlcAddress: result.htlc.address,
-    minConfirmations: result.minConfirmations
+    minConfirmations: result.minConfirmations,
+    payoutPkScript: import_base4.hex.encode(result.payoutPkScript)
   };
 }
 var OnchainSendCorridor = {
@@ -1352,6 +1463,9 @@ var OnchainSendCorridor = {
       paymentHash,
       htlc,
       minConfirmations: profile.minConfirmations,
+      // Optional here, required at the write: throwing on an older
+      // record would strand the refund it is still owed.
+      ...profile.payoutPkScript ? { payoutPkScript: import_base4.hex.decode(profile.payoutPkScript) } : {},
       ...profile.funding ? { funding: profile.funding } : {},
       ...profile.claimTxid ? { claimTxid: profile.claimTxid } : {}
     };
@@ -1512,7 +1626,9 @@ function classifySpend(offer, serverPubkey, spendTx, deposit) {
     const script = offerVtxoScript(offer, serverPubkey);
     if (import_base6.hex.encode(script.pkScript) !== import_base6.hex.encode(offer.swapPkScript)) return "indeterminate";
     leaves = {
-      cancel: script.functionByName("cancel")?.leafScript,
+      // both routes that hand the deposit back; `exit` is absent on an
+      // offer that carries no exit closure, and drops out here
+      returned: ["cancel", "exit"].map((name) => script.functionByName(name)?.leafScript).filter((leaf) => leaf !== void 0),
       fulfill: script.functionByName("fulfill")?.leafScript
     };
   } catch {
@@ -1524,7 +1640,7 @@ function classifySpend(offer, serverPubkey, spendTx, deposit) {
     if (import_base6.hex.encode(input.txid) !== deposit.txid) continue;
     for (const leaf of input.tapLeafScript ?? []) {
       const spent = import_base6.hex.encode((0, import_sdk6.scriptFromTapLeafScript)(leaf));
-      if (leaves.cancel && spent === import_base6.hex.encode(leaves.cancel)) return "cancelled";
+      if (leaves.returned.some((back) => spent === import_base6.hex.encode(back))) return "cancelled";
       if (leaves.fulfill && spent === import_base6.hex.encode(leaves.fulfill)) return "fulfilled";
     }
   }
@@ -1918,8 +2034,22 @@ var assertPairLength = (pair) => {
 };
 var verifyLockupAddress = (quote, derivedAddress) => {
   const quoted = quote.profile?.lockup_address;
-  if (derivedAddress !== quoted) throw new AddressMismatch(derivedAddress, quoted);
-  return derivedAddress;
+  const candidates = Array.isArray(derivedAddress) ? derivedAddress : [derivedAddress];
+  const matched = candidates.find((address) => address === quoted);
+  if (matched === void 0) throw new AddressMismatch(candidates, quoted);
+  return matched;
+};
+var LOCKUP_SHAPE_VARIANTS = [void 0, "preTimelockedRefund"];
+var matchQuotedLockup = (quote, hrp, serverPubkey, build) => {
+  const candidates = LOCKUP_SHAPE_VARIANTS.map((legacy) => {
+    const script = build(legacy);
+    return { script, address: script.address(hrp, serverPubkey).encode(), legacy };
+  });
+  const matchedAddress = verifyLockupAddress(
+    quote,
+    candidates.map((candidate) => candidate.address)
+  );
+  return candidates.find((candidate) => candidate.address === matchedAddress);
 };
 var assertFundable = (input) => {
   const fail = (reason, message) => {
@@ -1933,6 +2063,43 @@ var assertFundable = (input) => {
   if (input.quote.refund_locktime !== void 0 && input.quote.refund_locktime - input.now < MIN_HEADROOM_SECONDS) {
     fail("insufficient_headroom", "refund deadline headroom below 90 minutes");
   }
+  if (input.maxFee) {
+    const { bps, sats, referenceRate } = input.maxFee;
+    if (bps === void 0 && sats === void 0) {
+      fail("max_fee_unbounded", "maxFee names neither bps nor sats");
+    }
+    if (bps !== void 0 && (!Number.isInteger(bps) || bps < 0 || bps > 1e4)) {
+      fail("max_fee_out_of_range", `maxFee.bps must be an integer in 0..10000, got ${bps}`);
+    }
+    if (sats !== void 0 && (!Number.isInteger(sats) || sats < 0)) {
+      fail("max_fee_out_of_range", `maxFee.sats must be a non-negative integer, got ${sats}`);
+    }
+    const legs = input.quote.pair.split("->");
+    const assetOf = (leg) => leg.slice(leg.indexOf(":") + 1);
+    const sameAsset = legs.length === 2 && assetOf(legs[0]) === assetOf(legs[1]);
+    if (!sameAsset && referenceRate === void 0) {
+      fail(
+        "fee_gate_unavailable",
+        `maxFee cannot gate ${input.quote.pair}: its legs name different assets, so from_amount - to_amount is not a fee. Supply maxFee.referenceRate (to-units per from-unit) from a source of your OWN \u2014 reading it off the solver's published feed would check the solver against its own number`
+      );
+    }
+    if (!sameAsset && (!Number.isFinite(referenceRate) || referenceRate <= 0)) {
+      fail(
+        "max_fee_out_of_range",
+        `maxFee.referenceRate must be a positive finite number, got ${referenceRate}`
+      );
+    }
+    const fee = sameAsset ? input.quote.from_amount - input.quote.to_amount : Math.ceil(
+      (input.quote.from_amount * referenceRate - input.quote.to_amount) / referenceRate
+    );
+    const allowed = Math.max(
+      sats ?? 0,
+      Math.floor(input.quote.from_amount * (bps ?? 0) / 1e4)
+    );
+    if (fee > allowed) {
+      fail("fee_too_high", `fee ${fee} exceeds the ${allowed} this client allows`);
+    }
+  }
   if (input.onchain) {
     const { htlcLocktime, minConfirmations, direction } = input.onchain;
     if (!Number.isInteger(minConfirmations) || minConfirmations < 1 || minConfirmations > MAX_MIN_CONFIRMATIONS) {
@@ -2121,13 +2288,11 @@ function lightningSendVtxoScript(params) {
     unilateralRefundWithoutReceiverDelay: seconds(
       unilateralRefundWithoutReceiverDelay(params.claimDelay)
     ),
-    nonInteractiveClaim: {
+    nonInteractiveParameters: {
       receiverPkScript: params.receiverPkScript,
-      emulatorPubkey: params.emulatorPubkey
-    },
-    nonInteractiveRefund: {
       senderPkScript: params.refundPkScript,
-      emulatorPubkey: params.emulatorPubkey
+      emulatorPubkey: params.emulatorPubkey,
+      ...params.legacy !== void 0 && { legacy: params.legacy }
     }
   });
 }
@@ -2173,9 +2338,18 @@ async function requestLightningSend(wallet, arkServerUrl, transport, params) {
     receiverPkScript: solverHex(receiverPkScriptHex, "profile.receiver_pk_script"),
     refundPkScript: secrets.pkScript
   };
-  const script = lightningSendVtxoScript(treeParams);
-  const address = script.address(network.hrp, serverPubkey).encode();
-  verifyLockupAddress(quote, address);
+  const matched = matchQuotedLockup(
+    quote,
+    network.hrp,
+    serverPubkey,
+    (legacy) => lightningSendVtxoScript({ ...treeParams, ...legacy !== void 0 && { legacy } })
+  );
+  const script = matched.script;
+  const address = matched.address;
+  const matchedTreeParams = {
+    ...treeParams,
+    ...matched.legacy !== void 0 && { legacy: matched.legacy }
+  };
   assertFundable({
     quote,
     invoiceExpiresAt: params.invoice.expiresAt,
@@ -2194,7 +2368,7 @@ async function requestLightningSend(wallet, arkServerUrl, transport, params) {
     refundAddress,
     senderPubkey,
     secrets,
-    treeParams
+    treeParams: matchedTreeParams
   };
 }
 var offerTermsFromQuote = (quote, assets) => {
@@ -2259,7 +2433,7 @@ function deriveOnchainSend(input) {
   if (refundLocktime === void 0 || htlcPubkey === void 0 || htlcLocktime === void 0 || minConfirmations === void 0 || receiverPkScriptHex === void 0) {
     throw new Error("onchain-send quote is missing a binding field");
   }
-  const script = lightningSendVtxoScript({
+  const treeParams = {
     solverPubkey: (0, import_sdk9.toXOnly)(import_base10.hex.decode(quote.solver_pubkey), "solver key"),
     refundLocktime,
     serverPubkey: input.serverPubkey,
@@ -2269,9 +2443,13 @@ function deriveOnchainSend(input) {
     senderPubkey: input.senderPubkey,
     receiverPkScript: solverHex(receiverPkScriptHex, "profile.receiver_pk_script"),
     refundPkScript: import_sdk9.ArkAddress.decode(input.refundAddress).pkScript
-  });
-  const address = script.address(input.hrp, input.serverPubkey).encode();
-  verifyLockupAddress(quote, address);
+  };
+  const { script, address } = matchQuotedLockup(
+    quote,
+    input.hrp,
+    input.serverPubkey,
+    (legacy) => lightningSendVtxoScript({ ...treeParams, ...legacy !== void 0 && { legacy } })
+  );
   const htlcParams = {
     paymentHash: input.paymentHash,
     claimKey: input.payoutPubkey,
@@ -2317,6 +2495,7 @@ async function requestOnchainSend(wallet, arkServerUrl, transport, params) {
       amountSide: params.amountSide
     })
   );
+  assertQuotedAmount(quote, params.amountSide, params.amount);
   const network = (0, import_sdk9.getNetwork)(info.network);
   const derived = deriveOnchainSend({
     quote,
@@ -2446,13 +2625,11 @@ function receiveVtxoScript(params) {
     unilateralRefundWithoutReceiverDelay: seconds(
       unilateralRefundWithoutReceiverDelay(params.claimDelay)
     ),
-    nonInteractiveClaim: {
+    nonInteractiveParameters: {
       receiverPkScript: params.payoutPkScript,
-      emulatorPubkey: params.emulatorPubkey
-    },
-    nonInteractiveRefund: {
       senderPkScript: params.solverRefundPkScript,
-      emulatorPubkey: params.emulatorPubkey
+      emulatorPubkey: params.emulatorPubkey,
+      ...params.legacy !== void 0 && { legacy: params.legacy }
     }
   });
 }
@@ -2476,10 +2653,23 @@ function deriveLightningReceive(input) {
     payoutPubkey: input.payoutPubkey,
     payoutPkScript: import_sdk9.ArkAddress.decode(input.payoutAddress).pkScript
   };
-  const script = receiveVtxoScript(treeParams);
-  const address = script.address(input.hrp, input.serverPubkey).encode();
-  verifyLockupAddress(quote, address);
-  return { address, swapPkScript: script.pkScript, script, invoice, refundLocktime, treeParams };
+  const matched = matchQuotedLockup(
+    quote,
+    input.hrp,
+    input.serverPubkey,
+    (legacy) => receiveVtxoScript({ ...treeParams, ...legacy !== void 0 && { legacy } })
+  );
+  return {
+    address: matched.address,
+    swapPkScript: matched.script.pkScript,
+    script: matched.script,
+    invoice,
+    refundLocktime,
+    treeParams: {
+      ...treeParams,
+      ...matched.legacy !== void 0 && { legacy: matched.legacy }
+    }
+  };
 }
 async function requestLightningReceive(wallet, arkServerUrl, transport, params) {
   const rfqId = params.rfqId ?? newRfqId();
@@ -2567,7 +2757,7 @@ function deriveOnchainReceive(input) {
   if (refundLocktime === void 0 || claimPubkey === void 0 || htlcLocktime === void 0 || minConfirmations === void 0 || solverRefundPkScriptHex === void 0) {
     throw new Error("onchain-receive quote is missing a binding field");
   }
-  const script = receiveVtxoScript({
+  const treeParams = {
     solverPubkey: (0, import_sdk9.toXOnly)(import_base10.hex.decode(quote.solver_pubkey), "solver key"),
     refundLocktime,
     serverPubkey: input.serverPubkey,
@@ -2577,9 +2767,13 @@ function deriveOnchainReceive(input) {
     solverRefundPkScript: solverHex(solverRefundPkScriptHex, "profile.solver_refund_pk_script"),
     payoutPubkey: input.payoutPubkey,
     payoutPkScript: import_sdk9.ArkAddress.decode(input.payoutAddress).pkScript
-  });
-  const address = script.address(input.hrp, input.serverPubkey).encode();
-  verifyLockupAddress(quote, address);
+  };
+  const { script, address } = matchQuotedLockup(
+    quote,
+    input.hrp,
+    input.serverPubkey,
+    (legacy) => receiveVtxoScript({ ...treeParams, ...legacy !== void 0 && { legacy } })
+  );
   const htlc = onchainHtlcScript(
     {
       paymentHash: input.paymentHash,
@@ -2677,16 +2871,302 @@ async function requestOnchainReceive(wallet, arkServerUrl, transport, params) {
   };
 }
 
-// src/claim.ts
+// src/chainSource.ts
+var btc2 = __toESM(require("@scure/btc-signer"), 1);
+var import_base11 = require("@scure/base");
+var addressOf = (pkScript, network) => btc2.Address(L1_NETWORKS[network]).encode(btc2.OutScript.decode(pkScript));
+var chainSourceFrom = (provider, network) => {
+  const spenderFromHistory = async (txid, vout, pkScript) => {
+    const txs = await provider.getTransactions(addressOf(pkScript, network));
+    return txs.find((tx) => tx.vin?.some((i) => i.txid === txid && i.vout === vout))?.txid;
+  };
+  return {
+    async getScriptUtxos(pkScript) {
+      const address = addressOf(pkScript, network);
+      const [coins, tip] = await Promise.all([
+        provider.getCoins(address),
+        provider.getChainTip()
+      ]);
+      return coins.map((coin) => ({
+        txid: coin.txid,
+        vout: coin.vout,
+        amount: BigInt(coin.value),
+        // Zero, not one: calling a mempool output "1 deep" would let a
+        // 1-confirmation policy claim against a replaceable transaction.
+        confirmations: coin.status.confirmed && typeof coin.status.block_height === "number" ? Math.max(0, tip.height - coin.status.block_height + 1) : 0
+      }));
+    },
+    async getSpendingTx(txid, vout, pkScript) {
+      const outspends = await provider.getTxOutspends(txid);
+      const outspend = outspends[vout];
+      if (!outspend?.spent) return null;
+      const spender = outspend.txid || await spenderFromHistory(txid, vout, pkScript);
+      if (!spender) return null;
+      const raw = await provider.getRawTransaction(spender);
+      return { txHex: import_base11.hex.encode(raw) };
+    },
+    broadcast(txHex) {
+      return provider.broadcastTransaction(txHex);
+    },
+    async getMtp() {
+      return (await provider.getChainTip()).time;
+    }
+  };
+};
+
+// src/payment/rendezvous.ts
+var import_solver_discovery2 = require("@arkade-os/solver-discovery");
 var import_base12 = require("@scure/base");
+var XONLY_HEX = /^[0-9a-f]{64}$/;
+var rendezvousOf = (market, pinned) => {
+  const transports = { nostr: { relays: market.transports?.nostr?.relays ?? [] } };
+  if (!market.discovery_pubkey || !transports.nostr.relays.length) return void 0;
+  const advertised = market.emulator_pubkey;
+  const emulatorPubkey = advertised === void 0 || advertised === null || advertised === "" ? pinned : typeof advertised === "string" && XONLY_HEX.test(advertised) ? advertised : void 0;
+  if (!emulatorPubkey) return void 0;
+  if (pinned && emulatorPubkey !== pinned) return void 0;
+  const bounds = (0, import_solver_discovery2.sideLimits)(market, "quote");
+  if (!bounds) return void 0;
+  return {
+    solverPubkey: market.discovery_pubkey,
+    transports,
+    minSats: Number(bounds.min),
+    maxSats: Number(bounds.max)
+  };
+};
+var solverRendezvous = (markets, payoutCorridor, amountSats, fallbackEmulatorPubkey) => {
+  const encoded = fallbackEmulatorPubkey ? import_base12.hex.encode(fallbackEmulatorPubkey) : void 0;
+  if (encoded !== void 0 && !XONLY_HEX.test(encoded)) return void 0;
+  const pinned = encoded;
+  const candidates = (0, import_solver_discovery2.selectMarkets)(markets, {
+    baseId: BTC_ASSET_ID,
+    quoteId: BTC_ASSET_ID,
+    baseCorridor: "arkade",
+    quoteCorridor: payoutCorridor
+  });
+  for (const market of candidates) {
+    const rendezvous = rendezvousOf(market, pinned);
+    if (!rendezvous) continue;
+    if (amountSats >= rendezvous.minSats && amountSats <= rendezvous.maxSats) {
+      return rendezvous;
+    }
+  }
+  return void 0;
+};
+
+// src/payment/solverOnchain.ts
+var import_sdk11 = require("@arkade-os/sdk");
+var SOLVER_ONCHAIN_RAIL = "solver-onchain";
+var solverOnchainRendezvous = (markets, amountSats, fallbackEmulatorPubkey) => solverRendezvous(markets, "onchain", amountSats, fallbackEmulatorPubkey);
+function solverOnchainRail(deps) {
+  const rendezvousFor = async (amount) => {
+    if (amount === void 0) return void 0;
+    const markets = await deps.discover();
+    return solverOnchainRendezvous(markets, amount, deps.fallbackEmulatorPubkey);
+  };
+  return {
+    id: SOLVER_ONCHAIN_RAIL,
+    match: (req) => (0, import_sdk11.btcTarget)(req.raw) !== void 0,
+    available: async (req) => {
+      const address = (0, import_sdk11.btcTarget)(req.raw);
+      if (!address) return false;
+      try {
+        l1ScriptForAddress(address, deps.l1Network);
+      } catch {
+        return false;
+      }
+      const amount = (0, import_sdk11.tryResolveSendAmount)(req.raw, req.amount);
+      if (amount === void 0) return false;
+      return await rendezvousFor(amount) !== void 0;
+    },
+    quote: async (req, ctx) => {
+      const address = (0, import_sdk11.btcTarget)(req.raw);
+      const amount = (0, import_sdk11.resolveSendAmount)(SOLVER_ONCHAIN_RAIL, req.raw, req.amount);
+      const payoutPkScript = l1ScriptForAddress(address, deps.l1Network);
+      const rendezvous = await rendezvousFor(amount);
+      if (!rendezvous) {
+        throw new Error(
+          `${SOLVER_ONCHAIN_RAIL}: no solver serves arkade:BTC -> onchain:BTC at ${amount} sats`
+        );
+      }
+      const negotiated = await deps.connect(
+        rendezvous,
+        (transport) => requestOnchainSend(ctx.wallet, deps.arkServerUrl, transport, {
+          amount,
+          amountSide: "to",
+          payoutPubkey: deps.payoutPubkey,
+          ...deps.emulatorPubkey ? { emulatorPubkey: deps.emulatorPubkey } : {}
+        })
+      );
+      if (negotiated.l1Network !== deps.l1Network) {
+        throw new Error(
+          `${SOLVER_ONCHAIN_RAIL}: rail built for ${deps.l1Network} but the swap was negotiated on ${negotiated.l1Network}`
+        );
+      }
+      const swap = { ...negotiated, rendezvous, payoutPkScript };
+      return {
+        railId: SOLVER_ONCHAIN_RAIL,
+        amount,
+        fee: swap.fundAmount - amount,
+        total: swap.fundAmount,
+        meta: {
+          rfqId: swap.rfqId,
+          validUntil: swap.quote.valid_until,
+          htlcAddress: swap.htlc.address,
+          minConfirmations: swap.minConfirmations,
+          solverPubkey: rendezvous.solverPubkey,
+          // The claim tx's fee comes out of the HTLC output at a rate
+          // not knowable now, so `amount` is the payout, not the net.
+          claimFeeDeductedFromPayout: true
+        },
+        send: async () => (0, import_sdk11.makeHandle)(SOLVER_ONCHAIN_RAIL, async (emit) => {
+          assertFundable({
+            quote: swap.quote,
+            now: Math.floor(Date.now() / 1e3),
+            onchain: {
+              htlcLocktime: swap.htlcParams.refundLocktime,
+              minConfirmations: swap.minConfirmations,
+              direction: "send"
+            }
+          });
+          await deps.persist(swap);
+          await ctx.wallet.send({
+            address: swap.address,
+            amount: swap.fundAmount
+          });
+          emit({ status: "sent" });
+          const result = { railId: SOLVER_ONCHAIN_RAIL, swapId: swap.rfqId };
+          if (!deps.awaitSettlement) return result;
+          let txid;
+          try {
+            ({ txid } = await deps.awaitSettlement(swap));
+          } catch (e) {
+            console.warn(
+              `${SOLVER_ONCHAIN_RAIL}: settlement watch failed; the payment is sent`,
+              e
+            );
+            return result;
+          }
+          const settled = { ...result, txid };
+          emit({ status: "settled", result: settled });
+          return settled;
+        })
+      };
+    }
+  };
+}
+
+// src/payment/solverLightning.ts
+var import_sdk12 = require("@arkade-os/sdk");
+var SOLVER_LIGHTNING_RAIL = "solver-lightning";
+var factsOf = (raw, decode, now) => {
+  const invoice = (0, import_sdk12.invoiceTarget)(raw);
+  if (!invoice) return void 0;
+  let facts;
+  try {
+    facts = decode(invoice);
+  } catch {
+    return void 0;
+  }
+  if (!Number.isInteger(facts.amountSats) || facts.amountSats <= 0) return void 0;
+  if (facts.expiresAt <= now) return void 0;
+  return facts;
+};
+var solverLightningRendezvous = (markets, amountSats, fallbackEmulatorPubkey) => solverRendezvous(markets, "lightning", amountSats, fallbackEmulatorPubkey);
+function solverLightningRail(deps) {
+  const rendezvousFor = async (amountSats) => solverLightningRendezvous(await deps.discover(), amountSats, deps.fallbackEmulatorPubkey);
+  return {
+    id: SOLVER_LIGHTNING_RAIL,
+    match: (req) => (0, import_sdk12.invoiceTarget)(req.raw) !== void 0,
+    available: async (req) => {
+      const facts = factsOf(req.raw, deps.decodeInvoice, Math.floor(Date.now() / 1e3));
+      if (!facts) return false;
+      if (req.amount !== void 0 && req.amount !== facts.amountSats) return false;
+      return await rendezvousFor(facts.amountSats) !== void 0;
+    },
+    quote: async (req, ctx) => {
+      const facts = factsOf(req.raw, deps.decodeInvoice, Math.floor(Date.now() / 1e3));
+      if (!facts) {
+        throw new Error(
+          `${SOLVER_LIGHTNING_RAIL}: the request carries no payable BOLT11 invoice (amountless, expired, or undecodable)`
+        );
+      }
+      if (req.amount !== void 0 && req.amount !== facts.amountSats) {
+        throw new Error(
+          `${SOLVER_LIGHTNING_RAIL}: the request names ${req.amount} sats but the invoice is for ${facts.amountSats} \u2014 the payee is paid the invoice`
+        );
+      }
+      const rendezvous = await rendezvousFor(facts.amountSats);
+      if (!rendezvous) {
+        throw new Error(
+          `${SOLVER_LIGHTNING_RAIL}: no solver serves arkade:BTC -> lightning:BTC at ${facts.amountSats} sats`
+        );
+      }
+      const negotiated = await deps.connect(
+        rendezvous,
+        (transport) => requestLightningSend(ctx.wallet, deps.arkServerUrl, transport, {
+          invoice: facts,
+          ...deps.emulatorPubkey ? { emulatorPubkey: deps.emulatorPubkey } : {}
+        })
+      );
+      const swap = { ...negotiated, invoice: facts, rendezvous };
+      return {
+        railId: SOLVER_LIGHTNING_RAIL,
+        // `requestLightningSend` refuses a quote that reprices the
+        // invoice, so the spread is a fee on top.
+        amount: facts.amountSats,
+        fee: swap.fundAmount - facts.amountSats,
+        total: swap.fundAmount,
+        meta: {
+          rfqId: swap.rfqId,
+          validUntil: swap.quote.valid_until,
+          paymentHash: facts.paymentHash,
+          invoiceExpiresAt: facts.expiresAt,
+          solverPubkey: rendezvous.solverPubkey
+        },
+        send: async () => (0, import_sdk12.makeHandle)(SOLVER_LIGHTNING_RAIL, async (emit) => {
+          assertFundable({
+            quote: swap.quote,
+            invoiceExpiresAt: facts.expiresAt,
+            now: Math.floor(Date.now() / 1e3)
+          });
+          await deps.persist(swap);
+          await ctx.wallet.send({
+            address: swap.address,
+            amount: swap.fundAmount
+          });
+          emit({ status: "sent" });
+          const result = { railId: SOLVER_LIGHTNING_RAIL, swapId: swap.rfqId };
+          if (!deps.awaitSettlement) return result;
+          let preimage;
+          try {
+            ({ preimage } = await deps.awaitSettlement(swap));
+          } catch (e) {
+            console.warn(
+              `${SOLVER_LIGHTNING_RAIL}: settlement watch failed; the payment is sent`,
+              e
+            );
+            return result;
+          }
+          const settled = { ...result, ...preimage !== void 0 && { preimage } };
+          emit({ status: "settled", result: settled });
+          return settled;
+        })
+      };
+    }
+  };
+}
+
+// src/claim.ts
+var import_base14 = require("@scure/base");
 var import_legacy3 = require("@noble/hashes/legacy.js");
 var import_sha25 = require("@noble/hashes/sha2.js");
-var import_sdk12 = require("@arkade-os/sdk");
+var import_sdk14 = require("@arkade-os/sdk");
 
 // src/refund.ts
-var import_base11 = require("@scure/base");
+var import_base13 = require("@scure/base");
 var import_sha24 = require("@noble/hashes/sha2.js");
-var import_sdk11 = require("@arkade-os/sdk");
+var import_sdk13 = require("@arkade-os/sdk");
 var sleep2 = (ms) => new Promise((resolve) => setTimeout(resolve, ms));
 var isRfqTerminal = (state) => RFQ_TERMINAL_STATES.includes(state);
 var RFQ_RESOLVED_STATES = ["settled", "refunded"];
@@ -2733,7 +3213,7 @@ var LockupNeedsRecoveryError = class extends Error {
   }
 };
 async function findLockupVtxos(indexer, swapPkScript) {
-  const scripts = [import_base11.hex.encode(swapPkScript)];
+  const scripts = [import_base13.hex.encode(swapPkScript)];
   const [spendable, recoverable] = await Promise.all([
     indexer.getVtxos({ scripts, spendableOnly: true }),
     indexer.getVtxos({ scripts, recoverableOnly: true })
@@ -2759,16 +3239,16 @@ async function findLockupVtxos(indexer, swapPkScript) {
   }
   return out;
 }
-var hashesTo = (candidate, paymentHash) => import_base11.hex.encode((0, import_sha24.sha256)(candidate)) === paymentHash;
+var hashesTo = (candidate, paymentHash) => import_base13.hex.encode((0, import_sha24.sha256)(candidate)) === paymentHash;
 var candidateWitnessItems = (tx, inputIndex) => [
-  ...(0, import_sdk11.getArkPsbtFields)(tx, inputIndex, import_sdk11.ConditionWitness).flat(),
+  ...(0, import_sdk13.getArkPsbtFields)(tx, inputIndex, import_sdk13.ConditionWitness).flat(),
   ...tx.getInput(inputIndex).finalScriptWitness ?? []
 ];
 async function readLockupFate(indexer, input) {
-  const { vtxos } = await indexer.getVtxos({ scripts: [import_base11.hex.encode(input.swapPkScript)] });
+  const { vtxos } = await indexer.getVtxos({ scripts: [import_base13.hex.encode(input.swapPkScript)] });
   const all = vtxos ?? [];
   if (all.length === 0) return { fate: "unknown" };
-  const exited = all.filter((vtxo) => vtxo.isUnrolled && !(0, import_sdk11.hasTerminalSpend)(vtxo));
+  const exited = all.filter((vtxo) => vtxo.isUnrolled && !(0, import_sdk13.hasTerminalSpend)(vtxo));
   if (exited.length > 0) {
     return {
       fate: "exited",
@@ -2778,7 +3258,7 @@ async function readLockupFate(indexer, input) {
   const spentBy = /* @__PURE__ */ new Map();
   let everySpendNamed = true;
   for (const vtxo of all) {
-    if (!(0, import_sdk11.hasTerminalSpend)(vtxo)) return { fate: "open" };
+    if (!(0, import_sdk13.hasTerminalSpend)(vtxo)) return { fate: "open" };
     if (vtxo.spentBy)
       spentBy.set(vtxo.spentBy, {
         checkpointTxid: vtxo.spentBy,
@@ -2792,7 +3272,7 @@ async function readLockupFate(indexer, input) {
   for (const raw of txs) {
     let tx;
     try {
-      tx = import_sdk11.Transaction.fromPSBT(import_base11.base64.decode(raw));
+      tx = import_sdk13.Transaction.fromPSBT(import_base13.base64.decode(raw));
     } catch {
       continue;
     }
@@ -2800,7 +3280,7 @@ async function readLockupFate(indexer, input) {
     for (let i = 0; i < tx.inputsLength; i++) {
       const spent = tx.getInput(i);
       if (!spent.txid) continue;
-      const txid = import_base11.hex.encode(spent.txid);
+      const txid = import_base13.hex.encode(spent.txid);
       if (!all.some((vtxo) => vtxo.txid === txid && vtxo.vout === spent.index)) continue;
       for (const candidate of candidateWitnessItems(tx, i)) {
         if (hashesTo(candidate, input.paymentHash)) {
@@ -2820,23 +3300,23 @@ async function pushRefundWithoutReceiver(ark, input) {
       input.script.options.refundLocktime
     );
   }
-  const refundPkScript = input.refundPkScript ?? input.script.options.nonInteractiveRefund?.senderPkScript;
+  const refundPkScript = input.refundPkScript ?? input.script.options.nonInteractiveParameters?.senderPkScript;
   if (!refundPkScript) {
     throw new Error(
-      "no refund destination: the contract carries no nonInteractiveRefund leaf, so pass refundPkScript explicitly"
+      "no refund destination: the contract carries no emulator covenant suite, so pass refundPkScript explicitly"
     );
   }
   const info = await ark.getInfo();
   let serverUnrollScript;
   try {
-    serverUnrollScript = import_sdk11.CSVMultisigTapscript.decode(import_base11.hex.decode(info.checkpointTapscript));
+    serverUnrollScript = import_sdk13.CSVMultisigTapscript.decode(import_base13.hex.decode(info.checkpointTapscript));
   } catch {
     throw new Error("invalid checkpointTapscript from the Arkade server");
   }
   const leaf = input.script.refundWithoutReceiver();
   const tapTree = input.script.encode();
   const amount = input.vtxos.reduce((sum, vtxo) => sum + vtxo.value, 0);
-  const { arkTx, checkpoints } = (0, import_sdk11.buildOffchainTx)(
+  const { arkTx, checkpoints } = (0, import_sdk13.buildOffchainTx)(
     input.vtxos.map((vtxo) => ({
       txid: vtxo.txid,
       vout: vtxo.vout,
@@ -2849,18 +3329,18 @@ async function pushRefundWithoutReceiver(ark, input) {
   );
   const signedArkTx = await input.sender.sign(arkTx);
   const submitted = await ark.submitTx(
-    import_base11.base64.encode(signedArkTx.toPSBT()),
-    checkpoints.map((c) => import_base11.base64.encode(c.toPSBT()))
+    import_base13.base64.encode(signedArkTx.toPSBT()),
+    checkpoints.map((c) => import_base13.base64.encode(c.toPSBT()))
   );
-  (0, import_sdk11.assertSubmittedArkTxid)(submitted, signedArkTx, "refundWithoutReceiver");
-  const matched = (0, import_sdk11.matchServerCheckpoints)(
+  (0, import_sdk13.assertSubmittedArkTxid)(submitted, signedArkTx, "refundWithoutReceiver");
+  const matched = (0, import_sdk13.matchServerCheckpoints)(
     submitted.signedCheckpointTxs,
     checkpoints,
     "refundWithoutReceiver"
   );
   const finalCheckpoints = await Promise.all(
     matched.map(
-      async ({ server }) => import_base11.base64.encode((await input.sender.sign(server, [0])).toPSBT())
+      async ({ server }) => import_base13.base64.encode((await input.sender.sign(server, [0])).toPSBT())
     )
   );
   await ark.finalizeTx(submitted.arkTxid, finalCheckpoints);
@@ -2875,6 +3355,21 @@ async function refundIfUnresolved(transport, ark, indexer, input) {
     const status = await transport.status(input.rfqId);
     if (status && isResolved(status.state)) return { outcome: "resolved", status };
     if (now() >= input.refundLocktime) {
+      let fate = { fate: "unknown" };
+      try {
+        fate = await readLockupFate(indexer, {
+          swapPkScript: input.script.pkScript,
+          paymentHash: input.paymentHash
+        });
+      } catch {
+      }
+      if (fate.fate === "exited") {
+        return {
+          outcome: "exited",
+          outpoints: fate.outpoints.map((o) => `${o.txid}:${o.vout}`),
+          status
+        };
+      }
       const vtxos = await findLockupVtxos(indexer, input.script.pkScript);
       if (vtxos.length === 0) return { outcome: "nothing_to_refund", status };
       try {
@@ -2940,20 +3435,20 @@ async function pushClaim(ark, input) {
     }
   }
   const committed = input.script.options.preimageHash;
-  if (import_base12.hex.encode((0, import_legacy3.ripemd160)((0, import_sha25.sha256)(input.preimage))) !== import_base12.hex.encode(committed)) {
+  if (import_base14.hex.encode((0, import_legacy3.ripemd160)((0, import_sha25.sha256)(input.preimage))) !== import_base14.hex.encode(committed)) {
     throw new Error("preimage does not match the covenant's payment hash");
   }
   const info = await ark.getInfo();
   let serverUnrollScript;
   try {
-    serverUnrollScript = import_sdk12.CSVMultisigTapscript.decode(import_base12.hex.decode(info.checkpointTapscript));
+    serverUnrollScript = import_sdk14.CSVMultisigTapscript.decode(import_base14.hex.decode(info.checkpointTapscript));
   } catch {
     throw new Error("invalid checkpointTapscript from the Arkade server");
   }
   const leaf = input.script.claim();
   const tapTree = input.script.encode();
-  const arkTxid = await (0, import_sdk12.signAndSubmitOffchainTx)({
-    identity: (0, import_sdk12.claimWithPreimageIdentity)(input.receiver, input.preimage),
+  const arkTxid = await (0, import_sdk14.signAndSubmitOffchainTx)({
+    identity: (0, import_sdk14.claimWithPreimageIdentity)(input.receiver, input.preimage),
     provider: ark,
     inputs: input.vtxos.map((vtxo) => ({
       txid: vtxo.txid,
@@ -3000,7 +3495,7 @@ async function claimReceiveLockup(indexer, ark, input) {
 }
 
 // src/refundBlocked.ts
-var import_sdk13 = require("@arkade-os/sdk");
+var import_sdk15 = require("@arkade-os/sdk");
 var RefundNotLocallyPossibleError = class extends Error {
   constructor(reason, message, options) {
     super(message, options);
@@ -3017,16 +3512,16 @@ async function senderIdentityForSwapRecord(wallet, record) {
     );
   }
   try {
-    return await (0, import_sdk13.contractSigner)(wallet, record.signingDescriptor);
+    return await (0, import_sdk15.contractSigner)(wallet, record.signingDescriptor);
   } catch (cause) {
-    if (cause instanceof import_sdk13.WalletCannotSignError) {
+    if (cause instanceof import_sdk15.WalletCannotSignError) {
       throw new RefundNotLocallyPossibleError(
         "unsignable-wallet",
         `this wallet holds ${record.signingDescriptor} but cannot sign with it; attach its signer`,
         { cause }
       );
     }
-    if (cause instanceof import_sdk13.ForeignDescriptorError) {
+    if (cause instanceof import_sdk15.ForeignDescriptorError) {
       throw new RefundNotLocallyPossibleError(
         "foreign-descriptor",
         `this wallet cannot derive ${record.signingDescriptor}; the swap was created on another wallet`,
@@ -3061,7 +3556,7 @@ function arkadeRefunder(deps) {
 }
 
 // src/swapManager.ts
-var import_base13 = require("@scure/base");
+var import_base15 = require("@scure/base");
 function nextOnchainAction(input) {
   switch (input.phase.phase) {
     case "unfunded":
@@ -3509,7 +4004,7 @@ var RfqSwapManager = class {
   // ── internals ────────────────────────────────────────────────────────────
   track(swap) {
     this.monitored.set(swap.rfqId, swap);
-    this.byLockupScript.set(import_base13.hex.encode(swap.lockupPkScript), swap);
+    this.byLockupScript.set(import_base15.hex.encode(swap.lockupPkScript), swap);
   }
   /** Drops the swap from BOTH indexes. The event index is the one that stops
    * a late event finding a swap that is gone; `pollSwap`'s own
@@ -3518,7 +4013,7 @@ var RfqSwapManager = class {
    * them from silently re-driving a cancelled swap. */
   untrack(rfqId) {
     const swap = this.monitored.get(rfqId);
-    if (swap) this.byLockupScript.delete(import_base13.hex.encode(swap.lockupPkScript));
+    if (swap) this.byLockupScript.delete(import_base15.hex.encode(swap.lockupPkScript));
     this.monitored.delete(rfqId);
     this.refundRefused.delete(rfqId);
     this.lastClaimError.delete(rfqId);
@@ -3580,7 +4075,7 @@ var RfqSwapManager = class {
     if (!lockup) {
       try {
         const [existing] = await contracts.getContracts({
-          script: import_base13.hex.encode(swap.lockupPkScript)
+          script: import_base15.hex.encode(swap.lockupPkScript)
         });
         if (existing) {
           this.registered.set(swap.rfqId, true);
@@ -3599,13 +4094,13 @@ var RfqSwapManager = class {
       );
       return;
     }
-    const script = import_base13.hex.encode(lockup.script.pkScript);
-    if (script !== import_base13.hex.encode(swap.lockupPkScript)) {
+    const script = import_base15.hex.encode(lockup.script.pkScript);
+    if (script !== import_base15.hex.encode(swap.lockupPkScript)) {
       this.registered.set(swap.rfqId, false);
       this.emitFailed(
         swap,
         new Error(
-          `swap ${swap.rfqId} lockup script ${script} does not match its lockupPkScript ${import_base13.hex.encode(swap.lockupPkScript)}`
+          `swap ${swap.rfqId} lockup script ${script} does not match its lockupPkScript ${import_base15.hex.encode(swap.lockupPkScript)}`
         )
       );
       return;
@@ -3624,7 +4119,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;
-    void this.deps.contracts.setContractWatchState(import_base13.hex.encode(swap.lockupPkScript), "retained").catch((error) => this.emitFailed(swap, error));
+    void this.deps.contracts.setContractWatchState(import_base15.hex.encode(swap.lockupPkScript), "retained").catch((error) => this.emitFailed(swap, error));
   }
   arm() {
     if (!this.running) return;
@@ -4097,8 +4592,8 @@ var errorMessage = (error) => error instanceof Error ? error.message : String(er
 var outpointKey = (vtxo) => `${vtxo.txid}:${vtxo.vout}`;
 
 // src/activity.ts
-var import_sdk14 = require("@arkade-os/sdk");
-var import_base14 = require("@scure/base");
+var import_sdk16 = require("@arkade-os/sdk");
+var import_base16 = require("@scure/base");
 var LABELS = {
   lightning_send: "Lightning send",
   lightning_receive: "Lightning receive",
@@ -4173,7 +4668,7 @@ async function activityInputOf(record, indexer) {
 async function lockupTxids(indexer, record, wantFunding) {
   let script;
   try {
-    script = import_base14.hex.encode(import_sdk14.ArkAddress.decode(record.lockupAddress).pkScript);
+    script = import_base16.hex.encode(import_sdk16.ArkAddress.decode(record.lockupAddress).pkScript);
   } catch {
     return [];
   }
@@ -4227,6 +4722,8 @@ async function lockupTxids(indexer, record, wantFunding) {
   RfqSwapManager,
   RfqSwapOriginRequired,
   SOLO_REFUND_HEADROOM_SECONDS,
+  SOLVER_LIGHTNING_RAIL,
+  SOLVER_ONCHAIN_RAIL,
   SWAP_LOCKUP_CONTRACT_KIND,
   SWAP_LOCKUP_CONTRACT_LABEL,
   SWAP_LOCKUP_CONTRACT_TYPE,
@@ -4243,6 +4740,7 @@ async function lockupTxids(indexer, record, wantFunding) {
   buildHtlcClaim,
   buildHtlcRefund,
   cancelOffer,
+  chainSourceFrom,
   claimOnchainFill,
   claimReceiveLockup,
   classifyDepositSpend,
@@ -4264,6 +4762,7 @@ async function lockupTxids(indexer, record, wantFunding) {
   httpTransport,
   isRfqSwapTerminal,
   isRfqTerminal,
+  l1ScriptForAddress,
   lightningReceiveRequest,
   lightningSendRequest,
   lightningSendVtxoScript,
@@ -4303,6 +4802,11 @@ async function lockupTxids(indexer, record, wantFunding) {
   sealClaimPacket,
   senderIdentityForSwapRecord,
   shouldRetainRfqSwap,
+  solverLightningRail,
+  solverLightningRendezvous,
+  solverOnchainRail,
+  solverOnchainRendezvous,
+  solverRendezvous,
   spendTxidsOf,
   spendUpdate,
   swapActivityResolver,