@arkade-os/swap 0.0.11 → 0.0.13

package/dist/{chunk-RIC5ZTZK.js → chunk-IFZOBTTG.js}

@@ -17,6 +17,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");
@@ -199,7 +200,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(hex.decode(spend.txHex), {
@@ -451,6 +456,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) {
@@ -754,7 +796,7 @@ var lightningReceiveRequest = (input) => ({
     payment_hash: input.paymentHash,
     payout_address: input.payoutAddress,
     payout_pubkey: hex3.encode(input.payoutPubkey),
-    claim_packet: input.claimPacket
+    ...input.claimPacket === void 0 ? {} : { claim_packet: input.claimPacket }
   }
 });
 var onchainReceiveRequest = (input) => ({
@@ -766,7 +808,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: hex3.encode(input.refundPubkey),
     payout_address: input.payoutAddress,
     payout_pubkey: hex3.encode(input.payoutPubkey)
@@ -846,6 +888,7 @@ async function requestOnchainSend(wallet, arkServerUrl, transport, params) {
       amountSide: params.amountSide
     })
   );
+  assertQuotedAmount(quote, params.amountSide, params.amount);
   const network = getNetwork(info.network);
   const derived = deriveOnchainSend({
     quote,
@@ -1036,17 +1079,17 @@ async function requestLightningReceive(wallet, arkServerUrl, transport, params)
     new 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
     })
@@ -1159,10 +1202,10 @@ async function requestOnchainReceive(wallet, arkServerUrl, transport, params) {
     new 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,
@@ -1170,7 +1213,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
     })
@@ -1230,6 +1273,8 @@ export {
   ONCHAIN_DUST_SATS,
   newPreimage,
   paymentHashOf,
+  L1_NETWORKS,
+  l1ScriptForAddress,
   onchainHtlcScript,
   buildHtlcClaim,
   buildHtlcRefund,