@pod-network/trade-sdk 0.8.0 → 0.10.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/dist/client.d.ts +18 -0
- package/dist/client.d.ts.map +1 -1
- package/dist/client.js +30 -0
- package/dist/client.js.map +1 -1
- package/dist/codec/decode.d.ts.map +1 -1
- package/dist/codec/decode.js +4 -0
- package/dist/codec/decode.js.map +1 -1
- package/dist/index.d.ts +1 -0
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js +1 -0
- package/dist/index.js.map +1 -1
- package/dist/sync/order-preview.d.ts +3 -0
- package/dist/sync/order-preview.d.ts.map +1 -1
- package/dist/sync/order-preview.js +56 -0
- package/dist/sync/order-preview.js.map +1 -1
- package/dist/sync/pnl-history.d.ts +121 -0
- package/dist/sync/pnl-history.d.ts.map +1 -0
- package/dist/sync/pnl-history.js +427 -0
- package/dist/sync/pnl-history.js.map +1 -0
- package/dist/sync/positions-live.d.ts.map +1 -1
- package/dist/sync/positions-live.js +17 -14
- package/dist/sync/positions-live.js.map +1 -1
- package/dist/transport/jsonrpc.d.ts +5 -0
- package/dist/transport/jsonrpc.d.ts.map +1 -1
- package/dist/transport/jsonrpc.js +20 -0
- package/dist/transport/jsonrpc.js.map +1 -1
- package/dist/types/public.d.ts +13 -1
- package/dist/types/public.d.ts.map +1 -1
- package/dist/types/wire.d.ts +11 -0
- package/dist/types/wire.d.ts.map +1 -1
- package/package.json +1 -1
- package/src/client.ts +32 -0
- package/src/codec/decode.ts +4 -0
- package/src/index.ts +4 -0
- package/src/sync/order-preview.ts +63 -0
- package/src/sync/pnl-history.ts +470 -0
- package/src/sync/positions-live.ts +17 -18
- package/src/transport/jsonrpc.ts +23 -0
- package/src/types/public.ts +13 -1
- package/src/types/wire.ts +11 -0
|
@@ -0,0 +1,427 @@
|
|
|
1
|
+
// PnL change over a past window, folded backwards from the live snapshot.
|
|
2
|
+
//
|
|
3
|
+
// Total PnL is continuous through banking (realized ⇄ unrealized), so the
|
|
4
|
+
// change between a past point t and the reference tick needs no leg
|
|
5
|
+
// boundaries and no banked amounts:
|
|
6
|
+
// D(t) = Σ value_m(t) − Σ value_m(ref) − Σ_{events in (t, ref]} (F_b − p_b)·Δs_b
|
|
7
|
+
// value_m = (mark − F)·size spot: F = 0, mark = last clearing
|
|
8
|
+
// A spot withdrawal removes proportional cost without realizing, i.e. it is a
|
|
9
|
+
// sell at the holding's average cost.
|
|
10
|
+
//
|
|
11
|
+
// Fills page newest-first, so the walk streams: the newest points only need
|
|
12
|
+
// the newest pages, and each chunk is yielded as soon as its fills are in.
|
|
13
|
+
import { div, mul } from "../codec/fixed.js";
|
|
14
|
+
import { dec } from "../codec/units.js";
|
|
15
|
+
import { rpc, rpcBatch } from "../transport/jsonrpc.js";
|
|
16
|
+
const RESIDUAL_TOLERANCE = 10n ** 12n;
|
|
17
|
+
// Within a tick the engine runs sweeps, then matching, then withdrawals;
|
|
18
|
+
// walking backwards undoes them in the opposite order.
|
|
19
|
+
const RANK = { withdraw: 0, fill: 1, sweep: 2 };
|
|
20
|
+
const newestFirst = (a, b) => b.timeUs - a.timeUs || RANK[a.kind] - RANK[b.kind];
|
|
21
|
+
/** The backward walk. Feed events newest-first, ask for points newest-first;
|
|
22
|
+
* every event after a point must have been fed before the point is asked. */
|
|
23
|
+
export class PnlWalker {
|
|
24
|
+
tickAt;
|
|
25
|
+
refTimeUs;
|
|
26
|
+
warnings = [];
|
|
27
|
+
state = new Map();
|
|
28
|
+
pending = [];
|
|
29
|
+
acc = 0n;
|
|
30
|
+
refValue;
|
|
31
|
+
constructor(legs, tickAt, refTimeUs) {
|
|
32
|
+
this.tickAt = tickAt;
|
|
33
|
+
this.refTimeUs = refTimeUs;
|
|
34
|
+
for (const l of legs)
|
|
35
|
+
this.state.set(l.market, { kind: l.kind, size: l.size, basis: l.basis ?? 0n, basisKnown: l.basis !== undefined });
|
|
36
|
+
}
|
|
37
|
+
/** A market first seen in an old fill: flat at the reference. */
|
|
38
|
+
touch(market, kind) {
|
|
39
|
+
if (!this.state.has(market))
|
|
40
|
+
this.state.set(market, { kind, size: 0n, basis: 0n, basisKnown: true });
|
|
41
|
+
}
|
|
42
|
+
feed(events) {
|
|
43
|
+
this.pending = this.pending.concat(events).sort(newestFirst);
|
|
44
|
+
}
|
|
45
|
+
point(t) {
|
|
46
|
+
this.refValue ??= this.value(this.refTimeUs);
|
|
47
|
+
for (let e = this.pending[0]; e && e.timeUs > t; e = this.pending[0]) {
|
|
48
|
+
this.pending.shift();
|
|
49
|
+
this.acc += this.unapply(e);
|
|
50
|
+
}
|
|
51
|
+
return { time: t / 1000, pnl: this.value(t) - this.refValue - this.acc };
|
|
52
|
+
}
|
|
53
|
+
value(t) {
|
|
54
|
+
let sum = 0n;
|
|
55
|
+
for (const [m, st] of this.state) {
|
|
56
|
+
if (st.size === 0n)
|
|
57
|
+
continue;
|
|
58
|
+
const tick = this.tickAt(m, t);
|
|
59
|
+
if (!tick) {
|
|
60
|
+
this.warnings.push(`${m}: no tick at or before ${t}`);
|
|
61
|
+
continue;
|
|
62
|
+
}
|
|
63
|
+
sum += mul(tick.mark - tick.funding, st.size);
|
|
64
|
+
}
|
|
65
|
+
return sum;
|
|
66
|
+
}
|
|
67
|
+
unapply(e) {
|
|
68
|
+
const st = this.state.get(e.market);
|
|
69
|
+
if (!st)
|
|
70
|
+
throw new Error(`pnlHistory: event on unknown market ${e.market}`);
|
|
71
|
+
const tick = this.tickAt(e.market, e.timeUs);
|
|
72
|
+
const F = tick?.funding ?? 0n;
|
|
73
|
+
const sizeBefore = st.size - e.deltaSize;
|
|
74
|
+
let price = e.price;
|
|
75
|
+
if (st.kind === "spot") {
|
|
76
|
+
const average = st.size !== 0n && st.basisKnown ? div(st.basis, st.size) : undefined;
|
|
77
|
+
if (e.kind === "withdraw") {
|
|
78
|
+
if (average === undefined) {
|
|
79
|
+
this.warnings.push(`${e.market}: withdrawal at ${e.timeUs} with unknown cost basis, treated as neutral`);
|
|
80
|
+
price = tick?.mark ?? 0n;
|
|
81
|
+
}
|
|
82
|
+
else
|
|
83
|
+
price = average;
|
|
84
|
+
}
|
|
85
|
+
if (sizeBefore === 0n) {
|
|
86
|
+
st.basis = 0n;
|
|
87
|
+
st.basisKnown = true;
|
|
88
|
+
}
|
|
89
|
+
else if (e.deltaSize > 0n)
|
|
90
|
+
st.basis -= mul(e.price, e.deltaSize);
|
|
91
|
+
else if (average !== undefined)
|
|
92
|
+
st.basis = mul(average, sizeBefore);
|
|
93
|
+
else
|
|
94
|
+
st.basisKnown = false;
|
|
95
|
+
}
|
|
96
|
+
else {
|
|
97
|
+
const crossed = st.size !== 0n && sizeBefore !== 0n && (st.size > 0n) !== (sizeBefore > 0n);
|
|
98
|
+
if (st.size === 0n || crossed)
|
|
99
|
+
st.basisKnown = false;
|
|
100
|
+
else if (st.basisKnown)
|
|
101
|
+
st.basis -= mul(F - price, e.deltaSize);
|
|
102
|
+
if (sizeBefore === 0n && st.basisKnown) {
|
|
103
|
+
const r = st.basis < 0n ? -st.basis : st.basis;
|
|
104
|
+
if (r > RESIDUAL_TOLERANCE)
|
|
105
|
+
this.warnings.push(`${e.market}: basis residual ${st.basis} at flat ${e.timeUs}`);
|
|
106
|
+
st.basis = 0n;
|
|
107
|
+
}
|
|
108
|
+
}
|
|
109
|
+
st.size = sizeBefore;
|
|
110
|
+
return mul(F - price, e.deltaSize);
|
|
111
|
+
}
|
|
112
|
+
}
|
|
113
|
+
export function foldPnlHistory(input) {
|
|
114
|
+
const walker = new PnlWalker(input.legs, input.tickAt, input.refTimeUs);
|
|
115
|
+
walker.feed(input.events);
|
|
116
|
+
const points = [...input.gridUs].reverse().map((t) => walker.point(t)).reverse();
|
|
117
|
+
const base = points[0]?.pnl ?? 0n;
|
|
118
|
+
return { points: points.map((p) => ({ time: p.time, pnl: p.pnl - base })), warnings: walker.warnings };
|
|
119
|
+
}
|
|
120
|
+
/** Immutable inputs shared by every window size and every refresh: fills as
|
|
121
|
+
* events keyed by the time ranges they cover, and ticks keyed by market and
|
|
122
|
+
* time. The fold is recomputed per request; only uncovered ranges and unseen
|
|
123
|
+
* ticks are fetched. */
|
|
124
|
+
export class PnlHistoryCache {
|
|
125
|
+
maxEvents;
|
|
126
|
+
ticks = new Map();
|
|
127
|
+
/** Times at which every market's row was fetched at once. */
|
|
128
|
+
tickTimes = new Set();
|
|
129
|
+
events = [];
|
|
130
|
+
coverage = [];
|
|
131
|
+
/** About 150 bytes per event and per tick, so the default cap is on the
|
|
132
|
+
* order of 50 MB with its ticks. */
|
|
133
|
+
constructor(maxEvents = 250_000) {
|
|
134
|
+
this.maxEvents = maxEvents;
|
|
135
|
+
}
|
|
136
|
+
clear() {
|
|
137
|
+
this.ticks.clear();
|
|
138
|
+
this.tickTimes.clear();
|
|
139
|
+
this.events = [];
|
|
140
|
+
this.coverage = [];
|
|
141
|
+
}
|
|
142
|
+
/** Sub-ranges of [from, to) not yet covered. */
|
|
143
|
+
missing(from, to) {
|
|
144
|
+
const out = [];
|
|
145
|
+
let cursor = from;
|
|
146
|
+
for (const c of this.coverage) {
|
|
147
|
+
if (c.to <= cursor)
|
|
148
|
+
continue;
|
|
149
|
+
if (c.from >= to)
|
|
150
|
+
break;
|
|
151
|
+
if (c.from > cursor)
|
|
152
|
+
out.push({ from: cursor, to: c.from });
|
|
153
|
+
cursor = Math.max(cursor, c.to);
|
|
154
|
+
}
|
|
155
|
+
if (cursor < to)
|
|
156
|
+
out.push({ from: cursor, to });
|
|
157
|
+
return out;
|
|
158
|
+
}
|
|
159
|
+
add(from, to, events) {
|
|
160
|
+
this.events = this.events.concat(events).sort(newestFirst);
|
|
161
|
+
this.coverage.push({ from, to });
|
|
162
|
+
this.coverage.sort((a, b) => a.from - b.from);
|
|
163
|
+
const merged = [];
|
|
164
|
+
for (const c of this.coverage) {
|
|
165
|
+
const last = merged[merged.length - 1];
|
|
166
|
+
if (last && c.from <= last.to)
|
|
167
|
+
last.to = Math.max(last.to, c.to);
|
|
168
|
+
else
|
|
169
|
+
merged.push({ ...c });
|
|
170
|
+
}
|
|
171
|
+
this.coverage = merged;
|
|
172
|
+
if (this.events.length > this.maxEvents) {
|
|
173
|
+
// ponytail: evict the oldest events, their ticks, and coverage below them.
|
|
174
|
+
const cut = this.events[this.maxEvents - 1]?.timeUs ?? 0;
|
|
175
|
+
this.events = this.events.filter((e) => e.timeUs >= cut);
|
|
176
|
+
this.coverage = this.coverage.filter((c) => c.to > cut).map((c) => ({ from: Math.max(c.from, cut), to: c.to }));
|
|
177
|
+
for (const k of this.ticks.keys())
|
|
178
|
+
if (Number(k.slice(k.indexOf(":") + 1)) < cut)
|
|
179
|
+
this.ticks.delete(k);
|
|
180
|
+
for (const t of this.tickTimes)
|
|
181
|
+
if (t < cut)
|
|
182
|
+
this.tickTimes.delete(t);
|
|
183
|
+
}
|
|
184
|
+
}
|
|
185
|
+
/** Events with from ≤ time < to, newest first. */
|
|
186
|
+
slice(from, to) {
|
|
187
|
+
return this.events.filter((e) => e.timeUs >= from && e.timeUs < to);
|
|
188
|
+
}
|
|
189
|
+
}
|
|
190
|
+
const MAX_POINTS = 500;
|
|
191
|
+
const CHUNK_POINTS = 50;
|
|
192
|
+
const IN_FLIGHT = 4;
|
|
193
|
+
const WIDE_ACCOUNT_MARKETS = 10;
|
|
194
|
+
const RPC_BATCH = 200;
|
|
195
|
+
const FILLS_PAGE = 500;
|
|
196
|
+
/** Pages newest-first. A full page may cut a batch in half, so its oldest
|
|
197
|
+
* batch is dropped and refetched whole with the next page; rows are never
|
|
198
|
+
* keyed, since one order can legitimately fill several times in one batch
|
|
199
|
+
* (ADL slices). */
|
|
200
|
+
class FillsCursor {
|
|
201
|
+
rpcUrl;
|
|
202
|
+
account;
|
|
203
|
+
fromUs;
|
|
204
|
+
opts;
|
|
205
|
+
done = false;
|
|
206
|
+
warnings = [];
|
|
207
|
+
to;
|
|
208
|
+
constructor(rpcUrl, account, fromUs, toUs, opts) {
|
|
209
|
+
this.rpcUrl = rpcUrl;
|
|
210
|
+
this.account = account;
|
|
211
|
+
this.fromUs = fromUs;
|
|
212
|
+
this.opts = opts;
|
|
213
|
+
this.to = toUs;
|
|
214
|
+
}
|
|
215
|
+
async next() {
|
|
216
|
+
const page = await rpc(this.rpcUrl, "ob_getFills", [this.account, { from_ts: this.fromUs, to_ts: this.to, limit: FILLS_PAGE }], this.opts);
|
|
217
|
+
if (page.fills.length < FILLS_PAGE) {
|
|
218
|
+
this.done = true;
|
|
219
|
+
return page.fills;
|
|
220
|
+
}
|
|
221
|
+
const oldest = Math.min(...page.fills.map((f) => f.timestamp));
|
|
222
|
+
if (oldest + 1 === this.to) {
|
|
223
|
+
// ponytail: a single batch with more than FILLS_PAGE fills is truncated here.
|
|
224
|
+
this.warnings.push(`batch ${oldest} has more than ${FILLS_PAGE} fills; only the first page is used`);
|
|
225
|
+
this.to = oldest;
|
|
226
|
+
return page.fills;
|
|
227
|
+
}
|
|
228
|
+
this.to = oldest + 1;
|
|
229
|
+
return page.fills.filter((f) => f.timestamp !== oldest);
|
|
230
|
+
}
|
|
231
|
+
}
|
|
232
|
+
async function drainFills(rpcUrl, account, fromUs, toUs, opts) {
|
|
233
|
+
const cursor = new FillsCursor(rpcUrl, account, fromUs, toUs, opts);
|
|
234
|
+
const fills = [];
|
|
235
|
+
while (!cursor.done)
|
|
236
|
+
fills.push(...(await cursor.next()));
|
|
237
|
+
return { fills, warnings: cursor.warnings };
|
|
238
|
+
}
|
|
239
|
+
export async function fetchFills(rpcUrl, account, fromUs, toUs, opts) {
|
|
240
|
+
return (await drainFills(rpcUrl, account, fromUs, toUs, opts)).fills;
|
|
241
|
+
}
|
|
242
|
+
export async function* streamPnlHistory(deps, account, q) {
|
|
243
|
+
const rpcOpts = { fetch: deps.fetch };
|
|
244
|
+
// The snapshot is served from the live engine, fills and ticks from the
|
|
245
|
+
// indexer. Pair them: the engine's last executed batch is read together with
|
|
246
|
+
// the snapshot, one request sent just before it and one just after, and the
|
|
247
|
+
// read is retried when the two disagree. Sequential reads would be exact but
|
|
248
|
+
// straddle a 500 ms tick on every attempt from far away; concurrent ones
|
|
249
|
+
// land within a few ms of server time, so a boundary inside that gap is rare
|
|
250
|
+
// and the next refresh heals it.
|
|
251
|
+
const engineTick = async () => {
|
|
252
|
+
const st = await rpc(deps.rpcUrl, "pod_getSolverState", [], rpcOpts);
|
|
253
|
+
return Number(st.last_executed_batch?.deadline ?? 0);
|
|
254
|
+
};
|
|
255
|
+
const readSnapshot = async () => {
|
|
256
|
+
for (let attempt = 0;; attempt++) {
|
|
257
|
+
const [before, snap, balances, after] = await Promise.all([engineTick(), deps.rest.positions(account), deps.rest.balances(account), engineTick()]);
|
|
258
|
+
if (before === after || attempt >= 4)
|
|
259
|
+
return { nowUs: before, snap, balances };
|
|
260
|
+
}
|
|
261
|
+
};
|
|
262
|
+
const [markets, snapshot] = await Promise.all([deps.rest.markets(), readSnapshot()]);
|
|
263
|
+
const { snap, balances } = snapshot;
|
|
264
|
+
let nowUs = snapshot.nowUs;
|
|
265
|
+
const batchUs = Math.max(500, ...markets.map((m) => m.auctionIntervalMs)) * 1000;
|
|
266
|
+
// Grid points sit on batch ticks so one range call per point serves every market.
|
|
267
|
+
const fromUs = Math.ceil((q.from * 1000) / batchUs) * batchUs;
|
|
268
|
+
const indexerCaughtUp = async () => {
|
|
269
|
+
if (nowUs === 0) {
|
|
270
|
+
nowUs = (await deps.rest.status()).solutionNow * 1000;
|
|
271
|
+
return;
|
|
272
|
+
}
|
|
273
|
+
for (let i = 0; i < 30 && (await deps.rest.status()).solutionNow * 1000 < nowUs; i++) {
|
|
274
|
+
await new Promise((r) => setTimeout(r, 100));
|
|
275
|
+
}
|
|
276
|
+
};
|
|
277
|
+
const [backstop, withdrawals] = await Promise.all([
|
|
278
|
+
deps.rest.backstopTransfers(account),
|
|
279
|
+
deps.rest.bridgeWithdrawals(account, { since: fromUs - 1 }),
|
|
280
|
+
indexerCaughtUp(),
|
|
281
|
+
]);
|
|
282
|
+
const toUs = Math.min(q.to === undefined ? nowUs : Math.floor((q.to * 1000) / batchUs) * batchUs, nowUs);
|
|
283
|
+
if (fromUs >= toUs)
|
|
284
|
+
throw new Error("pnlHistory: from must be before to");
|
|
285
|
+
const points = Math.min(Math.max(2, Math.floor(q.points ?? MAX_POINTS)), MAX_POINTS);
|
|
286
|
+
const stepUs = Math.ceil((toUs - fromUs) / (points - 1) / batchUs) * batchUs;
|
|
287
|
+
// The series starts at `from` and ends at `to`; the points between sit on
|
|
288
|
+
// epoch multiples of the step, so a refreshed window shares them, and their
|
|
289
|
+
// ticks, with the previous one.
|
|
290
|
+
const gridUs = [fromUs];
|
|
291
|
+
for (let t = (Math.floor(fromUs / stepUs) + 1) * stepUs; t < toUs; t += stepUs)
|
|
292
|
+
gridUs.push(t);
|
|
293
|
+
gridUs.push(toUs);
|
|
294
|
+
const byId = new Map(markets.map((m) => [m.id, m]));
|
|
295
|
+
const spotByToken = new Map(markets.filter((m) => m.type === "spot").map((m) => [m.base.address, m]));
|
|
296
|
+
const kindOf = (id) => (byId.get(id)?.type === "spot" ? "spot" : "perp");
|
|
297
|
+
const legs = [];
|
|
298
|
+
for (const p of snap.positions) {
|
|
299
|
+
if (p.kind !== "perp")
|
|
300
|
+
continue;
|
|
301
|
+
const basis = p.fundingBasis !== undefined && p.costBasis !== undefined ? p.fundingBasis - p.costBasis : undefined;
|
|
302
|
+
legs.push({ market: p.orderbookId, kind: "perp", size: p.size, basis });
|
|
303
|
+
}
|
|
304
|
+
for (const h of balances.holdings)
|
|
305
|
+
legs.push({ market: h.orderbookId, kind: "spot", size: h.balance, basis: h.costBasis });
|
|
306
|
+
const cache = deps.cache ?? new PnlHistoryCache();
|
|
307
|
+
const ticks = cache.ticks;
|
|
308
|
+
const key = (m, t) => `${m}:${t}`;
|
|
309
|
+
const walker = new PnlWalker(legs, (m, t) => ticks.get(key(m, t)), nowUs);
|
|
310
|
+
const known = new Set(legs.map((l) => l.market));
|
|
311
|
+
const use = (id) => { if (!known.has(id)) {
|
|
312
|
+
known.add(id);
|
|
313
|
+
walker.touch(id, kindOf(id));
|
|
314
|
+
} };
|
|
315
|
+
const store = (row, t) => {
|
|
316
|
+
const id = row.orderbook_id;
|
|
317
|
+
const perp = kindOf(id) === "perp";
|
|
318
|
+
const window = byId.get(id)?.fundingWindowUs ?? 0;
|
|
319
|
+
ticks.set(key(id, t), {
|
|
320
|
+
mark: perp ? dec(row.mark_price) : dec(row.clearing_price),
|
|
321
|
+
funding: perp && row.funding_index !== undefined && window > 0 ? dec(row.funding_index) / BigInt(window) : 0n,
|
|
322
|
+
});
|
|
323
|
+
};
|
|
324
|
+
// Every batch of 200 calls goes out at once; the node runs them concurrently.
|
|
325
|
+
const solutions = async (params) => {
|
|
326
|
+
const batches = [];
|
|
327
|
+
for (let i = 0; i < params.length; i += RPC_BATCH)
|
|
328
|
+
batches.push(params.slice(i, i + RPC_BATCH));
|
|
329
|
+
const res = await Promise.all(batches.map((b) => rpcBatch(deps.rpcUrl, b.map((p) => ({ method: "ob_getSolutions", params: [p] })), rpcOpts)));
|
|
330
|
+
return res.flat().map((r) => r.solutions);
|
|
331
|
+
};
|
|
332
|
+
/** All markets' rows at each tick, one call per tick. */
|
|
333
|
+
const fetchAllAt = async (times) => {
|
|
334
|
+
const wanted = times.filter((t) => !cache.tickTimes.has(t));
|
|
335
|
+
const rows = await solutions(wanted.map((t) => ({ since: t, until: t + 1, limit: RPC_BATCH })));
|
|
336
|
+
rows.forEach((rs, i) => { const t = wanted[i] ?? 0; cache.tickTimes.add(t); for (const r of rs)
|
|
337
|
+
store(r, t); });
|
|
338
|
+
};
|
|
339
|
+
/** Ticks for every known market at the grid points. One call per tick when
|
|
340
|
+
* the account spans many markets, else one lookup per market: the wide call
|
|
341
|
+
* returns every market's row whether needed or not. */
|
|
342
|
+
const fetchTicks = async (times) => {
|
|
343
|
+
if (known.size >= WIDE_ACCOUNT_MARKETS)
|
|
344
|
+
await fetchAllAt(times);
|
|
345
|
+
else
|
|
346
|
+
await fetchPairs(times.flatMap((t) => [...known].map((market) => ({ market, timeUs: t }))));
|
|
347
|
+
};
|
|
348
|
+
/** Newest row at or before the time, per pair; the fallback and the per-fill path. */
|
|
349
|
+
const fetchPairs = async (pairs) => {
|
|
350
|
+
const wanted = pairs.filter((n, i, all) => !ticks.has(key(n.market, n.timeUs)) && all.findIndex((o) => o.market === n.market && o.timeUs === n.timeUs) === i);
|
|
351
|
+
const rows = await solutions(wanted.map((n) => ({ orderbook_id: n.market, until: n.timeUs + 1, limit: 1 })));
|
|
352
|
+
rows.forEach((rs, i) => { const r = rs[0]; const n = wanted[i]; if (r && n)
|
|
353
|
+
store(r, n.timeUs); });
|
|
354
|
+
};
|
|
355
|
+
const fixed = [];
|
|
356
|
+
for (const b of backstop.transfers) {
|
|
357
|
+
const timeUs = b.time * 1000;
|
|
358
|
+
if (!b.orderbookId || b.size === 0n || timeUs < fromUs || timeUs > nowUs)
|
|
359
|
+
continue;
|
|
360
|
+
use(b.orderbookId);
|
|
361
|
+
fixed.push({ market: b.orderbookId, timeUs, deltaSize: -b.size, price: b.markPrice, kind: "sweep" });
|
|
362
|
+
}
|
|
363
|
+
for (const w of withdrawals) {
|
|
364
|
+
if (w.error || w.timeUs < fromUs || w.timeUs > nowUs)
|
|
365
|
+
continue;
|
|
366
|
+
const m = spotByToken.get(w.token);
|
|
367
|
+
if (!m)
|
|
368
|
+
continue;
|
|
369
|
+
use(m.id);
|
|
370
|
+
fixed.push({ market: m.id, timeUs: w.timeUs, deltaSize: -w.amount, price: 0n, kind: "withdraw" });
|
|
371
|
+
}
|
|
372
|
+
walker.feed(fixed);
|
|
373
|
+
const preface = Promise.all([fetchTicks([nowUs]), fetchPairs(fixed.map((e) => ({ market: e.market, timeUs: e.timeUs })))]);
|
|
374
|
+
const toEvent = (f) => {
|
|
375
|
+
const base = dec(f.base_amount);
|
|
376
|
+
return { market: f.orderbook_id, timeUs: f.timestamp, deltaSize: dec(f.initial_size) < 0n ? -base : base, price: dec(f.price), kind: "fill" };
|
|
377
|
+
};
|
|
378
|
+
// Chunks newest-first. Chunk k needs the events in (oldest_k, oldest_{k−1}],
|
|
379
|
+
// an explicit window, so the next windows load while earlier ones are folded.
|
|
380
|
+
const chunks = [];
|
|
381
|
+
const newestFirstGrid = [...gridUs].reverse();
|
|
382
|
+
for (let i = 0; i < newestFirstGrid.length; i += CHUNK_POINTS)
|
|
383
|
+
chunks.push(newestFirstGrid.slice(i, i + CHUNK_POINTS));
|
|
384
|
+
const prep = async (k) => {
|
|
385
|
+
const pts = chunks[k] ?? [];
|
|
386
|
+
const oldest = pts[pts.length - 1] ?? 0;
|
|
387
|
+
const bound = k === 0 ? nowUs : (chunks[k - 1]?.at(-1) ?? nowUs);
|
|
388
|
+
const warnings = [];
|
|
389
|
+
await Promise.all(cache.missing(oldest + 1, bound + 1).map(async (r) => {
|
|
390
|
+
const page = await drainFills(deps.rpcUrl, account, r.from, r.to, rpcOpts);
|
|
391
|
+
cache.add(r.from, r.to, page.fills.map(toEvent));
|
|
392
|
+
warnings.push(...page.warnings);
|
|
393
|
+
}));
|
|
394
|
+
const events = cache.slice(oldest + 1, bound + 1);
|
|
395
|
+
await Promise.all([fetchTicks(pts), fetchPairs(events.map((e) => ({ market: e.market, timeUs: e.timeUs })))]);
|
|
396
|
+
return { events, warnings };
|
|
397
|
+
};
|
|
398
|
+
const queue = [];
|
|
399
|
+
let nextPrep = 0;
|
|
400
|
+
for (let k = 0; k < chunks.length; k++) {
|
|
401
|
+
while (queue.length < IN_FLIGHT && nextPrep < chunks.length) {
|
|
402
|
+
const p = prep(nextPrep++);
|
|
403
|
+
p.catch(() => { });
|
|
404
|
+
queue.push(p);
|
|
405
|
+
}
|
|
406
|
+
const { events, warnings } = await queue.shift();
|
|
407
|
+
await preface;
|
|
408
|
+
for (const e of events)
|
|
409
|
+
use(e.market);
|
|
410
|
+
walker.feed(events);
|
|
411
|
+
const pts = chunks[k] ?? [];
|
|
412
|
+
await fetchPairs(pts.flatMap((t) => [...known].map((market) => ({ market, timeUs: t }))));
|
|
413
|
+
const out = pts.map((t) => walker.point(t)).reverse();
|
|
414
|
+
yield { points: out, done: k === chunks.length - 1, warnings: [...walker.warnings.splice(0), ...warnings] };
|
|
415
|
+
}
|
|
416
|
+
}
|
|
417
|
+
export async function fetchPnlHistory(deps, account, q) {
|
|
418
|
+
let points = [];
|
|
419
|
+
const warnings = [];
|
|
420
|
+
for await (const c of streamPnlHistory(deps, account, q)) {
|
|
421
|
+
points = c.points.concat(points);
|
|
422
|
+
warnings.push(...c.warnings);
|
|
423
|
+
}
|
|
424
|
+
const base = points[0]?.pnl ?? 0n;
|
|
425
|
+
return { points: points.map((p) => ({ time: p.time, pnl: p.pnl - base })), warnings };
|
|
426
|
+
}
|
|
427
|
+
//# sourceMappingURL=pnl-history.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"pnl-history.js","sourceRoot":"","sources":["../../src/sync/pnl-history.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"positions-live.d.ts","sourceRoot":"","sources":["../../src/sync/positions-live.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"positions-live.d.ts","sourceRoot":"","sources":["../../src/sync/positions-live.ts"],"names":[],"mappings":"AAuBA,OAAO,KAAK,EAAE,MAAM,EAAsB,iBAAiB,EAAE,MAAM,oBAAoB,CAAC;AAMxF,wBAAgB,eAAe,CAAC,IAAI,EAAE,iBAAiB,EAAE,OAAO,EAAE,MAAM,EAAE,GAAG,iBAAiB,CAwE7F"}
|
|
@@ -9,17 +9,18 @@
|
|
|
9
9
|
//
|
|
10
10
|
// EXACT replication of pod — see the cross-reference notes in pod at:
|
|
11
11
|
// trading/src/perps/mod.rs `cross_budgets` (withdrawable / equity)
|
|
12
|
-
// trading/src/perps/mod.rs `
|
|
13
|
-
// trading/src/perps/config.rs `into_market` (margin-rate derivation)
|
|
12
|
+
// trading/src/perps/mod.rs `pending_funding` (funding)
|
|
14
13
|
// Integer semantics match trading/src/decimal.rs:
|
|
15
14
|
// mul(a,b) = (a*b)/1e18 truncated toward zero (Decimal `*`)
|
|
16
15
|
// mulFloor(a,b) = (a*b)/1e18 rounded toward -infinity (`mul_floor`)
|
|
17
|
-
//
|
|
18
|
-
//
|
|
19
|
-
// funding_accrued = mulDivCeil(funding_index - entry_funding, size, window_us*1e18)
|
|
16
|
+
// funding_accrued = mul(funding_settling_index, size) - funding_basis
|
|
17
|
+
// unrealized_pnl = mul(mark, size) - cost_basis
|
|
20
18
|
// cash_with_funding = native_cash - Σ funding_accrued
|
|
21
|
-
|
|
22
|
-
|
|
19
|
+
//
|
|
20
|
+
// Nothing is reconstructed here. `funding_index` is a different base — the
|
|
21
|
+
// undivided accumulator, window_us times the index positions settle on — so it
|
|
22
|
+
// can never be subtracted from a position's entry figure.
|
|
23
|
+
import { imRate, mul, mulFloor } from "../codec/fixed.js";
|
|
23
24
|
const absB = (x) => (x < 0n ? -x : x);
|
|
24
25
|
const maxB = (a, b) => (a > b ? a : b);
|
|
25
26
|
export function enrichPositions(snap, markets) {
|
|
@@ -39,19 +40,21 @@ export function enrichPositions(snap, markets) {
|
|
|
39
40
|
// than a spurious −entry·size that would wrongly zero withdrawable cash.
|
|
40
41
|
const liveMark = market?.markPrice && market.markPrice > 0n ? market.markPrice : p.markPrice;
|
|
41
42
|
const mark = liveMark > 0n ? liveMark : p.entryPrice;
|
|
42
|
-
|
|
43
|
+
// The entry-price fallback rounds against the holder.
|
|
44
|
+
const upnl = p.costBasis !== undefined
|
|
45
|
+
? mul(mark, p.size) - p.costBasis
|
|
46
|
+
: mulFloor(mark - p.entryPrice, p.size); // pure price drift (signed)
|
|
43
47
|
const sizeQuote = mul(absB(p.size), mark); // = notional
|
|
44
|
-
const imr = imRate(market?.maxLeverage ?? 0);
|
|
48
|
+
const imr = market?.initialMargin ?? imRate(market?.maxLeverage ?? 0);
|
|
45
49
|
im += mul(sizeQuote, imr);
|
|
46
50
|
mm += mul(sizeQuote, imr / 2n);
|
|
47
51
|
priceUpnl += upnl;
|
|
48
52
|
priceUpnlSnap += p.unrealizedPnl;
|
|
49
|
-
//
|
|
50
|
-
//
|
|
51
|
-
// hold the snapshot value (re-aligned by the periodic REST resync).
|
|
53
|
+
// The settling index streams via pod_markets, the basis is frozen in the
|
|
54
|
+
// snapshot. Without both, hold the snapshot's figure.
|
|
52
55
|
let funding = p.fundingAccrued;
|
|
53
|
-
if (market?.
|
|
54
|
-
funding =
|
|
56
|
+
if (market?.fundingSettlingIndex !== undefined && p.fundingBasis !== undefined) {
|
|
57
|
+
funding = mul(market.fundingSettlingIndex, p.size) - p.fundingBasis;
|
|
55
58
|
}
|
|
56
59
|
fundingLiveTotal += funding;
|
|
57
60
|
fundingSnapTotal += p.fundingAccrued;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"positions-live.js","sourceRoot":"","sources":["../../src/sync/positions-live.ts"],"names":[],"mappings":"AAAA,+EAA+E;AAC/E,gFAAgF;AAChF,EAAE;AACF,8EAA8E;AAC9E,gFAAgF;AAChF,8EAA8E;AAC9E,8EAA8E;AAC9E,gCAAgC;AAChC,EAAE;AACF,sEAAsE;AACtE,yEAAyE;AACzE,
|
|
1
|
+
{"version":3,"file":"positions-live.js","sourceRoot":"","sources":["../../src/sync/positions-live.ts"],"names":[],"mappings":"AAAA,+EAA+E;AAC/E,gFAAgF;AAChF,EAAE;AACF,8EAA8E;AAC9E,gFAAgF;AAChF,8EAA8E;AAC9E,8EAA8E;AAC9E,gCAAgC;AAChC,EAAE;AACF,sEAAsE;AACtE,yEAAyE;AACzE,2DAA2D;AAC3D,kDAAkD;AAClD,kFAAkF;AAClF,kFAAkF;AAClF,wEAAwE;AACxE,mDAAmD;AACnD,wDAAwD;AACxD,EAAE;AACF,2EAA2E;AAC3E,+EAA+E;AAC/E,0DAA0D;AAG1D,OAAO,EAAE,MAAM,EAAE,GAAG,EAAE,QAAQ,EAAE,MAAM,mBAAmB,CAAC;AAE1D,MAAM,IAAI,GAAG,CAAC,CAAS,EAAE,EAAE,CAAC,CAAC,CAAC,GAAG,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;AAC9C,MAAM,IAAI,GAAG,CAAC,CAAS,EAAE,CAAS,EAAE,EAAE,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;AAEvD,MAAM,UAAU,eAAe,CAAC,IAAuB,EAAE,OAAiB;IACxE,MAAM,IAAI,GAAG,IAAI,GAAG,CAAmB,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC;IAEtE,IAAI,SAAS,GAAG,EAAE,CAAC,CAAC,mDAAmD;IACvE,IAAI,aAAa,GAAG,EAAE,CAAC,CAAC,4CAA4C;IACpE,IAAI,gBAAgB,GAAG,EAAE,CAAC,CAAC,8CAA8C;IACzE,IAAI,gBAAgB,GAAG,EAAE,CAAC,CAAC,oCAAoC;IAC/D,IAAI,EAAE,GAAG,EAAE,CAAC,CAAC,gDAAgD;IAC7D,IAAI,EAAE,GAAG,EAAE,CAAC,CAAC,oDAAoD;IACjE,IAAI,KAAK,GAAG,EAAE,CAAC,CAAC,0DAA0D;IAE1E,MAAM,SAAS,GAAe,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE;QACrD,MAAM,MAAM,GAAG,CAAC,CAAC,WAAW,CAAC,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC;QAEnE,IAAI,CAAC,CAAC,IAAI,KAAK,MAAM,EAAE,CAAC;YACtB,yEAAyE;YACzE,0EAA0E;YAC1E,yEAAyE;YACzE,MAAM,QAAQ,GAAG,MAAM,EAAE,SAAS,IAAI,MAAM,CAAC,SAAS,GAAG,EAAE,CAAC,CAAC,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC;YAC7F,MAAM,IAAI,GAAG,QAAQ,GAAG,EAAE,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,CAAC,UAAU,CAAC;YACrD,sDAAsD;YACtD,MAAM,IAAI,GAAG,CAAC,CAAC,SAAS,KAAK,SAAS;gBACpC,CAAC,CAAC,GAAG,CAAC,IAAI,EAAE,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,SAAS;gBACjC,CAAC,CAAC,QAAQ,CAAC,IAAI,GAAG,CAAC,CAAC,UAAU,EAAE,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,4BAA4B;YACvE,MAAM,SAAS,GAAG,GAAG,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,EAAE,IAAI,CAAC,CAAC,CAAC,aAAa;YACxD,MAAM,GAAG,GAAG,MAAM,EAAE,aAAa,IAAI,MAAM,CAAC,MAAM,EAAE,WAAW,IAAI,CAAC,CAAC,CAAC;YACtE,EAAE,IAAI,GAAG,CAAC,SAAS,EAAE,GAAG,CAAC,CAAC;YAC1B,EAAE,IAAI,GAAG,CAAC,SAAS,EAAE,GAAG,GAAG,EAAE,CAAC,CAAC;YAC/B,SAAS,IAAI,IAAI,CAAC;YAClB,aAAa,IAAI,CAAC,CAAC,aAAa,CAAC;YAEjC,yEAAyE;YACzE,sDAAsD;YACtD,IAAI,OAAO,GAAG,CAAC,CAAC,cAAc,CAAC;YAC/B,IAAI,MAAM,EAAE,oBAAoB,KAAK,SAAS,IAAI,CAAC,CAAC,YAAY,KAAK,SAAS,EAAE,CAAC;gBAC/E,OAAO,GAAG,GAAG,CAAC,MAAM,CAAC,oBAAoB,EAAE,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,YAAY,CAAC;YACtE,CAAC;YACD,gBAAgB,IAAI,OAAO,CAAC;YAC5B,gBAAgB,IAAI,CAAC,CAAC,cAAc,CAAC;YAErC,OAAO,EAAE,GAAG,CAAC,EAAE,SAAS,EAAE,IAAI,EAAE,aAAa,EAAE,IAAI,EAAE,QAAQ,EAAE,SAAS,EAAE,cAAc,EAAE,OAAO,EAAE,CAAC;QACtG,CAAC;QAED,MAAM,IAAI,GAAG,MAAM,EAAE,iBAAiB,IAAI,MAAM,EAAE,SAAS,IAAI,CAAC,CAAC,SAAS,CAAC;QAC3E,KAAK,IAAI,GAAG,CAAC,CAAC,CAAC,OAAO,EAAE,IAAI,CAAC,GAAG,GAAG,CAAC,CAAC,CAAC,OAAO,EAAE,CAAC,CAAC,SAAS,CAAC,CAAC;QAC5D,OAAO,EAAE,GAAG,CAAC,EAAE,SAAS,EAAE,IAAI,EAAE,aAAa,EAAE,CAAC,CAAC,aAAa,GAAG,CAAC,GAAG,CAAC,CAAC,CAAC,OAAO,EAAE,IAAI,CAAC,GAAG,GAAG,CAAC,CAAC,CAAC,OAAO,EAAE,CAAC,CAAC,SAAS,CAAC,CAAC,EAAE,CAAC;IAC1H,CAAC,CAAC,CAAC;IAEH,yEAAyE;IACzE,kEAAkE;IAClE,MAAM,UAAU,GAAG,IAAI,CAAC,IAAI,GAAG,gBAAgB,CAAC;IAChD,MAAM,eAAe,GAAG,UAAU,GAAG,gBAAgB,CAAC;IAEtD,iFAAiF;IACjF,8EAA8E;IAC9E,MAAM,WAAW,GAAG,eAAe,GAAG,SAAS,CAAC;IAChD,MAAM,gBAAgB,GAAG,WAAW,GAAG,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,EAAE,EAAE,WAAW,GAAG,EAAE,CAAC,CAAC;IAE5E,4EAA4E;IAC5E,8EAA8E;IAC9E,+EAA+E;IAC/E,MAAM,UAAU,GAAG,SAAS,GAAG,aAAa,CAAC;IAC7C,OAAO;QACL,SAAS;QACT,IAAI,EAAE,eAAe;QACrB,gBAAgB,EAAE,IAAI,CAAC,gBAAgB;QACvC,WAAW;QACX,gBAAgB;QAChB,iBAAiB,EAAE,EAAE;QACrB,kBAAkB,EAAE,IAAI,CAAC,kBAAkB,GAAG,UAAU,GAAG,KAAK;QAChE,YAAY,EAAE,IAAI,CAAC,YAAY,GAAG,CAAC,WAAW,GAAG,IAAI,CAAC,WAAW,CAAC,GAAG,KAAK;KAC3E,CAAC;AACJ,CAAC"}
|
|
@@ -13,4 +13,9 @@ export declare function rpc<T>(rpcUrl: string, method: string, params?: unknown[
|
|
|
13
13
|
* `undefined` instead of throwing — for methods whose failure is a state the
|
|
14
14
|
* caller expects and handles, not an exception. */
|
|
15
15
|
export declare function tryRpc<T>(rpcUrl: string, method: string, params?: unknown[], opts?: RpcOptions): Promise<T | undefined>;
|
|
16
|
+
/** One HTTP round trip carrying many calls; results come back in call order. */
|
|
17
|
+
export declare function rpcBatch<T>(rpcUrl: string, calls: {
|
|
18
|
+
method: string;
|
|
19
|
+
params: unknown[];
|
|
20
|
+
}[], opts?: RpcOptions): Promise<T[]>;
|
|
16
21
|
//# sourceMappingURL=jsonrpc.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"jsonrpc.d.ts","sourceRoot":"","sources":["../../src/transport/jsonrpc.ts"],"names":[],"mappings":"AAMA,MAAM,WAAW,UAAU;IACzB,KAAK,CAAC,EAAE,OAAO,KAAK,CAAC;IACrB,MAAM,CAAC,EAAE,WAAW,CAAC;CACtB;AAED,qBAAa,WAAY,SAAQ,KAAK;IACjB,IAAI,EAAE,MAAM,GAAG,SAAS;gBAAxB,IAAI,EAAE,MAAM,GAAG,SAAS,EAAE,OAAO,EAAE,MAAM;CAI7D;AAED;6EAC6E;AAC7E,wBAAsB,GAAG,CAAC,CAAC,EACzB,MAAM,EAAE,MAAM,EACd,MAAM,EAAE,MAAM,EACd,MAAM,GAAE,OAAO,EAAO,EACtB,IAAI,CAAC,EAAE,UAAU,GAChB,OAAO,CAAC,CAAC,CAAC,CAYZ;AAED;;mDAEmD;AACnD,wBAAsB,MAAM,CAAC,CAAC,EAC5B,MAAM,EAAE,MAAM,EACd,MAAM,EAAE,MAAM,EACd,MAAM,GAAE,OAAO,EAAO,EACtB,IAAI,CAAC,EAAE,UAAU,GAChB,OAAO,CAAC,CAAC,GAAG,SAAS,CAAC,CAMxB"}
|
|
1
|
+
{"version":3,"file":"jsonrpc.d.ts","sourceRoot":"","sources":["../../src/transport/jsonrpc.ts"],"names":[],"mappings":"AAMA,MAAM,WAAW,UAAU;IACzB,KAAK,CAAC,EAAE,OAAO,KAAK,CAAC;IACrB,MAAM,CAAC,EAAE,WAAW,CAAC;CACtB;AAED,qBAAa,WAAY,SAAQ,KAAK;IACjB,IAAI,EAAE,MAAM,GAAG,SAAS;gBAAxB,IAAI,EAAE,MAAM,GAAG,SAAS,EAAE,OAAO,EAAE,MAAM;CAI7D;AAED;6EAC6E;AAC7E,wBAAsB,GAAG,CAAC,CAAC,EACzB,MAAM,EAAE,MAAM,EACd,MAAM,EAAE,MAAM,EACd,MAAM,GAAE,OAAO,EAAO,EACtB,IAAI,CAAC,EAAE,UAAU,GAChB,OAAO,CAAC,CAAC,CAAC,CAYZ;AAED;;mDAEmD;AACnD,wBAAsB,MAAM,CAAC,CAAC,EAC5B,MAAM,EAAE,MAAM,EACd,MAAM,EAAE,MAAM,EACd,MAAM,GAAE,OAAO,EAAO,EACtB,IAAI,CAAC,EAAE,UAAU,GAChB,OAAO,CAAC,CAAC,GAAG,SAAS,CAAC,CAMxB;AAED,gFAAgF;AAChF,wBAAsB,QAAQ,CAAC,CAAC,EAC9B,MAAM,EAAE,MAAM,EACd,KAAK,EAAE;IAAE,MAAM,EAAE,MAAM,CAAC;IAAC,MAAM,EAAE,OAAO,EAAE,CAAA;CAAE,EAAE,EAC9C,IAAI,CAAC,EAAE,UAAU,GAChB,OAAO,CAAC,CAAC,EAAE,CAAC,CAgBd"}
|
|
@@ -39,4 +39,24 @@ export async function tryRpc(rpcUrl, method, params = [], opts) {
|
|
|
39
39
|
return undefined;
|
|
40
40
|
}
|
|
41
41
|
}
|
|
42
|
+
/** One HTTP round trip carrying many calls; results come back in call order. */
|
|
43
|
+
export async function rpcBatch(rpcUrl, calls, opts) {
|
|
44
|
+
const doFetch = opts?.fetch ?? fetch;
|
|
45
|
+
const res = await doFetch(rpcUrl, {
|
|
46
|
+
method: "POST",
|
|
47
|
+
headers: { "content-type": "application/json" },
|
|
48
|
+
body: JSON.stringify(calls.map((c, id) => ({ jsonrpc: "2.0", id, ...c }))),
|
|
49
|
+
signal: opts?.signal,
|
|
50
|
+
});
|
|
51
|
+
const json = (await res.json());
|
|
52
|
+
if (!Array.isArray(json))
|
|
53
|
+
throw new PodRpcError(undefined, "batch response is not an array");
|
|
54
|
+
const out = new Array(calls.length);
|
|
55
|
+
for (const r of json) {
|
|
56
|
+
if (r.error)
|
|
57
|
+
throw new PodRpcError(r.error.code, r.error.message ?? `${calls[r.id]?.method} failed`);
|
|
58
|
+
out[r.id] = r.result;
|
|
59
|
+
}
|
|
60
|
+
return out;
|
|
61
|
+
}
|
|
42
62
|
//# sourceMappingURL=jsonrpc.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"jsonrpc.js","sourceRoot":"","sources":["../../src/transport/jsonrpc.ts"],"names":[],"mappings":"AAAA,gEAAgE;AAChE,EAAE;AACF,8EAA8E;AAC9E,6EAA6E;AAC7E,4CAA4C;AAO5C,MAAM,OAAO,WAAY,SAAQ,KAAK;IACjB;IAAnB,YAAmB,IAAwB,EAAE,OAAe;QAC1D,KAAK,CAAC,OAAO,CAAC,CAAC;QADE,SAAI,GAAJ,IAAI,CAAoB;QAEzC,IAAI,CAAC,IAAI,GAAG,aAAa,CAAC;IAC5B,CAAC;CACF;AAED;6EAC6E;AAC7E,MAAM,CAAC,KAAK,UAAU,GAAG,CACvB,MAAc,EACd,MAAc,EACd,SAAoB,EAAE,EACtB,IAAiB;IAEjB,MAAM,OAAO,GAAG,IAAI,EAAE,KAAK,IAAI,KAAK,CAAC;IACrC,MAAM,GAAG,GAAG,MAAM,OAAO,CAAC,MAAM,EAAE;QAChC,MAAM,EAAE,MAAM;QACd,OAAO,EAAE,EAAE,cAAc,EAAE,kBAAkB,EAAE;QAC/C,IAAI,EAAE,IAAI,CAAC,SAAS,CAAC,EAAE,OAAO,EAAE,KAAK,EAAE,EAAE,EAAE,CAAC,EAAE,MAAM,EAAE,MAAM,EAAE,CAAC;QAC/D,MAAM,EAAE,IAAI,EAAE,MAAM;KACrB,CAAC,CAAC;IACH,MAAM,IAAI,GAAG,CAAC,MAAM,GAAG,CAAC,IAAI,EAAE,CAAgE,CAAC;IAC/F,IAAI,IAAI,CAAC,KAAK;QAAE,MAAM,IAAI,WAAW,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,EAAE,IAAI,CAAC,KAAK,CAAC,OAAO,IAAI,GAAG,MAAM,SAAS,CAAC,CAAC;IACjG,IAAI,IAAI,CAAC,MAAM,KAAK,SAAS;QAAE,MAAM,IAAI,WAAW,CAAC,SAAS,EAAE,GAAG,MAAM,qBAAqB,CAAC,CAAC;IAChG,OAAO,IAAI,CAAC,MAAM,CAAC;AACrB,CAAC;AAED;;mDAEmD;AACnD,MAAM,CAAC,KAAK,UAAU,MAAM,CAC1B,MAAc,EACd,MAAc,EACd,SAAoB,EAAE,EACtB,IAAiB;IAEjB,IAAI,CAAC;QACH,OAAO,MAAM,GAAG,CAAI,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,IAAI,CAAC,CAAC;IACpD,CAAC;IAAC,MAAM,CAAC;QACP,OAAO,SAAS,CAAC;IACnB,CAAC;AACH,CAAC"}
|
|
1
|
+
{"version":3,"file":"jsonrpc.js","sourceRoot":"","sources":["../../src/transport/jsonrpc.ts"],"names":[],"mappings":"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"}
|
package/dist/types/public.d.ts
CHANGED
|
@@ -141,6 +141,9 @@ export interface Market {
|
|
|
141
141
|
/** Floor on an order's notional, 0 when the market sets none. */
|
|
142
142
|
minNotional: bigint;
|
|
143
143
|
maxLeverage: number;
|
|
144
|
+
/** Initial-margin rate as the engine charges it, maintenance being half of
|
|
145
|
+
* it; `maxLeverage` is rounded to an integer, this is not. */
|
|
146
|
+
initialMargin?: bigint;
|
|
144
147
|
fundingWindowUs: number;
|
|
145
148
|
makerFee: bigint;
|
|
146
149
|
takerFee: bigint;
|
|
@@ -154,6 +157,10 @@ export interface Market {
|
|
|
154
157
|
markPrice?: bigint;
|
|
155
158
|
fundingRate?: bigint;
|
|
156
159
|
fundingIndex?: bigint;
|
|
160
|
+
/** The index positions settle against: `mul(fundingSettlingIndex, size) −
|
|
161
|
+
* fundingBasis` is a position's accrual. `fundingIndex` is a different
|
|
162
|
+
* base and cannot stand in for it. */
|
|
163
|
+
fundingSettlingIndex?: bigint;
|
|
157
164
|
fundingLastUpdatedMs?: number;
|
|
158
165
|
openInterest?: bigint;
|
|
159
166
|
}
|
|
@@ -265,7 +272,12 @@ export interface PerpPosition {
|
|
|
265
272
|
margin: bigint;
|
|
266
273
|
leverage: number;
|
|
267
274
|
fundingAccrued: bigint;
|
|
268
|
-
/**
|
|
275
|
+
/** `Σ settlingIndex × Δsize`; absent on older nodes. */
|
|
276
|
+
fundingBasis?: bigint;
|
|
277
|
+
/** `Σ clearing × Δsize`; absent on older nodes. */
|
|
278
|
+
costBasis?: bigint;
|
|
279
|
+
/** Funding accumulator at entry, on `fundingIndex`'s base. Truncating, so
|
|
280
|
+
* estimates from it are within a grid step × size. */
|
|
269
281
|
entryFunding: bigint;
|
|
270
282
|
liquidationPrice: bigint;
|
|
271
283
|
unrealizedPnl: bigint;
|