zkcloudworker 0.7.4 → 0.7.6

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

@@ -1,5 +1,4 @@
-export * from "./cloud";
-export * from "./files";
-export * from "./job";
-export * from "./task";
-export * from "./local";
+export * from "./utils";
+export * from "./worker";
+export * from "./config";
+export * from "./networks";

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

@@ -14,8 +14,7 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
     for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-__exportStar(require("./cloud"), exports);
-__exportStar(require("./files"), exports);
-__exportStar(require("./job"), exports);
-__exportStar(require("./task"), exports);
-__exportStar(require("./local"), exports);
+__exportStar(require("./utils"), exports);
+__exportStar(require("./worker"), exports);
+__exportStar(require("./config"), exports);
+__exportStar(require("./networks"), exports);

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

@@ -0,0 +1,3 @@
+export * from "./files";
+export * from "./graphql";
+export * from "./utils";

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

@@ -0,0 +1,19 @@
+"use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __exportStar = (this && this.__exportStar) || function(m, exports) {
+    for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+__exportStar(require("./files"), exports);
+__exportStar(require("./graphql"), exports);
+__exportStar(require("./utils"), exports);

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

@@ -0,0 +1,3 @@
+export * from "./cloud";
+export * from "./job";
+export * from "./task";

package/lib/ts/src/cloud/worker/index.js

@@ -0,0 +1,19 @@
+"use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __exportStar = (this && this.__exportStar) || function(m, exports) {
+    for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+__exportStar(require("./cloud"), exports);
+__exportStar(require("./job"), exports);
+__exportStar(require("./task"), exports);

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

@@ -1,5 +1,2 @@
-export * from "./api/api";
 export * from "./cloud";
-export * from "./networks";
-export * from "./encryption";
-export * from "./utils";
+export * from "./mina";

package/lib/ts/src/index.js

@@ -14,8 +14,5 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
     for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-__exportStar(require("./api/api"), exports);
 __exportStar(require("./cloud"), exports);
-__exportStar(require("./networks"), exports);
-__exportStar(require("./encryption"), exports);
-__exportStar(require("./utils"), exports);
+__exportStar(require("./mina"), exports);

package/lib/ts/src/{api → mina/api}/api.d.ts

@@ -1,5 +1,5 @@
-import { zkCloudWorker, Cloud } from "../cloud/cloud";
-import { blockchain } from "../networks";
+import { zkCloudWorker, Cloud } from "../../cloud/worker";
+import { blockchain } from "../../cloud/networks";
 /**
  * The APICommand type for interacting with the zkCloudWorker
  * @typedef { "recursiveProof" | "execute" | "sendTransactions" | "jobResult" | "deploy" | "getBalance" | "queryBilling" } ApiCommand

package/lib/ts/src/{api → mina/api}/api.js

@@ -6,9 +6,9 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.zkCloudWorkerClient = void 0;
 const axios_1 = __importDefault(require("axios"));
 const chalk_1 = __importDefault(require("chalk"));
-const utils_1 = require("../utils/utils");
-const local_1 = require("../cloud/local");
-const config_1 = __importDefault(require("../config"));
+const utils_1 = require("../../cloud/utils");
+const local_1 = require("../local/local");
+const config_1 = __importDefault(require("../../cloud/config"));
 const { ZKCLOUDWORKER_AUTH, ZKCLOUDWORKER_API } = config_1.default;
 /**
  * API class for interacting with the zkCloudWorker

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

@@ -0,0 +1,4 @@
+export * from "./api/api";
+export * from "./encryption";
+export * from "./utils";
+export * from "./local/local";

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

@@ -0,0 +1,20 @@
+"use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __exportStar = (this && this.__exportStar) || function(m, exports) {
+    for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+__exportStar(require("./api/api"), exports);
+__exportStar(require("./encryption"), exports);
+__exportStar(require("./utils"), exports);
+__exportStar(require("./local/local"), exports);

package/lib/{web/src/cloud → ts/src/mina/local}/local.d.ts

@@ -1,9 +1,9 @@
 /// <reference types="node" />
-import { Cloud, zkCloudWorker } from "./cloud";
-import { JobData } from "./job";
-import { TaskData } from "./task";
-import { blockchain } from "../networks";
-import { CloudTransaction, DeployerKeyPair } from "./cloud";
+import { Cloud, zkCloudWorker } from "../../cloud";
+import { JobData } from "../../cloud";
+import { TaskData } from "../../cloud";
+import { blockchain } from "../../cloud";
+import { CloudTransaction, DeployerKeyPair } from "../../cloud";
 import { ApiCommand } from "../api/api";
 /**
  * LocalCloud is a cloud that runs on the local machine for testing and development
@@ -93,13 +93,6 @@ export declare class LocalCloud extends Cloud {
      * @param params the parameters to run the worker
      * @param params.command the command to run
      * @param params.data the data to use
-     * @param params.data.developer the developer of the repo
-     * @param params.data.repo the repo
-     * @param params.data.transactions the transactions to process
-     * @param params.data.task the task to execute
-     * @param params.data.userId the user id
-     * @param params.data.args the arguments for the job
-     * @param params.data.metadata the metadata for the job
      * @param params.chain the blockchain to execute the job on
      * @param params.localWorker the worker to execute the tasks
      * @returns the job id
@@ -203,13 +196,6 @@ export declare class LocalCloud extends Cloud {
      * @param params the parameters to run the sequencer
      * @param params.worker the worker to execute the tasks
      * @param params.data the data to use
-     * @param params.data.developer the developer of the repo
-     * @param params.data.repo the repo
-     * @param params.data.transactions the transactions to process
-     * @param params.data.task the task to execute
-     * @param params.data.userId the user id
-     * @param params.data.args the arguments for the job
-     * @param params.data.metadata the metadata for the job
      * @returns the proof
      */
     static sequencer(params: {

package/lib/ts/src/{cloud → mina/local}/local.js

@@ -1,9 +1,9 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.LocalStorage = exports.LocalCloud = void 0;
-const cloud_1 = require("./cloud");
-const utils_1 = require("../utils/utils");
-const files_1 = require("./files");
+const cloud_1 = require("../../cloud");
+const cloud_2 = require("../../cloud");
+const cloud_3 = require("../../cloud");
 /**
  * LocalCloud is a cloud that runs on the local machine for testing and development
  * It uses LocalStorage to store jobs, tasks, transactions, and data
@@ -93,7 +93,7 @@ class LocalCloud extends cloud_1.Cloud {
      * @param value the value to save
      */
     async saveFile(filename, value) {
-        await (0, files_1.saveBinaryFile)({ data: value, filename });
+        await (0, cloud_3.saveBinaryFile)({ data: value, filename });
     }
     /**
      * Loads the file
@@ -101,7 +101,7 @@ class LocalCloud extends cloud_1.Cloud {
      * @returns the file data
      */
     async loadFile(filename) {
-        const data = await (0, files_1.loadBinaryFile)(filename);
+        const data = await (0, cloud_3.loadBinaryFile)(filename);
         return data;
     }
     /**
@@ -116,7 +116,7 @@ class LocalCloud extends cloud_1.Cloud {
      * @returns generated unique id
      */
     static generateId() {
-        return "local." + Date.now().toString() + "." + (0, utils_1.makeString)(32);
+        return "local." + Date.now().toString() + "." + (0, cloud_2.makeString)(32);
     }
     /**
      * Adds transactions to the local cloud
@@ -158,13 +158,6 @@ class LocalCloud extends cloud_1.Cloud {
      * @param params the parameters to run the worker
      * @param params.command the command to run
      * @param params.data the data to use
-     * @param params.data.developer the developer of the repo
-     * @param params.data.repo the repo
-     * @param params.data.transactions the transactions to process
-     * @param params.data.task the task to execute
-     * @param params.data.userId the user id
-     * @param params.data.args the arguments for the job
-     * @param params.data.metadata the metadata for the job
      * @param params.chain the blockchain to execute the job on
      * @param params.localWorker the worker to execute the tasks
      * @returns the job id
@@ -386,13 +379,6 @@ class LocalCloud extends cloud_1.Cloud {
      * @param params the parameters to run the sequencer
      * @param params.worker the worker to execute the tasks
      * @param params.data the data to use
-     * @param params.data.developer the developer of the repo
-     * @param params.data.repo the repo
-     * @param params.data.transactions the transactions to process
-     * @param params.data.task the task to execute
-     * @param params.data.userId the user id
-     * @param params.data.args the arguments for the job
-     * @param params.data.metadata the metadata for the job
      * @returns the proof
      */
     static async sequencer(params) {
@@ -440,7 +426,7 @@ class LocalStorage {
             tasks: LocalStorage.tasks,
         };
         const filename = name + ".cloud";
-        await (0, files_1.saveFile)({ data, filename });
+        await (0, cloud_3.saveFile)({ data, filename });
     }
     /**
      * Loads the data
@@ -448,7 +434,7 @@ class LocalStorage {
      */
     static async loadData(name) {
         const filename = name + ".cloud";
-        const data = await (0, files_1.loadFile)(filename);
+        const data = await (0, cloud_3.loadFile)(filename);
         if (data === undefined)
             return;
         LocalStorage.jobs = data.jobs;

package/lib/ts/src/{utils → mina/utils}/fee.js

@@ -5,7 +5,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.fee = void 0;
 const o1js_1 = require("o1js");
-const config_1 = __importDefault(require("../config"));
+const config_1 = __importDefault(require("../../cloud/config"));
 /**
  * Calculate the fee for a transaction
  * @returns the fee for a transaction

package/lib/ts/src/{utils → mina/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 utils_1 = require("./utils");
+const cloud_1 = require("../../cloud");
 /**
  * Fetches the Mina account for a given public key with error handling
  * @param params the parameters for fetching the account
@@ -42,7 +42,7 @@ async function fetchMinaAccount(params) {
                 return result;
             }
         }
-        await (0, utils_1.sleep)(1000 * 5);
+        await (0, cloud_1.sleep)(1000 * 5);
     }
     if (force === true)
         throw new Error(`fetchMinaAccount timeout
@@ -80,7 +80,7 @@ async function fetchMinaActions(publicKey, fromActionState, endActionState) {
         catch (error) {
             console.log("Error in fetchMinaActions", error.toString().substring(0, 300));
         }
-        await (0, utils_1.sleep)(1000 * 60 * 2);
+        await (0, cloud_1.sleep)(1000 * 60 * 2);
     }
     console.log("Timeout in fetchMinaActions");
     return undefined;

package/lib/ts/src/{utils → mina/utils}/index.d.ts

@@ -1,7 +1,5 @@
 export * from "./base64";
 export * from "./fetch";
 export * from "./fields";
-export * from "./graphql";
 export * from "./fee";
 export * from "./mina";
-export * from "./utils";

package/lib/ts/src/{utils → mina/utils}/index.js

@@ -17,7 +17,5 @@ Object.defineProperty(exports, "__esModule", { value: true });
 __exportStar(require("./base64"), exports);
 __exportStar(require("./fetch"), exports);
 __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/utils}/mina.d.ts

@@ -1,6 +1,6 @@
 export { initBlockchain, accountBalance, accountBalanceMina, MinaNetworkInstance, currentNetwork, getNetworkIdHash, getCurrentNetwork, getDeployer, };
 import { Mina, PublicKey, UInt64, Field } from "o1js";
-import { blockchain, MinaNetwork } from "../networks";
+import { blockchain, MinaNetwork } from "../../cloud";
 /**
  * MinaNetworkInstance is the data structure for a Mina network instance, keeping track of the keys, network, and network id hash
  * @param keys the keys for the deployers

package/lib/ts/src/{utils → mina/utils}/mina.js

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 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");
+const cloud_1 = require("../../cloud");
 let currentNetwork = undefined;
 exports.currentNetwork = currentNetwork;
 function getNetworkIdHash() {
@@ -59,12 +59,12 @@ async function initBlockchain(instance, deployersNumber = 0) {
             throw new Error("Not enough test accounts");
         exports.currentNetwork = currentNetwork = {
             keys: local.testAccounts,
-            network: networks_1.Local,
+            network: cloud_1.Local,
             networkIdHash,
         };
         return currentNetwork;
     }
-    const network = networks_1.networks.find((n) => n.chainId === instance);
+    const network = cloud_1.networks.find((n) => n.chainId === instance);
     if (network === undefined) {
         throw new Error("Unknown network");
     }