@arkade-os/swap 0.0.12 → 0.0.13

package/dist/index.cjs

@@ -34,6 +34,8 @@ __export(index_exports, {
   ARKADE_BTC: () => ARKADE_BTC,
   AddressMismatch: () => AddressMismatch,
   BTC_ASSET_ID: () => BTC_ASSET_ID,
+  CROSS_ASSET_RAIL: () => CROSS_ASSET_RAIL,
+  CovclaimdRevealError: () => CovclaimdRevealError,
   InMemoryAssetSwapRepository: () => InMemoryAssetSwapRepository,
   IndexedDbAssetSwapRepository: () => IndexedDbAssetSwapRepository,
   LIGHTNING_BTC: () => LIGHTNING_BTC,
@@ -90,8 +92,10 @@ __export(index_exports, {
   classifyDepositSpend: () => classifyDepositSpend,
   classifyOnchainHtlc: () => classifyOnchainHtlc,
   classifySpend: () => classifySpend,
+  covclaimdClient: () => covclaimdClient,
   createOffer: () => createOffer,
   createRfqSwapRecord: () => createRfqSwapRecord,
+  crossAssetRail: () => crossAssetRail,
   decodeOffer: () => decodeOffer,
   deriveLightningReceive: () => deriveLightningReceive,
   deriveOnchainReceive: () => deriveOnchainReceive,
@@ -137,6 +141,8 @@ __export(index_exports, {
   requestOnchainSend: () => requestOnchainSend,
   restoreAssetSwaps: () => restoreAssetSwaps,
   retireSettledOfferContracts: () => retireSettledOfferContracts,
+  revealClaimPacket: () => revealClaimPacket,
+  revealFieldsFromScript: () => revealFieldsFromScript,
   rfqClaimSecretOf: () => rfqClaimSecretOf,
   rfqPair: () => rfqPair,
   rfqSecretsProfile: () => rfqSecretsProfile,
@@ -2403,7 +2409,7 @@ var lightningReceiveRequest = (input) => ({
     payment_hash: input.paymentHash,
     payout_address: input.payoutAddress,
     payout_pubkey: import_base10.hex.encode(input.payoutPubkey),
-    claim_packet: input.claimPacket
+    ...input.claimPacket === void 0 ? {} : { claim_packet: input.claimPacket }
   }
 });
 var onchainReceiveRequest = (input) => ({
@@ -2415,7 +2421,7 @@ var onchainReceiveRequest = (input) => ({
   amount: input.amount,
   profile: {
     payment_hash: input.paymentHash,
-    claim_packet: input.claimPacket,
+    ...input.claimPacket === void 0 ? {} : { claim_packet: input.claimPacket },
     refund_pubkey: import_base10.hex.encode(input.refundPubkey),
     payout_address: input.payoutAddress,
     payout_pubkey: import_base10.hex.encode(input.payoutPubkey)
@@ -2686,17 +2692,17 @@ async function requestLightningReceive(wallet, arkServerUrl, transport, params)
     new import_sdk9.RestArkProvider(arkServerUrl).getInfo(),
     wallet.getAddress()
   ]);
-  const claimPacket = await sealClaimPacket({
+  const claimPacket = params.covclaimdPubkey ? await sealClaimPacket({
     preimage,
     covclaimdPubkey: params.covclaimdPubkey
-  });
+  }) : void 0;
   const quote = await transport.requestQuote(
     lightningReceiveRequest({
       rfqId,
       paymentHash,
       payoutAddress,
       payoutPubkey,
-      claimPacket: claimPacket.ciphertext,
+      claimPacket: claimPacket?.ciphertext,
       amount: params.amount,
       amountSide: params.amountSide
     })
@@ -2809,10 +2815,10 @@ async function requestOnchainReceive(wallet, arkServerUrl, transport, params) {
     new import_sdk9.RestArkProvider(arkServerUrl).getInfo(),
     wallet.getAddress()
   ]);
-  const claimPacket = await sealClaimPacket({
+  const claimPacket = params.covclaimdPubkey ? await sealClaimPacket({
     preimage,
     covclaimdPubkey: params.covclaimdPubkey
-  });
+  }) : void 0;
   const quote = await transport.requestQuote(
     onchainReceiveRequest({
       rfqId,
@@ -2820,7 +2826,7 @@ async function requestOnchainReceive(wallet, arkServerUrl, transport, params) {
       payoutAddress,
       payoutPubkey,
       refundPubkey: params.refundPubkey,
-      claimPacket: claimPacket.ciphertext,
+      claimPacket: claimPacket?.ciphertext,
       amount: params.amount,
       amountSide: params.amountSide
     })
@@ -2968,6 +2974,7 @@ function solverOnchainRail(deps) {
     id: SOLVER_ONCHAIN_RAIL,
     match: (req) => (0, import_sdk11.btcTarget)(req.raw) !== void 0,
     available: async (req) => {
+      if ((0, import_sdk11.assetsOf)(req).length > 0) return false;
       const address = (0, import_sdk11.btcTarget)(req.raw);
       if (!address) return false;
       try {
@@ -2981,6 +2988,7 @@ function solverOnchainRail(deps) {
     },
     quote: async (req, ctx) => {
       const address = (0, import_sdk11.btcTarget)(req.raw);
+      (0, import_sdk11.assertNoAssets)(SOLVER_ONCHAIN_RAIL, req);
       const amount = (0, import_sdk11.resolveSendAmount)(SOLVER_ONCHAIN_RAIL, req.raw, req.amount);
       const payoutPkScript = l1ScriptForAddress(address, deps.l1Network);
       const rendezvous = await rendezvousFor(amount);
@@ -3079,12 +3087,14 @@ function solverLightningRail(deps) {
     id: SOLVER_LIGHTNING_RAIL,
     match: (req) => (0, import_sdk12.invoiceTarget)(req.raw) !== void 0,
     available: async (req) => {
+      if ((0, import_sdk12.assetsOf)(req).length > 0) return false;
       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) => {
+      (0, import_sdk12.assertNoAssets)(SOLVER_LIGHTNING_RAIL, req);
       const facts = factsOf(req.raw, deps.decodeInvoice, Math.floor(Date.now() / 1e3));
       if (!facts) {
         throw new Error(
@@ -3157,16 +3167,260 @@ function solverLightningRail(deps) {
   };
 }
 
-// src/claim.ts
-var import_base14 = require("@scure/base");
+// src/payment/crossAsset.ts
+var import_sdk13 = require("@arkade-os/sdk");
+var CROSS_ASSET_RAIL = "cross-asset";
+var DEFAULT_CARRIER_SATS = 330;
+var parseAssetId = (assetId) => {
+  try {
+    return import_sdk13.asset.AssetId.fromString(assetId);
+  } catch {
+    return void 0;
+  }
+};
+function crossAssetRail(deps) {
+  const planFor = async (asset3) => {
+    const markets = await deps.discover();
+    const found = findMarket(markets, BTC_ASSET_ID, asset3.assetId);
+    const market = found?.market;
+    if (!market) return void 0;
+    const plan = await deps.quote(market, found.give, asset3.amount);
+    const [balance, dust] = await Promise.all([deps.btcBalance(), deps.dust()]);
+    return { plan, error: validatePlan(plan, balance, dust) };
+  };
+  return {
+    id: CROSS_ASSET_RAIL,
+    match: (req) => (0, import_sdk13.arkTarget)(req.raw) !== void 0,
+    available: async (req) => {
+      const assets = (0, import_sdk13.assetsOf)(req);
+      if (assets.length !== 1) return false;
+      const [asset3] = assets;
+      if (asset3.assetId === BTC_ASSET_ID) return false;
+      if (typeof asset3.amount !== "bigint" || asset3.amount <= 0n) return false;
+      if (!parseAssetId(asset3.assetId)) return false;
+      const planned = await planFor(asset3);
+      return planned !== void 0 && planned.error === void 0;
+    },
+    quote: async (req, ctx) => {
+      const payTo = (0, import_sdk13.arkTarget)(req.raw);
+      const asset3 = (0, import_sdk13.resolveAssetAmount)(CROSS_ASSET_RAIL, req);
+      const wantAsset = parseAssetId(asset3.assetId);
+      if (!wantAsset) {
+        throw new Error(
+          `${CROSS_ASSET_RAIL}: ${asset3.assetId} is not an asset id (expected 34 bytes of hex)`
+        );
+      }
+      const planned = await planFor(asset3);
+      if (!planned) {
+        throw new Error(`${CROSS_ASSET_RAIL}: no market swaps BTC into ${asset3.assetId}`);
+      }
+      if (planned.error) {
+        throw new Error(
+          `${CROSS_ASSET_RAIL}: cannot swap into ${asset3.assetId} \u2014 ${planned.error}`
+        );
+      }
+      const { plan } = planned;
+      if (!Number.isSafeInteger(Number(plan.deposit.atomic))) {
+        throw new Error(
+          `${CROSS_ASSET_RAIL}: deposit of ${plan.deposit.atomic} does not fit a JS number`
+        );
+      }
+      const depositSats = Number(plan.deposit.atomic);
+      const carrier = deps.carrierSats ?? DEFAULT_CARRIER_SATS;
+      return {
+        railId: CROSS_ASSET_RAIL,
+        // OPEN QUESTION for review: `total = amount + fee` forces the
+        // purchase price into `fee`, which reads as a service charge.
+        // A third field instead? `assets.spent` labels it correctly.
+        amount: carrier,
+        fee: depositSats,
+        total: depositSats + carrier,
+        assets: {
+          delivered: asset3,
+          spent: { assetId: BTC_ASSET_ID, amount: plan.deposit.atomic }
+        },
+        meta: {
+          market: plan.market.pair,
+          priceDisplay: plan.priceDisplay,
+          give: plan.give
+        },
+        send: async () => (0, import_sdk13.makeHandle)(CROSS_ASSET_RAIL, async (emit) => {
+          const offer = await createOffer(ctx.wallet, deps.arkServerUrl, {
+            wantAmount: asset3.amount,
+            wantAsset,
+            ...deps.emulatorPubkey ? { emulatorPubkey: deps.emulatorPubkey } : {}
+          });
+          const swap = {
+            phase: "quoted",
+            offerHex: offer.offerHex,
+            address: offer.address,
+            swapPkScript: offer.swapPkScript,
+            depositSats,
+            asset: asset3,
+            payTo,
+            plan
+          };
+          await deps.persist(swap);
+          await ctx.wallet.send({
+            address: offer.address,
+            amount: depositSats,
+            extensions: [offer.extension]
+          });
+          emit({ status: "sent" });
+          await deps.awaitFill(swap);
+          await deps.persist({ ...swap, phase: "filled" });
+          await deps.persist({ ...swap, phase: "paying" });
+          const txid = await ctx.wallet.send({
+            address: payTo,
+            amount: carrier,
+            assets: [asset3]
+          });
+          await deps.persist({ ...swap, phase: "settled", txid });
+          const result = {
+            railId: CROSS_ASSET_RAIL,
+            txid,
+            swapId: offer.offerHex
+          };
+          emit({ status: "settled", result });
+          return result;
+        })
+      };
+    }
+  };
+}
+
+// src/reveal.ts
+var import_base13 = require("@scure/base");
 var import_legacy3 = require("@noble/hashes/legacy.js");
-var import_sha25 = require("@noble/hashes/sha2.js");
+var import_sha24 = require("@noble/hashes/sha2.js");
 var import_sdk14 = require("@arkade-os/sdk");
+var CovclaimdRevealError = class extends Error {
+  name = "CovclaimdRevealError";
+  status;
+  detail;
+  retryable;
+  constructor(what, status, detail) {
+    super(`covclaimd ${what} failed: ${status || "no response"} ${detail}`.trimEnd());
+    this.status = status;
+    this.detail = detail;
+    this.retryable = status === 0 || status === 429 || status >= 500;
+  }
+};
+var decodeKey = (value, field) => {
+  if (typeof value !== "string") throw new Error(`covclaimd info: ${field} is not a string`);
+  let bytes;
+  try {
+    bytes = import_base13.hex.decode(value);
+  } catch {
+    throw new Error(`covclaimd info: ${field} is not hex`);
+  }
+  if (bytes.length !== 33) {
+    throw new Error(`covclaimd info: ${field} must be 33-byte compressed, got ${bytes.length}`);
+  }
+  return bytes;
+};
+var LOOPBACK = /* @__PURE__ */ new Set(["localhost", "127.0.0.1", "[::1]"]);
+var assertTransportSecure = (baseUrl, allowInsecureHttp) => {
+  const { protocol, hostname } = new URL(baseUrl);
+  if (protocol === "https:" || allowInsecureHttp) return;
+  if (protocol === "http:" && LOOPBACK.has(hostname)) return;
+  throw new Error(
+    `covclaimd URL must be https (got ${protocol}//${hostname}): the key it serves is the one the preimage gets sealed to. Pass allowInsecureHttp to override.`
+  );
+};
+var covclaimdClient = (baseUrl, options = {}) => {
+  assertTransportSecure(baseUrl, options.allowInsecureHttp === true);
+  const url = baseUrl.replace(/\/+$/, "");
+  const fetchImpl = options.fetchImpl ?? fetch;
+  const timeoutMs = options.timeoutMs ?? 3e4;
+  const send = async (what, path, init) => {
+    let response;
+    try {
+      response = await fetchImpl(`${url}${path}`, {
+        ...init,
+        // a redirect would move the key fetch off the vetted origin
+        redirect: "error",
+        signal: AbortSignal.timeout(timeoutMs)
+      });
+    } catch (error) {
+      throw new CovclaimdRevealError(what, 0, String(error));
+    }
+    if (!response.ok) {
+      throw new CovclaimdRevealError(what, response.status, await response.text());
+    }
+    return response;
+  };
+  const readJson = async (what, response) => {
+    const body = await response.text();
+    try {
+      return JSON.parse(body);
+    } catch {
+      throw new CovclaimdRevealError(
+        what,
+        response.status,
+        `non-JSON body: ${body.slice(0, 200)}`
+      );
+    }
+  };
+  return {
+    async info() {
+      const response = await send("info", "/v1/preimage/covclaimd-pubkey", {
+        method: "GET"
+      });
+      const body = await readJson("info", response);
+      return {
+        covclaimdPubkey: decodeKey(body?.covclaimd_pub_key, "covclaimd_pub_key"),
+        emulatorPubkey: import_base13.hex.encode(decodeKey(body?.emulator_pub_key, "emulator_pub_key"))
+      };
+    },
+    async reveal(params) {
+      await send("reveal", "/v1/reveal", {
+        method: "POST",
+        headers: { "content-type": "application/json" },
+        body: JSON.stringify({
+          swap_address: params.swapAddress,
+          packet: { ciphertext: params.ciphertext, arkade_script: params.arkadeScript },
+          taptree: params.taptree
+        })
+      });
+    }
+  };
+};
+function revealFieldsFromScript(script) {
+  if (!script.nonInteractiveClaimArkadeScript) {
+    throw new Error("this covenant has no non-interactive claim leaf to reveal against");
+  }
+  return {
+    arkadeScript: import_base13.base64.encode(script.nonInteractiveClaimArkadeScript),
+    taptree: import_base13.hex.encode(script.encode())
+  };
+}
+async function revealClaimPacket(client, input) {
+  const fields = revealFieldsFromScript(input.script);
+  if (import_base13.hex.encode(import_sdk14.ArkAddress.decode(input.address).pkScript) !== import_base13.hex.encode(input.script.pkScript)) {
+    throw new Error("address does not belong to this covenant");
+  }
+  if (import_base13.hex.encode((0, import_legacy3.ripemd160)((0, import_sha24.sha256)(input.preimage))) !== import_base13.hex.encode(input.script.options.preimageHash)) {
+    throw new Error("preimage does not match the covenant's payment hash");
+  }
+  const { ciphertext } = await sealClaimPacket({
+    preimage: input.preimage,
+    covclaimdPubkey: (await client.info()).covclaimdPubkey
+  });
+  await client.reveal({ swapAddress: input.address, ciphertext, ...fields });
+  return { ciphertext };
+}
+
+// src/claim.ts
+var import_base15 = require("@scure/base");
+var import_legacy4 = require("@noble/hashes/legacy.js");
+var import_sha26 = require("@noble/hashes/sha2.js");
+var import_sdk16 = require("@arkade-os/sdk");
 
 // src/refund.ts
-var import_base13 = require("@scure/base");
-var import_sha24 = require("@noble/hashes/sha2.js");
-var import_sdk13 = require("@arkade-os/sdk");
+var import_base14 = require("@scure/base");
+var import_sha25 = require("@noble/hashes/sha2.js");
+var import_sdk15 = 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"];
@@ -3213,7 +3467,7 @@ var LockupNeedsRecoveryError = class extends Error {
   }
 };
 async function findLockupVtxos(indexer, swapPkScript) {
-  const scripts = [import_base13.hex.encode(swapPkScript)];
+  const scripts = [import_base14.hex.encode(swapPkScript)];
   const [spendable, recoverable] = await Promise.all([
     indexer.getVtxos({ scripts, spendableOnly: true }),
     indexer.getVtxos({ scripts, recoverableOnly: true })
@@ -3239,16 +3493,16 @@ async function findLockupVtxos(indexer, swapPkScript) {
   }
   return out;
 }
-var hashesTo = (candidate, paymentHash) => import_base13.hex.encode((0, import_sha24.sha256)(candidate)) === paymentHash;
+var hashesTo = (candidate, paymentHash) => import_base14.hex.encode((0, import_sha25.sha256)(candidate)) === paymentHash;
 var candidateWitnessItems = (tx, inputIndex) => [
-  ...(0, import_sdk13.getArkPsbtFields)(tx, inputIndex, import_sdk13.ConditionWitness).flat(),
+  ...(0, import_sdk15.getArkPsbtFields)(tx, inputIndex, import_sdk15.ConditionWitness).flat(),
   ...tx.getInput(inputIndex).finalScriptWitness ?? []
 ];
 async function readLockupFate(indexer, input) {
-  const { vtxos } = await indexer.getVtxos({ scripts: [import_base13.hex.encode(input.swapPkScript)] });
+  const { vtxos } = await indexer.getVtxos({ scripts: [import_base14.hex.encode(input.swapPkScript)] });
   const all = vtxos ?? [];
   if (all.length === 0) return { fate: "unknown" };
-  const exited = all.filter((vtxo) => vtxo.isUnrolled && !(0, import_sdk13.hasTerminalSpend)(vtxo));
+  const exited = all.filter((vtxo) => vtxo.isUnrolled && !(0, import_sdk15.hasTerminalSpend)(vtxo));
   if (exited.length > 0) {
     return {
       fate: "exited",
@@ -3258,7 +3512,7 @@ async function readLockupFate(indexer, input) {
   const spentBy = /* @__PURE__ */ new Map();
   let everySpendNamed = true;
   for (const vtxo of all) {
-    if (!(0, import_sdk13.hasTerminalSpend)(vtxo)) return { fate: "open" };
+    if (!(0, import_sdk15.hasTerminalSpend)(vtxo)) return { fate: "open" };
     if (vtxo.spentBy)
       spentBy.set(vtxo.spentBy, {
         checkpointTxid: vtxo.spentBy,
@@ -3272,7 +3526,7 @@ async function readLockupFate(indexer, input) {
   for (const raw of txs) {
     let tx;
     try {
-      tx = import_sdk13.Transaction.fromPSBT(import_base13.base64.decode(raw));
+      tx = import_sdk15.Transaction.fromPSBT(import_base14.base64.decode(raw));
     } catch {
       continue;
     }
@@ -3280,7 +3534,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_base13.hex.encode(spent.txid);
+      const txid = import_base14.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)) {
@@ -3309,14 +3563,14 @@ async function pushRefundWithoutReceiver(ark, input) {
   const info = await ark.getInfo();
   let serverUnrollScript;
   try {
-    serverUnrollScript = import_sdk13.CSVMultisigTapscript.decode(import_base13.hex.decode(info.checkpointTapscript));
+    serverUnrollScript = import_sdk15.CSVMultisigTapscript.decode(import_base14.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_sdk13.buildOffchainTx)(
+  const { arkTx, checkpoints } = (0, import_sdk15.buildOffchainTx)(
     input.vtxos.map((vtxo) => ({
       txid: vtxo.txid,
       vout: vtxo.vout,
@@ -3329,18 +3583,18 @@ async function pushRefundWithoutReceiver(ark, input) {
   );
   const signedArkTx = await input.sender.sign(arkTx);
   const submitted = await ark.submitTx(
-    import_base13.base64.encode(signedArkTx.toPSBT()),
-    checkpoints.map((c) => import_base13.base64.encode(c.toPSBT()))
+    import_base14.base64.encode(signedArkTx.toPSBT()),
+    checkpoints.map((c) => import_base14.base64.encode(c.toPSBT()))
   );
-  (0, import_sdk13.assertSubmittedArkTxid)(submitted, signedArkTx, "refundWithoutReceiver");
-  const matched = (0, import_sdk13.matchServerCheckpoints)(
+  (0, import_sdk15.assertSubmittedArkTxid)(submitted, signedArkTx, "refundWithoutReceiver");
+  const matched = (0, import_sdk15.matchServerCheckpoints)(
     submitted.signedCheckpointTxs,
     checkpoints,
     "refundWithoutReceiver"
   );
   const finalCheckpoints = await Promise.all(
     matched.map(
-      async ({ server }) => import_base13.base64.encode((await input.sender.sign(server, [0])).toPSBT())
+      async ({ server }) => import_base14.base64.encode((await input.sender.sign(server, [0])).toPSBT())
     )
   );
   await ark.finalizeTx(submitted.arkTxid, finalCheckpoints);
@@ -3435,20 +3689,20 @@ async function pushClaim(ark, input) {
     }
   }
   const committed = input.script.options.preimageHash;
-  if (import_base14.hex.encode((0, import_legacy3.ripemd160)((0, import_sha25.sha256)(input.preimage))) !== import_base14.hex.encode(committed)) {
+  if (import_base15.hex.encode((0, import_legacy4.ripemd160)((0, import_sha26.sha256)(input.preimage))) !== import_base15.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_sdk14.CSVMultisigTapscript.decode(import_base14.hex.decode(info.checkpointTapscript));
+    serverUnrollScript = import_sdk16.CSVMultisigTapscript.decode(import_base15.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_sdk14.signAndSubmitOffchainTx)({
-    identity: (0, import_sdk14.claimWithPreimageIdentity)(input.receiver, input.preimage),
+  const arkTxid = await (0, import_sdk16.signAndSubmitOffchainTx)({
+    identity: (0, import_sdk16.claimWithPreimageIdentity)(input.receiver, input.preimage),
     provider: ark,
     inputs: input.vtxos.map((vtxo) => ({
       txid: vtxo.txid,
@@ -3495,7 +3749,7 @@ async function claimReceiveLockup(indexer, ark, input) {
 }
 
 // src/refundBlocked.ts
-var import_sdk15 = require("@arkade-os/sdk");
+var import_sdk17 = require("@arkade-os/sdk");
 var RefundNotLocallyPossibleError = class extends Error {
   constructor(reason, message, options) {
     super(message, options);
@@ -3512,16 +3766,16 @@ async function senderIdentityForSwapRecord(wallet, record) {
     );
   }
   try {
-    return await (0, import_sdk15.contractSigner)(wallet, record.signingDescriptor);
+    return await (0, import_sdk17.contractSigner)(wallet, record.signingDescriptor);
   } catch (cause) {
-    if (cause instanceof import_sdk15.WalletCannotSignError) {
+    if (cause instanceof import_sdk17.WalletCannotSignError) {
       throw new RefundNotLocallyPossibleError(
         "unsignable-wallet",
         `this wallet holds ${record.signingDescriptor} but cannot sign with it; attach its signer`,
         { cause }
       );
     }
-    if (cause instanceof import_sdk15.ForeignDescriptorError) {
+    if (cause instanceof import_sdk17.ForeignDescriptorError) {
       throw new RefundNotLocallyPossibleError(
         "foreign-descriptor",
         `this wallet cannot derive ${record.signingDescriptor}; the swap was created on another wallet`,
@@ -3556,7 +3810,7 @@ function arkadeRefunder(deps) {
 }
 
 // src/swapManager.ts
-var import_base15 = require("@scure/base");
+var import_base16 = require("@scure/base");
 function nextOnchainAction(input) {
   switch (input.phase.phase) {
     case "unfunded":
@@ -4004,7 +4258,7 @@ var RfqSwapManager = class {
   // ── internals ────────────────────────────────────────────────────────────
   track(swap) {
     this.monitored.set(swap.rfqId, swap);
-    this.byLockupScript.set(import_base15.hex.encode(swap.lockupPkScript), swap);
+    this.byLockupScript.set(import_base16.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
@@ -4013,7 +4267,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_base15.hex.encode(swap.lockupPkScript));
+    if (swap) this.byLockupScript.delete(import_base16.hex.encode(swap.lockupPkScript));
     this.monitored.delete(rfqId);
     this.refundRefused.delete(rfqId);
     this.lastClaimError.delete(rfqId);
@@ -4075,7 +4329,7 @@ var RfqSwapManager = class {
     if (!lockup) {
       try {
         const [existing] = await contracts.getContracts({
-          script: import_base15.hex.encode(swap.lockupPkScript)
+          script: import_base16.hex.encode(swap.lockupPkScript)
         });
         if (existing) {
           this.registered.set(swap.rfqId, true);
@@ -4094,13 +4348,13 @@ var RfqSwapManager = class {
       );
       return;
     }
-    const script = import_base15.hex.encode(lockup.script.pkScript);
-    if (script !== import_base15.hex.encode(swap.lockupPkScript)) {
+    const script = import_base16.hex.encode(lockup.script.pkScript);
+    if (script !== import_base16.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_base15.hex.encode(swap.lockupPkScript)}`
+          `swap ${swap.rfqId} lockup script ${script} does not match its lockupPkScript ${import_base16.hex.encode(swap.lockupPkScript)}`
         )
       );
       return;
@@ -4119,7 +4373,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_base15.hex.encode(swap.lockupPkScript), "retained").catch((error) => this.emitFailed(swap, error));
+    void this.deps.contracts.setContractWatchState(import_base16.hex.encode(swap.lockupPkScript), "retained").catch((error) => this.emitFailed(swap, error));
   }
   arm() {
     if (!this.running) return;
@@ -4592,8 +4846,8 @@ var errorMessage = (error) => error instanceof Error ? error.message : String(er
 var outpointKey = (vtxo) => `${vtxo.txid}:${vtxo.vout}`;
 
 // src/activity.ts
-var import_sdk16 = require("@arkade-os/sdk");
-var import_base16 = require("@scure/base");
+var import_sdk18 = require("@arkade-os/sdk");
+var import_base17 = require("@scure/base");
 var LABELS = {
   lightning_send: "Lightning send",
   lightning_receive: "Lightning receive",
@@ -4668,7 +4922,7 @@ async function activityInputOf(record, indexer) {
 async function lockupTxids(indexer, record, wantFunding) {
   let script;
   try {
-    script = import_base16.hex.encode(import_sdk16.ArkAddress.decode(record.lockupAddress).pkScript);
+    script = import_base17.hex.encode(import_sdk18.ArkAddress.decode(record.lockupAddress).pkScript);
   } catch {
     return [];
   }
@@ -4690,6 +4944,8 @@ async function lockupTxids(indexer, record, wantFunding) {
   ARKADE_BTC,
   AddressMismatch,
   BTC_ASSET_ID,
+  CROSS_ASSET_RAIL,
+  CovclaimdRevealError,
   InMemoryAssetSwapRepository,
   IndexedDbAssetSwapRepository,
   LIGHTNING_BTC,
@@ -4746,8 +5002,10 @@ async function lockupTxids(indexer, record, wantFunding) {
   classifyDepositSpend,
   classifyOnchainHtlc,
   classifySpend,
+  covclaimdClient,
   createOffer,
   createRfqSwapRecord,
+  crossAssetRail,
   decodeOffer,
   deriveLightningReceive,
   deriveOnchainReceive,
@@ -4793,6 +5051,8 @@ async function lockupTxids(indexer, record, wantFunding) {
   requestOnchainSend,
   restoreAssetSwaps,
   retireSettledOfferContracts,
+  revealClaimPacket,
+  revealFieldsFromScript,
   rfqClaimSecretOf,
   rfqPair,
   rfqSecretsProfile,