@arkade-os/swap 0.1.0-rc.23 → 0.1.0-rc.25
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 +264 -91
- package/dist/advanced.d.cts +6 -6
- package/dist/advanced.d.ts +6 -6
- package/dist/advanced.js +2 -2
- package/dist/{chunk-MZX62KMU.js → chunk-5PI54AVY.js} +37 -5
- package/dist/{chunk-DQ2DY2L2.js → chunk-CZHB3ZDG.js} +129 -7
- package/dist/{errors-DQ35FKJf.d.ts → errors-Ckp_FRdo.d.ts} +6 -4
- package/dist/{errors-5q4e3PnH.d.cts → errors-DXjXCHYp.d.cts} +6 -4
- package/dist/index.cjs +290 -117
- package/dist/index.d.cts +4 -4
- package/dist/index.d.ts +4 -4
- package/dist/index.js +2 -2
- package/dist/node/index.d.cts +10 -6
- package/dist/node/index.d.ts +10 -6
- package/dist/nostr.cjs +83 -4
- package/dist/nostr.d.cts +9 -7
- package/dist/nostr.d.ts +9 -7
- package/dist/nostr.js +88 -4
- package/dist/{offer-DqTXQeP1.d.cts → offer-N2oXLfLX.d.cts} +1 -1
- package/dist/{offer--IpfzhIm.d.ts → offer-cE8qJmbC.d.ts} +1 -1
- package/dist/protocol.cjs +1751 -1311
- package/dist/protocol.d.cts +20 -9
- package/dist/protocol.d.ts +20 -9
- package/dist/protocol.js +3 -1
- package/dist/repositories/realm/index.d.cts +1 -1
- package/dist/repositories/realm/index.d.ts +1 -1
- package/dist/repositories/sqlite/index.d.cts +1 -1
- package/dist/repositories/sqlite/index.d.ts +1 -1
- package/dist/{repository-D_qvJk1S.d.ts → repository-DITDhUdX.d.ts} +10 -6
- package/dist/{repository-B4rQWmS2.d.cts → repository-yN-i_u-0.d.cts} +10 -6
- package/dist/{watch-RRhKuBkh.d.cts → watch-Bws1mS0R.d.cts} +1 -1
- package/dist/{watch-BkPz0vf8.d.ts → watch-G0Z7yJZb.d.ts} +1 -1
- package/package.json +3 -3
package/dist/advanced.cjs
CHANGED
|
@@ -1765,25 +1765,46 @@ var init_rfq = __esm({
|
|
|
1765
1765
|
}
|
|
1766
1766
|
});
|
|
1767
1767
|
|
|
1768
|
+
// src/closeOnceWebSocket.ts
|
|
1769
|
+
var CloseOnceWebSocket;
|
|
1770
|
+
var init_closeOnceWebSocket = __esm({
|
|
1771
|
+
"src/closeOnceWebSocket.ts"() {
|
|
1772
|
+
"use strict";
|
|
1773
|
+
CloseOnceWebSocket = typeof WebSocket === "undefined" ? void 0 : class CloseOnceWebSocket2 extends WebSocket {
|
|
1774
|
+
#closed = false;
|
|
1775
|
+
close(code, reason) {
|
|
1776
|
+
if (this.#closed) return;
|
|
1777
|
+
this.#closed = true;
|
|
1778
|
+
super.close(code, reason);
|
|
1779
|
+
}
|
|
1780
|
+
};
|
|
1781
|
+
}
|
|
1782
|
+
});
|
|
1783
|
+
|
|
1768
1784
|
// src/nostr.ts
|
|
1769
1785
|
var nostr_exports = {};
|
|
1770
1786
|
__export(nostr_exports, {
|
|
1771
|
-
RFQ_AD_KIND: () => RFQ_AD_KIND,
|
|
1772
1787
|
RFQ_DIRECTED_KIND: () => RFQ_DIRECTED_KIND,
|
|
1773
1788
|
RelayUnavailable: () => RelayUnavailable,
|
|
1774
1789
|
TransportClosed: () => TransportClosed,
|
|
1790
|
+
nostrCardFetcher: () => nostrCardFetcher,
|
|
1775
1791
|
nostrRfqTransport: () => nostrRfqTransport
|
|
1776
1792
|
});
|
|
1777
|
-
var
|
|
1793
|
+
var import_solver_discovery5, import_sdk17, import_nostr_tools, RFQ_DIRECTED_KIND, DEFAULT_TIMEOUT_MS, CARD_FETCH_TIMEOUT_MS, newPool, RelayUnavailable, TransportClosed, closeReasons, nostrRfqTransport, isNewer, nostrCardFetcher;
|
|
1778
1794
|
var init_nostr = __esm({
|
|
1779
1795
|
"src/nostr.ts"() {
|
|
1780
1796
|
"use strict";
|
|
1797
|
+
import_solver_discovery5 = require("@arkade-os/solver-discovery");
|
|
1781
1798
|
init_rfq();
|
|
1782
|
-
|
|
1799
|
+
init_closeOnceWebSocket();
|
|
1800
|
+
import_sdk17 = require("@arkade-os/sdk");
|
|
1783
1801
|
import_nostr_tools = require("nostr-tools");
|
|
1784
1802
|
RFQ_DIRECTED_KIND = 24859;
|
|
1785
|
-
RFQ_AD_KIND = 38859;
|
|
1786
1803
|
DEFAULT_TIMEOUT_MS = 3e4;
|
|
1804
|
+
CARD_FETCH_TIMEOUT_MS = 5e3;
|
|
1805
|
+
newPool = () => new import_nostr_tools.SimplePool(
|
|
1806
|
+
CloseOnceWebSocket ? { websocketImplementation: CloseOnceWebSocket } : void 0
|
|
1807
|
+
);
|
|
1787
1808
|
RelayUnavailable = class extends Error {
|
|
1788
1809
|
reasons;
|
|
1789
1810
|
constructor(reasons) {
|
|
@@ -1804,12 +1825,12 @@ var init_nostr = __esm({
|
|
|
1804
1825
|
return url ? `${url}: ${reason ?? "closed"}` : reason ?? "closed";
|
|
1805
1826
|
});
|
|
1806
1827
|
nostrRfqTransport = (options) => {
|
|
1807
|
-
(0,
|
|
1828
|
+
(0, import_sdk17.assertTimerMs)("timeoutMs", options.timeoutMs);
|
|
1808
1829
|
const relays = options.relays;
|
|
1809
1830
|
const solverPubkey = options.solverPubkey;
|
|
1810
1831
|
const secretKey = options.secretKey ?? (0, import_nostr_tools.generateSecretKey)();
|
|
1811
1832
|
const pubkey = (0, import_nostr_tools.getPublicKey)(secretKey);
|
|
1812
|
-
const pool = options.pool ??
|
|
1833
|
+
const pool = options.pool ?? newPool();
|
|
1813
1834
|
const ownsPool = !options.pool;
|
|
1814
1835
|
const timeoutMs = options.timeoutMs ?? DEFAULT_TIMEOUT_MS;
|
|
1815
1836
|
const conversationKey = import_nostr_tools.nip44.v2.utils.getConversationKey(secretKey, solverPubkey);
|
|
@@ -1895,6 +1916,71 @@ var init_nostr = __esm({
|
|
|
1895
1916
|
}
|
|
1896
1917
|
};
|
|
1897
1918
|
};
|
|
1919
|
+
isNewer = (event, held) => !held || event.created_at > held.created_at || event.created_at === held.created_at && event.id < held.id;
|
|
1920
|
+
nostrCardFetcher = (options = {}) => {
|
|
1921
|
+
(0, import_sdk17.assertTimerMs)("timeoutMs", options.timeoutMs);
|
|
1922
|
+
if (options.timeoutMs === 0) throw new Error("timeoutMs must be positive");
|
|
1923
|
+
const seen = /* @__PURE__ */ new Map();
|
|
1924
|
+
return {
|
|
1925
|
+
async fetch(solvers, network) {
|
|
1926
|
+
const asked = new Set(solvers.map((solver) => solver.discovery_pubkey));
|
|
1927
|
+
const authors = [...asked];
|
|
1928
|
+
const relays = [
|
|
1929
|
+
...new Set(solvers.flatMap((solver) => solver.transports?.nostr?.relays ?? []))
|
|
1930
|
+
];
|
|
1931
|
+
if (authors.length === 0 || relays.length === 0) return [];
|
|
1932
|
+
const timeoutMs = options.timeoutMs ?? CARD_FETCH_TIMEOUT_MS;
|
|
1933
|
+
const pool = options.pool ?? newPool();
|
|
1934
|
+
const latest = /* @__PURE__ */ new Map();
|
|
1935
|
+
let subscription;
|
|
1936
|
+
let timer;
|
|
1937
|
+
try {
|
|
1938
|
+
await new Promise((resolve) => {
|
|
1939
|
+
timer = setTimeout(resolve, timeoutMs);
|
|
1940
|
+
subscription = pool.subscribeMany(
|
|
1941
|
+
relays,
|
|
1942
|
+
{ kinds: [import_solver_discovery5.SOLVER_CARD_KIND], authors, "#d": [network] },
|
|
1943
|
+
{
|
|
1944
|
+
// Relays are untrusted: re-check the filter and the signature, so a stray
|
|
1945
|
+
// or forged later event cannot shadow the real card.
|
|
1946
|
+
onevent(event) {
|
|
1947
|
+
if (event.kind !== import_solver_discovery5.SOLVER_CARD_KIND || !asked.has(event.pubkey))
|
|
1948
|
+
return;
|
|
1949
|
+
if (!(0, import_nostr_tools.verifyEvent)(event)) return;
|
|
1950
|
+
if (event.tags.find((tag) => tag[0] === "d")?.[1] !== network)
|
|
1951
|
+
return;
|
|
1952
|
+
if (isNewer(event, latest.get(event.pubkey)))
|
|
1953
|
+
latest.set(event.pubkey, event);
|
|
1954
|
+
},
|
|
1955
|
+
oneose: () => resolve(),
|
|
1956
|
+
onclose: () => resolve()
|
|
1957
|
+
}
|
|
1958
|
+
);
|
|
1959
|
+
});
|
|
1960
|
+
} finally {
|
|
1961
|
+
clearTimeout(timer);
|
|
1962
|
+
if (options.pool) subscription?.close();
|
|
1963
|
+
else pool.close(relays);
|
|
1964
|
+
}
|
|
1965
|
+
for (const author of authors) {
|
|
1966
|
+
const key = `${network}:${author}`;
|
|
1967
|
+
const event = latest.get(author);
|
|
1968
|
+
if (event && isNewer(event, seen.get(key))) seen.set(key, event);
|
|
1969
|
+
const best = seen.get(key);
|
|
1970
|
+
if (best) latest.set(author, best);
|
|
1971
|
+
}
|
|
1972
|
+
const cards = [];
|
|
1973
|
+
for (const event of latest.values()) {
|
|
1974
|
+
try {
|
|
1975
|
+
const card = JSON.parse(event.content);
|
|
1976
|
+
cards.push({ pubkey: event.pubkey, createdAt: event.created_at, card });
|
|
1977
|
+
} catch {
|
|
1978
|
+
}
|
|
1979
|
+
}
|
|
1980
|
+
return cards;
|
|
1981
|
+
}
|
|
1982
|
+
};
|
|
1983
|
+
};
|
|
1898
1984
|
}
|
|
1899
1985
|
});
|
|
1900
1986
|
|
|
@@ -4084,15 +4170,15 @@ var corridorSet = (base, overrides) => {
|
|
|
4084
4170
|
};
|
|
4085
4171
|
|
|
4086
4172
|
// src/client/discovery.ts
|
|
4087
|
-
var
|
|
4173
|
+
var import_solver_discovery7 = require("@arkade-os/solver-discovery");
|
|
4088
4174
|
|
|
4089
4175
|
// src/markets.ts
|
|
4090
|
-
var
|
|
4091
|
-
var
|
|
4176
|
+
var import_solver_discovery6 = require("@arkade-os/solver-discovery");
|
|
4177
|
+
var import_sdk18 = require("@arkade-os/sdk");
|
|
4092
4178
|
init_store();
|
|
4093
4179
|
var QUOTE_OPTIONS = { safetyBps: 0 };
|
|
4094
4180
|
var makeCachedFeedFetch = (ttlMs = 3e4, fetchImpl = fetch) => {
|
|
4095
|
-
(0,
|
|
4181
|
+
(0, import_sdk18.assertNonNegativeMs)("ttlMs", ttlMs);
|
|
4096
4182
|
const cache = /* @__PURE__ */ new Map();
|
|
4097
4183
|
const inflight = /* @__PURE__ */ new Map();
|
|
4098
4184
|
return async (input, init) => {
|
|
@@ -4136,7 +4222,67 @@ var makeCachedFeedFetch = (ttlMs = 3e4, fetchImpl = fetch) => {
|
|
|
4136
4222
|
}
|
|
4137
4223
|
};
|
|
4138
4224
|
};
|
|
4139
|
-
var MARKETS_CACHE_TTL_MS =
|
|
4225
|
+
var MARKETS_CACHE_TTL_MS = 10 * 60 * 1e3;
|
|
4226
|
+
var registryAnswered = (sources) => sources.some((source) => source.sourceType === "registry" && source.ok);
|
|
4227
|
+
var CardTransportUnavailable = class extends Error {
|
|
4228
|
+
};
|
|
4229
|
+
var nostrFetcher;
|
|
4230
|
+
var nostrCards = {
|
|
4231
|
+
fetch: async (solvers, network) => {
|
|
4232
|
+
if (!nostrFetcher) {
|
|
4233
|
+
let nostr;
|
|
4234
|
+
try {
|
|
4235
|
+
nostr = await Promise.resolve().then(() => (init_nostr(), nostr_exports));
|
|
4236
|
+
} catch (error) {
|
|
4237
|
+
const reason = error instanceof Error ? error.message : String(error);
|
|
4238
|
+
throw new CardTransportUnavailable(
|
|
4239
|
+
`the nostr-tools peer is not installed (${reason})`
|
|
4240
|
+
);
|
|
4241
|
+
}
|
|
4242
|
+
nostrFetcher ??= nostr.nostrCardFetcher();
|
|
4243
|
+
}
|
|
4244
|
+
return nostrFetcher.fetch(solvers, network);
|
|
4245
|
+
}
|
|
4246
|
+
};
|
|
4247
|
+
var transportCardsOf = (option) => option === void 0 ? nostrCards : option ?? void 0;
|
|
4248
|
+
var UNDELIVERED_CARRY_MS = import_solver_discovery6.MAX_CARD_AGE_SECONDS * 1e3;
|
|
4249
|
+
var DEGRADED_RETRY_MS = 6e4;
|
|
4250
|
+
var trackDelivery = (fetcher) => {
|
|
4251
|
+
let undelivered = /* @__PURE__ */ new Set();
|
|
4252
|
+
if (!fetcher) return { fetcher, undelivered: () => undelivered };
|
|
4253
|
+
return {
|
|
4254
|
+
fetcher: {
|
|
4255
|
+
async fetch(solvers, network) {
|
|
4256
|
+
const asked = solvers.filter(
|
|
4257
|
+
(solver) => Object.keys(solver.transports ?? {}).length > 0
|
|
4258
|
+
);
|
|
4259
|
+
try {
|
|
4260
|
+
const cards = await fetcher.fetch(solvers, network);
|
|
4261
|
+
const got = new Set(
|
|
4262
|
+
Array.isArray(cards) ? cards.map((card) => card?.pubkey) : []
|
|
4263
|
+
);
|
|
4264
|
+
undelivered = new Set(
|
|
4265
|
+
asked.filter((solver) => !got.has(solver.discovery_pubkey)).map((solver) => solver.name)
|
|
4266
|
+
);
|
|
4267
|
+
return cards;
|
|
4268
|
+
} catch (error) {
|
|
4269
|
+
if (!(error instanceof CardTransportUnavailable))
|
|
4270
|
+
undelivered = new Set(asked.map((solver) => solver.name));
|
|
4271
|
+
throw error;
|
|
4272
|
+
}
|
|
4273
|
+
}
|
|
4274
|
+
},
|
|
4275
|
+
undelivered: () => undelivered
|
|
4276
|
+
};
|
|
4277
|
+
};
|
|
4278
|
+
var undeliveredCarry = (fresh, undelivered, cached) => {
|
|
4279
|
+
if (undelivered.size === 0 || !cached) return [];
|
|
4280
|
+
if (Date.now() - cached.fetchedAt >= UNDELIVERED_CARRY_MS) return [];
|
|
4281
|
+
const answered = new Set(fresh.map((market) => market.solver));
|
|
4282
|
+
return cached.markets.filter(
|
|
4283
|
+
(market) => undelivered.has(market.solver) && !answered.has(market.solver)
|
|
4284
|
+
);
|
|
4285
|
+
};
|
|
4140
4286
|
|
|
4141
4287
|
// src/client/discovery.ts
|
|
4142
4288
|
var REGISTRY_URL = {
|
|
@@ -4147,7 +4293,7 @@ var REGISTRY_URL = {
|
|
|
4147
4293
|
};
|
|
4148
4294
|
var HEX_64 = /^[0-9a-f]{64}$/;
|
|
4149
4295
|
var LEGACY_ASSET_ID = /^(?:btc|[0-9a-f]{68})$/;
|
|
4150
|
-
var isRelayList = (value) => Array.isArray(value) && value.length > 0 && value.length <=
|
|
4296
|
+
var isRelayList = (value) => Array.isArray(value) && value.length > 0 && value.length <= import_solver_discovery7.MAX_RELAYS && value.every((relay) => typeof relay === "string" && relay.startsWith("wss://"));
|
|
4151
4297
|
var isCorridorField = (value) => value === void 0 || CORRIDORS.includes(value);
|
|
4152
4298
|
var isUsableCard = (value) => {
|
|
4153
4299
|
const card = value;
|
|
@@ -4159,7 +4305,7 @@ var isUsableCard = (value) => {
|
|
|
4159
4305
|
const id = marketAssetId(card, side);
|
|
4160
4306
|
if (id === void 0 || !isAssetId(id) && !LEGACY_ASSET_ID.test(id)) return false;
|
|
4161
4307
|
}
|
|
4162
|
-
if ((0,
|
|
4308
|
+
if ((0, import_solver_discovery7.isRfqMarket)(card)) {
|
|
4163
4309
|
if (typeof card.discovery_pubkey !== "string" || !HEX_64.test(card.discovery_pubkey)) {
|
|
4164
4310
|
return false;
|
|
4165
4311
|
}
|
|
@@ -4186,6 +4332,7 @@ var discoveryIndex = (input) => {
|
|
|
4186
4332
|
ref: { fetchedAt: Date.now(), live: true, source: "injected" }
|
|
4187
4333
|
};
|
|
4188
4334
|
let held;
|
|
4335
|
+
let revalidateAt = 0;
|
|
4189
4336
|
const unavailable = (detail) => {
|
|
4190
4337
|
throw new DiscoverySnapshotUnavailable(input.network, detail);
|
|
4191
4338
|
};
|
|
@@ -4224,30 +4371,50 @@ var discoveryIndex = (input) => {
|
|
|
4224
4371
|
held = cached;
|
|
4225
4372
|
return cached;
|
|
4226
4373
|
}
|
|
4374
|
+
const { network: indexed, registry: url } = sources();
|
|
4375
|
+
if (indexed && url && config.localCards?.length) {
|
|
4376
|
+
const { markets } = await (0, import_solver_discovery7.discover)({
|
|
4377
|
+
registries: [],
|
|
4378
|
+
localCards: [...config.localCards],
|
|
4379
|
+
network: indexed
|
|
4380
|
+
});
|
|
4381
|
+
if (markets.length > 0) {
|
|
4382
|
+
return { markets, ref: { fetchedAt: Date.now(), live: true, source: "local" } };
|
|
4383
|
+
}
|
|
4384
|
+
}
|
|
4227
4385
|
return unavailable(whyUnavailable());
|
|
4228
4386
|
};
|
|
4229
4387
|
const load = async (opts = {}) => {
|
|
4230
4388
|
if (injected) return injected;
|
|
4231
|
-
const fresh = held?.ref.live === true && Date.now()
|
|
4389
|
+
const fresh = held?.ref.live === true && Date.now() < revalidateAt;
|
|
4232
4390
|
if (fresh && !opts.refresh) return held;
|
|
4233
4391
|
const { network: indexed, registry: url } = sources();
|
|
4234
4392
|
if (!indexed || !url) {
|
|
4235
4393
|
return unavailable(whyUnavailable());
|
|
4236
4394
|
}
|
|
4237
|
-
const
|
|
4395
|
+
const delivery = trackDelivery(transportCardsOf(config.transportCards));
|
|
4396
|
+
const result = await (0, import_solver_discovery7.discover)({
|
|
4238
4397
|
registries: [url],
|
|
4239
4398
|
localCards: [...config.localCards ?? []],
|
|
4240
4399
|
network: indexed,
|
|
4241
|
-
fetchImpl: config.fetchImpl
|
|
4400
|
+
fetchImpl: config.fetchImpl,
|
|
4401
|
+
transportCards: delivery.fetcher
|
|
4242
4402
|
});
|
|
4243
4403
|
if (result.warnings.length) config.logger?.("solver discovery:", ...result.warnings);
|
|
4244
|
-
if (result.sources
|
|
4404
|
+
if (registryAnswered(result.sources)) {
|
|
4245
4405
|
const fetchedAt = Date.now();
|
|
4246
4406
|
held = {
|
|
4247
4407
|
markets: result.markets,
|
|
4248
4408
|
ref: { fetchedAt, live: true, source: "live", registry: url }
|
|
4249
4409
|
};
|
|
4250
|
-
|
|
4410
|
+
const undelivered = delivery.undelivered();
|
|
4411
|
+
const keepsCache = undelivered.size > 0 && input.repository !== void 0 && undeliveredCarry(
|
|
4412
|
+
result.markets,
|
|
4413
|
+
undelivered,
|
|
4414
|
+
await readCache(input.repository, indexed, url)
|
|
4415
|
+
).length > 0;
|
|
4416
|
+
revalidateAt = fetchedAt + (keepsCache ? DEGRADED_RETRY_MS : MARKETS_CACHE_TTL_MS);
|
|
4417
|
+
if (input.repository && !keepsCache) {
|
|
4251
4418
|
try {
|
|
4252
4419
|
await input.repository.saveCachedMarkets(indexed, url, {
|
|
4253
4420
|
markets: result.markets,
|
|
@@ -4263,6 +4430,12 @@ var discoveryIndex = (input) => {
|
|
|
4263
4430
|
held = cached;
|
|
4264
4431
|
return cached;
|
|
4265
4432
|
}
|
|
4433
|
+
if (result.markets.length > 0) {
|
|
4434
|
+
const fetchedAt = Date.now();
|
|
4435
|
+
held = { markets: result.markets, ref: { fetchedAt, live: true, source: "local" } };
|
|
4436
|
+
revalidateAt = fetchedAt + DEGRADED_RETRY_MS;
|
|
4437
|
+
return held;
|
|
4438
|
+
}
|
|
4266
4439
|
return unavailable(whyUnavailable());
|
|
4267
4440
|
};
|
|
4268
4441
|
return { peek, load };
|
|
@@ -4270,13 +4443,13 @@ var discoveryIndex = (input) => {
|
|
|
4270
4443
|
|
|
4271
4444
|
// src/client/cancel.ts
|
|
4272
4445
|
var import_base14 = require("@scure/base");
|
|
4273
|
-
var
|
|
4446
|
+
var import_sdk22 = require("@arkade-os/sdk");
|
|
4274
4447
|
init_coverage();
|
|
4275
4448
|
init_offer();
|
|
4276
4449
|
|
|
4277
4450
|
// src/restore.ts
|
|
4278
4451
|
var import_base11 = require("@scure/base");
|
|
4279
|
-
var
|
|
4452
|
+
var import_sdk19 = require("@arkade-os/sdk");
|
|
4280
4453
|
init_offer();
|
|
4281
4454
|
init_store();
|
|
4282
4455
|
var TXS_PER_REQUEST = 50;
|
|
@@ -4301,7 +4474,7 @@ async function fetchParsedTxs(indexer, txids) {
|
|
|
4301
4474
|
if (result.status !== "fulfilled") continue;
|
|
4302
4475
|
for (const psbt of result.value) {
|
|
4303
4476
|
try {
|
|
4304
|
-
const parsed =
|
|
4477
|
+
const parsed = import_sdk19.Transaction.fromPSBT(import_base11.base64.decode(psbt));
|
|
4305
4478
|
parsedByTxid.set(parsed.id, parsed);
|
|
4306
4479
|
} catch {
|
|
4307
4480
|
}
|
|
@@ -4330,7 +4503,7 @@ function classifySpend(offer, operatorPubkey, spendTx, deposit) {
|
|
|
4330
4503
|
if (!input.txid || input.index !== deposit.vout) continue;
|
|
4331
4504
|
if (import_base11.hex.encode(input.txid) !== deposit.txid) continue;
|
|
4332
4505
|
for (const leaf of input.tapLeafScript ?? []) {
|
|
4333
|
-
const spent = import_base11.hex.encode((0,
|
|
4506
|
+
const spent = import_base11.hex.encode((0, import_sdk19.scriptFromTapLeafScript)(leaf));
|
|
4334
4507
|
if (leaves.returned.some((back) => spent === import_base11.hex.encode(back))) return "cancelled";
|
|
4335
4508
|
if (leaves.fulfill && spent === import_base11.hex.encode(leaves.fulfill)) return "fulfilled";
|
|
4336
4509
|
}
|
|
@@ -4384,7 +4557,7 @@ async function restoreAssetSwaps(indexer, txs, existingIds, opts) {
|
|
|
4384
4557
|
if (!fundingTx) continue;
|
|
4385
4558
|
fetchedTxids.push(txid);
|
|
4386
4559
|
try {
|
|
4387
|
-
const packet =
|
|
4560
|
+
const packet = import_sdk19.Extension.fromTx(parsed).getPacketByType(OFFER_PACKET_TYPE);
|
|
4388
4561
|
if (!packet) continue;
|
|
4389
4562
|
const payload = packet.serialize();
|
|
4390
4563
|
found.push({
|
|
@@ -4501,7 +4674,7 @@ init_repository();
|
|
|
4501
4674
|
init_repository();
|
|
4502
4675
|
|
|
4503
4676
|
// src/rfqRecord.ts
|
|
4504
|
-
var
|
|
4677
|
+
var import_sdk20 = require("@arkade-os/sdk");
|
|
4505
4678
|
var import_base12 = require("@scure/base");
|
|
4506
4679
|
|
|
4507
4680
|
// src/rfqSwapState.ts
|
|
@@ -4556,7 +4729,7 @@ function assertSameSwap(origin, swap) {
|
|
|
4556
4729
|
`rfq swap record is a ${origin.kind} origin paired with a ${swap.kind} swap`
|
|
4557
4730
|
);
|
|
4558
4731
|
}
|
|
4559
|
-
const funded = import_base12.hex.encode(
|
|
4732
|
+
const funded = import_base12.hex.encode(import_sdk20.ArkAddress.decode(origin.lockupAddress).pkScript);
|
|
4560
4733
|
const watched = import_base12.hex.encode(swap.lockupPkScript);
|
|
4561
4734
|
if (funded !== watched) {
|
|
4562
4735
|
throw new Error(
|
|
@@ -4603,8 +4776,8 @@ function rfqSwapOriginOf(record) {
|
|
|
4603
4776
|
};
|
|
4604
4777
|
}
|
|
4605
4778
|
function lockupScript(params, lockupAddress) {
|
|
4606
|
-
const script =
|
|
4607
|
-
const funded =
|
|
4779
|
+
const script = import_sdk20.VHTLCV2ContractHandler.createScript(params);
|
|
4780
|
+
const funded = import_sdk20.ArkAddress.decode(lockupAddress).pkScript;
|
|
4608
4781
|
if (import_base12.hex.encode(funded) !== import_base12.hex.encode(script.pkScript)) {
|
|
4609
4782
|
throw new Error(
|
|
4610
4783
|
`rfq swap covenant params derive ${import_base12.hex.encode(script.pkScript)}, but the record's lockup address holds ${import_base12.hex.encode(funded)} \u2014 these params are not this swap's`
|
|
@@ -4641,7 +4814,7 @@ function shouldRetainRfqSwap(record, now) {
|
|
|
4641
4814
|
|
|
4642
4815
|
// src/client/driveRecords.ts
|
|
4643
4816
|
init_store();
|
|
4644
|
-
var
|
|
4817
|
+
var import_sdk21 = require("@arkade-os/sdk");
|
|
4645
4818
|
var import_sha25 = require("@noble/hashes/sha2.js");
|
|
4646
4819
|
var import_base13 = require("@scure/base");
|
|
4647
4820
|
var splitRecords = (records) => {
|
|
@@ -4696,7 +4869,7 @@ var pageRfqRecords = (records, filter, page) => {
|
|
|
4696
4869
|
).sort(
|
|
4697
4870
|
(a, b) => a.updatedAt - b.updatedAt || (a.rfqId < b.rfqId ? -1 : a.rfqId > b.rfqId ? 1 : 0)
|
|
4698
4871
|
).slice(0, page.limit + 1);
|
|
4699
|
-
return (0,
|
|
4872
|
+
return (0, import_sdk21.pageResult)(rows, page.limit, (record) => ({
|
|
4700
4873
|
updatedAt: record.updatedAt,
|
|
4701
4874
|
rfqId: record.rfqId
|
|
4702
4875
|
}));
|
|
@@ -4722,7 +4895,7 @@ var corridorRecordStore = (repository, onRecord = () => {
|
|
|
4722
4895
|
index,
|
|
4723
4896
|
quoteIdOf: (rfqId) => byRfqId.get(rfqId),
|
|
4724
4897
|
async getRfqSwapsPage(filter, page) {
|
|
4725
|
-
(0,
|
|
4898
|
+
(0, import_sdk21.assertPageRequest)(page);
|
|
4726
4899
|
assertRfqSwapPageFilter(filter);
|
|
4727
4900
|
const { corridor } = splitRecords(await collectSwapRecords(repository));
|
|
4728
4901
|
for (const record of corridor) index(record);
|
|
@@ -4831,7 +5004,7 @@ var restoredOfferRecord = (swap, network, now) => {
|
|
|
4831
5004
|
now
|
|
4832
5005
|
);
|
|
4833
5006
|
};
|
|
4834
|
-
var restoredAssetId = (network, id) => id === BTC_ASSET_ID ? btcOn("arkade", network) : arkadeAsset(network,
|
|
5007
|
+
var restoredAssetId = (network, id) => id === BTC_ASSET_ID ? btcOn("arkade", network) : arkadeAsset(network, import_sdk21.asset.AssetId.fromString(id));
|
|
4835
5008
|
var RESTORED_CORRIDORS = {
|
|
4836
5009
|
lightning_send: ["arkade", "lightning"],
|
|
4837
5010
|
lightning_receive: ["lightning", "arkade"],
|
|
@@ -4863,7 +5036,7 @@ var restoredCorridorRecord = (stored, network, refundLocktime) => {
|
|
|
4863
5036
|
kind: v1.kind,
|
|
4864
5037
|
rfqId: v1.rfqId,
|
|
4865
5038
|
lockupAddress: v1.lockupAddress,
|
|
4866
|
-
lockupPkScript: import_base13.hex.encode(
|
|
5039
|
+
lockupPkScript: import_base13.hex.encode(import_sdk21.ArkAddress.decode(v1.lockupAddress).pkScript),
|
|
4867
5040
|
lock: { hash },
|
|
4868
5041
|
refundLocktime,
|
|
4869
5042
|
profile: v1.profile,
|
|
@@ -4959,12 +5132,12 @@ var reconcileDepositSpend = async (record, indexer) => {
|
|
|
4959
5132
|
const { txs } = await indexer.getVirtualTxs(candidates);
|
|
4960
5133
|
const parsed = txs.map((psbt) => {
|
|
4961
5134
|
try {
|
|
4962
|
-
return
|
|
5135
|
+
return import_sdk22.Transaction.fromPSBT(import_base14.base64.decode(psbt));
|
|
4963
5136
|
} catch {
|
|
4964
5137
|
return void 0;
|
|
4965
5138
|
}
|
|
4966
5139
|
}).filter((tx) => tx !== void 0);
|
|
4967
|
-
const operatorPubkey =
|
|
5140
|
+
const operatorPubkey = import_sdk22.ArkAddress.decode(record.swapAddress).serverPubKey;
|
|
4968
5141
|
const kind = classifyDepositSpend(offer, operatorPubkey, parsed, {
|
|
4969
5142
|
txid: deposit.txid,
|
|
4970
5143
|
vout: deposit.vout
|
|
@@ -5002,11 +5175,11 @@ var retireOfferScripts = async (wallet, repository, record) => {
|
|
|
5002
5175
|
};
|
|
5003
5176
|
|
|
5004
5177
|
// src/client/drive.ts
|
|
5005
|
-
var
|
|
5178
|
+
var import_sdk28 = require("@arkade-os/sdk");
|
|
5006
5179
|
var import_base17 = require("@scure/base");
|
|
5007
5180
|
|
|
5008
5181
|
// src/claim.ts
|
|
5009
|
-
var
|
|
5182
|
+
var import_sdk23 = require("@arkade-os/sdk");
|
|
5010
5183
|
init_onchainHtlc();
|
|
5011
5184
|
var LockupAmountMismatchError = class extends Error {
|
|
5012
5185
|
name = "LockupAmountMismatchError";
|
|
@@ -5039,8 +5212,8 @@ async function pushClaim(operator, input) {
|
|
|
5039
5212
|
assertPreimageMatches(input.preimage, input.contract.options.preimageHash);
|
|
5040
5213
|
const serverUnrollScript = await operatorUnrollScript(operator, input.network);
|
|
5041
5214
|
const leaf = input.contract.claim();
|
|
5042
|
-
const txid = await (0,
|
|
5043
|
-
identity: (0,
|
|
5215
|
+
const txid = await (0, import_sdk23.signAndSubmitOffchainTx)({
|
|
5216
|
+
identity: (0, import_sdk23.claimWithPreimageIdentity)(input.receiver, input.preimage),
|
|
5044
5217
|
provider: operator,
|
|
5045
5218
|
inputs: lockupInputs(input.vtxos, input.contract, leaf),
|
|
5046
5219
|
// One aggregate output: this leaf inspects nothing about the output set.
|
|
@@ -5058,7 +5231,7 @@ init_offer();
|
|
|
5058
5231
|
init_lockupContract();
|
|
5059
5232
|
|
|
5060
5233
|
// src/refundBlocked.ts
|
|
5061
|
-
var
|
|
5234
|
+
var import_sdk24 = require("@arkade-os/sdk");
|
|
5062
5235
|
var RefundNotLocallyPossibleError = class extends Error {
|
|
5063
5236
|
constructor(reason, message, options) {
|
|
5064
5237
|
super(message, options);
|
|
@@ -5075,16 +5248,16 @@ async function senderIdentityForSwapRecord(wallet, record) {
|
|
|
5075
5248
|
);
|
|
5076
5249
|
}
|
|
5077
5250
|
try {
|
|
5078
|
-
return await (0,
|
|
5251
|
+
return await (0, import_sdk24.contractSigner)(wallet, record.signingDescriptor);
|
|
5079
5252
|
} catch (cause) {
|
|
5080
|
-
if (cause instanceof
|
|
5253
|
+
if (cause instanceof import_sdk24.WalletCannotSignError) {
|
|
5081
5254
|
throw new RefundNotLocallyPossibleError(
|
|
5082
5255
|
"unsignable-wallet",
|
|
5083
5256
|
`this wallet holds ${record.signingDescriptor} but cannot sign with it; attach its signer`,
|
|
5084
5257
|
{ cause }
|
|
5085
5258
|
);
|
|
5086
5259
|
}
|
|
5087
|
-
if (cause instanceof
|
|
5260
|
+
if (cause instanceof import_sdk24.ForeignDescriptorError) {
|
|
5088
5261
|
throw new RefundNotLocallyPossibleError(
|
|
5089
5262
|
"foreign-descriptor",
|
|
5090
5263
|
`this wallet cannot derive ${record.signingDescriptor}; the swap was created on another wallet`,
|
|
@@ -5129,7 +5302,7 @@ init_repository();
|
|
|
5129
5302
|
|
|
5130
5303
|
// src/swapManager.ts
|
|
5131
5304
|
var import_base15 = require("@scure/base");
|
|
5132
|
-
var
|
|
5305
|
+
var import_sdk25 = require("@arkade-os/sdk");
|
|
5133
5306
|
init_onchainHtlc();
|
|
5134
5307
|
init_lockupContract();
|
|
5135
5308
|
init_repository();
|
|
@@ -5260,7 +5433,7 @@ var RfqSwapManager = class _RfqSwapManager {
|
|
|
5260
5433
|
timer = null;
|
|
5261
5434
|
running = false;
|
|
5262
5435
|
constructor(deps, config = {}) {
|
|
5263
|
-
(0,
|
|
5436
|
+
(0, import_sdk25.assertTimerMs)("pollIntervalMs", config.pollIntervalMs);
|
|
5264
5437
|
this.deps = deps;
|
|
5265
5438
|
this.config = {
|
|
5266
5439
|
enableAutoActions: config.enableAutoActions ?? true,
|
|
@@ -5604,7 +5777,7 @@ var RfqSwapManager = class _RfqSwapManager {
|
|
|
5604
5777
|
});
|
|
5605
5778
|
return;
|
|
5606
5779
|
}
|
|
5607
|
-
if (!(0,
|
|
5780
|
+
if (!(0, import_sdk25.isContractVtxoEvent)(event)) return;
|
|
5608
5781
|
const swap = this.byLockupScript.get(event.contractScript);
|
|
5609
5782
|
if (!swap) return;
|
|
5610
5783
|
void this.pollSwap(swap).catch(() => {
|
|
@@ -5832,8 +6005,8 @@ var RfqSwapManager = class _RfqSwapManager {
|
|
|
5832
6005
|
this.setState(swap, "claimed");
|
|
5833
6006
|
this.emitAction(swap, "claimLockup");
|
|
5834
6007
|
} catch (error) {
|
|
5835
|
-
const ark = (0,
|
|
5836
|
-
if ((0,
|
|
6008
|
+
const ark = (0, import_sdk25.isArkError)(error) ? error : (0, import_sdk25.maybeArkError)(error);
|
|
6009
|
+
if ((0, import_sdk25.isArkError)(ark, import_sdk25.ArkErrorName.VTXO_ALREADY_SPENT)) {
|
|
5837
6010
|
if (swap.claimFailure !== void 0) {
|
|
5838
6011
|
delete swap.claimFailure;
|
|
5839
6012
|
this.touch(swap);
|
|
@@ -6234,7 +6407,7 @@ var outpointKey = (vtxo) => `${vtxo.txid}:${vtxo.vout}`;
|
|
|
6234
6407
|
|
|
6235
6408
|
// src/watch.ts
|
|
6236
6409
|
var import_base16 = require("@scure/base");
|
|
6237
|
-
var
|
|
6410
|
+
var import_sdk26 = require("@arkade-os/sdk");
|
|
6238
6411
|
init_coverage();
|
|
6239
6412
|
init_offer();
|
|
6240
6413
|
init_store();
|
|
@@ -6269,7 +6442,7 @@ async function watchOfferSwaps({
|
|
|
6269
6442
|
wallet.getAddress(),
|
|
6270
6443
|
wallet.getArkadeReader()
|
|
6271
6444
|
]);
|
|
6272
|
-
const operatorPubkey =
|
|
6445
|
+
const operatorPubkey = import_sdk26.ArkAddress.decode(address).serverPubKey;
|
|
6273
6446
|
let queue = Promise.resolve();
|
|
6274
6447
|
const enqueue = (task) => {
|
|
6275
6448
|
queue = queue.then(task).catch(() => {
|
|
@@ -6284,7 +6457,7 @@ async function watchOfferSwaps({
|
|
|
6284
6457
|
return classifyDepositSpend(
|
|
6285
6458
|
decodeOffer(import_base16.hex.decode(swap.offerHex)),
|
|
6286
6459
|
operatorPubkey,
|
|
6287
|
-
txs.map((psbt) =>
|
|
6460
|
+
txs.map((psbt) => import_sdk26.Transaction.fromPSBT(import_base16.base64.decode(psbt))),
|
|
6288
6461
|
{ txid: vtxo.txid, vout: vtxo.vout }
|
|
6289
6462
|
);
|
|
6290
6463
|
} catch {
|
|
@@ -6312,7 +6485,7 @@ async function watchOfferSwaps({
|
|
|
6312
6485
|
}
|
|
6313
6486
|
};
|
|
6314
6487
|
const unsubscribe = manager.onContractEvent((event) => {
|
|
6315
|
-
if (!(0,
|
|
6488
|
+
if (!(0, import_sdk26.isContractVtxoEvent)(event) || event.type !== "vtxo_spent") return;
|
|
6316
6489
|
enqueue(() => handleSpend(event));
|
|
6317
6490
|
});
|
|
6318
6491
|
return {
|
|
@@ -6322,7 +6495,7 @@ async function watchOfferSwaps({
|
|
|
6322
6495
|
}
|
|
6323
6496
|
|
|
6324
6497
|
// src/client/legacyRecords.ts
|
|
6325
|
-
var
|
|
6498
|
+
var import_sdk27 = require("@arkade-os/sdk");
|
|
6326
6499
|
init_repository();
|
|
6327
6500
|
var readLegacyRfqSwaps = async (repository, filter = {}) => {
|
|
6328
6501
|
try {
|
|
@@ -6339,7 +6512,7 @@ var withLegacyRfqSwaps = (bridge, repository, admits) => {
|
|
|
6339
6512
|
index: bridge.index,
|
|
6340
6513
|
quoteIdOf: bridge.quoteIdOf,
|
|
6341
6514
|
async getRfqSwapsPage(filter, page) {
|
|
6342
|
-
(0,
|
|
6515
|
+
(0, import_sdk27.assertPageRequest)(page);
|
|
6343
6516
|
assertRfqSwapPageFilter(filter);
|
|
6344
6517
|
const v2 = await collectRfqSwaps(bridge, filter);
|
|
6345
6518
|
const held = new Set(
|
|
@@ -6578,7 +6751,7 @@ var createSwapDrive = (config) => {
|
|
|
6578
6751
|
const secret = rfqClaimSecretOf(record);
|
|
6579
6752
|
if (!secret) throw new Error(`rfq swap ${swap.rfqId} carries no claim secret`);
|
|
6580
6753
|
const preimage = await preimageForSwapRecord(wallet, secret);
|
|
6581
|
-
const signer = await (0,
|
|
6754
|
+
const signer = await (0, import_sdk28.contractSigner)(wallet, await (0, import_sdk28.identityDescriptor)(wallet.identity));
|
|
6582
6755
|
const claimKey = record.profile.claimKey;
|
|
6583
6756
|
if (typeof claimKey === "string") {
|
|
6584
6757
|
const held = import_base17.hex.encode(await signer.xOnlyPublicKey());
|
|
@@ -6616,7 +6789,7 @@ var createSwapDrive = (config) => {
|
|
|
6616
6789
|
`rfq swap ${swap.rfqId} carries no refund descriptor; wire the onchain corridor's refund callback to take its L1 funding back`
|
|
6617
6790
|
);
|
|
6618
6791
|
}
|
|
6619
|
-
const signer = await (0,
|
|
6792
|
+
const signer = await (0, import_sdk28.contractSigner)(wallet, descriptor);
|
|
6620
6793
|
const held = import_base17.hex.encode(await signer.xOnlyPublicKey());
|
|
6621
6794
|
if (held !== record.profile.refundKey) {
|
|
6622
6795
|
throw new Error(
|
|
@@ -6656,7 +6829,7 @@ var createSwapDrive = (config) => {
|
|
|
6656
6829
|
}
|
|
6657
6830
|
};
|
|
6658
6831
|
const drivable = async (record) => !readsChain(record.kind) || await resolveOnchain();
|
|
6659
|
-
const pinnedNetwork = async () => (0,
|
|
6832
|
+
const pinnedNetwork = async () => (0, import_sdk28.getNetwork)(await config.network());
|
|
6660
6833
|
const claimLockup = async (swap, vtxos, { partiallyClaimed }) => {
|
|
6661
6834
|
const record = await corridorStore().getRfqSwap(swap.rfqId);
|
|
6662
6835
|
if (!record) throw new Error(`rfq swap ${swap.rfqId} has no stored record to claim from`);
|
|
@@ -6671,10 +6844,10 @@ var createSwapDrive = (config) => {
|
|
|
6671
6844
|
return track(
|
|
6672
6845
|
pushClaim(operator, {
|
|
6673
6846
|
contract: script,
|
|
6674
|
-
receiver: await (0,
|
|
6847
|
+
receiver: await (0, import_sdk28.contractSigner)(wallet, secret.signingDescriptor),
|
|
6675
6848
|
preimage: await preimageForSwapRecord(wallet, secret),
|
|
6676
6849
|
vtxos,
|
|
6677
|
-
destinationPkScript:
|
|
6850
|
+
destinationPkScript: import_sdk28.ArkAddress.decode(payoutAddress).pkScript,
|
|
6678
6851
|
// Passed through: `pushClaim`'s own value check decides whether `P` is published.
|
|
6679
6852
|
expectedAmount: swap.expectedAmount,
|
|
6680
6853
|
partiallyClaimed,
|
|
@@ -6742,7 +6915,7 @@ var createSwapDrive = (config) => {
|
|
|
6742
6915
|
config.network()
|
|
6743
6916
|
]);
|
|
6744
6917
|
const txs = history.map(toRestoreTx);
|
|
6745
|
-
const { hrp, serverPubKey: operatorPubkey } =
|
|
6918
|
+
const { hrp, serverPubKey: operatorPubkey } = import_sdk28.ArkAddress.decode(address);
|
|
6746
6919
|
const reopened = await legacyOfferDepositsToAdopt(store);
|
|
6747
6920
|
for (const txid of reopen) reopened.add(txid);
|
|
6748
6921
|
const cursor = reopened.size === 0 ? scanned : new Set([...scanned].filter((txid) => !reopened.has(txid)));
|
|
@@ -7098,24 +7271,24 @@ var createSwapDrive = (config) => {
|
|
|
7098
7271
|
};
|
|
7099
7272
|
|
|
7100
7273
|
// src/client/quoteOffer.ts
|
|
7101
|
-
var
|
|
7274
|
+
var import_solver_discovery9 = require("@arkade-os/solver-discovery");
|
|
7102
7275
|
init_offer();
|
|
7103
7276
|
|
|
7104
7277
|
// src/client/market.ts
|
|
7105
|
-
var
|
|
7278
|
+
var import_solver_discovery8 = require("@arkade-os/solver-discovery");
|
|
7106
7279
|
var marketKeyOf = (card) => {
|
|
7107
|
-
const base = (0,
|
|
7108
|
-
const quote = (0,
|
|
7109
|
-
const baseIsArkade = (0,
|
|
7110
|
-
const quoteIsArkade = (0,
|
|
7280
|
+
const base = (0, import_solver_discovery8.marketLegKey)(card, "base");
|
|
7281
|
+
const quote = (0, import_solver_discovery8.marketLegKey)(card, "quote");
|
|
7282
|
+
const baseIsArkade = (0, import_solver_discovery8.marketCorridor)(card, "base") === "arkade";
|
|
7283
|
+
const quoteIsArkade = (0, import_solver_discovery8.marketCorridor)(card, "quote") === "arkade";
|
|
7111
7284
|
if (baseIsArkade !== quoteIsArkade) {
|
|
7112
7285
|
return baseIsArkade ? `${base}/${quote}` : `${quote}/${base}`;
|
|
7113
7286
|
}
|
|
7114
7287
|
return base <= quote ? `${base}/${quote}` : `${quote}/${base}`;
|
|
7115
7288
|
};
|
|
7116
7289
|
var hasRendezvous = (card) => typeof card.discovery_pubkey === "string" && (card.transports?.nostr?.relays?.length ?? 0) > 0;
|
|
7117
|
-
var isAddressable = (card) => !(0,
|
|
7118
|
-
var marketBackendOf = (card) => (0,
|
|
7290
|
+
var isAddressable = (card) => !(0, import_solver_discovery8.isRfqMarket)(card) || hasRendezvous(card);
|
|
7291
|
+
var marketBackendOf = (card) => (0, import_solver_discovery8.isRfqMarket)(card) || hasRendezvous(card) ? "rfq" : "feed";
|
|
7119
7292
|
var usableMarkets = (snapshot, policy) => {
|
|
7120
7293
|
const allowed = policy?.allowedRegistries;
|
|
7121
7294
|
return (allowed ? snapshot.markets.filter((card) => allowed.includes(card.source)) : snapshot.markets).filter(isAddressable);
|
|
@@ -7132,12 +7305,12 @@ var eligibleMarkets = (snapshot, legs, policy, takeAmount) => {
|
|
|
7132
7305
|
wantSide: side === "base" ? "quote" : "base",
|
|
7133
7306
|
...takeAmount === void 0 ? {} : { wantAmount: takeAmount }
|
|
7134
7307
|
};
|
|
7135
|
-
const canonical = (0,
|
|
7308
|
+
const canonical = (0, import_solver_discovery8.selectMarkets)([...markets], {
|
|
7136
7309
|
baseId: base.marketId,
|
|
7137
7310
|
quoteId: quote.marketId,
|
|
7138
7311
|
...selection
|
|
7139
7312
|
});
|
|
7140
|
-
const legacy = (0,
|
|
7313
|
+
const legacy = (0, import_solver_discovery8.selectMarkets)([...markets], {
|
|
7141
7314
|
baseId: `${base.corridor}:${base.assetId}`,
|
|
7142
7315
|
quoteId: `${quote.corridor}:${quote.assetId}`,
|
|
7143
7316
|
...selection
|
|
@@ -7542,7 +7715,7 @@ var quoteFromFeed = async (input) => {
|
|
|
7542
7715
|
if (amount === void 0) {
|
|
7543
7716
|
throw new Error("an asset swap needs an amount and the side it pins");
|
|
7544
7717
|
}
|
|
7545
|
-
const plan = await (0,
|
|
7718
|
+
const plan = await (0, import_solver_discovery9.quoteOffer)(candidate.card, {
|
|
7546
7719
|
give: candidate.give,
|
|
7547
7720
|
...amount.on === "give" ? { giveAmount: amount.value } : { wantAmount: amount.value },
|
|
7548
7721
|
// What `fund` attaches to an asset deposit and the fill pays an asset want: the plan asks
|
|
@@ -7586,7 +7759,7 @@ var quoteFromFeed = async (input) => {
|
|
|
7586
7759
|
};
|
|
7587
7760
|
var feedSpread = (plan, take, carrierSats = 0n) => {
|
|
7588
7761
|
const payout = take > carrierSats ? take - carrierSats : 0n;
|
|
7589
|
-
const fair = (0,
|
|
7762
|
+
const fair = (0, import_solver_discovery9.computeWantAmount)({
|
|
7590
7763
|
deposit: plan.deposit.atomic,
|
|
7591
7764
|
give: plan.give,
|
|
7592
7765
|
price: plan.price,
|
|
@@ -7604,7 +7777,7 @@ var feedExpiry = (card, feed, now) => {
|
|
|
7604
7777
|
};
|
|
7605
7778
|
var verifyPlanLegs = (plan, legs, give) => {
|
|
7606
7779
|
const take = give === "base" ? "quote" : "base";
|
|
7607
|
-
const spelled = (side) => (0,
|
|
7780
|
+
const spelled = (side) => (0, import_solver_discovery9.marketLegKey)(plan.market, side);
|
|
7608
7781
|
const names = (side, leg) => spelled(side) === leg.marketId || spelled(side) === `${leg.corridor}:${leg.assetId}`;
|
|
7609
7782
|
if (plan.give !== give || !names(give, legs.give) || !names(take, legs.take)) {
|
|
7610
7783
|
throw new QuoteVerificationFailed(
|
|
@@ -7617,8 +7790,8 @@ var verifyPlanLegs = (plan, legs, give) => {
|
|
|
7617
7790
|
|
|
7618
7791
|
// src/client/quoteRfq.ts
|
|
7619
7792
|
var import_base18 = require("@scure/base");
|
|
7620
|
-
var
|
|
7621
|
-
var
|
|
7793
|
+
var import_sdk31 = require("@arkade-os/sdk");
|
|
7794
|
+
var import_solver_discovery10 = require("@arkade-os/solver-discovery");
|
|
7622
7795
|
init_claimPacket();
|
|
7623
7796
|
init_offer();
|
|
7624
7797
|
init_store();
|
|
@@ -7626,11 +7799,11 @@ init_onchainHtlc();
|
|
|
7626
7799
|
init_onchainHtlc();
|
|
7627
7800
|
|
|
7628
7801
|
// src/payment/onchainSwap.ts
|
|
7629
|
-
var
|
|
7802
|
+
var import_sdk30 = require("@arkade-os/sdk");
|
|
7630
7803
|
init_onchainHtlc();
|
|
7631
7804
|
|
|
7632
7805
|
// src/payment/swapRail.ts
|
|
7633
|
-
var
|
|
7806
|
+
var import_sdk29 = require("@arkade-os/sdk");
|
|
7634
7807
|
|
|
7635
7808
|
// src/client/sats.ts
|
|
7636
7809
|
var satsOf = (value, field) => {
|
|
@@ -7687,13 +7860,13 @@ var lockupOf = (derived) => ({
|
|
|
7687
7860
|
pkScript: derived.swapPkScript
|
|
7688
7861
|
});
|
|
7689
7862
|
var covenantInputs = (input) => {
|
|
7690
|
-
const network = (0,
|
|
7863
|
+
const network = (0, import_sdk31.networkFromArkadeInfo)(input.info);
|
|
7691
7864
|
const arkade2 = input.corridors.get("arkade").deps;
|
|
7692
7865
|
return {
|
|
7693
|
-
operatorPubkey: (0,
|
|
7866
|
+
operatorPubkey: (0, import_sdk31.toXOnly)(import_base18.hex.decode(input.info.signerPubkey), "ark signer key"),
|
|
7694
7867
|
// The resolved per-network pin, never operator-reported: it lands in a covenant leaf
|
|
7695
7868
|
// that decides who can move the funds.
|
|
7696
|
-
emulatorPubkey: (0,
|
|
7869
|
+
emulatorPubkey: (0, import_sdk31.toXOnly)(import_base18.hex.decode(arkade2.emulatorPubkey), "emulator signer key"),
|
|
7697
7870
|
claimDelay: unilateralClaimDelay(Number(input.info.unilateralExitDelay)),
|
|
7698
7871
|
hrp: network.hrp
|
|
7699
7872
|
};
|
|
@@ -7770,7 +7943,7 @@ var quoteArkadeAsset = async (input) => {
|
|
|
7770
7943
|
floorSeconds: input.policy?.quoteTtlFloorSeconds
|
|
7771
7944
|
});
|
|
7772
7945
|
const carrierSats = sides.offerAsset === void 0 ? void 0 : verifiedCarrierSats(wire);
|
|
7773
|
-
const reference = await (0,
|
|
7946
|
+
const reference = await (0, import_solver_discovery10.quoteOffer)(input.candidate.card, {
|
|
7774
7947
|
give: input.candidate.give,
|
|
7775
7948
|
giveAmount: parsed.give,
|
|
7776
7949
|
...carrierSats === void 0 ? {} : { carrierSats },
|
|
@@ -7832,14 +8005,14 @@ var assetSidesOf = (legs) => {
|
|
|
7832
8005
|
{ give: "arkade", take: "arkade" }
|
|
7833
8006
|
);
|
|
7834
8007
|
}
|
|
7835
|
-
return giveIsBtc ? { wantAsset:
|
|
8008
|
+
return giveIsBtc ? { wantAsset: import_sdk31.asset.AssetId.fromString(legs.take.assetId) } : { offerAsset: import_sdk31.asset.AssetId.fromString(legs.give.assetId) };
|
|
7836
8009
|
};
|
|
7837
8010
|
var makerPosition = async (wallet) => {
|
|
7838
8011
|
const [address, publicKey] = await Promise.all([
|
|
7839
8012
|
wallet.getAddress(),
|
|
7840
8013
|
wallet.identity.xOnlyPublicKey()
|
|
7841
8014
|
]);
|
|
7842
|
-
return { pkScript:
|
|
8015
|
+
return { pkScript: import_sdk31.ArkAddress.decode(address).pkScript, publicKey };
|
|
7843
8016
|
};
|
|
7844
8017
|
var quoteLightningSend = async (input) => {
|
|
7845
8018
|
const invoice = input.endpoints.take.instrument;
|
|
@@ -7848,7 +8021,7 @@ var quoteLightningSend = async (input) => {
|
|
|
7848
8021
|
}
|
|
7849
8022
|
const pair = rfqPairFor(input.legs.give, input.legs.take);
|
|
7850
8023
|
const rfqId = newRfqId();
|
|
7851
|
-
const secrets = await (0,
|
|
8024
|
+
const secrets = await (0, import_sdk31.provisionRefundKey)(input.wallet);
|
|
7852
8025
|
const wire = await input.transport.requestQuote(
|
|
7853
8026
|
lightningSendRequest({
|
|
7854
8027
|
rfqId,
|
|
@@ -7923,7 +8096,7 @@ var quoteLightningReceive = async (input) => {
|
|
|
7923
8096
|
const pinned = pinnedFor(input);
|
|
7924
8097
|
const pair = rfqPairFor(input.legs.give, input.legs.take);
|
|
7925
8098
|
const rfqId = newRfqId();
|
|
7926
|
-
const secrets = await (0,
|
|
8099
|
+
const secrets = await (0, import_sdk31.provisionClaimSecret)(input.wallet);
|
|
7927
8100
|
const paymentHash = import_base18.hex.encode(secrets.paymentHash);
|
|
7928
8101
|
const payoutAddress = await input.wallet.getAddress();
|
|
7929
8102
|
const lightning = input.corridors.get("lightning").deps;
|
|
@@ -8035,8 +8208,8 @@ var quoteOnchainSend = async (input) => {
|
|
|
8035
8208
|
claimVsize: onchain.claimVsize
|
|
8036
8209
|
}) : void 0;
|
|
8037
8210
|
const quoted = claimFee === void 0 ? pinned : { on: pinned.on, value: pinned.value + claimFee, source: pinned.source };
|
|
8038
|
-
const secrets = await (0,
|
|
8039
|
-
const payoutKey = await (0,
|
|
8211
|
+
const secrets = await (0, import_sdk31.provisionClaimSecret)(input.wallet);
|
|
8212
|
+
const payoutKey = await (0, import_sdk31.provisionRefundKey)(input.wallet);
|
|
8040
8213
|
const paymentHash = import_base18.hex.encode(secrets.paymentHash);
|
|
8041
8214
|
const wire = await input.transport.requestQuote(
|
|
8042
8215
|
withCanonicalAmount(
|
|
@@ -8141,8 +8314,8 @@ var quoteOnchainReceive = async (input) => {
|
|
|
8141
8314
|
const pair = rfqPairFor(input.legs.give, input.legs.take);
|
|
8142
8315
|
const rfqId = newRfqId();
|
|
8143
8316
|
const l1Network = l1NetworkFromArk(input.info.network);
|
|
8144
|
-
const secrets = await (0,
|
|
8145
|
-
const refundKey = await (0,
|
|
8317
|
+
const secrets = await (0, import_sdk31.provisionClaimSecret)(input.wallet);
|
|
8318
|
+
const refundKey = await (0, import_sdk31.provisionRefundKey)(input.wallet);
|
|
8146
8319
|
const paymentHash = import_base18.hex.encode(secrets.paymentHash);
|
|
8147
8320
|
const payoutAddress = await input.wallet.getAddress();
|
|
8148
8321
|
const refundPkScript = l1ScriptForAddress(await input.wallet.getBoardingAddress(), l1Network);
|
|
@@ -8250,7 +8423,7 @@ var quoteOnchainReceive = async (input) => {
|
|
|
8250
8423
|
};
|
|
8251
8424
|
|
|
8252
8425
|
// src/client/verbs.ts
|
|
8253
|
-
var
|
|
8426
|
+
var import_sdk32 = require("@arkade-os/sdk");
|
|
8254
8427
|
var enforceFeeCeiling = (quote, call, policy) => {
|
|
8255
8428
|
let ceiling;
|
|
8256
8429
|
for (const [source, limit] of [
|
|
@@ -8275,9 +8448,9 @@ var settle = async (deps, input, maxFee) => {
|
|
|
8275
8448
|
return deps.accept(quote);
|
|
8276
8449
|
};
|
|
8277
8450
|
var pay = async (deps, destination, options = {}) => {
|
|
8278
|
-
const arkade2 = (0,
|
|
8451
|
+
const arkade2 = (0, import_sdk32.arkTarget)(destination);
|
|
8279
8452
|
if (arkade2 !== void 0) {
|
|
8280
|
-
const amount = (0,
|
|
8453
|
+
const amount = (0, import_sdk32.resolveSendAmount)(
|
|
8281
8454
|
"ark",
|
|
8282
8455
|
destination,
|
|
8283
8456
|
options.amount === void 0 ? void 0 : satsOf(options.amount, "amount")
|