@arkade-os/swap 0.1.0-rc.21 → 0.1.0-rc.23

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (37) hide show
  1. package/README.md +7 -2
  2. package/dist/advanced.cjs +875 -129
  3. package/dist/advanced.d.cts +158 -14
  4. package/dist/advanced.d.ts +158 -14
  5. package/dist/advanced.js +255 -4
  6. package/dist/{chunk-ITFCQWPG.js → chunk-DQ2DY2L2.js} +223 -11
  7. package/dist/{chunk-HUQQVBC4.js → chunk-MZX62KMU.js} +220 -12
  8. package/dist/{chunk-PVB7EBAM.js → chunk-UFJEO4VV.js} +47 -21
  9. package/dist/{errors-hm7aqnRM.d.cts → errors-5q4e3PnH.d.cts} +48 -16
  10. package/dist/{errors-C3h8ANmE.d.ts → errors-DQ35FKJf.d.ts} +48 -16
  11. package/dist/index.cjs +670 -185
  12. package/dist/index.d.cts +5 -5
  13. package/dist/index.d.ts +5 -5
  14. package/dist/index.js +5 -3
  15. package/dist/node/index.d.cts +26 -4
  16. package/dist/node/index.d.ts +26 -4
  17. package/dist/nostr.cjs +12 -9
  18. package/dist/nostr.d.cts +1 -1
  19. package/dist/nostr.d.ts +1 -1
  20. package/dist/nostr.js +3 -1
  21. package/dist/{offer-Bd9Yvd8Z.d.ts → offer--IpfzhIm.d.ts} +1 -1
  22. package/dist/{offer-F88rtL_I.d.cts → offer-DqTXQeP1.d.cts} +1 -1
  23. package/dist/protocol.cjs +395 -156
  24. package/dist/protocol.d.cts +45 -8
  25. package/dist/protocol.d.ts +45 -8
  26. package/dist/protocol.js +10 -3
  27. package/dist/repositories/realm/index.d.cts +2 -2
  28. package/dist/repositories/realm/index.d.ts +2 -2
  29. package/dist/repositories/sqlite/index.d.cts +2 -2
  30. package/dist/repositories/sqlite/index.d.ts +2 -2
  31. package/dist/{repository-DYnRLPt-.d.ts → repository-B4rQWmS2.d.cts} +88 -20
  32. package/dist/{repository-BuYWGAKz.d.cts → repository-D_qvJk1S.d.ts} +88 -20
  33. package/dist/{rfq-60PGpQ_x.d.cts → rfq-BgdgO9OO.d.cts} +16 -7
  34. package/dist/{rfq-60PGpQ_x.d.ts → rfq-BgdgO9OO.d.ts} +16 -7
  35. package/dist/{watch-BTyiBLSd.d.ts → watch-BkPz0vf8.d.ts} +1 -1
  36. package/dist/{watch-M_KY-5ho.d.cts → watch-RRhKuBkh.d.cts} +1 -1
  37. package/package.json +3 -3
@@ -20,6 +20,7 @@ import {
20
20
  normalizeRfqSwapRecord,
21
21
  offerOutcome,
22
22
  onchainCorridor,
23
+ onchainReceiveProfile,
23
24
  onchainSendProfile,
24
25
  pushClaim,
25
26
  readsChain,
@@ -36,7 +37,7 @@ import {
36
37
  toRestoreTx,
37
38
  walletOperator,
38
39
  watchOfferSwaps
39
- } from "./chunk-ITFCQWPG.js";
40
+ } from "./chunk-DQ2DY2L2.js";
40
41
  import {
41
42
  ARKADE_BTC,
42
43
  ASSET_CARRIER_SATS,
@@ -57,12 +58,14 @@ import {
57
58
  assertFundable,
58
59
  assertPairLength,
59
60
  assertReceivable,
61
+ buildHtlcRefund,
60
62
  claimOnchainFill,
61
63
  createOffer,
62
64
  decodeOffer,
63
65
  deriveLightningReceive,
64
66
  deriveLightningSend,
65
67
  deriveOffer,
68
+ deriveOnchainReceive,
66
69
  deriveOnchainSend,
67
70
  l1NetworkFromArk,
68
71
  l1ScriptForAddress,
@@ -71,6 +74,7 @@ import {
71
74
  lockupContractParams,
72
75
  newRfqId,
73
76
  offerTermsFromQuote,
77
+ onchainReceiveRequest,
74
78
  onchainSendRequest,
75
79
  preimageForSwapRecord,
76
80
  prepareOfferCancel,
@@ -84,7 +88,7 @@ import {
84
88
  sealClaimPacket,
85
89
  unilateralClaimDelay,
86
90
  verifyOfferAddress
87
- } from "./chunk-PVB7EBAM.js";
91
+ } from "./chunk-UFJEO4VV.js";
88
92
  import {
89
93
  assertRfqSwapPageFilter,
90
94
  collectAssetSwaps,
@@ -846,7 +850,8 @@ var corridorRecord = (quote, preparation, now) => {
846
850
  var KIND_OF = {
847
851
  "arkade->lightning": "lightning_send",
848
852
  "lightning->arkade": "lightning_receive",
849
- "arkade->onchain": "onchain_send"
853
+ "arkade->onchain": "onchain_send",
854
+ "onchain->arkade": "onchain_receive"
850
855
  };
851
856
  var profileOf = (preparation, paymentHash) => {
852
857
  const secrets = rfqSecretsProfile(preparation.secrets, paymentHash);
@@ -871,6 +876,20 @@ var profileOf = (preparation, paymentHash) => {
871
876
  payoutPkScript: preparation.payoutPkScript
872
877
  })
873
878
  };
879
+ case "onchain->arkade":
880
+ return {
881
+ ...secrets,
882
+ expectedAmount: toSafeNumber(preparation.expectedAmount, "expectedAmount"),
883
+ payoutAddress: preparation.payoutAddress,
884
+ ...onchainReceiveProfile({
885
+ htlc: preparation.htlc,
886
+ htlcParams: preparation.htlcParams,
887
+ l1Network: preparation.l1Network,
888
+ minConfirmations: preparation.minConfirmations,
889
+ refundPkScript: preparation.refundPkScript,
890
+ refundDescriptor: preparation.refundKey.descriptor
891
+ })
892
+ };
874
893
  }
875
894
  };
876
895
  var acceptQuote = async (input) => runSerialized(input.quote.id, () => acceptQuoteBody(input));
@@ -976,7 +995,7 @@ var fund = async (input, record) => {
976
995
  extensions: [offerExtensionOf(record)]
977
996
  });
978
997
  }
979
- if (record.kind === "lightning_receive") {
998
+ if (record.kind === "lightning_receive" || record.kind === "onchain_receive") {
980
999
  throw new Error(`receive swap ${record.id} funds nothing from this wallet`);
981
1000
  }
982
1001
  return wallet.send({
@@ -1243,6 +1262,11 @@ function resolveCorridorDeps(corridor, overrides, base) {
1243
1262
  case "onchain": {
1244
1263
  const chain = refusedIfNull(overrides?.onchain?.chain, "onchain", "chain source");
1245
1264
  const claim = refusedIfNull(overrides?.onchain?.claim, "onchain", "L1 claim callback");
1265
+ const refund = refusedIfNull(
1266
+ overrides?.onchain?.refund,
1267
+ "onchain",
1268
+ "L1 refund callback"
1269
+ );
1246
1270
  const feeRateOverride = refusedIfMalformed(
1247
1271
  overrides?.onchain?.claimFeeRateSatVb,
1248
1272
  "L1 claim fee rate"
@@ -1257,6 +1281,7 @@ function resolveCorridorDeps(corridor, overrides, base) {
1257
1281
  fetchImpl: base.fetchImpl
1258
1282
  }),
1259
1283
  ...claim === void 0 ? {} : { claim },
1284
+ ...refund === void 0 ? {} : { refund },
1260
1285
  ...claimFeeRateSatVb === void 0 ? {} : { claimFeeRateSatVb },
1261
1286
  claimVsize
1262
1287
  };
@@ -1671,7 +1696,8 @@ var restoredAssetId = (network, id) => id === BTC_ASSET_ID ? btcOn("arkade", net
1671
1696
  var RESTORED_CORRIDORS = {
1672
1697
  lightning_send: ["arkade", "lightning"],
1673
1698
  lightning_receive: ["lightning", "arkade"],
1674
- onchain_send: ["arkade", "onchain"]
1699
+ onchain_send: ["arkade", "onchain"],
1700
+ onchain_receive: ["onchain", "arkade"]
1675
1701
  };
1676
1702
  var restoredCorridorRecord = (stored, network, refundLocktime) => {
1677
1703
  const v1 = normalizeRfqSwapRecord(stored);
@@ -2129,12 +2155,46 @@ var createSwapDrive = (config) => {
2129
2155
  return { txid };
2130
2156
  };
2131
2157
  };
2158
+ const defaultOnchainRefund = (chain, feeRateSatVb) => {
2159
+ return async (swap, utxo) => {
2160
+ const record = await corridorStore().getRfqSwap(swap.rfqId);
2161
+ if (!record) {
2162
+ throw new Error(`rfq swap ${swap.rfqId} has no stored record to refund from`);
2163
+ }
2164
+ const descriptor = record.profile.refundDescriptor;
2165
+ if (typeof descriptor !== "string") {
2166
+ throw new Error(
2167
+ `rfq swap ${swap.rfqId} carries no refund descriptor; wire the onchain corridor's refund callback to take its L1 funding back`
2168
+ );
2169
+ }
2170
+ const signer = await contractSigner(wallet, descriptor);
2171
+ const held = hex5.encode(await signer.xOnlyPublicKey());
2172
+ if (held !== record.profile.refundKey) {
2173
+ throw new Error(
2174
+ `the key behind ${descriptor} is ${held}, not the refund key ${String(record.profile.refundKey)} rfq swap ${swap.rfqId}'s HTLC was derived with`
2175
+ );
2176
+ }
2177
+ const { txHex } = await buildHtlcRefund({
2178
+ htlc: swap.htlc,
2179
+ utxo,
2180
+ payoutPkScript: swap.refundPkScript,
2181
+ feeRateSatVb,
2182
+ sign: (sighash) => signer.signMessage(sighash, "schnorr")
2183
+ });
2184
+ return { txid: await track(chain.broadcast(txHex)) };
2185
+ };
2186
+ };
2132
2187
  const resolveOnchain = async () => {
2133
2188
  if (onchainSeams !== void 0) return onchainSeams !== null;
2134
2189
  try {
2135
2190
  const deps = (await corridors()).get("onchain").deps;
2136
2191
  const claim = deps.claim ?? (deps.claimFeeRateSatVb === void 0 ? void 0 : defaultOnchainClaim(deps.chain, deps.claimFeeRateSatVb));
2137
- onchainSeams = { chain: deps.chain, ...claim ? { claim } : {} };
2192
+ const refund = deps.refund ?? (deps.claimFeeRateSatVb === void 0 ? void 0 : defaultOnchainRefund(deps.chain, deps.claimFeeRateSatVb));
2193
+ onchainSeams = {
2194
+ chain: deps.chain,
2195
+ ...claim ? { claim } : {},
2196
+ ...refund ? { refund } : {}
2197
+ };
2138
2198
  managerDeps.chain = deps.chain;
2139
2199
  return true;
2140
2200
  } catch (error) {
@@ -2218,7 +2278,8 @@ var createSwapDrive = (config) => {
2218
2278
  },
2219
2279
  canRefundArkade,
2220
2280
  claimLockup,
2221
- ...onchainSeams?.claim ? { claimOnchain: onchainSeams.claim } : {}
2281
+ ...onchainSeams?.claim ? { claimOnchain: onchainSeams.claim } : {},
2282
+ ...onchainSeams?.refund ? { refundOnchain: onchainSeams.refund } : {}
2222
2283
  });
2223
2284
  };
2224
2285
  let offerSource;
@@ -2672,7 +2733,8 @@ var SUPPORTED_PAIRS = [
2672
2733
  "arkade->arkade",
2673
2734
  "arkade->lightning",
2674
2735
  "lightning->arkade",
2675
- "arkade->onchain"
2736
+ "arkade->onchain",
2737
+ "onchain->arkade"
2676
2738
  ];
2677
2739
  var isSupportedPair = (pair) => SUPPORTED_PAIRS.includes(pair);
2678
2740
  var assembleRoute = (give, take) => {
@@ -2733,10 +2795,10 @@ var resolveRoute = async (input, deps) => {
2733
2795
  }
2734
2796
  const pair = `${giveLeg.corridor}->${takeLeg.corridor}`;
2735
2797
  if (!isSupportedPair(pair)) {
2736
- throw new UnsupportedRoute(
2737
- pair === "onchain->arkade" ? "onchain -> arkade is not served until the client owns the trader's L1 refund path end to end" : `${pair} is not an implemented route`,
2738
- { give: giveLeg.corridor, take: takeLeg.corridor }
2739
- );
2798
+ throw new UnsupportedRoute(`${pair} is not an implemented route`, {
2799
+ give: giveLeg.corridor,
2800
+ take: takeLeg.corridor
2801
+ });
2740
2802
  }
2741
2803
  const give = endpoint(
2742
2804
  giveLeg.corridor,
@@ -2800,6 +2862,9 @@ var pinAmount = (input, takeInstrument) => {
2800
2862
  return void 0;
2801
2863
  };
2802
2864
 
2865
+ // src/client/policy.ts
2866
+ var DEFAULT_MAX_REFUND_WINDOW_SECONDS = 30 * 24 * 3600;
2867
+
2803
2868
  // src/client/verify.ts
2804
2869
  var reasonOf = (error) => error instanceof Error && typeof error.reason === "string" ? error.reason : void 0;
2805
2870
  var CHECK_BY_REASON = {
@@ -2951,6 +3016,22 @@ var verifyQuoteTtl = (input) => {
2951
3016
  throw new QuoteExpired(input.quoteId, input.expiresAt, input.now);
2952
3017
  }
2953
3018
  };
3019
+ var CSV_GRANULARITY_SECONDS = 512;
3020
+ var verifyRefundWindow = (input) => {
3021
+ const max = input.maxSeconds ?? DEFAULT_MAX_REFUND_WINDOW_SECONDS;
3022
+ const window = input.refundLocktime - input.now;
3023
+ if (!(window <= max)) {
3024
+ throw new QuoteVerificationFailed("refund_window", `at most ${max}s`, `${window}s`);
3025
+ }
3026
+ const delay = input.refundWithoutReceiverDelay;
3027
+ if (delay !== void 0 && !(delay < max + CSV_GRANULARITY_SECONDS)) {
3028
+ throw new QuoteVerificationFailed(
3029
+ "refund_window",
3030
+ `a solo-refund delay of at most ${max}s`,
3031
+ `${delay}s`
3032
+ );
3033
+ }
3034
+ };
2954
3035
  var verifyQuotedAmount = (input) => {
2955
3036
  verifyPinnedAmount(input);
2956
3037
  if (input.take > input.give) {
@@ -3368,6 +3449,8 @@ var quoteViaRfq = async (input) => {
3368
3449
  return quoteLightningReceive(input);
3369
3450
  case "arkade->onchain":
3370
3451
  return quoteOnchainSend(input);
3452
+ case "onchain->arkade":
3453
+ return quoteOnchainReceive(input);
3371
3454
  }
3372
3455
  };
3373
3456
  var quoteArkadeAsset = async (input) => {
@@ -3513,6 +3596,12 @@ var quoteLightningSend = async (input) => {
3513
3596
  now: input.now,
3514
3597
  invoiceExpiresAt: invoice.expiresAt
3515
3598
  });
3599
+ verifyRefundWindow({
3600
+ refundLocktime: derived.refundLocktime,
3601
+ refundWithoutReceiverDelay: derived.contractParams.refundWithoutReceiverDelay,
3602
+ now: input.now,
3603
+ maxSeconds: input.policy?.maxRefundWindowSeconds
3604
+ });
3516
3605
  verifyQuoteTtl({
3517
3606
  quoteId: input.quoteId,
3518
3607
  expiresAt: parsed.validUntil,
@@ -3715,6 +3804,11 @@ var quoteOnchainSend = async (input) => {
3715
3804
  direction: "send"
3716
3805
  }
3717
3806
  });
3807
+ verifyRefundWindow({
3808
+ refundLocktime: derived.refundLocktime,
3809
+ now: input.now,
3810
+ maxSeconds: input.policy?.maxRefundWindowSeconds
3811
+ });
3718
3812
  verifyQuoteTtl({
3719
3813
  quoteId: input.quoteId,
3720
3814
  expiresAt: parsed.validUntil,
@@ -3761,6 +3855,118 @@ var quoteOnchainSend = async (input) => {
3761
3855
  }
3762
3856
  };
3763
3857
  };
3858
+ var quoteOnchainReceive = async (input) => {
3859
+ const pinned = pinnedFor(input);
3860
+ const pair = rfqPairFor(input.legs.give, input.legs.take);
3861
+ const rfqId = newRfqId();
3862
+ const l1Network = l1NetworkFromArk(input.info.network);
3863
+ const secrets = await provisionClaimSecret(input.wallet);
3864
+ const refundKey = await provisionRefundKey(input.wallet);
3865
+ const paymentHash = hex6.encode(secrets.paymentHash);
3866
+ const payoutAddress = await input.wallet.getAddress();
3867
+ const refundPkScript = l1ScriptForAddress(await input.wallet.getBoardingAddress(), l1Network);
3868
+ const wire = await input.transport.requestQuote(
3869
+ withCanonicalAmount(
3870
+ onchainReceiveRequest({
3871
+ rfqId,
3872
+ paymentHash,
3873
+ payoutAddress,
3874
+ payoutPubkey: secrets.pubkey,
3875
+ refundPubkey: refundKey.pubkey,
3876
+ // Placeholder: `withCanonicalAmount` writes the canonical decimal string.
3877
+ amount: 0,
3878
+ amountSide: toRfqAmountSide(pinned.on)
3879
+ }),
3880
+ pinned.value
3881
+ )
3882
+ );
3883
+ verifyPair(wire.pair, pair);
3884
+ const parsed = parseRfqQuote(wire);
3885
+ verifyQuotedAmount({ pair, pinned, give: parsed.give, take: parsed.take });
3886
+ const covenant = covenantInputs(input);
3887
+ const derived = verifyingDerivation(
3888
+ () => deriveOnchainReceive({
3889
+ quote: wire,
3890
+ paymentHash,
3891
+ payoutPubkey: secrets.pubkey,
3892
+ payoutAddress,
3893
+ refundPubkey: refundKey.pubkey,
3894
+ ...covenant,
3895
+ l1Network
3896
+ })
3897
+ );
3898
+ verifySendWindow({
3899
+ quote: wire,
3900
+ quoteId: input.quoteId,
3901
+ now: input.now,
3902
+ onchain: {
3903
+ htlcLocktime: derived.htlcLocktime,
3904
+ minConfirmations: derived.minConfirmations,
3905
+ direction: "receive"
3906
+ }
3907
+ });
3908
+ verifyRefundWindow({
3909
+ refundLocktime: derived.htlcLocktime,
3910
+ now: input.now,
3911
+ maxSeconds: input.policy?.maxRefundWindowSeconds
3912
+ });
3913
+ verifyQuoteTtl({
3914
+ quoteId: input.quoteId,
3915
+ expiresAt: parsed.validUntil,
3916
+ now: input.now,
3917
+ floorSeconds: input.policy?.quoteTtlFloorSeconds
3918
+ });
3919
+ const artifact = {
3920
+ kind: "deposit",
3921
+ corridor: "onchain",
3922
+ address: derived.htlc.address,
3923
+ asset: input.endpoints.give.asset,
3924
+ amount: parsed.give,
3925
+ expiresAt: parsed.validUntil
3926
+ };
3927
+ return {
3928
+ quote: {
3929
+ id: input.quoteId,
3930
+ route: assembleRoute(
3931
+ {
3932
+ ...input.endpoints.give,
3933
+ instrument: {
3934
+ kind: "address",
3935
+ address: derived.htlc.address,
3936
+ amount: parsed.give
3937
+ }
3938
+ },
3939
+ { ...input.endpoints.take, instrument: { kind: "wallet" } }
3940
+ ),
3941
+ give: { asset: input.endpoints.give.asset, amount: parsed.give },
3942
+ take: { asset: input.endpoints.take.asset, amount: parsed.take },
3943
+ lock: { hash: paymentHash },
3944
+ market: input.market,
3945
+ solver: parsed.solver,
3946
+ expiresAt: parsed.validUntil,
3947
+ refundLocktime: derived.refundLocktime,
3948
+ artifact,
3949
+ fee: { amount: parsed.give - parsed.take, asset: input.endpoints.give.asset }
3950
+ },
3951
+ preparation: {
3952
+ backend: "rfq",
3953
+ route: "onchain->arkade",
3954
+ card: input.candidate.card,
3955
+ rfqId,
3956
+ wire: parsed,
3957
+ lockup: lockupOf(derived),
3958
+ secrets,
3959
+ payoutAddress,
3960
+ expectedAmount: parsed.take,
3961
+ refundKey,
3962
+ refundPkScript,
3963
+ htlc: derived.htlc,
3964
+ htlcParams: derived.htlcParams,
3965
+ l1Network,
3966
+ minConfirmations: derived.minConfirmations
3967
+ }
3968
+ };
3969
+ };
3764
3970
 
3765
3971
  // src/client/verbs.ts
3766
3972
  import { arkTarget as arkTarget2, resolveSendAmount as resolveSendAmount2 } from "@arkade-os/sdk";
@@ -4219,6 +4425,7 @@ export {
4219
4425
  isCardMarket,
4220
4426
  assembleRoute,
4221
4427
  resolveRoute,
4428
+ DEFAULT_MAX_REFUND_WINDOW_SECONDS,
4222
4429
  verifyResponder,
4223
4430
  verifyPair,
4224
4431
  verifyingDerivation,
@@ -4227,6 +4434,7 @@ export {
4227
4434
  verifySendInvoice,
4228
4435
  verifyReceiveInvoiceFacts,
4229
4436
  verifyQuoteTtl,
4437
+ verifyRefundWindow,
4230
4438
  verifyQuotedAmount,
4231
4439
  verifyCrossAssetAmount,
4232
4440
  verifiedCarrierSats,
@@ -880,6 +880,7 @@ import { hex as hex4 } from "@scure/base";
880
880
  import { sha256 as sha2562 } from "@noble/hashes/sha2.js";
881
881
  import { ripemd160 } from "@noble/hashes/legacy.js";
882
882
  import * as btc from "@scure/btc-signer";
883
+ import { assertTimerMs } from "@arkade-os/sdk";
883
884
  var ONCHAIN_ORDER_MARGIN_SECONDS = 2 * 60 * 60;
884
885
  var ONCHAIN_CLAIM_MARGIN_SECONDS = 90 * 60;
885
886
  var MAX_MIN_CONFIRMATIONS = 6;
@@ -903,6 +904,7 @@ var gateError = (reason, message) => {
903
904
  var sleep = (ms) => new Promise((resolve) => setTimeout(resolve, ms));
904
905
  async function pollUntil(probe, options, reason, message) {
905
906
  const pollMs = options.pollMs ?? 5e3;
907
+ assertTimerMs("pollMs", pollMs);
906
908
  for (; ; ) {
907
909
  const value = await probe();
908
910
  if (value !== void 0) return value;
@@ -1212,6 +1214,7 @@ import { isAmount } from "@arkade-os/solver-discovery";
1212
1214
  import { ripemd160 as ripemd1602 } from "@noble/hashes/legacy.js";
1213
1215
  import {
1214
1216
  ArkAddress as ArkAddress3,
1217
+ assertTimerMs as assertTimerMs2,
1215
1218
  VHTLC,
1216
1219
  networkFromArkadeInfo as networkFromArkadeInfo2,
1217
1220
  resolveEmulatorPubkey as resolveEmulatorPubkey2,
@@ -1459,6 +1462,12 @@ var assertFundable = (input) => {
1459
1462
  const fail = (reason, message) => {
1460
1463
  throw gateError(reason, message);
1461
1464
  };
1465
+ if (input.quote.pair.split("->").some((leg) => leg.startsWith("ethereum:"))) {
1466
+ fail(
1467
+ "evm_funding_unavailable",
1468
+ "EVM funding is unavailable until local contract, finality, and deadline verification is implemented"
1469
+ );
1470
+ }
1462
1471
  if (input.quote.valid_until === void 0) {
1463
1472
  fail("quote_malformed", "quote carries no valid_until");
1464
1473
  }
@@ -1592,6 +1601,7 @@ var httpTransport = (baseUrl, options = {}) => {
1592
1601
  };
1593
1602
  var relayTransport = (relayUrl, options) => {
1594
1603
  const timeoutMs = options.timeoutMs ?? 3e4;
1604
+ assertTimerMs2("timeoutMs", timeoutMs);
1595
1605
  const Ctor = options.WebSocketCtor ?? WebSocket;
1596
1606
  const pending = /* @__PURE__ */ new Map();
1597
1607
  let sequence = 0;
@@ -2258,15 +2268,29 @@ var provisionReceive = async (wallet, covclaimdPubkey, persistBefore) => {
2258
2268
  const claimPacket = covclaimdPubkey ? await sealClaimPacket({ preimage, covclaimdPubkey }) : void 0;
2259
2269
  return { secrets, paymentHash, payoutPubkey, info, payoutAddress, claimPacket };
2260
2270
  };
2271
+ var quoteReceive = async (wallet, transport, covclaimdPubkey, persistBefore, request) => {
2272
+ for (let attempt = 0; ; attempt++) {
2273
+ const provisioned = await provisionReceive(wallet, covclaimdPubkey, persistBefore);
2274
+ try {
2275
+ return { ...provisioned, quote: await transport.requestQuote(request(provisioned)) };
2276
+ } catch (error) {
2277
+ const conflict = error instanceof SwapRefusal && error.reason === "quote_conflict";
2278
+ if (!conflict || attempt >= 1) throw error;
2279
+ }
2280
+ }
2281
+ };
2261
2282
  async function requestLightningReceive(wallet, transport, params) {
2262
2283
  const rfqId = params.rfqId ?? newRfqId();
2263
- const { secrets, paymentHash, payoutPubkey, info, payoutAddress, claimPacket } = await provisionReceive(wallet, params.covclaimdPubkey, "paying");
2264
- const quote = await transport.requestQuote(
2265
- lightningReceiveRequest({
2284
+ const { secrets, paymentHash, payoutPubkey, info, payoutAddress, quote } = await quoteReceive(
2285
+ wallet,
2286
+ transport,
2287
+ params.covclaimdPubkey,
2288
+ "paying",
2289
+ ({ paymentHash: paymentHash2, payoutAddress: payoutAddress2, payoutPubkey: payoutPubkey2, claimPacket }) => lightningReceiveRequest({
2266
2290
  rfqId,
2267
- paymentHash,
2268
- payoutAddress,
2269
- payoutPubkey,
2291
+ paymentHash: paymentHash2,
2292
+ payoutAddress: payoutAddress2,
2293
+ payoutPubkey: payoutPubkey2,
2270
2294
  claimPacket: claimPacket?.packet,
2271
2295
  amount: params.amount,
2272
2296
  amountSide: params.amountSide
@@ -2326,21 +2350,20 @@ function deriveOnchainReceive(input) {
2326
2350
  refundLocktime,
2327
2351
  solverRefundPkScriptHex
2328
2352
  ).matched;
2329
- const htlc = onchainHtlcScript(
2330
- {
2331
- paymentHash: input.paymentHash,
2332
- claimKey: toXOnly(hex5.decode(claimPubkey), "solver L1 claim key"),
2333
- refundKey: input.refundPubkey,
2334
- refundLocktime: htlcLocktime
2335
- },
2336
- input.l1Network
2337
- );
2353
+ const htlcParams = {
2354
+ paymentHash: input.paymentHash,
2355
+ claimKey: toXOnly(hex5.decode(claimPubkey), "solver L1 claim key"),
2356
+ refundKey: input.refundPubkey,
2357
+ refundLocktime: htlcLocktime
2358
+ };
2359
+ const htlc = onchainHtlcScript(htlcParams, input.l1Network);
2338
2360
  if (htlc.address !== htlcAddress) throw new AddressMismatch(htlc.address, htlcAddress);
2339
2361
  return {
2340
2362
  address,
2341
2363
  swapPkScript: script.pkScript,
2342
2364
  script,
2343
2365
  htlc,
2366
+ htlcParams,
2344
2367
  refundLocktime,
2345
2368
  htlcLocktime,
2346
2369
  minConfirmations
@@ -2348,13 +2371,16 @@ function deriveOnchainReceive(input) {
2348
2371
  }
2349
2372
  async function requestOnchainReceive(wallet, transport, params) {
2350
2373
  const rfqId = params.rfqId ?? newRfqId();
2351
- const { secrets, paymentHash, payoutPubkey, info, payoutAddress, claimPacket } = await provisionReceive(wallet, params.covclaimdPubkey, "funding");
2352
- const quote = await transport.requestQuote(
2353
- onchainReceiveRequest({
2374
+ const { secrets, paymentHash, payoutPubkey, info, payoutAddress, quote } = await quoteReceive(
2375
+ wallet,
2376
+ transport,
2377
+ params.covclaimdPubkey,
2378
+ "funding",
2379
+ ({ paymentHash: paymentHash2, payoutAddress: payoutAddress2, payoutPubkey: payoutPubkey2, claimPacket }) => onchainReceiveRequest({
2354
2380
  rfqId,
2355
- paymentHash,
2356
- payoutAddress,
2357
- payoutPubkey,
2381
+ paymentHash: paymentHash2,
2382
+ payoutAddress: payoutAddress2,
2383
+ payoutPubkey: payoutPubkey2,
2358
2384
  refundPubkey: params.refundPubkey,
2359
2385
  claimPacket: claimPacket?.packet,
2360
2386
  amount: params.amount,