@arkade-os/swap 0.1.0-rc.23 → 0.1.0-rc.24
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 +253 -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-J6MXF4GQ.js} +26 -5
- package/dist/{chunk-DQ2DY2L2.js → chunk-MSVRO7ZS.js} +116 -7
- package/dist/{errors-DQ35FKJf.d.ts → errors-ByFSFU1B.d.ts} +5 -3
- package/dist/{errors-5q4e3PnH.d.cts → errors-C0agdsz-.d.cts} +5 -3
- package/dist/index.cjs +279 -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 +1741 -1312
- 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,66 @@ 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 = 2 * 60 * 60 * 1e3;
|
|
4249
|
+
var trackDelivery = (fetcher) => {
|
|
4250
|
+
let undelivered = /* @__PURE__ */ new Set();
|
|
4251
|
+
if (!fetcher) return { fetcher, undelivered: () => undelivered };
|
|
4252
|
+
return {
|
|
4253
|
+
fetcher: {
|
|
4254
|
+
async fetch(solvers, network) {
|
|
4255
|
+
const asked = solvers.filter(
|
|
4256
|
+
(solver) => Object.keys(solver.transports ?? {}).length > 0
|
|
4257
|
+
);
|
|
4258
|
+
try {
|
|
4259
|
+
const cards = await fetcher.fetch(solvers, network);
|
|
4260
|
+
const got = new Set(
|
|
4261
|
+
Array.isArray(cards) ? cards.map((card) => card?.pubkey) : []
|
|
4262
|
+
);
|
|
4263
|
+
undelivered = new Set(
|
|
4264
|
+
asked.filter((solver) => !got.has(solver.discovery_pubkey)).map((solver) => solver.name)
|
|
4265
|
+
);
|
|
4266
|
+
return cards;
|
|
4267
|
+
} catch (error) {
|
|
4268
|
+
if (!(error instanceof CardTransportUnavailable))
|
|
4269
|
+
undelivered = new Set(asked.map((solver) => solver.name));
|
|
4270
|
+
throw error;
|
|
4271
|
+
}
|
|
4272
|
+
}
|
|
4273
|
+
},
|
|
4274
|
+
undelivered: () => undelivered
|
|
4275
|
+
};
|
|
4276
|
+
};
|
|
4277
|
+
var undeliveredCarry = (fresh, undelivered, cached) => {
|
|
4278
|
+
if (undelivered.size === 0 || !cached) return [];
|
|
4279
|
+
if (Date.now() - cached.fetchedAt >= UNDELIVERED_CARRY_MS) return [];
|
|
4280
|
+
const answered = new Set(fresh.map((market) => market.solver));
|
|
4281
|
+
return cached.markets.filter(
|
|
4282
|
+
(market) => undelivered.has(market.solver) && !answered.has(market.solver)
|
|
4283
|
+
);
|
|
4284
|
+
};
|
|
4140
4285
|
|
|
4141
4286
|
// src/client/discovery.ts
|
|
4142
4287
|
var REGISTRY_URL = {
|
|
@@ -4147,7 +4292,7 @@ var REGISTRY_URL = {
|
|
|
4147
4292
|
};
|
|
4148
4293
|
var HEX_64 = /^[0-9a-f]{64}$/;
|
|
4149
4294
|
var LEGACY_ASSET_ID = /^(?:btc|[0-9a-f]{68})$/;
|
|
4150
|
-
var isRelayList = (value) => Array.isArray(value) && value.length > 0 && value.length <=
|
|
4295
|
+
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
4296
|
var isCorridorField = (value) => value === void 0 || CORRIDORS.includes(value);
|
|
4152
4297
|
var isUsableCard = (value) => {
|
|
4153
4298
|
const card = value;
|
|
@@ -4159,7 +4304,7 @@ var isUsableCard = (value) => {
|
|
|
4159
4304
|
const id = marketAssetId(card, side);
|
|
4160
4305
|
if (id === void 0 || !isAssetId(id) && !LEGACY_ASSET_ID.test(id)) return false;
|
|
4161
4306
|
}
|
|
4162
|
-
if ((0,
|
|
4307
|
+
if ((0, import_solver_discovery7.isRfqMarket)(card)) {
|
|
4163
4308
|
if (typeof card.discovery_pubkey !== "string" || !HEX_64.test(card.discovery_pubkey)) {
|
|
4164
4309
|
return false;
|
|
4165
4310
|
}
|
|
@@ -4177,6 +4322,7 @@ var readCache = async (repository, network, registry) => {
|
|
|
4177
4322
|
return void 0;
|
|
4178
4323
|
}
|
|
4179
4324
|
};
|
|
4325
|
+
var DEGRADED_RETRY_MS = 6e4;
|
|
4180
4326
|
var discoveryIndex = (input) => {
|
|
4181
4327
|
const config = input.config ?? {};
|
|
4182
4328
|
const network = config.network ?? input.network;
|
|
@@ -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
|
};
|
|
@@ -4228,26 +4375,35 @@ var discoveryIndex = (input) => {
|
|
|
4228
4375
|
};
|
|
4229
4376
|
const load = async (opts = {}) => {
|
|
4230
4377
|
if (injected) return injected;
|
|
4231
|
-
const fresh = held?.ref.live === true && Date.now()
|
|
4378
|
+
const fresh = held?.ref.live === true && Date.now() < revalidateAt;
|
|
4232
4379
|
if (fresh && !opts.refresh) return held;
|
|
4233
4380
|
const { network: indexed, registry: url } = sources();
|
|
4234
4381
|
if (!indexed || !url) {
|
|
4235
4382
|
return unavailable(whyUnavailable());
|
|
4236
4383
|
}
|
|
4237
|
-
const
|
|
4384
|
+
const delivery = trackDelivery(transportCardsOf(config.transportCards));
|
|
4385
|
+
const result = await (0, import_solver_discovery7.discover)({
|
|
4238
4386
|
registries: [url],
|
|
4239
4387
|
localCards: [...config.localCards ?? []],
|
|
4240
4388
|
network: indexed,
|
|
4241
|
-
fetchImpl: config.fetchImpl
|
|
4389
|
+
fetchImpl: config.fetchImpl,
|
|
4390
|
+
transportCards: delivery.fetcher
|
|
4242
4391
|
});
|
|
4243
4392
|
if (result.warnings.length) config.logger?.("solver discovery:", ...result.warnings);
|
|
4244
|
-
if (result.sources
|
|
4393
|
+
if (registryAnswered(result.sources)) {
|
|
4245
4394
|
const fetchedAt = Date.now();
|
|
4246
4395
|
held = {
|
|
4247
4396
|
markets: result.markets,
|
|
4248
4397
|
ref: { fetchedAt, live: true, source: "live", registry: url }
|
|
4249
4398
|
};
|
|
4250
|
-
|
|
4399
|
+
const undelivered = delivery.undelivered();
|
|
4400
|
+
const keepsCache = undelivered.size > 0 && input.repository !== void 0 && undeliveredCarry(
|
|
4401
|
+
result.markets,
|
|
4402
|
+
undelivered,
|
|
4403
|
+
await readCache(input.repository, indexed, url)
|
|
4404
|
+
).length > 0;
|
|
4405
|
+
revalidateAt = fetchedAt + (keepsCache ? DEGRADED_RETRY_MS : MARKETS_CACHE_TTL_MS);
|
|
4406
|
+
if (input.repository && !keepsCache) {
|
|
4251
4407
|
try {
|
|
4252
4408
|
await input.repository.saveCachedMarkets(indexed, url, {
|
|
4253
4409
|
markets: result.markets,
|
|
@@ -4263,6 +4419,12 @@ var discoveryIndex = (input) => {
|
|
|
4263
4419
|
held = cached;
|
|
4264
4420
|
return cached;
|
|
4265
4421
|
}
|
|
4422
|
+
if (result.markets.length > 0) {
|
|
4423
|
+
const fetchedAt = Date.now();
|
|
4424
|
+
held = { markets: result.markets, ref: { fetchedAt, live: true, source: "local" } };
|
|
4425
|
+
revalidateAt = fetchedAt + DEGRADED_RETRY_MS;
|
|
4426
|
+
return held;
|
|
4427
|
+
}
|
|
4266
4428
|
return unavailable(whyUnavailable());
|
|
4267
4429
|
};
|
|
4268
4430
|
return { peek, load };
|
|
@@ -4270,13 +4432,13 @@ var discoveryIndex = (input) => {
|
|
|
4270
4432
|
|
|
4271
4433
|
// src/client/cancel.ts
|
|
4272
4434
|
var import_base14 = require("@scure/base");
|
|
4273
|
-
var
|
|
4435
|
+
var import_sdk22 = require("@arkade-os/sdk");
|
|
4274
4436
|
init_coverage();
|
|
4275
4437
|
init_offer();
|
|
4276
4438
|
|
|
4277
4439
|
// src/restore.ts
|
|
4278
4440
|
var import_base11 = require("@scure/base");
|
|
4279
|
-
var
|
|
4441
|
+
var import_sdk19 = require("@arkade-os/sdk");
|
|
4280
4442
|
init_offer();
|
|
4281
4443
|
init_store();
|
|
4282
4444
|
var TXS_PER_REQUEST = 50;
|
|
@@ -4301,7 +4463,7 @@ async function fetchParsedTxs(indexer, txids) {
|
|
|
4301
4463
|
if (result.status !== "fulfilled") continue;
|
|
4302
4464
|
for (const psbt of result.value) {
|
|
4303
4465
|
try {
|
|
4304
|
-
const parsed =
|
|
4466
|
+
const parsed = import_sdk19.Transaction.fromPSBT(import_base11.base64.decode(psbt));
|
|
4305
4467
|
parsedByTxid.set(parsed.id, parsed);
|
|
4306
4468
|
} catch {
|
|
4307
4469
|
}
|
|
@@ -4330,7 +4492,7 @@ function classifySpend(offer, operatorPubkey, spendTx, deposit) {
|
|
|
4330
4492
|
if (!input.txid || input.index !== deposit.vout) continue;
|
|
4331
4493
|
if (import_base11.hex.encode(input.txid) !== deposit.txid) continue;
|
|
4332
4494
|
for (const leaf of input.tapLeafScript ?? []) {
|
|
4333
|
-
const spent = import_base11.hex.encode((0,
|
|
4495
|
+
const spent = import_base11.hex.encode((0, import_sdk19.scriptFromTapLeafScript)(leaf));
|
|
4334
4496
|
if (leaves.returned.some((back) => spent === import_base11.hex.encode(back))) return "cancelled";
|
|
4335
4497
|
if (leaves.fulfill && spent === import_base11.hex.encode(leaves.fulfill)) return "fulfilled";
|
|
4336
4498
|
}
|
|
@@ -4384,7 +4546,7 @@ async function restoreAssetSwaps(indexer, txs, existingIds, opts) {
|
|
|
4384
4546
|
if (!fundingTx) continue;
|
|
4385
4547
|
fetchedTxids.push(txid);
|
|
4386
4548
|
try {
|
|
4387
|
-
const packet =
|
|
4549
|
+
const packet = import_sdk19.Extension.fromTx(parsed).getPacketByType(OFFER_PACKET_TYPE);
|
|
4388
4550
|
if (!packet) continue;
|
|
4389
4551
|
const payload = packet.serialize();
|
|
4390
4552
|
found.push({
|
|
@@ -4501,7 +4663,7 @@ init_repository();
|
|
|
4501
4663
|
init_repository();
|
|
4502
4664
|
|
|
4503
4665
|
// src/rfqRecord.ts
|
|
4504
|
-
var
|
|
4666
|
+
var import_sdk20 = require("@arkade-os/sdk");
|
|
4505
4667
|
var import_base12 = require("@scure/base");
|
|
4506
4668
|
|
|
4507
4669
|
// src/rfqSwapState.ts
|
|
@@ -4556,7 +4718,7 @@ function assertSameSwap(origin, swap) {
|
|
|
4556
4718
|
`rfq swap record is a ${origin.kind} origin paired with a ${swap.kind} swap`
|
|
4557
4719
|
);
|
|
4558
4720
|
}
|
|
4559
|
-
const funded = import_base12.hex.encode(
|
|
4721
|
+
const funded = import_base12.hex.encode(import_sdk20.ArkAddress.decode(origin.lockupAddress).pkScript);
|
|
4560
4722
|
const watched = import_base12.hex.encode(swap.lockupPkScript);
|
|
4561
4723
|
if (funded !== watched) {
|
|
4562
4724
|
throw new Error(
|
|
@@ -4603,8 +4765,8 @@ function rfqSwapOriginOf(record) {
|
|
|
4603
4765
|
};
|
|
4604
4766
|
}
|
|
4605
4767
|
function lockupScript(params, lockupAddress) {
|
|
4606
|
-
const script =
|
|
4607
|
-
const funded =
|
|
4768
|
+
const script = import_sdk20.VHTLCV2ContractHandler.createScript(params);
|
|
4769
|
+
const funded = import_sdk20.ArkAddress.decode(lockupAddress).pkScript;
|
|
4608
4770
|
if (import_base12.hex.encode(funded) !== import_base12.hex.encode(script.pkScript)) {
|
|
4609
4771
|
throw new Error(
|
|
4610
4772
|
`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 +4803,7 @@ function shouldRetainRfqSwap(record, now) {
|
|
|
4641
4803
|
|
|
4642
4804
|
// src/client/driveRecords.ts
|
|
4643
4805
|
init_store();
|
|
4644
|
-
var
|
|
4806
|
+
var import_sdk21 = require("@arkade-os/sdk");
|
|
4645
4807
|
var import_sha25 = require("@noble/hashes/sha2.js");
|
|
4646
4808
|
var import_base13 = require("@scure/base");
|
|
4647
4809
|
var splitRecords = (records) => {
|
|
@@ -4696,7 +4858,7 @@ var pageRfqRecords = (records, filter, page) => {
|
|
|
4696
4858
|
).sort(
|
|
4697
4859
|
(a, b) => a.updatedAt - b.updatedAt || (a.rfqId < b.rfqId ? -1 : a.rfqId > b.rfqId ? 1 : 0)
|
|
4698
4860
|
).slice(0, page.limit + 1);
|
|
4699
|
-
return (0,
|
|
4861
|
+
return (0, import_sdk21.pageResult)(rows, page.limit, (record) => ({
|
|
4700
4862
|
updatedAt: record.updatedAt,
|
|
4701
4863
|
rfqId: record.rfqId
|
|
4702
4864
|
}));
|
|
@@ -4722,7 +4884,7 @@ var corridorRecordStore = (repository, onRecord = () => {
|
|
|
4722
4884
|
index,
|
|
4723
4885
|
quoteIdOf: (rfqId) => byRfqId.get(rfqId),
|
|
4724
4886
|
async getRfqSwapsPage(filter, page) {
|
|
4725
|
-
(0,
|
|
4887
|
+
(0, import_sdk21.assertPageRequest)(page);
|
|
4726
4888
|
assertRfqSwapPageFilter(filter);
|
|
4727
4889
|
const { corridor } = splitRecords(await collectSwapRecords(repository));
|
|
4728
4890
|
for (const record of corridor) index(record);
|
|
@@ -4831,7 +4993,7 @@ var restoredOfferRecord = (swap, network, now) => {
|
|
|
4831
4993
|
now
|
|
4832
4994
|
);
|
|
4833
4995
|
};
|
|
4834
|
-
var restoredAssetId = (network, id) => id === BTC_ASSET_ID ? btcOn("arkade", network) : arkadeAsset(network,
|
|
4996
|
+
var restoredAssetId = (network, id) => id === BTC_ASSET_ID ? btcOn("arkade", network) : arkadeAsset(network, import_sdk21.asset.AssetId.fromString(id));
|
|
4835
4997
|
var RESTORED_CORRIDORS = {
|
|
4836
4998
|
lightning_send: ["arkade", "lightning"],
|
|
4837
4999
|
lightning_receive: ["lightning", "arkade"],
|
|
@@ -4863,7 +5025,7 @@ var restoredCorridorRecord = (stored, network, refundLocktime) => {
|
|
|
4863
5025
|
kind: v1.kind,
|
|
4864
5026
|
rfqId: v1.rfqId,
|
|
4865
5027
|
lockupAddress: v1.lockupAddress,
|
|
4866
|
-
lockupPkScript: import_base13.hex.encode(
|
|
5028
|
+
lockupPkScript: import_base13.hex.encode(import_sdk21.ArkAddress.decode(v1.lockupAddress).pkScript),
|
|
4867
5029
|
lock: { hash },
|
|
4868
5030
|
refundLocktime,
|
|
4869
5031
|
profile: v1.profile,
|
|
@@ -4959,12 +5121,12 @@ var reconcileDepositSpend = async (record, indexer) => {
|
|
|
4959
5121
|
const { txs } = await indexer.getVirtualTxs(candidates);
|
|
4960
5122
|
const parsed = txs.map((psbt) => {
|
|
4961
5123
|
try {
|
|
4962
|
-
return
|
|
5124
|
+
return import_sdk22.Transaction.fromPSBT(import_base14.base64.decode(psbt));
|
|
4963
5125
|
} catch {
|
|
4964
5126
|
return void 0;
|
|
4965
5127
|
}
|
|
4966
5128
|
}).filter((tx) => tx !== void 0);
|
|
4967
|
-
const operatorPubkey =
|
|
5129
|
+
const operatorPubkey = import_sdk22.ArkAddress.decode(record.swapAddress).serverPubKey;
|
|
4968
5130
|
const kind = classifyDepositSpend(offer, operatorPubkey, parsed, {
|
|
4969
5131
|
txid: deposit.txid,
|
|
4970
5132
|
vout: deposit.vout
|
|
@@ -5002,11 +5164,11 @@ var retireOfferScripts = async (wallet, repository, record) => {
|
|
|
5002
5164
|
};
|
|
5003
5165
|
|
|
5004
5166
|
// src/client/drive.ts
|
|
5005
|
-
var
|
|
5167
|
+
var import_sdk28 = require("@arkade-os/sdk");
|
|
5006
5168
|
var import_base17 = require("@scure/base");
|
|
5007
5169
|
|
|
5008
5170
|
// src/claim.ts
|
|
5009
|
-
var
|
|
5171
|
+
var import_sdk23 = require("@arkade-os/sdk");
|
|
5010
5172
|
init_onchainHtlc();
|
|
5011
5173
|
var LockupAmountMismatchError = class extends Error {
|
|
5012
5174
|
name = "LockupAmountMismatchError";
|
|
@@ -5039,8 +5201,8 @@ async function pushClaim(operator, input) {
|
|
|
5039
5201
|
assertPreimageMatches(input.preimage, input.contract.options.preimageHash);
|
|
5040
5202
|
const serverUnrollScript = await operatorUnrollScript(operator, input.network);
|
|
5041
5203
|
const leaf = input.contract.claim();
|
|
5042
|
-
const txid = await (0,
|
|
5043
|
-
identity: (0,
|
|
5204
|
+
const txid = await (0, import_sdk23.signAndSubmitOffchainTx)({
|
|
5205
|
+
identity: (0, import_sdk23.claimWithPreimageIdentity)(input.receiver, input.preimage),
|
|
5044
5206
|
provider: operator,
|
|
5045
5207
|
inputs: lockupInputs(input.vtxos, input.contract, leaf),
|
|
5046
5208
|
// One aggregate output: this leaf inspects nothing about the output set.
|
|
@@ -5058,7 +5220,7 @@ init_offer();
|
|
|
5058
5220
|
init_lockupContract();
|
|
5059
5221
|
|
|
5060
5222
|
// src/refundBlocked.ts
|
|
5061
|
-
var
|
|
5223
|
+
var import_sdk24 = require("@arkade-os/sdk");
|
|
5062
5224
|
var RefundNotLocallyPossibleError = class extends Error {
|
|
5063
5225
|
constructor(reason, message, options) {
|
|
5064
5226
|
super(message, options);
|
|
@@ -5075,16 +5237,16 @@ async function senderIdentityForSwapRecord(wallet, record) {
|
|
|
5075
5237
|
);
|
|
5076
5238
|
}
|
|
5077
5239
|
try {
|
|
5078
|
-
return await (0,
|
|
5240
|
+
return await (0, import_sdk24.contractSigner)(wallet, record.signingDescriptor);
|
|
5079
5241
|
} catch (cause) {
|
|
5080
|
-
if (cause instanceof
|
|
5242
|
+
if (cause instanceof import_sdk24.WalletCannotSignError) {
|
|
5081
5243
|
throw new RefundNotLocallyPossibleError(
|
|
5082
5244
|
"unsignable-wallet",
|
|
5083
5245
|
`this wallet holds ${record.signingDescriptor} but cannot sign with it; attach its signer`,
|
|
5084
5246
|
{ cause }
|
|
5085
5247
|
);
|
|
5086
5248
|
}
|
|
5087
|
-
if (cause instanceof
|
|
5249
|
+
if (cause instanceof import_sdk24.ForeignDescriptorError) {
|
|
5088
5250
|
throw new RefundNotLocallyPossibleError(
|
|
5089
5251
|
"foreign-descriptor",
|
|
5090
5252
|
`this wallet cannot derive ${record.signingDescriptor}; the swap was created on another wallet`,
|
|
@@ -5129,7 +5291,7 @@ init_repository();
|
|
|
5129
5291
|
|
|
5130
5292
|
// src/swapManager.ts
|
|
5131
5293
|
var import_base15 = require("@scure/base");
|
|
5132
|
-
var
|
|
5294
|
+
var import_sdk25 = require("@arkade-os/sdk");
|
|
5133
5295
|
init_onchainHtlc();
|
|
5134
5296
|
init_lockupContract();
|
|
5135
5297
|
init_repository();
|
|
@@ -5260,7 +5422,7 @@ var RfqSwapManager = class _RfqSwapManager {
|
|
|
5260
5422
|
timer = null;
|
|
5261
5423
|
running = false;
|
|
5262
5424
|
constructor(deps, config = {}) {
|
|
5263
|
-
(0,
|
|
5425
|
+
(0, import_sdk25.assertTimerMs)("pollIntervalMs", config.pollIntervalMs);
|
|
5264
5426
|
this.deps = deps;
|
|
5265
5427
|
this.config = {
|
|
5266
5428
|
enableAutoActions: config.enableAutoActions ?? true,
|
|
@@ -5604,7 +5766,7 @@ var RfqSwapManager = class _RfqSwapManager {
|
|
|
5604
5766
|
});
|
|
5605
5767
|
return;
|
|
5606
5768
|
}
|
|
5607
|
-
if (!(0,
|
|
5769
|
+
if (!(0, import_sdk25.isContractVtxoEvent)(event)) return;
|
|
5608
5770
|
const swap = this.byLockupScript.get(event.contractScript);
|
|
5609
5771
|
if (!swap) return;
|
|
5610
5772
|
void this.pollSwap(swap).catch(() => {
|
|
@@ -5832,8 +5994,8 @@ var RfqSwapManager = class _RfqSwapManager {
|
|
|
5832
5994
|
this.setState(swap, "claimed");
|
|
5833
5995
|
this.emitAction(swap, "claimLockup");
|
|
5834
5996
|
} catch (error) {
|
|
5835
|
-
const ark = (0,
|
|
5836
|
-
if ((0,
|
|
5997
|
+
const ark = (0, import_sdk25.isArkError)(error) ? error : (0, import_sdk25.maybeArkError)(error);
|
|
5998
|
+
if ((0, import_sdk25.isArkError)(ark, import_sdk25.ArkErrorName.VTXO_ALREADY_SPENT)) {
|
|
5837
5999
|
if (swap.claimFailure !== void 0) {
|
|
5838
6000
|
delete swap.claimFailure;
|
|
5839
6001
|
this.touch(swap);
|
|
@@ -6234,7 +6396,7 @@ var outpointKey = (vtxo) => `${vtxo.txid}:${vtxo.vout}`;
|
|
|
6234
6396
|
|
|
6235
6397
|
// src/watch.ts
|
|
6236
6398
|
var import_base16 = require("@scure/base");
|
|
6237
|
-
var
|
|
6399
|
+
var import_sdk26 = require("@arkade-os/sdk");
|
|
6238
6400
|
init_coverage();
|
|
6239
6401
|
init_offer();
|
|
6240
6402
|
init_store();
|
|
@@ -6269,7 +6431,7 @@ async function watchOfferSwaps({
|
|
|
6269
6431
|
wallet.getAddress(),
|
|
6270
6432
|
wallet.getArkadeReader()
|
|
6271
6433
|
]);
|
|
6272
|
-
const operatorPubkey =
|
|
6434
|
+
const operatorPubkey = import_sdk26.ArkAddress.decode(address).serverPubKey;
|
|
6273
6435
|
let queue = Promise.resolve();
|
|
6274
6436
|
const enqueue = (task) => {
|
|
6275
6437
|
queue = queue.then(task).catch(() => {
|
|
@@ -6284,7 +6446,7 @@ async function watchOfferSwaps({
|
|
|
6284
6446
|
return classifyDepositSpend(
|
|
6285
6447
|
decodeOffer(import_base16.hex.decode(swap.offerHex)),
|
|
6286
6448
|
operatorPubkey,
|
|
6287
|
-
txs.map((psbt) =>
|
|
6449
|
+
txs.map((psbt) => import_sdk26.Transaction.fromPSBT(import_base16.base64.decode(psbt))),
|
|
6288
6450
|
{ txid: vtxo.txid, vout: vtxo.vout }
|
|
6289
6451
|
);
|
|
6290
6452
|
} catch {
|
|
@@ -6312,7 +6474,7 @@ async function watchOfferSwaps({
|
|
|
6312
6474
|
}
|
|
6313
6475
|
};
|
|
6314
6476
|
const unsubscribe = manager.onContractEvent((event) => {
|
|
6315
|
-
if (!(0,
|
|
6477
|
+
if (!(0, import_sdk26.isContractVtxoEvent)(event) || event.type !== "vtxo_spent") return;
|
|
6316
6478
|
enqueue(() => handleSpend(event));
|
|
6317
6479
|
});
|
|
6318
6480
|
return {
|
|
@@ -6322,7 +6484,7 @@ async function watchOfferSwaps({
|
|
|
6322
6484
|
}
|
|
6323
6485
|
|
|
6324
6486
|
// src/client/legacyRecords.ts
|
|
6325
|
-
var
|
|
6487
|
+
var import_sdk27 = require("@arkade-os/sdk");
|
|
6326
6488
|
init_repository();
|
|
6327
6489
|
var readLegacyRfqSwaps = async (repository, filter = {}) => {
|
|
6328
6490
|
try {
|
|
@@ -6339,7 +6501,7 @@ var withLegacyRfqSwaps = (bridge, repository, admits) => {
|
|
|
6339
6501
|
index: bridge.index,
|
|
6340
6502
|
quoteIdOf: bridge.quoteIdOf,
|
|
6341
6503
|
async getRfqSwapsPage(filter, page) {
|
|
6342
|
-
(0,
|
|
6504
|
+
(0, import_sdk27.assertPageRequest)(page);
|
|
6343
6505
|
assertRfqSwapPageFilter(filter);
|
|
6344
6506
|
const v2 = await collectRfqSwaps(bridge, filter);
|
|
6345
6507
|
const held = new Set(
|
|
@@ -6578,7 +6740,7 @@ var createSwapDrive = (config) => {
|
|
|
6578
6740
|
const secret = rfqClaimSecretOf(record);
|
|
6579
6741
|
if (!secret) throw new Error(`rfq swap ${swap.rfqId} carries no claim secret`);
|
|
6580
6742
|
const preimage = await preimageForSwapRecord(wallet, secret);
|
|
6581
|
-
const signer = await (0,
|
|
6743
|
+
const signer = await (0, import_sdk28.contractSigner)(wallet, await (0, import_sdk28.identityDescriptor)(wallet.identity));
|
|
6582
6744
|
const claimKey = record.profile.claimKey;
|
|
6583
6745
|
if (typeof claimKey === "string") {
|
|
6584
6746
|
const held = import_base17.hex.encode(await signer.xOnlyPublicKey());
|
|
@@ -6616,7 +6778,7 @@ var createSwapDrive = (config) => {
|
|
|
6616
6778
|
`rfq swap ${swap.rfqId} carries no refund descriptor; wire the onchain corridor's refund callback to take its L1 funding back`
|
|
6617
6779
|
);
|
|
6618
6780
|
}
|
|
6619
|
-
const signer = await (0,
|
|
6781
|
+
const signer = await (0, import_sdk28.contractSigner)(wallet, descriptor);
|
|
6620
6782
|
const held = import_base17.hex.encode(await signer.xOnlyPublicKey());
|
|
6621
6783
|
if (held !== record.profile.refundKey) {
|
|
6622
6784
|
throw new Error(
|
|
@@ -6656,7 +6818,7 @@ var createSwapDrive = (config) => {
|
|
|
6656
6818
|
}
|
|
6657
6819
|
};
|
|
6658
6820
|
const drivable = async (record) => !readsChain(record.kind) || await resolveOnchain();
|
|
6659
|
-
const pinnedNetwork = async () => (0,
|
|
6821
|
+
const pinnedNetwork = async () => (0, import_sdk28.getNetwork)(await config.network());
|
|
6660
6822
|
const claimLockup = async (swap, vtxos, { partiallyClaimed }) => {
|
|
6661
6823
|
const record = await corridorStore().getRfqSwap(swap.rfqId);
|
|
6662
6824
|
if (!record) throw new Error(`rfq swap ${swap.rfqId} has no stored record to claim from`);
|
|
@@ -6671,10 +6833,10 @@ var createSwapDrive = (config) => {
|
|
|
6671
6833
|
return track(
|
|
6672
6834
|
pushClaim(operator, {
|
|
6673
6835
|
contract: script,
|
|
6674
|
-
receiver: await (0,
|
|
6836
|
+
receiver: await (0, import_sdk28.contractSigner)(wallet, secret.signingDescriptor),
|
|
6675
6837
|
preimage: await preimageForSwapRecord(wallet, secret),
|
|
6676
6838
|
vtxos,
|
|
6677
|
-
destinationPkScript:
|
|
6839
|
+
destinationPkScript: import_sdk28.ArkAddress.decode(payoutAddress).pkScript,
|
|
6678
6840
|
// Passed through: `pushClaim`'s own value check decides whether `P` is published.
|
|
6679
6841
|
expectedAmount: swap.expectedAmount,
|
|
6680
6842
|
partiallyClaimed,
|
|
@@ -6742,7 +6904,7 @@ var createSwapDrive = (config) => {
|
|
|
6742
6904
|
config.network()
|
|
6743
6905
|
]);
|
|
6744
6906
|
const txs = history.map(toRestoreTx);
|
|
6745
|
-
const { hrp, serverPubKey: operatorPubkey } =
|
|
6907
|
+
const { hrp, serverPubKey: operatorPubkey } = import_sdk28.ArkAddress.decode(address);
|
|
6746
6908
|
const reopened = await legacyOfferDepositsToAdopt(store);
|
|
6747
6909
|
for (const txid of reopen) reopened.add(txid);
|
|
6748
6910
|
const cursor = reopened.size === 0 ? scanned : new Set([...scanned].filter((txid) => !reopened.has(txid)));
|
|
@@ -7098,24 +7260,24 @@ var createSwapDrive = (config) => {
|
|
|
7098
7260
|
};
|
|
7099
7261
|
|
|
7100
7262
|
// src/client/quoteOffer.ts
|
|
7101
|
-
var
|
|
7263
|
+
var import_solver_discovery9 = require("@arkade-os/solver-discovery");
|
|
7102
7264
|
init_offer();
|
|
7103
7265
|
|
|
7104
7266
|
// src/client/market.ts
|
|
7105
|
-
var
|
|
7267
|
+
var import_solver_discovery8 = require("@arkade-os/solver-discovery");
|
|
7106
7268
|
var marketKeyOf = (card) => {
|
|
7107
|
-
const base = (0,
|
|
7108
|
-
const quote = (0,
|
|
7109
|
-
const baseIsArkade = (0,
|
|
7110
|
-
const quoteIsArkade = (0,
|
|
7269
|
+
const base = (0, import_solver_discovery8.marketLegKey)(card, "base");
|
|
7270
|
+
const quote = (0, import_solver_discovery8.marketLegKey)(card, "quote");
|
|
7271
|
+
const baseIsArkade = (0, import_solver_discovery8.marketCorridor)(card, "base") === "arkade";
|
|
7272
|
+
const quoteIsArkade = (0, import_solver_discovery8.marketCorridor)(card, "quote") === "arkade";
|
|
7111
7273
|
if (baseIsArkade !== quoteIsArkade) {
|
|
7112
7274
|
return baseIsArkade ? `${base}/${quote}` : `${quote}/${base}`;
|
|
7113
7275
|
}
|
|
7114
7276
|
return base <= quote ? `${base}/${quote}` : `${quote}/${base}`;
|
|
7115
7277
|
};
|
|
7116
7278
|
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,
|
|
7279
|
+
var isAddressable = (card) => !(0, import_solver_discovery8.isRfqMarket)(card) || hasRendezvous(card);
|
|
7280
|
+
var marketBackendOf = (card) => (0, import_solver_discovery8.isRfqMarket)(card) || hasRendezvous(card) ? "rfq" : "feed";
|
|
7119
7281
|
var usableMarkets = (snapshot, policy) => {
|
|
7120
7282
|
const allowed = policy?.allowedRegistries;
|
|
7121
7283
|
return (allowed ? snapshot.markets.filter((card) => allowed.includes(card.source)) : snapshot.markets).filter(isAddressable);
|
|
@@ -7132,12 +7294,12 @@ var eligibleMarkets = (snapshot, legs, policy, takeAmount) => {
|
|
|
7132
7294
|
wantSide: side === "base" ? "quote" : "base",
|
|
7133
7295
|
...takeAmount === void 0 ? {} : { wantAmount: takeAmount }
|
|
7134
7296
|
};
|
|
7135
|
-
const canonical = (0,
|
|
7297
|
+
const canonical = (0, import_solver_discovery8.selectMarkets)([...markets], {
|
|
7136
7298
|
baseId: base.marketId,
|
|
7137
7299
|
quoteId: quote.marketId,
|
|
7138
7300
|
...selection
|
|
7139
7301
|
});
|
|
7140
|
-
const legacy = (0,
|
|
7302
|
+
const legacy = (0, import_solver_discovery8.selectMarkets)([...markets], {
|
|
7141
7303
|
baseId: `${base.corridor}:${base.assetId}`,
|
|
7142
7304
|
quoteId: `${quote.corridor}:${quote.assetId}`,
|
|
7143
7305
|
...selection
|
|
@@ -7542,7 +7704,7 @@ var quoteFromFeed = async (input) => {
|
|
|
7542
7704
|
if (amount === void 0) {
|
|
7543
7705
|
throw new Error("an asset swap needs an amount and the side it pins");
|
|
7544
7706
|
}
|
|
7545
|
-
const plan = await (0,
|
|
7707
|
+
const plan = await (0, import_solver_discovery9.quoteOffer)(candidate.card, {
|
|
7546
7708
|
give: candidate.give,
|
|
7547
7709
|
...amount.on === "give" ? { giveAmount: amount.value } : { wantAmount: amount.value },
|
|
7548
7710
|
// What `fund` attaches to an asset deposit and the fill pays an asset want: the plan asks
|
|
@@ -7586,7 +7748,7 @@ var quoteFromFeed = async (input) => {
|
|
|
7586
7748
|
};
|
|
7587
7749
|
var feedSpread = (plan, take, carrierSats = 0n) => {
|
|
7588
7750
|
const payout = take > carrierSats ? take - carrierSats : 0n;
|
|
7589
|
-
const fair = (0,
|
|
7751
|
+
const fair = (0, import_solver_discovery9.computeWantAmount)({
|
|
7590
7752
|
deposit: plan.deposit.atomic,
|
|
7591
7753
|
give: plan.give,
|
|
7592
7754
|
price: plan.price,
|
|
@@ -7604,7 +7766,7 @@ var feedExpiry = (card, feed, now) => {
|
|
|
7604
7766
|
};
|
|
7605
7767
|
var verifyPlanLegs = (plan, legs, give) => {
|
|
7606
7768
|
const take = give === "base" ? "quote" : "base";
|
|
7607
|
-
const spelled = (side) => (0,
|
|
7769
|
+
const spelled = (side) => (0, import_solver_discovery9.marketLegKey)(plan.market, side);
|
|
7608
7770
|
const names = (side, leg) => spelled(side) === leg.marketId || spelled(side) === `${leg.corridor}:${leg.assetId}`;
|
|
7609
7771
|
if (plan.give !== give || !names(give, legs.give) || !names(take, legs.take)) {
|
|
7610
7772
|
throw new QuoteVerificationFailed(
|
|
@@ -7617,8 +7779,8 @@ var verifyPlanLegs = (plan, legs, give) => {
|
|
|
7617
7779
|
|
|
7618
7780
|
// src/client/quoteRfq.ts
|
|
7619
7781
|
var import_base18 = require("@scure/base");
|
|
7620
|
-
var
|
|
7621
|
-
var
|
|
7782
|
+
var import_sdk31 = require("@arkade-os/sdk");
|
|
7783
|
+
var import_solver_discovery10 = require("@arkade-os/solver-discovery");
|
|
7622
7784
|
init_claimPacket();
|
|
7623
7785
|
init_offer();
|
|
7624
7786
|
init_store();
|
|
@@ -7626,11 +7788,11 @@ init_onchainHtlc();
|
|
|
7626
7788
|
init_onchainHtlc();
|
|
7627
7789
|
|
|
7628
7790
|
// src/payment/onchainSwap.ts
|
|
7629
|
-
var
|
|
7791
|
+
var import_sdk30 = require("@arkade-os/sdk");
|
|
7630
7792
|
init_onchainHtlc();
|
|
7631
7793
|
|
|
7632
7794
|
// src/payment/swapRail.ts
|
|
7633
|
-
var
|
|
7795
|
+
var import_sdk29 = require("@arkade-os/sdk");
|
|
7634
7796
|
|
|
7635
7797
|
// src/client/sats.ts
|
|
7636
7798
|
var satsOf = (value, field) => {
|
|
@@ -7687,13 +7849,13 @@ var lockupOf = (derived) => ({
|
|
|
7687
7849
|
pkScript: derived.swapPkScript
|
|
7688
7850
|
});
|
|
7689
7851
|
var covenantInputs = (input) => {
|
|
7690
|
-
const network = (0,
|
|
7852
|
+
const network = (0, import_sdk31.networkFromArkadeInfo)(input.info);
|
|
7691
7853
|
const arkade2 = input.corridors.get("arkade").deps;
|
|
7692
7854
|
return {
|
|
7693
|
-
operatorPubkey: (0,
|
|
7855
|
+
operatorPubkey: (0, import_sdk31.toXOnly)(import_base18.hex.decode(input.info.signerPubkey), "ark signer key"),
|
|
7694
7856
|
// The resolved per-network pin, never operator-reported: it lands in a covenant leaf
|
|
7695
7857
|
// that decides who can move the funds.
|
|
7696
|
-
emulatorPubkey: (0,
|
|
7858
|
+
emulatorPubkey: (0, import_sdk31.toXOnly)(import_base18.hex.decode(arkade2.emulatorPubkey), "emulator signer key"),
|
|
7697
7859
|
claimDelay: unilateralClaimDelay(Number(input.info.unilateralExitDelay)),
|
|
7698
7860
|
hrp: network.hrp
|
|
7699
7861
|
};
|
|
@@ -7770,7 +7932,7 @@ var quoteArkadeAsset = async (input) => {
|
|
|
7770
7932
|
floorSeconds: input.policy?.quoteTtlFloorSeconds
|
|
7771
7933
|
});
|
|
7772
7934
|
const carrierSats = sides.offerAsset === void 0 ? void 0 : verifiedCarrierSats(wire);
|
|
7773
|
-
const reference = await (0,
|
|
7935
|
+
const reference = await (0, import_solver_discovery10.quoteOffer)(input.candidate.card, {
|
|
7774
7936
|
give: input.candidate.give,
|
|
7775
7937
|
giveAmount: parsed.give,
|
|
7776
7938
|
...carrierSats === void 0 ? {} : { carrierSats },
|
|
@@ -7832,14 +7994,14 @@ var assetSidesOf = (legs) => {
|
|
|
7832
7994
|
{ give: "arkade", take: "arkade" }
|
|
7833
7995
|
);
|
|
7834
7996
|
}
|
|
7835
|
-
return giveIsBtc ? { wantAsset:
|
|
7997
|
+
return giveIsBtc ? { wantAsset: import_sdk31.asset.AssetId.fromString(legs.take.assetId) } : { offerAsset: import_sdk31.asset.AssetId.fromString(legs.give.assetId) };
|
|
7836
7998
|
};
|
|
7837
7999
|
var makerPosition = async (wallet) => {
|
|
7838
8000
|
const [address, publicKey] = await Promise.all([
|
|
7839
8001
|
wallet.getAddress(),
|
|
7840
8002
|
wallet.identity.xOnlyPublicKey()
|
|
7841
8003
|
]);
|
|
7842
|
-
return { pkScript:
|
|
8004
|
+
return { pkScript: import_sdk31.ArkAddress.decode(address).pkScript, publicKey };
|
|
7843
8005
|
};
|
|
7844
8006
|
var quoteLightningSend = async (input) => {
|
|
7845
8007
|
const invoice = input.endpoints.take.instrument;
|
|
@@ -7848,7 +8010,7 @@ var quoteLightningSend = async (input) => {
|
|
|
7848
8010
|
}
|
|
7849
8011
|
const pair = rfqPairFor(input.legs.give, input.legs.take);
|
|
7850
8012
|
const rfqId = newRfqId();
|
|
7851
|
-
const secrets = await (0,
|
|
8013
|
+
const secrets = await (0, import_sdk31.provisionRefundKey)(input.wallet);
|
|
7852
8014
|
const wire = await input.transport.requestQuote(
|
|
7853
8015
|
lightningSendRequest({
|
|
7854
8016
|
rfqId,
|
|
@@ -7923,7 +8085,7 @@ var quoteLightningReceive = async (input) => {
|
|
|
7923
8085
|
const pinned = pinnedFor(input);
|
|
7924
8086
|
const pair = rfqPairFor(input.legs.give, input.legs.take);
|
|
7925
8087
|
const rfqId = newRfqId();
|
|
7926
|
-
const secrets = await (0,
|
|
8088
|
+
const secrets = await (0, import_sdk31.provisionClaimSecret)(input.wallet);
|
|
7927
8089
|
const paymentHash = import_base18.hex.encode(secrets.paymentHash);
|
|
7928
8090
|
const payoutAddress = await input.wallet.getAddress();
|
|
7929
8091
|
const lightning = input.corridors.get("lightning").deps;
|
|
@@ -8035,8 +8197,8 @@ var quoteOnchainSend = async (input) => {
|
|
|
8035
8197
|
claimVsize: onchain.claimVsize
|
|
8036
8198
|
}) : void 0;
|
|
8037
8199
|
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,
|
|
8200
|
+
const secrets = await (0, import_sdk31.provisionClaimSecret)(input.wallet);
|
|
8201
|
+
const payoutKey = await (0, import_sdk31.provisionRefundKey)(input.wallet);
|
|
8040
8202
|
const paymentHash = import_base18.hex.encode(secrets.paymentHash);
|
|
8041
8203
|
const wire = await input.transport.requestQuote(
|
|
8042
8204
|
withCanonicalAmount(
|
|
@@ -8141,8 +8303,8 @@ var quoteOnchainReceive = async (input) => {
|
|
|
8141
8303
|
const pair = rfqPairFor(input.legs.give, input.legs.take);
|
|
8142
8304
|
const rfqId = newRfqId();
|
|
8143
8305
|
const l1Network = l1NetworkFromArk(input.info.network);
|
|
8144
|
-
const secrets = await (0,
|
|
8145
|
-
const refundKey = await (0,
|
|
8306
|
+
const secrets = await (0, import_sdk31.provisionClaimSecret)(input.wallet);
|
|
8307
|
+
const refundKey = await (0, import_sdk31.provisionRefundKey)(input.wallet);
|
|
8146
8308
|
const paymentHash = import_base18.hex.encode(secrets.paymentHash);
|
|
8147
8309
|
const payoutAddress = await input.wallet.getAddress();
|
|
8148
8310
|
const refundPkScript = l1ScriptForAddress(await input.wallet.getBoardingAddress(), l1Network);
|
|
@@ -8250,7 +8412,7 @@ var quoteOnchainReceive = async (input) => {
|
|
|
8250
8412
|
};
|
|
8251
8413
|
|
|
8252
8414
|
// src/client/verbs.ts
|
|
8253
|
-
var
|
|
8415
|
+
var import_sdk32 = require("@arkade-os/sdk");
|
|
8254
8416
|
var enforceFeeCeiling = (quote, call, policy) => {
|
|
8255
8417
|
let ceiling;
|
|
8256
8418
|
for (const [source, limit] of [
|
|
@@ -8275,9 +8437,9 @@ var settle = async (deps, input, maxFee) => {
|
|
|
8275
8437
|
return deps.accept(quote);
|
|
8276
8438
|
};
|
|
8277
8439
|
var pay = async (deps, destination, options = {}) => {
|
|
8278
|
-
const arkade2 = (0,
|
|
8440
|
+
const arkade2 = (0, import_sdk32.arkTarget)(destination);
|
|
8279
8441
|
if (arkade2 !== void 0) {
|
|
8280
|
-
const amount = (0,
|
|
8442
|
+
const amount = (0, import_sdk32.resolveSendAmount)(
|
|
8281
8443
|
"ark",
|
|
8282
8444
|
destination,
|
|
8283
8445
|
options.amount === void 0 ? void 0 : satsOf(options.amount, "amount")
|