Merge pull request #87 from zama-ai/feat/add-support-eip

Feat/add support eip

.github/workflows/main.yml

@@ -11,7 +11,7 @@ jobs:
 
     strategy:
       matrix:
-        node-version: [18.x]
+        node-version: [20.x]
     steps:
       - uses: actions/checkout@v3
       - name: Use Node.js ${{ matrix.node-version }}

.github/workflows/publish.yml

@@ -11,7 +11,7 @@ jobs:
       - uses: actions/checkout@v3
       - uses: actions/setup-node@v3
         with:
-          node-version: 18.x
+          node-version: 20.x
       - run: npm ci
       - run: npm test
       - run: npm run build

.github/workflows/publishprerelease.yml

@@ -11,7 +11,7 @@ jobs:
       - uses: actions/checkout@v3
       - uses: actions/setup-node@v3
         with:
-          node-version: 18.x
+          node-version: 20.x
       - run: npm ci
       - run: npm test
       - run: npm run build

.github/workflows/test.yml

@@ -10,7 +10,7 @@ jobs:
 
     strategy:
       matrix:
-        node-version: [18.x]
+        node-version: [20.x]
     steps:
       - uses: actions/checkout@v3
       - name: Use Node.js ${{ matrix.node-version }}

package.json

@@ -1,6 +1,6 @@
 {
   "name": "fhevmjs",
-  "version": "0.5.1",
+  "version": "0.5.2",
   "description": "fhEVM SDK for blockchain using TFHE",
   "main": "lib/node.js",
   "types": "lib/node/node.d.ts",
@@ -22,6 +22,9 @@
       "require": "./lib/node.cjs"
     }
   },
+  "engines": {
+    "node": ">=20"
+  },
   "scripts": {
     "lint": "eslint src/",
     "build": "npm run build:lib && npm run build:bundle",
@@ -45,7 +48,6 @@
     "@types/keccak": "^3.0.4",
     "bigint-buffer": "^1.1.5",
     "commander": "^11.0.0",
-    "ethers": "^6.6.4",
     "node-fetch": "^2.7.0",
     "node-tfhe": "^0.6.3",
     "sha3": "^2.1.4",
@@ -64,6 +66,7 @@
     "@types/node-fetch": "^2.6.11",
     "buffer": "^6.0.3",
     "crypto-browserify": "^3.12.0",
+    "ethers": "^6.13.1",
     "fetch-mock-jest": "^1.5.1",
     "jest": "^29.5.0",
     "jest-raw-loader": "^1.0.1",

src/sdk/index.ts

@@ -1,11 +1,14 @@
 import { TfheCompactPublicKey } from 'node-tfhe';
+import type { Eip1193Provider } from 'ethers';
 import { URL } from 'url';
 import { fromHexString } from '../utils';
 import { ZKInput } from './encrypt';
 import {
   getPublicKeyFromNetwork,
   getPublicKeyFromCoprocessor,
   getChainIdFromNetwork,
+  getChainIdFromEip1193,
+  getPublicKeyFromEip1193,
 } from './network';
 import { createEncryptedInput } from './encrypt';
 import { generateKeypair, createEIP712, EIP712 } from './keypair';
@@ -22,6 +25,7 @@ type FhevmInstanceConfig = {
   chainId?: number;
   publicKey?: string;
   gatewayUrl?: string;
+  network?: Eip1193Provider;
   networkUrl?: string;
   coprocessorUrl?: string;
 };
@@ -51,7 +55,7 @@ export type FhevmInstance = {
 export const createInstance = async (
   config: FhevmInstanceConfig,
 ): Promise<FhevmInstance> => {
-  let { publicKey, networkUrl, gatewayUrl, coprocessorUrl } = config;
+  let { publicKey, networkUrl, network, gatewayUrl, coprocessorUrl } = config;
 
   if (gatewayUrl) {
     gatewayUrl = new URL(gatewayUrl).href;
@@ -72,6 +76,8 @@ export const createInstance = async (
     throw new Error('chainId must be a number.');
   } else if (networkUrl) {
     chainId = await getChainIdFromNetwork(networkUrl);
+  } else if (network) {
+    chainId = await getChainIdFromEip1193(network);
   } else {
     throw new Error(
       "You didn't provide the chainId nor the network url to get it.",
@@ -83,10 +89,8 @@ export const createInstance = async (
     publicKey = data.publicKey;
   } else if (networkUrl && !publicKey) {
     publicKey = await getPublicKeyFromNetwork(networkUrl);
-  }
-
-  if (networkUrl && !chainId) {
-    chainId = await getChainIdFromNetwork(networkUrl);
+  } else if (network && !publicKey) {
+    publicKey = await getPublicKeyFromEip1193(network);
   }
 
   if (publicKey && typeof publicKey !== 'string')

src/sdk/network.ts

@@ -1,10 +1,27 @@
-import { fetchJSONRPC } from '../ethCall';
+import type { Eip1193Provider } from 'ethers';
+import { decodeAbiBytes, fetchJSONRPC } from '../ethCall';
+import { toHexString } from '../utils';
 
 export const getPublicKeyCallParams = () => ({
   to: '0x000000000000000000000000000000000000005d',
   data: '0xd9d47bb001',
 });
 
+export const getChainIdFromEip1193 = async (ethereum: Eip1193Provider) => {
+  const payload = {
+    method: 'eth_chainId',
+    params: [],
+  };
+
+  let chainId;
+  try {
+    chainId = await ethereum.request(payload);
+  } catch (e) {
+    throw new Error('Impossible to fetch chain id (wrong network?)');
+  }
+  return Number(chainId);
+};
+
 export const getChainIdFromNetwork = async (url: string) => {
   const payload = {
     jsonrpc: '2.0',
@@ -24,11 +41,30 @@ export const getChainIdFromNetwork = async (url: string) => {
   try {
     chainId = await fetchJSONRPC(url, options);
   } catch (e) {
-    throw new Error('Impossible to fetch chain id (wrong networkUrl?)');
+    throw new Error('Impossible to fetch chain id (wrong url?)');
   }
   return Number(chainId);
 };
 
+export const getPublicKeyFromEip1193 = async (ethereum: Eip1193Provider) => {
+  const payload = {
+    method: 'eth_call',
+    params: [getPublicKeyCallParams(), 'latest'],
+  };
+
+  let publicKey;
+  try {
+    const rawPubKey = await ethereum.request(payload);
+    const decodedBytes = decodeAbiBytes(rawPubKey);
+    publicKey = `0x${toHexString(decodedBytes)}`;
+  } catch (e) {
+    throw new Error(
+      'Impossible to fetch public key from network (wrong network?)',
+    );
+  }
+  return publicKey;
+};
+
 // Define the function to perform the eth_call
 export const getPublicKeyFromNetwork = async (url: string) => {
   // Create the JSON-RPC request payload