@arkade-os/swap 0.1.11 → 0.1.12

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.
package/dist/advanced.cjs CHANGED
@@ -3246,7 +3246,7 @@ var openRfqTransport_exports = {};
3246
3246
  __export(openRfqTransport_exports, {
3247
3247
  collectOpenRfqBids: () => collectOpenRfqBids
3248
3248
  });
3249
- var import_nostr_tools2, MAX_BIDS, MAX_AUTHENTICATED_REPLY_DECRYPTIONS, MAX_EVENT_CONTENT, MAX_WINDOW_MS, collectOpenRfqBids;
3249
+ var import_nostr_tools2, MAX_BIDS, MAX_AUTHENTICATED_REPLY_DECRYPTIONS, MAX_EVENT_CONTENT, MAX_WINDOW_MS, CLOCK_SKEW_SECONDS, collectOpenRfqBids;
3250
3250
  var init_openRfqTransport = __esm({
3251
3251
  "src/openRfqTransport.ts"() {
3252
3252
  "use strict";
@@ -3259,6 +3259,7 @@ var init_openRfqTransport = __esm({
3259
3259
  MAX_AUTHENTICATED_REPLY_DECRYPTIONS = 256;
3260
3260
  MAX_EVENT_CONTENT = 1e5;
3261
3261
  MAX_WINDOW_MS = 3e4;
3262
+ CLOCK_SKEW_SECONDS = 30;
3262
3263
  collectOpenRfqBids = (request, options) => {
3263
3264
  const payload = openRfqPayload(request);
3264
3265
  const windowMs = options.windowMs ?? 3e3;
@@ -3315,7 +3316,12 @@ var init_openRfqTransport = __esm({
3315
3316
  try {
3316
3317
  subscription = pool.subscribeMany(
3317
3318
  relays,
3318
- { kinds: [RFQ_DIRECTED_KIND], "#p": [clientPubkey], "#e": [event.id], since: now },
3319
+ {
3320
+ kinds: [RFQ_DIRECTED_KIND],
3321
+ "#p": [clientPubkey],
3322
+ "#e": [event.id],
3323
+ since: now - CLOCK_SKEW_SECONDS
3324
+ },
3319
3325
  {
3320
3326
  onevent(reply) {
3321
3327
  const current = Math.floor(Date.now() / 1e3);
@@ -3323,7 +3329,7 @@ var init_openRfqTransport = __esm({
3323
3329
  (tag) => Array.isArray(tag) && tag.length <= 8 && tag.every(
3324
3330
  (value) => typeof value === "string" && value.length <= 1024
3325
3331
  )
3326
- ) || Date.now() >= started + duration || reply.kind !== RFQ_DIRECTED_KIND || reply.content.length > MAX_EVENT_CONTENT || !Number.isSafeInteger(reply.created_at) || reply.created_at < event.created_at || reply.created_at > current + 5 || reply.created_at >= request.bidsUntil || seen.has(reply.id) || seen.size >= MAX_AUTHENTICATED_REPLY_DECRYPTIONS)
3332
+ ) || Date.now() >= started + duration || reply.kind !== RFQ_DIRECTED_KIND || reply.content.length > MAX_EVENT_CONTENT || !Number.isSafeInteger(reply.created_at) || reply.created_at < event.created_at - CLOCK_SKEW_SECONDS || reply.created_at > current + CLOCK_SKEW_SECONDS || reply.created_at >= request.bidsUntil || seen.has(reply.id) || seen.size >= MAX_AUTHENTICATED_REPLY_DECRYPTIONS)
3327
3333
  return;
3328
3334
  const recipients = reply.tags.filter((tag) => tag[0] === "p");
3329
3335
  const references = reply.tags.filter((tag) => tag[0] === "e");
@@ -7169,12 +7175,12 @@ var corridorRecordStore = (repository, onRecord = () => {
7169
7175
  }
7170
7176
  };
7171
7177
  };
7172
- var covenantOf = (swap) => {
7173
- if (swap.binding !== void 0)
7174
- return {
7175
- binding: swap.binding,
7176
- ...swap.offerHex === void 0 ? {} : { offerHex: swap.offerHex }
7177
- };
7178
+ var covenantOf = (swap) => ({
7179
+ ...swap.offerHex === void 0 ? {} : { offerHex: swap.offerHex },
7180
+ ...swap.binding === void 0 ? {} : { binding: swap.binding }
7181
+ });
7182
+ var restoredCovenant = (swap) => {
7183
+ if (swap.binding !== void 0) return { ...covenantOf(swap), binding: swap.binding };
7178
7184
  if (swap.offerHex !== void 0) return { offerHex: swap.offerHex };
7179
7185
  throw new Error("this offer swap carries neither a binding nor an offerHex to rebuild from");
7180
7186
  };
@@ -7254,7 +7260,7 @@ var restoredOfferRecord = (swap, network, now) => {
7254
7260
  market: { kind: "restored", backend: "feed" },
7255
7261
  expiresAt: createdAt,
7256
7262
  status: swap.status,
7257
- ...covenantOf(swap),
7263
+ ...restoredCovenant(swap),
7258
7264
  swapAddress: swap.swapAddress,
7259
7265
  swapPkScript: swap.swapPkScript,
7260
7266
  fundingTxid: swap.fundingTxid,
package/dist/advanced.js CHANGED
@@ -122,7 +122,7 @@ import {
122
122
  withCanonicalAmount,
123
123
  withDepositFate,
124
124
  withRfqState
125
- } from "./chunk-ZJFQCUYP.js";
125
+ } from "./chunk-F3BGKWIB.js";
126
126
  import {
127
127
  ACTIVITY_TOKEN,
128
128
  Amount,
@@ -157,7 +157,7 @@ import {
157
157
  recordOutcome,
158
158
  swapOf,
159
159
  toAtomicDecimal
160
- } from "./chunk-SRJM7MKP.js";
160
+ } from "./chunk-JBTU7Y6M.js";
161
161
  import {
162
162
  AcceptConflict,
163
163
  AmbiguousDestination,
@@ -62,7 +62,7 @@ import {
62
62
  undeliveredCarry,
63
63
  walletOperator,
64
64
  watchOfferSwaps
65
- } from "./chunk-SRJM7MKP.js";
65
+ } from "./chunk-JBTU7Y6M.js";
66
66
  import {
67
67
  AcceptConflict,
68
68
  AmbiguousDestination,
@@ -1487,12 +1487,12 @@ var corridorRecordStore = (repository, onRecord = () => {
1487
1487
  }
1488
1488
  };
1489
1489
  };
1490
- var covenantOf = (swap) => {
1491
- if (swap.binding !== void 0)
1492
- return {
1493
- binding: swap.binding,
1494
- ...swap.offerHex === void 0 ? {} : { offerHex: swap.offerHex }
1495
- };
1490
+ var covenantOf = (swap) => ({
1491
+ ...swap.offerHex === void 0 ? {} : { offerHex: swap.offerHex },
1492
+ ...swap.binding === void 0 ? {} : { binding: swap.binding }
1493
+ });
1494
+ var restoredCovenant = (swap) => {
1495
+ if (swap.binding !== void 0) return { ...covenantOf(swap), binding: swap.binding };
1496
1496
  if (swap.offerHex !== void 0) return { offerHex: swap.offerHex };
1497
1497
  throw new Error("this offer swap carries neither a binding nor an offerHex to rebuild from");
1498
1498
  };
@@ -1572,7 +1572,7 @@ var restoredOfferRecord = (swap, network, now) => {
1572
1572
  market: { kind: "restored", backend: "feed" },
1573
1573
  expiresAt: createdAt,
1574
1574
  status: swap.status,
1575
- ...covenantOf(swap),
1575
+ ...restoredCovenant(swap),
1576
1576
  swapAddress: swap.swapAddress,
1577
1577
  swapPkScript: swap.swapPkScript,
1578
1578
  fundingTxid: swap.fundingTxid,
@@ -4761,7 +4761,7 @@ var createSwapClient = (config) => {
4761
4761
  let progressRevision = 0;
4762
4762
  try {
4763
4763
  ensureLive("openRfq");
4764
- const { collectOpenRfqBids } = await import("./openRfqTransport-VFTIZEEO.js");
4764
+ const { collectOpenRfqBids } = await import("./openRfqTransport-MQZ7JWYN.js");
4765
4765
  ensureLive("openRfq");
4766
4766
  const bids = await collectOpenRfqBids(
4767
4767
  { ...request, bidsUntil: Math.ceil((Date.now() + windowMs) / 1e3) },
@@ -413,6 +413,7 @@ var MAX_BIDS = 64;
413
413
  var MAX_AUTHENTICATED_REPLY_DECRYPTIONS = 256;
414
414
  var MAX_EVENT_CONTENT = 1e5;
415
415
  var MAX_WINDOW_MS = 3e4;
416
+ var CLOCK_SKEW_SECONDS = 30;
416
417
  var collectOpenRfqBids = (request, options) => {
417
418
  const payload = openRfqPayload(request);
418
419
  const windowMs = options.windowMs ?? 3e3;
@@ -469,7 +470,12 @@ var collectOpenRfqBids = (request, options) => {
469
470
  try {
470
471
  subscription = pool.subscribeMany(
471
472
  relays,
472
- { kinds: [RFQ_DIRECTED_KIND], "#p": [clientPubkey], "#e": [event.id], since: now },
473
+ {
474
+ kinds: [RFQ_DIRECTED_KIND],
475
+ "#p": [clientPubkey],
476
+ "#e": [event.id],
477
+ since: now - CLOCK_SKEW_SECONDS
478
+ },
473
479
  {
474
480
  onevent(reply) {
475
481
  const current = Math.floor(Date.now() / 1e3);
@@ -477,7 +483,7 @@ var collectOpenRfqBids = (request, options) => {
477
483
  (tag) => Array.isArray(tag) && tag.length <= 8 && tag.every(
478
484
  (value) => typeof value === "string" && value.length <= 1024
479
485
  )
480
- ) || Date.now() >= started + duration || reply.kind !== RFQ_DIRECTED_KIND || reply.content.length > MAX_EVENT_CONTENT || !Number.isSafeInteger(reply.created_at) || reply.created_at < event.created_at || reply.created_at > current + 5 || reply.created_at >= request.bidsUntil || seen.has(reply.id) || seen.size >= MAX_AUTHENTICATED_REPLY_DECRYPTIONS)
486
+ ) || Date.now() >= started + duration || reply.kind !== RFQ_DIRECTED_KIND || reply.content.length > MAX_EVENT_CONTENT || !Number.isSafeInteger(reply.created_at) || reply.created_at < event.created_at - CLOCK_SKEW_SECONDS || reply.created_at > current + CLOCK_SKEW_SECONDS || reply.created_at >= request.bidsUntil || seen.has(reply.id) || seen.size >= MAX_AUTHENTICATED_REPLY_DECRYPTIONS)
481
487
  return;
482
488
  const recipients = reply.tags.filter((tag) => tag[0] === "p");
483
489
  const references = reply.tags.filter((tag) => tag[0] === "e");
package/dist/index.cjs CHANGED
@@ -3376,7 +3376,7 @@ var openRfqTransport_exports = {};
3376
3376
  __export(openRfqTransport_exports, {
3377
3377
  collectOpenRfqBids: () => collectOpenRfqBids
3378
3378
  });
3379
- var import_nostr_tools2, MAX_BIDS, MAX_AUTHENTICATED_REPLY_DECRYPTIONS, MAX_EVENT_CONTENT, MAX_WINDOW_MS, collectOpenRfqBids;
3379
+ var import_nostr_tools2, MAX_BIDS, MAX_AUTHENTICATED_REPLY_DECRYPTIONS, MAX_EVENT_CONTENT, MAX_WINDOW_MS, CLOCK_SKEW_SECONDS, collectOpenRfqBids;
3380
3380
  var init_openRfqTransport = __esm({
3381
3381
  "src/openRfqTransport.ts"() {
3382
3382
  "use strict";
@@ -3389,6 +3389,7 @@ var init_openRfqTransport = __esm({
3389
3389
  MAX_AUTHENTICATED_REPLY_DECRYPTIONS = 256;
3390
3390
  MAX_EVENT_CONTENT = 1e5;
3391
3391
  MAX_WINDOW_MS = 3e4;
3392
+ CLOCK_SKEW_SECONDS = 30;
3392
3393
  collectOpenRfqBids = (request, options) => {
3393
3394
  const payload = openRfqPayload(request);
3394
3395
  const windowMs = options.windowMs ?? 3e3;
@@ -3445,7 +3446,12 @@ var init_openRfqTransport = __esm({
3445
3446
  try {
3446
3447
  subscription = pool.subscribeMany(
3447
3448
  relays,
3448
- { kinds: [RFQ_DIRECTED_KIND], "#p": [clientPubkey], "#e": [event.id], since: now },
3449
+ {
3450
+ kinds: [RFQ_DIRECTED_KIND],
3451
+ "#p": [clientPubkey],
3452
+ "#e": [event.id],
3453
+ since: now - CLOCK_SKEW_SECONDS
3454
+ },
3449
3455
  {
3450
3456
  onevent(reply) {
3451
3457
  const current = Math.floor(Date.now() / 1e3);
@@ -3453,7 +3459,7 @@ var init_openRfqTransport = __esm({
3453
3459
  (tag) => Array.isArray(tag) && tag.length <= 8 && tag.every(
3454
3460
  (value) => typeof value === "string" && value.length <= 1024
3455
3461
  )
3456
- ) || Date.now() >= started + duration || reply.kind !== RFQ_DIRECTED_KIND || reply.content.length > MAX_EVENT_CONTENT || !Number.isSafeInteger(reply.created_at) || reply.created_at < event.created_at || reply.created_at > current + 5 || reply.created_at >= request.bidsUntil || seen.has(reply.id) || seen.size >= MAX_AUTHENTICATED_REPLY_DECRYPTIONS)
3462
+ ) || Date.now() >= started + duration || reply.kind !== RFQ_DIRECTED_KIND || reply.content.length > MAX_EVENT_CONTENT || !Number.isSafeInteger(reply.created_at) || reply.created_at < event.created_at - CLOCK_SKEW_SECONDS || reply.created_at > current + CLOCK_SKEW_SECONDS || reply.created_at >= request.bidsUntil || seen.has(reply.id) || seen.size >= MAX_AUTHENTICATED_REPLY_DECRYPTIONS)
3457
3463
  return;
3458
3464
  const recipients = reply.tags.filter((tag) => tag[0] === "p");
3459
3465
  const references = reply.tags.filter((tag) => tag[0] === "e");
@@ -7127,12 +7133,12 @@ var corridorRecordStore = (repository, onRecord = () => {
7127
7133
  }
7128
7134
  };
7129
7135
  };
7130
- var covenantOf = (swap) => {
7131
- if (swap.binding !== void 0)
7132
- return {
7133
- binding: swap.binding,
7134
- ...swap.offerHex === void 0 ? {} : { offerHex: swap.offerHex }
7135
- };
7136
+ var covenantOf = (swap) => ({
7137
+ ...swap.offerHex === void 0 ? {} : { offerHex: swap.offerHex },
7138
+ ...swap.binding === void 0 ? {} : { binding: swap.binding }
7139
+ });
7140
+ var restoredCovenant = (swap) => {
7141
+ if (swap.binding !== void 0) return { ...covenantOf(swap), binding: swap.binding };
7136
7142
  if (swap.offerHex !== void 0) return { offerHex: swap.offerHex };
7137
7143
  throw new Error("this offer swap carries neither a binding nor an offerHex to rebuild from");
7138
7144
  };
@@ -7212,7 +7218,7 @@ var restoredOfferRecord = (swap, network, now) => {
7212
7218
  market: { kind: "restored", backend: "feed" },
7213
7219
  expiresAt: createdAt,
7214
7220
  status: swap.status,
7215
- ...covenantOf(swap),
7221
+ ...restoredCovenant(swap),
7216
7222
  swapAddress: swap.swapAddress,
7217
7223
  swapPkScript: swap.swapPkScript,
7218
7224
  fundingTxid: swap.fundingTxid,
package/dist/index.js CHANGED
@@ -47,7 +47,7 @@ import {
47
47
  unsignedPsbtBytes,
48
48
  verifyJointGraph,
49
49
  verifyOfferFillPlan
50
- } from "./chunk-ZJFQCUYP.js";
50
+ } from "./chunk-F3BGKWIB.js";
51
51
  import {
52
52
  Amount,
53
53
  AmountFormatError,
@@ -58,7 +58,7 @@ import {
58
58
  isRfqSwapTerminal,
59
59
  quoteIdOfSwapId,
60
60
  toAtomicDecimal
61
- } from "./chunk-SRJM7MKP.js";
61
+ } from "./chunk-JBTU7Y6M.js";
62
62
  import {
63
63
  AcceptConflict,
64
64
  AmbiguousDestination,
package/dist/nostr.cjs CHANGED
@@ -979,6 +979,7 @@ var MAX_BIDS = 64;
979
979
  var MAX_AUTHENTICATED_REPLY_DECRYPTIONS = 256;
980
980
  var MAX_EVENT_CONTENT = 1e5;
981
981
  var MAX_WINDOW_MS = 3e4;
982
+ var CLOCK_SKEW_SECONDS = 30;
982
983
  var collectOpenRfqBids = (request, options) => {
983
984
  const payload = openRfqPayload(request);
984
985
  const windowMs = options.windowMs ?? 3e3;
@@ -1035,7 +1036,12 @@ var collectOpenRfqBids = (request, options) => {
1035
1036
  try {
1036
1037
  subscription = pool.subscribeMany(
1037
1038
  relays,
1038
- { kinds: [RFQ_DIRECTED_KIND], "#p": [clientPubkey], "#e": [event.id], since: now },
1039
+ {
1040
+ kinds: [RFQ_DIRECTED_KIND],
1041
+ "#p": [clientPubkey],
1042
+ "#e": [event.id],
1043
+ since: now - CLOCK_SKEW_SECONDS
1044
+ },
1039
1045
  {
1040
1046
  onevent(reply) {
1041
1047
  const current = Math.floor(Date.now() / 1e3);
@@ -1043,7 +1049,7 @@ var collectOpenRfqBids = (request, options) => {
1043
1049
  (tag) => Array.isArray(tag) && tag.length <= 8 && tag.every(
1044
1050
  (value) => typeof value === "string" && value.length <= 1024
1045
1051
  )
1046
- ) || Date.now() >= started + duration || reply.kind !== RFQ_DIRECTED_KIND || reply.content.length > MAX_EVENT_CONTENT || !Number.isSafeInteger(reply.created_at) || reply.created_at < event.created_at || reply.created_at > current + 5 || reply.created_at >= request.bidsUntil || seen.has(reply.id) || seen.size >= MAX_AUTHENTICATED_REPLY_DECRYPTIONS)
1052
+ ) || Date.now() >= started + duration || reply.kind !== RFQ_DIRECTED_KIND || reply.content.length > MAX_EVENT_CONTENT || !Number.isSafeInteger(reply.created_at) || reply.created_at < event.created_at - CLOCK_SKEW_SECONDS || reply.created_at > current + CLOCK_SKEW_SECONDS || reply.created_at >= request.bidsUntil || seen.has(reply.id) || seen.size >= MAX_AUTHENTICATED_REPLY_DECRYPTIONS)
1047
1053
  return;
1048
1054
  const recipients = reply.tags.filter((tag) => tag[0] === "p");
1049
1055
  const references = reply.tags.filter((tag) => tag[0] === "e");
package/dist/nostr.js CHANGED
@@ -12,7 +12,7 @@ import {
12
12
  parseOpenRfqBid,
13
13
  rankOpenRfqBids,
14
14
  sharedNostrPool
15
- } from "./chunk-36FAXUHI.js";
15
+ } from "./chunk-UXK7YDA4.js";
16
16
  import "./chunk-ISKJIONJ.js";
17
17
  import "./chunk-VPVSSBY2.js";
18
18
  import "./chunk-A3SHHRX4.js";
@@ -1,6 +1,6 @@
1
1
  import {
2
2
  collectOpenRfqBids
3
- } from "./chunk-36FAXUHI.js";
3
+ } from "./chunk-UXK7YDA4.js";
4
4
  import "./chunk-ISKJIONJ.js";
5
5
  import "./chunk-VPVSSBY2.js";
6
6
  import "./chunk-A3SHHRX4.js";
package/dist/protocol.cjs CHANGED
@@ -4055,7 +4055,7 @@ var init_openRfq = __esm({
4055
4055
  });
4056
4056
 
4057
4057
  // src/openRfqTransport.ts
4058
- var import_nostr_tools2, MAX_BIDS, MAX_AUTHENTICATED_REPLY_DECRYPTIONS, MAX_EVENT_CONTENT, MAX_WINDOW_MS, collectOpenRfqBids;
4058
+ var import_nostr_tools2, MAX_BIDS, MAX_AUTHENTICATED_REPLY_DECRYPTIONS, MAX_EVENT_CONTENT, MAX_WINDOW_MS, CLOCK_SKEW_SECONDS, collectOpenRfqBids;
4059
4059
  var init_openRfqTransport = __esm({
4060
4060
  "src/openRfqTransport.ts"() {
4061
4061
  "use strict";
@@ -4068,6 +4068,7 @@ var init_openRfqTransport = __esm({
4068
4068
  MAX_AUTHENTICATED_REPLY_DECRYPTIONS = 256;
4069
4069
  MAX_EVENT_CONTENT = 1e5;
4070
4070
  MAX_WINDOW_MS = 3e4;
4071
+ CLOCK_SKEW_SECONDS = 30;
4071
4072
  collectOpenRfqBids = (request, options) => {
4072
4073
  const payload = openRfqPayload(request);
4073
4074
  const windowMs = options.windowMs ?? 3e3;
@@ -4124,7 +4125,12 @@ var init_openRfqTransport = __esm({
4124
4125
  try {
4125
4126
  subscription = pool.subscribeMany(
4126
4127
  relays,
4127
- { kinds: [RFQ_DIRECTED_KIND], "#p": [clientPubkey], "#e": [event.id], since: now },
4128
+ {
4129
+ kinds: [RFQ_DIRECTED_KIND],
4130
+ "#p": [clientPubkey],
4131
+ "#e": [event.id],
4132
+ since: now - CLOCK_SKEW_SECONDS
4133
+ },
4128
4134
  {
4129
4135
  onevent(reply) {
4130
4136
  const current = Math.floor(Date.now() / 1e3);
@@ -4132,7 +4138,7 @@ var init_openRfqTransport = __esm({
4132
4138
  (tag) => Array.isArray(tag) && tag.length <= 8 && tag.every(
4133
4139
  (value) => typeof value === "string" && value.length <= 1024
4134
4140
  )
4135
- ) || Date.now() >= started + duration || reply.kind !== RFQ_DIRECTED_KIND || reply.content.length > MAX_EVENT_CONTENT || !Number.isSafeInteger(reply.created_at) || reply.created_at < event.created_at || reply.created_at > current + 5 || reply.created_at >= request.bidsUntil || seen.has(reply.id) || seen.size >= MAX_AUTHENTICATED_REPLY_DECRYPTIONS)
4141
+ ) || Date.now() >= started + duration || reply.kind !== RFQ_DIRECTED_KIND || reply.content.length > MAX_EVENT_CONTENT || !Number.isSafeInteger(reply.created_at) || reply.created_at < event.created_at - CLOCK_SKEW_SECONDS || reply.created_at > current + CLOCK_SKEW_SECONDS || reply.created_at >= request.bidsUntil || seen.has(reply.id) || seen.size >= MAX_AUTHENTICATED_REPLY_DECRYPTIONS)
4136
4142
  return;
4137
4143
  const recipients = reply.tags.filter((tag) => tag[0] === "p");
4138
4144
  const references = reply.tags.filter((tag) => tag[0] === "e");
package/dist/protocol.js CHANGED
@@ -43,7 +43,7 @@ import {
43
43
  validatePlan,
44
44
  watchMarkets,
45
45
  watchOfferSwaps
46
- } from "./chunk-SRJM7MKP.js";
46
+ } from "./chunk-JBTU7Y6M.js";
47
47
  import {
48
48
  ARKADE_BTC,
49
49
  ASSET_CARRIER_SATS,
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@arkade-os/swap",
3
- "version": "0.1.11",
3
+ "version": "0.1.12",
4
4
  "type": "module",
5
5
  "description": "Client-side Arkade Intents asset swaps: state a route, get an outcome. Pay a bolt11 invoice, receive over Lightning, exchange assets, or withdraw onchain.",
6
6
  "repository": {
File without changes