@vlayer/sdk 0.1.0-nightly-20241009-483ba9f → 0.1.0-nightly-20241009-c348db7

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

@@ -0,0 +1 @@
+export * from "./lib";

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

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

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

@@ -0,0 +1,20 @@
+export const enum ExtensionAction {
+  RequestWebProof,
+}
+
+export const enum ExtensionMessageType {
+  ProofDone = "ProofDone",
+  ProofError = "ProofError",
+  RedirectBack = "RedirectBack",
+}
+
+export type ExtensionMessage =
+  // eslint-disable-next-line @typescript-eslint/no-explicit-any
+  | { type: ExtensionMessageType.ProofDone; proof: any } // Change to WebProof
+  | { type: ExtensionMessageType.ProofError; error: string }
+  | { type: ExtensionMessageType.RedirectBack };
+
+export type WebProverSessionConfig = {
+  notaryUrl: string;
+  wsProxyUrl: string;
+};

package/node_modules/@vlayer/web-proof-commons/package.json

@@ -4,6 +4,10 @@
   "version": "1.0.0",
   "module": "index.ts",
   "type": "module",
+  "scripts": {
+    "lint": "eslint lib",
+    "lint:fix": "eslint --fix lib"
+  },
   "devDependencies": {
     "@types/bun": "latest"
   },

package/package.json

@@ -2,7 +2,7 @@
   "name": "@vlayer/sdk",
   "type": "module",
   "module": "src/index.ts",
-  "version": "0.1.0-nightly-20241009-483ba9f",
+  "version": "0.1.0-nightly-20241009-c348db7",
   "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

@@ -2,18 +2,24 @@ import { VlayerClient } from "types/vlayer";
 import { WebProofProvider } from "types/webProofProvider";
 
 import { prove } from "../prover";
-export const createVlayerClient = ({
-  url,
-  webProofProvider,
-}: {
-  url: string;
-  webProofProvider: WebProofProvider;
-}): VlayerClient => {
+import { createExtensionWebProofProvider } from "../webProof";
+export const createVlayerClient = (
+  {
+    url = "http://127.0.0.1:3000",
+    webProofProvider = createExtensionWebProofProvider(),
+  }: {
+    url?: string;
+    webProofProvider?: WebProofProvider;
+  } = {
+    url: "http://127.0.0.1:3000",
+    webProofProvider: createExtensionWebProofProvider(),
+  },
+): VlayerClient => {
   // TODO : implement high level api
   console.log("createVlayerClient with", url, webProofProvider);
   return {
     prove: async ({ address, functionName, chainId, proverAbi, args }) => {
-      return prove(address, proverAbi, functionName, args, chainId);
+      return prove(address, proverAbi, functionName, args, chainId, url);
     },
   };
 };

package/src/api/prover.ts

@@ -11,13 +11,8 @@ import {
 
 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>,
@@ -27,6 +22,7 @@ export async function prove<
   functionName: F,
   args: ContractFunctionArgs<T, AbiStateMutability, F>,
   chainId: number = foundry.id,
+  url: string = "http://127.0.0.1:3000",
 ) {
   const calldata = encodeFunctionData({
     abi: abi as Abi,
@@ -41,14 +37,14 @@ export async function prove<
 
   const {
     result: { proof, evm_call_result },
-  } = await v_call(call, context);
+  } = await v_call(call, context, url);
 
-  const [, ...returnValue] = decodeFunctionResult({
+  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, returnValue };
+  return { proof, result };
 }

package/src/api/v_call.ts

@@ -12,8 +12,9 @@ function v_callBody(call: CallParams, context: CallContext) {
 export async function v_call(
   call: CallParams,
   context: CallContext,
+  url: string = "http://127.0.0.1:3000",
 ): Promise<VCallResponse> {
-  const response = await fetch("http://127.0.0.1:3000", {
+  const response = await fetch(url, {
     method: "POST",
     body: JSON.stringify(v_callBody(call, context)),
     headers: { "Content-Type": "application/json" },

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

@@ -7,7 +7,8 @@ import {
 import {
   ExtensionAction,
   ExtensionMessage,
-} from "@vlayer/web-proof-commons/constants/message";
+  ExtensionMessageType,
+} from "@vlayer/web-proof-commons";
 
 import { WebProof } from "../../lib/types/webProof";
 
@@ -31,10 +32,15 @@ declare const chrome: {
 // this id is fixed in the extension by the key in manifest.json
 const EXTENSION_ID = "ghigbilfcgeibjkkajaekabeldkmijcd";
 
-export const createExtensionWebProofProvider = ({
-  notaryUrl = "https://notary.pse.dev/v0.1.0-alpha.5/",
-  wsProxyUrl = "wss://notary.pse.dev/proxy",
-}: WebProofProviderSetup): WebProofProvider => {
+export const createExtensionWebProofProvider = (
+  {
+    notaryUrl = "https://notary.pse.dev/v0.1.0-alpha.5/",
+    wsProxyUrl = "wss://notary.pse.dev/proxy",
+  }: WebProofProviderSetup = {
+    notaryUrl: "https://notary.pse.dev/v0.1.0-alpha.5/",
+    wsProxyUrl: "wss://notary.pse.dev/proxy",
+  },
+): WebProofProvider => {
   return {
     getWebProof: async function (webProofSetup: WebProofSetupInput) {
       return new Promise<WebProof>((resolve, reject) => {
@@ -49,26 +55,14 @@ export const createExtensionWebProofProvider = ({
         });
         const port = chrome.runtime.connect(EXTENSION_ID);
         // TODO: validate message in runtime
-        port.onMessage.addListener(
-          (
-            message:
-              | {
-                  type: ExtensionMessage.ProofDone;
-                  proof: WebProof;
-                }
-              | {
-                  type: ExtensionMessage.ProofError;
-                  error: { message: string };
-                },
-          ) => {
-            if (message.type === ExtensionMessage.ProofDone) {
-              resolve(message.proof);
-            }
-            if (message.type === ExtensionMessage.ProofError) {
-              reject(message.error);
-            }
-          },
-        );
+        port.onMessage.addListener((message: ExtensionMessage) => {
+          if (message.type === ExtensionMessageType.ProofDone) {
+            resolve(message.proof);
+          }
+          if (message.type === ExtensionMessageType.ProofError) {
+            reject(message.error);
+          }
+        });
       });
     },
   };

package/src/index.ts

@@ -1,11 +1,6 @@
-export { v_call } from "./api/v_call";
-export type { CallParams, CallContext } from "types/vlayer";
-export type { ContractSpec } from "types/ethereum";
-
-export { getContractSpec, prove } 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";
 
 export * from "./api/webProof";
 export * from "./api/lib/types";

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

@@ -1,13 +0,0 @@
-export const enum ExtensionAction {
-  RequestWebProof,
-}
-
-export const enum ExtensionMessage {
-  ProofDone,
-  ProofError,
-}
-
-export type WebProverSessionConfig = {
-  notaryUrl: string;
-  wsProxyUrl: string;
-};