@vlayer/sdk 0.1.0-nightly-20241009-3c85ef5 → 0.1.0-nightly-20241010-e69694a

package/node_modules/@vlayer/web-proof-commons/lib/index.ts

@@ -1 +1,2 @@
 export * from "./message";
+export * from "./utils";

package/node_modules/@vlayer/web-proof-commons/lib/message.ts

@@ -1,7 +1,23 @@
+import type { Branded } from "./utils.ts";
+
+export const EXTENSION_STEP = {
+  expectUrl: "expectUrl",
+  startPage: "startPage",
+  notarize: "notarize",
+} as const;
+
+export type ExtensionStep =
+  (typeof EXTENSION_STEP)[keyof typeof EXTENSION_STEP];
+
 export const enum ExtensionAction {
   RequestWebProof,
 }
 
+export type MessageToExtension = {
+  action: ExtensionAction;
+  payload: WebProverSessionConfig;
+};
+
 export const enum ExtensionMessageType {
   ProofDone = "ProofDone",
   ProofError = "ProofError",
@@ -17,4 +33,39 @@ export type ExtensionMessage =
 export type WebProverSessionConfig = {
   notaryUrl: string;
   wsProxyUrl: string;
+  logoUrl: string;
+  steps: WebProofStep[];
 };
+
+export type WebProofStep =
+  | WebProofStepNotarize
+  | WebProofStepExpectUrl
+  | WebProofStepStartPage;
+
+export type WebProofStepNotarize = Branded<
+  {
+    url: string;
+    method: string;
+    label: string;
+    step: typeof EXTENSION_STEP.notarize;
+  },
+  "notarize"
+>;
+
+export type WebProofStepExpectUrl = Branded<
+  {
+    url: string;
+    label: string;
+    step: typeof EXTENSION_STEP.expectUrl;
+  },
+  "expectUrl"
+>;
+
+export type WebProofStepStartPage = Branded<
+  {
+    url: string;
+    label: string;
+    step: typeof EXTENSION_STEP.startPage;
+  },
+  "startPage"
+>;

package/node_modules/@vlayer/web-proof-commons/lib/utils.ts

@@ -0,0 +1,12 @@
+declare const __brand: unique symbol;
+type Brand<B> = { [__brand]: B };
+export type Branded<T, B> = T & Brand<B>;
+
+export function isDefined<T>(
+  value: T | undefined,
+  message: string = "Value is undefined",
+): asserts value is T {
+  if (value === undefined) {
+    throw new Error(message);
+  }
+}

package/package.json

@@ -2,7 +2,7 @@
   "name": "@vlayer/sdk",
   "type": "module",
   "module": "src/index.ts",
-  "version": "0.1.0-nightly-20241009-3c85ef5",
+  "version": "0.1.0-nightly-20241010-e69694a",
   "types": "src/index.ts",
   "scripts": {
     "build": "npm run gen:types",

package/src/api/helpers.ts

@@ -21,7 +21,7 @@ const rpcUrls: Map<number, HttpTransport> = new Map([[foundry.id, http()]]);
 
 export const chainIds = [foundry.id];
 
-export function client(
+export function createAnvilClient(
   chainId: number = foundry.id,
 ): ReturnType<typeof walletActions> & PublicClient {
   const transport = rpcUrls.get(chainId);
@@ -43,7 +43,7 @@ export async function deployContract(
   args: ContractArg[] = [],
   chainId: number = foundry.id,
 ): Promise<Address> {
-  const ethClient = client(chainId);
+  const ethClient = createAnvilClient(chainId);
 
   const [deployer] = await ethClient.getAddresses();
 
@@ -113,7 +113,7 @@ export async function call<
   args?: ContractFunctionArgs<T, "pure" | "view", F>,
   chainId: number = foundry.id,
 ) {
-  const ethClient = client(chainId);
+  const ethClient = createAnvilClient(chainId);
 
   return ethClient.readContract({
     abi,
@@ -134,7 +134,7 @@ export async function writeContract<
   sender?: Address,
   chainId: number = foundry.id,
 ) {
-  const ethClient = client(chainId);
+  const ethClient = createAnvilClient(chainId);
   const selectedSender = sender || (await ethClient.getAddresses())[0];
 
   const txHash = await ethClient.writeContract({
@@ -160,4 +160,4 @@ export const getTestAccount = () => privateKeyToAccount(generatePrivateKey());
 
 export const getTestAddresses = (
   chainId: number = foundry.id,
-): Promise<Address[]> => client(chainId).getAddresses();
+): Promise<Address[]> => createAnvilClient(chainId).getAddresses();

package/src/api/lib/client.ts

@@ -1,8 +1,25 @@
-import { VlayerClient } from "types/vlayer";
+import { VCallResponse, VlayerClient } from "types/vlayer";
 import { WebProofProvider } from "types/webProofProvider";
 
 import { prove } from "../prover";
 import { createExtensionWebProofProvider } from "../webProof";
+import { type Abi, decodeFunctionResult } from "viem";
+
+function dropProofFromArgs(args: unknown) {
+  if (Array.isArray(args)) {
+    return args.slice(1);
+  }
+  return [];
+}
+
+function generateRandomHash() {
+  let hash = "0x";
+  for (let i = 0; i < 40; ++i) {
+    hash += Math.floor(Math.random() * 16).toString(16);
+  }
+  return hash;
+}
+
 export const createVlayerClient = (
   {
     url = "http://127.0.0.1:3000",
@@ -17,9 +34,43 @@ export const createVlayerClient = (
 ): VlayerClient => {
   // TODO : implement high level api
   console.log("createVlayerClient with", url, webProofProvider);
+  const resultHashMap = new Map<
+    string,
+    [Promise<VCallResponse>, Abi, string]
+  >();
+
   return {
     prove: async ({ address, functionName, chainId, proverAbi, args }) => {
-      return prove(address, proverAbi, functionName, args, chainId, url);
+      const result_promise = prove(
+        address,
+        proverAbi,
+        functionName,
+        args,
+        chainId,
+        url,
+      );
+      const hash = generateRandomHash();
+      resultHashMap.set(hash, [result_promise, proverAbi, functionName]);
+      return { hash };
+    },
+    waitForProvingResult: async ({ hash }) => {
+      const savedProvingData = resultHashMap.get(hash);
+      if (!savedProvingData) {
+        throw new Error("No result found for hash " + hash);
+      }
+      const {
+        result: { proof, evm_call_result },
+      } = await savedProvingData[0];
+
+      const result = dropProofFromArgs(
+        decodeFunctionResult({
+          abi: savedProvingData[1] as Abi,
+          data: evm_call_result,
+          functionName: savedProvingData[2] as string,
+        }),
+      );
+
+      return { proof, result };
     },
   };
 };

package/src/api/lib/types/ethereum.ts

@@ -1,5 +1,5 @@
 import { Abi, Address, Hex } from "viem";
-import { Branded } from "./utils";
+import { Branded } from "@vlayer/web-proof-commons";
 export type Bytecode = {
   object: Hex;
 };

package/src/api/lib/types/index.ts

@@ -1,5 +1,4 @@
 export * from "./ethereum";
 export * from "./webProof";
-export * from "./utils";
 export * from "./vlayer";
 export * from "./webProofProvider";

package/src/api/lib/types/vlayer.ts

@@ -66,7 +66,12 @@ export type VlayerClient = {
     F extends ContractFunctionName<T>,
   >(
     args: VlayerClientProveArgs<T, F>,
-  ) => void;
+  ) => Promise<{ hash: string }>;
+  waitForProvingResult: ({
+    hash,
+  }: {
+    hash: string;
+  }) => Promise<{ proof: Proof; result: unknown[] }>;
 };
 
 export type VlayerClientProveArgs<

package/src/api/lib/types/webProofProvider.ts

@@ -1,44 +1,11 @@
 import { WebProof } from "types/webProof.ts";
 import { AbiFunction, Hex, Abi, ContractFunctionName } from "viem";
-import { Branded } from "types/utils.ts";
 import type { ContractFunctionArgsWithout } from "./viem";
-
-export const EXTENSION_STEP = {
-  expectUrl: "expectUrl",
-  startPage: "startPage",
-  notarize: "notarize",
-} as const;
-
-export type ExtensionStep =
-  (typeof EXTENSION_STEP)[keyof typeof EXTENSION_STEP];
-
-export type WebProofStepNotarize = Branded<
-  {
-    url: string;
-    method: string;
-    label: string;
-    step: typeof EXTENSION_STEP.notarize;
-  },
-  "notarize"
->;
-
-export type WebProofStepExpectUrl = Branded<
-  {
-    url: string;
-    label: string;
-    step: typeof EXTENSION_STEP.expectUrl;
-  },
-  "expectUrl"
->;
-
-export type WebProofStepStartPage = Branded<
-  {
-    url: string;
-    label: string;
-    step: typeof EXTENSION_STEP.startPage;
-  },
-  "startPage"
->;
+import {
+  Branded,
+  WebProofStepExpectUrl,
+  WebProofStepStartPage,
+} from "@vlayer/web-proof-commons";
 
 export type WebProofSetupInput = {
   logoUrl: string;
@@ -62,6 +29,7 @@ export type ProverCallCommitment<
   commitmentArgs: ContractFunctionArgsWithout<T, F, { name: "webProof" }>;
   chainId: number;
 };
+
 export type GetWebProofArgs<
   T extends readonly [AbiFunction, ...Abi[number][]],
   F extends ContractFunctionName<T>,

package/src/api/prover.ts

@@ -5,19 +5,13 @@ import {
   type Address,
   ContractFunctionArgs,
   ContractFunctionName,
-  decodeFunctionResult,
   encodeFunctionData,
 } from "viem";
 
 import { type CallContext, type CallParams } from "types/vlayer";
 import { v_call } from "./v_call";
-import { ContractSpec } from "types/ethereum";
 import { foundry } from "viem/chains";
 
-export async function getContractSpec(file: string): Promise<ContractSpec> {
-  return Bun.file(file).json();
-}
-
 export async function prove<
   T extends readonly [AbiFunction, ...Abi[number][]],
   F extends ContractFunctionName<T>,
@@ -40,16 +34,5 @@ export async function prove<
     chain_id: chainId,
   };
 
-  const {
-    result: { proof, evm_call_result },
-  } = await v_call(call, context, url);
-
-  const [, ...result] = decodeFunctionResult({
-    abi: abi as Abi,
-    data: evm_call_result,
-    functionName: functionName as string,
-    // eslint-disable-next-line @typescript-eslint/no-explicit-any
-  }) as any[];
-
-  return { proof, result };
+  return v_call(call, context, url);
 }

package/src/api/webProof/providers/extension.ts

@@ -6,8 +6,9 @@ import {
 
 import {
   ExtensionAction,
-  ExtensionMessage,
+  type ExtensionMessage,
   ExtensionMessageType,
+  type MessageToExtension,
 } from "@vlayer/web-proof-commons";
 
 import { WebProof } from "../../lib/types/webProof";
@@ -20,7 +21,10 @@ import { WebProof } from "../../lib/types/webProof";
 
 declare const chrome: {
   runtime: {
-    sendMessage: (extensionId: string | undefined, message: unknown) => void;
+    sendMessage: (
+      extensionId: string | undefined,
+      message: MessageToExtension,
+    ) => void;
     connect: (extensionId: string) => {
       onMessage: {
         addListener: (message: unknown) => void;

package/src/api/webProof/steps/expectUrl.ts

@@ -1,7 +1,7 @@
 import {
   EXTENSION_STEP,
   WebProofStepExpectUrl,
-} from "../../../api/lib/types/webProofProvider";
+} from "@vlayer/web-proof-commons";
 
 export const expectUrl = (url: string, label: string) => {
   return {

package/src/api/webProof/steps/notarize.ts

@@ -1,7 +1,7 @@
 import {
   EXTENSION_STEP,
   WebProofStepNotarize,
-} from "../../../api/lib/types/webProofProvider";
+} from "@vlayer/web-proof-commons";
 
 export const notarize = (
   url: string,

package/src/api/webProof/steps/startPage.ts

@@ -1,7 +1,7 @@
 import {
   EXTENSION_STEP,
   WebProofStepStartPage,
-} from "../../../api/lib/types/webProofProvider";
+} from "@vlayer/web-proof-commons";
 
 export const startPage = (url: string, label: string) => {
   return {

package/src/index.ts

@@ -1,10 +1,4 @@
-export { v_call } from "./api/v_call";
-export type { CallParams, CallContext } from "types/vlayer";
-export type { ContractSpec } from "types/ethereum";
-
-export { getContractSpec } from "./api/prover";
 export * as testHelpers from "./api/helpers";
-export { client as createTestClient } from "./api/helpers";
 export { preverifyEmail } from "./api/email/preverify.ts";
 export { createVlayerClient } from "./api/lib/client.ts";
 

package/src/api/lib/types/utils.ts

@@ -1,3 +0,0 @@
-declare const __brand: unique symbol;
-type Brand<B> = { [__brand]: B };
-export type Branded<T, B> = T & Brand<B>;