jcc_hyper_tool 0.1.3 → 0.1.5
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.md +53 -22
- package/dist/advisor/actionRunner.d.ts +29 -0
- package/dist/advisor/actionRunner.d.ts.map +1 -0
- package/dist/advisor/actionRunner.js +163 -0
- package/dist/advisor/actionRunner.js.map +1 -0
- package/dist/advisor/actionSchema.d.ts +417 -0
- package/dist/advisor/actionSchema.d.ts.map +1 -0
- package/dist/advisor/actionSchema.js +90 -0
- package/dist/advisor/actionSchema.js.map +1 -0
- package/dist/advisor/adviseEngine.d.ts +43 -0
- package/dist/advisor/adviseEngine.d.ts.map +1 -0
- package/dist/advisor/adviseEngine.js +91 -0
- package/dist/advisor/adviseEngine.js.map +1 -0
- package/dist/advisor/contextBuilder.d.ts +34 -0
- package/dist/advisor/contextBuilder.d.ts.map +1 -0
- package/dist/advisor/contextBuilder.js +134 -0
- package/dist/advisor/contextBuilder.js.map +1 -0
- package/dist/advisor/deepseekClient.d.ts +26 -0
- package/dist/advisor/deepseekClient.d.ts.map +1 -0
- package/dist/advisor/deepseekClient.js +96 -0
- package/dist/advisor/deepseekClient.js.map +1 -0
- package/dist/advisor/guards.d.ts +17 -0
- package/dist/advisor/guards.d.ts.map +1 -0
- package/dist/advisor/guards.js +71 -0
- package/dist/advisor/guards.js.map +1 -0
- package/dist/advisor/promptTemplate.d.ts +5 -0
- package/dist/advisor/promptTemplate.d.ts.map +1 -0
- package/dist/advisor/promptTemplate.js +78 -0
- package/dist/advisor/promptTemplate.js.map +1 -0
- package/dist/advisor/sessionLog.d.ts +41 -0
- package/dist/advisor/sessionLog.d.ts.map +1 -0
- package/dist/advisor/sessionLog.js +7 -0
- package/dist/advisor/sessionLog.js.map +1 -0
- package/dist/cli/advisorCli.d.ts +3 -0
- package/dist/cli/advisorCli.d.ts.map +1 -0
- package/dist/cli/advisorCli.js +354 -0
- package/dist/cli/advisorCli.js.map +1 -0
- package/dist/cli/index.js +6 -3
- package/dist/cli/index.js.map +1 -1
- package/dist/cli/strategyCli.js +1 -1
- package/dist/cli/tradingCli.d.ts.map +1 -1
- package/dist/cli/tradingCli.js +3 -1
- package/dist/cli/tradingCli.js.map +1 -1
- package/dist/core/cliBin.d.ts +8 -0
- package/dist/core/cliBin.d.ts.map +1 -0
- package/dist/core/cliBin.js +15 -0
- package/dist/core/cliBin.js.map +1 -0
- package/dist/core/errorFormat.d.ts +7 -0
- package/dist/core/errorFormat.d.ts.map +1 -0
- package/dist/core/errorFormat.js +59 -0
- package/dist/core/errorFormat.js.map +1 -0
- package/dist/core/errors.d.ts +2 -1
- package/dist/core/errors.d.ts.map +1 -1
- package/dist/core/errors.js +3 -1
- package/dist/core/errors.js.map +1 -1
- package/dist/core/hyperliquid/client.d.ts +3 -0
- package/dist/core/hyperliquid/client.d.ts.map +1 -1
- package/dist/core/hyperliquid/client.js +31 -21
- package/dist/core/hyperliquid/client.js.map +1 -1
- package/dist/core/hyperliquid/exchange.d.ts +3 -0
- package/dist/core/hyperliquid/exchange.d.ts.map +1 -1
- package/dist/core/hyperliquid/exchange.js +31 -21
- package/dist/core/hyperliquid/exchange.js.map +1 -1
- package/dist/core/hyperliquid/exchangeParse.d.ts +3 -0
- package/dist/core/hyperliquid/exchangeParse.d.ts.map +1 -1
- package/dist/core/hyperliquid/exchangeParse.js +62 -0
- package/dist/core/hyperliquid/exchangeParse.js.map +1 -1
- package/dist/core/hyperliquid/httpRequest.d.ts +36 -0
- package/dist/core/hyperliquid/httpRequest.d.ts.map +1 -0
- package/dist/core/hyperliquid/httpRequest.js +171 -0
- package/dist/core/hyperliquid/httpRequest.js.map +1 -0
- package/dist/core/hyperliquid/watchOrders.d.ts.map +1 -1
- package/dist/core/hyperliquid/watchOrders.js +2 -1
- package/dist/core/hyperliquid/watchOrders.js.map +1 -1
- package/dist/core/state/gcTradeState.js +1 -1
- package/dist/core/state/gcTradeState.js.map +1 -1
- package/dist/core/state/openOrdersAgg.d.ts +13 -0
- package/dist/core/state/openOrdersAgg.d.ts.map +1 -0
- package/dist/core/state/openOrdersAgg.js +50 -0
- package/dist/core/state/openOrdersAgg.js.map +1 -0
- package/dist/core/state/profileStore.d.ts +6 -0
- package/dist/core/state/profileStore.d.ts.map +1 -0
- package/dist/core/state/profileStore.js +30 -0
- package/dist/core/state/profileStore.js.map +1 -0
- package/dist/core/state/runCancelOpen.js +3 -3
- package/dist/core/state/runCancelOpen.js.map +1 -1
- package/dist/core/state/runReconcile.d.ts.map +1 -1
- package/dist/core/state/runReconcile.js +43 -18
- package/dist/core/state/runReconcile.js.map +1 -1
- package/dist/core/state/schema.d.ts +148 -78
- package/dist/core/state/schema.d.ts.map +1 -1
- package/dist/core/state/schema.js +11 -0
- package/dist/core/state/schema.js.map +1 -1
- package/dist/core/state/statePaths.d.ts +1 -0
- package/dist/core/state/statePaths.d.ts.map +1 -1
- package/dist/core/state/statePaths.js +4 -0
- package/dist/core/state/statePaths.js.map +1 -1
- package/dist/core/state/store.js +1 -1
- package/dist/core/state/store.js.map +1 -1
- package/dist/daemon/index.js +3 -3
- package/dist/daemon/index.js.map +1 -1
- package/package.json +1 -1
|
@@ -0,0 +1,171 @@
|
|
|
1
|
+
import { HyperliquidApiError } from "../errors.js";
|
|
2
|
+
import { formatHttpResponseBodyForDisplay } from "../errorFormat.js";
|
|
3
|
+
/** Hyperliquid REST IP weight budget (see HL rate-limits docs). */
|
|
4
|
+
export const HL_REST_WEIGHT_LIMIT_PER_MINUTE = 1200;
|
|
5
|
+
function readRetryEnv(name, fallback) {
|
|
6
|
+
const raw = process.env[name]?.trim();
|
|
7
|
+
if (!raw) {
|
|
8
|
+
return fallback;
|
|
9
|
+
}
|
|
10
|
+
const n = Number(raw);
|
|
11
|
+
return Number.isFinite(n) && n >= 0 ? n : fallback;
|
|
12
|
+
}
|
|
13
|
+
export function defaultHyperliquidHttpRetryOptions() {
|
|
14
|
+
return {
|
|
15
|
+
maxRetries: readRetryEnv("JCC_HL_MAX_RETRIES", 4),
|
|
16
|
+
retryBaseDelayMs: readRetryEnv("JCC_HL_RETRY_BASE_MS", 1000),
|
|
17
|
+
};
|
|
18
|
+
}
|
|
19
|
+
export function requestHintFromJsonBody(body) {
|
|
20
|
+
if (typeof body !== "object" || body === null) {
|
|
21
|
+
return undefined;
|
|
22
|
+
}
|
|
23
|
+
const type = body.type;
|
|
24
|
+
return typeof type === "string" ? type : undefined;
|
|
25
|
+
}
|
|
26
|
+
/** Unwrap Error.cause chains (Node fetch often surfaces only "fetch failed" at the top). */
|
|
27
|
+
export function formatErrorChain(error) {
|
|
28
|
+
const parts = [];
|
|
29
|
+
const seen = new Set();
|
|
30
|
+
let cur = error;
|
|
31
|
+
while (cur !== undefined && cur !== null && !seen.has(cur)) {
|
|
32
|
+
seen.add(cur);
|
|
33
|
+
if (cur instanceof Error) {
|
|
34
|
+
const code = "code" in cur && typeof cur.code === "string"
|
|
35
|
+
? cur.code
|
|
36
|
+
: undefined;
|
|
37
|
+
parts.push(code ? `${cur.message} (${code})` : cur.message);
|
|
38
|
+
cur = cur.cause;
|
|
39
|
+
}
|
|
40
|
+
else {
|
|
41
|
+
parts.push(String(cur));
|
|
42
|
+
break;
|
|
43
|
+
}
|
|
44
|
+
}
|
|
45
|
+
return parts.join(" → ");
|
|
46
|
+
}
|
|
47
|
+
export function hyperliquidRateLimitHint() {
|
|
48
|
+
return [
|
|
49
|
+
`Hyperliquid REST IP weight limit: ${HL_REST_WEIGHT_LIMIT_PER_MINUTE}/minute.`,
|
|
50
|
+
"Typical info weights: candleSnapshot≈20 (+1 per 60 candles returned),",
|
|
51
|
+
"clearinghouseState/allMids/l2Book=2, most other info=20, userRole=60.",
|
|
52
|
+
"Exchange actions use separate address-based limits (not info); when throttled,",
|
|
53
|
+
"actions may be limited to about one request every 10 seconds.",
|
|
54
|
+
].join(" ");
|
|
55
|
+
}
|
|
56
|
+
export function formatHyperliquidHttpError(params) {
|
|
57
|
+
const req = params.requestHint ? ` type=${params.requestHint}` : "";
|
|
58
|
+
const statusLabel = params.statusText && params.statusText.length > 0
|
|
59
|
+
? `${params.status} ${params.statusText}`
|
|
60
|
+
: String(params.status);
|
|
61
|
+
const bodyDisplay = params.bodyText.length > 0 ? formatHttpResponseBodyForDisplay(params.bodyText) : "";
|
|
62
|
+
const retryNote = params.retriesAttempted !== undefined && params.retriesAttempted > 0
|
|
63
|
+
? ` Retried ${params.retriesAttempted} time(s) before giving up.`
|
|
64
|
+
: "";
|
|
65
|
+
if (params.status === 429) {
|
|
66
|
+
return [
|
|
67
|
+
`Hyperliquid rate limited (HTTP 429) on ${params.method} ${params.url}${req}.${retryNote}`,
|
|
68
|
+
hyperliquidRateLimitHint(),
|
|
69
|
+
bodyDisplay ? `Response body:\n${bodyDisplay}` : undefined,
|
|
70
|
+
]
|
|
71
|
+
.filter(Boolean)
|
|
72
|
+
.join("\n");
|
|
73
|
+
}
|
|
74
|
+
if (params.status === 0) {
|
|
75
|
+
return [
|
|
76
|
+
`Network error on ${params.method} ${params.url}${req}.${retryNote}`,
|
|
77
|
+
bodyDisplay || "(no additional detail)",
|
|
78
|
+
"Check DNS, TLS, proxy/firewall, and that the API host is reachable from this machine.",
|
|
79
|
+
].join("\n");
|
|
80
|
+
}
|
|
81
|
+
return [
|
|
82
|
+
`HTTP ${statusLabel} on ${params.method} ${params.url}${req}.${retryNote}`,
|
|
83
|
+
bodyDisplay ? `Response body:\n${bodyDisplay}` : undefined,
|
|
84
|
+
]
|
|
85
|
+
.filter(Boolean)
|
|
86
|
+
.join("\n");
|
|
87
|
+
}
|
|
88
|
+
function parseRetryAfterMs(headers) {
|
|
89
|
+
const raw = headers.get("retry-after")?.trim();
|
|
90
|
+
if (!raw) {
|
|
91
|
+
return undefined;
|
|
92
|
+
}
|
|
93
|
+
const seconds = Number(raw);
|
|
94
|
+
if (Number.isFinite(seconds) && seconds >= 0) {
|
|
95
|
+
return seconds * 1000;
|
|
96
|
+
}
|
|
97
|
+
const when = Date.parse(raw);
|
|
98
|
+
if (Number.isFinite(when)) {
|
|
99
|
+
return Math.max(0, when - Date.now());
|
|
100
|
+
}
|
|
101
|
+
return undefined;
|
|
102
|
+
}
|
|
103
|
+
function isRetryableHttpStatus(status) {
|
|
104
|
+
return status === 429 || status === 502 || status === 503 || status === 504;
|
|
105
|
+
}
|
|
106
|
+
function backoffDelayMs(attempt, baseMs, retryAfterMs) {
|
|
107
|
+
if (retryAfterMs !== undefined) {
|
|
108
|
+
return retryAfterMs;
|
|
109
|
+
}
|
|
110
|
+
const exp = Math.min(baseMs * 2 ** attempt, 30_000);
|
|
111
|
+
return exp + Math.floor(Math.random() * 250);
|
|
112
|
+
}
|
|
113
|
+
function sleep(ms) {
|
|
114
|
+
return new Promise((resolve) => {
|
|
115
|
+
setTimeout(resolve, ms);
|
|
116
|
+
});
|
|
117
|
+
}
|
|
118
|
+
export async function postJsonWithRetry(params) {
|
|
119
|
+
const retryOpts = { ...defaultHyperliquidHttpRetryOptions(), ...params.retry };
|
|
120
|
+
const bodyText = JSON.stringify(params.body);
|
|
121
|
+
const requestHint = requestHintFromJsonBody(params.body);
|
|
122
|
+
let lastNetworkDetail = "";
|
|
123
|
+
for (let attempt = 0; attempt <= retryOpts.maxRetries; attempt++) {
|
|
124
|
+
let res;
|
|
125
|
+
try {
|
|
126
|
+
res = await params.fetchImpl(params.url, {
|
|
127
|
+
method: "POST",
|
|
128
|
+
headers: {
|
|
129
|
+
Accept: "application/json",
|
|
130
|
+
"Content-Type": "application/json",
|
|
131
|
+
},
|
|
132
|
+
body: bodyText,
|
|
133
|
+
});
|
|
134
|
+
}
|
|
135
|
+
catch (e) {
|
|
136
|
+
lastNetworkDetail = formatErrorChain(e);
|
|
137
|
+
if (attempt >= retryOpts.maxRetries) {
|
|
138
|
+
throw new HyperliquidApiError(formatHyperliquidHttpError({
|
|
139
|
+
method: "POST",
|
|
140
|
+
url: params.url,
|
|
141
|
+
status: 0,
|
|
142
|
+
bodyText: lastNetworkDetail,
|
|
143
|
+
requestHint,
|
|
144
|
+
retriesAttempted: attempt,
|
|
145
|
+
}), 0, lastNetworkDetail, requestHint);
|
|
146
|
+
}
|
|
147
|
+
await sleep(backoffDelayMs(attempt, retryOpts.retryBaseDelayMs));
|
|
148
|
+
continue;
|
|
149
|
+
}
|
|
150
|
+
const text = await res.text();
|
|
151
|
+
if (res.ok || !isRetryableHttpStatus(res.status) || attempt >= retryOpts.maxRetries) {
|
|
152
|
+
return {
|
|
153
|
+
status: res.status,
|
|
154
|
+
statusText: res.statusText,
|
|
155
|
+
text,
|
|
156
|
+
headers: res.headers,
|
|
157
|
+
attemptsMade: attempt + 1,
|
|
158
|
+
};
|
|
159
|
+
}
|
|
160
|
+
await sleep(backoffDelayMs(attempt, retryOpts.retryBaseDelayMs, parseRetryAfterMs(res.headers)));
|
|
161
|
+
}
|
|
162
|
+
throw new HyperliquidApiError(formatHyperliquidHttpError({
|
|
163
|
+
method: "POST",
|
|
164
|
+
url: params.url,
|
|
165
|
+
status: 0,
|
|
166
|
+
bodyText: lastNetworkDetail || "retry loop exhausted",
|
|
167
|
+
requestHint,
|
|
168
|
+
retriesAttempted: retryOpts.maxRetries,
|
|
169
|
+
}), 0, lastNetworkDetail, requestHint);
|
|
170
|
+
}
|
|
171
|
+
//# sourceMappingURL=httpRequest.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"httpRequest.js","sourceRoot":"","sources":["../../../src/core/hyperliquid/httpRequest.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,mBAAmB,EAAE,MAAM,cAAc,CAAC;AACnD,OAAO,EAAE,gCAAgC,EAAE,MAAM,mBAAmB,CAAC;AAErE,mEAAmE;AACnE,MAAM,CAAC,MAAM,+BAA+B,GAAG,IAAI,CAAC;AAgBpD,SAAS,YAAY,CAAC,IAAY,EAAE,QAAgB;IAClD,MAAM,GAAG,GAAG,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,CAAC;IACtC,IAAI,CAAC,GAAG,EAAE,CAAC;QACT,OAAO,QAAQ,CAAC;IAClB,CAAC;IACD,MAAM,CAAC,GAAG,MAAM,CAAC,GAAG,CAAC,CAAC;IACtB,OAAO,MAAM,CAAC,QAAQ,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC;AACrD,CAAC;AAED,MAAM,UAAU,kCAAkC;IAChD,OAAO;QACL,UAAU,EAAE,YAAY,CAAC,oBAAoB,EAAE,CAAC,CAAC;QACjD,gBAAgB,EAAE,YAAY,CAAC,sBAAsB,EAAE,IAAI,CAAC;KAC7D,CAAC;AACJ,CAAC;AAED,MAAM,UAAU,uBAAuB,CAAC,IAAa;IACnD,IAAI,OAAO,IAAI,KAAK,QAAQ,IAAI,IAAI,KAAK,IAAI,EAAE,CAAC;QAC9C,OAAO,SAAS,CAAC;IACnB,CAAC;IACD,MAAM,IAAI,GAAI,IAAgC,CAAC,IAAI,CAAC;IACpD,OAAO,OAAO,IAAI,KAAK,QAAQ,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,SAAS,CAAC;AACrD,CAAC;AAED,4FAA4F;AAC5F,MAAM,UAAU,gBAAgB,CAAC,KAAc;IAC7C,MAAM,KAAK,GAAa,EAAE,CAAC;IAC3B,MAAM,IAAI,GAAG,IAAI,GAAG,EAAW,CAAC;IAChC,IAAI,GAAG,GAAY,KAAK,CAAC;IACzB,OAAO,GAAG,KAAK,SAAS,IAAI,GAAG,KAAK,IAAI,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE,CAAC;QAC3D,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;QACd,IAAI,GAAG,YAAY,KAAK,EAAE,CAAC;YACzB,MAAM,IAAI,GACR,MAAM,IAAI,GAAG,IAAI,OAAQ,GAA6B,CAAC,IAAI,KAAK,QAAQ;gBACtE,CAAC,CAAE,GAA6B,CAAC,IAAI;gBACrC,CAAC,CAAC,SAAS,CAAC;YAChB,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,GAAG,GAAG,CAAC,OAAO,KAAK,IAAI,GAAG,CAAC,CAAC,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;YAC5D,GAAG,GAAG,GAAG,CAAC,KAAK,CAAC;QAClB,CAAC;aAAM,CAAC;YACN,KAAK,CAAC,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC;YACxB,MAAM;QACR,CAAC;IACH,CAAC;IACD,OAAO,KAAK,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;AAC3B,CAAC;AAED,MAAM,UAAU,wBAAwB;IACtC,OAAO;QACL,qCAAqC,+BAA+B,UAAU;QAC9E,uEAAuE;QACvE,uEAAuE;QACvE,gFAAgF;QAChF,+DAA+D;KAChE,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;AACd,CAAC;AAED,MAAM,UAAU,0BAA0B,CAAC,MAQ1C;IACC,MAAM,GAAG,GAAG,MAAM,CAAC,WAAW,CAAC,CAAC,CAAC,SAAS,MAAM,CAAC,WAAW,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;IACpE,MAAM,WAAW,GACf,MAAM,CAAC,UAAU,IAAI,MAAM,CAAC,UAAU,CAAC,MAAM,GAAG,CAAC;QAC/C,CAAC,CAAC,GAAG,MAAM,CAAC,MAAM,IAAI,MAAM,CAAC,UAAU,EAAE;QACzC,CAAC,CAAC,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;IAC5B,MAAM,WAAW,GACf,MAAM,CAAC,QAAQ,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,gCAAgC,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;IACtF,MAAM,SAAS,GACb,MAAM,CAAC,gBAAgB,KAAK,SAAS,IAAI,MAAM,CAAC,gBAAgB,GAAG,CAAC;QAClE,CAAC,CAAC,YAAY,MAAM,CAAC,gBAAgB,4BAA4B;QACjE,CAAC,CAAC,EAAE,CAAC;IAET,IAAI,MAAM,CAAC,MAAM,KAAK,GAAG,EAAE,CAAC;QAC1B,OAAO;YACL,0CAA0C,MAAM,CAAC,MAAM,IAAI,MAAM,CAAC,GAAG,GAAG,GAAG,IAAI,SAAS,EAAE;YAC1F,wBAAwB,EAAE;YAC1B,WAAW,CAAC,CAAC,CAAC,mBAAmB,WAAW,EAAE,CAAC,CAAC,CAAC,SAAS;SAC3D;aACE,MAAM,CAAC,OAAO,CAAC;aACf,IAAI,CAAC,IAAI,CAAC,CAAC;IAChB,CAAC;IAED,IAAI,MAAM,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QACxB,OAAO;YACL,oBAAoB,MAAM,CAAC,MAAM,IAAI,MAAM,CAAC,GAAG,GAAG,GAAG,IAAI,SAAS,EAAE;YACpE,WAAW,IAAI,wBAAwB;YACvC,uFAAuF;SACxF,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IACf,CAAC;IAED,OAAO;QACL,QAAQ,WAAW,OAAO,MAAM,CAAC,MAAM,IAAI,MAAM,CAAC,GAAG,GAAG,GAAG,IAAI,SAAS,EAAE;QAC1E,WAAW,CAAC,CAAC,CAAC,mBAAmB,WAAW,EAAE,CAAC,CAAC,CAAC,SAAS;KAC3D;SACE,MAAM,CAAC,OAAO,CAAC;SACf,IAAI,CAAC,IAAI,CAAC,CAAC;AAChB,CAAC;AAED,SAAS,iBAAiB,CAAC,OAAgB;IACzC,MAAM,GAAG,GAAG,OAAO,CAAC,GAAG,CAAC,aAAa,CAAC,EAAE,IAAI,EAAE,CAAC;IAC/C,IAAI,CAAC,GAAG,EAAE,CAAC;QACT,OAAO,SAAS,CAAC;IACnB,CAAC;IACD,MAAM,OAAO,GAAG,MAAM,CAAC,GAAG,CAAC,CAAC;IAC5B,IAAI,MAAM,CAAC,QAAQ,CAAC,OAAO,CAAC,IAAI,OAAO,IAAI,CAAC,EAAE,CAAC;QAC7C,OAAO,OAAO,GAAG,IAAI,CAAC;IACxB,CAAC;IACD,MAAM,IAAI,GAAG,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;IAC7B,IAAI,MAAM,CAAC,QAAQ,CAAC,IAAI,CAAC,EAAE,CAAC;QAC1B,OAAO,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,IAAI,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC,CAAC;IACxC,CAAC;IACD,OAAO,SAAS,CAAC;AACnB,CAAC;AAED,SAAS,qBAAqB,CAAC,MAAc;IAC3C,OAAO,MAAM,KAAK,GAAG,IAAI,MAAM,KAAK,GAAG,IAAI,MAAM,KAAK,GAAG,IAAI,MAAM,KAAK,GAAG,CAAC;AAC9E,CAAC;AAED,SAAS,cAAc,CAAC,OAAe,EAAE,MAAc,EAAE,YAAqB;IAC5E,IAAI,YAAY,KAAK,SAAS,EAAE,CAAC;QAC/B,OAAO,YAAY,CAAC;IACtB,CAAC;IACD,MAAM,GAAG,GAAG,IAAI,CAAC,GAAG,CAAC,MAAM,GAAG,CAAC,IAAI,OAAO,EAAE,MAAM,CAAC,CAAC;IACpD,OAAO,GAAG,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,MAAM,EAAE,GAAG,GAAG,CAAC,CAAC;AAC/C,CAAC;AAED,SAAS,KAAK,CAAC,EAAU;IACvB,OAAO,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,EAAE;QAC7B,UAAU,CAAC,OAAO,EAAE,EAAE,CAAC,CAAC;IAC1B,CAAC,CAAC,CAAC;AACL,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,iBAAiB,CAAC,MAKvC;IACC,MAAM,SAAS,GAAG,EAAE,GAAG,kCAAkC,EAAE,EAAE,GAAG,MAAM,CAAC,KAAK,EAAE,CAAC;IAC/E,MAAM,QAAQ,GAAG,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;IAC7C,MAAM,WAAW,GAAG,uBAAuB,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;IACzD,IAAI,iBAAiB,GAAG,EAAE,CAAC;IAE3B,KAAK,IAAI,OAAO,GAAG,CAAC,EAAE,OAAO,IAAI,SAAS,CAAC,UAAU,EAAE,OAAO,EAAE,EAAE,CAAC;QACjE,IAAI,GAAa,CAAC;QAClB,IAAI,CAAC;YACH,GAAG,GAAG,MAAM,MAAM,CAAC,SAAS,CAAC,MAAM,CAAC,GAAG,EAAE;gBACvC,MAAM,EAAE,MAAM;gBACd,OAAO,EAAE;oBACP,MAAM,EAAE,kBAAkB;oBAC1B,cAAc,EAAE,kBAAkB;iBACnC;gBACD,IAAI,EAAE,QAAQ;aACf,CAAC,CAAC;QACL,CAAC;QAAC,OAAO,CAAC,EAAE,CAAC;YACX,iBAAiB,GAAG,gBAAgB,CAAC,CAAC,CAAC,CAAC;YACxC,IAAI,OAAO,IAAI,SAAS,CAAC,UAAU,EAAE,CAAC;gBACpC,MAAM,IAAI,mBAAmB,CAC3B,0BAA0B,CAAC;oBACzB,MAAM,EAAE,MAAM;oBACd,GAAG,EAAE,MAAM,CAAC,GAAG;oBACf,MAAM,EAAE,CAAC;oBACT,QAAQ,EAAE,iBAAiB;oBAC3B,WAAW;oBACX,gBAAgB,EAAE,OAAO;iBAC1B,CAAC,EACF,CAAC,EACD,iBAAiB,EACjB,WAAW,CACZ,CAAC;YACJ,CAAC;YACD,MAAM,KAAK,CAAC,cAAc,CAAC,OAAO,EAAE,SAAS,CAAC,gBAAgB,CAAC,CAAC,CAAC;YACjE,SAAS;QACX,CAAC;QAED,MAAM,IAAI,GAAG,MAAM,GAAG,CAAC,IAAI,EAAE,CAAC;QAC9B,IAAI,GAAG,CAAC,EAAE,IAAI,CAAC,qBAAqB,CAAC,GAAG,CAAC,MAAM,CAAC,IAAI,OAAO,IAAI,SAAS,CAAC,UAAU,EAAE,CAAC;YACpF,OAAO;gBACL,MAAM,EAAE,GAAG,CAAC,MAAM;gBAClB,UAAU,EAAE,GAAG,CAAC,UAAU;gBAC1B,IAAI;gBACJ,OAAO,EAAE,GAAG,CAAC,OAAO;gBACpB,YAAY,EAAE,OAAO,GAAG,CAAC;aAC1B,CAAC;QACJ,CAAC;QAED,MAAM,KAAK,CACT,cAAc,CAAC,OAAO,EAAE,SAAS,CAAC,gBAAgB,EAAE,iBAAiB,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC,CACpF,CAAC;IACJ,CAAC;IAED,MAAM,IAAI,mBAAmB,CAC3B,0BAA0B,CAAC;QACzB,MAAM,EAAE,MAAM;QACd,GAAG,EAAE,MAAM,CAAC,GAAG;QACf,MAAM,EAAE,CAAC;QACT,QAAQ,EAAE,iBAAiB,IAAI,sBAAsB;QACrD,WAAW;QACX,gBAAgB,EAAE,SAAS,CAAC,UAAU;KACvC,CAAC,EACF,CAAC,EACD,iBAAiB,EACjB,WAAW,CACZ,CAAC;AACJ,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"watchOrders.d.ts","sourceRoot":"","sources":["../../../src/core/hyperliquid/watchOrders.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,aAAa,CAAC;AACzD,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,YAAY,CAAC;AAE5C,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,cAAc,CAAC;
|
|
1
|
+
{"version":3,"file":"watchOrders.d.ts","sourceRoot":"","sources":["../../../src/core/hyperliquid/watchOrders.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,aAAa,CAAC;AACzD,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,YAAY,CAAC;AAE5C,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,cAAc,CAAC;AAGxD,yDAAyD;AAEzD,wBAAgB,kBAAkB,CAChC,IAAI,EAAE,SAAS,EACf,IAAI,EAAE,SAAS,GACd;IAAE,KAAK,EAAE,MAAM,EAAE,CAAC;IAAC,OAAO,EAAE,MAAM,EAAE,CAAA;CAAE,CAkBxC;AAmBD,wBAAsB,uBAAuB,CAC3C,MAAM,EAAE,qBAAqB,EAC7B,IAAI,EAAE,mBAAmB,GACxB,OAAO,CAAC,SAAS,CAAC,CAEpB"}
|
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
import { loadAllOpenOrdersRawForUser } from "../state/openOrdersAgg.js";
|
|
1
2
|
/** Compare open order oid sets between two snapshots. */
|
|
2
3
|
export function diffOrderSnapshots(prev, next) {
|
|
3
4
|
const a = extractTopLevelOids(prev);
|
|
@@ -33,6 +34,6 @@ function extractTopLevelOids(snapshot) {
|
|
|
33
34
|
return set;
|
|
34
35
|
}
|
|
35
36
|
export async function fetchOpenOrdersSnapshot(client, user) {
|
|
36
|
-
return client
|
|
37
|
+
return loadAllOpenOrdersRawForUser(client, user.userAddress);
|
|
37
38
|
}
|
|
38
39
|
//# sourceMappingURL=watchOrders.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"watchOrders.js","sourceRoot":"","sources":["../../../src/core/hyperliquid/watchOrders.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"watchOrders.js","sourceRoot":"","sources":["../../../src/core/hyperliquid/watchOrders.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,2BAA2B,EAAE,MAAM,2BAA2B,CAAC;AAExE,yDAAyD;AAEzD,MAAM,UAAU,kBAAkB,CAChC,IAAe,EACf,IAAe;IAEf,MAAM,CAAC,GAAG,mBAAmB,CAAC,IAAI,CAAC,CAAC;IACpC,MAAM,CAAC,GAAG,mBAAmB,CAAC,IAAI,CAAC,CAAC;IAEpC,MAAM,KAAK,GAAa,EAAE,CAAC;IAC3B,MAAM,OAAO,GAAa,EAAE,CAAC;IAE7B,KAAK,MAAM,CAAC,IAAI,CAAC,EAAE,CAAC;QAClB,IAAI,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC;YACd,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;QAChB,CAAC;IACH,CAAC;IACD,KAAK,MAAM,CAAC,IAAI,CAAC,EAAE,CAAC;QAClB,IAAI,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC;YACd,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;QAClB,CAAC;IACH,CAAC;IACD,OAAO,EAAE,KAAK,EAAE,OAAO,EAAE,CAAC;AAC5B,CAAC;AAED,SAAS,mBAAmB,CAAC,QAAmB;IAC9C,MAAM,GAAG,GAAG,IAAI,GAAG,EAAU,CAAC;IAC9B,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,QAAQ,CAAC,EAAE,CAAC;QAC7B,OAAO,GAAG,CAAC;IACb,CAAC;IACD,KAAK,MAAM,IAAI,IAAI,QAAQ,EAAE,CAAC;QAC5B,IAAI,OAAO,IAAI,KAAK,QAAQ,IAAI,IAAI,KAAK,IAAI,EAAE,CAAC;YAC9C,SAAS;QACX,CAAC;QACD,MAAM,GAAG,GAAI,IAAgC,CAAC,GAAG,CAAC;QAClD,IAAI,OAAO,GAAG,KAAK,QAAQ,IAAI,MAAM,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE,CAAC;YACpD,GAAG,CAAC,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC;QACvB,CAAC;IACH,CAAC;IACD,OAAO,GAAG,CAAC;AACb,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,uBAAuB,CAC3C,MAA6B,EAC7B,IAAyB;IAEzB,OAAO,2BAA2B,CAAC,MAAM,EAAE,IAAI,CAAC,WAAW,CAAC,CAAC;AAC/D,CAAC"}
|
|
@@ -37,7 +37,7 @@ export function garbageCollectTradeState(params) {
|
|
|
37
37
|
const nextEvents = params.state.events.filter((e) => !removed.has(e.intentId));
|
|
38
38
|
return {
|
|
39
39
|
next: {
|
|
40
|
-
|
|
40
|
+
...params.state,
|
|
41
41
|
updatedAtMs: params.nowMs,
|
|
42
42
|
intents: nextIntents,
|
|
43
43
|
events: nextEvents,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"gcTradeState.js","sourceRoot":"","sources":["../../../src/core/state/gcTradeState.ts"],"names":[],"mappings":"AAGA,4FAA4F;AAC5F,MAAM,UAAU,cAAc,CAAC,MAAoB,EAAE,UAAuB;IAC1E,IAAI,MAAM,CAAC,IAAI,KAAK,SAAS,EAAE,CAAC;QAC9B,MAAM,CAAC,GAAG,MAAM,CAAC,KAAK,CAAC;QACvB,OAAO,CAAC,KAAK,QAAQ,IAAI,CAAC,KAAK,WAAW,IAAI,CAAC,KAAK,SAAS,IAAI,CAAC,KAAK,OAAO,CAAC;IACjF,CAAC;IACD,IAAI,MAAM,CAAC,IAAI,KAAK,MAAM,EAAE,CAAC;QAC3B,OAAO,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,QAAQ,KAAK,QAAQ,IAAI,CAAC,CAAC,QAAQ,KAAK,WAAW,CAAC,CAAC;IACzF,CAAC;IACD,IAAI,MAAM,CAAC,IAAI,KAAK,cAAc,EAAE,CAAC;QACnC,IAAI,MAAM,CAAC,GAAG,KAAK,SAAS,EAAE,CAAC;YAC7B,OAAO,IAAI,CAAC;QACd,CAAC;QACD,OAAO,CAAC,UAAU,CAAC,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;IACrC,CAAC;IACD,IAAI,MAAM,CAAC,IAAI,KAAK,iBAAiB,EAAE,CAAC;QACtC,IAAI,MAAM,CAAC,GAAG,KAAK,SAAS,EAAE,CAAC;YAC7B,OAAO,IAAI,CAAC;QACd,CAAC;QACD,OAAO,CAAC,UAAU,CAAC,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;IACrC,CAAC;IACD,OAAO,KAAK,CAAC;AACf,CAAC;AAED,MAAM,UAAU,wBAAwB,CAAC,MAIxC;IACC,MAAM,UAAU,GAAG,IAAI,GAAG,CAAC,MAAM,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC;IAChE,MAAM,gBAAgB,GAAa,EAAE,CAAC;IACtC,MAAM,WAAW,GAAiC,EAAE,CAAC;IAErD,KAAK,MAAM,CAAC,EAAE,EAAE,MAAM,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,OAAO,CAAC,EAAE,CAAC;QAChE,IAAI,CAAC,cAAc,CAAC,MAAM,EAAE,UAAU,CAAC,EAAE,CAAC;YACxC,WAAW,CAAC,EAAE,CAAC,GAAG,MAAM,CAAC;QAC3B,CAAC;aAAM,CAAC;YACN,gBAAgB,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;QAC5B,CAAC;IACH,CAAC;IAED,MAAM,OAAO,GAAG,IAAI,GAAG,CAAC,gBAAgB,CAAC,CAAC;IAC1C,MAAM,UAAU,GAAG,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC;IAE/E,OAAO;QACL,IAAI,EAAE;YACJ,
|
|
1
|
+
{"version":3,"file":"gcTradeState.js","sourceRoot":"","sources":["../../../src/core/state/gcTradeState.ts"],"names":[],"mappings":"AAGA,4FAA4F;AAC5F,MAAM,UAAU,cAAc,CAAC,MAAoB,EAAE,UAAuB;IAC1E,IAAI,MAAM,CAAC,IAAI,KAAK,SAAS,EAAE,CAAC;QAC9B,MAAM,CAAC,GAAG,MAAM,CAAC,KAAK,CAAC;QACvB,OAAO,CAAC,KAAK,QAAQ,IAAI,CAAC,KAAK,WAAW,IAAI,CAAC,KAAK,SAAS,IAAI,CAAC,KAAK,OAAO,CAAC;IACjF,CAAC;IACD,IAAI,MAAM,CAAC,IAAI,KAAK,MAAM,EAAE,CAAC;QAC3B,OAAO,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,QAAQ,KAAK,QAAQ,IAAI,CAAC,CAAC,QAAQ,KAAK,WAAW,CAAC,CAAC;IACzF,CAAC;IACD,IAAI,MAAM,CAAC,IAAI,KAAK,cAAc,EAAE,CAAC;QACnC,IAAI,MAAM,CAAC,GAAG,KAAK,SAAS,EAAE,CAAC;YAC7B,OAAO,IAAI,CAAC;QACd,CAAC;QACD,OAAO,CAAC,UAAU,CAAC,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;IACrC,CAAC;IACD,IAAI,MAAM,CAAC,IAAI,KAAK,iBAAiB,EAAE,CAAC;QACtC,IAAI,MAAM,CAAC,GAAG,KAAK,SAAS,EAAE,CAAC;YAC7B,OAAO,IAAI,CAAC;QACd,CAAC;QACD,OAAO,CAAC,UAAU,CAAC,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;IACrC,CAAC;IACD,OAAO,KAAK,CAAC;AACf,CAAC;AAED,MAAM,UAAU,wBAAwB,CAAC,MAIxC;IACC,MAAM,UAAU,GAAG,IAAI,GAAG,CAAC,MAAM,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC;IAChE,MAAM,gBAAgB,GAAa,EAAE,CAAC;IACtC,MAAM,WAAW,GAAiC,EAAE,CAAC;IAErD,KAAK,MAAM,CAAC,EAAE,EAAE,MAAM,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,OAAO,CAAC,EAAE,CAAC;QAChE,IAAI,CAAC,cAAc,CAAC,MAAM,EAAE,UAAU,CAAC,EAAE,CAAC;YACxC,WAAW,CAAC,EAAE,CAAC,GAAG,MAAM,CAAC;QAC3B,CAAC;aAAM,CAAC;YACN,gBAAgB,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;QAC5B,CAAC;IACH,CAAC;IAED,MAAM,OAAO,GAAG,IAAI,GAAG,CAAC,gBAAgB,CAAC,CAAC;IAC1C,MAAM,UAAU,GAAG,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC;IAE/E,OAAO;QACL,IAAI,EAAE;YACJ,GAAG,MAAM,CAAC,KAAK;YACf,WAAW,EAAE,MAAM,CAAC,KAAK;YACzB,OAAO,EAAE,WAAW;YACpB,MAAM,EAAE,UAAU;SACnB;QACD,gBAAgB;KACjB,CAAC;AACJ,CAAC"}
|
|
@@ -0,0 +1,13 @@
|
|
|
1
|
+
import type { HyperliquidInfoClient } from "../hyperliquid/client.js";
|
|
2
|
+
import type { JsonValue } from "../hyperliquid/types.js";
|
|
3
|
+
import { type NormalizedOpenOrder } from "./snapshot.js";
|
|
4
|
+
/** Builder dex `name` values from `POST { type: "perpDexs" }` (skips null index-0 native slot). */
|
|
5
|
+
export declare function perpDexNamesFromInfoList(perpDexs: JsonValue): string[];
|
|
6
|
+
/**
|
|
7
|
+
* `openOrders(user)` without `dex` only returns the default perp dex book. Builder/HIP-3 books
|
|
8
|
+
* need `openOrders(user, dexName)` per `perpDexs` entry — otherwise state cancel-open / reconcile
|
|
9
|
+
* miss those oids.
|
|
10
|
+
*/
|
|
11
|
+
export declare function loadAllOpenOrdersRawForUser(info: HyperliquidInfoClient, user: `0x${string}`): Promise<JsonValue>;
|
|
12
|
+
export declare function loadAllNormalizedOpenOrdersForUser(info: HyperliquidInfoClient, user: `0x${string}`): Promise<NormalizedOpenOrder[]>;
|
|
13
|
+
//# sourceMappingURL=openOrdersAgg.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"openOrdersAgg.d.ts","sourceRoot":"","sources":["../../../src/core/state/openOrdersAgg.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,0BAA0B,CAAC;AACtE,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,yBAAyB,CAAC;AAEzD,OAAO,EAAuB,KAAK,mBAAmB,EAAE,MAAM,eAAe,CAAC;AAiB9E,mGAAmG;AACnG,wBAAgB,wBAAwB,CAAC,QAAQ,EAAE,SAAS,GAAG,MAAM,EAAE,CAetE;AAED;;;;GAIG;AACH,wBAAsB,2BAA2B,CAC/C,IAAI,EAAE,qBAAqB,EAC3B,IAAI,EAAE,KAAK,MAAM,EAAE,GAClB,OAAO,CAAC,SAAS,CAAC,CAQpB;AAED,wBAAsB,kCAAkC,CACtD,IAAI,EAAE,qBAAqB,EAC3B,IAAI,EAAE,KAAK,MAAM,EAAE,GAClB,OAAO,CAAC,mBAAmB,EAAE,CAAC,CAEhC"}
|
|
@@ -0,0 +1,50 @@
|
|
|
1
|
+
import { normalizeOpenOrders } from "./snapshot.js";
|
|
2
|
+
function addOpenOrdersRawInto(byOid, raw) {
|
|
3
|
+
if (!Array.isArray(raw)) {
|
|
4
|
+
return;
|
|
5
|
+
}
|
|
6
|
+
for (const item of raw) {
|
|
7
|
+
if (typeof item !== "object" || item === null) {
|
|
8
|
+
continue;
|
|
9
|
+
}
|
|
10
|
+
const oid = item.oid;
|
|
11
|
+
if (typeof oid === "number" && Number.isFinite(oid) && !byOid.has(oid)) {
|
|
12
|
+
byOid.set(oid, item);
|
|
13
|
+
}
|
|
14
|
+
}
|
|
15
|
+
}
|
|
16
|
+
/** Builder dex `name` values from `POST { type: "perpDexs" }` (skips null index-0 native slot). */
|
|
17
|
+
export function perpDexNamesFromInfoList(perpDexs) {
|
|
18
|
+
if (!Array.isArray(perpDexs)) {
|
|
19
|
+
return [];
|
|
20
|
+
}
|
|
21
|
+
const names = [];
|
|
22
|
+
for (const row of perpDexs) {
|
|
23
|
+
if (row === null || typeof row !== "object") {
|
|
24
|
+
continue;
|
|
25
|
+
}
|
|
26
|
+
const name = row.name;
|
|
27
|
+
if (typeof name === "string" && name.trim()) {
|
|
28
|
+
names.push(name.trim());
|
|
29
|
+
}
|
|
30
|
+
}
|
|
31
|
+
return names;
|
|
32
|
+
}
|
|
33
|
+
/**
|
|
34
|
+
* `openOrders(user)` without `dex` only returns the default perp dex book. Builder/HIP-3 books
|
|
35
|
+
* need `openOrders(user, dexName)` per `perpDexs` entry — otherwise state cancel-open / reconcile
|
|
36
|
+
* miss those oids.
|
|
37
|
+
*/
|
|
38
|
+
export async function loadAllOpenOrdersRawForUser(info, user) {
|
|
39
|
+
const byOid = new Map();
|
|
40
|
+
addOpenOrdersRawInto(byOid, await info.openOrders(user));
|
|
41
|
+
const dexNames = perpDexNamesFromInfoList(await info.perpDexs());
|
|
42
|
+
for (const dex of dexNames) {
|
|
43
|
+
addOpenOrdersRawInto(byOid, await info.openOrders(user, dex));
|
|
44
|
+
}
|
|
45
|
+
return [...byOid.values()];
|
|
46
|
+
}
|
|
47
|
+
export async function loadAllNormalizedOpenOrdersForUser(info, user) {
|
|
48
|
+
return normalizeOpenOrders(await loadAllOpenOrdersRawForUser(info, user));
|
|
49
|
+
}
|
|
50
|
+
//# sourceMappingURL=openOrdersAgg.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"openOrdersAgg.js","sourceRoot":"","sources":["../../../src/core/state/openOrdersAgg.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,mBAAmB,EAA4B,MAAM,eAAe,CAAC;AAE9E,SAAS,oBAAoB,CAAC,KAA2B,EAAE,GAAc;IACvE,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,GAAG,CAAC,EAAE,CAAC;QACxB,OAAO;IACT,CAAC;IACD,KAAK,MAAM,IAAI,IAAI,GAAG,EAAE,CAAC;QACvB,IAAI,OAAO,IAAI,KAAK,QAAQ,IAAI,IAAI,KAAK,IAAI,EAAE,CAAC;YAC9C,SAAS;QACX,CAAC;QACD,MAAM,GAAG,GAAI,IAAgC,CAAC,GAAG,CAAC;QAClD,IAAI,OAAO,GAAG,KAAK,QAAQ,IAAI,MAAM,CAAC,QAAQ,CAAC,GAAG,CAAC,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE,CAAC;YACvE,KAAK,CAAC,GAAG,CAAC,GAAG,EAAE,IAAI,CAAC,CAAC;QACvB,CAAC;IACH,CAAC;AACH,CAAC;AAED,mGAAmG;AACnG,MAAM,UAAU,wBAAwB,CAAC,QAAmB;IAC1D,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,QAAQ,CAAC,EAAE,CAAC;QAC7B,OAAO,EAAE,CAAC;IACZ,CAAC;IACD,MAAM,KAAK,GAAa,EAAE,CAAC;IAC3B,KAAK,MAAM,GAAG,IAAI,QAAQ,EAAE,CAAC;QAC3B,IAAI,GAAG,KAAK,IAAI,IAAI,OAAO,GAAG,KAAK,QAAQ,EAAE,CAAC;YAC5C,SAAS;QACX,CAAC;QACD,MAAM,IAAI,GAAI,GAA+B,CAAC,IAAI,CAAC;QACnD,IAAI,OAAO,IAAI,KAAK,QAAQ,IAAI,IAAI,CAAC,IAAI,EAAE,EAAE,CAAC;YAC5C,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,EAAE,CAAC,CAAC;QAC1B,CAAC;IACH,CAAC;IACD,OAAO,KAAK,CAAC;AACf,CAAC;AAED;;;;GAIG;AACH,MAAM,CAAC,KAAK,UAAU,2BAA2B,CAC/C,IAA2B,EAC3B,IAAmB;IAEnB,MAAM,KAAK,GAAG,IAAI,GAAG,EAAmB,CAAC;IACzC,oBAAoB,CAAC,KAAK,EAAE,MAAM,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC,CAAC;IACzD,MAAM,QAAQ,GAAG,wBAAwB,CAAC,MAAM,IAAI,CAAC,QAAQ,EAAE,CAAC,CAAC;IACjE,KAAK,MAAM,GAAG,IAAI,QAAQ,EAAE,CAAC;QAC3B,oBAAoB,CAAC,KAAK,EAAE,MAAM,IAAI,CAAC,UAAU,CAAC,IAAI,EAAE,GAAG,CAAC,CAAC,CAAC;IAChE,CAAC;IACD,OAAO,CAAC,GAAG,KAAK,CAAC,MAAM,EAAE,CAAc,CAAC;AAC1C,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,kCAAkC,CACtD,IAA2B,EAC3B,IAAmB;IAEnB,OAAO,mBAAmB,CAAC,MAAM,2BAA2B,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC,CAAC;AAC5E,CAAC"}
|
|
@@ -0,0 +1,6 @@
|
|
|
1
|
+
import type { TradeStateFile, UserProfile } from "./schema.js";
|
|
2
|
+
/** Merge stored profile with Zod defaults (for prompts and guards). */
|
|
3
|
+
export declare function mergeUserProfileDefaults(profile: UserProfile | undefined): UserProfile;
|
|
4
|
+
export declare function upsertUserProfileFields(filePath: string, patch: Partial<UserProfile>, nowMs: number): Promise<TradeStateFile>;
|
|
5
|
+
export declare function clearUserProfile(filePath: string, nowMs: number): Promise<TradeStateFile>;
|
|
6
|
+
//# sourceMappingURL=profileStore.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"profileStore.d.ts","sourceRoot":"","sources":["../../../src/core/state/profileStore.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAE,WAAW,EAAE,MAAM,aAAa,CAAC;AAI/D,uEAAuE;AACvE,wBAAgB,wBAAwB,CAAC,OAAO,EAAE,WAAW,GAAG,SAAS,GAAG,WAAW,CAEtF;AAED,wBAAsB,uBAAuB,CAC3C,QAAQ,EAAE,MAAM,EAChB,KAAK,EAAE,OAAO,CAAC,WAAW,CAAC,EAC3B,KAAK,EAAE,MAAM,GACZ,OAAO,CAAC,cAAc,CAAC,CAWzB;AAED,wBAAsB,gBAAgB,CAAC,QAAQ,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC,cAAc,CAAC,CAU/F"}
|
|
@@ -0,0 +1,30 @@
|
|
|
1
|
+
import { UserProfileSchema } from "./schema.js";
|
|
2
|
+
import { readOrCreateTradeStateFile, writeTradeStateFileAtomic } from "./store.js";
|
|
3
|
+
/** Merge stored profile with Zod defaults (for prompts and guards). */
|
|
4
|
+
export function mergeUserProfileDefaults(profile) {
|
|
5
|
+
return UserProfileSchema.parse(profile ?? {});
|
|
6
|
+
}
|
|
7
|
+
export async function upsertUserProfileFields(filePath, patch, nowMs) {
|
|
8
|
+
const cur = await readOrCreateTradeStateFile(filePath, nowMs);
|
|
9
|
+
const prev = mergeUserProfileDefaults(cur.userProfile);
|
|
10
|
+
const merged = UserProfileSchema.parse({ ...prev, ...patch, updatedAtMs: nowMs });
|
|
11
|
+
const next = {
|
|
12
|
+
...cur,
|
|
13
|
+
updatedAtMs: nowMs,
|
|
14
|
+
userProfile: merged,
|
|
15
|
+
};
|
|
16
|
+
await writeTradeStateFileAtomic(filePath, next);
|
|
17
|
+
return next;
|
|
18
|
+
}
|
|
19
|
+
export async function clearUserProfile(filePath, nowMs) {
|
|
20
|
+
const cur = await readOrCreateTradeStateFile(filePath, nowMs);
|
|
21
|
+
const next = {
|
|
22
|
+
version: cur.version,
|
|
23
|
+
updatedAtMs: nowMs,
|
|
24
|
+
intents: cur.intents,
|
|
25
|
+
events: cur.events,
|
|
26
|
+
};
|
|
27
|
+
await writeTradeStateFileAtomic(filePath, next);
|
|
28
|
+
return next;
|
|
29
|
+
}
|
|
30
|
+
//# sourceMappingURL=profileStore.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"profileStore.js","sourceRoot":"","sources":["../../../src/core/state/profileStore.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,iBAAiB,EAAE,MAAM,aAAa,CAAC;AAChD,OAAO,EAAE,0BAA0B,EAAE,yBAAyB,EAAE,MAAM,YAAY,CAAC;AAEnF,uEAAuE;AACvE,MAAM,UAAU,wBAAwB,CAAC,OAAgC;IACvE,OAAO,iBAAiB,CAAC,KAAK,CAAC,OAAO,IAAI,EAAE,CAAC,CAAC;AAChD,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,uBAAuB,CAC3C,QAAgB,EAChB,KAA2B,EAC3B,KAAa;IAEb,MAAM,GAAG,GAAG,MAAM,0BAA0B,CAAC,QAAQ,EAAE,KAAK,CAAC,CAAC;IAC9D,MAAM,IAAI,GAAG,wBAAwB,CAAC,GAAG,CAAC,WAAW,CAAC,CAAC;IACvD,MAAM,MAAM,GAAG,iBAAiB,CAAC,KAAK,CAAC,EAAE,GAAG,IAAI,EAAE,GAAG,KAAK,EAAE,WAAW,EAAE,KAAK,EAAE,CAAC,CAAC;IAClF,MAAM,IAAI,GAAmB;QAC3B,GAAG,GAAG;QACN,WAAW,EAAE,KAAK;QAClB,WAAW,EAAE,MAAM;KACpB,CAAC;IACF,MAAM,yBAAyB,CAAC,QAAQ,EAAE,IAAI,CAAC,CAAC;IAChD,OAAO,IAAI,CAAC;AACd,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,gBAAgB,CAAC,QAAgB,EAAE,KAAa;IACpE,MAAM,GAAG,GAAG,MAAM,0BAA0B,CAAC,QAAQ,EAAE,KAAK,CAAC,CAAC;IAC9D,MAAM,IAAI,GAAmB;QAC3B,OAAO,EAAE,GAAG,CAAC,OAAO;QACpB,WAAW,EAAE,KAAK;QAClB,OAAO,EAAE,GAAG,CAAC,OAAO;QACpB,MAAM,EAAE,GAAG,CAAC,MAAM;KACnB,CAAC;IACF,MAAM,yBAAyB,CAAC,QAAQ,EAAE,IAAI,CAAC,CAAC;IAChD,OAAO,IAAI,CAAC;AACd,CAAC"}
|
|
@@ -8,7 +8,7 @@ import { buildSignedExchangePayload } from "../hyperliquid/signed-exchange.js";
|
|
|
8
8
|
import { requireTraderWallet } from "../trading.js";
|
|
9
9
|
import { planStateCancelOpen } from "./cancelOpenPlan.js";
|
|
10
10
|
import { garbageCollectTradeState } from "./gcTradeState.js";
|
|
11
|
-
import {
|
|
11
|
+
import { loadAllNormalizedOpenOrdersForUser } from "./openOrdersAgg.js";
|
|
12
12
|
import { readOrCreateTradeStateFile, writeTradeStateFileAtomic } from "./store.js";
|
|
13
13
|
function isMainnet(cfg) {
|
|
14
14
|
return cfg.network === "mainnet";
|
|
@@ -29,7 +29,7 @@ export async function runStateCancelOpen(opts) {
|
|
|
29
29
|
const prior = await readOrCreateTradeStateFile(opts.statePath, nowMs);
|
|
30
30
|
const user = requireUserContext(opts.cfg);
|
|
31
31
|
const info = new HyperliquidInfoClient({ infoOrigin: user.infoOrigin });
|
|
32
|
-
let openNorm =
|
|
32
|
+
let openNorm = await loadAllNormalizedOpenOrdersForUser(info, user.userAddress);
|
|
33
33
|
const plan = planStateCancelOpen({
|
|
34
34
|
state: prior,
|
|
35
35
|
openOrders: openNorm,
|
|
@@ -87,7 +87,7 @@ export async function runStateCancelOpen(opts) {
|
|
|
87
87
|
response: resp,
|
|
88
88
|
});
|
|
89
89
|
}
|
|
90
|
-
openNorm =
|
|
90
|
+
openNorm = await loadAllNormalizedOpenOrdersForUser(info, user.userAddress);
|
|
91
91
|
}
|
|
92
92
|
const gc = garbageCollectTradeState({ state: prior, openOrders: openNorm, nowMs });
|
|
93
93
|
await writeTradeStateFileAtomic(opts.statePath, gc.next);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"runCancelOpen.js","sourceRoot":"","sources":["../../../src/core/state/runCancelOpen.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,kBAAkB,EAAE,MAAM,cAAc,CAAC;AAClD,OAAO,EAAE,WAAW,EAAE,MAAM,cAAc,CAAC;AAC3C,OAAO,EAAE,yBAAyB,EAAE,MAAM,yBAAyB,CAAC;AACpE,OAAO,EAAE,qBAAqB,EAAE,MAAM,0BAA0B,CAAC;AACjE,OAAO,EAAE,yBAAyB,EAAE,MAAM,4BAA4B,CAAC;AACvE,OAAO,EAAE,uBAAuB,EAAE,MAAM,0BAA0B,CAAC;AACnE,OAAO,EAAE,0BAA0B,EAAE,MAAM,mCAAmC,CAAC;AAE/E,OAAO,EAAE,mBAAmB,EAAE,MAAM,eAAe,CAAC;AAEpD,OAAO,EAAE,mBAAmB,EAAE,MAAM,qBAAqB,CAAC;AAC1D,OAAO,EAAE,wBAAwB,EAAE,MAAM,mBAAmB,CAAC;AAC7D,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"runCancelOpen.js","sourceRoot":"","sources":["../../../src/core/state/runCancelOpen.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"runReconcile.d.ts","sourceRoot":"","sources":["../../../src/core/state/runReconcile.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,cAAc,CAAC;AAgBpD,OAAO,EAIL,KAAK,aAAa,EACnB,MAAM,uBAAuB,CAAC;
|
|
1
|
+
{"version":3,"file":"runReconcile.d.ts","sourceRoot":"","sources":["../../../src/core/state/runReconcile.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,cAAc,CAAC;AAgBpD,OAAO,EAIL,KAAK,aAAa,EACnB,MAAM,uBAAuB,CAAC;AAS/B,OAAO,KAAK,EAAqC,cAAc,EAAE,MAAM,aAAa,CAAC;AAGrF,OAAO,KAAK,EAAE,eAAe,EAAiB,MAAM,YAAY,CAAC;AAsDjE,MAAM,MAAM,mBAAmB,GAAG;IAChC,SAAS,EAAE,MAAM,CAAC;IAClB,GAAG,EAAE,eAAe,CAAC;IACrB,IAAI,EAAE,aAAa,CAAC;IACpB,SAAS,EAAE,OAAO,CAAC;IACnB,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,WAAW,CAAC,EAAE,CAAC,MAAM,EAAE,MAAM,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;CACjD,CAAC;AAEF,MAAM,MAAM,kBAAkB,GAAG;IAC/B,KAAK,EAAE,cAAc,CAAC;IACtB,eAAe,EAAE,eAAe,EAAE,CAAC;IACnC,OAAO,EAAE,eAAe,EAAE,CAAC;CAC5B,CAAC;AAEF,wBAAsB,iBAAiB,CAAC,IAAI,EAAE,mBAAmB,GAAG,OAAO,CAAC,kBAAkB,CAAC,CA4Q9F"}
|
|
@@ -9,8 +9,9 @@ import { buildSignedExchangePayload } from "../hyperliquid/signed-exchange.js";
|
|
|
9
9
|
import { requireTraderWallet } from "../trading.js";
|
|
10
10
|
import { mergeBracketDedupe, reconcileBracketIntent, } from "./bracketReconcile.js";
|
|
11
11
|
import { garbageCollectTradeState } from "./gcTradeState.js";
|
|
12
|
+
import { loadAllNormalizedOpenOrdersForUser } from "./openOrdersAgg.js";
|
|
12
13
|
import { applyGridCounterOrderSuccess, mergeGridReplenishDedupe, parseUserFills, reconcileGridIntent, } from "./gridReconcile.js";
|
|
13
|
-
import {
|
|
14
|
+
import { signedPositionSizeForCoin } from "./snapshot.js";
|
|
14
15
|
import { readOrCreateTradeStateFile, writeTradeStateFileAtomic } from "./store.js";
|
|
15
16
|
function isMainnet(cfg) {
|
|
16
17
|
return cfg.network === "mainnet";
|
|
@@ -35,13 +36,21 @@ async function postSigned(cfg, wallet, action) {
|
|
|
35
36
|
const body = await buildSignedExchangePayload(wallet, action, { isMainnet: isMainnet(cfg) });
|
|
36
37
|
return ex.exchange(body);
|
|
37
38
|
}
|
|
39
|
+
/** Persist intent progress without GC (exchange snapshot is refreshed next reconcile). */
|
|
40
|
+
async function persistReconcileCheckpoint(params) {
|
|
41
|
+
await writeTradeStateFileAtomic(params.statePath, {
|
|
42
|
+
...params.prior,
|
|
43
|
+
updatedAtMs: params.nowMs,
|
|
44
|
+
intents: params.nextIntents,
|
|
45
|
+
events: [...params.prior.events, ...params.collected],
|
|
46
|
+
});
|
|
47
|
+
}
|
|
38
48
|
export async function runTradeReconcile(opts) {
|
|
39
49
|
const nowMs = opts.nowMs ?? Date.now();
|
|
40
50
|
const prior = await readOrCreateTradeStateFile(opts.statePath, nowMs);
|
|
41
51
|
const user = requireUserContext(opts.cfg);
|
|
42
52
|
const info = new HyperliquidInfoClient({ infoOrigin: user.infoOrigin });
|
|
43
|
-
|
|
44
|
-
let openNorm = normalizeOpenOrders(rawOpen);
|
|
53
|
+
let openNorm = await loadAllNormalizedOpenOrdersForUser(info, user.userAddress);
|
|
45
54
|
const ch = await info.clearinghouseState(user.userAddress);
|
|
46
55
|
const needsUserFills = Object.values(prior.intents).some((i) => i.kind === "grid");
|
|
47
56
|
let userFillsRaw;
|
|
@@ -112,11 +121,15 @@ export async function runTradeReconcile(opts) {
|
|
|
112
121
|
gridWorking = applyGridCounterOrderSuccess(gridWorking, act.legIndex, placedOid, nowMs);
|
|
113
122
|
gridWorking = mergeGridReplenishDedupe(gridWorking, [act.replenishDedupeKey], "live", nowMs);
|
|
114
123
|
executed.push(act);
|
|
115
|
-
|
|
116
|
-
|
|
117
|
-
|
|
124
|
+
nextIntents[id] = gridWorking;
|
|
125
|
+
await persistReconcileCheckpoint({
|
|
126
|
+
statePath: opts.statePath,
|
|
127
|
+
prior,
|
|
128
|
+
nextIntents,
|
|
129
|
+
collected,
|
|
130
|
+
nowMs,
|
|
131
|
+
});
|
|
118
132
|
}
|
|
119
|
-
nextIntents[id] = gridWorking;
|
|
120
133
|
continue;
|
|
121
134
|
}
|
|
122
135
|
if (intent.kind === "single_limit" || intent.kind === "standalone_tpsl") {
|
|
@@ -169,14 +182,15 @@ export async function runTradeReconcile(opts) {
|
|
|
169
182
|
const resp = await postSigned(opts.cfg, trader.wallet, action);
|
|
170
183
|
const oids = extractOrderOidsFromExchangeResponse(resp);
|
|
171
184
|
const oid = oids[0];
|
|
172
|
-
if (typeof oid
|
|
173
|
-
|
|
174
|
-
...working,
|
|
175
|
-
entryOid: oid,
|
|
176
|
-
phase: "entry_pending",
|
|
177
|
-
updatedAtMs: nowMs,
|
|
178
|
-
};
|
|
185
|
+
if (typeof oid !== "number" || !Number.isFinite(oid)) {
|
|
186
|
+
throw new ConfigError("LIVE bracket: exchange did not return an entry order id.");
|
|
179
187
|
}
|
|
188
|
+
working = {
|
|
189
|
+
...working,
|
|
190
|
+
entryOid: oid,
|
|
191
|
+
phase: "entry_pending",
|
|
192
|
+
updatedAtMs: nowMs,
|
|
193
|
+
};
|
|
180
194
|
executed.push(act);
|
|
181
195
|
working = mergeBracketDedupe(working, ["place_entry"], "live", nowMs);
|
|
182
196
|
}
|
|
@@ -200,6 +214,12 @@ export async function runTradeReconcile(opts) {
|
|
|
200
214
|
const oids = extractOrderOidsFromExchangeResponse(resp);
|
|
201
215
|
const tpOid = oids[0];
|
|
202
216
|
const slOid = oids[1];
|
|
217
|
+
if (typeof tpOid !== "number" ||
|
|
218
|
+
!Number.isFinite(tpOid) ||
|
|
219
|
+
typeof slOid !== "number" ||
|
|
220
|
+
!Number.isFinite(slOid)) {
|
|
221
|
+
throw new ConfigError("LIVE bracket: exchange did not return TP/SL order ids.");
|
|
222
|
+
}
|
|
203
223
|
working = {
|
|
204
224
|
...working,
|
|
205
225
|
tpOid,
|
|
@@ -220,15 +240,20 @@ export async function runTradeReconcile(opts) {
|
|
|
220
240
|
: dedupeKeysForCancelEntry(working);
|
|
221
241
|
working = mergeBracketDedupe(working, keys, "live", nowMs);
|
|
222
242
|
}
|
|
223
|
-
|
|
224
|
-
|
|
225
|
-
|
|
243
|
+
nextIntents[id] = working;
|
|
244
|
+
await persistReconcileCheckpoint({
|
|
245
|
+
statePath: opts.statePath,
|
|
246
|
+
prior,
|
|
247
|
+
nextIntents,
|
|
248
|
+
collected,
|
|
249
|
+
nowMs,
|
|
250
|
+
});
|
|
226
251
|
}
|
|
227
252
|
}
|
|
228
253
|
nextIntents[id] = working;
|
|
229
254
|
}
|
|
230
255
|
const nextState = {
|
|
231
|
-
|
|
256
|
+
...prior,
|
|
232
257
|
updatedAtMs: nowMs,
|
|
233
258
|
intents: nextIntents,
|
|
234
259
|
events: [...prior.events, ...collected],
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"runReconcile.js","sourceRoot":"","sources":["../../../src/core/state/runReconcile.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"runReconcile.js","sourceRoot":"","sources":["../../../src/core/state/runReconcile.ts"],"names":[],"mappings":"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"}
|