zkcloudworker 0.6.2 → 0.7.0

package/lib/ts/src/api/api.js

@@ -6,7 +6,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.zkCloudWorkerClient = void 0;
 const axios_1 = __importDefault(require("axios"));
 const chalk_1 = __importDefault(require("chalk"));
-const mina_1 = require("../utils/mina");
+const utils_1 = require("../utils/utils");
 const local_1 = require("../cloud/local");
 const config_1 = __importDefault(require("../config"));
 const { ZKCLOUDWORKER_AUTH, ZKCLOUDWORKER_API } = config_1.default;
@@ -312,7 +312,7 @@ class zkCloudWorkerClient {
                         result: undefined,
                     };
                 }
-                await (0, mina_1.sleep)(errorDelay * errors);
+                await (0, utils_1.sleep)(errorDelay * errors);
             }
             else {
                 if (this.isError(result.data))
@@ -335,7 +335,7 @@ class zkCloudWorkerClient {
                         result: result.data,
                     };
                 }
-                await (0, mina_1.sleep)(interval);
+                await (0, utils_1.sleep)(interval);
             }
             attempts++;
         }

package/lib/ts/src/cloud/cloud.d.ts

@@ -1,5 +1,4 @@
 /// <reference types="node" />
-import type { Cache } from "o1js";
 import { blockchain } from "../networks";
 import { JobData } from "./job";
 export interface DeployedSmartContract {
@@ -25,7 +24,7 @@ export declare abstract class Cloud {
     readonly jobId: string;
     readonly stepId: string;
     readonly taskId: string;
-    readonly cache: Cache;
+    readonly cache: string;
     readonly developer: string;
     readonly repo: string;
     readonly task?: string;
@@ -39,7 +38,7 @@ export declare abstract class Cloud {
         jobId: string;
         stepId: string;
         taskId: string;
-        cache: Cache;
+        cache: string;
         developer: string;
         repo: string;
         task?: string;

package/lib/ts/src/cloud/local.d.ts

@@ -1,5 +1,4 @@
 /// <reference types="node" />
-import { Cache } from "o1js";
 import { Cloud, zkCloudWorker } from "./cloud";
 import { JobData } from "./job";
 import { TaskData } from "./task";
@@ -11,7 +10,7 @@ export declare class LocalCloud extends Cloud {
     constructor(params: {
         job: JobData;
         chain: blockchain;
-        cache?: Cache;
+        cache?: string;
         stepId?: string;
         localWorker: (cloud: Cloud) => Promise<zkCloudWorker>;
     });

package/lib/ts/src/cloud/local.js

@@ -1,9 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.LocalStorage = exports.LocalCloud = void 0;
-const o1js_1 = require("o1js");
 const cloud_1 = require("./cloud");
-const mina_1 = require("../utils/mina");
+const utils_1 = require("../utils/utils");
 const files_1 = require("./files");
 class LocalCloud extends cloud_1.Cloud {
     constructor(params) {
@@ -14,7 +13,7 @@ class LocalCloud extends cloud_1.Cloud {
             jobId: jobId,
             stepId: stepId ?? "stepId",
             taskId: taskId ?? "taskId",
-            cache: cache ?? o1js_1.Cache.FileSystem("./cache"),
+            cache: cache ?? "./cache",
             developer: developer,
             repo: repo,
             task: task,
@@ -27,17 +26,18 @@ class LocalCloud extends cloud_1.Cloud {
         this.localWorker = localWorker;
     }
     async getDeployer() {
-        const deployer = process.env.DEPLOYER;
+        const privateKey = process.env.DEPLOYER_PRIVATE_KEY;
+        const publicKey = process.env.DEPLOYER_PUBLIC_KEY;
         try {
-            return deployer === undefined
+            return privateKey === undefined || publicKey === undefined
                 ? undefined
                 : {
-                    privateKey: deployer,
-                    publicKey: o1js_1.PrivateKey.fromBase58(deployer).toPublicKey().toBase58(),
+                    privateKey,
+                    publicKey,
                 };
         }
         catch (error) {
-            console.error(`getDeployer: process.env.DEPLOYER has wrong encoding, should be base58 private key ("EKE...")`, error);
+            console.error(`getDeployer: error getting deployer key pair: ${error}`, error);
             return undefined;
         }
     }
@@ -68,7 +68,7 @@ class LocalCloud extends cloud_1.Cloud {
         throw new Error("Method not implemented.");
     }
     static generateId() {
-        return "local." + Date.now().toString() + "." + (0, mina_1.makeString)(32);
+        return "local." + Date.now().toString() + "." + (0, utils_1.makeString)(32);
     }
     static async addTransactions(transactions) {
         const timeReceived = Date.now();

package/lib/ts/src/utils/fetch.d.ts

@@ -4,10 +4,10 @@ export declare function fetchMinaAccount(params: {
     tokenId?: string | Field | undefined;
     force?: boolean;
 }): Promise<{
+    account: undefined;
+} | {
     account: import("o1js/dist/node/bindings/mina-transaction/gen/transaction").Account;
     error: undefined;
-} | {
-    account: undefined;
 }>;
 export declare function fetchMinaActions(publicKey: PublicKey, fromActionState: Field, endActionState?: Field): Promise<{
     actions: string[][];

package/lib/ts/src/utils/fetch.js

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.checkMinaZkappTransaction = exports.fetchMinaActions = exports.fetchMinaAccount = void 0;
 const o1js_1 = require("o1js");
-const mina_1 = require("./mina");
+const utils_1 = require("./utils");
 async function fetchMinaAccount(params) {
     const { publicKey, tokenId, force } = params;
     const timeout = 1000 * 60 * 2; // 2 minutes
@@ -34,7 +34,7 @@ async function fetchMinaAccount(params) {
                 return result;
             }
         }
-        await (0, mina_1.sleep)(1000 * 5);
+        await (0, utils_1.sleep)(1000 * 5);
     }
     if (force === true)
         throw new Error(`fetchMinaAccount timeout
@@ -65,7 +65,7 @@ async function fetchMinaActions(publicKey, fromActionState, endActionState) {
         catch (error) {
             console.log("Error in fetchMinaActions", error.toString().substring(0, 300));
         }
-        await (0, mina_1.sleep)(1000 * 60 * 2);
+        await (0, utils_1.sleep)(1000 * 60 * 2);
     }
     console.log("Timeout in fetchMinaActions");
     return undefined;

package/lib/ts/src/utils/index.d.ts

@@ -4,3 +4,4 @@ export * from "./fields";
 export * from "./graphql";
 export * from "./fee";
 export * from "./mina";
+export * from "./utils";

package/lib/ts/src/utils/index.js

@@ -20,3 +20,4 @@ __exportStar(require("./fields"), exports);
 __exportStar(require("./graphql"), exports);
 __exportStar(require("./fee"), exports);
 __exportStar(require("./mina"), exports);
+__exportStar(require("./utils"), exports);

package/lib/ts/src/utils/mina.d.ts

@@ -1,4 +1,4 @@
-export { initBlockchain, Memory, makeString, sleep, accountBalance, accountBalanceMina, formatTime, MinaNetworkInstance, currentNetwork, getNetworkIdHash, getCurrentNetwork, getDeployer, };
+export { initBlockchain, accountBalance, accountBalanceMina, MinaNetworkInstance, currentNetwork, getNetworkIdHash, getCurrentNetwork, getDeployer, };
 import { Mina, PublicKey, UInt64, Field } from "o1js";
 import { blockchain, MinaNetwork } from "../networks";
 interface MinaNetworkInstance {
@@ -13,11 +13,3 @@ declare function getDeployer(): Mina.TestPublicKey | undefined;
 declare function initBlockchain(instance: blockchain, deployersNumber?: number): Promise<MinaNetworkInstance>;
 declare function accountBalance(address: PublicKey): Promise<UInt64>;
 declare function accountBalanceMina(address: PublicKey): Promise<number>;
-declare function sleep(ms: number): Promise<unknown>;
-declare function makeString(length: number): string;
-declare function formatTime(ms: number): string;
-declare class Memory {
-    static rss: number;
-    constructor();
-    static info(description?: string, fullInfo?: boolean): void;
-}

package/lib/ts/src/utils/mina.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getDeployer = exports.getCurrentNetwork = exports.getNetworkIdHash = exports.currentNetwork = exports.formatTime = exports.accountBalanceMina = exports.accountBalance = exports.sleep = exports.makeString = exports.Memory = exports.initBlockchain = void 0;
+exports.getDeployer = exports.getCurrentNetwork = exports.getNetworkIdHash = exports.currentNetwork = exports.accountBalanceMina = exports.accountBalance = exports.initBlockchain = void 0;
 const o1js_1 = require("o1js");
 const networks_1 = require("../networks");
 let currentNetwork = undefined;
@@ -108,67 +108,3 @@ async function accountBalanceMina(address) {
     return Number((await accountBalance(address)).toBigInt()) / 1e9;
 }
 exports.accountBalanceMina = accountBalanceMina;
-function sleep(ms) {
-    return new Promise((resolve) => setTimeout(resolve, ms));
-}
-exports.sleep = sleep;
-function makeString(length) {
-    // eslint-disable-next-line @typescript-eslint/no-inferrable-types
-    let outString = ``;
-    // eslint-disable-next-line @typescript-eslint/no-inferrable-types
-    const inOptions = `ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789`;
-    for (let i = 0; i < length; i++) {
-        outString += inOptions.charAt(Math.floor(Math.random() * inOptions.length));
-    }
-    return outString;
-}
-exports.makeString = makeString;
-function formatTime(ms) {
-    if (ms === undefined)
-        return "";
-    if (ms < 1000)
-        return ms.toString() + " ms";
-    if (ms < 60 * 1000)
-        return parseInt((ms / 1000).toString()).toString() + " sec";
-    if (ms < 60 * 60 * 1000) {
-        const minutes = parseInt((ms / 1000 / 60).toString());
-        const seconds = parseInt(((ms - minutes * 60 * 1000) / 1000).toString());
-        return minutes.toString() + " min " + seconds.toString() + " sec";
-    }
-    else {
-        const hours = parseInt((ms / 1000 / 60 / 60).toString());
-        const minutes = parseInt(((ms - hours * 60 * 60 * 1000) / 1000 / 60).toString());
-        return hours.toString() + " h " + minutes.toString() + " min";
-    }
-}
-exports.formatTime = formatTime;
-class Memory {
-    constructor() {
-        Memory.rss = 0;
-    }
-    // eslint-disable-next-line @typescript-eslint/no-inferrable-types
-    static info(description = ``, fullInfo = false) {
-        const memoryData = process.memoryUsage();
-        const formatMemoryUsage = (data) => `${Math.round(data / 1024 / 1024)} MB`;
-        const oldRSS = Memory.rss;
-        Memory.rss = Math.round(memoryData.rss / 1024 / 1024);
-        const memoryUsage = fullInfo
-            ? {
-                step: `${description}:`,
-                rssDelta: `${(oldRSS === 0
-                    ? 0
-                    : Memory.rss - oldRSS).toString()} MB -> Resident Set Size memory change`,
-                rss: `${formatMemoryUsage(memoryData.rss)} -> Resident Set Size - total memory allocated`,
-                heapTotal: `${formatMemoryUsage(memoryData.heapTotal)} -> total size of the allocated heap`,
-                heapUsed: `${formatMemoryUsage(memoryData.heapUsed)} -> actual memory used during the execution`,
-                external: `${formatMemoryUsage(memoryData.external)} -> V8 external memory`,
-            }
-            : `RSS memory ${description}: ${formatMemoryUsage(memoryData.rss)}${oldRSS === 0
-                ? ``
-                : `, changed by ` + (Memory.rss - oldRSS).toString() + ` MB`}`;
-        console.log(memoryUsage);
-    }
-}
-exports.Memory = Memory;
-// eslint-disable-next-line @typescript-eslint/no-inferrable-types
-Memory.rss = 0;

package/lib/ts/src/utils/utils.d.ts

@@ -0,0 +1,8 @@
+export declare function sleep(ms: number): Promise<unknown>;
+export declare function makeString(length: number): string;
+export declare function formatTime(ms: number): string;
+export declare class Memory {
+    static rss: number;
+    constructor();
+    static info(description?: string, fullInfo?: boolean): void;
+}

package/lib/ts/src/utils/utils.js

@@ -0,0 +1,67 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.Memory = exports.formatTime = exports.makeString = exports.sleep = void 0;
+function sleep(ms) {
+    return new Promise((resolve) => setTimeout(resolve, ms));
+}
+exports.sleep = sleep;
+function makeString(length) {
+    // eslint-disable-next-line @typescript-eslint/no-inferrable-types
+    let outString = ``;
+    // eslint-disable-next-line @typescript-eslint/no-inferrable-types
+    const inOptions = `ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789`;
+    for (let i = 0; i < length; i++) {
+        outString += inOptions.charAt(Math.floor(Math.random() * inOptions.length));
+    }
+    return outString;
+}
+exports.makeString = makeString;
+function formatTime(ms) {
+    if (ms === undefined)
+        return "";
+    if (ms < 1000)
+        return ms.toString() + " ms";
+    if (ms < 60 * 1000)
+        return parseInt((ms / 1000).toString()).toString() + " sec";
+    if (ms < 60 * 60 * 1000) {
+        const minutes = parseInt((ms / 1000 / 60).toString());
+        const seconds = parseInt(((ms - minutes * 60 * 1000) / 1000).toString());
+        return minutes.toString() + " min " + seconds.toString() + " sec";
+    }
+    else {
+        const hours = parseInt((ms / 1000 / 60 / 60).toString());
+        const minutes = parseInt(((ms - hours * 60 * 60 * 1000) / 1000 / 60).toString());
+        return hours.toString() + " h " + minutes.toString() + " min";
+    }
+}
+exports.formatTime = formatTime;
+class Memory {
+    constructor() {
+        Memory.rss = 0;
+    }
+    // eslint-disable-next-line @typescript-eslint/no-inferrable-types
+    static info(description = ``, fullInfo = false) {
+        const memoryData = process.memoryUsage();
+        const formatMemoryUsage = (data) => `${Math.round(data / 1024 / 1024)} MB`;
+        const oldRSS = Memory.rss;
+        Memory.rss = Math.round(memoryData.rss / 1024 / 1024);
+        const memoryUsage = fullInfo
+            ? {
+                step: `${description}:`,
+                rssDelta: `${(oldRSS === 0
+                    ? 0
+                    : Memory.rss - oldRSS).toString()} MB -> Resident Set Size memory change`,
+                rss: `${formatMemoryUsage(memoryData.rss)} -> Resident Set Size - total memory allocated`,
+                heapTotal: `${formatMemoryUsage(memoryData.heapTotal)} -> total size of the allocated heap`,
+                heapUsed: `${formatMemoryUsage(memoryData.heapUsed)} -> actual memory used during the execution`,
+                external: `${formatMemoryUsage(memoryData.external)} -> V8 external memory`,
+            }
+            : `RSS memory ${description}: ${formatMemoryUsage(memoryData.rss)}${oldRSS === 0
+                ? ``
+                : `, changed by ` + (Memory.rss - oldRSS).toString() + ` MB`}`;
+        console.log(memoryUsage);
+    }
+}
+exports.Memory = Memory;
+// eslint-disable-next-line @typescript-eslint/no-inferrable-types
+Memory.rss = 0;