@vlayer/sdk 0.1.0-nightly-20241209-1e00031 → 0.1.0-nightly-20241210-34a8354

package/dist/api/lib/client.js

@@ -1,3 +1,4 @@
+import { VGetProofReceiptStatus, } from "./types/vlayer.js";
 import { prove, getProofReceipt } from "../prover.js";
 import { createExtensionWebProofProvider } from "../webProof/index.js";
 import { decodeFunctionResult, } from "viem";
@@ -12,6 +13,9 @@ async function getHash(vcall_response) {
     const result = await vcall_response;
     return result.result;
 }
+async function sleep(ms) {
+    return new Promise((resolve) => setTimeout(resolve, ms));
+}
 export const createVlayerClient = ({ url = "http://127.0.0.1:3000", webProofProvider = createExtensionWebProofProvider(), } = {
     url: "http://127.0.0.1:3000",
     webProofProvider: createExtensionWebProofProvider(),
@@ -33,19 +37,32 @@ export const createVlayerClient = ({ url = "http://127.0.0.1:3000", webProofProv
             resultHashMap.set(hash, [proverAbi, functionName]);
             return { hash };
         },
-        waitForProvingResult: async ({ hash, }) => {
-            const { result: { proof, evm_call_result }, } = await getProofReceipt({ hash }, url);
-            const savedProvingData = resultHashMap.get(hash);
+        waitForProvingResult: async ({ hash, numberOfRetries = 120, sleepDuration = 1000, }) => {
+            const getProof = async () => {
+                for (let retry = 0; retry < numberOfRetries; retry++) {
+                    const resp = await getProofReceipt(hash, url);
+                    if (resp.result.status === VGetProofReceiptStatus.done) {
+                        if (resp.result.data === undefined) {
+                            throw new Error("No ZK proof returned from server for hash " + hash.hash);
+                        }
+                        return resp.result.data;
+                    }
+                    await sleep(sleepDuration);
+                }
+                throw new Error(`Timed out waiting for ZK proof generation after {numberOfRetries * sleepDuration}ms. Consider increasing numberOfRetries in waitForProvingResult`);
+            };
+            const data = await getProof();
+            const savedProvingData = resultHashMap.get(hash.hash);
             if (!savedProvingData) {
-                throw new Error("No result found for hash " + hash);
+                throw new Error("No result found for hash " + hash.hash);
             }
             const [proverAbi, functionName] = savedProvingData;
             const result = dropEmptyProofFromArgs(decodeFunctionResult({
                 abi: proverAbi,
-                data: evm_call_result,
+                data: data?.evm_call_result,
                 functionName,
             }));
-            return [proof, ...result];
+            return [data?.proof, ...result];
         },
         proveWeb: async function ({ address, proverAbi, functionName, chainId, args, }) {
             const webProofPlaceholder = args[0];

package/dist/api/lib/client.test.js

@@ -28,11 +28,11 @@ function generateRandomHash() {
     return hash;
 }
 describe("Success zk-proving", () => {
-    let hash;
+    let hashStr;
     let zkProvingSpy;
     let vlayer;
     beforeAll(() => {
-        hash = generateRandomHash();
+        hashStr = generateRandomHash();
         const webProofProvider = createExtensionWebProofProvider();
         zkProvingSpy = vi.spyOn(webProofProvider, "notifyZkProvingStatus");
         vlayer = createVlayerClient({ webProofProvider });
@@ -41,7 +41,7 @@ describe("Success zk-proving", () => {
         fetchMocker.mockResponseOnce(() => {
             return {
                 body: JSON.stringify({
-                    result: hash,
+                    result: hashStr,
                 }),
             };
         });
@@ -52,7 +52,7 @@ describe("Success zk-proving", () => {
             args: [],
             chainId: 42,
         });
-        expect(result.hash).toBe(hash);
+        expect(result.hash).toBe(hashStr);
         expect(zkProvingSpy).toBeCalledTimes(2);
         expect(zkProvingSpy).toHaveBeenNthCalledWith(1, ZkProvingStatus.Proving);
     });
@@ -61,11 +61,13 @@ describe("Success zk-proving", () => {
             return {
                 body: JSON.stringify({
                     result: {
-                        proof: {},
+                        status: "done",
+                        data: {},
                     },
                 }),
             };
         });
+        const hash = { hash: hashStr };
         await vlayer.waitForProvingResult({ hash });
         expect(zkProvingSpy).toBeCalledTimes(2);
         expect(zkProvingSpy).toHaveBeenNthCalledWith(2, ZkProvingStatus.Done);
@@ -94,7 +96,7 @@ describe("Failed zk-proving", () => {
                 args: [],
                 chainId: 42,
             });
-            await vlayer.waitForProvingResult(hash);
+            await vlayer.waitForProvingResult({ hash });
         }
         catch (e) {
             console.log("Error waiting for proving result", e);

package/dist/api/lib/types/vlayer.d.ts

@@ -38,9 +38,16 @@ export interface VCallResponse {
 export type VGetProofReceiptParams = {
     hash: Hex;
 };
+export declare enum VGetProofReceiptStatus {
+    pending = "pending",
+    done = "done"
+}
 export interface VGetProofReceiptResult {
-    evm_call_result: Hex;
-    proof: Proof;
+    status: VGetProofReceiptStatus;
+    data?: {
+        evm_call_result: Hex;
+        proof: Proof;
+    };
 }
 export interface VGetProofReceiptResponse {
     jsonrpc: string;
@@ -56,7 +63,11 @@ export type VlayerClient = {
         gasLimit?: number;
         args: ContractFunctionArgs<T, AbiStateMutability, F>;
     }) => Promise<BrandedHash<T, F>>;
-    waitForProvingResult: <T extends Abi, F extends ContractFunctionName<T>>(hash: BrandedHash<T, F>) => Promise<ContractFunctionReturnType<T, AbiStateMutability, F>>;
+    waitForProvingResult: <T extends Abi, F extends ContractFunctionName<T>>(args: {
+        hash: BrandedHash<T, F>;
+        numberOfRetries?: number;
+        sleepDuration?: number;
+    }) => Promise<ContractFunctionReturnType<T, AbiStateMutability, F>>;
     proveWeb: <T extends Abi, F extends ContractFunctionName<T>>(args: {
         address: Hex;
         proverAbi: T;

package/dist/api/lib/types/vlayer.js

@@ -1 +1,5 @@
-export {};
+export var VGetProofReceiptStatus;
+(function (VGetProofReceiptStatus) {
+    VGetProofReceiptStatus["pending"] = "pending";
+    VGetProofReceiptStatus["done"] = "done";
+})(VGetProofReceiptStatus || (VGetProofReceiptStatus = {}));

package/package.json

@@ -15,7 +15,7 @@
       "types": "./dist/config/index.d.ts"
     }
   },
-  "version": "0.1.0-nightly-20241209-1e00031",
+  "version": "0.1.0-nightly-20241210-34a8354",
   "scripts": {
     "build": "bun tsc && bun tsc-alias",
     "test:unit": "vitest --run",