zkcloudworker 0.23.7 → 0.23.8
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/node/index.cjs +8 -14
- package/dist/node/mina/transactions/send.d.ts +1 -0
- package/dist/node/mina/transactions/send.js +8 -15
- package/dist/node/mina/transactions/send.js.map +1 -1
- package/dist/web/mina/transactions/send.d.ts +1 -0
- package/dist/web/mina/transactions/send.js +8 -15
- package/dist/web/mina/transactions/send.js.map +1 -1
- package/package.json +1 -1
- package/src/mina/transactions/send.ts +10 -14
package/dist/node/index.cjs
CHANGED
|
@@ -2418,7 +2418,7 @@ var TinyContract = class extends import_o1js9.SmartContract {
|
|
|
2418
2418
|
// dist/node/mina/transactions/send.js
|
|
2419
2419
|
var import_o1js10 = require("o1js");
|
|
2420
2420
|
async function sendTx(params) {
|
|
2421
|
-
const { tx, description = "", verbose = true, wait = true, chain = getCurrentNetwork().network.chainId, delay = chain === "zeko" ? 5e3 : 3e4 } = params;
|
|
2421
|
+
const { tx, description = "", verbose = true, wait = true, chain = getCurrentNetwork().network.chainId, delay = chain === "zeko" || chain === "lightnet" ? 5e3 : 3e4, retry = 3 } = params;
|
|
2422
2422
|
const accountUpdates = JSON.parse(tx.toJSON()).accountUpdates;
|
|
2423
2423
|
const auCount = [];
|
|
2424
2424
|
let proofAuthorizationCount = 0;
|
|
@@ -2447,32 +2447,26 @@ async function sendTx(params) {
|
|
|
2447
2447
|
try {
|
|
2448
2448
|
let txSent;
|
|
2449
2449
|
let sent = false;
|
|
2450
|
-
let
|
|
2451
|
-
while (!sent &&
|
|
2450
|
+
let attempt = 1;
|
|
2451
|
+
while (!sent && attempt <= retry) {
|
|
2452
2452
|
txSent = await tx.safeSend();
|
|
2453
2453
|
if (txSent.status === "pending") {
|
|
2454
2454
|
sent = true;
|
|
2455
2455
|
if (verbose)
|
|
2456
2456
|
console.log(`${description ?? ""} tx sent: hash: ${txSent.hash} status: ${txSent.status}`);
|
|
2457
|
-
} else if (chain === "zeko") {
|
|
2458
|
-
retry++;
|
|
2459
|
-
if (verbose) {
|
|
2460
|
-
console.log("Retrying Zeko tx, retry: ", retry);
|
|
2461
|
-
}
|
|
2462
|
-
await sleep(3e4);
|
|
2463
2457
|
} else if (chain !== "local") {
|
|
2464
|
-
|
|
2458
|
+
attempt++;
|
|
2465
2459
|
console.error(`${description} tx NOT sent: hash: ${txSent?.hash} status: ${txSent?.status}`, txSent.errors);
|
|
2466
2460
|
if (verbose)
|
|
2467
|
-
console.log(`Retrying ${chain} tx, retry:`,
|
|
2468
|
-
await sleep(
|
|
2461
|
+
console.log(`Retrying ${chain} tx, retry:`, attempt);
|
|
2462
|
+
await sleep(5e3 * attempt);
|
|
2469
2463
|
} else
|
|
2470
|
-
|
|
2464
|
+
attempt = retry + 1;
|
|
2471
2465
|
}
|
|
2472
2466
|
if (txSent === void 0)
|
|
2473
2467
|
throw new Error("txSent is undefined");
|
|
2474
2468
|
if (txSent.errors.length > 0) {
|
|
2475
|
-
console.error(`${description ?? ""} tx error: hash: ${txSent.hash} status: ${txSent.status} errors: ${txSent.errors}`);
|
|
2469
|
+
console.error(`${description ?? ""} tx error: hash: ${txSent.hash} status: ${txSent.status} errors: ${String(txSent.errors ?? "")}`);
|
|
2476
2470
|
}
|
|
2477
2471
|
if (txSent.status === "pending" && wait !== false && chain !== "zeko") {
|
|
2478
2472
|
if (verbose)
|
|
@@ -15,6 +15,7 @@ import { blockchain } from "../../cloud/networks.js";
|
|
|
15
15
|
export declare function sendTx(params: {
|
|
16
16
|
tx: Mina.Transaction<false, true> | Mina.Transaction<true, true>;
|
|
17
17
|
description?: string;
|
|
18
|
+
retry?: number;
|
|
18
19
|
verbose?: boolean;
|
|
19
20
|
wait?: boolean;
|
|
20
21
|
chain?: blockchain;
|
|
@@ -15,7 +15,7 @@ import { getCurrentNetwork } from "../utils/mina.js";
|
|
|
15
15
|
* `Mina.RejectedTransaction`, or `undefined` if there was an error during the process.
|
|
16
16
|
*/
|
|
17
17
|
export async function sendTx(params) {
|
|
18
|
-
const { tx, description = "", verbose = true, wait = true, chain = getCurrentNetwork().network.chainId, delay = chain === "zeko" ? 5000 : 30000, } = params;
|
|
18
|
+
const { tx, description = "", verbose = true, wait = true, chain = getCurrentNetwork().network.chainId, delay = chain === "zeko" || chain === "lightnet" ? 5000 : 30000, retry = 3, } = params;
|
|
19
19
|
// flatten accountUpdates
|
|
20
20
|
const accountUpdates = JSON.parse(tx.toJSON()).accountUpdates;
|
|
21
21
|
const auCount = [];
|
|
@@ -48,35 +48,28 @@ export async function sendTx(params) {
|
|
|
48
48
|
try {
|
|
49
49
|
let txSent;
|
|
50
50
|
let sent = false;
|
|
51
|
-
let
|
|
52
|
-
while (!sent &&
|
|
51
|
+
let attempt = 1;
|
|
52
|
+
while (!sent && attempt <= retry) {
|
|
53
53
|
txSent = await tx.safeSend();
|
|
54
54
|
if (txSent.status === "pending") {
|
|
55
55
|
sent = true;
|
|
56
56
|
if (verbose)
|
|
57
57
|
console.log(`${description ?? ""} tx sent: hash: ${txSent.hash} status: ${txSent.status}`);
|
|
58
58
|
}
|
|
59
|
-
else if (chain === "zeko") {
|
|
60
|
-
retry++;
|
|
61
|
-
if (verbose) {
|
|
62
|
-
console.log("Retrying Zeko tx, retry: ", retry);
|
|
63
|
-
}
|
|
64
|
-
await sleep(30000);
|
|
65
|
-
}
|
|
66
59
|
else if (chain !== "local") {
|
|
67
|
-
|
|
60
|
+
attempt++;
|
|
68
61
|
console.error(`${description} tx NOT sent: hash: ${txSent?.hash} status: ${txSent?.status}`, txSent.errors);
|
|
69
62
|
if (verbose)
|
|
70
|
-
console.log(`Retrying ${chain} tx, retry:`,
|
|
71
|
-
await sleep(
|
|
63
|
+
console.log(`Retrying ${chain} tx, retry:`, attempt);
|
|
64
|
+
await sleep(5000 * attempt);
|
|
72
65
|
}
|
|
73
66
|
else
|
|
74
|
-
|
|
67
|
+
attempt = retry + 1; // local chain - do not retry
|
|
75
68
|
}
|
|
76
69
|
if (txSent === undefined)
|
|
77
70
|
throw new Error("txSent is undefined");
|
|
78
71
|
if (txSent.errors.length > 0) {
|
|
79
|
-
console.error(`${description ?? ""} tx error: hash: ${txSent.hash} status: ${txSent.status} errors: ${txSent.errors}`);
|
|
72
|
+
console.error(`${description ?? ""} tx error: hash: ${txSent.hash} status: ${txSent.status} errors: ${String(txSent.errors ?? "")}`);
|
|
80
73
|
}
|
|
81
74
|
if (txSent.status === "pending" && wait !== false && chain !== "zeko") {
|
|
82
75
|
if (verbose)
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"send.js","sourceRoot":"","sources":["../../../../src/mina/transactions/send.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,qBAAqB,EAAE,MAAM,MAAM,CAAC;AAG7C,OAAO,EAAE,KAAK,EAAE,MAAM,4BAA4B,CAAC;AACnD,OAAO,EAAE,gBAAgB,EAAE,MAAM,mBAAmB,CAAC;AACrD,OAAO,EAAE,iBAAiB,EAAE,MAAM,kBAAkB,CAAC;AAErD;;;;;;;;;;;GAWG;AACH,MAAM,CAAC,KAAK,UAAU,MAAM,CAAC,
|
|
1
|
+
{"version":3,"file":"send.js","sourceRoot":"","sources":["../../../../src/mina/transactions/send.ts"],"names":[],"mappings":"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"}
|
|
@@ -15,6 +15,7 @@ import { blockchain } from "../../cloud/networks.js";
|
|
|
15
15
|
export declare function sendTx(params: {
|
|
16
16
|
tx: Mina.Transaction<false, true> | Mina.Transaction<true, true>;
|
|
17
17
|
description?: string;
|
|
18
|
+
retry?: number;
|
|
18
19
|
verbose?: boolean;
|
|
19
20
|
wait?: boolean;
|
|
20
21
|
chain?: blockchain;
|
|
@@ -15,7 +15,7 @@ import { getCurrentNetwork } from "../utils/mina.js";
|
|
|
15
15
|
* `Mina.RejectedTransaction`, or `undefined` if there was an error during the process.
|
|
16
16
|
*/
|
|
17
17
|
export async function sendTx(params) {
|
|
18
|
-
const { tx, description = "", verbose = true, wait = true, chain = getCurrentNetwork().network.chainId, delay = chain === "zeko" ? 5000 : 30000, } = params;
|
|
18
|
+
const { tx, description = "", verbose = true, wait = true, chain = getCurrentNetwork().network.chainId, delay = chain === "zeko" || chain === "lightnet" ? 5000 : 30000, retry = 3, } = params;
|
|
19
19
|
// flatten accountUpdates
|
|
20
20
|
const accountUpdates = JSON.parse(tx.toJSON()).accountUpdates;
|
|
21
21
|
const auCount = [];
|
|
@@ -48,35 +48,28 @@ export async function sendTx(params) {
|
|
|
48
48
|
try {
|
|
49
49
|
let txSent;
|
|
50
50
|
let sent = false;
|
|
51
|
-
let
|
|
52
|
-
while (!sent &&
|
|
51
|
+
let attempt = 1;
|
|
52
|
+
while (!sent && attempt <= retry) {
|
|
53
53
|
txSent = await tx.safeSend();
|
|
54
54
|
if (txSent.status === "pending") {
|
|
55
55
|
sent = true;
|
|
56
56
|
if (verbose)
|
|
57
57
|
console.log(`${description ?? ""} tx sent: hash: ${txSent.hash} status: ${txSent.status}`);
|
|
58
58
|
}
|
|
59
|
-
else if (chain === "zeko") {
|
|
60
|
-
retry++;
|
|
61
|
-
if (verbose) {
|
|
62
|
-
console.log("Retrying Zeko tx, retry: ", retry);
|
|
63
|
-
}
|
|
64
|
-
await sleep(30000);
|
|
65
|
-
}
|
|
66
59
|
else if (chain !== "local") {
|
|
67
|
-
|
|
60
|
+
attempt++;
|
|
68
61
|
console.error(`${description} tx NOT sent: hash: ${txSent?.hash} status: ${txSent?.status}`, txSent.errors);
|
|
69
62
|
if (verbose)
|
|
70
|
-
console.log(`Retrying ${chain} tx, retry:`,
|
|
71
|
-
await sleep(
|
|
63
|
+
console.log(`Retrying ${chain} tx, retry:`, attempt);
|
|
64
|
+
await sleep(5000 * attempt);
|
|
72
65
|
}
|
|
73
66
|
else
|
|
74
|
-
|
|
67
|
+
attempt = retry + 1; // local chain - do not retry
|
|
75
68
|
}
|
|
76
69
|
if (txSent === undefined)
|
|
77
70
|
throw new Error("txSent is undefined");
|
|
78
71
|
if (txSent.errors.length > 0) {
|
|
79
|
-
console.error(`${description ?? ""} tx error: hash: ${txSent.hash} status: ${txSent.status} errors: ${txSent.errors}`);
|
|
72
|
+
console.error(`${description ?? ""} tx error: hash: ${txSent.hash} status: ${txSent.status} errors: ${String(txSent.errors ?? "")}`);
|
|
80
73
|
}
|
|
81
74
|
if (txSent.status === "pending" && wait !== false && chain !== "zeko") {
|
|
82
75
|
if (verbose)
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"send.js","sourceRoot":"","sources":["../../../../src/mina/transactions/send.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,qBAAqB,EAAE,MAAM,MAAM,CAAC;AAG7C,OAAO,EAAE,KAAK,EAAE,MAAM,4BAA4B,CAAC;AACnD,OAAO,EAAE,gBAAgB,EAAE,MAAM,mBAAmB,CAAC;AACrD,OAAO,EAAE,iBAAiB,EAAE,MAAM,kBAAkB,CAAC;AAErD;;;;;;;;;;;GAWG;AACH,MAAM,CAAC,KAAK,UAAU,MAAM,CAAC,
|
|
1
|
+
{"version":3,"file":"send.js","sourceRoot":"","sources":["../../../../src/mina/transactions/send.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -20,6 +20,7 @@ import { getCurrentNetwork } from "../utils/mina.js";
|
|
|
20
20
|
export async function sendTx(params: {
|
|
21
21
|
tx: Mina.Transaction<false, true> | Mina.Transaction<true, true>;
|
|
22
22
|
description?: string;
|
|
23
|
+
retry?: number;
|
|
23
24
|
verbose?: boolean;
|
|
24
25
|
wait?: boolean;
|
|
25
26
|
chain?: blockchain;
|
|
@@ -36,7 +37,8 @@ export async function sendTx(params: {
|
|
|
36
37
|
verbose = true,
|
|
37
38
|
wait = true,
|
|
38
39
|
chain = getCurrentNetwork().network.chainId,
|
|
39
|
-
delay = chain === "zeko" ? 5000 : 30000,
|
|
40
|
+
delay = chain === "zeko" || chain === "lightnet" ? 5000 : 30000,
|
|
41
|
+
retry = 3,
|
|
40
42
|
} = params;
|
|
41
43
|
// flatten accountUpdates
|
|
42
44
|
const accountUpdates = JSON.parse(tx.toJSON()).accountUpdates;
|
|
@@ -81,8 +83,8 @@ export async function sendTx(params: {
|
|
|
81
83
|
try {
|
|
82
84
|
let txSent;
|
|
83
85
|
let sent = false;
|
|
84
|
-
let
|
|
85
|
-
while (!sent &&
|
|
86
|
+
let attempt = 1;
|
|
87
|
+
while (!sent && attempt <= retry) {
|
|
86
88
|
txSent = await tx.safeSend();
|
|
87
89
|
if (txSent.status === "pending") {
|
|
88
90
|
sent = true;
|
|
@@ -92,28 +94,22 @@ export async function sendTx(params: {
|
|
|
92
94
|
txSent.status
|
|
93
95
|
}`
|
|
94
96
|
);
|
|
95
|
-
} else if (chain === "zeko") {
|
|
96
|
-
retry++;
|
|
97
|
-
if (verbose) {
|
|
98
|
-
console.log("Retrying Zeko tx, retry: ", retry);
|
|
99
|
-
}
|
|
100
|
-
await sleep(30000);
|
|
101
97
|
} else if (chain !== "local") {
|
|
102
|
-
|
|
98
|
+
attempt++;
|
|
103
99
|
console.error(
|
|
104
100
|
`${description} tx NOT sent: hash: ${txSent?.hash} status: ${txSent?.status}`,
|
|
105
101
|
txSent.errors
|
|
106
102
|
);
|
|
107
|
-
if (verbose) console.log(`Retrying ${chain} tx, retry:`,
|
|
108
|
-
await sleep(
|
|
109
|
-
} else
|
|
103
|
+
if (verbose) console.log(`Retrying ${chain} tx, retry:`, attempt);
|
|
104
|
+
await sleep(5000 * attempt);
|
|
105
|
+
} else attempt = retry + 1; // local chain - do not retry
|
|
110
106
|
}
|
|
111
107
|
if (txSent === undefined) throw new Error("txSent is undefined");
|
|
112
108
|
if (txSent.errors.length > 0) {
|
|
113
109
|
console.error(
|
|
114
110
|
`${description ?? ""} tx error: hash: ${txSent.hash} status: ${
|
|
115
111
|
txSent.status
|
|
116
|
-
} errors: ${txSent.errors}`
|
|
112
|
+
} errors: ${String(txSent.errors ?? "")}`
|
|
117
113
|
);
|
|
118
114
|
}
|
|
119
115
|
|