jcc_hyper_tool 0.1.1 → 0.1.4
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 +10 -10
- package/dist/cli/index.js +2 -1
- package/dist/cli/index.js.map +1 -1
- 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/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/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 +5 -7
- package/dist/core/state/runReconcile.js.map +1 -1
- package/dist/core/state/schema.d.ts +86 -86
- package/dist/daemon/childArgs.d.ts +11 -0
- package/dist/daemon/childArgs.d.ts.map +1 -0
- package/dist/daemon/childArgs.js +32 -0
- package/dist/daemon/childArgs.js.map +1 -0
- package/dist/daemon/index.js +15 -4
- package/dist/daemon/index.js.map +1 -1
- package/package.json +1 -1
package/README.md
CHANGED
|
@@ -188,7 +188,7 @@ HIP-3 合约名称形如 `deployer:ASSET`(例如 `xyz:CL`)。调用 `/info`
|
|
|
188
188
|
|
|
189
189
|
- **`jcc_hyper_tool order bracket`** — 创建 **bracket** 意图(入场限价 → 仅在对账认为入场已成交后再挂 TP/SL),**须有可写的 state 路径**(默认文件或 **`--state-file`**);**不可用 **`--no-state`**。保护腿默认 **reduce-only**。触发方式与单项 tpsl 类似:**`--is-market`** 或 **`--protection-limit-px`**(互斥)。随后对该意图执行一次 **`state reconcile`**(无 **`--live`** 则为 dry)。完整参数见下文 **Bracket(`order bracket`)\*\* 一节。
|
|
190
190
|
|
|
191
|
-
- **`jcc_hyper_tool watch orders`** —
|
|
191
|
+
- **`jcc_hyper_tool watch orders`** — 轮询合并后的 `openOrders`(默认 perp + 各 builder dex),在 oid 集合或 payload 变化时打印 JSON 行。选项:`--poll-ms`、`--coin`、`--full`。
|
|
192
192
|
|
|
193
193
|
### 策略(Phase 3)
|
|
194
194
|
|
|
@@ -279,7 +279,7 @@ done
|
|
|
279
279
|
|
|
280
280
|
### 3)紧急情况:一键撤掉 state 里仍在簿上的单
|
|
281
281
|
|
|
282
|
-
对已写入默认或指定 **trade-state** 里的 **`single_limit` / `standalone_tpsl` / `bracket` 各腿 oid / `grid` legs**,可用 **`state cancel-open
|
|
282
|
+
对已写入默认或指定 **trade-state** 里的 **`single_limit` / `standalone_tpsl` / `bracket` 各腿 oid / `grid` legs**,可用 **`state cancel-open`**:**先拉取并合并**默认 perp 与各 **`perpDexs`** builder 账簿的 **openOrders**(与 HIP-3 挂单一致),再与 state 中的 oid 求交,只对**仍在挂单列表里**的 oid 发撤单。
|
|
283
283
|
|
|
284
284
|
预览(不 POST **`/exchange` 撤单**;仍会按规则 **GC** 精简本地文件):
|
|
285
285
|
|
|
@@ -324,14 +324,14 @@ jcc_hyper_tool state cancel-open --state-file ./trade-state.json --intent <意
|
|
|
324
324
|
|
|
325
325
|
### `state` 子命令(**`--state-file`** 可省略,与根默认路径一致)
|
|
326
326
|
|
|
327
|
-
| 子命令 | 作用
|
|
328
|
-
| ------------------------------------- |
|
|
329
|
-
| **`state reconcile`** | 读状态 → 拉
|
|
330
|
-
| **`state cancel-open`** | 从 state 收集 oid,与
|
|
331
|
-
| **`state list`** | 以任务可读方式列出全部意图摘要(阶段、下一步提示等)。
|
|
332
|
-
| **`state show <intentId>`** | 单条意图的结构化详情 + 最近相关事件。
|
|
333
|
-
| **`state events <intentId>`** | 该意图的事件流;支持 **`--tail N`**、**`--newest-first`**。
|
|
334
|
-
| **`state request-cancel <intentId>`** | 为 **bracket** 打上「请求撤销入场」标记;后续 **`reconcile`** 在合适阶段尝试撤销仍在簿上的入场单。
|
|
327
|
+
| 子命令 | 作用 |
|
|
328
|
+
| ------------------------------------- | -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
|
|
329
|
+
| **`state reconcile`** | 读状态 → 拉 **合并后的 openOrders**(默认 perp + 各 builder dex)与 **clearinghouseState(仓位)** → 推进 bracket/grid 状态机 → **默认只输出 dry-run 计划**;加 **`--live`** 则在确认后真实下单 / 撤单(需私钥;可用 **`--assume-yes`** 跳过交互)。**`--intent <id>`** 可只处理一条意图。写回前会 **GC** 终态意图。 |
|
|
330
|
+
| **`state cancel-open`** | 从 state 收集 oid,与 **合并后的 openOrders**(默认 perp + 各 builder dex)求交后按 **coin / assetIndex** 批量撤单;默认 **dry** 只出计划;**`--live`** 真实撤单(**`--assume-yes`** 可非交互)。结束后 **GC** 本地 state。 |
|
|
331
|
+
| **`state list`** | 以任务可读方式列出全部意图摘要(阶段、下一步提示等)。 |
|
|
332
|
+
| **`state show <intentId>`** | 单条意图的结构化详情 + 最近相关事件。 |
|
|
333
|
+
| **`state events <intentId>`** | 该意图的事件流;支持 **`--tail N`**、**`--newest-first`**。 |
|
|
334
|
+
| **`state request-cancel <intentId>`** | 为 **bracket** 打上「请求撤销入场」标记;后续 **`reconcile`** 在合适阶段尝试撤销仍在簿上的入场单。 |
|
|
335
335
|
|
|
336
336
|
说明:**dry-run 对账**会为已展示的计划写入 **`plan:*`**,避免连续两次 dry-run 重复打印同一批动作;**`--live`** **不会**因有 **`plan:*`** 而跳过真实下单,成功后会记 **`done:*`** 并清除对应 **`plan:*`**。
|
|
337
337
|
|
package/dist/cli/index.js
CHANGED
|
@@ -4,6 +4,7 @@ import { ConfigError } from "../core/errors.js";
|
|
|
4
4
|
import { VERSION } from "../meta/version.js";
|
|
5
5
|
import { loadEffectiveConfig, printEffectiveConfig, requireUserContext } from "../core/config.js";
|
|
6
6
|
import { HyperliquidInfoClient } from "../core/hyperliquid/client.js";
|
|
7
|
+
import { loadAllOpenOrdersRawForUser } from "../core/state/openOrdersAgg.js";
|
|
7
8
|
import { attachTradingCli } from "./tradingCli.js";
|
|
8
9
|
import { attachStrategyCli } from "./strategyCli.js";
|
|
9
10
|
import { attachStateCli } from "./stateCli.js";
|
|
@@ -151,7 +152,7 @@ async function main() {
|
|
|
151
152
|
const cfg = loadEffectiveConfig({ network: globals.network, apiUrl: globals.apiUrl });
|
|
152
153
|
const user = requireUserContext(cfg);
|
|
153
154
|
const client = new HyperliquidInfoClient({ infoOrigin: user.infoOrigin });
|
|
154
|
-
let out = await client
|
|
155
|
+
let out = await loadAllOpenOrdersRawForUser(client, user.userAddress);
|
|
155
156
|
if (opts.coin) {
|
|
156
157
|
if (!Array.isArray(out)) {
|
|
157
158
|
throw new ConfigError("Unexpected openOrders response shape");
|
package/dist/cli/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/cli/index.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/cli/index.ts"],"names":[],"mappings":"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"}
|
|
@@ -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"}
|
|
@@ -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"}
|
|
@@ -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;AAsCjE,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,CAyP9F"}
|
|
@@ -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";
|
|
@@ -40,8 +41,7 @@ export async function runTradeReconcile(opts) {
|
|
|
40
41
|
const prior = await readOrCreateTradeStateFile(opts.statePath, nowMs);
|
|
41
42
|
const user = requireUserContext(opts.cfg);
|
|
42
43
|
const info = new HyperliquidInfoClient({ infoOrigin: user.infoOrigin });
|
|
43
|
-
|
|
44
|
-
let openNorm = normalizeOpenOrders(rawOpen);
|
|
44
|
+
let openNorm = await loadAllNormalizedOpenOrdersForUser(info, user.userAddress);
|
|
45
45
|
const ch = await info.clearinghouseState(user.userAddress);
|
|
46
46
|
const needsUserFills = Object.values(prior.intents).some((i) => i.kind === "grid");
|
|
47
47
|
let userFillsRaw;
|
|
@@ -112,8 +112,7 @@ export async function runTradeReconcile(opts) {
|
|
|
112
112
|
gridWorking = applyGridCounterOrderSuccess(gridWorking, act.legIndex, placedOid, nowMs);
|
|
113
113
|
gridWorking = mergeGridReplenishDedupe(gridWorking, [act.replenishDedupeKey], "live", nowMs);
|
|
114
114
|
executed.push(act);
|
|
115
|
-
|
|
116
|
-
openNorm = normalizeOpenOrders(rawOpenNext);
|
|
115
|
+
openNorm = await loadAllNormalizedOpenOrdersForUser(info, user.userAddress);
|
|
117
116
|
chSnap = await info.clearinghouseState(user.userAddress);
|
|
118
117
|
}
|
|
119
118
|
nextIntents[id] = gridWorking;
|
|
@@ -220,8 +219,7 @@ export async function runTradeReconcile(opts) {
|
|
|
220
219
|
: dedupeKeysForCancelEntry(working);
|
|
221
220
|
working = mergeBracketDedupe(working, keys, "live", nowMs);
|
|
222
221
|
}
|
|
223
|
-
|
|
224
|
-
openNorm = normalizeOpenOrders(rawOpenNext);
|
|
222
|
+
openNorm = await loadAllNormalizedOpenOrdersForUser(info, user.userAddress);
|
|
225
223
|
chSnap = await info.clearinghouseState(user.userAddress);
|
|
226
224
|
}
|
|
227
225
|
}
|
|
@@ -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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"}
|
|
@@ -48,7 +48,7 @@ declare const BracketIntentSchema: z.ZodObject<{
|
|
|
48
48
|
slTriggerPx: number;
|
|
49
49
|
tpslIsMarket: boolean;
|
|
50
50
|
protectionReduceOnly: boolean;
|
|
51
|
-
phase: "planned" | "entry_pending" | "entry_partial" | "entry_filled" | "protection_active" | "tp_filled" | "sl_filled" | "closed" | "
|
|
51
|
+
phase: "cancelled" | "planned" | "entry_pending" | "entry_partial" | "entry_filled" | "protection_active" | "tp_filled" | "sl_filled" | "closed" | "expired" | "error";
|
|
52
52
|
network?: string | undefined;
|
|
53
53
|
dex?: string | undefined;
|
|
54
54
|
entryReduceOnly?: boolean | undefined;
|
|
@@ -76,7 +76,7 @@ declare const BracketIntentSchema: z.ZodObject<{
|
|
|
76
76
|
tpTriggerPx: number;
|
|
77
77
|
slTriggerPx: number;
|
|
78
78
|
tpslIsMarket: boolean;
|
|
79
|
-
phase: "planned" | "entry_pending" | "entry_partial" | "entry_filled" | "protection_active" | "tp_filled" | "sl_filled" | "closed" | "
|
|
79
|
+
phase: "cancelled" | "planned" | "entry_pending" | "entry_partial" | "entry_filled" | "protection_active" | "tp_filled" | "sl_filled" | "closed" | "expired" | "error";
|
|
80
80
|
network?: string | undefined;
|
|
81
81
|
dex?: string | undefined;
|
|
82
82
|
entryReduceOnly?: boolean | undefined;
|
|
@@ -141,7 +141,7 @@ declare const GridIntentSchema: z.ZodObject<{
|
|
|
141
141
|
index: number;
|
|
142
142
|
px: number;
|
|
143
143
|
isBuy: boolean;
|
|
144
|
-
legPhase: "
|
|
144
|
+
legPhase: "pending" | "open" | "partial" | "filled" | "cancelled";
|
|
145
145
|
oid?: number | undefined;
|
|
146
146
|
lastSz?: number | undefined;
|
|
147
147
|
lastOrigSz?: number | undefined;
|
|
@@ -153,7 +153,7 @@ declare const GridIntentSchema: z.ZodObject<{
|
|
|
153
153
|
index: number;
|
|
154
154
|
px: number;
|
|
155
155
|
isBuy: boolean;
|
|
156
|
-
legPhase: "
|
|
156
|
+
legPhase: "pending" | "open" | "partial" | "filled" | "cancelled";
|
|
157
157
|
oid?: number | undefined;
|
|
158
158
|
lastSz?: number | undefined;
|
|
159
159
|
lastOrigSz?: number | undefined;
|
|
@@ -164,6 +164,7 @@ declare const GridIntentSchema: z.ZodObject<{
|
|
|
164
164
|
}>, "many">;
|
|
165
165
|
}, "strip", z.ZodTypeAny, {
|
|
166
166
|
coin: string;
|
|
167
|
+
reduceOnly: boolean;
|
|
167
168
|
kind: "grid";
|
|
168
169
|
id: string;
|
|
169
170
|
createdAtMs: number;
|
|
@@ -174,12 +175,11 @@ declare const GridIntentSchema: z.ZodObject<{
|
|
|
174
175
|
grids: number;
|
|
175
176
|
orderSz: number;
|
|
176
177
|
bias: "symmetric" | "long" | "short";
|
|
177
|
-
reduceOnly: boolean;
|
|
178
178
|
legs: {
|
|
179
179
|
index: number;
|
|
180
180
|
px: number;
|
|
181
181
|
isBuy: boolean;
|
|
182
|
-
legPhase: "
|
|
182
|
+
legPhase: "pending" | "open" | "partial" | "filled" | "cancelled";
|
|
183
183
|
oid?: number | undefined;
|
|
184
184
|
lastSz?: number | undefined;
|
|
185
185
|
lastOrigSz?: number | undefined;
|
|
@@ -195,6 +195,7 @@ declare const GridIntentSchema: z.ZodObject<{
|
|
|
195
195
|
replenishDedupeKeys?: string[] | undefined;
|
|
196
196
|
}, {
|
|
197
197
|
coin: string;
|
|
198
|
+
reduceOnly: boolean;
|
|
198
199
|
kind: "grid";
|
|
199
200
|
id: string;
|
|
200
201
|
createdAtMs: number;
|
|
@@ -205,12 +206,11 @@ declare const GridIntentSchema: z.ZodObject<{
|
|
|
205
206
|
grids: number;
|
|
206
207
|
orderSz: number;
|
|
207
208
|
bias: "symmetric" | "long" | "short";
|
|
208
|
-
reduceOnly: boolean;
|
|
209
209
|
legs: {
|
|
210
210
|
index: number;
|
|
211
211
|
px: number;
|
|
212
212
|
isBuy: boolean;
|
|
213
|
-
legPhase: "
|
|
213
|
+
legPhase: "pending" | "open" | "partial" | "filled" | "cancelled";
|
|
214
214
|
oid?: number | undefined;
|
|
215
215
|
lastSz?: number | undefined;
|
|
216
216
|
lastOrigSz?: number | undefined;
|
|
@@ -240,28 +240,28 @@ declare const SingleLimitIntentSchema: z.ZodObject<{
|
|
|
240
240
|
oid: z.ZodOptional<z.ZodNumber>;
|
|
241
241
|
}, "strip", z.ZodTypeAny, {
|
|
242
242
|
coin: string;
|
|
243
|
+
sz: number;
|
|
244
|
+
reduceOnly: boolean;
|
|
245
|
+
limitPx: number;
|
|
243
246
|
kind: "single_limit";
|
|
244
247
|
id: string;
|
|
245
248
|
createdAtMs: number;
|
|
246
249
|
updatedAtMs: number;
|
|
247
250
|
entrySide: "buy" | "sell";
|
|
248
251
|
tif: "Gtc" | "Ioc" | "Alo";
|
|
249
|
-
reduceOnly: boolean;
|
|
250
|
-
limitPx: number;
|
|
251
|
-
sz: number;
|
|
252
252
|
dex?: string | undefined;
|
|
253
253
|
oid?: number | undefined;
|
|
254
254
|
}, {
|
|
255
255
|
coin: string;
|
|
256
|
+
sz: number;
|
|
257
|
+
reduceOnly: boolean;
|
|
258
|
+
limitPx: number;
|
|
256
259
|
kind: "single_limit";
|
|
257
260
|
id: string;
|
|
258
261
|
createdAtMs: number;
|
|
259
262
|
updatedAtMs: number;
|
|
260
263
|
entrySide: "buy" | "sell";
|
|
261
264
|
tif: "Gtc" | "Ioc" | "Alo";
|
|
262
|
-
reduceOnly: boolean;
|
|
263
|
-
limitPx: number;
|
|
264
|
-
sz: number;
|
|
265
265
|
dex?: string | undefined;
|
|
266
266
|
oid?: number | undefined;
|
|
267
267
|
}>;
|
|
@@ -282,14 +282,14 @@ declare const StandaloneTpslIntentSchema: z.ZodObject<{
|
|
|
282
282
|
oid: z.ZodOptional<z.ZodNumber>;
|
|
283
283
|
}, "strip", z.ZodTypeAny, {
|
|
284
284
|
coin: string;
|
|
285
|
+
side: "buy" | "sell";
|
|
286
|
+
sz: number;
|
|
287
|
+
reduceOnly: boolean;
|
|
288
|
+
triggerPx: number;
|
|
285
289
|
kind: "standalone_tpsl";
|
|
286
290
|
id: string;
|
|
287
291
|
createdAtMs: number;
|
|
288
292
|
updatedAtMs: number;
|
|
289
|
-
reduceOnly: boolean;
|
|
290
|
-
sz: number;
|
|
291
|
-
side: "buy" | "sell";
|
|
292
|
-
triggerPx: number;
|
|
293
293
|
tpsl: "tp" | "sl";
|
|
294
294
|
isMarket: boolean;
|
|
295
295
|
dex?: string | undefined;
|
|
@@ -297,14 +297,14 @@ declare const StandaloneTpslIntentSchema: z.ZodObject<{
|
|
|
297
297
|
limitPx?: number | undefined;
|
|
298
298
|
}, {
|
|
299
299
|
coin: string;
|
|
300
|
+
side: "buy" | "sell";
|
|
301
|
+
sz: number;
|
|
302
|
+
reduceOnly: boolean;
|
|
303
|
+
triggerPx: number;
|
|
300
304
|
kind: "standalone_tpsl";
|
|
301
305
|
id: string;
|
|
302
306
|
createdAtMs: number;
|
|
303
307
|
updatedAtMs: number;
|
|
304
|
-
reduceOnly: boolean;
|
|
305
|
-
sz: number;
|
|
306
|
-
side: "buy" | "sell";
|
|
307
|
-
triggerPx: number;
|
|
308
308
|
tpsl: "tp" | "sl";
|
|
309
309
|
isMarket: boolean;
|
|
310
310
|
dex?: string | undefined;
|
|
@@ -360,7 +360,7 @@ export declare const IntentRecordSchema: z.ZodDiscriminatedUnion<"kind", [z.ZodO
|
|
|
360
360
|
slTriggerPx: number;
|
|
361
361
|
tpslIsMarket: boolean;
|
|
362
362
|
protectionReduceOnly: boolean;
|
|
363
|
-
phase: "planned" | "entry_pending" | "entry_partial" | "entry_filled" | "protection_active" | "tp_filled" | "sl_filled" | "closed" | "
|
|
363
|
+
phase: "cancelled" | "planned" | "entry_pending" | "entry_partial" | "entry_filled" | "protection_active" | "tp_filled" | "sl_filled" | "closed" | "expired" | "error";
|
|
364
364
|
network?: string | undefined;
|
|
365
365
|
dex?: string | undefined;
|
|
366
366
|
entryReduceOnly?: boolean | undefined;
|
|
@@ -388,7 +388,7 @@ export declare const IntentRecordSchema: z.ZodDiscriminatedUnion<"kind", [z.ZodO
|
|
|
388
388
|
tpTriggerPx: number;
|
|
389
389
|
slTriggerPx: number;
|
|
390
390
|
tpslIsMarket: boolean;
|
|
391
|
-
phase: "planned" | "entry_pending" | "entry_partial" | "entry_filled" | "protection_active" | "tp_filled" | "sl_filled" | "closed" | "
|
|
391
|
+
phase: "cancelled" | "planned" | "entry_pending" | "entry_partial" | "entry_filled" | "protection_active" | "tp_filled" | "sl_filled" | "closed" | "expired" | "error";
|
|
392
392
|
network?: string | undefined;
|
|
393
393
|
dex?: string | undefined;
|
|
394
394
|
entryReduceOnly?: boolean | undefined;
|
|
@@ -452,7 +452,7 @@ export declare const IntentRecordSchema: z.ZodDiscriminatedUnion<"kind", [z.ZodO
|
|
|
452
452
|
index: number;
|
|
453
453
|
px: number;
|
|
454
454
|
isBuy: boolean;
|
|
455
|
-
legPhase: "
|
|
455
|
+
legPhase: "pending" | "open" | "partial" | "filled" | "cancelled";
|
|
456
456
|
oid?: number | undefined;
|
|
457
457
|
lastSz?: number | undefined;
|
|
458
458
|
lastOrigSz?: number | undefined;
|
|
@@ -464,7 +464,7 @@ export declare const IntentRecordSchema: z.ZodDiscriminatedUnion<"kind", [z.ZodO
|
|
|
464
464
|
index: number;
|
|
465
465
|
px: number;
|
|
466
466
|
isBuy: boolean;
|
|
467
|
-
legPhase: "
|
|
467
|
+
legPhase: "pending" | "open" | "partial" | "filled" | "cancelled";
|
|
468
468
|
oid?: number | undefined;
|
|
469
469
|
lastSz?: number | undefined;
|
|
470
470
|
lastOrigSz?: number | undefined;
|
|
@@ -475,6 +475,7 @@ export declare const IntentRecordSchema: z.ZodDiscriminatedUnion<"kind", [z.ZodO
|
|
|
475
475
|
}>, "many">;
|
|
476
476
|
}, "strip", z.ZodTypeAny, {
|
|
477
477
|
coin: string;
|
|
478
|
+
reduceOnly: boolean;
|
|
478
479
|
kind: "grid";
|
|
479
480
|
id: string;
|
|
480
481
|
createdAtMs: number;
|
|
@@ -485,12 +486,11 @@ export declare const IntentRecordSchema: z.ZodDiscriminatedUnion<"kind", [z.ZodO
|
|
|
485
486
|
grids: number;
|
|
486
487
|
orderSz: number;
|
|
487
488
|
bias: "symmetric" | "long" | "short";
|
|
488
|
-
reduceOnly: boolean;
|
|
489
489
|
legs: {
|
|
490
490
|
index: number;
|
|
491
491
|
px: number;
|
|
492
492
|
isBuy: boolean;
|
|
493
|
-
legPhase: "
|
|
493
|
+
legPhase: "pending" | "open" | "partial" | "filled" | "cancelled";
|
|
494
494
|
oid?: number | undefined;
|
|
495
495
|
lastSz?: number | undefined;
|
|
496
496
|
lastOrigSz?: number | undefined;
|
|
@@ -506,6 +506,7 @@ export declare const IntentRecordSchema: z.ZodDiscriminatedUnion<"kind", [z.ZodO
|
|
|
506
506
|
replenishDedupeKeys?: string[] | undefined;
|
|
507
507
|
}, {
|
|
508
508
|
coin: string;
|
|
509
|
+
reduceOnly: boolean;
|
|
509
510
|
kind: "grid";
|
|
510
511
|
id: string;
|
|
511
512
|
createdAtMs: number;
|
|
@@ -516,12 +517,11 @@ export declare const IntentRecordSchema: z.ZodDiscriminatedUnion<"kind", [z.ZodO
|
|
|
516
517
|
grids: number;
|
|
517
518
|
orderSz: number;
|
|
518
519
|
bias: "symmetric" | "long" | "short";
|
|
519
|
-
reduceOnly: boolean;
|
|
520
520
|
legs: {
|
|
521
521
|
index: number;
|
|
522
522
|
px: number;
|
|
523
523
|
isBuy: boolean;
|
|
524
|
-
legPhase: "
|
|
524
|
+
legPhase: "pending" | "open" | "partial" | "filled" | "cancelled";
|
|
525
525
|
oid?: number | undefined;
|
|
526
526
|
lastSz?: number | undefined;
|
|
527
527
|
lastOrigSz?: number | undefined;
|
|
@@ -550,28 +550,28 @@ export declare const IntentRecordSchema: z.ZodDiscriminatedUnion<"kind", [z.ZodO
|
|
|
550
550
|
oid: z.ZodOptional<z.ZodNumber>;
|
|
551
551
|
}, "strip", z.ZodTypeAny, {
|
|
552
552
|
coin: string;
|
|
553
|
+
sz: number;
|
|
554
|
+
reduceOnly: boolean;
|
|
555
|
+
limitPx: number;
|
|
553
556
|
kind: "single_limit";
|
|
554
557
|
id: string;
|
|
555
558
|
createdAtMs: number;
|
|
556
559
|
updatedAtMs: number;
|
|
557
560
|
entrySide: "buy" | "sell";
|
|
558
561
|
tif: "Gtc" | "Ioc" | "Alo";
|
|
559
|
-
reduceOnly: boolean;
|
|
560
|
-
limitPx: number;
|
|
561
|
-
sz: number;
|
|
562
562
|
dex?: string | undefined;
|
|
563
563
|
oid?: number | undefined;
|
|
564
564
|
}, {
|
|
565
565
|
coin: string;
|
|
566
|
+
sz: number;
|
|
567
|
+
reduceOnly: boolean;
|
|
568
|
+
limitPx: number;
|
|
566
569
|
kind: "single_limit";
|
|
567
570
|
id: string;
|
|
568
571
|
createdAtMs: number;
|
|
569
572
|
updatedAtMs: number;
|
|
570
573
|
entrySide: "buy" | "sell";
|
|
571
574
|
tif: "Gtc" | "Ioc" | "Alo";
|
|
572
|
-
reduceOnly: boolean;
|
|
573
|
-
limitPx: number;
|
|
574
|
-
sz: number;
|
|
575
575
|
dex?: string | undefined;
|
|
576
576
|
oid?: number | undefined;
|
|
577
577
|
}>, z.ZodObject<{
|
|
@@ -591,14 +591,14 @@ export declare const IntentRecordSchema: z.ZodDiscriminatedUnion<"kind", [z.ZodO
|
|
|
591
591
|
oid: z.ZodOptional<z.ZodNumber>;
|
|
592
592
|
}, "strip", z.ZodTypeAny, {
|
|
593
593
|
coin: string;
|
|
594
|
+
side: "buy" | "sell";
|
|
595
|
+
sz: number;
|
|
596
|
+
reduceOnly: boolean;
|
|
597
|
+
triggerPx: number;
|
|
594
598
|
kind: "standalone_tpsl";
|
|
595
599
|
id: string;
|
|
596
600
|
createdAtMs: number;
|
|
597
601
|
updatedAtMs: number;
|
|
598
|
-
reduceOnly: boolean;
|
|
599
|
-
sz: number;
|
|
600
|
-
side: "buy" | "sell";
|
|
601
|
-
triggerPx: number;
|
|
602
602
|
tpsl: "tp" | "sl";
|
|
603
603
|
isMarket: boolean;
|
|
604
604
|
dex?: string | undefined;
|
|
@@ -606,14 +606,14 @@ export declare const IntentRecordSchema: z.ZodDiscriminatedUnion<"kind", [z.ZodO
|
|
|
606
606
|
limitPx?: number | undefined;
|
|
607
607
|
}, {
|
|
608
608
|
coin: string;
|
|
609
|
+
side: "buy" | "sell";
|
|
610
|
+
sz: number;
|
|
611
|
+
reduceOnly: boolean;
|
|
612
|
+
triggerPx: number;
|
|
609
613
|
kind: "standalone_tpsl";
|
|
610
614
|
id: string;
|
|
611
615
|
createdAtMs: number;
|
|
612
616
|
updatedAtMs: number;
|
|
613
|
-
reduceOnly: boolean;
|
|
614
|
-
sz: number;
|
|
615
|
-
side: "buy" | "sell";
|
|
616
|
-
triggerPx: number;
|
|
617
617
|
tpsl: "tp" | "sl";
|
|
618
618
|
isMarket: boolean;
|
|
619
619
|
dex?: string | undefined;
|
|
@@ -677,7 +677,7 @@ export declare const TradeStateFileSchema: z.ZodObject<{
|
|
|
677
677
|
slTriggerPx: number;
|
|
678
678
|
tpslIsMarket: boolean;
|
|
679
679
|
protectionReduceOnly: boolean;
|
|
680
|
-
phase: "planned" | "entry_pending" | "entry_partial" | "entry_filled" | "protection_active" | "tp_filled" | "sl_filled" | "closed" | "
|
|
680
|
+
phase: "cancelled" | "planned" | "entry_pending" | "entry_partial" | "entry_filled" | "protection_active" | "tp_filled" | "sl_filled" | "closed" | "expired" | "error";
|
|
681
681
|
network?: string | undefined;
|
|
682
682
|
dex?: string | undefined;
|
|
683
683
|
entryReduceOnly?: boolean | undefined;
|
|
@@ -705,7 +705,7 @@ export declare const TradeStateFileSchema: z.ZodObject<{
|
|
|
705
705
|
tpTriggerPx: number;
|
|
706
706
|
slTriggerPx: number;
|
|
707
707
|
tpslIsMarket: boolean;
|
|
708
|
-
phase: "planned" | "entry_pending" | "entry_partial" | "entry_filled" | "protection_active" | "tp_filled" | "sl_filled" | "closed" | "
|
|
708
|
+
phase: "cancelled" | "planned" | "entry_pending" | "entry_partial" | "entry_filled" | "protection_active" | "tp_filled" | "sl_filled" | "closed" | "expired" | "error";
|
|
709
709
|
network?: string | undefined;
|
|
710
710
|
dex?: string | undefined;
|
|
711
711
|
entryReduceOnly?: boolean | undefined;
|
|
@@ -769,7 +769,7 @@ export declare const TradeStateFileSchema: z.ZodObject<{
|
|
|
769
769
|
index: number;
|
|
770
770
|
px: number;
|
|
771
771
|
isBuy: boolean;
|
|
772
|
-
legPhase: "
|
|
772
|
+
legPhase: "pending" | "open" | "partial" | "filled" | "cancelled";
|
|
773
773
|
oid?: number | undefined;
|
|
774
774
|
lastSz?: number | undefined;
|
|
775
775
|
lastOrigSz?: number | undefined;
|
|
@@ -781,7 +781,7 @@ export declare const TradeStateFileSchema: z.ZodObject<{
|
|
|
781
781
|
index: number;
|
|
782
782
|
px: number;
|
|
783
783
|
isBuy: boolean;
|
|
784
|
-
legPhase: "
|
|
784
|
+
legPhase: "pending" | "open" | "partial" | "filled" | "cancelled";
|
|
785
785
|
oid?: number | undefined;
|
|
786
786
|
lastSz?: number | undefined;
|
|
787
787
|
lastOrigSz?: number | undefined;
|
|
@@ -792,6 +792,7 @@ export declare const TradeStateFileSchema: z.ZodObject<{
|
|
|
792
792
|
}>, "many">;
|
|
793
793
|
}, "strip", z.ZodTypeAny, {
|
|
794
794
|
coin: string;
|
|
795
|
+
reduceOnly: boolean;
|
|
795
796
|
kind: "grid";
|
|
796
797
|
id: string;
|
|
797
798
|
createdAtMs: number;
|
|
@@ -802,12 +803,11 @@ export declare const TradeStateFileSchema: z.ZodObject<{
|
|
|
802
803
|
grids: number;
|
|
803
804
|
orderSz: number;
|
|
804
805
|
bias: "symmetric" | "long" | "short";
|
|
805
|
-
reduceOnly: boolean;
|
|
806
806
|
legs: {
|
|
807
807
|
index: number;
|
|
808
808
|
px: number;
|
|
809
809
|
isBuy: boolean;
|
|
810
|
-
legPhase: "
|
|
810
|
+
legPhase: "pending" | "open" | "partial" | "filled" | "cancelled";
|
|
811
811
|
oid?: number | undefined;
|
|
812
812
|
lastSz?: number | undefined;
|
|
813
813
|
lastOrigSz?: number | undefined;
|
|
@@ -823,6 +823,7 @@ export declare const TradeStateFileSchema: z.ZodObject<{
|
|
|
823
823
|
replenishDedupeKeys?: string[] | undefined;
|
|
824
824
|
}, {
|
|
825
825
|
coin: string;
|
|
826
|
+
reduceOnly: boolean;
|
|
826
827
|
kind: "grid";
|
|
827
828
|
id: string;
|
|
828
829
|
createdAtMs: number;
|
|
@@ -833,12 +834,11 @@ export declare const TradeStateFileSchema: z.ZodObject<{
|
|
|
833
834
|
grids: number;
|
|
834
835
|
orderSz: number;
|
|
835
836
|
bias: "symmetric" | "long" | "short";
|
|
836
|
-
reduceOnly: boolean;
|
|
837
837
|
legs: {
|
|
838
838
|
index: number;
|
|
839
839
|
px: number;
|
|
840
840
|
isBuy: boolean;
|
|
841
|
-
legPhase: "
|
|
841
|
+
legPhase: "pending" | "open" | "partial" | "filled" | "cancelled";
|
|
842
842
|
oid?: number | undefined;
|
|
843
843
|
lastSz?: number | undefined;
|
|
844
844
|
lastOrigSz?: number | undefined;
|
|
@@ -867,28 +867,28 @@ export declare const TradeStateFileSchema: z.ZodObject<{
|
|
|
867
867
|
oid: z.ZodOptional<z.ZodNumber>;
|
|
868
868
|
}, "strip", z.ZodTypeAny, {
|
|
869
869
|
coin: string;
|
|
870
|
+
sz: number;
|
|
871
|
+
reduceOnly: boolean;
|
|
872
|
+
limitPx: number;
|
|
870
873
|
kind: "single_limit";
|
|
871
874
|
id: string;
|
|
872
875
|
createdAtMs: number;
|
|
873
876
|
updatedAtMs: number;
|
|
874
877
|
entrySide: "buy" | "sell";
|
|
875
878
|
tif: "Gtc" | "Ioc" | "Alo";
|
|
876
|
-
reduceOnly: boolean;
|
|
877
|
-
limitPx: number;
|
|
878
|
-
sz: number;
|
|
879
879
|
dex?: string | undefined;
|
|
880
880
|
oid?: number | undefined;
|
|
881
881
|
}, {
|
|
882
882
|
coin: string;
|
|
883
|
+
sz: number;
|
|
884
|
+
reduceOnly: boolean;
|
|
885
|
+
limitPx: number;
|
|
883
886
|
kind: "single_limit";
|
|
884
887
|
id: string;
|
|
885
888
|
createdAtMs: number;
|
|
886
889
|
updatedAtMs: number;
|
|
887
890
|
entrySide: "buy" | "sell";
|
|
888
891
|
tif: "Gtc" | "Ioc" | "Alo";
|
|
889
|
-
reduceOnly: boolean;
|
|
890
|
-
limitPx: number;
|
|
891
|
-
sz: number;
|
|
892
892
|
dex?: string | undefined;
|
|
893
893
|
oid?: number | undefined;
|
|
894
894
|
}>, z.ZodObject<{
|
|
@@ -908,14 +908,14 @@ export declare const TradeStateFileSchema: z.ZodObject<{
|
|
|
908
908
|
oid: z.ZodOptional<z.ZodNumber>;
|
|
909
909
|
}, "strip", z.ZodTypeAny, {
|
|
910
910
|
coin: string;
|
|
911
|
+
side: "buy" | "sell";
|
|
912
|
+
sz: number;
|
|
913
|
+
reduceOnly: boolean;
|
|
914
|
+
triggerPx: number;
|
|
911
915
|
kind: "standalone_tpsl";
|
|
912
916
|
id: string;
|
|
913
917
|
createdAtMs: number;
|
|
914
918
|
updatedAtMs: number;
|
|
915
|
-
reduceOnly: boolean;
|
|
916
|
-
sz: number;
|
|
917
|
-
side: "buy" | "sell";
|
|
918
|
-
triggerPx: number;
|
|
919
919
|
tpsl: "tp" | "sl";
|
|
920
920
|
isMarket: boolean;
|
|
921
921
|
dex?: string | undefined;
|
|
@@ -923,14 +923,14 @@ export declare const TradeStateFileSchema: z.ZodObject<{
|
|
|
923
923
|
limitPx?: number | undefined;
|
|
924
924
|
}, {
|
|
925
925
|
coin: string;
|
|
926
|
+
side: "buy" | "sell";
|
|
927
|
+
sz: number;
|
|
928
|
+
reduceOnly: boolean;
|
|
929
|
+
triggerPx: number;
|
|
926
930
|
kind: "standalone_tpsl";
|
|
927
931
|
id: string;
|
|
928
932
|
createdAtMs: number;
|
|
929
933
|
updatedAtMs: number;
|
|
930
|
-
reduceOnly: boolean;
|
|
931
|
-
sz: number;
|
|
932
|
-
side: "buy" | "sell";
|
|
933
|
-
triggerPx: number;
|
|
934
934
|
tpsl: "tp" | "sl";
|
|
935
935
|
isMarket: boolean;
|
|
936
936
|
dex?: string | undefined;
|
|
@@ -973,7 +973,7 @@ export declare const TradeStateFileSchema: z.ZodObject<{
|
|
|
973
973
|
slTriggerPx: number;
|
|
974
974
|
tpslIsMarket: boolean;
|
|
975
975
|
protectionReduceOnly: boolean;
|
|
976
|
-
phase: "planned" | "entry_pending" | "entry_partial" | "entry_filled" | "protection_active" | "tp_filled" | "sl_filled" | "closed" | "
|
|
976
|
+
phase: "cancelled" | "planned" | "entry_pending" | "entry_partial" | "entry_filled" | "protection_active" | "tp_filled" | "sl_filled" | "closed" | "expired" | "error";
|
|
977
977
|
network?: string | undefined;
|
|
978
978
|
dex?: string | undefined;
|
|
979
979
|
entryReduceOnly?: boolean | undefined;
|
|
@@ -990,6 +990,7 @@ export declare const TradeStateFileSchema: z.ZodObject<{
|
|
|
990
990
|
dedupeKeys?: string[] | undefined;
|
|
991
991
|
} | {
|
|
992
992
|
coin: string;
|
|
993
|
+
reduceOnly: boolean;
|
|
993
994
|
kind: "grid";
|
|
994
995
|
id: string;
|
|
995
996
|
createdAtMs: number;
|
|
@@ -1000,12 +1001,11 @@ export declare const TradeStateFileSchema: z.ZodObject<{
|
|
|
1000
1001
|
grids: number;
|
|
1001
1002
|
orderSz: number;
|
|
1002
1003
|
bias: "symmetric" | "long" | "short";
|
|
1003
|
-
reduceOnly: boolean;
|
|
1004
1004
|
legs: {
|
|
1005
1005
|
index: number;
|
|
1006
1006
|
px: number;
|
|
1007
1007
|
isBuy: boolean;
|
|
1008
|
-
legPhase: "
|
|
1008
|
+
legPhase: "pending" | "open" | "partial" | "filled" | "cancelled";
|
|
1009
1009
|
oid?: number | undefined;
|
|
1010
1010
|
lastSz?: number | undefined;
|
|
1011
1011
|
lastOrigSz?: number | undefined;
|
|
@@ -1021,27 +1021,27 @@ export declare const TradeStateFileSchema: z.ZodObject<{
|
|
|
1021
1021
|
replenishDedupeKeys?: string[] | undefined;
|
|
1022
1022
|
} | {
|
|
1023
1023
|
coin: string;
|
|
1024
|
+
sz: number;
|
|
1025
|
+
reduceOnly: boolean;
|
|
1026
|
+
limitPx: number;
|
|
1024
1027
|
kind: "single_limit";
|
|
1025
1028
|
id: string;
|
|
1026
1029
|
createdAtMs: number;
|
|
1027
1030
|
updatedAtMs: number;
|
|
1028
1031
|
entrySide: "buy" | "sell";
|
|
1029
1032
|
tif: "Gtc" | "Ioc" | "Alo";
|
|
1030
|
-
reduceOnly: boolean;
|
|
1031
|
-
limitPx: number;
|
|
1032
|
-
sz: number;
|
|
1033
1033
|
dex?: string | undefined;
|
|
1034
1034
|
oid?: number | undefined;
|
|
1035
1035
|
} | {
|
|
1036
1036
|
coin: string;
|
|
1037
|
+
side: "buy" | "sell";
|
|
1038
|
+
sz: number;
|
|
1039
|
+
reduceOnly: boolean;
|
|
1040
|
+
triggerPx: number;
|
|
1037
1041
|
kind: "standalone_tpsl";
|
|
1038
1042
|
id: string;
|
|
1039
1043
|
createdAtMs: number;
|
|
1040
1044
|
updatedAtMs: number;
|
|
1041
|
-
reduceOnly: boolean;
|
|
1042
|
-
sz: number;
|
|
1043
|
-
side: "buy" | "sell";
|
|
1044
|
-
triggerPx: number;
|
|
1045
1045
|
tpsl: "tp" | "sl";
|
|
1046
1046
|
isMarket: boolean;
|
|
1047
1047
|
dex?: string | undefined;
|
|
@@ -1071,7 +1071,7 @@ export declare const TradeStateFileSchema: z.ZodObject<{
|
|
|
1071
1071
|
tpTriggerPx: number;
|
|
1072
1072
|
slTriggerPx: number;
|
|
1073
1073
|
tpslIsMarket: boolean;
|
|
1074
|
-
phase: "planned" | "entry_pending" | "entry_partial" | "entry_filled" | "protection_active" | "tp_filled" | "sl_filled" | "closed" | "
|
|
1074
|
+
phase: "cancelled" | "planned" | "entry_pending" | "entry_partial" | "entry_filled" | "protection_active" | "tp_filled" | "sl_filled" | "closed" | "expired" | "error";
|
|
1075
1075
|
network?: string | undefined;
|
|
1076
1076
|
dex?: string | undefined;
|
|
1077
1077
|
entryReduceOnly?: boolean | undefined;
|
|
@@ -1089,6 +1089,7 @@ export declare const TradeStateFileSchema: z.ZodObject<{
|
|
|
1089
1089
|
dedupeKeys?: string[] | undefined;
|
|
1090
1090
|
} | {
|
|
1091
1091
|
coin: string;
|
|
1092
|
+
reduceOnly: boolean;
|
|
1092
1093
|
kind: "grid";
|
|
1093
1094
|
id: string;
|
|
1094
1095
|
createdAtMs: number;
|
|
@@ -1099,12 +1100,11 @@ export declare const TradeStateFileSchema: z.ZodObject<{
|
|
|
1099
1100
|
grids: number;
|
|
1100
1101
|
orderSz: number;
|
|
1101
1102
|
bias: "symmetric" | "long" | "short";
|
|
1102
|
-
reduceOnly: boolean;
|
|
1103
1103
|
legs: {
|
|
1104
1104
|
index: number;
|
|
1105
1105
|
px: number;
|
|
1106
1106
|
isBuy: boolean;
|
|
1107
|
-
legPhase: "
|
|
1107
|
+
legPhase: "pending" | "open" | "partial" | "filled" | "cancelled";
|
|
1108
1108
|
oid?: number | undefined;
|
|
1109
1109
|
lastSz?: number | undefined;
|
|
1110
1110
|
lastOrigSz?: number | undefined;
|
|
@@ -1120,27 +1120,27 @@ export declare const TradeStateFileSchema: z.ZodObject<{
|
|
|
1120
1120
|
replenishDedupeKeys?: string[] | undefined;
|
|
1121
1121
|
} | {
|
|
1122
1122
|
coin: string;
|
|
1123
|
+
sz: number;
|
|
1124
|
+
reduceOnly: boolean;
|
|
1125
|
+
limitPx: number;
|
|
1123
1126
|
kind: "single_limit";
|
|
1124
1127
|
id: string;
|
|
1125
1128
|
createdAtMs: number;
|
|
1126
1129
|
updatedAtMs: number;
|
|
1127
1130
|
entrySide: "buy" | "sell";
|
|
1128
1131
|
tif: "Gtc" | "Ioc" | "Alo";
|
|
1129
|
-
reduceOnly: boolean;
|
|
1130
|
-
limitPx: number;
|
|
1131
|
-
sz: number;
|
|
1132
1132
|
dex?: string | undefined;
|
|
1133
1133
|
oid?: number | undefined;
|
|
1134
1134
|
} | {
|
|
1135
1135
|
coin: string;
|
|
1136
|
+
side: "buy" | "sell";
|
|
1137
|
+
sz: number;
|
|
1138
|
+
reduceOnly: boolean;
|
|
1139
|
+
triggerPx: number;
|
|
1136
1140
|
kind: "standalone_tpsl";
|
|
1137
1141
|
id: string;
|
|
1138
1142
|
createdAtMs: number;
|
|
1139
1143
|
updatedAtMs: number;
|
|
1140
|
-
reduceOnly: boolean;
|
|
1141
|
-
sz: number;
|
|
1142
|
-
side: "buy" | "sell";
|
|
1143
|
-
triggerPx: number;
|
|
1144
1144
|
tpsl: "tp" | "sl";
|
|
1145
1145
|
isMarket: boolean;
|
|
1146
1146
|
dex?: string | undefined;
|
|
@@ -0,0 +1,11 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* Prepends jcc_hyper_tool root-global flags for daemon runs so you can set
|
|
3
|
+
* network / state / API once on the daemon instead of repeating after `--`.
|
|
4
|
+
* Skips injection when the child argv already contains the same flag (child wins).
|
|
5
|
+
*/
|
|
6
|
+
export declare function prependChildGlobalArgs(childArgv: string[], opts: {
|
|
7
|
+
network?: string;
|
|
8
|
+
apiUrl?: string;
|
|
9
|
+
stateFile?: string;
|
|
10
|
+
}): string[];
|
|
11
|
+
//# sourceMappingURL=childArgs.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"childArgs.d.ts","sourceRoot":"","sources":["../../src/daemon/childArgs.ts"],"names":[],"mappings":"AAWA;;;;GAIG;AACH,wBAAgB,sBAAsB,CACpC,SAAS,EAAE,MAAM,EAAE,EACnB,IAAI,EAAE;IACJ,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,SAAS,CAAC,EAAE,MAAM,CAAC;CACpB,GACA,MAAM,EAAE,CAeV"}
|
|
@@ -0,0 +1,32 @@
|
|
|
1
|
+
/** True if argv already sets a long option `--name` or `--name=value`. */
|
|
2
|
+
function hasLongFlag(argv, name) {
|
|
3
|
+
const p = `--${name}`;
|
|
4
|
+
for (const a of argv) {
|
|
5
|
+
if (a === p || a.startsWith(`${p}=`)) {
|
|
6
|
+
return true;
|
|
7
|
+
}
|
|
8
|
+
}
|
|
9
|
+
return false;
|
|
10
|
+
}
|
|
11
|
+
/**
|
|
12
|
+
* Prepends jcc_hyper_tool root-global flags for daemon runs so you can set
|
|
13
|
+
* network / state / API once on the daemon instead of repeating after `--`.
|
|
14
|
+
* Skips injection when the child argv already contains the same flag (child wins).
|
|
15
|
+
*/
|
|
16
|
+
export function prependChildGlobalArgs(childArgv, opts) {
|
|
17
|
+
const prefix = [];
|
|
18
|
+
const n = opts.network?.trim();
|
|
19
|
+
if (n && !hasLongFlag(childArgv, "network")) {
|
|
20
|
+
prefix.push("--network", n);
|
|
21
|
+
}
|
|
22
|
+
const u = opts.apiUrl?.trim();
|
|
23
|
+
if (u && !hasLongFlag(childArgv, "api-url")) {
|
|
24
|
+
prefix.push("--api-url", u);
|
|
25
|
+
}
|
|
26
|
+
const s = opts.stateFile?.trim();
|
|
27
|
+
if (s && !hasLongFlag(childArgv, "state-file")) {
|
|
28
|
+
prefix.push("--state-file", s);
|
|
29
|
+
}
|
|
30
|
+
return [...prefix, ...childArgv];
|
|
31
|
+
}
|
|
32
|
+
//# sourceMappingURL=childArgs.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"childArgs.js","sourceRoot":"","sources":["../../src/daemon/childArgs.ts"],"names":[],"mappings":"AAAA,0EAA0E;AAC1E,SAAS,WAAW,CAAC,IAAc,EAAE,IAAY;IAC/C,MAAM,CAAC,GAAG,KAAK,IAAI,EAAE,CAAC;IACtB,KAAK,MAAM,CAAC,IAAI,IAAI,EAAE,CAAC;QACrB,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,UAAU,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE,CAAC;YACrC,OAAO,IAAI,CAAC;QACd,CAAC;IACH,CAAC;IACD,OAAO,KAAK,CAAC;AACf,CAAC;AAED;;;;GAIG;AACH,MAAM,UAAU,sBAAsB,CACpC,SAAmB,EACnB,IAIC;IAED,MAAM,MAAM,GAAa,EAAE,CAAC;IAC5B,MAAM,CAAC,GAAG,IAAI,CAAC,OAAO,EAAE,IAAI,EAAE,CAAC;IAC/B,IAAI,CAAC,IAAI,CAAC,WAAW,CAAC,SAAS,EAAE,SAAS,CAAC,EAAE,CAAC;QAC5C,MAAM,CAAC,IAAI,CAAC,WAAW,EAAE,CAAC,CAAC,CAAC;IAC9B,CAAC;IACD,MAAM,CAAC,GAAG,IAAI,CAAC,MAAM,EAAE,IAAI,EAAE,CAAC;IAC9B,IAAI,CAAC,IAAI,CAAC,WAAW,CAAC,SAAS,EAAE,SAAS,CAAC,EAAE,CAAC;QAC5C,MAAM,CAAC,IAAI,CAAC,WAAW,EAAE,CAAC,CAAC,CAAC;IAC9B,CAAC;IACD,MAAM,CAAC,GAAG,IAAI,CAAC,SAAS,EAAE,IAAI,EAAE,CAAC;IACjC,IAAI,CAAC,IAAI,CAAC,WAAW,CAAC,SAAS,EAAE,YAAY,CAAC,EAAE,CAAC;QAC/C,MAAM,CAAC,IAAI,CAAC,cAAc,EAAE,CAAC,CAAC,CAAC;IACjC,CAAC;IACD,OAAO,CAAC,GAAG,MAAM,EAAE,GAAG,SAAS,CAAC,CAAC;AACnC,CAAC"}
|
package/dist/daemon/index.js
CHANGED
|
@@ -4,6 +4,7 @@ import { Command } from "commander";
|
|
|
4
4
|
import { dirname, join } from "node:path";
|
|
5
5
|
import { fileURLToPath } from "node:url";
|
|
6
6
|
import { VERSION } from "../meta/version.js";
|
|
7
|
+
import { prependChildGlobalArgs } from "./childArgs.js";
|
|
7
8
|
function sleep(ms) {
|
|
8
9
|
return new Promise((resolve) => setTimeout(resolve, ms));
|
|
9
10
|
}
|
|
@@ -54,11 +55,16 @@ async function main() {
|
|
|
54
55
|
program
|
|
55
56
|
.name("jcc_hyper_daemon")
|
|
56
57
|
.description("Run jcc_hyper_tool on a loop: execute the child command, wait --interval seconds, repeat. " +
|
|
57
|
-
"Child arguments must follow a single `--` separator."
|
|
58
|
+
"Child arguments must follow a single `--` separator. " +
|
|
59
|
+
"Optional --network / --api-url / --state-file are prepended to each child run (skips if the child argv already sets that flag). " +
|
|
60
|
+
"Children still inherit your shell env (e.g. JCC_HYPER_STATE_FILE, JCC_HYPER_NETWORK, JCC_HYPER_TOOL_BIN, wallet keys).")
|
|
58
61
|
.version(VERSION, "-V, --version", "output the version number")
|
|
59
62
|
.option("-i, --interval <seconds>", "Sleep after each child exit before the next run", (v) => parseInterval(v), 60)
|
|
60
63
|
.option("--once", "Run the child once and exit (no loop)", false)
|
|
61
|
-
.option("--jcc-bin <path>", "Executable for jcc_hyper_tool (default: env JCC_HYPER_TOOL_BIN, else current Node + bundled cli/index.js)")
|
|
64
|
+
.option("--jcc-bin <path>", "Executable for jcc_hyper_tool (default: env JCC_HYPER_TOOL_BIN, else current Node + bundled cli/index.js)")
|
|
65
|
+
.option("--network <network>", "Prepended before child args: same as jcc_hyper_tool --network (omit if child or env JCC_HYPER_NETWORK is enough)")
|
|
66
|
+
.option("--api-url <url>", "Prepended: --api-url for each child (omit if env or child sets it)")
|
|
67
|
+
.option("--state-file <path>", "Prepended: --state-file for each child (omit if env JCC_HYPER_STATE_FILE or child sets it)");
|
|
62
68
|
try {
|
|
63
69
|
await program.parseAsync([...daemonArgv], { from: "user" });
|
|
64
70
|
}
|
|
@@ -71,13 +77,18 @@ async function main() {
|
|
|
71
77
|
const opts = program.opts();
|
|
72
78
|
if (childArgv.length === 0) {
|
|
73
79
|
process.stderr.write("Missing child command: pass jcc_hyper_tool arguments after `--`.\n" +
|
|
74
|
-
"Example: jcc_hyper_daemon --interval 60 --
|
|
80
|
+
"Example: jcc_hyper_daemon --interval 60 --state-file ./trade-state.json -- state reconcile\n");
|
|
75
81
|
process.stdout.write(program.helpInformation());
|
|
76
82
|
process.exitCode = 1;
|
|
77
83
|
return;
|
|
78
84
|
}
|
|
79
85
|
const { file, argsPrefix } = resolveToolInvocation(opts.jccBin);
|
|
80
|
-
const
|
|
86
|
+
const childWithGlobals = prependChildGlobalArgs(childArgv, {
|
|
87
|
+
network: opts.network,
|
|
88
|
+
apiUrl: opts.apiUrl,
|
|
89
|
+
stateFile: opts.stateFile,
|
|
90
|
+
});
|
|
91
|
+
const fullArgs = [...argsPrefix, ...childWithGlobals];
|
|
81
92
|
const stop = () => {
|
|
82
93
|
process.exit(0);
|
|
83
94
|
};
|
package/dist/daemon/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/daemon/index.ts"],"names":[],"mappings":";AACA,OAAO,EAAE,KAAK,EAAE,MAAM,oBAAoB,CAAC;AAC3C,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AACpC,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,MAAM,WAAW,CAAC;AAC1C,OAAO,EAAE,aAAa,EAAE,MAAM,UAAU,CAAC;AAEzC,OAAO,EAAE,OAAO,EAAE,MAAM,oBAAoB,CAAC;
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/daemon/index.ts"],"names":[],"mappings":"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"}
|