@zama-fhe/relayer-sdk 0.1.0-3 → 0.1.0-5

package/lib/node.cjs

@@ -368,8 +368,8 @@ const userDecryptRequest = (kmsSigners, gatewayChainId, chainId, verifyingContra
     let pubKey;
     let privKey;
     try {
-        pubKey = nodeTkms.u8vec_to_cryptobox_pk(fromHexString(publicKey));
-        privKey = nodeTkms.u8vec_to_cryptobox_sk(fromHexString(privateKey));
+        pubKey = nodeTkms.u8vec_to_ml_kem_pke_pk(fromHexString(publicKey));
+        privKey = nodeTkms.u8vec_to_ml_kem_pke_sk(fromHexString(privateKey));
     }
     catch (e) {
         throw new Error('Invalid public or private key', { cause: e });
@@ -398,7 +398,11 @@ const userDecryptRequest = (kmsSigners, gatewayChainId, chainId, verifyingContra
     if (json.status === 'failure') {
         throw new Error("User decrypt failed: the user decryption didn't succeed for an unknown reason", { cause: json });
     }
-    const client = nodeTkms.new_client(kmsSigners, userAddress, 'default');
+    // assume the KMS Signers have the correct order
+    let indexedKmsSigners = kmsSigners.map((signer, index) => {
+        return nodeTkms.new_server_id_addr(index + 1, signer);
+    });
+    const client = nodeTkms.new_client(indexedKmsSigners, userAddress, 'default');
     try {
         const buffer = new ArrayBuffer(32);
         const view = new DataView(buffer);
@@ -1067,10 +1071,10 @@ const createEIP712 = (gatewayChainId, verifyingContract, contractsChainId) => (p
     };
 };
 const generateKeypair = () => {
-    const keypair = nodeTkms.cryptobox_keygen();
+    const keypair = nodeTkms.ml_kem_pke_keygen();
     return {
-        publicKey: toHexString(nodeTkms.cryptobox_pk_to_u8vec(nodeTkms.cryptobox_get_pk(keypair))),
-        privateKey: toHexString(nodeTkms.cryptobox_sk_to_u8vec(keypair)),
+        publicKey: toHexString(nodeTkms.ml_kem_pke_pk_to_u8vec(nodeTkms.ml_kem_pke_get_pk(keypair))),
+        privateKey: toHexString(nodeTkms.ml_kem_pke_sk_to_u8vec(keypair)),
     };
 };
 

package/lib/node.js

@@ -1,6 +1,6 @@
 import { JsonRpcProvider, BrowserProvider, Contract, ethers, getAddress, isAddress, AbiCoder } from 'ethers';
 import { TfheCompactPublicKey, CompactPkeCrs, CompactCiphertextList, ZkComputeLoad, ShortintParameters, ShortintParametersName, ShortintCompactPublicKeyEncryptionParameters, ShortintCompactPublicKeyEncryptionParametersName, TfheConfigBuilder, TfheClientKey } from 'node-tfhe';
-import { u8vec_to_cryptobox_pk, u8vec_to_cryptobox_sk, new_client, process_user_decryption_resp_from_js, cryptobox_keygen, cryptobox_pk_to_u8vec, cryptobox_get_pk, cryptobox_sk_to_u8vec } from 'node-tkms';
+import { u8vec_to_ml_kem_pke_pk, u8vec_to_ml_kem_pke_sk, new_server_id_addr, new_client, process_user_decryption_resp_from_js, ml_kem_pke_keygen, ml_kem_pke_pk_to_u8vec, ml_kem_pke_get_pk, ml_kem_pke_sk_to_u8vec } from 'node-tkms';
 import createHash from 'keccak';
 import fetchRetry from 'fetch-retry';
 
@@ -366,8 +366,8 @@ const userDecryptRequest = (kmsSigners, gatewayChainId, chainId, verifyingContra
     let pubKey;
     let privKey;
     try {
-        pubKey = u8vec_to_cryptobox_pk(fromHexString(publicKey));
-        privKey = u8vec_to_cryptobox_sk(fromHexString(privateKey));
+        pubKey = u8vec_to_ml_kem_pke_pk(fromHexString(publicKey));
+        privKey = u8vec_to_ml_kem_pke_sk(fromHexString(privateKey));
     }
     catch (e) {
         throw new Error('Invalid public or private key', { cause: e });
@@ -396,7 +396,11 @@ const userDecryptRequest = (kmsSigners, gatewayChainId, chainId, verifyingContra
     if (json.status === 'failure') {
         throw new Error("User decrypt failed: the user decryption didn't succeed for an unknown reason", { cause: json });
     }
-    const client = new_client(kmsSigners, userAddress, 'default');
+    // assume the KMS Signers have the correct order
+    let indexedKmsSigners = kmsSigners.map((signer, index) => {
+        return new_server_id_addr(index + 1, signer);
+    });
+    const client = new_client(indexedKmsSigners, userAddress, 'default');
     try {
         const buffer = new ArrayBuffer(32);
         const view = new DataView(buffer);
@@ -1065,10 +1069,10 @@ const createEIP712 = (gatewayChainId, verifyingContract, contractsChainId) => (p
     };
 };
 const generateKeypair = () => {
-    const keypair = cryptobox_keygen();
+    const keypair = ml_kem_pke_keygen();
     return {
-        publicKey: toHexString(cryptobox_pk_to_u8vec(cryptobox_get_pk(keypair))),
-        privateKey: toHexString(cryptobox_sk_to_u8vec(keypair)),
+        publicKey: toHexString(ml_kem_pke_pk_to_u8vec(ml_kem_pke_get_pk(keypair))),
+        privateKey: toHexString(ml_kem_pke_sk_to_u8vec(keypair)),
     };
 };
 

package/lib/web.js

@@ -25189,6 +25189,23 @@ function takeFromExternrefTable0(idx) {
     return value;
 }
 
+/**
+ * Create a new [ServerIdAddr] structure that holds an ID and an address
+ * which must be a valid EIP-55 address, notably prefixed with "0x".
+ * @param {number} id
+ * @param {string} addr
+ * @returns {ServerIdAddr}
+ */
+function new_server_id_addr(id, addr) {
+    const ptr0 = passStringToWasm0(addr, wasm.__wbindgen_malloc, wasm.__wbindgen_realloc);
+    const len0 = WASM_VECTOR_LEN;
+    const ret = wasm.new_server_id_addr(id, ptr0, len0);
+    if (ret[2]) {
+        throw takeFromExternrefTable0(ret[1]);
+    }
+    return ServerIdAddr.__wrap(ret[0]);
+}
+
 function passArrayJsValueToWasm0(array, malloc) {
     const ptr = malloc(array.length * 4, 4) >>> 0;
     for (let i = 0; i < array.length; i++) {
@@ -25201,15 +25218,15 @@ function passArrayJsValueToWasm0(array, malloc) {
 /**
  * Instantiate a new client.
  *
- * * `server_addrs` - a list of KMS server EIP-55 addresses,
- * must be prefixed with "0x".
+ * * `server_addrs` - a list of KMS server ID with EIP-55 addresses,
+ * the elements in the list can be created using [new_server_id_addr].
  *
  * * `client_address_hex` - the client (wallet) address in hex,
  * must be prefixed with "0x".
  *
  * * `fhe_parameter` - the parameter choice, which can be either `"test"` or `"default"`.
  * The "default" parameter choice is selected if no matching string is found.
- * @param {string[]} server_addrs
+ * @param {ServerIdAddr[]} server_addrs
  * @param {string} client_address_hex
  * @param {string} fhe_parameter
  * @returns {Client}
@@ -25242,8 +25259,8 @@ function getArrayJsValueFromWasm0(ptr, len) {
 /**
  * @returns {PrivateEncKey}
  */
-function cryptobox_keygen() {
-    const ret = wasm.cryptobox_keygen();
+function ml_kem_pke_keygen() {
+    const ret = wasm.ml_kem_pke_keygen();
     return PrivateEncKey.__wrap(ret);
 }
 
@@ -25251,9 +25268,9 @@ function cryptobox_keygen() {
  * @param {PrivateEncKey} sk
  * @returns {PublicEncKey}
  */
-function cryptobox_get_pk(sk) {
+function ml_kem_pke_get_pk(sk) {
     _assertClass(sk, PrivateEncKey);
-    const ret = wasm.cryptobox_get_pk(sk.__wbg_ptr);
+    const ret = wasm.ml_kem_pke_get_pk(sk.__wbg_ptr);
     return PublicEncKey.__wrap(ret);
 }
 
@@ -25261,9 +25278,9 @@ function cryptobox_get_pk(sk) {
  * @param {PublicEncKey} pk
  * @returns {Uint8Array}
  */
-function cryptobox_pk_to_u8vec(pk) {
+function ml_kem_pke_pk_to_u8vec(pk) {
     _assertClass(pk, PublicEncKey);
-    const ret = wasm.cryptobox_pk_to_u8vec(pk.__wbg_ptr);
+    const ret = wasm.ml_kem_pke_pk_to_u8vec(pk.__wbg_ptr);
     if (ret[3]) {
         throw takeFromExternrefTable0(ret[2]);
     }
@@ -25276,9 +25293,9 @@ function cryptobox_pk_to_u8vec(pk) {
  * @param {PrivateEncKey} sk
  * @returns {Uint8Array}
  */
-function cryptobox_sk_to_u8vec(sk) {
+function ml_kem_pke_sk_to_u8vec(sk) {
     _assertClass(sk, PrivateEncKey);
-    const ret = wasm.cryptobox_sk_to_u8vec(sk.__wbg_ptr);
+    const ret = wasm.ml_kem_pke_sk_to_u8vec(sk.__wbg_ptr);
     if (ret[3]) {
         throw takeFromExternrefTable0(ret[2]);
     }
@@ -25291,10 +25308,10 @@ function cryptobox_sk_to_u8vec(sk) {
  * @param {Uint8Array} v
  * @returns {PublicEncKey}
  */
-function u8vec_to_cryptobox_pk(v) {
+function u8vec_to_ml_kem_pke_pk(v) {
     const ptr0 = passArray8ToWasm0(v, wasm.__wbindgen_malloc);
     const len0 = WASM_VECTOR_LEN;
-    const ret = wasm.u8vec_to_cryptobox_pk(ptr0, len0);
+    const ret = wasm.u8vec_to_ml_kem_pke_pk(ptr0, len0);
     if (ret[2]) {
         throw takeFromExternrefTable0(ret[1]);
     }
@@ -25305,10 +25322,10 @@ function u8vec_to_cryptobox_pk(v) {
  * @param {Uint8Array} v
  * @returns {PrivateEncKey}
  */
-function u8vec_to_cryptobox_sk(v) {
+function u8vec_to_ml_kem_pke_sk(v) {
     const ptr0 = passArray8ToWasm0(v, wasm.__wbindgen_malloc);
     const len0 = WASM_VECTOR_LEN;
-    const ret = wasm.u8vec_to_cryptobox_sk(ptr0, len0);
+    const ret = wasm.u8vec_to_ml_kem_pke_sk(ptr0, len0);
     if (ret[2]) {
         throw takeFromExternrefTable0(ret[1]);
     }
@@ -25511,6 +25528,40 @@ class PublicEncKey {
     ? { register: () => {}, unregister: () => {} }
     : new FinalizationRegistry(ptr => wasm.__wbg_requestid_free(ptr >>> 0, 1));
 
+const ServerIdAddrFinalization = (typeof FinalizationRegistry === 'undefined')
+    ? { register: () => {}, unregister: () => {} }
+    : new FinalizationRegistry(ptr => wasm.__wbg_serveridaddr_free(ptr >>> 0, 1));
+
+class ServerIdAddr {
+
+    static __wrap(ptr) {
+        ptr = ptr >>> 0;
+        const obj = Object.create(ServerIdAddr.prototype);
+        obj.__wbg_ptr = ptr;
+        ServerIdAddrFinalization.register(obj, obj.__wbg_ptr, obj);
+        return obj;
+    }
+
+    static __unwrap(jsValue) {
+        if (!(jsValue instanceof ServerIdAddr)) {
+            return 0;
+        }
+        return jsValue.__destroy_into_raw();
+    }
+
+    __destroy_into_raw() {
+        const ptr = this.__wbg_ptr;
+        this.__wbg_ptr = 0;
+        ServerIdAddrFinalization.unregister(this);
+        return ptr;
+    }
+
+    free() {
+        const ptr = this.__destroy_into_raw();
+        wasm.__wbg_serveridaddr_free(ptr, 0);
+    }
+}
+
 const TypedCiphertextFinalization = (typeof FinalizationRegistry === 'undefined')
     ? { register: () => {}, unregister: () => {} }
     : new FinalizationRegistry(ptr => wasm.__wbg_typedciphertext_free(ptr >>> 0, 1));
@@ -25835,7 +25886,7 @@ class UserDecryptionResponse {
     }
     /**
      * This is the external signature created from the Eip712 domain
-     * on the structure, where userDecryptedShare is bincode::serialize(&payload)
+     * on the structure, where userDecryptedShare is bc2wrap::serialize(&payload)
      * struct UserDecryptResponseVerification {
      *      bytes publicKey;
      *      uint256\[\] ctHandles;
@@ -25851,7 +25902,7 @@ class UserDecryptionResponse {
     }
     /**
      * This is the external signature created from the Eip712 domain
-     * on the structure, where userDecryptedShare is bincode::serialize(&payload)
+     * on the structure, where userDecryptedShare is bc2wrap::serialize(&payload)
      * struct UserDecryptResponseVerification {
      *      bytes publicKey;
      *      uint256\[\] ctHandles;
@@ -26188,6 +26239,14 @@ function __wbg_get_imports() {
         const ret = module.require;
         return ret;
     }, arguments) };
+    imports.wbg.__wbg_serveridaddr_new = function(arg0) {
+        const ret = ServerIdAddr.__wrap(arg0);
+        return ret;
+    };
+    imports.wbg.__wbg_serveridaddr_unwrap = function(arg0) {
+        const ret = ServerIdAddr.__unwrap(arg0);
+        return ret;
+    };
     imports.wbg.__wbg_set_65595bdd868b3009 = function(arg0, arg1, arg2) {
         arg0.set(arg1, arg2 >>> 0);
     };
@@ -26519,8 +26578,8 @@ const userDecryptRequest = (kmsSigners, gatewayChainId, chainId, verifyingContra
     let pubKey;
     let privKey;
     try {
-        pubKey = u8vec_to_cryptobox_pk(fromHexString(publicKey));
-        privKey = u8vec_to_cryptobox_sk(fromHexString(privateKey));
+        pubKey = u8vec_to_ml_kem_pke_pk(fromHexString(publicKey));
+        privKey = u8vec_to_ml_kem_pke_sk(fromHexString(privateKey));
     }
     catch (e) {
         throw new Error('Invalid public or private key', { cause: e });
@@ -26549,7 +26608,11 @@ const userDecryptRequest = (kmsSigners, gatewayChainId, chainId, verifyingContra
     if (json.status === 'failure') {
         throw new Error("User decrypt failed: the user decryption didn't succeed for an unknown reason", { cause: json });
     }
-    const client = new_client(kmsSigners, userAddress, 'default');
+    // assume the KMS Signers have the correct order
+    let indexedKmsSigners = kmsSigners.map((signer, index) => {
+        return new_server_id_addr(index + 1, signer);
+    });
+    const client = new_client(indexedKmsSigners, userAddress, 'default');
     try {
         const buffer = new ArrayBuffer(32);
         const view = new DataView(buffer);
@@ -27218,10 +27281,10 @@ const createEIP712 = (gatewayChainId, verifyingContract, contractsChainId) => (p
     };
 };
 const generateKeypair = () => {
-    const keypair = cryptobox_keygen();
+    const keypair = ml_kem_pke_keygen();
     return {
-        publicKey: toHexString(cryptobox_pk_to_u8vec(cryptobox_get_pk(keypair))),
-        privateKey: toHexString(cryptobox_sk_to_u8vec(keypair)),
+        publicKey: toHexString(ml_kem_pke_pk_to_u8vec(ml_kem_pke_get_pk(keypair))),
+        privateKey: toHexString(ml_kem_pke_sk_to_u8vec(keypair)),
     };
 };
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zama-fhe/relayer-sdk",
-  "version": "0.1.0-3",
+  "version": "0.1.0-5",
   "description": "fhevm Relayer SDK",
   "main": "lib/node.js",
   "types": "lib/node.d.ts",
@@ -63,9 +63,9 @@
     "fetch-retry": "^6.0.0",
     "keccak": "^3.0.4",
     "node-tfhe": "^1.1.2",
-    "node-tkms": "0.11.0-rc15",
+    "node-tkms": "0.11.0-rc17",
     "tfhe": "^1.1.2",
-    "tkms": "0.11.0-rc15",
+    "tkms": "0.11.0-rc17",
     "wasm-feature-detect": "^1.8.0"
   },
   "devDependencies": {