@primuslabs/por-client-sdk 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 +14 -16
- package/dist/cli.js +7 -8
- package/dist/cli.js.map +1 -1
- package/dist/client/data_service_client.d.ts +7 -2
- package/dist/client/data_service_client.js +23 -5
- package/dist/client/data_service_client.js.map +1 -1
- package/dist/client/por_client.d.ts +2 -0
- package/dist/client/por_client.js +36 -5
- package/dist/client/por_client.js.map +1 -1
- package/dist/client/prover_client.d.ts +3 -4
- package/dist/client/prover_client.js +6 -6
- package/dist/client/prover_client.js.map +1 -1
- package/dist/client/zktls_client.d.ts +2 -0
- package/dist/client/zktls_client.js +41 -8
- package/dist/client/zktls_client.js.map +1 -1
- package/dist/config_schema.d.ts +21 -29
- package/dist/config_schema.js +37 -19
- package/dist/config_schema.js.map +1 -1
- package/dist/datasource/base_exchange.js +1 -1
- package/dist/datasource/base_exchange.js.map +1 -1
- package/dist/datasource/binance.d.ts +1 -0
- package/dist/datasource/binance.js +13 -0
- package/dist/datasource/binance.js.map +1 -1
- package/dist/datasource/index.d.ts +0 -1
- package/dist/datasource/index.js +0 -1
- package/dist/datasource/index.js.map +1 -1
- package/dist/index.d.ts +1 -0
- package/dist/index.js +1 -0
- package/dist/index.js.map +1 -1
- package/dist/scheduler.d.ts +17 -0
- package/dist/scheduler.js +75 -0
- package/dist/scheduler.js.map +1 -0
- package/dist/utils.d.ts +0 -2
- package/dist/utils.js +0 -5
- package/dist/utils.js.map +1 -1
- package/package.json +1 -1
package/README.md
CHANGED
|
@@ -21,10 +21,9 @@ npm run build
|
|
|
21
21
|
|
|
22
22
|
2. Ensure required fields are set:
|
|
23
23
|
|
|
24
|
-
* `app.identity.
|
|
25
|
-
* `app.identity.programId` for program execution
|
|
24
|
+
* `app.identity.userToken` and `app.identity.projectId` for authentication
|
|
26
25
|
|
|
27
|
-
3. Run an example:
|
|
26
|
+
3. Run an example: (Need configure your Binance API Key first)
|
|
28
27
|
|
|
29
28
|
```bash
|
|
30
29
|
npx tsx example/binance.ts
|
|
@@ -56,20 +55,19 @@ Contains application authorization and identification.
|
|
|
56
55
|
|
|
57
56
|
| Field | Type | Description | Example |
|
|
58
57
|
| --------- | ------ | ------------------------------------------------ | ----------------- |
|
|
59
|
-
|
|
|
58
|
+
| userToken | string | Authentication token issued for this application | `"my-auth-token"` |
|
|
60
59
|
| projectId | string | Unique project identifier | `"project-123"` |
|
|
61
|
-
| programId | string | Unique program identifier | `"program-abc"` |
|
|
62
60
|
|
|
63
61
|
#### 2. Runtime (`app.runtime`)
|
|
64
62
|
|
|
65
63
|
Specifies the runtime environment and logging.
|
|
66
64
|
|
|
67
|
-
| Field
|
|
68
|
-
|
|
|
69
|
-
| version
|
|
70
|
-
| env
|
|
71
|
-
|
|
|
72
|
-
|
|
|
65
|
+
| Field | Type | Default | Description | Example |
|
|
66
|
+
| ----------- | ------- | -------------- | ------------------------------------------------------ | -------------- |
|
|
67
|
+
| version | string | - | Application version in semantic version format (x.y.z) | `"1.0.0"` |
|
|
68
|
+
| env | string | `"production"` | Runtime environment (`development` or `production`) | `"production"` |
|
|
69
|
+
| logVerbose | integer | `0` | Log verbosity (default 0 = off, higher = more detail) | `3` |
|
|
70
|
+
| jobInterval | integer | `1800` | Interval between jobs in seconds (default 1800) | `3600` |
|
|
73
71
|
|
|
74
72
|
#### 3. Services (`app.services`)
|
|
75
73
|
|
|
@@ -91,11 +89,11 @@ External service endpoints used by the application.
|
|
|
91
89
|
|
|
92
90
|
Blockchain connection and signer configuration.
|
|
93
91
|
|
|
94
|
-
| Field | Type | Default | Description
|
|
95
|
-
| ------- | ------ | -------- |
|
|
96
|
-
| network | string | `"base"` | Target blockchain network (`base` or `base-sepolia`)
|
|
97
|
-
| rpcUrl | string | - | Optional custom RPC URL. If not set, default RPC for the network is used
|
|
98
|
-
| signer | object | - | Transaction signer info (required if `
|
|
92
|
+
| Field | Type | Default | Description | Example |
|
|
93
|
+
| ------- | ------ | -------- | ---------------------------------------------------------------------------- | --------------------------- |
|
|
94
|
+
| network | string | `"base"` | Target blockchain network (`base` or `base-sepolia`) | `"base-sepolia"` |
|
|
95
|
+
| rpcUrl | string | - | Optional custom RPC URL. If not set, default RPC for the network is used | `"https://rpc.example.com"` |
|
|
96
|
+
| signer | object | - | Transaction signer info (required if `subscriptionType` is `PLAN_SELF_PAID`) | - |
|
|
99
97
|
|
|
100
98
|
##### Signer (`app.blockchain.signer`)
|
|
101
99
|
|
package/dist/cli.js
CHANGED
|
@@ -11,13 +11,14 @@ async function main() {
|
|
|
11
11
|
.command("uploadProgram")
|
|
12
12
|
.description("uploadProgram.")
|
|
13
13
|
.requiredOption("--filepath <FILEPATH>", "Program file path")
|
|
14
|
+
.option("--replace", "Replace existing program if set", false)
|
|
14
15
|
.option("--name <NAME>", "Program Name", "Default Name")
|
|
15
16
|
.option("--version <VERSION>", "Version number", "1.0")
|
|
16
17
|
.option("--description <DESCRIPTION>", "Description", "Default description.")
|
|
17
18
|
.action(async (opts) => {
|
|
18
19
|
console.log("uploadProgram");
|
|
19
|
-
const result = await api.uploadProgram(opts.filepath, 'My Program', '1.0', 'Program description');
|
|
20
|
-
console.log('Program uploaded, ID:', result
|
|
20
|
+
const result = await api.uploadProgram(opts.filepath, config.app.identity.projectId, opts.replace, 'My Program', '1.0', 'Program description');
|
|
21
|
+
console.log('Program uploaded, ID:', result);
|
|
21
22
|
});
|
|
22
23
|
program
|
|
23
24
|
.command("submitTask")
|
|
@@ -27,11 +28,10 @@ async function main() {
|
|
|
27
28
|
console.log("submitTask");
|
|
28
29
|
const attestation_data = fs.readFileSync(opts.filepath, { encoding: "utf-8" });
|
|
29
30
|
const result = await api.submitTask({
|
|
30
|
-
|
|
31
|
+
userToken: config.app.identity.userToken,
|
|
31
32
|
projectId: config.app.identity.projectId,
|
|
32
|
-
|
|
33
|
+
network: config.app.blockchain.network,
|
|
33
34
|
attestationData: attestation_data,
|
|
34
|
-
zktlsMode: config.app.runtime.mode,
|
|
35
35
|
});
|
|
36
36
|
console.log('Task submitted:', result);
|
|
37
37
|
});
|
|
@@ -52,11 +52,10 @@ async function main() {
|
|
|
52
52
|
console.log("submitTask and getResult.");
|
|
53
53
|
const attestation_data = fs.readFileSync(opts.filepath, { encoding: "utf-8" });
|
|
54
54
|
const result = await api.doZkVM({
|
|
55
|
-
|
|
55
|
+
userToken: config.app.identity.userToken,
|
|
56
56
|
projectId: config.app.identity.projectId,
|
|
57
|
-
|
|
57
|
+
network: config.app.blockchain.network,
|
|
58
58
|
attestationData: attestation_data,
|
|
59
|
-
zktlsMode: config.app.runtime.mode,
|
|
60
59
|
});
|
|
61
60
|
console.log('result:', result);
|
|
62
61
|
});
|
package/dist/cli.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"cli.js","sourceRoot":"","sources":["../src/cli.ts"],"names":[],"mappings":";AAEA,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AACpC,OAAO,EAAE,YAAY,EAAE,MAAM,2BAA2B,CAAC;AACzD,OAAO,EAAE,kBAAkB,EAAE,MAAM,oBAAoB,CAAC;AACxD,OAAO,EAAE,MAAM,IAAI,CAAC;AAEpB,KAAK,UAAU,IAAI;IACjB,MAAM,MAAM,GAAG,kBAAkB,EAAE,CAAC;IACpC,MAAM,GAAG,GAAG,IAAI,YAAY,CAAC,MAAM,CAAC,GAAG,CAAC,QAAQ,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;IAC3D,MAAM,OAAO,GAAG,IAAI,OAAO,EAAE,CAAC;IAE9B,OAAO;SACJ,OAAO,CAAC,eAAe,CAAC;SACxB,WAAW,CAAC,gBAAgB,CAAC;SAC7B,cAAc,CAAC,uBAAuB,EAAE,mBAAmB,CAAC;SAC5D,MAAM,CAAC,eAAe,EAAE,cAAc,EAAE,cAAc,CAAC;SACvD,MAAM,CAAC,qBAAqB,EAAE,gBAAgB,EAAE,KAAK,CAAC;SACtD,MAAM,CAAC,6BAA6B,EAAE,aAAa,EAAE,sBAAsB,CAAC;SAC5E,MAAM,CAAC,KAAK,EAAE,IAAI,EAAE,EAAE;QACrB,OAAO,CAAC,GAAG,CAAC,eAAe,CAAC,CAAC;QAC7B,MAAM,MAAM,GAAG,MAAM,GAAG,CAAC,aAAa,CAAC,IAAI,CAAC,QAAQ,EAAE,YAAY,EAAE,KAAK,EAAE,qBAAqB,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"cli.js","sourceRoot":"","sources":["../src/cli.ts"],"names":[],"mappings":"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"}
|
|
@@ -10,10 +10,15 @@ export interface SubmitTaskResult {
|
|
|
10
10
|
taskAttestors: string[];
|
|
11
11
|
submitterAddress: string;
|
|
12
12
|
}
|
|
13
|
+
export interface CheckPaymentResult {
|
|
14
|
+
projectId: string;
|
|
15
|
+
subscriptionType: string;
|
|
16
|
+
}
|
|
13
17
|
export declare class DataServiceClient {
|
|
14
18
|
private readonly client;
|
|
15
19
|
constructor(baseURL: string, timeout?: number);
|
|
16
|
-
submitTask(bizId: string, projectId: string,
|
|
17
|
-
checkPayment(bizId: string, projectId: string,
|
|
20
|
+
submitTask(bizId: string, projectId: string, userToken: string): Promise<SubmitTaskResult>;
|
|
21
|
+
checkPayment(bizId: string, projectId: string, userToken: string): Promise<CheckPaymentResult>;
|
|
22
|
+
alertTrigger(bizId: string, projectId: string, userToken: string, title: string, content: string): Promise<any>;
|
|
18
23
|
private unwrap;
|
|
19
24
|
}
|
|
@@ -5,11 +5,11 @@ export class DataServiceClient {
|
|
|
5
5
|
constructor(baseURL, timeout = 30_000) {
|
|
6
6
|
this.client = axios.create({ baseURL, timeout });
|
|
7
7
|
}
|
|
8
|
-
async submitTask(bizId, projectId,
|
|
8
|
+
async submitTask(bizId, projectId, userToken) {
|
|
9
9
|
const res = await this.client.get("/public/program/submitTask", {
|
|
10
10
|
params: { bizId, projectId },
|
|
11
11
|
headers: {
|
|
12
|
-
"POR-TOKEN":
|
|
12
|
+
"POR-TOKEN": userToken,
|
|
13
13
|
},
|
|
14
14
|
});
|
|
15
15
|
const raw = this.unwrap('submitTask', res.data);
|
|
@@ -20,16 +20,34 @@ export class DataServiceClient {
|
|
|
20
20
|
submitterAddress: raw.submitterAddress,
|
|
21
21
|
};
|
|
22
22
|
}
|
|
23
|
-
async checkPayment(bizId, projectId,
|
|
23
|
+
async checkPayment(bizId, projectId, userToken) {
|
|
24
24
|
const res = await this.client.get("/public/program/payment/check", {
|
|
25
25
|
params: { bizId, projectId },
|
|
26
26
|
headers: {
|
|
27
|
-
"POR-TOKEN":
|
|
27
|
+
"POR-TOKEN": userToken,
|
|
28
28
|
},
|
|
29
29
|
});
|
|
30
|
-
this.unwrap('checkPayment', res.data);
|
|
30
|
+
const raw = this.unwrap('checkPayment', res.data);
|
|
31
|
+
return {
|
|
32
|
+
projectId: raw.projectId,
|
|
33
|
+
subscriptionType: raw.subscriptionType,
|
|
34
|
+
};
|
|
35
|
+
}
|
|
36
|
+
async alertTrigger(bizId, projectId, userToken, title, content) {
|
|
37
|
+
const res = await this.client.post("/public/alert/trigger", {
|
|
38
|
+
origin: "POR_CLIENT",
|
|
39
|
+
severity: "critical",
|
|
40
|
+
occurredAt: Date.now().toString(),
|
|
41
|
+
bizId, projectId, title, content
|
|
42
|
+
}, {
|
|
43
|
+
headers: {
|
|
44
|
+
"POR-TOKEN": userToken,
|
|
45
|
+
},
|
|
46
|
+
});
|
|
47
|
+
this.unwrap("alertTrigger", res.data);
|
|
31
48
|
}
|
|
32
49
|
unwrap(op, data) {
|
|
50
|
+
// console.log('data_service.unwrap', op, JSON.stringify(data));
|
|
33
51
|
if (data.rc === 0) {
|
|
34
52
|
return data.result;
|
|
35
53
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"data_service_client.js","sourceRoot":"","sources":["../../src/client/data_service_client.ts"],"names":[],"mappings":"AAAA,OAAO,KAAwB,MAAM,OAAO,CAAC;AAC7C,OAAO,EAAE,WAAW,EAAE,MAAM,aAAa,CAAC;
|
|
1
|
+
{"version":3,"file":"data_service_client.js","sourceRoot":"","sources":["../../src/client/data_service_client.ts"],"names":[],"mappings":"AAAA,OAAO,KAAwB,MAAM,OAAO,CAAC;AAC7C,OAAO,EAAE,WAAW,EAAE,MAAM,aAAa,CAAC;AAqB1C,MAAM,OAAO,iBAAiB;IACX,MAAM,CAAgB;IACvC,YAAY,OAAe,EAAE,UAAkB,MAAM;QACnD,IAAI,CAAC,MAAM,GAAG,KAAK,CAAC,MAAM,CAAC,EAAE,OAAO,EAAE,OAAO,EAAE,CAAC,CAAC;IACnD,CAAC;IAED,KAAK,CAAC,UAAU,CACd,KAAa,EACb,SAAiB,EACjB,SAAiB;QAEjB,MAAM,GAAG,GAAG,MAAM,IAAI,CAAC,MAAM,CAAC,GAAG,CAC/B,4BAA4B,EAC5B;YACE,MAAM,EAAE,EAAE,KAAK,EAAE,SAAS,EAAE;YAC5B,OAAO,EAAE;gBACP,WAAW,EAAE,SAAS;aACvB;SACF,CACF,CAAC;QAEF,MAAM,GAAG,GAAG,IAAI,CAAC,MAAM,CAAC,YAAY,EAAE,GAAG,CAAC,IAAI,CAAC,CAAC;QAChD,OAAO;YACL,MAAM,EAAE,GAAG,CAAC,MAAM;YAClB,UAAU,EAAE,GAAG,CAAC,UAAU;YAC1B,aAAa,EAAE,GAAG,CAAC,aAAa;YAChC,gBAAgB,EAAE,GAAG,CAAC,gBAAgB;SACvC,CAAC;IACJ,CAAC;IAED,KAAK,CAAC,YAAY,CAChB,KAAa,EACb,SAAiB,EACjB,SAAiB;QAEjB,MAAM,GAAG,GAAG,MAAM,IAAI,CAAC,MAAM,CAAC,GAAG,CAC/B,+BAA+B,EAC/B;YACE,MAAM,EAAE,EAAE,KAAK,EAAE,SAAS,EAAE;YAC5B,OAAO,EAAE;gBACP,WAAW,EAAE,SAAS;aACvB;SACF,CACF,CAAC;QAEF,MAAM,GAAG,GAAG,IAAI,CAAC,MAAM,CAAC,cAAc,EAAE,GAAG,CAAC,IAAI,CAAC,CAAC;QAClD,OAAO;YACL,SAAS,EAAE,GAAG,CAAC,SAAS;YACxB,gBAAgB,EAAE,GAAG,CAAC,gBAAgB;SACvC,CAAC;IACJ,CAAC;IAED,KAAK,CAAC,YAAY,CAChB,KAAa,EACb,SAAiB,EACjB,SAAiB,EACjB,KAAa,EACb,OAAe;QAEf,MAAM,GAAG,GAAG,MAAM,IAAI,CAAC,MAAM,CAAC,IAAI,CAChC,uBAAuB,EACvB;YACE,MAAM,EAAE,YAAY;YACpB,QAAQ,EAAE,UAAU;YACpB,UAAU,EAAE,IAAI,CAAC,GAAG,EAAE,CAAC,QAAQ,EAAE;YACjC,KAAK,EAAE,SAAS,EAAE,KAAK,EAAE,OAAO;SACjC,EACD;YACE,OAAO,EAAE;gBACP,WAAW,EAAE,SAAS;aACvB;SACF,CACF,CAAC;QAEF,IAAI,CAAC,MAAM,CAAC,cAAc,EAAE,GAAG,CAAC,IAAI,CAAC,CAAC;IACxC,CAAC;IAEO,MAAM,CAAI,EAAU,EAAE,IAAoB;QAChD,gEAAgE;QAChE,IAAI,IAAI,CAAC,EAAE,KAAK,CAAC,EAAE,CAAC;YAClB,OAAO,IAAI,CAAC,MAAM,CAAC;QACrB,CAAC;QAED,gBAAgB;QAChB,MAAM,EAAE,EAAE,EAAE,GAAG,EAAE,GAAG,IAAI,CAAC;QACzB,MAAM,IAAI,WAAW,CAAC,OAAO,EAAE,GAAG,EAAE,SAAS,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,GAAG,EAAE,CAAC,CAAC;IAClE,CAAC;CACF"}
|
|
@@ -1,7 +1,10 @@
|
|
|
1
|
-
import { saveToFile } from "../utils.js";
|
|
1
|
+
import { saveToFile, makeErrData } from "../utils.js";
|
|
2
2
|
import { getDefaultOptions } from "../types.js";
|
|
3
3
|
import { ZkTLSClient } from "./zktls_client.js";
|
|
4
4
|
import { ProverClient } from "./prover_client.js";
|
|
5
|
+
import { ClientError } from "../error.js";
|
|
6
|
+
import { DataServiceClient } from "./data_service_client.js";
|
|
7
|
+
import { v4 as uuidv4 } from 'uuid';
|
|
5
8
|
export class PoRClient {
|
|
6
9
|
config;
|
|
7
10
|
zktlsClient;
|
|
@@ -15,6 +18,32 @@ export class PoRClient {
|
|
|
15
18
|
* zkTLS + zkVM (optional)
|
|
16
19
|
*/
|
|
17
20
|
async run(params, options = {}) {
|
|
21
|
+
try {
|
|
22
|
+
return await this._run(params, options);
|
|
23
|
+
}
|
|
24
|
+
catch (err) {
|
|
25
|
+
if (!(err instanceof ClientError)) {
|
|
26
|
+
err = new ClientError("70099", `PoR failed`, makeErrData(err));
|
|
27
|
+
}
|
|
28
|
+
try {
|
|
29
|
+
const NO_REPORT_CODES = ["71008"];
|
|
30
|
+
if (NO_REPORT_CODES.includes(err.code))
|
|
31
|
+
return;
|
|
32
|
+
const client = new DataServiceClient(this.config.services.data.url);
|
|
33
|
+
const bizId = uuidv4();
|
|
34
|
+
const userToken = this.config.identity.userToken;
|
|
35
|
+
const projectId = this.config.identity.projectId;
|
|
36
|
+
const title = err.message;
|
|
37
|
+
const content = JSON.stringify(err);
|
|
38
|
+
await client.alertTrigger(bizId, projectId, userToken, title, content);
|
|
39
|
+
}
|
|
40
|
+
catch (err) {
|
|
41
|
+
console.log("alertTrigger err:", err?.message, JSON.stringify(err));
|
|
42
|
+
}
|
|
43
|
+
throw err;
|
|
44
|
+
}
|
|
45
|
+
}
|
|
46
|
+
async _run(params, options = {}) {
|
|
18
47
|
const opts = getDefaultOptions(options);
|
|
19
48
|
console.log("do zkTLS");
|
|
20
49
|
const attestationData = await this.zktlsClient.doZkTLS(params, opts);
|
|
@@ -25,16 +54,18 @@ export class PoRClient {
|
|
|
25
54
|
if (opts.runZkvm && hasAny) {
|
|
26
55
|
console.log("do zkVM");
|
|
27
56
|
const result = await this.proverClient.doZkVM({
|
|
28
|
-
|
|
57
|
+
userToken: this.config.identity.userToken,
|
|
29
58
|
projectId: this.config.identity.projectId,
|
|
30
|
-
|
|
59
|
+
network: this.config.blockchain.network,
|
|
31
60
|
attestationData: JSON.stringify(attestationData),
|
|
32
|
-
zktlsMode: this.config.runtime.mode,
|
|
33
61
|
});
|
|
34
|
-
console.log("result", result);
|
|
62
|
+
// console.log("result", result);
|
|
35
63
|
return result;
|
|
36
64
|
}
|
|
37
65
|
return attestationData;
|
|
38
66
|
}
|
|
67
|
+
async tryWithdrawBalance(limit = 100) {
|
|
68
|
+
return await this.zktlsClient.tryWithdrawBalance(limit);
|
|
69
|
+
}
|
|
39
70
|
}
|
|
40
71
|
//# sourceMappingURL=por_client.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"por_client.js","sourceRoot":"","sources":["../../src/client/por_client.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;
|
|
1
|
+
{"version":3,"file":"por_client.js","sourceRoot":"","sources":["../../src/client/por_client.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,14 +1,13 @@
|
|
|
1
1
|
interface SubmitTaskInput {
|
|
2
|
-
|
|
2
|
+
userToken: string;
|
|
3
3
|
projectId: string;
|
|
4
|
-
|
|
4
|
+
network: string;
|
|
5
5
|
attestationData: string;
|
|
6
|
-
zktlsMode: string;
|
|
7
6
|
}
|
|
8
7
|
export declare class ProverClient {
|
|
9
8
|
private client;
|
|
10
9
|
constructor(url: string, timeout?: number);
|
|
11
|
-
uploadProgram(filePath: string, name: string, version: string, desc: string, prover?: string): Promise<any>;
|
|
10
|
+
uploadProgram(filePath: string, projectId: string, replace: boolean, name: string, version: string, desc: string, prover?: string): Promise<any>;
|
|
12
11
|
submitTask(input: SubmitTaskInput): Promise<any>;
|
|
13
12
|
getResult(taskId: string): Promise<any>;
|
|
14
13
|
private unwrap;
|
|
@@ -2,15 +2,17 @@ import axios from "axios";
|
|
|
2
2
|
import FormData from "form-data";
|
|
3
3
|
import fs from "fs";
|
|
4
4
|
import { ClientError } from "../error.js";
|
|
5
|
-
import { sleepMs,
|
|
5
|
+
import { sleepMs, makeErrData } from "../utils.js";
|
|
6
6
|
export class ProverClient {
|
|
7
7
|
client;
|
|
8
8
|
constructor(url, timeout = 30_000) {
|
|
9
9
|
this.client = axios.create({ baseURL: url, timeout });
|
|
10
10
|
}
|
|
11
|
-
async uploadProgram(filePath, name, version, desc, prover = "succinct") {
|
|
11
|
+
async uploadProgram(filePath, projectId, replace, name, version, desc, prover = "succinct") {
|
|
12
12
|
const form = new FormData();
|
|
13
13
|
form.append("file", fs.createReadStream(filePath));
|
|
14
|
+
form.append("project_id", projectId);
|
|
15
|
+
form.append("replace", replace ? "true" : "false");
|
|
14
16
|
form.append("prover", prover);
|
|
15
17
|
form.append("name", name);
|
|
16
18
|
form.append("version", version);
|
|
@@ -22,11 +24,10 @@ export class ProverClient {
|
|
|
22
24
|
}
|
|
23
25
|
async submitTask(input) {
|
|
24
26
|
const form = new FormData();
|
|
25
|
-
form.append("
|
|
27
|
+
form.append("user_token", input.userToken);
|
|
26
28
|
form.append("project_id", input.projectId);
|
|
27
|
-
form.append("
|
|
29
|
+
form.append("network", input.network);
|
|
28
30
|
form.append("attestation_data", input.attestationData);
|
|
29
|
-
form.append("zktls_mode", input.zktlsMode);
|
|
30
31
|
const res = await this.client.post("/submitTask", form, {
|
|
31
32
|
headers: form.getHeaders()
|
|
32
33
|
});
|
|
@@ -107,7 +108,6 @@ export class ProverClient {
|
|
|
107
108
|
if (!(err instanceof ClientError)) {
|
|
108
109
|
err = new ClientError("73099", `Do doZkVM failed`, makeErrData(err));
|
|
109
110
|
}
|
|
110
|
-
await mockErrorReport(err);
|
|
111
111
|
throw err;
|
|
112
112
|
}
|
|
113
113
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"prover_client.js","sourceRoot":"","sources":["../../src/client/prover_client.ts"],"names":[],"mappings":"AAAA,OAAO,KAAwB,MAAM,OAAO,CAAC;AAC7C,OAAO,QAAQ,MAAM,WAAW,CAAC;AACjC,OAAO,EAAE,MAAM,IAAI,CAAC;AACpB,OAAO,EAAE,WAAW,EAAE,MAAM,aAAa,CAAC;AAC1C,OAAO,EAAE,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"prover_client.js","sourceRoot":"","sources":["../../src/client/prover_client.ts"],"names":[],"mappings":"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"}
|
|
@@ -3,6 +3,7 @@ import { AppConfig } from "../config_schema.js";
|
|
|
3
3
|
export declare class ZkTLSClient {
|
|
4
4
|
private readonly config;
|
|
5
5
|
private primusNetwork;
|
|
6
|
+
private planType;
|
|
6
7
|
constructor(config: AppConfig);
|
|
7
8
|
/**
|
|
8
9
|
* Initialize PrimusNetwork SDK
|
|
@@ -29,4 +30,5 @@ export declare class ZkTLSClient {
|
|
|
29
30
|
*/
|
|
30
31
|
private _doZkTLS;
|
|
31
32
|
doZkTLS(params: RequestParamsInput, options?: Options): Promise<Record<string, any>>;
|
|
33
|
+
tryWithdrawBalance(limit?: number): Promise<boolean>;
|
|
32
34
|
}
|
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
import { PrimusNetwork } from "@primuslabs/network-core-sdk";
|
|
2
|
+
import { TokenSymbol } from "@primuslabs/network-core-sdk/dist/types";
|
|
2
3
|
import { ethers } from "ethers";
|
|
3
|
-
import { sleepMs,
|
|
4
|
+
import { sleepMs, makeErrData } from "../utils.js";
|
|
4
5
|
import { getDefaultOptions } from "../types.js";
|
|
5
6
|
import { ClientError } from "../error.js";
|
|
6
7
|
import { DataServiceClient } from "./data_service_client.js";
|
|
@@ -8,9 +9,11 @@ import { v4 as uuidv4 } from 'uuid';
|
|
|
8
9
|
export class ZkTLSClient {
|
|
9
10
|
config;
|
|
10
11
|
primusNetwork;
|
|
12
|
+
planType;
|
|
11
13
|
constructor(config) {
|
|
12
14
|
this.config = { ...config };
|
|
13
15
|
this.primusNetwork = new PrimusNetwork();
|
|
16
|
+
this.planType = 'UNKNOWN';
|
|
14
17
|
}
|
|
15
18
|
/**
|
|
16
19
|
* Initialize PrimusNetwork SDK
|
|
@@ -34,16 +37,31 @@ export class ZkTLSClient {
|
|
|
34
37
|
console.log("📝 Submitting zkTLS task...");
|
|
35
38
|
while (true) {
|
|
36
39
|
try {
|
|
40
|
+
if (this.planType === 'UNKNOWN') {
|
|
41
|
+
const client = new DataServiceClient(this.config.services.data.url);
|
|
42
|
+
const bizId = uuidv4();
|
|
43
|
+
const userToken = this.config.identity.userToken;
|
|
44
|
+
const projectId = this.config.identity.projectId;
|
|
45
|
+
const { subscriptionType } = await client.checkPayment(bizId, projectId, userToken);
|
|
46
|
+
console.log(`SubscriptionType: ${subscriptionType}`);
|
|
47
|
+
this.planType = 'SUBSCRIPTION';
|
|
48
|
+
if (subscriptionType === "PLAN_SELF_PAID") {
|
|
49
|
+
this.planType = 'SELF';
|
|
50
|
+
if (!this.config.blockchain.signer?.privateKey) {
|
|
51
|
+
throw new ClientError("71008", "Please set your private key at `app.blockchain.signer.privateKey`");
|
|
52
|
+
}
|
|
53
|
+
}
|
|
54
|
+
}
|
|
37
55
|
let result;
|
|
38
|
-
if (this.
|
|
56
|
+
if (this.planType === 'SELF') {
|
|
39
57
|
result = await this.primusNetwork.submitTask(attestParams);
|
|
40
58
|
}
|
|
41
|
-
else if (this.
|
|
59
|
+
else if (this.planType === 'SUBSCRIPTION') {
|
|
42
60
|
const client = new DataServiceClient(this.config.services.data.url);
|
|
43
61
|
const bizId = uuidv4();
|
|
44
|
-
const
|
|
62
|
+
const userToken = this.config.identity.userToken;
|
|
45
63
|
const projectId = this.config.identity.projectId;
|
|
46
|
-
const { taskId, taskTxHash, taskAttestors, submitterAddress } = await client.submitTask(bizId, projectId,
|
|
64
|
+
const { taskId, taskTxHash, taskAttestors, submitterAddress } = await client.submitTask(bizId, projectId, userToken);
|
|
47
65
|
result = { taskId, taskTxHash, taskAttestors };
|
|
48
66
|
attestParams.address = submitterAddress;
|
|
49
67
|
}
|
|
@@ -51,7 +69,7 @@ export class ZkTLSClient {
|
|
|
51
69
|
return result;
|
|
52
70
|
}
|
|
53
71
|
catch (err) {
|
|
54
|
-
const NO_RETRY_CODES = ["72001"]; // from data service client
|
|
72
|
+
const NO_RETRY_CODES = ["72001", "71008"]; // from data service client
|
|
55
73
|
if (err instanceof ClientError && NO_RETRY_CODES.includes(err.code))
|
|
56
74
|
throw err;
|
|
57
75
|
attempt++;
|
|
@@ -89,7 +107,7 @@ export class ZkTLSClient {
|
|
|
89
107
|
noProxy: opts.noProxy,
|
|
90
108
|
getAllJsonResponse: "true"
|
|
91
109
|
};
|
|
92
|
-
const result = await this.primusNetwork.attest(params,
|
|
110
|
+
const result = await this.primusNetwork.attest(params, 3 * 60 * 1000);
|
|
93
111
|
console.log(`✅ attest done (${Date.now() - start}ms):`, result);
|
|
94
112
|
return result;
|
|
95
113
|
}
|
|
@@ -207,7 +225,6 @@ export class ZkTLSClient {
|
|
|
207
225
|
if (!(err instanceof ClientError)) {
|
|
208
226
|
err = new ClientError("71099", `Do zkTLS failed`, makeErrData(err));
|
|
209
227
|
}
|
|
210
|
-
await mockErrorReport(err);
|
|
211
228
|
throw err;
|
|
212
229
|
}
|
|
213
230
|
}
|
|
@@ -219,9 +236,25 @@ export class ZkTLSClient {
|
|
|
219
236
|
const reqParams = cb();
|
|
220
237
|
if (!reqParams)
|
|
221
238
|
continue; // skip undefined requestParams
|
|
239
|
+
console.log(`Run ${key}`);
|
|
222
240
|
attestations[key] = await this._doZkTLS(reqParams, options, cb);
|
|
223
241
|
}
|
|
242
|
+
attestations["__meta__"] = {
|
|
243
|
+
projectId: this.config.identity.projectId,
|
|
244
|
+
};
|
|
224
245
|
return attestations;
|
|
225
246
|
}
|
|
247
|
+
async tryWithdrawBalance(limit = 100) {
|
|
248
|
+
if (this.planType != "SELF")
|
|
249
|
+
return true;
|
|
250
|
+
try {
|
|
251
|
+
await this.primusNetwork.withdrawBalance(TokenSymbol.ETH, limit);
|
|
252
|
+
return true;
|
|
253
|
+
}
|
|
254
|
+
catch (err) {
|
|
255
|
+
console.log("tryWithdrawBalance failed:", err?.message, JSON.stringify(err));
|
|
256
|
+
}
|
|
257
|
+
return false;
|
|
258
|
+
}
|
|
226
259
|
}
|
|
227
260
|
//# sourceMappingURL=zktls_client.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"zktls_client.js","sourceRoot":"","sources":["../../src/client/zktls_client.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,8BAA8B,CAAC;AAC7D,OAAO,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAChC,OAAO,EAAE,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"zktls_client.js","sourceRoot":"","sources":["../../src/client/zktls_client.ts"],"names":[],"mappings":"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"}
|
package/dist/config_schema.d.ts
CHANGED
|
@@ -38,30 +38,26 @@ export declare const AsterAccountSchema: z.ZodObject<{
|
|
|
38
38
|
export type AsterAccount = z.infer<typeof AsterAccountSchema>;
|
|
39
39
|
declare const AppConfigSchema: z.ZodObject<{
|
|
40
40
|
identity: z.ZodObject<{
|
|
41
|
-
|
|
41
|
+
userToken: z.ZodString;
|
|
42
42
|
projectId: z.ZodString;
|
|
43
|
-
|
|
44
|
-
}, z.core.$strip>;
|
|
43
|
+
}, z.core.$strict>;
|
|
45
44
|
runtime: z.ZodObject<{
|
|
46
45
|
version: z.ZodString;
|
|
47
46
|
env: z.ZodDefault<z.ZodEnum<{
|
|
48
47
|
development: "development";
|
|
49
48
|
production: "production";
|
|
50
49
|
}>>;
|
|
51
|
-
mode: z.ZodDefault<z.ZodEnum<{
|
|
52
|
-
POR: "POR";
|
|
53
|
-
DVC: "DVC";
|
|
54
|
-
}>>;
|
|
55
50
|
logVerbose: z.ZodDefault<z.ZodNumber>;
|
|
56
|
-
|
|
51
|
+
jobInterval: z.ZodDefault<z.ZodNumber>;
|
|
52
|
+
}, z.core.$strict>;
|
|
57
53
|
services: z.ZodObject<{
|
|
58
54
|
zkvm: z.ZodObject<{
|
|
59
55
|
url: z.ZodURL;
|
|
60
|
-
}, z.core.$
|
|
56
|
+
}, z.core.$strict>;
|
|
61
57
|
data: z.ZodObject<{
|
|
62
58
|
url: z.ZodURL;
|
|
63
|
-
}, z.core.$
|
|
64
|
-
}, z.core.$
|
|
59
|
+
}, z.core.$strict>;
|
|
60
|
+
}, z.core.$strict>;
|
|
65
61
|
blockchain: z.ZodObject<{
|
|
66
62
|
network: z.ZodDefault<z.ZodEnum<{
|
|
67
63
|
base: "base";
|
|
@@ -70,9 +66,9 @@ declare const AppConfigSchema: z.ZodObject<{
|
|
|
70
66
|
rpcUrl: z.ZodOptional<z.ZodURL>;
|
|
71
67
|
signer: z.ZodOptional<z.ZodObject<{
|
|
72
68
|
privateKey: z.ZodString;
|
|
73
|
-
}, z.core.$
|
|
74
|
-
}, z.core.$
|
|
75
|
-
}, z.core.$
|
|
69
|
+
}, z.core.$strict>>;
|
|
70
|
+
}, z.core.$strict>;
|
|
71
|
+
}, z.core.$strict>;
|
|
76
72
|
declare const ExchangesConfigSchema: z.ZodObject<{
|
|
77
73
|
binance: z.ZodOptional<z.ZodArray<z.ZodObject<{
|
|
78
74
|
apiKey: z.ZodString;
|
|
@@ -100,30 +96,26 @@ declare const ExchangesConfigSchema: z.ZodObject<{
|
|
|
100
96
|
declare const ConfigSchema: z.ZodObject<{
|
|
101
97
|
app: z.ZodObject<{
|
|
102
98
|
identity: z.ZodObject<{
|
|
103
|
-
|
|
99
|
+
userToken: z.ZodString;
|
|
104
100
|
projectId: z.ZodString;
|
|
105
|
-
|
|
106
|
-
}, z.core.$strip>;
|
|
101
|
+
}, z.core.$strict>;
|
|
107
102
|
runtime: z.ZodObject<{
|
|
108
103
|
version: z.ZodString;
|
|
109
104
|
env: z.ZodDefault<z.ZodEnum<{
|
|
110
105
|
development: "development";
|
|
111
106
|
production: "production";
|
|
112
107
|
}>>;
|
|
113
|
-
mode: z.ZodDefault<z.ZodEnum<{
|
|
114
|
-
POR: "POR";
|
|
115
|
-
DVC: "DVC";
|
|
116
|
-
}>>;
|
|
117
108
|
logVerbose: z.ZodDefault<z.ZodNumber>;
|
|
118
|
-
|
|
109
|
+
jobInterval: z.ZodDefault<z.ZodNumber>;
|
|
110
|
+
}, z.core.$strict>;
|
|
119
111
|
services: z.ZodObject<{
|
|
120
112
|
zkvm: z.ZodObject<{
|
|
121
113
|
url: z.ZodURL;
|
|
122
|
-
}, z.core.$
|
|
114
|
+
}, z.core.$strict>;
|
|
123
115
|
data: z.ZodObject<{
|
|
124
116
|
url: z.ZodURL;
|
|
125
|
-
}, z.core.$
|
|
126
|
-
}, z.core.$
|
|
117
|
+
}, z.core.$strict>;
|
|
118
|
+
}, z.core.$strict>;
|
|
127
119
|
blockchain: z.ZodObject<{
|
|
128
120
|
network: z.ZodDefault<z.ZodEnum<{
|
|
129
121
|
base: "base";
|
|
@@ -132,9 +124,9 @@ declare const ConfigSchema: z.ZodObject<{
|
|
|
132
124
|
rpcUrl: z.ZodOptional<z.ZodURL>;
|
|
133
125
|
signer: z.ZodOptional<z.ZodObject<{
|
|
134
126
|
privateKey: z.ZodString;
|
|
135
|
-
}, z.core.$
|
|
136
|
-
}, z.core.$
|
|
137
|
-
}, z.core.$
|
|
127
|
+
}, z.core.$strict>>;
|
|
128
|
+
}, z.core.$strict>;
|
|
129
|
+
}, z.core.$strict>;
|
|
138
130
|
exchanges: z.ZodObject<{
|
|
139
131
|
binance: z.ZodOptional<z.ZodArray<z.ZodObject<{
|
|
140
132
|
apiKey: z.ZodString;
|
|
@@ -159,7 +151,7 @@ declare const ConfigSchema: z.ZodObject<{
|
|
|
159
151
|
}>>;
|
|
160
152
|
}, z.core.$strip>>>;
|
|
161
153
|
}, z.core.$strict>;
|
|
162
|
-
}, z.core.$
|
|
154
|
+
}, z.core.$strict>;
|
|
163
155
|
export type AppConfig = z.infer<typeof AppConfigSchema>;
|
|
164
156
|
export type ExchangesConfig = z.infer<typeof ExchangesConfigSchema>;
|
|
165
157
|
export type Config = z.infer<typeof ConfigSchema>;
|
package/dist/config_schema.js
CHANGED
|
@@ -16,40 +16,39 @@ const AccountSchema = (kind) => BaseAccountSchema.extend({
|
|
|
16
16
|
export const BinanceAccountSchema = AccountSchema(BinanceKindSchema);
|
|
17
17
|
export const AsterAccountSchema = AccountSchema(AsterKindSchema);
|
|
18
18
|
const AppIdentitySchema = z.object({
|
|
19
|
-
|
|
19
|
+
userToken: z.string().min(1),
|
|
20
20
|
projectId: z.string().min(1),
|
|
21
|
-
|
|
22
|
-
});
|
|
21
|
+
}).strict();
|
|
23
22
|
const AppRuntimeSchema = z.object({
|
|
24
23
|
version: z.string().regex(/^\d+\.\d+\.\d+$/),
|
|
25
24
|
env: z.enum(["development", "production"]).default("production"),
|
|
26
|
-
mode: z.enum(["POR", "DVC"]).default("POR"),
|
|
27
25
|
logVerbose: z.number().int().min(0).max(5).default(0),
|
|
28
|
-
|
|
26
|
+
jobInterval: z.number().int().min(10).default(1800),
|
|
27
|
+
}).strict();
|
|
29
28
|
const ZkvmServiceSchema = z.object({
|
|
30
29
|
url: z.url(),
|
|
31
|
-
});
|
|
30
|
+
}).strict();
|
|
32
31
|
const DataServiceSchema = z.object({
|
|
33
32
|
url: z.url(),
|
|
34
|
-
});
|
|
33
|
+
}).strict();
|
|
35
34
|
const AppServicesSchema = z.object({
|
|
36
35
|
zkvm: ZkvmServiceSchema,
|
|
37
36
|
data: DataServiceSchema,
|
|
38
|
-
});
|
|
37
|
+
}).strict();
|
|
39
38
|
const BlockchainSignerSchema = z.object({
|
|
40
39
|
privateKey: z.string(),
|
|
41
|
-
});
|
|
40
|
+
}).strict();
|
|
42
41
|
const BlockchainSchema = z.object({
|
|
43
42
|
network: z.enum(["base", "base-sepolia"]).default("base"),
|
|
44
43
|
rpcUrl: z.url().optional(),
|
|
45
44
|
signer: BlockchainSignerSchema.optional(),
|
|
46
|
-
});
|
|
45
|
+
}).strict();
|
|
47
46
|
const AppConfigSchema = z.object({
|
|
48
47
|
identity: AppIdentitySchema,
|
|
49
48
|
runtime: AppRuntimeSchema,
|
|
50
49
|
services: AppServicesSchema,
|
|
51
50
|
blockchain: BlockchainSchema,
|
|
52
|
-
});
|
|
51
|
+
}).strict();
|
|
53
52
|
const ExchangesConfigSchema = z.object({
|
|
54
53
|
binance: z.array(BinanceAccountSchema).optional(),
|
|
55
54
|
aster: z.array(AsterAccountSchema).optional(),
|
|
@@ -60,15 +59,33 @@ const ExchangesConfigSchema = z.object({
|
|
|
60
59
|
const ConfigSchema = z.object({
|
|
61
60
|
app: AppConfigSchema,
|
|
62
61
|
exchanges: ExchangesConfigSchema,
|
|
63
|
-
}).
|
|
64
|
-
|
|
65
|
-
|
|
62
|
+
}).strict();
|
|
63
|
+
function mask(value) {
|
|
64
|
+
if (!value)
|
|
65
|
+
return "";
|
|
66
|
+
const len = value.length;
|
|
67
|
+
if (len <= 8)
|
|
68
|
+
return "*".repeat(len);
|
|
69
|
+
return value.slice(0, 4) + "*".repeat(3) + value.slice(-4);
|
|
70
|
+
}
|
|
71
|
+
const SENSITIVE_KEYS = ["userToken", "privateKey", "apiKey", "apiSecret"];
|
|
72
|
+
function maskConfig(obj) {
|
|
73
|
+
if (Array.isArray(obj))
|
|
74
|
+
return obj.map(maskConfig);
|
|
75
|
+
if (obj && typeof obj === "object") {
|
|
76
|
+
const res = {};
|
|
77
|
+
for (const key in obj) {
|
|
78
|
+
if (SENSITIVE_KEYS.includes(key)) {
|
|
79
|
+
res[key] = mask(obj[key]);
|
|
80
|
+
}
|
|
81
|
+
else {
|
|
82
|
+
res[key] = maskConfig(obj[key]);
|
|
83
|
+
}
|
|
84
|
+
}
|
|
85
|
+
return res;
|
|
66
86
|
}
|
|
67
|
-
return
|
|
68
|
-
}
|
|
69
|
-
message: "signer is required when mode is DVC",
|
|
70
|
-
path: ["app", "blockchain", "signer"],
|
|
71
|
-
});
|
|
87
|
+
return obj;
|
|
88
|
+
}
|
|
72
89
|
export function loadConfigFromFile(filePath = ".config.yml") {
|
|
73
90
|
const absolutePath = path.resolve(filePath);
|
|
74
91
|
if (!fs.existsSync(absolutePath)) {
|
|
@@ -83,6 +100,7 @@ export function loadConfigFromFile(filePath = ".config.yml") {
|
|
|
83
100
|
throw new Error(`Failed to parse JSON config: ${err.message}`);
|
|
84
101
|
}
|
|
85
102
|
const config = ConfigSchema.parse(parsed);
|
|
103
|
+
console.log(JSON.stringify(maskConfig(config), null, 2));
|
|
86
104
|
return config;
|
|
87
105
|
}
|
|
88
106
|
//# sourceMappingURL=config_schema.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"config_schema.js","sourceRoot":"","sources":["../src/config_schema.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,IAAI,CAAC;AACpB,OAAO,IAAI,MAAM,MAAM,CAAC;AACxB,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AACxB,OAAO,IAAI,MAAM,SAAS,CAAC;AAI3B,MAAM,iBAAiB,GAAG,CAAC,CAAC,IAAI,CAAC,CAAC,MAAM,EAAE,cAAc,EAAE,cAAc,EAAE,SAAS,CAAC,CAAC,CAAC;AACtF,MAAM,eAAe,GAAG,CAAC,CAAC,IAAI,CAAC,CAAC,MAAM,EAAE,cAAc,CAAC,CAAC,CAAC;AAIzD,MAAM,iBAAiB,GAAG,CAAC,CAAC,MAAM,CAAC;IACjC,MAAM,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC;IACzB,SAAS,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC;IAC5B,OAAO,EAAE,CAAC,CAAC,OAAO,EAAE,CAAC,QAAQ,EAAE,CAAC,OAAO,CAAC,IAAI,CAAC;IAC7C,WAAW,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE,CAAC,OAAO,CAAC,EAAE,CAAC;CAC/C,CAAC,CAAC;AACH,MAAM,aAAa,GAAG,CAAyB,IAAO,EAAE,EAAE,CACxD,iBAAiB,CAAC,MAAM,CAAC;IACvB,IAAI,EAAE,CAAC,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,GAAG,CAAC,EAAE,CAAC,IAAI,GAAG,CAAC,GAAG,CAAC,CAAC,IAAI,KAAK,GAAG,CAAC,MAAM,EAAE,EAAE,OAAO,EAAE,qBAAqB,EAAE,CAAC;CAC/G,CAAC,CAAC;AAEL,MAAM,CAAC,MAAM,oBAAoB,GAAG,aAAa,CAAC,iBAAiB,CAAC,CAAC;AAGrE,MAAM,CAAC,MAAM,kBAAkB,GAAG,aAAa,CAAC,eAAe,CAAC,CAAC;AAGjE,MAAM,iBAAiB,GAAG,CAAC,CAAC,MAAM,CAAC;IACjC,
|
|
1
|
+
{"version":3,"file":"config_schema.js","sourceRoot":"","sources":["../src/config_schema.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"base_exchange.js","sourceRoot":"","sources":["../../src/datasource/base_exchange.ts"],"names":[],"mappings":"AAAA,MAAM,OAAgB,YAAY;IAIb,QAAQ,CAAe;IACvB,UAAU,GAAW,EAAE,CAAC;
|
|
1
|
+
{"version":3,"file":"base_exchange.js","sourceRoot":"","sources":["../../src/datasource/base_exchange.ts"],"names":[],"mappings":"AAAA,MAAM,OAAgB,YAAY;IAIb,QAAQ,CAAe;IACvB,UAAU,GAAW,EAAE,GAAG,IAAI,CAAC;IAElD,YAAY,QAAuB;QACjC,IAAI,CAAC,QAAQ,GAAG,CAAC,QAAQ,IAAI,EAAE,CAAC,CAAC,MAAM,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,OAAO,IAAI,IAAI,CAAC,CAAC,CAAC,uBAAuB;IAC9F,CAAC;IAES,WAAW,CAAC,IAAQ;QAC5B,IAAI,CAAC,IAAI;YAAE,OAAO,CAAC,GAAG,IAAI,CAAC,QAAQ,CAAC,CAAC;QACrC,OAAO,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,CAAC;IAC9D,CAAC;CACF"}
|
|
@@ -37,5 +37,6 @@ export declare class Binance extends BaseExchange<BinanceAccount, BinanceKind> {
|
|
|
37
37
|
}[];
|
|
38
38
|
getSpotAccountInfoRequests(verifyType?: VERIFY_TYPE): RequestParamsOutput;
|
|
39
39
|
getUsdSFutureAccountBalanceV3Requests(verifyType?: VERIFY_TYPE): RequestParamsOutput;
|
|
40
|
+
getCoinFutureAccountBalanceRequests(verifyType?: VERIFY_TYPE): RequestParamsOutput;
|
|
40
41
|
getUnifiedAccountBalanceRequests(verifyType?: VERIFY_TYPE): RequestParamsOutput;
|
|
41
42
|
}
|
|
@@ -44,6 +44,19 @@ export class Binance extends BaseExchange {
|
|
|
44
44
|
}
|
|
45
45
|
return makeHashComparisonParams(origRequests, verifyType);
|
|
46
46
|
}
|
|
47
|
+
/// doc: https://developers.binance.com/docs/derivatives/coin-margined-futures/account/rest-api/Futures-Account-Balance
|
|
48
|
+
/// api: https://dapi.binance.com/dapi/v1/balance
|
|
49
|
+
getCoinFutureAccountBalanceRequests(verifyType = 'HASH_COMPARISON') {
|
|
50
|
+
if (!this.hasCoinFutures)
|
|
51
|
+
return undefined;
|
|
52
|
+
const signParams = { recvWindow: this.recvWindow };
|
|
53
|
+
const origRequests = [];
|
|
54
|
+
for (const acc of this.usdSFuturesAccounts) {
|
|
55
|
+
const exchange = new ccxt.binance({ apiKey: acc.apiKey, secret: acc.apiSecret });
|
|
56
|
+
origRequests.push(exchange.sign("balance", "dapiPrivate", "GET", { ...signParams }));
|
|
57
|
+
}
|
|
58
|
+
return makeHashComparisonParams(origRequests, verifyType);
|
|
59
|
+
}
|
|
47
60
|
/// doc: https://developers.binance.com/docs/derivatives/portfolio-margin/account
|
|
48
61
|
/// api: https://papi.binance.com/papi/v1/balance
|
|
49
62
|
getUnifiedAccountBalanceRequests(verifyType = 'HASH_COMPARISON') {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"binance.js","sourceRoot":"","sources":["../../src/datasource/binance.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"binance.js","sourceRoot":"","sources":["../../src/datasource/binance.ts"],"names":[],"mappings":"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"}
|
package/dist/datasource/index.js
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/datasource/index.ts"],"names":[],"mappings":"AAAA,cAAc,WAAW,CAAC;AAC1B,cAAc,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/datasource/index.ts"],"names":[],"mappings":"AAAA,cAAc,WAAW,CAAC;AAC1B,cAAc,SAAS,CAAC;AACxB,cAAc,oBAAoB,CAAC"}
|
package/dist/index.d.ts
CHANGED
package/dist/index.js
CHANGED
package/dist/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,cAAc,SAAS,CAAC;AACxB,cAAc,SAAS,CAAC;AACxB,cAAc,UAAU,CAAC;AACzB,OAAO,KAAK,UAAU,MAAM,cAAc,CAAC;AAC3C,OAAO,EAAE,kBAAkB,EAAE,MAAM,iBAAiB,CAAC"}
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,cAAc,SAAS,CAAC;AACxB,cAAc,SAAS,CAAC;AACxB,cAAc,UAAU,CAAC;AACzB,OAAO,KAAK,UAAU,MAAM,cAAc,CAAC;AAC3C,OAAO,EAAE,kBAAkB,EAAE,MAAM,iBAAiB,CAAC;AACrD,OAAO,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC"}
|
|
@@ -0,0 +1,17 @@
|
|
|
1
|
+
type JobFn = () => Promise<void>;
|
|
2
|
+
interface SchedulerOptions {
|
|
3
|
+
intervalMs: number;
|
|
4
|
+
shouldStop?: (err: any) => boolean;
|
|
5
|
+
stopMode?: "immediate" | "delayed";
|
|
6
|
+
}
|
|
7
|
+
export declare class Scheduler {
|
|
8
|
+
private job;
|
|
9
|
+
private opts;
|
|
10
|
+
private stopped;
|
|
11
|
+
private lastSigintTime;
|
|
12
|
+
private sigintCount;
|
|
13
|
+
constructor(job: JobFn, opts: SchedulerOptions);
|
|
14
|
+
stop(signal?: string): void;
|
|
15
|
+
start(): Promise<void>;
|
|
16
|
+
}
|
|
17
|
+
export {};
|
|
@@ -0,0 +1,75 @@
|
|
|
1
|
+
import { sleepMs } from "./utils.js";
|
|
2
|
+
export class Scheduler {
|
|
3
|
+
job;
|
|
4
|
+
opts;
|
|
5
|
+
stopped = false;
|
|
6
|
+
lastSigintTime = 0;
|
|
7
|
+
sigintCount = 0;
|
|
8
|
+
constructor(job, opts) {
|
|
9
|
+
this.job = job;
|
|
10
|
+
this.opts = opts;
|
|
11
|
+
if (!this.opts.stopMode)
|
|
12
|
+
this.opts.stopMode = "delayed";
|
|
13
|
+
process.on("SIGTERM", () => this.stop("SIGTERM"));
|
|
14
|
+
process.on("SIGINT", () => this.stop("SIGINT"));
|
|
15
|
+
}
|
|
16
|
+
stop(signal) {
|
|
17
|
+
if (signal) {
|
|
18
|
+
if (signal !== "SIGINT") {
|
|
19
|
+
console.log(`🛑 Received ${signal}.`);
|
|
20
|
+
}
|
|
21
|
+
}
|
|
22
|
+
else {
|
|
23
|
+
console.log("🛑 Stop requested.");
|
|
24
|
+
}
|
|
25
|
+
const now = Date.now();
|
|
26
|
+
if (signal === "SIGINT") {
|
|
27
|
+
if (now - this.lastSigintTime <= 2000) {
|
|
28
|
+
this.sigintCount++;
|
|
29
|
+
}
|
|
30
|
+
else {
|
|
31
|
+
this.sigintCount = 1;
|
|
32
|
+
}
|
|
33
|
+
this.lastSigintTime = now;
|
|
34
|
+
if (this.sigintCount >= 2) {
|
|
35
|
+
process.exit(1);
|
|
36
|
+
}
|
|
37
|
+
else {
|
|
38
|
+
console.log(`🛑 Received ${signal}. (Press twice Ctrl + C to exit)`);
|
|
39
|
+
}
|
|
40
|
+
}
|
|
41
|
+
this.stopped = true;
|
|
42
|
+
}
|
|
43
|
+
async start() {
|
|
44
|
+
const intervalMs = this.opts.intervalMs;
|
|
45
|
+
console.log(`Start Scheduler at ${new Date().toISOString()} with job interval: ${intervalMs} (ms)`);
|
|
46
|
+
while (!this.stopped) {
|
|
47
|
+
const startedAt = Date.now();
|
|
48
|
+
console.log("🚀 job start", new Date().toISOString());
|
|
49
|
+
let shouldStop = false;
|
|
50
|
+
try {
|
|
51
|
+
await this.job();
|
|
52
|
+
}
|
|
53
|
+
catch (err) {
|
|
54
|
+
shouldStop = this.opts.shouldStop?.(err) ?? false;
|
|
55
|
+
}
|
|
56
|
+
console.log("✅ job done", new Date().toISOString());
|
|
57
|
+
const elapsedMs = Date.now() - startedAt;
|
|
58
|
+
const delayMs = Math.max(0, intervalMs - elapsedMs);
|
|
59
|
+
if (shouldStop && this.opts.stopMode === "immediate") {
|
|
60
|
+
console.log("🔁 stop immediately due to error");
|
|
61
|
+
this.stopped = true;
|
|
62
|
+
}
|
|
63
|
+
if (!this.stopped) {
|
|
64
|
+
console.log(`⏳ Next in ${delayMs} ms ...`);
|
|
65
|
+
await sleepMs(delayMs);
|
|
66
|
+
}
|
|
67
|
+
if (shouldStop && this.opts.stopMode === "delayed") {
|
|
68
|
+
console.log("🔁 delayed stop triggered after interval");
|
|
69
|
+
this.stopped = true;
|
|
70
|
+
}
|
|
71
|
+
}
|
|
72
|
+
console.log("👋 Scheduler exited");
|
|
73
|
+
}
|
|
74
|
+
}
|
|
75
|
+
//# sourceMappingURL=scheduler.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"scheduler.js","sourceRoot":"","sources":["../src/scheduler.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,YAAY,CAAC;AAUrC,MAAM,OAAO,SAAS;IAMV;IACA;IANF,OAAO,GAAG,KAAK,CAAC;IAChB,cAAc,GAAG,CAAC,CAAC;IACnB,WAAW,GAAG,CAAC,CAAC;IAExB,YACU,GAAU,EACV,IAAsB;QADtB,QAAG,GAAH,GAAG,CAAO;QACV,SAAI,GAAJ,IAAI,CAAkB;QAE9B,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,QAAQ;YAAE,IAAI,CAAC,IAAI,CAAC,QAAQ,GAAG,SAAS,CAAC;QAExD,OAAO,CAAC,EAAE,CAAC,SAAS,EAAE,GAAG,EAAE,CAAC,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC;QAClD,OAAO,CAAC,EAAE,CAAC,QAAQ,EAAE,GAAG,EAAE,CAAC,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC,CAAC;IAClD,CAAC;IAED,IAAI,CAAC,MAAe;QAClB,IAAI,MAAM,EAAE,CAAC;YACX,IAAI,MAAM,KAAK,QAAQ,EAAE,CAAC;gBACxB,OAAO,CAAC,GAAG,CAAC,eAAe,MAAM,GAAG,CAAC,CAAC;YACxC,CAAC;QACH,CAAC;aAAM,CAAC;YACN,OAAO,CAAC,GAAG,CAAC,oBAAoB,CAAC,CAAC;QACpC,CAAC;QAED,MAAM,GAAG,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC;QACvB,IAAI,MAAM,KAAK,QAAQ,EAAE,CAAC;YACxB,IAAI,GAAG,GAAG,IAAI,CAAC,cAAc,IAAI,IAAI,EAAE,CAAC;gBAAC,IAAI,CAAC,WAAW,EAAE,CAAC;YAAC,CAAC;iBACzD,CAAC;gBAAC,IAAI,CAAC,WAAW,GAAG,CAAC,CAAC;YAAC,CAAC;YAC9B,IAAI,CAAC,cAAc,GAAG,GAAG,CAAC;YAC1B,IAAI,IAAI,CAAC,WAAW,IAAI,CAAC,EAAE,CAAC;gBAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;YAAC,CAAC;iBAC1C,CAAC;gBAAC,OAAO,CAAC,GAAG,CAAC,eAAe,MAAM,kCAAkC,CAAC,CAAC;YAAC,CAAC;QAChF,CAAC;QAED,IAAI,CAAC,OAAO,GAAG,IAAI,CAAC;IACtB,CAAC;IAED,KAAK,CAAC,KAAK;QACT,MAAM,UAAU,GAAG,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC;QACxC,OAAO,CAAC,GAAG,CAAC,sBAAsB,IAAI,IAAI,EAAE,CAAC,WAAW,EAAE,uBAAuB,UAAU,OAAO,CAAC,CAAC;QAEpG,OAAO,CAAC,IAAI,CAAC,OAAO,EAAE,CAAC;YACrB,MAAM,SAAS,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC;YAE7B,OAAO,CAAC,GAAG,CAAC,cAAc,EAAE,IAAI,IAAI,EAAE,CAAC,WAAW,EAAE,CAAC,CAAC;YACtD,IAAI,UAAU,GAAG,KAAK,CAAC;YACvB,IAAI,CAAC;gBACH,MAAM,IAAI,CAAC,GAAG,EAAE,CAAC;YACnB,CAAC;YAAC,OAAO,GAAQ,EAAE,CAAC;gBAClB,UAAU,GAAG,IAAI,CAAC,IAAI,CAAC,UAAU,EAAE,CAAC,GAAG,CAAC,IAAI,KAAK,CAAC;YACpD,CAAC;YACD,OAAO,CAAC,GAAG,CAAC,YAAY,EAAE,IAAI,IAAI,EAAE,CAAC,WAAW,EAAE,CAAC,CAAC;YAEpD,MAAM,SAAS,GAAG,IAAI,CAAC,GAAG,EAAE,GAAG,SAAS,CAAC;YACzC,MAAM,OAAO,GAAG,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,UAAU,GAAG,SAAS,CAAC,CAAC;YAEpD,IAAI,UAAU,IAAI,IAAI,CAAC,IAAI,CAAC,QAAQ,KAAK,WAAW,EAAE,CAAC;gBACrD,OAAO,CAAC,GAAG,CAAC,kCAAkC,CAAC,CAAC;gBAChD,IAAI,CAAC,OAAO,GAAG,IAAI,CAAC;YACtB,CAAC;YAED,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,CAAC;gBAClB,OAAO,CAAC,GAAG,CAAC,aAAa,OAAO,SAAS,CAAC,CAAC;gBAC3C,MAAM,OAAO,CAAC,OAAO,CAAC,CAAC;YACzB,CAAC;YAED,IAAI,UAAU,IAAI,IAAI,CAAC,IAAI,CAAC,QAAQ,KAAK,SAAS,EAAE,CAAC;gBACnD,OAAO,CAAC,GAAG,CAAC,0CAA0C,CAAC,CAAC;gBACxD,IAAI,CAAC,OAAO,GAAG,IAAI,CAAC;YACtB,CAAC;QACH,CAAC;QAED,OAAO,CAAC,GAAG,CAAC,qBAAqB,CAAC,CAAC;IACrC,CAAC;CACF"}
|
package/dist/utils.d.ts
CHANGED
|
@@ -1,4 +1,3 @@
|
|
|
1
|
-
import { ClientError } from "./error.js";
|
|
2
1
|
/**
|
|
3
2
|
* Save data to file
|
|
4
3
|
*/
|
|
@@ -9,4 +8,3 @@ export declare function saveToFile(filepath: string, data: string | Buffer): voi
|
|
|
9
8
|
export declare function sleepMs(ms: number): Promise<void>;
|
|
10
9
|
export declare function assertEnvVars<T extends Record<string, any>>(obj: T, keys: readonly (keyof T)[]): void;
|
|
11
10
|
export declare function makeErrData(err: any): Record<string, any> | undefined;
|
|
12
|
-
export declare function mockErrorReport(err: ClientError): Promise<void>;
|
package/dist/utils.js
CHANGED
|
@@ -28,11 +28,6 @@ export function makeErrData(err) {
|
|
|
28
28
|
errData.message = err.message;
|
|
29
29
|
if (err.data)
|
|
30
30
|
errData.data = err.data;
|
|
31
|
-
console.log("makeErrData:", errData);
|
|
32
31
|
return errData;
|
|
33
32
|
}
|
|
34
|
-
export async function mockErrorReport(err) {
|
|
35
|
-
// TODO:
|
|
36
|
-
console.log('mockErrorReport: ', JSON.stringify(err));
|
|
37
|
-
}
|
|
38
33
|
//# sourceMappingURL=utils.js.map
|
package/dist/utils.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../src/utils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,IAAI,CAAC;
|
|
1
|
+
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../src/utils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,IAAI,CAAC;AAEpB;;GAEG;AACH,MAAM,UAAU,UAAU,CAAC,QAAgB,EAAE,IAAqB;IAChE,EAAE,CAAC,aAAa,CAAC,QAAQ,EAAE,IAAI,CAAC,CAAC;AACnC,CAAC;AAED;;GAEG;AACH,MAAM,CAAC,KAAK,UAAU,OAAO,CAAC,EAAU;IACtC,OAAO,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,UAAU,CAAC,OAAO,EAAE,EAAE,CAAC,CAAC,CAAC;AAC3D,CAAC;AAED,MAAM,UAAU,aAAa,CAAgC,GAAM,EAAE,IAA0B;IAC7F,KAAK,MAAM,GAAG,IAAI,IAAI,EAAE,CAAC;QACvB,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE,CAAC;YACd,MAAM,IAAI,KAAK,CAAC,kCAAkC,MAAM,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;QACnE,CAAC;IACH,CAAC;AACH,CAAC;AAED,MAAM,UAAU,WAAW,CAAC,GAAQ;IAClC,IAAI,CAAC,GAAG;QAAE,OAAO,SAAS,CAAC;IAE3B,MAAM,OAAO,GAAwB,EAAE,CAAC;IACxC,IAAI,GAAG,CAAC,IAAI;QAAE,OAAO,CAAC,IAAI,GAAG,GAAG,CAAC,IAAI,CAAC;IACtC,IAAI,GAAG,CAAC,OAAO;QAAE,OAAO,CAAC,OAAO,GAAG,GAAG,CAAC,OAAO,CAAC;IAC/C,IAAI,GAAG,CAAC,IAAI;QAAE,OAAO,CAAC,IAAI,GAAG,GAAG,CAAC,IAAI,CAAC;IACtC,OAAO,OAAO,CAAC;AACjB,CAAC"}
|