zkcloudworker 0.3.6 → 0.3.8

package/lib/ts/src/api/api.d.ts

@@ -1,6 +1,6 @@
 import { zkCloudWorker, Cloud } from "../cloud/cloud";
 import { blockchain } from "../networks";
-export type ApiCommand = "recursiveProof" | "execute" | "sendTransaction" | "jobResult" | "deploy" | "queryBilling";
+export type ApiCommand = "recursiveProof" | "execute" | "sendTransaction" | "jobResult" | "deploy" | "getBalance" | "queryBilling";
 /**
  * API class for interacting with the zkCloudWorker
  * @property jwt The jwt token for authentication, get it at https://t.me/minanft_bot?start=auth
@@ -128,7 +128,9 @@ export declare class zkCloudWorkerClient {
      * if the job is not found, the result will be undefined and error will be set
      */
     deploy(data: {
-        packageName: string;
+        repo: string;
+        developer: string;
+        packageManager: string;
     }): Promise<{
         success: boolean;
         error?: string;
@@ -144,6 +146,16 @@ export declare class zkCloudWorkerClient {
         error?: string;
         result?: any;
     }>;
+    /**
+     * Gets the remaining balance
+     * @returns { success: boolean, error?: string, result?: any }
+     * where result is the billing report
+     */
+    getBalance(): Promise<{
+        success: boolean;
+        error?: string;
+        result?: any;
+    }>;
     /**
      * Waits for the job to finish
      * @param data the data for the waitForJobResult call

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

@@ -23,7 +23,7 @@ class zkCloudWorkerClient {
         const { jwt, zkcloudworker, chain, webhook } = params;
         this.jwt = jwt;
         this.endpoint = ZKCLOUDWORKER_API;
-        this.chain = chain ?? "berkeley";
+        this.chain = chain ?? "devnet";
         this.webhook = webhook;
         if (jwt === "local") {
             if (zkcloudworker === undefined)
@@ -152,7 +152,12 @@ class zkCloudWorkerClient {
      */
     async deploy(data) {
         // TODO: encrypt env.json
-        const result = await this.apiHub("deploy", data);
+        const { repo, developer, packageManager } = data;
+        const result = await this.apiHub("deploy", {
+            developer,
+            repo,
+            args: packageManager,
+        });
         if (result.data === "error")
             return {
                 success: false,
@@ -185,6 +190,26 @@ class zkCloudWorkerClient {
                 result: result.data,
             };
     }
+    /**
+     * Gets the remaining balance
+     * @returns { success: boolean, error?: string, result?: any }
+     * where result is the billing report
+     */
+    async getBalance() {
+        const result = await this.apiHub("getBalance", {});
+        if (this.isError(result.data))
+            return {
+                success: false,
+                error: result.error,
+                result: result.data,
+            };
+        else
+            return {
+                success: result.success,
+                error: result.error,
+                result: result.data,
+            };
+    }
     /**
      * Waits for the job to finish
      * @param data the data for the waitForJobResult call

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

@@ -65,6 +65,7 @@ export declare abstract class Cloud {
     }): Promise<string>;
     abstract addTask(data: {
         task: string;
+        startTime?: number;
         userId?: string;
         args?: string;
         metadata?: string;

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

@@ -12,6 +12,9 @@ export interface JobData {
     metadata?: string;
     chain: blockchain;
     webhook?: string;
+    cloudhook?: string;
+    cloudIteration?: number;
+    previousJob?: JobData;
     filename?: string;
     txNumber: number;
     timeCreated: number;

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

@@ -58,6 +58,7 @@ export declare class LocalCloud extends Cloud {
     jobResult(jobId: string): Promise<JobData | undefined>;
     addTask(data: {
         task: string;
+        startTime?: number;
         userId?: string;
         args?: string;
         metadata?: string;

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

@@ -196,6 +196,8 @@ class LocalCloud extends cloud_1.Cloud {
             const data = LocalStorage.tasks[taskId];
             const jobId = LocalCloud.generateId();
             const timeCreated = Date.now();
+            if (data.startTime !== undefined && data.startTime < timeCreated)
+                continue;
             const job = {
                 id: "local",
                 jobId: jobId,

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

@@ -2,6 +2,7 @@ import { blockchain } from "../networks";
 export interface TaskData {
     id: string;
     taskId: string;
+    startTime?: number;
     timeCreated: number;
     developer: string;
     repo: string;
@@ -10,5 +11,4 @@ export interface TaskData {
     args?: string;
     metadata?: string;
     chain: blockchain;
-    webhook?: string;
 }

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

@@ -1,4 +1,4 @@
-export { initBlockchain, Memory, makeString, sleep, accountBalance, accountBalanceMina, formatTime, MinaNetworkInstance, currentNetwork, getNetworkIdHash, getDeployer, };
+export { initBlockchain, Memory, makeString, sleep, accountBalance, accountBalanceMina, formatTime, MinaNetworkInstance, currentNetwork, getNetworkIdHash, getCurrentNetwork, getDeployer, };
 import { PublicKey, PrivateKey, UInt64, Field } from "o1js";
 import { blockchain, MinaNetwork } from "./networks";
 interface MinaNetworkInstance {
@@ -11,8 +11,9 @@ interface MinaNetworkInstance {
 }
 declare let currentNetwork: MinaNetworkInstance | undefined;
 declare function getNetworkIdHash(): Field;
+declare function getCurrentNetwork(): MinaNetworkInstance;
 declare function getDeployer(): PrivateKey | undefined;
-declare function initBlockchain(instance: blockchain, deployersNumber?: number): MinaNetworkInstance;
+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>;

package/lib/ts/src/mina.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getDeployer = 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.formatTime = exports.accountBalanceMina = exports.accountBalance = exports.sleep = exports.makeString = exports.Memory = exports.initBlockchain = void 0;
 const o1js_1 = require("o1js");
 const networks_1 = require("./networks");
 let currentNetwork = undefined;
@@ -12,6 +12,13 @@ function getNetworkIdHash() {
     return currentNetwork.networkIdHash;
 }
 exports.getNetworkIdHash = getNetworkIdHash;
+function getCurrentNetwork() {
+    if (currentNetwork === undefined) {
+        throw new Error("Network is not initialized");
+    }
+    return currentNetwork;
+}
+exports.getCurrentNetwork = getCurrentNetwork;
 function getDeployer() {
     if (currentNetwork === undefined) {
         throw new Error("Network is not initialized");
@@ -19,50 +26,21 @@ function getDeployer() {
     return currentNetwork.keys[0]?.privateKey;
 }
 exports.getDeployer = getDeployer;
-/*function getNetworkIdHash(params: {
-  chainId?: blockchain;
-  verbose?: boolean;
-}): Field {
-  const { chainId, verbose } = params;
-  if (chainId !== undefined) {
-    if (verbose) console.log(`Chain ID: ${chainId}`);
-    return CircuitString.fromString(chainId).hash();
-  }
-  const networkId = Mina.getNetworkId();
-  if (verbose) console.log(`Network ID: ${networkId}`);
-  if (networkId === "testnet")
-    throw new Error(
-      "Network ID is not set, please call initBlockchain() first"
-    );
-
-  if (networkId === "mainnet")
-    return CircuitString.fromString("mainnet").hash();
-  else {
-    if (
-      networkId.custom === undefined ||
-      typeof networkId.custom !== "string"
-    ) {
-      throw new Error(
-        "Network ID is not set, please call initBlockchain() first"
-      );
-    }
-    return CircuitString.fromString(networkId.custom).hash();
-  }
-}
-*/
-function initBlockchain(instance, deployersNumber = 0) {
+async function initBlockchain(instance, deployersNumber = 0) {
     if (instance === "mainnet") {
         throw new Error("Mainnet is not supported yet by zkApps");
     }
+    const networkIdHash = o1js_1.Poseidon.hash(o1js_1.Encoding.stringToFields(instance));
+    // await used for compatibility with future versions of o1js
     if (instance === "local") {
-        const local = o1js_1.Mina.LocalBlockchain({
+        const local = await o1js_1.Mina.LocalBlockchain({
             proofsEnabled: true,
         });
-        o1js_1.Mina.setActiveInstance(local);
+        await o1js_1.Mina.setActiveInstance(local);
         exports.currentNetwork = currentNetwork = {
             keys: local.testAccounts,
             network: networks_1.Local,
-            networkIdHash: o1js_1.CircuitString.fromString("local").hash(),
+            networkIdHash,
         };
         return currentNetwork;
     }
@@ -75,7 +53,7 @@ function initBlockchain(instance, deployersNumber = 0) {
         archive: network.archive,
         lightnetAccountManager: network.accountManager,
     });
-    o1js_1.Mina.setActiveInstance(networkInstance);
+    await o1js_1.Mina.setActiveInstance(networkInstance);
     const keys = [];
     if (deployersNumber > 0) {
         if (instance === "lighnet") {
@@ -97,7 +75,7 @@ function initBlockchain(instance, deployersNumber = 0) {
     exports.currentNetwork = currentNetwork = {
         keys,
         network,
-        networkIdHash: o1js_1.CircuitString.fromString(instance).hash(),
+        networkIdHash,
     };
     return currentNetwork;
 }

package/lib/ts/src/networks.d.ts

@@ -1,5 +1,5 @@
-export { blockchain, MinaNetwork, networks, Mainnet, Berkeley, Devnet, Zeko, TestWorld2, Lightnet, Local, };
-type blockchain = "local" | "berkeley" | "devnet" | "lighnet" | "mainnet" | "testworld2" | "zeko";
+export { blockchain, MinaNetwork, networks, Mainnet, Devnet, Zeko, Lightnet, Local, };
+type blockchain = "local" | "devnet" | "lighnet" | "mainnet" | "zeko" | "mainnet";
 interface MinaNetwork {
     mina: string[];
     archive: string[];
@@ -11,9 +11,7 @@ interface MinaNetwork {
 }
 declare const Mainnet: MinaNetwork;
 declare const Local: MinaNetwork;
-declare const Berkeley: MinaNetwork;
 declare const Devnet: MinaNetwork;
 declare const Zeko: MinaNetwork;
-declare const TestWorld2: MinaNetwork;
 declare const Lightnet: MinaNetwork;
 declare const networks: MinaNetwork[];

package/lib/ts/src/networks.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.Local = exports.Lightnet = exports.TestWorld2 = exports.Zeko = exports.Devnet = exports.Berkeley = exports.Mainnet = exports.networks = void 0;
+exports.Local = exports.Lightnet = exports.Zeko = exports.Devnet = exports.Mainnet = exports.networks = void 0;
 const Mainnet = {
     mina: [],
     archive: [],
@@ -13,21 +13,6 @@ const Local = {
     chainId: "local",
 };
 exports.Local = Local;
-const Berkeley = {
-    mina: [
-        "https://api.minascan.io/node/berkeley/v1/graphql",
-        "https://proxy.berkeley.minaexplorer.com/graphql",
-    ],
-    archive: [
-        "https://api.minascan.io/archive/berkeley/v1/graphql",
-        "https://archive.berkeley.minaexplorer.com",
-    ],
-    explorerAccountUrl: "https://minascan.io/berkeley/account/",
-    explorerTransactionUrl: "https://minascan.io/berkeley/tx/",
-    chainId: "berkeley",
-    name: "Berkeley",
-};
-exports.Berkeley = Berkeley;
 const Devnet = {
     mina: [
         "https://api.minascan.io/node/devnet/v1/graphql",
@@ -49,15 +34,6 @@ const Zeko = {
     chainId: "zeko",
 };
 exports.Zeko = Zeko;
-const TestWorld2 = {
-    mina: ["https://api.minascan.io/node/testworld/v1/graphql"],
-    archive: ["https://archive.testworld.minaexplorer.com"],
-    explorerAccountUrl: "https://minascan.io/testworld/account/",
-    explorerTransactionUrl: "https://minascan.io/testworld/tx/",
-    chainId: "testworld2",
-    name: "TestWorld2",
-};
-exports.TestWorld2 = TestWorld2;
 const Lightnet = {
     mina: ["http://localhost:8080/graphql"],
     archive: ["http://localhost:8282"],
@@ -66,13 +42,34 @@ const Lightnet = {
     name: "Lightnet",
 };
 exports.Lightnet = Lightnet;
-const networks = [
-    Mainnet,
-    Local,
-    Berkeley,
-    Devnet,
-    Zeko,
-    TestWorld2,
-    Lightnet,
-];
+const networks = [Mainnet, Local, Devnet, Zeko, Lightnet];
 exports.networks = networks;
+/*
+
+// not supported by o1js 0.18.0
+
+const Berkeley: MinaNetwork = {
+  mina: [
+    "https://api.minascan.io/node/berkeley/v1/graphql",
+    "https://proxy.berkeley.minaexplorer.com/graphql",
+  ],
+  archive: [
+    "https://api.minascan.io/archive/berkeley/v1/graphql",
+    "https://archive.berkeley.minaexplorer.com",
+  ],
+  explorerAccountUrl: "https://minascan.io/berkeley/account/",
+  explorerTransactionUrl: "https://minascan.io/berkeley/tx/",
+  chainId: "berkeley",
+  name: "Berkeley",
+};
+
+const TestWorld2: MinaNetwork = {
+  mina: ["https://api.minascan.io/node/testworld/v1/graphql"],
+  archive: ["https://archive.testworld.minaexplorer.com"],
+  explorerAccountUrl: "https://minascan.io/testworld/account/",
+  explorerTransactionUrl: "https://minascan.io/testworld/tx/",
+  chainId: "testworld2",
+  name: "TestWorld2",
+};
+
+*/