@arkade-os/swap 0.0.6 → 0.0.8

package/dist/{chunk-Q4FAYBXS.js → chunk-TU4NGZDP.js}

@@ -25,6 +25,11 @@ function onchainHtlcScript(params, network) {
       `refundLocktime must be a positive unix timestamp, got ${params.refundLocktime}`
     );
   }
+  if (!Object.hasOwn(L1_NETWORKS, network)) {
+    throw new Error(
+      `unknown L1 network '${String(network)}' \u2014 expected one of ${Object.keys(L1_NETWORKS).join(", ")}`
+    );
+  }
   const h160 = h160FromPaymentHash(params.paymentHash);
   const claim = btc.Script.encode([
     "SIZE",
@@ -249,10 +254,27 @@ async function sealWithEntropy(input, ephemeralKey, nonce) {
 
 // src/lockupContract.ts
 import { hex as hex2 } from "@scure/base";
-import { VHTLCV2ContractHandler } from "@arkade-os/sdk";
+import {
+  ArkAddress,
+  VHTLCV2ContractHandler
+} from "@arkade-os/sdk";
 var SWAP_LOCKUP_CONTRACT_TYPE = "vhtlc-v2";
 var SWAP_LOCKUP_CONTRACT_LABEL = "Arkade RFQ swap lockup";
 var SWAP_LOCKUP_CONTRACT_KIND = "rfq-swap-lockup";
+var LockupContractMissing = class extends Error {
+  /** The lockup whose row is absent. */
+  address;
+  /** Its pkScript hex — the key the row would have been under. */
+  script;
+  constructor(address, script) {
+    super(
+      `no contract row for lockup ${address} (script ${script}); its covenant cannot be rebuilt from this wallet's contract store`
+    );
+    this.name = "LockupContractMissing";
+    this.address = address;
+    this.script = script;
+  }
+};
 var LockupRegistrationFailed = class extends Error {
   /** The lockup address that was never registered — never fund it: nothing
    * is watching it. */
@@ -281,12 +303,18 @@ async function registerLockupContract(contracts, script, address) {
     throw new LockupRegistrationFailed(script, address, error);
   }
 }
+async function lockupContractParams(contracts, lockupAddress) {
+  const script = hex2.encode(ArkAddress.decode(lockupAddress).pkScript);
+  const [row] = await contracts.getContracts({ script });
+  if (!row) throw new LockupContractMissing(lockupAddress, script);
+  return row.params;
+}
 
 // src/rfq.ts
 import { hex as hex3 } from "@scure/base";
 import { ripemd160 as ripemd1602 } from "@noble/hashes/legacy.js";
 import {
-  ArkAddress,
+  ArkAddress as ArkAddress2,
   RestArkProvider,
   VHTLC,
   getNetwork,
@@ -311,9 +339,10 @@ var solverHex = (value, field) => {
   }
 };
 var ARKADE_BTC = "arkade:BTC";
-var ARKADE_ASSET = "arkade:ASSET";
 var LIGHTNING_BTC = "lightning:BTC";
 var ONCHAIN_BTC = "onchain:BTC";
+var arkadeAssetLeg = (id) => `arkade:${id.toString()}`;
+var ARKADE_ASSET = "arkade:ASSET";
 var rfqPair = (from, to) => `${from}->${to}`;
 var LIGHTNING_SEND_PAIR = rfqPair(ARKADE_BTC, LIGHTNING_BTC);
 var LIGHTNING_RECEIVE_PAIR = rfqPair(LIGHTNING_BTC, ARKADE_BTC);
@@ -354,23 +383,34 @@ var lightningSendRequest = (input) => ({
   }
 });
 var arkadeSwapRequest = (input) => {
-  if (Boolean(input.wantAsset) === Boolean(input.offerAsset)) {
-    throw new Error("set exactly one of wantAsset (BTC->asset) or offerAsset (asset->BTC)");
+  if (!input.wantAsset && !input.offerAsset) {
+    throw new Error(
+      "set exactly one of wantAsset (BTC->asset) or offerAsset (asset->BTC) \u2014 with neither set both legs are BTC, which is not a swap"
+    );
   }
+  if (input.wantAsset && input.offerAsset) {
+    throw new Error(
+      "set exactly one of wantAsset (BTC->asset) or offerAsset (asset->BTC) \u2014 asset->asset is nameable on the wire but no solver quotes it yet"
+    );
+  }
+  const pair = rfqPair(
+    input.offerAsset ? arkadeAssetLeg(input.offerAsset) : ARKADE_BTC,
+    input.wantAsset ? arkadeAssetLeg(input.wantAsset) : ARKADE_BTC
+  );
+  assertPairLength(pair);
   return {
     v: 1,
     type: "rfq_request",
     rfq_id: input.rfqId,
-    pair: rfqPair(
-      input.offerAsset ? ARKADE_ASSET : ARKADE_BTC,
-      input.wantAsset ? ARKADE_ASSET : ARKADE_BTC
-    ),
+    pair,
     amount_side: input.amountSide,
     amount: input.amount,
-    profile: {
-      ...input.offerAsset && { offer_asset: hex3.encode(input.offerAsset.serialize()) },
-      ...input.wantAsset && { want_asset: hex3.encode(input.wantAsset.serialize()) }
-    }
+    // The pair is the only place the asset ids appear. Repeating them here
+    // would be a key the solver's `.strict()` profile schema does not
+    // declare, and an undeclared key is `unsupported_payload` — a refusal,
+    // not an ignored extra. Empty, not absent: `profile` is required on
+    // every other request shape this wire carries.
+    profile: {}
   };
 };
 var MIN_HEADROOM_SECONDS = 90 * 60;
@@ -384,6 +424,14 @@ var assertFinite = (value, reason, label) => {
     throw gateError(reason, `${label} is not a finite number (${String(value)})`);
   }
 };
+var MAX_PAIR_LENGTH = 158;
+var assertPairLength = (pair) => {
+  if (pair.length > MAX_PAIR_LENGTH) {
+    throw new Error(
+      `pair is ${pair.length} characters, over the wire's ${MAX_PAIR_LENGTH}-character limit`
+    );
+  }
+};
 var verifyLockupAddress = (quote, derivedAddress) => {
   const quoted = quote.profile?.lockup_address;
   if (derivedAddress !== quoted) throw new AddressMismatch(derivedAddress, quoted);
@@ -423,14 +471,20 @@ var assertFundable = (input) => {
     }
   }
 };
-var expectQuote = (payload, rfqId) => {
+var expectQuote = (payload, rfqId, requestedPair) => {
   const p = payload;
   if (p?.type === "rfq_refusal") throw new SwapRefusal(p.reason ?? "unknown", p.rfq_id ?? rfqId);
   if (p?.type !== "rfq_quote" || p.rfq_id !== rfqId) {
     throw new Error(`unexpected reply: ${p?.type ?? "no payload"}`);
   }
+  if (requestedPair !== void 0 && p.pair !== requestedPair) {
+    throw new Error(
+      `solver quoted ${JSON.stringify(p.pair)}, not the requested ${requestedPair}`
+    );
+  }
   return payload;
 };
+var pairOf = (payload) => typeof payload.pair === "string" ? payload.pair : void 0;
 var httpTransport = (baseUrl, options = {}) => {
   const fetchImpl = options.fetchImpl ?? fetch;
   const readJson = async (response, what) => {
@@ -450,7 +504,11 @@ var httpTransport = (baseUrl, options = {}) => {
         headers: { "content-type": "application/json" },
         body: JSON.stringify(payload)
       });
-      return expectQuote(await readJson(response, "quote request"), String(payload.rfq_id));
+      return expectQuote(
+        await readJson(response, "quote request"),
+        String(payload.rfq_id),
+        pairOf(payload)
+      );
     },
     async status(rfqId) {
       const response = await fetchImpl(`${baseUrl}/v1/rfq/${rfqId}`, { method: "GET" });
@@ -527,7 +585,8 @@ var relayTransport = (relayUrl, options) => {
     async requestQuote(payload) {
       return expectQuote(
         await roundTrip(payload, String(payload.rfq_id)),
-        String(payload.rfq_id)
+        String(payload.rfq_id),
+        pairOf(payload)
       );
     },
     async status(rfqId) {
@@ -618,7 +677,7 @@ async function requestLightningSend(wallet, arkServerUrl, transport, params) {
   }
   const serverPubkey = xOnly(hex3.decode(info.signerPubkey), "ark signer key");
   const network = getNetwork(info.network);
-  const script = lightningSendVtxoScript({
+  const treeParams = {
     solverPubkey: xOnly(hex3.decode(quote.solver_pubkey), "solver key"),
     refundLocktime: quote.refund_locktime,
     serverPubkey,
@@ -630,8 +689,9 @@ async function requestLightningSend(wallet, arkServerUrl, transport, params) {
     ),
     senderPubkey,
     receiverPkScript: solverHex(receiverPkScriptHex, "profile.receiver_pk_script"),
-    refundPkScript: ArkAddress.decode(refundAddress).pkScript
-  });
+    refundPkScript: ArkAddress2.decode(refundAddress).pkScript
+  };
+  const script = lightningSendVtxoScript(treeParams);
   const address = script.address(network.hrp, serverPubkey).encode();
   verifyLockupAddress(quote, address);
   assertFundable({
@@ -651,7 +711,8 @@ async function requestLightningSend(wallet, arkServerUrl, transport, params) {
     script,
     refundAddress,
     senderPubkey,
-    secrets
+    secrets,
+    treeParams
   };
 }
 var offerTermsFromQuote = (quote, assets) => {
@@ -725,25 +786,25 @@ function deriveOnchainSend(input) {
     emulatorPubkey: input.emulatorPubkey,
     senderPubkey: input.senderPubkey,
     receiverPkScript: solverHex(receiverPkScriptHex, "profile.receiver_pk_script"),
-    refundPkScript: ArkAddress.decode(input.refundAddress).pkScript
+    refundPkScript: ArkAddress2.decode(input.refundAddress).pkScript
   });
   const address = script.address(input.hrp, input.serverPubkey).encode();
   verifyLockupAddress(quote, address);
-  const htlc = onchainHtlcScript(
-    {
-      paymentHash: input.paymentHash,
-      claimKey: input.payoutPubkey,
-      refundKey: xOnly(hex3.decode(htlcPubkey), "solver L1 htlc key"),
-      refundLocktime: htlcLocktime
-    },
-    input.l1Network
-  );
+  const htlcParams = {
+    paymentHash: input.paymentHash,
+    claimKey: input.payoutPubkey,
+    refundKey: xOnly(hex3.decode(htlcPubkey), "solver L1 htlc key"),
+    refundLocktime: htlcLocktime
+  };
+  const htlc = onchainHtlcScript(htlcParams, input.l1Network);
   if (htlc.address !== htlcAddress) throw new AddressMismatch(htlc.address, htlcAddress);
   return {
     address,
     swapPkScript: script.pkScript,
     script,
     htlc,
+    htlcParams,
+    l1Network: input.l1Network,
     refundLocktime,
     htlcLocktime,
     minConfirmations
@@ -813,6 +874,9 @@ async function requestOnchainSend(wallet, arkServerUrl, transport, params) {
     script: derived.script,
     refundAddress,
     htlc: derived.htlc,
+    htlcParams: derived.htlcParams,
+    l1Network: derived.l1Network,
+    minConfirmations: derived.minConfirmations,
     senderPubkey,
     secrets
   };
@@ -919,7 +983,7 @@ function deriveLightningReceive(input) {
   if (refundLocktime === void 0 || invoice === void 0 || solverRefundPkScriptHex === void 0) {
     throw new Error("lightning-receive quote is missing a binding field");
   }
-  const script = receiveVtxoScript({
+  const treeParams = {
     solverPubkey: xOnly(hex3.decode(quote.solver_pubkey), "solver key"),
     refundLocktime,
     serverPubkey: input.serverPubkey,
@@ -928,11 +992,12 @@ function deriveLightningReceive(input) {
     emulatorPubkey: input.emulatorPubkey,
     solverRefundPkScript: solverHex(solverRefundPkScriptHex, "profile.solver_refund_pk_script"),
     payoutPubkey: input.payoutPubkey,
-    payoutPkScript: ArkAddress.decode(input.payoutAddress).pkScript
-  });
+    payoutPkScript: ArkAddress2.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 };
+  return { address, swapPkScript: script.pkScript, script, invoice, refundLocktime, treeParams };
 }
 async function requestLightningReceive(wallet, arkServerUrl, transport, params) {
   const rfqId = params.rfqId ?? newRfqId();
@@ -1004,7 +1069,8 @@ async function requestLightningReceive(wallet, arkServerUrl, transport, params)
     script: derived.script,
     payoutAddress,
     payoutPubkey,
-    secrets
+    secrets,
+    treeParams: derived.treeParams
   };
 }
 function deriveOnchainReceive(input) {
@@ -1028,7 +1094,7 @@ function deriveOnchainReceive(input) {
     emulatorPubkey: input.emulatorPubkey,
     solverRefundPkScript: solverHex(solverRefundPkScriptHex, "profile.solver_refund_pk_script"),
     payoutPubkey: input.payoutPubkey,
-    payoutPkScript: ArkAddress.decode(input.payoutAddress).pkScript
+    payoutPkScript: ArkAddress2.decode(input.payoutAddress).pkScript
   });
   const address = script.address(input.hrp, input.serverPubkey).encode();
   verifyLockupAddress(quote, address);
@@ -1148,12 +1214,15 @@ export {
   SWAP_LOCKUP_CONTRACT_TYPE,
   SWAP_LOCKUP_CONTRACT_LABEL,
   SWAP_LOCKUP_CONTRACT_KIND,
+  LockupContractMissing,
   LockupRegistrationFailed,
   registerLockupContract,
+  lockupContractParams,
   ARKADE_BTC,
-  ARKADE_ASSET,
   LIGHTNING_BTC,
   ONCHAIN_BTC,
+  arkadeAssetLeg,
+  ARKADE_ASSET,
   rfqPair,
   LIGHTNING_SEND_PAIR,
   LIGHTNING_RECEIVE_PAIR,
@@ -1168,6 +1237,8 @@ export {
   MIN_HEADROOM_SECONDS,
   verifyLockupAddress,
   assertFundable,
+  expectQuote,
+  pairOf,
   httpTransport,
   relayTransport,
   SOLO_REFUND_HEADROOM_SECONDS,