@arkade-os/swap 0.1.0-rc.8 → 0.1.0
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/README.md +45 -10
- package/dist/advanced.cjs +6429 -3083
- package/dist/advanced.d.cts +325 -282
- package/dist/advanced.d.ts +325 -282
- package/dist/advanced.js +343 -34
- package/dist/chunk-A3SHHRX4.js +104 -0
- package/dist/chunk-FMRAV77W.js +3065 -0
- package/dist/{chunk-HV7EIUE2.js → chunk-HRMWBULL.js} +1773 -634
- package/dist/chunk-WKJFXXSR.js +3382 -0
- package/dist/index.cjs +6868 -3837
- package/dist/index.d.cts +71 -243
- package/dist/index.d.ts +71 -243
- package/dist/index.js +139 -167
- package/dist/lockupContract-D7BNjksX.d.ts +148 -0
- package/dist/lockupContract-G-9CNRMq.d.cts +148 -0
- package/dist/node/index.cjs +61 -10
- package/dist/node/index.d.cts +310 -639
- package/dist/node/index.d.ts +310 -639
- package/dist/node/index.js +65 -10
- package/dist/nostr.cjs +428 -49
- package/dist/nostr.d.cts +59 -70
- package/dist/nostr.d.ts +59 -70
- package/dist/nostr.js +268 -36
- package/dist/offer-CcJfx5Fj.d.cts +269 -0
- package/dist/offer-DdB1M6FZ.d.ts +269 -0
- package/dist/offerFillPlan-BII0PW92.d.cts +1642 -0
- package/dist/offerFillPlan-CNTLVD7j.d.ts +1642 -0
- package/dist/protocol.cjs +5591 -4064
- package/dist/protocol.d.cts +258 -355
- package/dist/protocol.d.ts +258 -355
- package/dist/protocol.js +209 -228
- package/dist/repositories/realm/index.cjs +55 -11
- package/dist/repositories/realm/index.d.cts +18 -30
- package/dist/repositories/realm/index.d.ts +18 -30
- package/dist/repositories/realm/index.js +49 -12
- package/dist/repositories/sqlite/index.cjs +61 -10
- package/dist/repositories/sqlite/index.d.cts +7 -6
- package/dist/repositories/sqlite/index.d.ts +7 -6
- package/dist/repositories/sqlite/index.js +57 -11
- package/dist/repository-DmPzpbd7.d.ts +2342 -0
- package/dist/repository-DqdLVrVv.d.cts +2342 -0
- package/dist/rfq-C0tHOvn6.d.cts +983 -0
- package/dist/rfq-C0tHOvn6.d.ts +983 -0
- package/dist/watch-BonYT9af.d.cts +74 -0
- package/dist/watch-CmJQDtsy.d.ts +74 -0
- package/package.json +12 -12
- package/dist/chunk-4PATNGYQ.js +0 -3297
- package/dist/chunk-ARYFNDJY.js +0 -1432
- package/dist/chunk-U7VWWTL6.js +0 -66
- package/dist/errors-CSpOUdCN.d.ts +0 -2216
- package/dist/errors-DVn92LQd.d.cts +0 -2216
- package/dist/lockupContract-6TYZOBbn.d.ts +0 -490
- package/dist/lockupContract-aLCQQiSu.d.cts +0 -490
- package/dist/repository-D0gFF_GA.d.cts +0 -3491
- package/dist/repository-tDT8p-Nx.d.ts +0 -3491
- package/dist/rfq-DhkgiwQ7.d.cts +0 -1126
- package/dist/rfq-DhkgiwQ7.d.ts +0 -1126
- package/dist/watch-C4cMEeZT.d.cts +0 -96
- package/dist/watch-DbWXdpzm.d.ts +0 -96
package/dist/nostr.cjs
CHANGED
|
@@ -30,26 +30,33 @@ var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: tru
|
|
|
30
30
|
// src/nostr.ts
|
|
31
31
|
var nostr_exports = {};
|
|
32
32
|
__export(nostr_exports, {
|
|
33
|
-
RFQ_AD_KIND: () => RFQ_AD_KIND,
|
|
34
33
|
RFQ_DIRECTED_KIND: () => RFQ_DIRECTED_KIND,
|
|
35
34
|
RelayUnavailable: () => RelayUnavailable,
|
|
36
35
|
TransportClosed: () => TransportClosed,
|
|
37
|
-
|
|
36
|
+
closeSharedNostrPool: () => closeSharedNostrPool,
|
|
37
|
+
createNostrPool: () => createNostrPool,
|
|
38
|
+
nostrCardFetcher: () => nostrCardFetcher,
|
|
39
|
+
nostrRfqTransport: () => nostrRfqTransport,
|
|
40
|
+
sharedNostrPool: () => sharedNostrPool
|
|
38
41
|
});
|
|
39
42
|
module.exports = __toCommonJS(nostr_exports);
|
|
43
|
+
var import_solver_discovery2 = require("@arkade-os/solver-discovery");
|
|
40
44
|
|
|
41
45
|
// src/rfq.ts
|
|
42
|
-
var
|
|
46
|
+
var import_base6 = require("@scure/base");
|
|
47
|
+
var import_solver_discovery = require("@arkade-os/solver-discovery");
|
|
43
48
|
var import_legacy2 = require("@noble/hashes/legacy.js");
|
|
44
|
-
var
|
|
49
|
+
var import_sdk6 = require("@arkade-os/sdk");
|
|
45
50
|
|
|
46
51
|
// src/onchainHtlc.ts
|
|
47
52
|
var import_base = require("@scure/base");
|
|
48
53
|
var import_sha2 = require("@noble/hashes/sha2.js");
|
|
49
54
|
var import_legacy = require("@noble/hashes/legacy.js");
|
|
50
55
|
var btc = __toESM(require("@scure/btc-signer"), 1);
|
|
56
|
+
var import_sdk = require("@arkade-os/sdk");
|
|
51
57
|
var ONCHAIN_ORDER_MARGIN_SECONDS = 2 * 60 * 60;
|
|
52
58
|
var ONCHAIN_CLAIM_MARGIN_SECONDS = 90 * 60;
|
|
59
|
+
var ONCHAIN_CLAIM_BUMP_SECONDS = 20 * 60;
|
|
53
60
|
var ONCHAIN_DUST_SATS = BigInt(330);
|
|
54
61
|
var L1_NETWORKS = {
|
|
55
62
|
bitcoin: btc.NETWORK,
|
|
@@ -58,10 +65,11 @@ var L1_NETWORKS = {
|
|
|
58
65
|
};
|
|
59
66
|
|
|
60
67
|
// src/rfq.ts
|
|
61
|
-
var
|
|
68
|
+
var import_sdk7 = require("@arkade-os/sdk");
|
|
62
69
|
|
|
63
70
|
// src/claimPacket.ts
|
|
64
71
|
var import_base2 = require("@scure/base");
|
|
72
|
+
var import_utils = require("@scure/btc-signer/utils.js");
|
|
65
73
|
var import_aes = require("@noble/ciphers/aes.js");
|
|
66
74
|
var import_secp256k1 = require("@noble/curves/secp256k1.js");
|
|
67
75
|
var import_hkdf = require("@noble/hashes/hkdf.js");
|
|
@@ -70,7 +78,153 @@ var HKDF_INFO = new TextEncoder().encode("covclaimd/preimage/v1");
|
|
|
70
78
|
|
|
71
79
|
// src/lockupContract.ts
|
|
72
80
|
var import_base3 = require("@scure/base");
|
|
73
|
-
var
|
|
81
|
+
var import_sdk2 = require("@arkade-os/sdk");
|
|
82
|
+
|
|
83
|
+
// src/offer.ts
|
|
84
|
+
var import_base5 = require("@scure/base");
|
|
85
|
+
var import_utils2 = require("@scure/btc-signer/utils.js");
|
|
86
|
+
var import_sdk5 = require("@arkade-os/sdk");
|
|
87
|
+
|
|
88
|
+
// src/swap-want-asset.program.json
|
|
89
|
+
var swap_want_asset_program_default = {
|
|
90
|
+
version: 1,
|
|
91
|
+
name: "banco-btc-to-asset",
|
|
92
|
+
params: [
|
|
93
|
+
{ name: "makerWP", type: "pubkey" },
|
|
94
|
+
{ name: "wantAmount", type: "int" },
|
|
95
|
+
{ name: "wantAssetTxid", type: "bytes32" },
|
|
96
|
+
{ name: "wantAssetGroupIndex", type: "int" },
|
|
97
|
+
{ name: "server", type: "pubkey" },
|
|
98
|
+
{ name: "user", type: "pubkey" }
|
|
99
|
+
],
|
|
100
|
+
functions: {
|
|
101
|
+
fulfill: {
|
|
102
|
+
tapscript: { signers: ["$server"] },
|
|
103
|
+
arkadeScript: {
|
|
104
|
+
asm: [
|
|
105
|
+
0,
|
|
106
|
+
"$wantAssetTxid",
|
|
107
|
+
"$wantAssetGroupIndex",
|
|
108
|
+
"INSPECTOUTASSETLOOKUP",
|
|
109
|
+
"VERIFY",
|
|
110
|
+
"$wantAmount",
|
|
111
|
+
"GREATERTHANOREQUAL",
|
|
112
|
+
"VERIFY",
|
|
113
|
+
0,
|
|
114
|
+
"INSPECTOUTPUTSCRIPTPUBKEY",
|
|
115
|
+
1,
|
|
116
|
+
"EQUALVERIFY",
|
|
117
|
+
"$makerWP",
|
|
118
|
+
"EQUAL"
|
|
119
|
+
]
|
|
120
|
+
}
|
|
121
|
+
},
|
|
122
|
+
cancel: {
|
|
123
|
+
tapscript: { signers: ["$user", "$server"] }
|
|
124
|
+
}
|
|
125
|
+
}
|
|
126
|
+
};
|
|
127
|
+
|
|
128
|
+
// src/swap-want-btc.program.json
|
|
129
|
+
var swap_want_btc_program_default = {
|
|
130
|
+
version: 1,
|
|
131
|
+
name: "banco-asset-to-btc",
|
|
132
|
+
params: [
|
|
133
|
+
{ name: "makerWP", type: "pubkey" },
|
|
134
|
+
{ name: "wantAmount", type: "int" },
|
|
135
|
+
{ name: "server", type: "pubkey" },
|
|
136
|
+
{ name: "user", type: "pubkey" }
|
|
137
|
+
],
|
|
138
|
+
functions: {
|
|
139
|
+
fulfill: {
|
|
140
|
+
tapscript: { signers: ["$server"] },
|
|
141
|
+
arkadeScript: {
|
|
142
|
+
asm: [
|
|
143
|
+
0,
|
|
144
|
+
"INSPECTOUTPUTVALUE",
|
|
145
|
+
"$wantAmount",
|
|
146
|
+
"GREATERTHANOREQUAL",
|
|
147
|
+
"VERIFY",
|
|
148
|
+
0,
|
|
149
|
+
"INSPECTOUTPUTSCRIPTPUBKEY",
|
|
150
|
+
1,
|
|
151
|
+
"EQUALVERIFY",
|
|
152
|
+
"$makerWP",
|
|
153
|
+
"EQUAL"
|
|
154
|
+
]
|
|
155
|
+
}
|
|
156
|
+
},
|
|
157
|
+
cancel: {
|
|
158
|
+
tapscript: { signers: ["$user", "$server"] }
|
|
159
|
+
}
|
|
160
|
+
}
|
|
161
|
+
};
|
|
162
|
+
|
|
163
|
+
// src/rfqCorridor.ts
|
|
164
|
+
var RfqCorridorRegistry = class {
|
|
165
|
+
handlers = /* @__PURE__ */ new Map();
|
|
166
|
+
register(handler) {
|
|
167
|
+
if (this.handlers.has(handler.kind)) {
|
|
168
|
+
throw new Error(
|
|
169
|
+
`RFQ corridor handler for kind '${handler.kind}' is already registered`
|
|
170
|
+
);
|
|
171
|
+
}
|
|
172
|
+
this.handlers.set(handler.kind, handler);
|
|
173
|
+
}
|
|
174
|
+
/** A bare `string` on purpose: the key comes off a stored record, and narrowing it to the
|
|
175
|
+
* `kind` union would read as a check already made. */
|
|
176
|
+
get(kind) {
|
|
177
|
+
return this.handlers.get(kind);
|
|
178
|
+
}
|
|
179
|
+
/** The handler for a kind, or a loud failure naming the registered kinds. */
|
|
180
|
+
getOrThrow(kind) {
|
|
181
|
+
const handler = this.get(kind);
|
|
182
|
+
if (!handler) {
|
|
183
|
+
throw new Error(
|
|
184
|
+
`no RFQ corridor handler registered for kind '${kind}'; registered: ${this.registeredKinds().join(", ") || "none"}`
|
|
185
|
+
);
|
|
186
|
+
}
|
|
187
|
+
return handler;
|
|
188
|
+
}
|
|
189
|
+
registeredKinds() {
|
|
190
|
+
return [...this.handlers.keys()];
|
|
191
|
+
}
|
|
192
|
+
/** Test seam, mirroring the contract registry's. */
|
|
193
|
+
unregister(kind) {
|
|
194
|
+
return this.handlers.delete(kind);
|
|
195
|
+
}
|
|
196
|
+
};
|
|
197
|
+
var rfqCorridorHandlers = new RfqCorridorRegistry();
|
|
198
|
+
|
|
199
|
+
// src/store.ts
|
|
200
|
+
var import_base4 = require("@scure/base");
|
|
201
|
+
var import_sha23 = require("@noble/hashes/sha2.js");
|
|
202
|
+
var import_sdk4 = require("@arkade-os/sdk");
|
|
203
|
+
|
|
204
|
+
// src/repository.ts
|
|
205
|
+
var import_sdk3 = require("@arkade-os/sdk");
|
|
206
|
+
|
|
207
|
+
// src/offer.ts
|
|
208
|
+
var swapPrograms = {
|
|
209
|
+
wantAsset: import_sdk5.arkade.parseArtifact(swap_want_asset_program_default),
|
|
210
|
+
wantBtc: import_sdk5.arkade.parseArtifact(swap_want_btc_program_default)
|
|
211
|
+
};
|
|
212
|
+
var FIELDS = {
|
|
213
|
+
swapPkScript: { tag: 1, width: 34 },
|
|
214
|
+
wantAmount: { tag: 2, width: 8 },
|
|
215
|
+
wantAsset: { tag: 3, width: void 0 },
|
|
216
|
+
makerPkScript: { tag: 5, width: 34 },
|
|
217
|
+
makerPublicKey: { tag: 7, width: 32 },
|
|
218
|
+
emulatorPubkey: { tag: 8, width: 32 },
|
|
219
|
+
ratioNum: { tag: 9, width: 8 },
|
|
220
|
+
ratioDen: { tag: 10, width: 8 },
|
|
221
|
+
offerAsset: { tag: 11, width: void 0 },
|
|
222
|
+
exitTimelock: { tag: 12, width: 9 }
|
|
223
|
+
};
|
|
224
|
+
var NAMES = Object.fromEntries(Object.entries(FIELDS).map(([k, f]) => [f.tag, k]));
|
|
225
|
+
var ASSET_CARRIER_SATS = BigInt(import_sdk5.ASSET_CARRIER_SATS);
|
|
226
|
+
var U64_MAX = (BigInt(1) << BigInt(64)) - BigInt(1);
|
|
227
|
+
var MAX_SAFE_SATS = BigInt(Number.MAX_SAFE_INTEGER);
|
|
74
228
|
|
|
75
229
|
// src/rfq.ts
|
|
76
230
|
var ARKADE_BTC = "arkade:BTC";
|
|
@@ -134,8 +288,7 @@ var refusalMessage = (reason, detail) => {
|
|
|
134
288
|
};
|
|
135
289
|
var SwapRefusal = class extends Error {
|
|
136
290
|
/** Literal-typed so the v2 error taxonomy's union discriminates on `name`
|
|
137
|
-
* — a `string` here collapses the discriminant for every member.
|
|
138
|
-
* the constructor has always set, moved to a field initializer. */
|
|
291
|
+
* — a `string` here collapses the discriminant for every member. */
|
|
139
292
|
name = "SwapRefusal";
|
|
140
293
|
reason;
|
|
141
294
|
rfqId;
|
|
@@ -186,11 +339,140 @@ var SEQUENCE_GRANULARITY_SECONDS = 512;
|
|
|
186
339
|
var SOLO_REFUND_HEADROOM_SECONDS = 8 * SEQUENCE_GRANULARITY_SECONDS;
|
|
187
340
|
var MIN_CLAIM_WINDOW_SECONDS = 30 * 60;
|
|
188
341
|
|
|
189
|
-
// src/
|
|
342
|
+
// src/nostrPool.ts
|
|
190
343
|
var import_nostr_tools = require("nostr-tools");
|
|
344
|
+
var import_utils3 = require("nostr-tools/utils");
|
|
345
|
+
|
|
346
|
+
// src/closeOnceWebSocket.ts
|
|
347
|
+
var CloseOnceWebSocket = typeof WebSocket === "undefined" ? void 0 : class CloseOnceWebSocket2 extends WebSocket {
|
|
348
|
+
#closed = false;
|
|
349
|
+
close(code, reason) {
|
|
350
|
+
if (this.#closed) return;
|
|
351
|
+
this.#closed = true;
|
|
352
|
+
super.close(code, reason);
|
|
353
|
+
}
|
|
354
|
+
};
|
|
355
|
+
|
|
356
|
+
// src/nostrPool.ts
|
|
357
|
+
var shared;
|
|
358
|
+
var IDLE_CLOSE_MS = 3e4;
|
|
359
|
+
var NEVER_IDLE_MS = 2 ** 31 - 1;
|
|
360
|
+
var PUBLISH_TIMED_OUT = "publish timed out";
|
|
361
|
+
var POOL_DESTROYED = "nostr pool destroyed";
|
|
362
|
+
var urlKey = (url) => {
|
|
363
|
+
try {
|
|
364
|
+
return (0, import_utils3.normalizeURL)(url);
|
|
365
|
+
} catch {
|
|
366
|
+
return url;
|
|
367
|
+
}
|
|
368
|
+
};
|
|
369
|
+
var SharedPool = class extends import_nostr_tools.SimplePool {
|
|
370
|
+
#users = /* @__PURE__ */ new Map();
|
|
371
|
+
#idle = /* @__PURE__ */ new Map();
|
|
372
|
+
#destroyed = false;
|
|
373
|
+
/** Count one user on each relay; the returned release is idempotent. */
|
|
374
|
+
#hold(urls) {
|
|
375
|
+
const held = [...new Set(urls.map(urlKey))];
|
|
376
|
+
for (const url of held) {
|
|
377
|
+
clearTimeout(this.#idle.get(url));
|
|
378
|
+
this.#idle.delete(url);
|
|
379
|
+
this.#users.set(url, (this.#users.get(url) ?? 0) + 1);
|
|
380
|
+
}
|
|
381
|
+
let released = false;
|
|
382
|
+
return () => {
|
|
383
|
+
if (released) return;
|
|
384
|
+
released = true;
|
|
385
|
+
for (const url of held) {
|
|
386
|
+
const left = (this.#users.get(url) ?? 1) - 1;
|
|
387
|
+
if (left > 0) {
|
|
388
|
+
this.#users.set(url, left);
|
|
389
|
+
continue;
|
|
390
|
+
}
|
|
391
|
+
this.#users.delete(url);
|
|
392
|
+
const timer = setTimeout(() => {
|
|
393
|
+
this.#idle.delete(url);
|
|
394
|
+
if (!this.#users.has(url)) this.close([url]);
|
|
395
|
+
}, IDLE_CLOSE_MS);
|
|
396
|
+
timer.unref?.();
|
|
397
|
+
this.#idle.set(url, timer);
|
|
398
|
+
}
|
|
399
|
+
};
|
|
400
|
+
}
|
|
401
|
+
/**
|
|
402
|
+
* A destroyed pool would otherwise reconnect for anyone still holding it (a transport that
|
|
403
|
+
* outlived closeSharedNostrPool()), opening a socket no one can close. Refused here, a
|
|
404
|
+
* subscription reports every relay lost and a publish a connection failure.
|
|
405
|
+
*/
|
|
406
|
+
async ensureRelay(...args) {
|
|
407
|
+
if (this.#destroyed) throw new Error(POOL_DESTROYED);
|
|
408
|
+
return super.ensureRelay(...args);
|
|
409
|
+
}
|
|
410
|
+
subscribeMap(...[requests, params]) {
|
|
411
|
+
const release = this.#hold(requests.map((request) => request.url));
|
|
412
|
+
const closer = super.subscribeMap(requests, {
|
|
413
|
+
...params,
|
|
414
|
+
// Every relay dropped it: nothing is left to hold the sockets for.
|
|
415
|
+
onclose: (reasons) => {
|
|
416
|
+
release();
|
|
417
|
+
params.onclose?.(reasons);
|
|
418
|
+
}
|
|
419
|
+
});
|
|
420
|
+
let closed = false;
|
|
421
|
+
return {
|
|
422
|
+
close: (reason) => {
|
|
423
|
+
if (closed) return;
|
|
424
|
+
closed = true;
|
|
425
|
+
release();
|
|
426
|
+
closer.close(reason);
|
|
427
|
+
}
|
|
428
|
+
};
|
|
429
|
+
}
|
|
430
|
+
publish(...[relays, event, params]) {
|
|
431
|
+
const release = this.#hold(relays);
|
|
432
|
+
const sent = super.publish(relays, event, params);
|
|
433
|
+
sent.forEach((publish, i) => {
|
|
434
|
+
publish.catch((error) => {
|
|
435
|
+
if (error instanceof Error && error.message === PUBLISH_TIMED_OUT)
|
|
436
|
+
this.close([relays[i]]);
|
|
437
|
+
});
|
|
438
|
+
});
|
|
439
|
+
void Promise.allSettled(sent).then(release);
|
|
440
|
+
return sent;
|
|
441
|
+
}
|
|
442
|
+
destroy() {
|
|
443
|
+
this.#destroyed = true;
|
|
444
|
+
for (const timer of this.#idle.values()) clearTimeout(timer);
|
|
445
|
+
this.#idle.clear();
|
|
446
|
+
this.#users.clear();
|
|
447
|
+
super.destroy();
|
|
448
|
+
}
|
|
449
|
+
};
|
|
450
|
+
var createNostrPool = () => (
|
|
451
|
+
// SimplePool forwards every option at runtime; its declared options just omit most of them.
|
|
452
|
+
new SharedPool({
|
|
453
|
+
enablePing: true,
|
|
454
|
+
idleTimeout: NEVER_IDLE_MS,
|
|
455
|
+
...CloseOnceWebSocket ? { websocketImplementation: CloseOnceWebSocket } : {}
|
|
456
|
+
})
|
|
457
|
+
);
|
|
458
|
+
var sharedNostrPool = () => shared ??= createNostrPool();
|
|
459
|
+
var closeSharedNostrPool = () => {
|
|
460
|
+
const pool = shared;
|
|
461
|
+
shared = void 0;
|
|
462
|
+
if (!pool) return;
|
|
463
|
+
try {
|
|
464
|
+
pool.destroy();
|
|
465
|
+
} catch {
|
|
466
|
+
}
|
|
467
|
+
};
|
|
468
|
+
|
|
469
|
+
// src/nostr.ts
|
|
470
|
+
var import_sdk8 = require("@arkade-os/sdk");
|
|
471
|
+
var import_nostr_tools2 = require("nostr-tools");
|
|
191
472
|
var RFQ_DIRECTED_KIND = 24859;
|
|
192
|
-
var RFQ_AD_KIND = 38859;
|
|
193
473
|
var DEFAULT_TIMEOUT_MS = 3e4;
|
|
474
|
+
var CONNECTION_FAILURE = "connection failure";
|
|
475
|
+
var CARD_FETCH_TIMEOUT_MS = 5e3;
|
|
194
476
|
var RelayUnavailable = class extends Error {
|
|
195
477
|
reasons;
|
|
196
478
|
constructor(reasons) {
|
|
@@ -211,15 +493,16 @@ var closeReasons = (raw) => raw.map((entry) => {
|
|
|
211
493
|
return url ? `${url}: ${reason ?? "closed"}` : reason ?? "closed";
|
|
212
494
|
});
|
|
213
495
|
var nostrRfqTransport = (options) => {
|
|
496
|
+
(0, import_sdk8.assertTimerMs)("timeoutMs", options.timeoutMs);
|
|
214
497
|
const relays = options.relays;
|
|
215
498
|
const solverPubkey = options.solverPubkey;
|
|
216
|
-
const secretKey = options.secretKey ?? (0,
|
|
217
|
-
const pubkey = (0,
|
|
218
|
-
const pool = options.pool ??
|
|
219
|
-
const ownsPool = !options.pool;
|
|
499
|
+
const secretKey = options.secretKey ?? (0, import_nostr_tools2.generateSecretKey)();
|
|
500
|
+
const pubkey = (0, import_nostr_tools2.getPublicKey)(secretKey);
|
|
501
|
+
const pool = options.pool ?? sharedNostrPool();
|
|
220
502
|
const timeoutMs = options.timeoutMs ?? DEFAULT_TIMEOUT_MS;
|
|
221
|
-
const conversationKey =
|
|
503
|
+
const conversationKey = import_nostr_tools2.nip44.v2.utils.getConversationKey(secretKey, solverPubkey);
|
|
222
504
|
let closed = false;
|
|
505
|
+
let lost;
|
|
223
506
|
const waiters = /* @__PURE__ */ new Map();
|
|
224
507
|
const subscription = pool.subscribeMany(
|
|
225
508
|
relays,
|
|
@@ -228,7 +511,7 @@ var nostrRfqTransport = (options) => {
|
|
|
228
511
|
onevent(event) {
|
|
229
512
|
let payload;
|
|
230
513
|
try {
|
|
231
|
-
payload = JSON.parse(
|
|
514
|
+
payload = JSON.parse(import_nostr_tools2.nip44.v2.decrypt(event.content, conversationKey));
|
|
232
515
|
} catch {
|
|
233
516
|
return;
|
|
234
517
|
}
|
|
@@ -236,78 +519,174 @@ var nostrRfqTransport = (options) => {
|
|
|
236
519
|
if (!rfqId) return;
|
|
237
520
|
waiters.get(rfqId)?.resolve(payload);
|
|
238
521
|
},
|
|
239
|
-
//
|
|
240
|
-
// arrive after it, so failing now beats waiting out the timeout — and
|
|
241
|
-
// it names the real cause instead of implicating the solver.
|
|
522
|
+
// Called once every relay has closed: fail now with the real cause, not at timeout.
|
|
242
523
|
onclose(reasons) {
|
|
243
524
|
if (closed) return;
|
|
244
525
|
const error = new RelayUnavailable(closeReasons(reasons));
|
|
526
|
+
lost = error;
|
|
245
527
|
for (const waiter of waiters.values()) waiter.reject(error);
|
|
246
528
|
waiters.clear();
|
|
247
529
|
}
|
|
248
530
|
}
|
|
249
531
|
);
|
|
250
532
|
const send = async (payload) => {
|
|
251
|
-
const event = (0,
|
|
533
|
+
const event = (0, import_nostr_tools2.finalizeEvent)(
|
|
252
534
|
{
|
|
253
535
|
kind: RFQ_DIRECTED_KIND,
|
|
254
536
|
created_at: Math.floor(Date.now() / 1e3),
|
|
255
537
|
tags: [["p", solverPubkey]],
|
|
256
|
-
content:
|
|
538
|
+
content: import_nostr_tools2.nip44.v2.encrypt(JSON.stringify(payload), conversationKey)
|
|
257
539
|
},
|
|
258
540
|
secretKey
|
|
259
541
|
);
|
|
260
542
|
const results = await Promise.allSettled(pool.publish(relays, event));
|
|
261
|
-
|
|
262
|
-
|
|
263
|
-
|
|
543
|
+
const reasons = results.map(
|
|
544
|
+
(r) => r.status === "rejected" ? String(r.reason) : String(r.value)
|
|
545
|
+
);
|
|
546
|
+
const accepted = results.some(
|
|
547
|
+
(r) => r.status === "fulfilled" && !String(r.value).startsWith(CONNECTION_FAILURE)
|
|
548
|
+
);
|
|
549
|
+
if (!accepted) throw new Error(`no relay accepted the RFQ message: ${reasons.join("; ")}`);
|
|
264
550
|
};
|
|
265
|
-
const awaitReply = (rfqId) =>
|
|
266
|
-
const
|
|
267
|
-
|
|
268
|
-
reject(new Error(`no solver reply within ${timeoutMs}ms`));
|
|
269
|
-
}, timeoutMs);
|
|
270
|
-
waiters.set(rfqId, {
|
|
271
|
-
resolve: (payload) => {
|
|
272
|
-
clearTimeout(timer);
|
|
273
|
-
waiters.delete(rfqId);
|
|
274
|
-
resolve(payload);
|
|
275
|
-
},
|
|
276
|
-
reject: (error) => {
|
|
277
|
-
clearTimeout(timer);
|
|
551
|
+
const awaitReply = (rfqId) => {
|
|
552
|
+
const reply = new Promise((resolve, reject) => {
|
|
553
|
+
const timer = setTimeout(() => {
|
|
278
554
|
waiters.delete(rfqId);
|
|
279
|
-
reject(
|
|
280
|
-
}
|
|
555
|
+
reject(new Error(`no solver reply within ${timeoutMs}ms`));
|
|
556
|
+
}, timeoutMs);
|
|
557
|
+
waiters.set(rfqId, {
|
|
558
|
+
resolve: (payload) => {
|
|
559
|
+
clearTimeout(timer);
|
|
560
|
+
waiters.delete(rfqId);
|
|
561
|
+
resolve(payload);
|
|
562
|
+
},
|
|
563
|
+
reject: (error) => {
|
|
564
|
+
clearTimeout(timer);
|
|
565
|
+
waiters.delete(rfqId);
|
|
566
|
+
reject(error);
|
|
567
|
+
}
|
|
568
|
+
});
|
|
281
569
|
});
|
|
282
|
-
|
|
570
|
+
reply.catch(() => {
|
|
571
|
+
});
|
|
572
|
+
return reply;
|
|
573
|
+
};
|
|
574
|
+
const ask = async (rfqId, payload) => {
|
|
575
|
+
if (closed) throw new TransportClosed();
|
|
576
|
+
if (lost) throw lost;
|
|
577
|
+
const reply = awaitReply(rfqId);
|
|
578
|
+
try {
|
|
579
|
+
await send(payload);
|
|
580
|
+
} catch (error) {
|
|
581
|
+
waiters.get(rfqId)?.reject(error);
|
|
582
|
+
throw error;
|
|
583
|
+
}
|
|
584
|
+
return reply;
|
|
585
|
+
};
|
|
283
586
|
return {
|
|
284
587
|
async requestQuote(payload) {
|
|
285
588
|
const rfqId = String(payload.rfq_id);
|
|
286
|
-
|
|
287
|
-
await send(payload);
|
|
288
|
-
return expectQuote(await reply, rfqId, pairOf(payload));
|
|
589
|
+
return expectQuote(await ask(rfqId, payload), rfqId, pairOf(payload));
|
|
289
590
|
},
|
|
290
591
|
async status(rfqId) {
|
|
291
|
-
const reply =
|
|
292
|
-
await send({ v: 1, type: "rfq_status_request", rfq_id: rfqId });
|
|
592
|
+
const reply = ask(rfqId, { v: 1, type: "rfq_status_request", rfq_id: rfqId });
|
|
293
593
|
const payload = await reply;
|
|
294
594
|
if (payload?.type !== "rfq_status") return null;
|
|
295
595
|
return payload;
|
|
296
596
|
},
|
|
297
597
|
async close() {
|
|
598
|
+
if (closed) return;
|
|
298
599
|
closed = true;
|
|
299
600
|
for (const waiter of waiters.values()) waiter.reject(new TransportClosed());
|
|
300
601
|
waiters.clear();
|
|
301
|
-
|
|
302
|
-
|
|
602
|
+
subscription.close();
|
|
603
|
+
}
|
|
604
|
+
};
|
|
605
|
+
};
|
|
606
|
+
var isNewer = (event, held) => !held || event.created_at > held.created_at || event.created_at === held.created_at && event.id < held.id;
|
|
607
|
+
var nostrCardFetcher = (options = {}) => {
|
|
608
|
+
(0, import_sdk8.assertTimerMs)("timeoutMs", options.timeoutMs);
|
|
609
|
+
if (options.timeoutMs === 0) throw new Error("timeoutMs must be positive");
|
|
610
|
+
const seen = /* @__PURE__ */ new Map();
|
|
611
|
+
const inflight = /* @__PURE__ */ new Map();
|
|
612
|
+
return {
|
|
613
|
+
async fetch(solvers, network) {
|
|
614
|
+
const asked = new Set(solvers.map((solver) => solver.discovery_pubkey));
|
|
615
|
+
const authors = [...asked];
|
|
616
|
+
const relays = [
|
|
617
|
+
...new Set(solvers.flatMap((solver) => solver.transports?.nostr?.relays ?? []))
|
|
618
|
+
];
|
|
619
|
+
if (authors.length === 0 || relays.length === 0) return [];
|
|
620
|
+
const key = `${network}:${[...asked].sort().join(",")}@${[...relays].sort().join(",")}`;
|
|
621
|
+
const pending = inflight.get(key);
|
|
622
|
+
if (pending) return pending;
|
|
623
|
+
const task = (async () => {
|
|
624
|
+
const timeoutMs = options.timeoutMs ?? CARD_FETCH_TIMEOUT_MS;
|
|
625
|
+
const pool = options.pool ?? sharedNostrPool();
|
|
626
|
+
const latest = /* @__PURE__ */ new Map();
|
|
627
|
+
let subscription;
|
|
628
|
+
let timer;
|
|
629
|
+
try {
|
|
630
|
+
await new Promise((resolve) => {
|
|
631
|
+
timer = setTimeout(resolve, timeoutMs);
|
|
632
|
+
subscription = pool.subscribeMany(
|
|
633
|
+
relays,
|
|
634
|
+
{ kinds: [import_solver_discovery2.SOLVER_CARD_KIND], authors, "#d": [network] },
|
|
635
|
+
{
|
|
636
|
+
// Relays are untrusted: re-check the filter and the signature, so a stray
|
|
637
|
+
// or forged later event cannot shadow the real card.
|
|
638
|
+
onevent(event) {
|
|
639
|
+
if (event.kind !== import_solver_discovery2.SOLVER_CARD_KIND || !asked.has(event.pubkey))
|
|
640
|
+
return;
|
|
641
|
+
if (!(0, import_nostr_tools2.verifyEvent)(event)) return;
|
|
642
|
+
if (event.tags.find((tag) => tag[0] === "d")?.[1] !== network)
|
|
643
|
+
return;
|
|
644
|
+
if (isNewer(event, latest.get(event.pubkey)))
|
|
645
|
+
latest.set(event.pubkey, event);
|
|
646
|
+
},
|
|
647
|
+
oneose: () => resolve(),
|
|
648
|
+
onclose: () => resolve()
|
|
649
|
+
}
|
|
650
|
+
);
|
|
651
|
+
});
|
|
652
|
+
} finally {
|
|
653
|
+
clearTimeout(timer);
|
|
654
|
+
subscription?.close();
|
|
655
|
+
}
|
|
656
|
+
for (const author of authors) {
|
|
657
|
+
const seenKey = `${network}:${author}`;
|
|
658
|
+
const event = latest.get(author);
|
|
659
|
+
if (event && isNewer(event, seen.get(seenKey))) seen.set(seenKey, event);
|
|
660
|
+
const best = seen.get(seenKey);
|
|
661
|
+
if (best) latest.set(author, best);
|
|
662
|
+
}
|
|
663
|
+
const cards = [];
|
|
664
|
+
for (const event of latest.values()) {
|
|
665
|
+
try {
|
|
666
|
+
const card = JSON.parse(event.content);
|
|
667
|
+
cards.push({ pubkey: event.pubkey, createdAt: event.created_at, card });
|
|
668
|
+
} catch {
|
|
669
|
+
}
|
|
670
|
+
}
|
|
671
|
+
return cards;
|
|
672
|
+
})();
|
|
673
|
+
inflight.set(key, task);
|
|
674
|
+
try {
|
|
675
|
+
return await task;
|
|
676
|
+
} finally {
|
|
677
|
+
if (inflight.get(key) === task) inflight.delete(key);
|
|
678
|
+
}
|
|
303
679
|
}
|
|
304
680
|
};
|
|
305
681
|
};
|
|
306
682
|
// Annotate the CommonJS export names for ESM import in node:
|
|
307
683
|
0 && (module.exports = {
|
|
308
|
-
RFQ_AD_KIND,
|
|
309
684
|
RFQ_DIRECTED_KIND,
|
|
310
685
|
RelayUnavailable,
|
|
311
686
|
TransportClosed,
|
|
312
|
-
|
|
687
|
+
closeSharedNostrPool,
|
|
688
|
+
createNostrPool,
|
|
689
|
+
nostrCardFetcher,
|
|
690
|
+
nostrRfqTransport,
|
|
691
|
+
sharedNostrPool
|
|
313
692
|
});
|