@dynamic-labs-wallet/browser 0.0.10 → 0.0.12

package/index.cjs.js

@@ -182,34 +182,24 @@ const downloadFileFromGoogleDrive = async ({ accessToken, name })=>{
 const BACKUP_FILENAME = 'dynamicWalletSecretBackup.json';
 
 class DynamicWalletClient {
-    async serverInitializeKeyGen({ chainName, clientPrimaryKeygenId, clientSecondaryKeygenId, thresholdSignatureScheme }) {
+    async serverInitializeKeyGen({ chainName, clientKeygenIds, thresholdSignatureScheme }) {
         // Initilize keygen, create room, and create the wallet account on the server
         const data = await this.apiClient.createWalletAccount({
             chainName,
-            clientKeygenIds: [
-                clientPrimaryKeygenId,
-                clientSecondaryKeygenId
-            ],
+            clientKeygenIds,
             thresholdSignatureScheme
         });
         return data;
     }
-    async clientInitializeKeyGen({ chainName }) {
+    async clientInitializeKeyGen({ chainName, thresholdSignatureScheme }) {
         // Get the mpc signer
         const mpcSigner = getMPCSigner({
             chainName,
             baseRelayUrl: this.baseMPCRelayApiUrl
         });
-        // Initialize the keygen for the primary client and the secondary client shares
-        const keygenInitResults = await Promise.all([
-            mpcSigner.initKeygen(),
-            mpcSigner.initKeygen()
-        ]);
-        const [clientPrimaryKeygenInitResult, clientSecondaryKeygenInitResult] = keygenInitResults;
-        return {
-            clientPrimaryKeygenInitResult,
-            clientSecondaryKeygenInitResult
-        };
+        const clientThreshold = core.getClientThreshold(thresholdSignatureScheme);
+        const keygenInitResults = await Promise.all(Array(clientThreshold).fill(null).map(()=>mpcSigner.initKeygen()));
+        return keygenInitResults;
     }
     async derivePublicKey({ chainName, keyShare }) {
         const mpcSigner = getMPCSigner({
@@ -225,72 +215,58 @@ class DynamicWalletClient {
         }
         return publicKey;
     }
-    async clientKeyGen({ chainName, roomId, serverKeygenIds, clientPrimaryKeygenInitResult, clientSecondaryKeygenInitResult, thresholdSignatureScheme }) {
+    async clientKeyGen({ chainName, roomId, serverKeygenIds, clientKeygenInitResults, thresholdSignatureScheme }) {
         // Get the chain config and the mpc signer
-        const chainConfig = core.getMPCChainConfig(chainName);
         const mpcSigner = getMPCSigner({
             chainName,
             baseRelayUrl: this.baseMPCRelayApiUrl
         });
-        // All parties receive the keygenIds from all OTHER parties
-        const clientPrimaryKeygenId = clientPrimaryKeygenInitResult.keygenId;
-        const clientSecondaryKeygenId = clientSecondaryKeygenInitResult.keygenId;
-        const clientPrimaryKeygenIds = [
-            ...serverKeygenIds,
-            clientSecondaryKeygenId
-        ];
-        const clientSecondaryKeygenIds = [
-            ...serverKeygenIds,
-            clientPrimaryKeygenId
-        ];
         // Get the MPC config for the threshold signature scheme
         const mpcConfig = core.MPC_CONFIG[thresholdSignatureScheme];
-        // All parties join the keygen room
-        const keygenResults = await Promise.all([
-            mpcSigner.keygen(roomId, mpcConfig.numberOfParties, mpcConfig.threshold, clientPrimaryKeygenInitResult, clientPrimaryKeygenIds),
-            mpcSigner.keygen(roomId, mpcConfig.numberOfParties, mpcConfig.threshold, clientSecondaryKeygenInitResult, clientSecondaryKeygenIds)
-        ]);
-        const [clientPrimaryKeygenResult, clientSecondaryKeygenResult] = keygenResults;
-        // Pick the derivation path of the public key you want to sign for
-        const derivationPath = new Uint32Array(chainConfig.derivationPath);
-        // Get the public key for the derivation path
-        let rawPublicKey;
-        if (mpcSigner instanceof libMpcWeb.Ecdsa) {
-            rawPublicKey = await mpcSigner.derivePubkey(clientPrimaryKeygenResult, derivationPath);
-        } else if (mpcSigner instanceof libMpcWeb.Ed25519) {
-            rawPublicKey = await mpcSigner.derivePubkey(clientPrimaryKeygenResult, derivationPath);
-        } else if (mpcSigner instanceof libMpcWeb.BIP340) {
-            rawPublicKey = await mpcSigner.deriveTweakPubkey(clientPrimaryKeygenResult, derivationPath);
-        }
+        // For each client keygen init result, create an array of other parties' keygenIds
+        const clientKeygenResults = await Promise.all(clientKeygenInitResults.map((currentInit)=>{
+            // Get all other client keygenIds (excluding current one)
+            const otherClientKeygenIds = clientKeygenInitResults.filter((init)=>init.keygenId !== currentInit.keygenId).map((init)=>init.keygenId);
+            // Combine server keygenIds with other client keygenIds
+            const allOtherKeygenIds = [
+                ...serverKeygenIds,
+                ...otherClientKeygenIds
+            ];
+            return mpcSigner.keygen(roomId, mpcConfig.numberOfParties, mpcConfig.threshold, currentInit, allOtherKeygenIds);
+        }));
+        // only need one client keygen result to derive the public key
+        const [clientKeygenResult] = clientKeygenResults;
+        const rawPublicKey = await this.derivePublicKey({
+            chainName,
+            keyShare: clientKeygenResult
+        });
         return {
             rawPublicKey,
-            primaryKeygenResult: clientPrimaryKeygenResult,
-            secondaryKeygenResult: clientSecondaryKeygenResult
+            clientKeygenResults
         };
     }
     async keyGen({ chainName, thresholdSignatureScheme }) {
         try {
-            const { clientPrimaryKeygenInitResult, clientSecondaryKeygenInitResult } = await this.clientInitializeKeyGen({
-                chainName
+            const clientKeygenInitResults = await this.clientInitializeKeyGen({
+                chainName,
+                thresholdSignatureScheme
             });
-            const data = await this.serverInitializeKeyGen({
+            const clientKeygenIds = clientKeygenInitResults.map((result)=>result.keygenId);
+            const { roomId, serverKeygenIds } = await this.serverInitializeKeyGen({
                 chainName,
-                clientPrimaryKeygenId: clientPrimaryKeygenInitResult.keygenId,
-                clientSecondaryKeygenId: clientSecondaryKeygenInitResult.keygenId,
+                clientKeygenIds,
                 thresholdSignatureScheme
             });
-            const { rawPublicKey, primaryKeygenResult, secondaryKeygenResult } = await this.clientKeyGen({
+            const { rawPublicKey, clientKeygenResults: clientKeyShares } = await this.clientKeyGen({
                 chainName,
-                roomId: data.roomId,
-                serverKeygenIds: data.serverKeygenIds,
-                clientPrimaryKeygenInitResult,
-                clientSecondaryKeygenInitResult,
+                roomId,
+                serverKeygenIds,
+                clientKeygenInitResults,
                 thresholdSignatureScheme
             });
             return {
                 rawPublicKey,
-                primaryKeygenResult,
-                secondaryKeygenResult
+                clientKeyShares
             };
         } catch (error) {
             console.error('Error creating wallet account', error);
@@ -299,6 +275,9 @@ class DynamicWalletClient {
     }
     async serverSign({ walletId, message }) {
         // Create the room and sign the message
+        if (typeof message !== 'string') {
+            message = '0x' + Buffer.from(message).toString('hex');
+        }
         const data = await this.apiClient.signMessage({
             walletId,
             message
@@ -314,11 +293,12 @@ class DynamicWalletClient {
             });
             const derivationPath = new Uint32Array(chainConfig.derivationPath);
             let formattedMessage;
+            //note: Ecdsa can also be used by bitcoin, but only keccak256 is used by ethereum
             if (mpcSigner instanceof libMpcWeb.Ecdsa) {
-                formattedMessage = libMpcWeb.MessageHash.sha256(message);
-            } else if (mpcSigner instanceof libMpcWeb.Ed25519) {
+                formattedMessage = libMpcWeb.MessageHash.keccak256(message);
+            } else if (mpcSigner instanceof libMpcWeb.Ed25519 && typeof message === 'string') {
                 formattedMessage = new TextEncoder().encode(message);
-            } else if (mpcSigner instanceof libMpcWeb.BIP340) {
+            } else if (mpcSigner instanceof libMpcWeb.BIP340 && typeof message === 'string') {
                 formattedMessage = new TextEncoder().encode(message);
             } else {
                 throw new Error('Unsupported signer type');
@@ -594,59 +574,43 @@ class DynamicWalletClient {
         return decryptedKeyShare;
     }
     async importRawPrivateKey({ chainName, privateKey, thresholdSignatureScheme }) {
-        const chainConfig = core.getMPCChainConfig(chainName);
         const mpcSigner = getMPCSigner({
             chainName,
             baseRelayUrl: this.baseMPCRelayApiUrl
         });
-        // 1. 2 parties on the client side create keygenInit
-        const { clientPrimaryKeygenInitResult, clientSecondaryKeygenInitResult } = await this.clientInitializeKeyGen({
-            chainName
-        });
-        const clientSecondaryKeygenId = clientSecondaryKeygenInitResult.keygenId;
-        const clientPrimaryKeygenId = clientPrimaryKeygenInitResult.keygenId;
-        // 2. server to create a room for importing the private key
-        // server will do 3 things:
-        // --- 1. init keygen for the server as a party
-        // --- 2. open a room and return the roomId for the ceremony
-        // --- 3. join the room as a party for the 2/3 ceremony
+        const clientKeygenInitResults = await this.clientInitializeKeyGen({
+            chainName,
+            thresholdSignatureScheme
+        });
+        const clientKeygenIds = clientKeygenInitResults.map((result)=>result.keygenId);
         const { roomId, serverKeygenIds } = await this.apiClient.importPrivateKey({
             chainName,
-            clientKeygenIds: [
-                clientPrimaryKeygenId,
-                clientSecondaryKeygenId
-            ],
+            clientKeygenIds,
             thresholdSignatureScheme
         });
         const { threshold } = core.getTSSConfig(thresholdSignatureScheme);
-        // prep
-        const importerKeygenIds = [
-            ...serverKeygenIds,
-            clientSecondaryKeygenId
-        ];
-        const recipientKeygenIds = [
-            ...serverKeygenIds,
-            clientPrimaryKeygenId
-        ];
-        // 3. Join the keygen room for the ceremony
-        const [clientPrimaryKeygenResult, clientSecondaryKeygenResult] = await Promise.all([
-            mpcSigner.importPrivateKeyImporter(roomId, threshold, privateKey, clientPrimaryKeygenInitResult, importerKeygenIds),
-            mpcSigner.importPrivateKeyRecipient(roomId, threshold, clientSecondaryKeygenInitResult, recipientKeygenIds)
-        ]);
-        const derivationPath = new Uint32Array(chainConfig.derivationPath);
-        // Get the public key for the derivation path
-        let rawPublicKey;
-        if (mpcSigner instanceof libMpcWeb.Ecdsa) {
-            rawPublicKey = await mpcSigner.derivePubkey(clientPrimaryKeygenResult, derivationPath);
-        } else if (mpcSigner instanceof libMpcWeb.Ed25519) {
-            rawPublicKey = await mpcSigner.derivePubkey(clientPrimaryKeygenResult, derivationPath);
-        } else if (mpcSigner instanceof libMpcWeb.BIP340) {
-            rawPublicKey = await mpcSigner.deriveTweakPubkey(clientPrimaryKeygenResult, derivationPath);
-        }
+        const clientKeygenResults = await Promise.all(clientKeygenInitResults.map((currentInit, index)=>{
+            const otherClientKeygenIds = clientKeygenInitResults.filter((init)=>init.keygenId !== currentInit.keygenId).map((init)=>init.keygenId);
+            if (index === 0) {
+                return mpcSigner.importPrivateKeyImporter(roomId, threshold, privateKey, currentInit, [
+                    ...serverKeygenIds,
+                    ...otherClientKeygenIds
+                ]);
+            } else {
+                return mpcSigner.importPrivateKeyRecipient(roomId, threshold, currentInit, [
+                    ...serverKeygenIds,
+                    ...otherClientKeygenIds
+                ]);
+            }
+        }));
+        const [clientKeygenResult] = clientKeygenResults;
+        const rawPublicKey = await this.derivePublicKey({
+            chainName,
+            keyShare: clientKeygenResult
+        });
         return {
             rawPublicKey,
-            primaryKeygenResult: clientPrimaryKeygenResult,
-            secondaryKeygenResult: clientSecondaryKeygenResult
+            clientKeyShares: clientKeygenResults
         };
     }
     async exportClientKeyshares({ accountAddress }) {

package/index.esm.js

@@ -1,4 +1,4 @@
-import { SigningAlgorithm, MPC_RELAY_PROD_API_URL, getMPCChainConfig, MPC_CONFIG, getTSSConfig, DynamicApiClient } from '@dynamic-labs-wallet/core';
+import { SigningAlgorithm, MPC_RELAY_PROD_API_URL, getMPCChainConfig, getClientThreshold, MPC_CONFIG, getTSSConfig, DynamicApiClient } from '@dynamic-labs-wallet/core';
 export * from '@dynamic-labs-wallet/core';
 import { BIP340, Ed25519, Ecdsa, MessageHash, EcdsaKeygenResult, Ed25519KeygenResult, BIP340KeygenResult } from '@dynamic-labs-wallet/lib-mpc-web';
 export { BIP340, BIP340InitKeygenResult, BIP340KeygenResult, Ecdsa, EcdsaInitKeygenResult, EcdsaKeygenResult, EcdsaPublicKey, EcdsaSignature, Ed25519, Ed25519InitKeygenResult, Ed25519KeygenResult, MessageHash } from '@dynamic-labs-wallet/lib-mpc-web';
@@ -182,34 +182,24 @@ const downloadFileFromGoogleDrive = async ({ accessToken, name })=>{
 const BACKUP_FILENAME = 'dynamicWalletSecretBackup.json';
 
 class DynamicWalletClient {
-    async serverInitializeKeyGen({ chainName, clientPrimaryKeygenId, clientSecondaryKeygenId, thresholdSignatureScheme }) {
+    async serverInitializeKeyGen({ chainName, clientKeygenIds, thresholdSignatureScheme }) {
         // Initilize keygen, create room, and create the wallet account on the server
         const data = await this.apiClient.createWalletAccount({
             chainName,
-            clientKeygenIds: [
-                clientPrimaryKeygenId,
-                clientSecondaryKeygenId
-            ],
+            clientKeygenIds,
             thresholdSignatureScheme
         });
         return data;
     }
-    async clientInitializeKeyGen({ chainName }) {
+    async clientInitializeKeyGen({ chainName, thresholdSignatureScheme }) {
         // Get the mpc signer
         const mpcSigner = getMPCSigner({
             chainName,
             baseRelayUrl: this.baseMPCRelayApiUrl
         });
-        // Initialize the keygen for the primary client and the secondary client shares
-        const keygenInitResults = await Promise.all([
-            mpcSigner.initKeygen(),
-            mpcSigner.initKeygen()
-        ]);
-        const [clientPrimaryKeygenInitResult, clientSecondaryKeygenInitResult] = keygenInitResults;
-        return {
-            clientPrimaryKeygenInitResult,
-            clientSecondaryKeygenInitResult
-        };
+        const clientThreshold = getClientThreshold(thresholdSignatureScheme);
+        const keygenInitResults = await Promise.all(Array(clientThreshold).fill(null).map(()=>mpcSigner.initKeygen()));
+        return keygenInitResults;
     }
     async derivePublicKey({ chainName, keyShare }) {
         const mpcSigner = getMPCSigner({
@@ -225,72 +215,58 @@ class DynamicWalletClient {
         }
         return publicKey;
     }
-    async clientKeyGen({ chainName, roomId, serverKeygenIds, clientPrimaryKeygenInitResult, clientSecondaryKeygenInitResult, thresholdSignatureScheme }) {
+    async clientKeyGen({ chainName, roomId, serverKeygenIds, clientKeygenInitResults, thresholdSignatureScheme }) {
         // Get the chain config and the mpc signer
-        const chainConfig = getMPCChainConfig(chainName);
         const mpcSigner = getMPCSigner({
             chainName,
             baseRelayUrl: this.baseMPCRelayApiUrl
         });
-        // All parties receive the keygenIds from all OTHER parties
-        const clientPrimaryKeygenId = clientPrimaryKeygenInitResult.keygenId;
-        const clientSecondaryKeygenId = clientSecondaryKeygenInitResult.keygenId;
-        const clientPrimaryKeygenIds = [
-            ...serverKeygenIds,
-            clientSecondaryKeygenId
-        ];
-        const clientSecondaryKeygenIds = [
-            ...serverKeygenIds,
-            clientPrimaryKeygenId
-        ];
         // Get the MPC config for the threshold signature scheme
         const mpcConfig = MPC_CONFIG[thresholdSignatureScheme];
-        // All parties join the keygen room
-        const keygenResults = await Promise.all([
-            mpcSigner.keygen(roomId, mpcConfig.numberOfParties, mpcConfig.threshold, clientPrimaryKeygenInitResult, clientPrimaryKeygenIds),
-            mpcSigner.keygen(roomId, mpcConfig.numberOfParties, mpcConfig.threshold, clientSecondaryKeygenInitResult, clientSecondaryKeygenIds)
-        ]);
-        const [clientPrimaryKeygenResult, clientSecondaryKeygenResult] = keygenResults;
-        // Pick the derivation path of the public key you want to sign for
-        const derivationPath = new Uint32Array(chainConfig.derivationPath);
-        // Get the public key for the derivation path
-        let rawPublicKey;
-        if (mpcSigner instanceof Ecdsa) {
-            rawPublicKey = await mpcSigner.derivePubkey(clientPrimaryKeygenResult, derivationPath);
-        } else if (mpcSigner instanceof Ed25519) {
-            rawPublicKey = await mpcSigner.derivePubkey(clientPrimaryKeygenResult, derivationPath);
-        } else if (mpcSigner instanceof BIP340) {
-            rawPublicKey = await mpcSigner.deriveTweakPubkey(clientPrimaryKeygenResult, derivationPath);
-        }
+        // For each client keygen init result, create an array of other parties' keygenIds
+        const clientKeygenResults = await Promise.all(clientKeygenInitResults.map((currentInit)=>{
+            // Get all other client keygenIds (excluding current one)
+            const otherClientKeygenIds = clientKeygenInitResults.filter((init)=>init.keygenId !== currentInit.keygenId).map((init)=>init.keygenId);
+            // Combine server keygenIds with other client keygenIds
+            const allOtherKeygenIds = [
+                ...serverKeygenIds,
+                ...otherClientKeygenIds
+            ];
+            return mpcSigner.keygen(roomId, mpcConfig.numberOfParties, mpcConfig.threshold, currentInit, allOtherKeygenIds);
+        }));
+        // only need one client keygen result to derive the public key
+        const [clientKeygenResult] = clientKeygenResults;
+        const rawPublicKey = await this.derivePublicKey({
+            chainName,
+            keyShare: clientKeygenResult
+        });
         return {
             rawPublicKey,
-            primaryKeygenResult: clientPrimaryKeygenResult,
-            secondaryKeygenResult: clientSecondaryKeygenResult
+            clientKeygenResults
         };
     }
     async keyGen({ chainName, thresholdSignatureScheme }) {
         try {
-            const { clientPrimaryKeygenInitResult, clientSecondaryKeygenInitResult } = await this.clientInitializeKeyGen({
-                chainName
+            const clientKeygenInitResults = await this.clientInitializeKeyGen({
+                chainName,
+                thresholdSignatureScheme
             });
-            const data = await this.serverInitializeKeyGen({
+            const clientKeygenIds = clientKeygenInitResults.map((result)=>result.keygenId);
+            const { roomId, serverKeygenIds } = await this.serverInitializeKeyGen({
                 chainName,
-                clientPrimaryKeygenId: clientPrimaryKeygenInitResult.keygenId,
-                clientSecondaryKeygenId: clientSecondaryKeygenInitResult.keygenId,
+                clientKeygenIds,
                 thresholdSignatureScheme
             });
-            const { rawPublicKey, primaryKeygenResult, secondaryKeygenResult } = await this.clientKeyGen({
+            const { rawPublicKey, clientKeygenResults: clientKeyShares } = await this.clientKeyGen({
                 chainName,
-                roomId: data.roomId,
-                serverKeygenIds: data.serverKeygenIds,
-                clientPrimaryKeygenInitResult,
-                clientSecondaryKeygenInitResult,
+                roomId,
+                serverKeygenIds,
+                clientKeygenInitResults,
                 thresholdSignatureScheme
             });
             return {
                 rawPublicKey,
-                primaryKeygenResult,
-                secondaryKeygenResult
+                clientKeyShares
             };
         } catch (error) {
             console.error('Error creating wallet account', error);
@@ -299,6 +275,9 @@ class DynamicWalletClient {
     }
     async serverSign({ walletId, message }) {
         // Create the room and sign the message
+        if (typeof message !== 'string') {
+            message = '0x' + Buffer.from(message).toString('hex');
+        }
         const data = await this.apiClient.signMessage({
             walletId,
             message
@@ -314,11 +293,12 @@ class DynamicWalletClient {
             });
             const derivationPath = new Uint32Array(chainConfig.derivationPath);
             let formattedMessage;
+            //note: Ecdsa can also be used by bitcoin, but only keccak256 is used by ethereum
             if (mpcSigner instanceof Ecdsa) {
-                formattedMessage = MessageHash.sha256(message);
-            } else if (mpcSigner instanceof Ed25519) {
+                formattedMessage = MessageHash.keccak256(message);
+            } else if (mpcSigner instanceof Ed25519 && typeof message === 'string') {
                 formattedMessage = new TextEncoder().encode(message);
-            } else if (mpcSigner instanceof BIP340) {
+            } else if (mpcSigner instanceof BIP340 && typeof message === 'string') {
                 formattedMessage = new TextEncoder().encode(message);
             } else {
                 throw new Error('Unsupported signer type');
@@ -594,59 +574,43 @@ class DynamicWalletClient {
         return decryptedKeyShare;
     }
     async importRawPrivateKey({ chainName, privateKey, thresholdSignatureScheme }) {
-        const chainConfig = getMPCChainConfig(chainName);
         const mpcSigner = getMPCSigner({
             chainName,
             baseRelayUrl: this.baseMPCRelayApiUrl
         });
-        // 1. 2 parties on the client side create keygenInit
-        const { clientPrimaryKeygenInitResult, clientSecondaryKeygenInitResult } = await this.clientInitializeKeyGen({
-            chainName
-        });
-        const clientSecondaryKeygenId = clientSecondaryKeygenInitResult.keygenId;
-        const clientPrimaryKeygenId = clientPrimaryKeygenInitResult.keygenId;
-        // 2. server to create a room for importing the private key
-        // server will do 3 things:
-        // --- 1. init keygen for the server as a party
-        // --- 2. open a room and return the roomId for the ceremony
-        // --- 3. join the room as a party for the 2/3 ceremony
+        const clientKeygenInitResults = await this.clientInitializeKeyGen({
+            chainName,
+            thresholdSignatureScheme
+        });
+        const clientKeygenIds = clientKeygenInitResults.map((result)=>result.keygenId);
         const { roomId, serverKeygenIds } = await this.apiClient.importPrivateKey({
             chainName,
-            clientKeygenIds: [
-                clientPrimaryKeygenId,
-                clientSecondaryKeygenId
-            ],
+            clientKeygenIds,
             thresholdSignatureScheme
         });
         const { threshold } = getTSSConfig(thresholdSignatureScheme);
-        // prep
-        const importerKeygenIds = [
-            ...serverKeygenIds,
-            clientSecondaryKeygenId
-        ];
-        const recipientKeygenIds = [
-            ...serverKeygenIds,
-            clientPrimaryKeygenId
-        ];
-        // 3. Join the keygen room for the ceremony
-        const [clientPrimaryKeygenResult, clientSecondaryKeygenResult] = await Promise.all([
-            mpcSigner.importPrivateKeyImporter(roomId, threshold, privateKey, clientPrimaryKeygenInitResult, importerKeygenIds),
-            mpcSigner.importPrivateKeyRecipient(roomId, threshold, clientSecondaryKeygenInitResult, recipientKeygenIds)
-        ]);
-        const derivationPath = new Uint32Array(chainConfig.derivationPath);
-        // Get the public key for the derivation path
-        let rawPublicKey;
-        if (mpcSigner instanceof Ecdsa) {
-            rawPublicKey = await mpcSigner.derivePubkey(clientPrimaryKeygenResult, derivationPath);
-        } else if (mpcSigner instanceof Ed25519) {
-            rawPublicKey = await mpcSigner.derivePubkey(clientPrimaryKeygenResult, derivationPath);
-        } else if (mpcSigner instanceof BIP340) {
-            rawPublicKey = await mpcSigner.deriveTweakPubkey(clientPrimaryKeygenResult, derivationPath);
-        }
+        const clientKeygenResults = await Promise.all(clientKeygenInitResults.map((currentInit, index)=>{
+            const otherClientKeygenIds = clientKeygenInitResults.filter((init)=>init.keygenId !== currentInit.keygenId).map((init)=>init.keygenId);
+            if (index === 0) {
+                return mpcSigner.importPrivateKeyImporter(roomId, threshold, privateKey, currentInit, [
+                    ...serverKeygenIds,
+                    ...otherClientKeygenIds
+                ]);
+            } else {
+                return mpcSigner.importPrivateKeyRecipient(roomId, threshold, currentInit, [
+                    ...serverKeygenIds,
+                    ...otherClientKeygenIds
+                ]);
+            }
+        }));
+        const [clientKeygenResult] = clientKeygenResults;
+        const rawPublicKey = await this.derivePublicKey({
+            chainName,
+            keyShare: clientKeygenResult
+        });
         return {
             rawPublicKey,
-            primaryKeygenResult: clientPrimaryKeygenResult,
-            secondaryKeygenResult: clientSecondaryKeygenResult
+            clientKeyShares: clientKeygenResults
         };
     }
     async exportClientKeyshares({ accountAddress }) {

package/package.json

@@ -1,9 +1,9 @@
 {
   "name": "@dynamic-labs-wallet/browser",
-  "version": "0.0.10",
+  "version": "0.0.12",
   "dependencies": {
-    "@dynamic-labs-wallet/core": "0.0.10",
-    "@dynamic-labs-wallet/lib-mpc-web": "0.0.10"
+    "@dynamic-labs-wallet/core": "0.0.12",
+    "@dynamic-labs-wallet/lib-mpc-web": "0.0.12"
   },
   "publishConfig": {
     "access": "restricted"

package/src/client.d.ts

@@ -19,55 +19,49 @@ export declare class DynamicWalletClient {
         baseApiUrl?: string;
         baseMPCRelayApiUrl?: string;
     });
-    serverInitializeKeyGen({ chainName, clientPrimaryKeygenId, clientSecondaryKeygenId, thresholdSignatureScheme, }: {
+    serverInitializeKeyGen({ chainName, clientKeygenIds, thresholdSignatureScheme, }: {
         chainName: string;
-        clientPrimaryKeygenId: string;
-        clientSecondaryKeygenId: string;
+        clientKeygenIds: string[];
         thresholdSignatureScheme: ThresholdSignatureScheme;
     }): Promise<any>;
-    clientInitializeKeyGen({ chainName }: {
+    clientInitializeKeyGen({ chainName, thresholdSignatureScheme, }: {
         chainName: string;
-    }): Promise<{
-        clientPrimaryKeygenInitResult: import("@dynamic-labs-wallet/lib-mpc-internal").BIP340InitKeygenResult;
-        clientSecondaryKeygenInitResult: import("@dynamic-labs-wallet/lib-mpc-internal").BIP340InitKeygenResult;
-    }>;
+        thresholdSignatureScheme: ThresholdSignatureScheme;
+    }): Promise<ClientInitKeygenResult[]>;
     derivePublicKey({ chainName, keyShare, }: {
         chainName: string;
         keyShare: ClientKeyShare;
     }): Promise<EcdsaPublicKey | Uint8Array | undefined>;
-    clientKeyGen({ chainName, roomId, serverKeygenIds, clientPrimaryKeygenInitResult, clientSecondaryKeygenInitResult, thresholdSignatureScheme, }: {
+    clientKeyGen({ chainName, roomId, serverKeygenIds, clientKeygenInitResults, thresholdSignatureScheme, }: {
         chainName: string;
         roomId: string;
         serverKeygenIds: string[];
-        clientPrimaryKeygenInitResult: ClientInitKeygenResult;
-        clientSecondaryKeygenInitResult: ClientInitKeygenResult;
+        clientKeygenInitResults: ClientInitKeygenResult[];
         thresholdSignatureScheme: ThresholdSignatureScheme;
     }): Promise<{
         rawPublicKey: EcdsaPublicKey | Uint8Array | undefined;
-        primaryKeygenResult: EcdsaKeygenResult | BIP340KeygenResult;
-        secondaryKeygenResult: EcdsaKeygenResult | BIP340KeygenResult;
+        clientKeygenResults: ClientKeyShare[];
     }>;
     keyGen({ chainName, thresholdSignatureScheme, }: {
         chainName: string;
         thresholdSignatureScheme: ThresholdSignatureScheme;
     }): Promise<{
         rawPublicKey: EcdsaPublicKey | Uint8Array | undefined;
-        primaryKeygenResult: EcdsaKeygenResult | BIP340KeygenResult;
-        secondaryKeygenResult: EcdsaKeygenResult | BIP340KeygenResult;
+        clientKeyShares: ClientKeyShare[];
     }>;
     serverSign({ walletId, message, }: {
         walletId: string;
-        message: string;
+        message: string | Uint8Array;
     }): Promise<any>;
     clientSign({ chainName, message, roomId, keyShare, }: {
         chainName: string;
-        message: string;
+        message: string | Uint8Array;
         roomId: string;
         keyShare: ClientKeyShare;
     }): Promise<Uint8Array | EcdsaSignature>;
     sign({ accountAddress, message, chainName, }: {
         accountAddress?: string;
-        message: string;
+        message: string | Uint8Array;
         chainName: string;
     }): Promise<Uint8Array | EcdsaSignature>;
     refreshWalletAccountShares({ accountAddress, }: {
@@ -138,8 +132,7 @@ export declare class DynamicWalletClient {
         thresholdSignatureScheme: ThresholdSignatureScheme;
     }): Promise<{
         rawPublicKey: EcdsaPublicKey | Uint8Array | undefined;
-        primaryKeygenResult: ClientKeyShare;
-        secondaryKeygenResult: ClientKeyShare;
+        clientKeyShares: ClientKeyShare[];
     }>;
     exportClientKeyshares({ accountAddress }: {
         accountAddress?: string;

package/src/client.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"client.d.ts","sourceRoot":"","sources":["../../packages/src/client.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"client.d.ts","sourceRoot":"","sources":["../../packages/src/client.ts"],"names":[],"mappings":"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"}