@dynamic-labs-wallet/browser 0.0.228 → 0.0.230

package/index.cjs.js

@@ -33,8 +33,8 @@ const getMPCSignatureScheme = ({ signingAlgorithm, baseRelayUrl = core.MPC_RELAY
             throw new Error(`Unsupported signing algorithm: ${signingAlgorithm}`);
     }
 };
-const getMPCSigner = ({ chainName, baseRelayUrl })=>{
-    const chainConfig = core.getMPCChainConfig(chainName);
+const getMPCSigner = ({ chainName, baseRelayUrl, bitcoinConfig })=>{
+    const chainConfig = core.getMPCChainConfig(chainName, bitcoinConfig);
     const signatureScheme = getMPCSignatureScheme({
         signingAlgorithm: chainConfig.signingAlgorithm,
         baseRelayUrl
@@ -467,7 +467,28 @@ const ROOM_EXPIRATION_TIME = 1000 * 60 * 10; // 10 minutes
 const ROOM_CACHE_COUNT = 5;
 const WALLET_BUSY_LOCK_TIMEOUT_MS = 20000; // 20 seconds
 
+// eslint-disable-next-line @nx/enforce-module-boundaries
 const isBrowser = ()=>typeof window !== 'undefined';
+/**
+ * Helper function to extract pubkey from potentially nested structure
+ * Handles cases where pubkey is stored as {pubkey: {0: 33, 1: 209, ...}} in localStorage
+ */ const extractPubkey = (pubkey)=>{
+    var _pubkey_pubkey;
+    // Handle nested pubkey structure (e.g., {pubkey: {0: 33, 1: 209, ...}})
+    const actualPubkey = (_pubkey_pubkey = pubkey == null ? void 0 : pubkey.pubkey) != null ? _pubkey_pubkey : pubkey;
+    if (actualPubkey instanceof Uint8Array) {
+        return actualPubkey;
+    }
+    // Convert object with numeric keys to Uint8Array
+    if (typeof actualPubkey === 'object' && actualPubkey !== null) {
+        const keys = Object.keys(actualPubkey).map(Number).filter((k)=>!Number.isNaN(k)).sort((a, b)=>a - b);
+        if (keys.length > 0) {
+            const result = new Uint8Array(keys.map((k)=>actualPubkey[k]));
+            return result;
+        }
+    }
+    return actualPubkey;
+};
 const getClientKeyShareExportFileName = ({ thresholdSignatureScheme, accountAddress, isGoogleDrive = false })=>{
     const suffix = isGoogleDrive ? '-google-drive' : '';
     return `${CLIENT_KEYSHARE_EXPORT_FILENAME_PREFIX}-${thresholdSignatureScheme}-${accountAddress}${suffix}.json`;
@@ -580,6 +601,17 @@ const formatSolanaMessage = (message)=>{
         return message;
     }
 };
+const formatTonMessage = (message)=>{
+    if (typeof message === 'string') {
+        if (!isHexString(message)) {
+            return Buffer.from(message).toString('hex');
+        } else {
+            return new Uint8Array(Buffer.from(message, 'hex'));
+        }
+    } else {
+        return message;
+    }
+};
 const formatMessage = (chainName, message)=>{
     switch(chainName){
         case 'EVM':
@@ -588,6 +620,8 @@ const formatMessage = (chainName, message)=>{
             return formatSolanaMessage(message);
         case 'SUI':
             return message;
+        case 'TON':
+            return formatTonMessage(message);
         default:
             throw new Error('Unsupported chain name');
     }
@@ -825,21 +859,21 @@ class WalletBusyError extends Error {
     }
 }
 const createDelegationWithGoogleDriveDistribution = ({ existingShares, delegatedShare })=>({
-        dynamicBackendShares: existingShares,
+        clientShares: existingShares,
         googleDriveShares: existingShares,
         delegatedShare
     });
 const createDelegationOnlyDistribution = ({ existingShares, delegatedShare })=>({
-        dynamicBackendShares: existingShares,
+        clientShares: existingShares,
         googleDriveShares: [],
         delegatedShare
     });
 const createGoogleDriveOnlyDistribution = ({ allShares })=>({
-        dynamicBackendShares: allShares.slice(0, -1),
+        clientShares: allShares.slice(0, -1),
         googleDriveShares: allShares.slice(-1)
     });
 const createDynamicOnlyDistribution = ({ allShares })=>({
-        dynamicBackendShares: allShares,
+        clientShares: allShares,
         googleDriveShares: []
     });
 const hasGoogleDriveBackup = (backupInfo)=>{
@@ -857,10 +891,11 @@ const hasDelegatedBackup = (backupInfo)=>{
  * Client's shares go to both Dynamic and Google Drive.
  * delegatedShare is undefined - we don't re-publish, but preserve the location.
  */ const createAddGoogleDriveToExistingDelegationDistribution = ({ clientShares })=>({
-        dynamicBackendShares: clientShares,
+        clientShares: clientShares,
         googleDriveShares: clientShares
     });
 
+// eslint-disable-next-line @nx/enforce-module-boundaries
 class DynamicWalletClient {
     async initializeForwardMPCClient() {
         try {
@@ -1031,47 +1066,53 @@ class DynamicWalletClient {
             };
         }
     }
-    async serverInitializeKeyGen({ chainName, clientKeygenIds, dynamicRequestId, thresholdSignatureScheme, onError, onCeremonyComplete }) {
+    async serverInitializeKeyGen({ chainName, clientKeygenIds, dynamicRequestId, thresholdSignatureScheme, bitcoinConfig, onError, onCeremonyComplete }) {
         // Initialize keygen, create room, and create the wallet account on the server
         const data = await this.apiClient.createWalletAccount({
             chainName,
             clientKeygenIds,
             dynamicRequestId,
             thresholdSignatureScheme,
+            bitcoinConfig,
             onError,
             onCeremonyComplete
         });
         this.logger.debug(`[DynamicWaasWalletClient] Initialized client key generation with IDs: ${clientKeygenIds.join(', ')} for chain: ${chainName} using scheme: ${thresholdSignatureScheme}`);
         return data;
     }
-    async clientInitializeKeyGen({ chainName, thresholdSignatureScheme }) {
+    async clientInitializeKeyGen({ chainName, thresholdSignatureScheme, bitcoinConfig }) {
         // Get the mpc signer
         const mpcSigner = getMPCSigner({
             chainName,
-            baseRelayUrl: this.baseMPCRelayApiUrl
+            baseRelayUrl: this.baseMPCRelayApiUrl,
+            bitcoinConfig
         });
         const clientThreshold = core.getClientThreshold(thresholdSignatureScheme);
         const keygenInitResults = await Promise.all(Array(clientThreshold).fill(null).map(()=>mpcSigner.initKeygen()));
         return keygenInitResults;
     }
-    async derivePublicKey({ chainName, keyShare, derivationPath }) {
+    async derivePublicKey({ chainName, keyShare, derivationPath, bitcoinConfig }) {
         const mpcSigner = getMPCSigner({
             chainName,
-            baseRelayUrl: this.baseMPCRelayApiUrl
+            baseRelayUrl: this.baseMPCRelayApiUrl,
+            bitcoinConfig
         });
         let publicKey;
         if (mpcSigner instanceof web.Ecdsa) {
             publicKey = await mpcSigner.derivePubkey(keyShare, derivationPath);
         } else if (mpcSigner instanceof web.ExportableEd25519) {
             publicKey = await mpcSigner.getPubkey(keyShare);
+        } else if (mpcSigner instanceof web.BIP340) {
+            publicKey = await mpcSigner.deriveTweakPubkey(keyShare, derivationPath);
         }
         return publicKey;
     }
-    async clientKeyGen({ chainName, roomId, serverKeygenIds, clientKeygenInitResults, thresholdSignatureScheme }) {
+    async clientKeyGen({ chainName, roomId, serverKeygenIds, clientKeygenInitResults, thresholdSignatureScheme, bitcoinConfig }) {
         // Get the chain config and the mpc signer
         const mpcSigner = getMPCSigner({
             chainName,
-            baseRelayUrl: this.baseMPCRelayApiUrl
+            baseRelayUrl: this.baseMPCRelayApiUrl,
+            bitcoinConfig
         });
         // Get the MPC config for the threshold signature scheme
         const mpcConfig = core.MPC_CONFIG[thresholdSignatureScheme];
@@ -1094,24 +1135,26 @@ class DynamicWalletClient {
         }));
         // only need one client keygen result to derive the public key
         const [clientKeygenResult] = clientKeygenResults;
-        const chainConfig = core.getMPCChainConfig(chainName);
+        const chainConfig = core.getMPCChainConfig(chainName, bitcoinConfig);
         const derivationPath = new Uint32Array(chainConfig.derivationPath);
         const rawPublicKey = await this.derivePublicKey({
             chainName,
             keyShare: clientKeygenResult,
-            derivationPath
+            derivationPath,
+            bitcoinConfig
         });
         return {
             rawPublicKey,
             clientKeygenResults
         };
     }
-    async keyGen({ chainName, thresholdSignatureScheme, onError, onCeremonyComplete, traceContext }) {
+    async keyGen({ chainName, thresholdSignatureScheme, bitcoinConfig, onError, onCeremonyComplete, traceContext }) {
         const dynamicRequestId = uuid.v4();
         try {
             const clientKeygenInitResults = await this.clientInitializeKeyGen({
                 chainName,
-                thresholdSignatureScheme
+                thresholdSignatureScheme,
+                bitcoinConfig
             });
             const clientKeygenIds = clientKeygenInitResults.map((result)=>result.keygenId);
             this.instrument('[DynamicWaasWalletClient] Initialized client key generation', _extends({
@@ -1125,6 +1168,7 @@ class DynamicWalletClient {
                 clientKeygenIds,
                 dynamicRequestId,
                 thresholdSignatureScheme,
+                bitcoinConfig,
                 onCeremonyComplete
             });
             this.instrument('[DynamicWaasWalletClient] Server key generation initialized', _extends({
@@ -1140,7 +1184,8 @@ class DynamicWalletClient {
                 roomId,
                 serverKeygenIds,
                 clientKeygenInitResults,
-                thresholdSignatureScheme
+                thresholdSignatureScheme,
+                bitcoinConfig
             });
             this.instrument('[DynamicWaasWalletClient] Client key generation completed', _extends({
                 roomId,
@@ -1256,7 +1301,7 @@ class DynamicWalletClient {
             throw error;
         }
     }
-    async serverSign({ walletId, message, isFormatted, mfaToken, roomId, context, onError, dynamicRequestId, traceContext }) {
+    async serverSign({ walletId, message, isFormatted, mfaToken, roomId, context, onError, dynamicRequestId, traceContext, bitcoinConfig }) {
         // Create the room and sign the message
         if (typeof message !== 'string') {
             message = `0x${Buffer.from(message).toString('hex')}`;
@@ -1271,7 +1316,8 @@ class DynamicWalletClient {
             context: context ? JSON.parse(JSON.stringify(context, (_key, value)=>typeof value === 'bigint' ? value.toString() : value)) : undefined,
             onError,
             forwardMPCClientEnabled: this.forwardMPCEnabled,
-            traceContext
+            traceContext,
+            bitcoinConfig
         });
         return data;
     }
@@ -1319,11 +1365,12 @@ class DynamicWalletClient {
             throw error;
         }
     }
-    async clientSign({ chainName, message, roomId, keyShare, derivationPath, isFormatted, dynamicRequestId, traceContext }) {
+    async clientSign({ chainName, message, roomId, keyShare, derivationPath, isFormatted, dynamicRequestId, traceContext, bitcoinConfig }) {
         try {
             const mpcSigner = getMPCSigner({
                 chainName,
-                baseRelayUrl: this.baseMPCRelayApiUrl
+                baseRelayUrl: this.baseMPCRelayApiUrl,
+                bitcoinConfig
             });
             const formattedMessage = isFormatted ? new web.MessageHash(message) : formatMessage(chainName, message);
             this.logger.debug('[DynamicWaasWalletClient] Starting client sign', _extends({
@@ -1346,7 +1393,13 @@ class DynamicWalletClient {
                     traceContext
                 });
             }
-            const signature = await mpcSigner.sign(roomId, keyShare, formattedMessage, derivationPath);
+            // Unwrap MessageHash for BIP340 as it expects Uint8Array or hex string
+            let messageToSign = formattedMessage;
+            if (mpcSigner instanceof web.BIP340 && formattedMessage instanceof web.MessageHash) {
+                messageToSign = formattedMessage.bytes;
+            }
+            const tweak = bitcoinConfig == null ? void 0 : bitcoinConfig.tweak;
+            const signature = await mpcSigner.sign(roomId, keyShare, messageToSign, derivationPath, tweak);
             return signature;
         } catch (error) {
             logError({
@@ -1364,7 +1417,7 @@ class DynamicWalletClient {
         }
     }
     //todo: need to modify with imported flag
-    async sign({ accountAddress, message, chainName, password = undefined, isFormatted = false, signedSessionId, mfaToken, context, onError, traceContext }) {
+    async sign({ accountAddress, message, chainName, password = undefined, isFormatted = false, signedSessionId, mfaToken, context, onError, traceContext, bitcoinConfig }) {
         const dynamicRequestId = uuid.v4();
         try {
             await this.waitForWalletNotBusy(accountAddress);
@@ -1395,7 +1448,7 @@ class DynamicWalletClient {
                     }, this.getTraceContext(traceContext)));
                 }
             }
-            // Perform the server sign - always call, but only await if roomId is not provided
+            // Perform the server sign
             const serverSignPromise = this.serverSign({
                 walletId: wallet.walletId,
                 message,
@@ -1405,7 +1458,8 @@ class DynamicWalletClient {
                 context,
                 onError,
                 dynamicRequestId,
-                traceContext
+                traceContext,
+                bitcoinConfig
             });
             // Only await if roomId is not provided
             roomId = roomId != null ? roomId : (await serverSignPromise).roomId;
@@ -1431,7 +1485,8 @@ class DynamicWalletClient {
                 derivationPath,
                 isFormatted,
                 dynamicRequestId,
-                traceContext
+                traceContext,
+                bitcoinConfig
             });
             this.instrument('[DynamicWaasWalletClient] Client sign completed', _extends({
                 accountAddress,
@@ -1525,13 +1580,38 @@ class DynamicWalletClient {
             throw error;
         }
     }
-    async getExportId({ chainName, clientKeyShare }) {
+    async getExportId({ chainName, clientKeyShare, bitcoinConfig }) {
         const mpcSigner = getMPCSigner({
             chainName,
-            baseRelayUrl: this.baseMPCRelayApiUrl
+            baseRelayUrl: this.baseMPCRelayApiUrl,
+            bitcoinConfig
         });
-        const exportId = await mpcSigner.exportID(clientKeyShare);
-        return exportId;
+        try {
+            // For BIP340, try passing the secretShare as a string directly
+            // The exportID accepts either BIP340KeygenResult or string (secretShare)
+            let exportId;
+            if (mpcSigner instanceof web.BIP340) {
+                const secretShareString = clientKeyShare.secretShare;
+                exportId = await mpcSigner.exportID(secretShareString);
+            } else {
+                exportId = await mpcSigner.exportID(clientKeyShare);
+            }
+            this.logger.debug('[DynamicWaasWalletClient] getExportId succeeded', {
+                chainName,
+                exportId
+            });
+            return exportId;
+        } catch (error) {
+            var _clientKeyShare_secretShare;
+            this.logger.error('[DynamicWaasWalletClient] Error in getExportId', {
+                chainName,
+                error,
+                errorMessage: error instanceof Error ? error.message : String(error),
+                clientKeyShareType: clientKeyShare.constructor.name,
+                secretSharePrefix: (_clientKeyShare_secretShare = clientKeyShare.secretShare) == null ? void 0 : _clientKeyShare_secretShare.substring(0, 100)
+            });
+            throw error;
+        }
     }
     /**
    * Helper function to create client shares required to complete a reshare ceremony.
@@ -1656,21 +1736,6 @@ class DynamicWalletClient {
                 Promise.all(existingResharePromises),
                 Promise.all(newResharePromises)
             ]);
-            const clientKeysharesToLocalStorage = delegateToProjectEnvironment ? [
-                ...existingReshareResults
-            ] : [
-                ...existingReshareResults,
-                ...newReshareResults
-            ];
-            this.walletMap[accountAddress] = _extends({}, this.walletMap[accountAddress], {
-                thresholdSignatureScheme: newThresholdSignatureScheme
-            });
-            // store client key shares to localStorage
-            await this.setClientKeySharesToLocalStorage({
-                accountAddress,
-                clientKeyShares: clientKeysharesToLocalStorage,
-                overwriteOrMerge: 'overwrite'
-            });
             const allClientShares = [
                 ...existingReshareResults,
                 ...newReshareResults
@@ -1702,6 +1767,14 @@ class DynamicWalletClient {
                     allShares: allClientShares
                 });
             }
+            this.walletMap[accountAddress] = _extends({}, this.walletMap[accountAddress], {
+                thresholdSignatureScheme: newThresholdSignatureScheme
+            });
+            await this.setClientKeySharesToLocalStorage({
+                accountAddress,
+                clientKeyShares: distribution.clientShares,
+                overwriteOrMerge: 'overwrite'
+            });
             await this.backupSharesWithDistribution({
                 accountAddress,
                 password,
@@ -1797,7 +1870,16 @@ class DynamicWalletClient {
             operationName: 'revokeDelegation'
         });
     }
-    async exportKey({ accountAddress, chainName, password = undefined, signedSessionId, mfaToken, traceContext }) {
+    createKeygenResult(mpcSigner, extractedPubkey, secretShare) {
+        if (mpcSigner instanceof web.Ecdsa) {
+            return new web.EcdsaKeygenResult(extractedPubkey, secretShare);
+        }
+        if (mpcSigner instanceof web.ExportableEd25519) {
+            return new web.ExportableEd25519KeygenResult(extractedPubkey, secretShare);
+        }
+        return new web.BIP340KeygenResult(extractedPubkey, secretShare);
+    }
+    async exportKey({ accountAddress, chainName, bitcoinConfig, password = undefined, signedSessionId, mfaToken, traceContext }) {
         const dynamicRequestId = uuid.v4();
         try {
             const wallet = await this.getWallet({
@@ -1808,18 +1890,19 @@ class DynamicWalletClient {
             });
             const mpcSigner = getMPCSigner({
                 chainName,
-                baseRelayUrl: this.baseMPCRelayApiUrl
-            });
-            const clientKeyShares = await this.getClientKeySharesFromLocalStorage({
-                accountAddress
+                baseRelayUrl: this.baseMPCRelayApiUrl,
+                bitcoinConfig
             });
+            const reconstructedKeyShare = await this.getReconstructedKeyShare(accountAddress, mpcSigner);
             const exportId = await this.getExportId({
                 chainName,
-                clientKeyShare: clientKeyShares[0]
+                clientKeyShare: reconstructedKeyShare,
+                bitcoinConfig
             });
             const data = await this.apiClient.exportKey({
                 walletId: wallet.walletId,
                 exportId,
+                bitcoinConfig,
                 dynamicRequestId,
                 mfaToken
             });
@@ -1830,10 +1913,7 @@ class DynamicWalletClient {
                 exportId,
                 roomId: data.roomId
             }, this.getTraceContext(traceContext)));
-            const keyExportRaw = await mpcSigner.exportFullPrivateKey(data.roomId, clientKeyShares[0], exportId);
-            if (!keyExportRaw) {
-                throw new Error('Error exporting private key');
-            }
+            const keyExportRaw = await this.performMPCExport(mpcSigner, reconstructedKeyShare, data.roomId, exportId, accountAddress, chainName);
             this.logger.debug('[DynamicWaasWalletClient] Completed export of private key', _extends({
                 accountAddress,
                 chainName,
@@ -1841,15 +1921,7 @@ class DynamicWalletClient {
                 exportId,
                 roomId: data.roomId
             }, this.getTraceContext(traceContext)));
-            const derivationPath = wallet.derivationPath && wallet.derivationPath != '' ? new Uint32Array(Object.values(JSON.parse(wallet.derivationPath))) : undefined;
-            let derivedPrivateKey;
-            if (mpcSigner instanceof web.Ecdsa) {
-                derivedPrivateKey = await mpcSigner.derivePrivateKeyFromXpriv(keyExportRaw, derivationPath);
-            } else if (mpcSigner instanceof web.ExportableEd25519) {
-                derivedPrivateKey = keyExportRaw;
-            } else if (mpcSigner instanceof web.BIP340) {
-                derivedPrivateKey = await mpcSigner.derivePrivateKeyFromXpriv(keyExportRaw, derivationPath);
-            }
+            const derivedPrivateKey = await this.derivePrivateKeyFromExport(mpcSigner, keyExportRaw, wallet);
             return {
                 derivedPrivateKey
             };
@@ -1866,6 +1938,63 @@ class DynamicWalletClient {
             throw error;
         }
     }
+    async getReconstructedKeyShare(accountAddress, mpcSigner) {
+        const clientKeyShares = await this.getClientKeySharesFromLocalStorage({
+            accountAddress
+        });
+        if (!clientKeyShares || clientKeyShares.length === 0) {
+            throw new Error('No client key shares found for account');
+        }
+        // Reconstruct the keygen result from the stored clientKeyShare
+        // This is necessary because localStorage stores plain objects, not class instances
+        const clientKeyShare = clientKeyShares[0];
+        const extractedPubkey = extractPubkey(clientKeyShare.pubkey);
+        return this.createKeygenResult(mpcSigner, extractedPubkey, clientKeyShare.secretShare);
+    }
+    async performMPCExport(mpcSigner, reconstructedKeyShare, roomId, exportId, accountAddress, chainName) {
+        try {
+            // For BIP340, try passing the secretShare as a string directly if the keygenResult doesn't work
+            // The exportFullPrivateKey accepts either BIP340KeygenResult or string (secretShare)
+            const secretShareString = reconstructedKeyShare.secretShare;
+            const keygenResultToPass = mpcSigner instanceof web.BIP340 ? secretShareString || reconstructedKeyShare : reconstructedKeyShare;
+            const keyExportRaw = await mpcSigner.exportFullPrivateKey(roomId, keygenResultToPass, exportId);
+            if (!keyExportRaw) {
+                throw new Error('Error exporting private key');
+            }
+            return keyExportRaw;
+        } catch (exportError) {
+            var _reconstructedKeyShare_secretShare, _reconstructedKeyShare_secretShare1;
+            this.logger.error('[DynamicWaasWalletClient] Error in exportFullPrivateKey', {
+                accountAddress,
+                chainName,
+                error: exportError,
+                errorMessage: exportError instanceof Error ? exportError.message : String(exportError),
+                errorStack: exportError instanceof Error ? exportError.stack : undefined,
+                reconstructedKeyShareType: reconstructedKeyShare.constructor.name,
+                reconstructedKeyShare: {
+                    pubkeyType: reconstructedKeyShare.pubkey instanceof Uint8Array ? 'Uint8Array' : typeof reconstructedKeyShare.pubkey,
+                    pubkeyLength: reconstructedKeyShare.pubkey instanceof Uint8Array ? reconstructedKeyShare.pubkey.length : 'N/A',
+                    secretShareType: typeof reconstructedKeyShare.secretShare,
+                    secretShareLength: (_reconstructedKeyShare_secretShare = reconstructedKeyShare.secretShare) == null ? void 0 : _reconstructedKeyShare_secretShare.length,
+                    secretSharePrefix: (_reconstructedKeyShare_secretShare1 = reconstructedKeyShare.secretShare) == null ? void 0 : _reconstructedKeyShare_secretShare1.substring(0, 100)
+                },
+                roomId: roomId,
+                exportId
+            });
+            throw exportError;
+        }
+    }
+    async derivePrivateKeyFromExport(mpcSigner, keyExportRaw, wallet) {
+        const derivationPath = wallet.derivationPath && wallet.derivationPath != '' ? new Uint32Array(Object.values(JSON.parse(wallet.derivationPath))) : undefined;
+        if (mpcSigner instanceof web.Ecdsa) {
+            return mpcSigner.derivePrivateKeyFromXpriv(keyExportRaw, derivationPath);
+        } else if (mpcSigner instanceof web.ExportableEd25519) {
+            return keyExportRaw;
+        } else if (mpcSigner instanceof web.BIP340) {
+            return mpcSigner.derivePrivateKeyFromXpriv(keyExportRaw, derivationPath);
+        }
+        return undefined;
+    }
     async offlineExportKey({ chainName, keyShares, derivationPath }) {
         try {
             if (!keyShares || keyShares.length < 2) {
@@ -1876,7 +2005,7 @@ class DynamicWalletClient {
                 baseRelayUrl: this.baseMPCRelayApiUrl
             });
             const walletKeyShares = keyShares.map((keyShare)=>{
-                return mpcSigner instanceof web.Ecdsa ? new web.EcdsaKeygenResult(keyShare.pubkey, keyShare.secretShare) : mpcSigner instanceof web.ExportableEd25519 ? new web.ExportableEd25519KeygenResult(keyShare.pubkey, keyShare.secretShare) : new web.BIP340KeygenResult(keyShare.pubkey, keyShare.secretShare);
+                return this.createKeygenResult(mpcSigner, extractPubkey(keyShare.pubkey), keyShare.secretShare);
             });
             const keyExportRaw = await mpcSigner.offlineExportFullPrivateKey(walletKeyShares);
             if (!keyExportRaw) {
@@ -1978,8 +2107,8 @@ class DynamicWalletClient {
                 throw error;
             }
             const locations = [];
-            if (distribution.dynamicBackendShares.length > 0) {
-                const encryptedDynamicShares = await Promise.all(distribution.dynamicBackendShares.map((keyShare)=>this.encryptKeyShare({
+            if (distribution.clientShares.length > 0) {
+                const encryptedDynamicShares = await Promise.all(distribution.clientShares.map((keyShare)=>this.encryptKeyShare({
                         keyShare,
                         password
                     })));
@@ -2139,6 +2268,7 @@ class DynamicWalletClient {
             preserveDelegatedLocation = true;
         } else if (shouldBackupToGoogleDrive && keySharesToBackup.length >= 2) {
             // Google Drive only (no delegation): Split shares between Dynamic (N-1) and Google Drive (1).
+            // The last share (new share) goes to Google Drive.
             distribution = createGoogleDriveOnlyDistribution({
                 allShares: keySharesToBackup
             });
@@ -2727,7 +2857,8 @@ class DynamicWalletClient {
                 derivationPath: walletProperties.derivationPath,
                 clientKeySharesBackupInfo: getClientKeyShareBackupInfo({
                     walletProperties
-                })
+                }),
+                addressType: walletProperties.addressType
             });
             if (walletOperation !== core.WalletOperation.NO_OPERATION && await this.requiresRestoreBackupSharesForOperation({
                 accountAddress,
@@ -2781,7 +2912,7 @@ class DynamicWalletClient {
             this.userId = user.id;
             const waasWallets = (_user_verifiedCredentials = user.verifiedCredentials) == null ? void 0 : _user_verifiedCredentials.filter((vc)=>vc.walletName === 'dynamicwaas');
             const wallets = waasWallets.map((vc)=>{
-                var _this_walletMap_vc_address, _vc_walletProperties;
+                var _this_walletMap_vc_address, _vc_walletProperties, _vc_walletProperties1;
                 var _this_walletMap_vc_address_derivationPath;
                 return {
                     walletId: vc.id,
@@ -2791,7 +2922,8 @@ class DynamicWalletClient {
                         walletProperties: vc.walletProperties || {}
                     }),
                     derivationPath: (_this_walletMap_vc_address_derivationPath = (_this_walletMap_vc_address = this.walletMap[vc.address]) == null ? void 0 : _this_walletMap_vc_address.derivationPath) != null ? _this_walletMap_vc_address_derivationPath : undefined,
-                    thresholdSignatureScheme: (_vc_walletProperties = vc.walletProperties) == null ? void 0 : _vc_walletProperties.thresholdSignatureScheme
+                    thresholdSignatureScheme: (_vc_walletProperties = vc.walletProperties) == null ? void 0 : _vc_walletProperties.thresholdSignatureScheme,
+                    addressType: (_vc_walletProperties1 = vc.walletProperties) == null ? void 0 : _vc_walletProperties1.addressType
                 };
             });
             this.walletMap = wallets.reduce((acc, wallet)=>{
@@ -2803,7 +2935,8 @@ class DynamicWalletClient {
                     accountAddress: wallet.accountAddress,
                     clientKeySharesBackupInfo: wallet.clientKeySharesBackupInfo,
                     derivationPath: ((_acc_accountAddress = acc[accountAddress]) == null ? void 0 : _acc_accountAddress.derivationPath) || undefined,
-                    thresholdSignatureScheme: wallet.thresholdSignatureScheme
+                    thresholdSignatureScheme: wallet.thresholdSignatureScheme,
+                    addressType: wallet.addressType
                 };
                 return acc;
             }, {});
@@ -3076,6 +3209,7 @@ exports.createDelegationWithGoogleDriveDistribution = createDelegationWithGoogle
 exports.createDynamicOnlyDistribution = createDynamicOnlyDistribution;
 exports.createGoogleDriveOnlyDistribution = createGoogleDriveOnlyDistribution;
 exports.downloadStringAsFile = downloadStringAsFile;
+exports.extractPubkey = extractPubkey;
 exports.formatEvmMessage = formatEvmMessage;
 exports.formatMessage = formatMessage;
 exports.getClientKeyShareBackupInfo = getClientKeyShareBackupInfo;