npm - @dynamic-labs-wallet/browser - Versions diffs - 0.0.29 → 0.0.31 - Mend

@dynamic-labs-wallet/browser 0.0.29 → 0.0.31

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (13) hide show

package/index.cjs.js +173 -66
package/index.esm.js +173 -66
package/package.json +2 -2
package/src/backup/encryption.d.ts +5 -0
package/src/backup/encryption.d.ts.map +1 -1
package/src/backup/providers/googleDrive.d.ts +8 -3
package/src/backup/providers/googleDrive.d.ts.map +1 -1
package/src/client.d.ts +18 -15
package/src/client.d.ts.map +1 -1
package/src/types.d.ts +18 -0
package/src/types.d.ts.map +1 -1
package/src/utils.d.ts +5 -0
package/src/utils.d.ts.map +1 -1

package/index.cjs.js CHANGED Viewed

@@ -36,6 +36,10 @@ const getMPCSigner = ({ chainName, baseRelayUrl })=>{
     return signatureScheme;
 };
+const DEFAULT_LOG_LEVEL = 'INFO';
+const STORAGE_KEY = 'dynamic-waas-wallet-client';
+const CLIENT_KEYSHARE_EXPORT_FILENAME_PREFIX = 'dynamicWalletKeyShareBackup';
 const bytesToBase64 = (arr)=>{
     return btoa(Array.from(arr, (b)=>String.fromCharCode(b)).join(''));
 };
@@ -56,7 +60,15 @@ const isHexString = (str)=>{
     // Check if string contains only hex characters
     return /^[0-9A-Fa-f]+$/.test(hex);
 };
+const getClientKeyShareExportFileName = ({ thresholdSignatureScheme, accountAddress })=>{
+    return `${CLIENT_KEYSHARE_EXPORT_FILENAME_PREFIX}-${thresholdSignatureScheme}-${accountAddress}.json`;
+};
+const PBKDF2_ALGORITHM = 'PBKDF2';
+const PBKDF2_ITERATIONS = 100000;
+const PBKDF2_HASH_ALGORITHM = 'SHA-256';
+const AES_GCM_ALGORITHM = 'AES-GCM';
+const AES_GCM_LENGTH = 256;
 const getKey = async ({ password, salt })=>{
     const passwordBytes = stringToBytes(password);
     const initialKey = await crypto.subtle.importKey('raw', passwordBytes, {
@@ -65,13 +77,13 @@ const getKey = async ({ password, salt })=>{
         'deriveKey'
     ]);
     return crypto.subtle.deriveKey({
-        name: 'PBKDF2',
+        name: PBKDF2_ALGORITHM,
         salt,
-        iterations: 100000,
-        hash: 'SHA-256'
+        iterations: PBKDF2_ITERATIONS,
+        hash: PBKDF2_HASH_ALGORITHM
     }, initialKey, {
-        name: 'AES-GCM',
-        length: 256
+        name: AES_GCM_ALGORITHM,
+        length: AES_GCM_LENGTH
     }, false, [
         'encrypt',
         'decrypt'
@@ -90,7 +102,7 @@ const encryptData = async ({ data, password })=>{
         const dataBytes = new TextEncoder().encode(data);
         // Encrypt the data
         const encryptedData = await crypto.subtle.encrypt({
-            name: 'AES-GCM',
+            name: AES_GCM_ALGORITHM,
             iv
         }, key, dataBytes);
         // Convert to base64 strings, ensure proper padding
@@ -119,24 +131,42 @@ const decryptData = async ({ data, password })=>{
             salt: saltBytes
         });
         const decryptedData = await crypto.subtle.decrypt({
-            name: 'AES-GCM',
+            name: AES_GCM_ALGORITHM,
             iv: ivBytes
         }, key, cipherBytes);
         return new TextDecoder().decode(decryptedData);
     } catch (error) {
         console.error('Decryption error details:', error);
-        throw new Error(`Decryption failed`);
+        throw new Error('Decryption failed');
     }
 };
 const GOOGLE_DRIVE_UPLOAD_API = 'https://www.googleapis.com';
-const uploadFileToGoogleDrive = async ({ accessToken, fileName, jsonData })=>{
-    const metadata = {
-        name: fileName,
-        mimeType: 'application/json',
+const uploadFileToGoogleDriveAppStorage = async ({ accessToken, fileName, jsonData })=>{
+    return uploadFileToGoogleDrive({
+        accessToken,
+        fileName,
+        jsonData,
         parents: [
             'appDataFolder'
         ]
+    });
+};
+const uploadFileToGoogleDrivePersonal = async ({ accessToken, fileName, jsonData })=>{
+    return uploadFileToGoogleDrive({
+        accessToken,
+        fileName,
+        jsonData,
+        parents: [
+            'root'
+        ]
+    });
+};
+const uploadFileToGoogleDrive = async ({ accessToken, fileName, jsonData, parents })=>{
+    const metadata = {
+        name: fileName,
+        mimeType: 'application/json',
+        parents
     };
     const form = new FormData();
     form.append('metadata', new Blob([
@@ -182,6 +212,9 @@ const downloadFileFromGoogleDrive = async ({ accessToken, name })=>{
         accessToken,
         name
     });
+    if (!files || files.length === 0) {
+        return null;
+    }
     // Get the most recent file
     const fileMetadata = files[0];
     // Fetch the file data using the file ID
@@ -195,14 +228,16 @@ const downloadFileFromGoogleDrive = async ({ accessToken, name })=>{
     if (fileRawData.length === 0) {
         return null;
     }
-    return JSON.parse(fileRawData);
+    try {
+        // Just parse and return the data without validation
+        // The client will handle validation of the structure
+        return JSON.parse(fileRawData);
+    } catch (error) {
+        console.error('Error parsing backup file:', error);
+        return null;
+    }
 };
-const DEFAULT_LOG_LEVEL = 'INFO';
-const STORAGE_KEY = 'dynamic-waas-wallet-client';
-const BACKUP_FILENAME = 'dynamicWalletKeyShareBackup.json';
-const CLIENT_KEYSHARE_EXPORT_FILENAME_PREFIX = 'dynamicWalletKeyShareBackup';
 const localStorageWriteTest = {
     tested: false,
     writable: false
@@ -320,13 +355,11 @@ class DynamicWalletClient {
         const keygenInitResults = await Promise.all(Array(clientThreshold).fill(null).map(()=>mpcSigner.initKeygen()));
         return keygenInitResults;
     }
-    async derivePublicKey({ chainName, keyShare, imported = false }) {
+    async derivePublicKey({ chainName, keyShare, derivationPath }) {
         const mpcSigner = getMPCSigner({
             chainName,
             baseRelayUrl: this.baseMPCRelayApiUrl
         });
-        const chainConfig = core.getMPCChainConfig(chainName);
-        const derivationPath = imported ? undefined : new Uint32Array(chainConfig.derivationPath);
         let publicKey;
         if (mpcSigner instanceof web.Ecdsa) {
             publicKey = await mpcSigner.derivePubkey(keyShare, derivationPath);
@@ -356,10 +389,12 @@ class DynamicWalletClient {
         }));
         // only need one client keygen result to derive the public key
         const [clientKeygenResult] = clientKeygenResults;
+        const chainConfig = core.getMPCChainConfig(chainName);
+        const derivationPath = new Uint32Array(chainConfig.derivationPath);
         const rawPublicKey = await this.derivePublicKey({
             chainName,
             keyShare: clientKeygenResult,
-            imported: false
+            derivationPath
         });
         return {
             rawPublicKey,
@@ -405,14 +440,12 @@ class DynamicWalletClient {
         });
         return data;
     }
-    async clientSign({ chainName, message, roomId, keyShare, imported = false }) {
+    async clientSign({ chainName, message, roomId, keyShare, derivationPath }) {
         try {
-            const chainConfig = core.getMPCChainConfig(chainName);
             const mpcSigner = getMPCSigner({
                 chainName,
                 baseRelayUrl: this.baseMPCRelayApiUrl
             });
-            const derivationPath = imported ? undefined : new Uint32Array(chainConfig.derivationPath);
             let formattedMessage;
             //note: Ecdsa can also be used by bitcoin, but only keccak256 is used by ethereum
             if (mpcSigner instanceof web.Ecdsa) {
@@ -440,23 +473,23 @@ class DynamicWalletClient {
         }
     }
     //todo: need to modify with imported flag
-    async sign({ accountAddress, message, chainName, imported = false }) {
+    async sign({ accountAddress, message, chainName }) {
         const wallet = await this.getWallet({
             accountAddress
         });
-        this.logger.debug('signing wallet', wallet);
         // Perform the server sign
         const data = await this.serverSign({
             walletId: wallet.walletId,
             message
         });
+        const derivationPath = wallet.derivationPath && wallet.derivationPath != '' ? new Uint32Array(Object.values(JSON.parse(wallet.derivationPath))) : undefined;
         // Perform the client sign and return the signature
         const signature = await this.clientSign({
             chainName,
             message,
             roomId: data.roomId,
             keyShare: wallet.clientKeyShares[0],
-            imported
+            derivationPath
         });
         return signature;
     }
@@ -584,7 +617,6 @@ class DynamicWalletClient {
         const wallet = await this.getWallet({
             accountAddress
         });
-        const chainConfig = core.getMPCChainConfig(chainName);
         const mpcSigner = getMPCSigner({
             chainName,
             baseRelayUrl: this.baseMPCRelayApiUrl
@@ -601,7 +633,7 @@ class DynamicWalletClient {
         if (!keyExportRaw) {
             throw new Error('Error exporting private key');
         }
-        const derivationPath = new Uint32Array(chainConfig.derivationPath);
+        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);
@@ -614,7 +646,7 @@ class DynamicWalletClient {
             derivedPrivateKey
         };
     }
-    async offlineExportKey({ chainName, keyShares }) {
+    async offlineExportKey({ chainName, keyShares, derivationPath }) {
         try {
             if (!keyShares || keyShares.length < 2) {
                 throw new Error(`Must provide at least min threshold of key shares`);
@@ -631,14 +663,14 @@ class DynamicWalletClient {
                 throw new Error('Error exporting private key: Export returned null');
             }
             const chainConfig = core.getMPCChainConfig(chainName);
-            const derivationPath = new Uint32Array(chainConfig.derivationPath);
+            const walletDerivationPath = !derivationPath ? undefined : new Uint32Array(chainConfig.derivationPath);
             let derivedPrivateKey;
             if (mpcSigner instanceof web.Ecdsa) {
-                derivedPrivateKey = await mpcSigner.derivePrivateKeyFromXpriv(keyExportRaw, derivationPath);
+                derivedPrivateKey = await mpcSigner.derivePrivateKeyFromXpriv(keyExportRaw, walletDerivationPath);
             } else if (mpcSigner instanceof web.Ed25519) {
                 derivedPrivateKey = keyExportRaw;
             } else if (mpcSigner instanceof web.BIP340) {
-                derivedPrivateKey = await mpcSigner.derivePrivateKeyFromXpriv(keyExportRaw, derivationPath);
+                derivedPrivateKey = await mpcSigner.derivePrivateKeyFromXpriv(keyExportRaw, walletDerivationPath);
             }
             return {
                 derivedPrivateKey
@@ -682,14 +714,15 @@ class DynamicWalletClient {
         const deserializedKeyShare = JSON.parse(decryptedKeyShare);
         return deserializedKeyShare;
     }
-    async recoverEncryptedBackupByWallet({ accountAddress, password, keyShareIds }) {
+    async recoverEncryptedBackupByWallet({ accountAddress, password }) {
         const wallet = this.walletMap[accountAddress];
         this.logger.debug('recoverEncryptedBackupByWallet wallet', wallet);
         const data = await this.apiClient.recoverEncryptedBackupByWallet({
-            walletId: wallet.walletId,
-            keyShareIds
+            walletId: wallet.walletId
         });
-        const decryptedKeyShares = await Promise.all(data.keyShares.map((keyShare)=>this.decryptKeyShare({
+        // TODO: allow handling backup from other sources
+        const dynamicKeyShares = data.keyShares.filter((keyShare)=>keyShare.encryptedAccountCredential !== null && keyShare.backupLocation === 'dynamic');
+        const decryptedKeyShares = await Promise.all(dynamicKeyShares.map((keyShare)=>this.decryptKeyShare({
                 keyShare: keyShare.encryptedAccountCredential,
                 password: password != null ? password : this.environmentId
             })));
@@ -699,7 +732,8 @@ class DynamicWalletClient {
                 accountAddress,
                 chainName: data.chainName,
                 keyShare,
-                thresholdSignatureScheme: wallet.thresholdSignatureScheme
+                thresholdSignatureScheme: wallet.thresholdSignatureScheme,
+                derivationPath: wallet.derivationPath
             });
         });
         return decryptedKeyShares;
@@ -712,7 +746,7 @@ class DynamicWalletClient {
         }
         this.walletMap = JSON.parse(wallets);
     }
-    async restoreBackupShare({ walletId, accountAddress, chainName, keyShare, thresholdSignatureScheme }) {
+    async restoreBackupShare({ walletId, accountAddress, chainName, keyShare, thresholdSignatureScheme, derivationPath }) {
         var _this_walletMap_accountAddress;
         this.walletMap[accountAddress] = {
             walletId,
@@ -722,46 +756,109 @@ class DynamicWalletClient {
                 ...((_this_walletMap_accountAddress = this.walletMap[accountAddress]) == null ? void 0 : _this_walletMap_accountAddress.clientKeyShares) || [],
                 keyShare
             ],
-            thresholdSignatureScheme
+            thresholdSignatureScheme,
+            derivationPath
         };
         await this.storage.setItem(this.storageKey, JSON.stringify(this.walletMap));
     }
-    async backupKeySharesToGoogleDrive({ accountAddress, fileName = BACKUP_FILENAME, keyShares, oauthAccountId, password }) {
-        const encryptedKeyShares = await Promise.all(keyShares.map((keyShare)=>this.encryptKeyShare({
+    async backupKeySharesToGoogleDrive({ accountAddress, fileName, oauthAccountId, password }) {
+        await this.getWallet({
+            accountAddress
+        });
+        const clientKeyShares = this.walletMap[accountAddress].clientKeyShares;
+        if (clientKeyShares.length === 0) {
+            throw new Error('No key shares found');
+        }
+        const encryptedKeyShares = await Promise.all(clientKeyShares.map((keyShare)=>this.encryptKeyShare({
                 keyShare,
                 password
             })));
         const accessToken = await this.apiClient.getAccessToken({
             oauthAccountId
         });
-        const uploadMetadata = await uploadFileToGoogleDrive({
-            accessToken,
-            fileName,
-            jsonData: encryptedKeyShares
+        const thresholdSignatureScheme = this.walletMap[accountAddress].thresholdSignatureScheme;
+        const suggestedFileName = getClientKeyShareExportFileName({
+            thresholdSignatureScheme,
+            accountAddress
         });
+        const backupData = {
+            keyShares: encryptedKeyShares,
+            metadata: {
+                version: '1.0',
+                createdAt: new Date().toISOString(),
+                accountAddress,
+                thresholdSignatureScheme,
+                hasPassword: true,
+                encryption: {
+                    algorithm: AES_GCM_ALGORITHM,
+                    keyDerivation: PBKDF2_ALGORITHM,
+                    iterations: PBKDF2_ITERATIONS,
+                    hashAlgorithm: PBKDF2_HASH_ALGORITHM,
+                    algorithmLength: AES_GCM_LENGTH
+                },
+                shareCount: encryptedKeyShares.length
+            }
+        };
+        // TODO: handle errors
+        const [appUpload, personalUpload] = await Promise.all([
+            uploadFileToGoogleDriveAppStorage({
+                accessToken,
+                fileName: fileName != null ? fileName : suggestedFileName,
+                jsonData: backupData
+            }),
+            uploadFileToGoogleDrivePersonal({
+                accessToken,
+                fileName: fileName != null ? fileName : suggestedFileName,
+                jsonData: backupData
+            })
+        ]);
         await this.apiClient.markKeySharesAsBackedUpGoogleDrive({
             walletId: this.walletMap[accountAddress].walletId
         });
-        return uploadMetadata;
+        return {
+            appUpload,
+            personalUpload
+        };
     }
-    async restoreBackupFromGoogleDrive({ oauthAccountId, name = BACKUP_FILENAME, password }) {
+    async restoreBackupFromGoogleDrive({ accountAddress, oauthAccountId, name, password }) {
+        await this.getWallet({
+            accountAddress
+        });
         const accessToken = await this.apiClient.getAccessToken({
             oauthAccountId
         });
-        const file = await downloadFileFromGoogleDrive({
+        const thresholdSignatureScheme = this.walletMap[accountAddress].thresholdSignatureScheme;
+        const suggestedFileName = getClientKeyShareExportFileName({
+            thresholdSignatureScheme,
+            accountAddress
+        });
+        const backupData = await downloadFileFromGoogleDrive({
             accessToken,
-            name
+            name: name != null ? name : suggestedFileName
         });
-        if (!file) {
-            throw new Error('No file found');
+        if (!backupData) {
+            throw new Error('No backup file found');
         }
-        const fileArray = Array.isArray(file) ? file : [
-            file
-        ];
-        const decryptedKeyShares = await Promise.all(fileArray.map((keyShare)=>this.decryptKeyShare({
+        // Validate the backup data structure
+        if (!backupData.keyShares || !backupData.metadata) {
+            throw new Error('Invalid backup format: missing keyShares or metadata');
+        }
+        const { keyShares } = backupData;
+        const decryptedKeyShares = await Promise.all(keyShares.map((keyShare)=>this.decryptKeyShare({
                 keyShare,
-                password: password != null ? password : this.environmentId
+                password
             })));
+        const existingKeyShares = this.walletMap[accountAddress].clientKeyShares || [];
+        const uniqueKeyShares = decryptedKeyShares.filter((newShare)=>!existingKeyShares.some((existingShare)=>{
+                if (!(newShare == null ? void 0 : newShare.pubkey) || !(existingShare == null ? void 0 : existingShare.pubkey)) return false;
+                return newShare.pubkey.toString() === existingShare.pubkey.toString() && newShare.secretShare === existingShare.secretShare;
+            }));
+        this.walletMap[accountAddress] = _extends({}, this.walletMap[accountAddress], {
+            clientKeyShares: [
+                ...existingKeyShares,
+                ...uniqueKeyShares
+            ]
+        });
         return decryptedKeyShares;
     }
     async importRawPrivateKey({ chainName, privateKey, thresholdSignatureScheme }) {
@@ -801,7 +898,7 @@ class DynamicWalletClient {
         const rawPublicKey = await this.derivePublicKey({
             chainName,
             keyShare: clientKeygenResult,
-            imported: true
+            derivationPath: undefined
         });
         return {
             rawPublicKey,
@@ -812,7 +909,14 @@ class DynamicWalletClient {
         const clientKeyShares = await this.getClientKeyShares({
             accountAddress
         });
-        const text = JSON.stringify(clientKeyShares);
+        if (!accountAddress) {
+            throw new Error('Must provide an account address');
+        }
+        const derivationPath = this.walletMap[accountAddress].derivationPath;
+        const text = JSON.stringify({
+            keyShares: clientKeyShares,
+            derivationPath
+        });
         const blob = new Blob([
             text
         ], {
@@ -832,7 +936,7 @@ class DynamicWalletClient {
     }
     async getWallet({ accountAddress }) {
         if (accountAddress) {
-            if (this.walletMap[accountAddress] && this.walletMap[accountAddress].clientKeyShares.length > 0) {
+            if (this.walletMap[accountAddress] && this.walletMap[accountAddress].clientKeyShares.length > 0 && this.walletMap[accountAddress].thresholdSignatureScheme && this.walletMap[accountAddress].derivationPath) {
                 this.logger.debug('Wallet already exists', this.walletMap[accountAddress]);
                 return this.walletMap[accountAddress];
             } else {
@@ -848,7 +952,8 @@ class DynamicWalletClient {
                     walletId: wallet.id,
                     chainName: wallet.chainName,
                     accountAddress,
-                    thresholdSignatureScheme: walletProperties.thresholdSignatureScheme
+                    thresholdSignatureScheme: walletProperties.thresholdSignatureScheme,
+                    derivationPath: walletProperties.derivationPath
                 });
                 // restore backup
                 const decryptedKeyShares = await this.recoverEncryptedBackupByWallet({
@@ -883,13 +988,15 @@ class DynamicWalletClient {
                 accountAddress: vc.address
             }));
         this.walletMap = wallets.reduce((acc, wallet)=>{
-            var _acc_wallet_accountAddress, _acc_wallet_accountAddress1;
+            var _acc_accountAddress, _acc_accountAddress1, _acc_accountAddress2;
+            const accountAddress = wallet.accountAddress;
             acc[wallet.accountAddress] = {
                 walletId: wallet.walletId,
                 chainName: wallet.chainName,
-                accountAddress: wallet.accountAddress,
-                clientKeyShares: ((_acc_wallet_accountAddress = acc[wallet.accountAddress]) == null ? void 0 : _acc_wallet_accountAddress.clientKeyShares) || [],
-                thresholdSignatureScheme: ((_acc_wallet_accountAddress1 = acc[wallet.accountAddress]) == null ? void 0 : _acc_wallet_accountAddress1.thresholdSignatureScheme) || undefined
+                accountAddress: accountAddress,
+                clientKeyShares: ((_acc_accountAddress = acc[accountAddress]) == null ? void 0 : _acc_accountAddress.clientKeyShares) || [],
+                thresholdSignatureScheme: ((_acc_accountAddress1 = acc[accountAddress]) == null ? void 0 : _acc_accountAddress1.thresholdSignatureScheme) || undefined,
+                derivationPath: ((_acc_accountAddress2 = acc[accountAddress]) == null ? void 0 : _acc_accountAddress2.derivationPath) || undefined
             };
             return acc;
         }, {});

package/index.esm.js CHANGED Viewed

@@ -36,6 +36,10 @@ const getMPCSigner = ({ chainName, baseRelayUrl })=>{
     return signatureScheme;
 };
+const DEFAULT_LOG_LEVEL = 'INFO';
+const STORAGE_KEY = 'dynamic-waas-wallet-client';
+const CLIENT_KEYSHARE_EXPORT_FILENAME_PREFIX = 'dynamicWalletKeyShareBackup';
 const bytesToBase64 = (arr)=>{
     return btoa(Array.from(arr, (b)=>String.fromCharCode(b)).join(''));
 };
@@ -56,7 +60,15 @@ const isHexString = (str)=>{
     // Check if string contains only hex characters
     return /^[0-9A-Fa-f]+$/.test(hex);
 };
+const getClientKeyShareExportFileName = ({ thresholdSignatureScheme, accountAddress })=>{
+    return `${CLIENT_KEYSHARE_EXPORT_FILENAME_PREFIX}-${thresholdSignatureScheme}-${accountAddress}.json`;
+};
+const PBKDF2_ALGORITHM = 'PBKDF2';
+const PBKDF2_ITERATIONS = 100000;
+const PBKDF2_HASH_ALGORITHM = 'SHA-256';
+const AES_GCM_ALGORITHM = 'AES-GCM';
+const AES_GCM_LENGTH = 256;
 const getKey = async ({ password, salt })=>{
     const passwordBytes = stringToBytes(password);
     const initialKey = await crypto.subtle.importKey('raw', passwordBytes, {
@@ -65,13 +77,13 @@ const getKey = async ({ password, salt })=>{
         'deriveKey'
     ]);
     return crypto.subtle.deriveKey({
-        name: 'PBKDF2',
+        name: PBKDF2_ALGORITHM,
         salt,
-        iterations: 100000,
-        hash: 'SHA-256'
+        iterations: PBKDF2_ITERATIONS,
+        hash: PBKDF2_HASH_ALGORITHM
     }, initialKey, {
-        name: 'AES-GCM',
-        length: 256
+        name: AES_GCM_ALGORITHM,
+        length: AES_GCM_LENGTH
     }, false, [
         'encrypt',
         'decrypt'
@@ -90,7 +102,7 @@ const encryptData = async ({ data, password })=>{
         const dataBytes = new TextEncoder().encode(data);
         // Encrypt the data
         const encryptedData = await crypto.subtle.encrypt({
-            name: 'AES-GCM',
+            name: AES_GCM_ALGORITHM,
             iv
         }, key, dataBytes);
         // Convert to base64 strings, ensure proper padding
@@ -119,24 +131,42 @@ const decryptData = async ({ data, password })=>{
             salt: saltBytes
         });
         const decryptedData = await crypto.subtle.decrypt({
-            name: 'AES-GCM',
+            name: AES_GCM_ALGORITHM,
             iv: ivBytes
         }, key, cipherBytes);
         return new TextDecoder().decode(decryptedData);
     } catch (error) {
         console.error('Decryption error details:', error);
-        throw new Error(`Decryption failed`);
+        throw new Error('Decryption failed');
     }
 };
 const GOOGLE_DRIVE_UPLOAD_API = 'https://www.googleapis.com';
-const uploadFileToGoogleDrive = async ({ accessToken, fileName, jsonData })=>{
-    const metadata = {
-        name: fileName,
-        mimeType: 'application/json',
+const uploadFileToGoogleDriveAppStorage = async ({ accessToken, fileName, jsonData })=>{
+    return uploadFileToGoogleDrive({
+        accessToken,
+        fileName,
+        jsonData,
         parents: [
             'appDataFolder'
         ]
+    });
+};
+const uploadFileToGoogleDrivePersonal = async ({ accessToken, fileName, jsonData })=>{
+    return uploadFileToGoogleDrive({
+        accessToken,
+        fileName,
+        jsonData,
+        parents: [
+            'root'
+        ]
+    });
+};
+const uploadFileToGoogleDrive = async ({ accessToken, fileName, jsonData, parents })=>{
+    const metadata = {
+        name: fileName,
+        mimeType: 'application/json',
+        parents
     };
     const form = new FormData();
     form.append('metadata', new Blob([
@@ -182,6 +212,9 @@ const downloadFileFromGoogleDrive = async ({ accessToken, name })=>{
         accessToken,
         name
     });
+    if (!files || files.length === 0) {
+        return null;
+    }
     // Get the most recent file
     const fileMetadata = files[0];
     // Fetch the file data using the file ID
@@ -195,14 +228,16 @@ const downloadFileFromGoogleDrive = async ({ accessToken, name })=>{
     if (fileRawData.length === 0) {
         return null;
     }
-    return JSON.parse(fileRawData);
+    try {
+        // Just parse and return the data without validation
+        // The client will handle validation of the structure
+        return JSON.parse(fileRawData);
+    } catch (error) {
+        console.error('Error parsing backup file:', error);
+        return null;
+    }
 };
-const DEFAULT_LOG_LEVEL = 'INFO';
-const STORAGE_KEY = 'dynamic-waas-wallet-client';
-const BACKUP_FILENAME = 'dynamicWalletKeyShareBackup.json';
-const CLIENT_KEYSHARE_EXPORT_FILENAME_PREFIX = 'dynamicWalletKeyShareBackup';
 const localStorageWriteTest = {
     tested: false,
     writable: false
@@ -320,13 +355,11 @@ class DynamicWalletClient {
         const keygenInitResults = await Promise.all(Array(clientThreshold).fill(null).map(()=>mpcSigner.initKeygen()));
         return keygenInitResults;
     }
-    async derivePublicKey({ chainName, keyShare, imported = false }) {
+    async derivePublicKey({ chainName, keyShare, derivationPath }) {
         const mpcSigner = getMPCSigner({
             chainName,
             baseRelayUrl: this.baseMPCRelayApiUrl
         });
-        const chainConfig = getMPCChainConfig(chainName);
-        const derivationPath = imported ? undefined : new Uint32Array(chainConfig.derivationPath);
         let publicKey;
         if (mpcSigner instanceof Ecdsa) {
             publicKey = await mpcSigner.derivePubkey(keyShare, derivationPath);
@@ -356,10 +389,12 @@ class DynamicWalletClient {
         }));
         // only need one client keygen result to derive the public key
         const [clientKeygenResult] = clientKeygenResults;
+        const chainConfig = getMPCChainConfig(chainName);
+        const derivationPath = new Uint32Array(chainConfig.derivationPath);
         const rawPublicKey = await this.derivePublicKey({
             chainName,
             keyShare: clientKeygenResult,
-            imported: false
+            derivationPath
         });
         return {
             rawPublicKey,
@@ -405,14 +440,12 @@ class DynamicWalletClient {
         });
         return data;
     }
-    async clientSign({ chainName, message, roomId, keyShare, imported = false }) {
+    async clientSign({ chainName, message, roomId, keyShare, derivationPath }) {
         try {
-            const chainConfig = getMPCChainConfig(chainName);
             const mpcSigner = getMPCSigner({
                 chainName,
                 baseRelayUrl: this.baseMPCRelayApiUrl
             });
-            const derivationPath = imported ? undefined : 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) {
@@ -440,23 +473,23 @@ class DynamicWalletClient {
         }
     }
     //todo: need to modify with imported flag
-    async sign({ accountAddress, message, chainName, imported = false }) {
+    async sign({ accountAddress, message, chainName }) {
         const wallet = await this.getWallet({
             accountAddress
         });
-        this.logger.debug('signing wallet', wallet);
         // Perform the server sign
         const data = await this.serverSign({
             walletId: wallet.walletId,
             message
         });
+        const derivationPath = wallet.derivationPath && wallet.derivationPath != '' ? new Uint32Array(Object.values(JSON.parse(wallet.derivationPath))) : undefined;
         // Perform the client sign and return the signature
         const signature = await this.clientSign({
             chainName,
             message,
             roomId: data.roomId,
             keyShare: wallet.clientKeyShares[0],
-            imported
+            derivationPath
         });
         return signature;
     }
@@ -584,7 +617,6 @@ class DynamicWalletClient {
         const wallet = await this.getWallet({
             accountAddress
         });
-        const chainConfig = getMPCChainConfig(chainName);
         const mpcSigner = getMPCSigner({
             chainName,
             baseRelayUrl: this.baseMPCRelayApiUrl
@@ -601,7 +633,7 @@ class DynamicWalletClient {
         if (!keyExportRaw) {
             throw new Error('Error exporting private key');
         }
-        const derivationPath = new Uint32Array(chainConfig.derivationPath);
+        const derivationPath = wallet.derivationPath && wallet.derivationPath != '' ? new Uint32Array(Object.values(JSON.parse(wallet.derivationPath))) : undefined;
         let derivedPrivateKey;
         if (mpcSigner instanceof Ecdsa) {
             derivedPrivateKey = await mpcSigner.derivePrivateKeyFromXpriv(keyExportRaw, derivationPath);
@@ -614,7 +646,7 @@ class DynamicWalletClient {
             derivedPrivateKey
         };
     }
-    async offlineExportKey({ chainName, keyShares }) {
+    async offlineExportKey({ chainName, keyShares, derivationPath }) {
         try {
             if (!keyShares || keyShares.length < 2) {
                 throw new Error(`Must provide at least min threshold of key shares`);
@@ -631,14 +663,14 @@ class DynamicWalletClient {
                 throw new Error('Error exporting private key: Export returned null');
             }
             const chainConfig = getMPCChainConfig(chainName);
-            const derivationPath = new Uint32Array(chainConfig.derivationPath);
+            const walletDerivationPath = !derivationPath ? undefined : new Uint32Array(chainConfig.derivationPath);
             let derivedPrivateKey;
             if (mpcSigner instanceof Ecdsa) {
-                derivedPrivateKey = await mpcSigner.derivePrivateKeyFromXpriv(keyExportRaw, derivationPath);
+                derivedPrivateKey = await mpcSigner.derivePrivateKeyFromXpriv(keyExportRaw, walletDerivationPath);
             } else if (mpcSigner instanceof Ed25519) {
                 derivedPrivateKey = keyExportRaw;
             } else if (mpcSigner instanceof BIP340) {
-                derivedPrivateKey = await mpcSigner.derivePrivateKeyFromXpriv(keyExportRaw, derivationPath);
+                derivedPrivateKey = await mpcSigner.derivePrivateKeyFromXpriv(keyExportRaw, walletDerivationPath);
             }
             return {
                 derivedPrivateKey
@@ -682,14 +714,15 @@ class DynamicWalletClient {
         const deserializedKeyShare = JSON.parse(decryptedKeyShare);
         return deserializedKeyShare;
     }
-    async recoverEncryptedBackupByWallet({ accountAddress, password, keyShareIds }) {
+    async recoverEncryptedBackupByWallet({ accountAddress, password }) {
         const wallet = this.walletMap[accountAddress];
         this.logger.debug('recoverEncryptedBackupByWallet wallet', wallet);
         const data = await this.apiClient.recoverEncryptedBackupByWallet({
-            walletId: wallet.walletId,
-            keyShareIds
+            walletId: wallet.walletId
         });
-        const decryptedKeyShares = await Promise.all(data.keyShares.map((keyShare)=>this.decryptKeyShare({
+        // TODO: allow handling backup from other sources
+        const dynamicKeyShares = data.keyShares.filter((keyShare)=>keyShare.encryptedAccountCredential !== null && keyShare.backupLocation === 'dynamic');
+        const decryptedKeyShares = await Promise.all(dynamicKeyShares.map((keyShare)=>this.decryptKeyShare({
                 keyShare: keyShare.encryptedAccountCredential,
                 password: password != null ? password : this.environmentId
             })));
@@ -699,7 +732,8 @@ class DynamicWalletClient {
                 accountAddress,
                 chainName: data.chainName,
                 keyShare,
-                thresholdSignatureScheme: wallet.thresholdSignatureScheme
+                thresholdSignatureScheme: wallet.thresholdSignatureScheme,
+                derivationPath: wallet.derivationPath
             });
         });
         return decryptedKeyShares;
@@ -712,7 +746,7 @@ class DynamicWalletClient {
         }
         this.walletMap = JSON.parse(wallets);
     }
-    async restoreBackupShare({ walletId, accountAddress, chainName, keyShare, thresholdSignatureScheme }) {
+    async restoreBackupShare({ walletId, accountAddress, chainName, keyShare, thresholdSignatureScheme, derivationPath }) {
         var _this_walletMap_accountAddress;
         this.walletMap[accountAddress] = {
             walletId,
@@ -722,46 +756,109 @@ class DynamicWalletClient {
                 ...((_this_walletMap_accountAddress = this.walletMap[accountAddress]) == null ? void 0 : _this_walletMap_accountAddress.clientKeyShares) || [],
                 keyShare
             ],
-            thresholdSignatureScheme
+            thresholdSignatureScheme,
+            derivationPath
         };
         await this.storage.setItem(this.storageKey, JSON.stringify(this.walletMap));
     }
-    async backupKeySharesToGoogleDrive({ accountAddress, fileName = BACKUP_FILENAME, keyShares, oauthAccountId, password }) {
-        const encryptedKeyShares = await Promise.all(keyShares.map((keyShare)=>this.encryptKeyShare({
+    async backupKeySharesToGoogleDrive({ accountAddress, fileName, oauthAccountId, password }) {
+        await this.getWallet({
+            accountAddress
+        });
+        const clientKeyShares = this.walletMap[accountAddress].clientKeyShares;
+        if (clientKeyShares.length === 0) {
+            throw new Error('No key shares found');
+        }
+        const encryptedKeyShares = await Promise.all(clientKeyShares.map((keyShare)=>this.encryptKeyShare({
                 keyShare,
                 password
             })));
         const accessToken = await this.apiClient.getAccessToken({
             oauthAccountId
         });
-        const uploadMetadata = await uploadFileToGoogleDrive({
-            accessToken,
-            fileName,
-            jsonData: encryptedKeyShares
+        const thresholdSignatureScheme = this.walletMap[accountAddress].thresholdSignatureScheme;
+        const suggestedFileName = getClientKeyShareExportFileName({
+            thresholdSignatureScheme,
+            accountAddress
         });
+        const backupData = {
+            keyShares: encryptedKeyShares,
+            metadata: {
+                version: '1.0',
+                createdAt: new Date().toISOString(),
+                accountAddress,
+                thresholdSignatureScheme,
+                hasPassword: true,
+                encryption: {
+                    algorithm: AES_GCM_ALGORITHM,
+                    keyDerivation: PBKDF2_ALGORITHM,
+                    iterations: PBKDF2_ITERATIONS,
+                    hashAlgorithm: PBKDF2_HASH_ALGORITHM,
+                    algorithmLength: AES_GCM_LENGTH
+                },
+                shareCount: encryptedKeyShares.length
+            }
+        };
+        // TODO: handle errors
+        const [appUpload, personalUpload] = await Promise.all([
+            uploadFileToGoogleDriveAppStorage({
+                accessToken,
+                fileName: fileName != null ? fileName : suggestedFileName,
+                jsonData: backupData
+            }),
+            uploadFileToGoogleDrivePersonal({
+                accessToken,
+                fileName: fileName != null ? fileName : suggestedFileName,
+                jsonData: backupData
+            })
+        ]);
         await this.apiClient.markKeySharesAsBackedUpGoogleDrive({
             walletId: this.walletMap[accountAddress].walletId
         });
-        return uploadMetadata;
+        return {
+            appUpload,
+            personalUpload
+        };
     }
-    async restoreBackupFromGoogleDrive({ oauthAccountId, name = BACKUP_FILENAME, password }) {
+    async restoreBackupFromGoogleDrive({ accountAddress, oauthAccountId, name, password }) {
+        await this.getWallet({
+            accountAddress
+        });
         const accessToken = await this.apiClient.getAccessToken({
             oauthAccountId
         });
-        const file = await downloadFileFromGoogleDrive({
+        const thresholdSignatureScheme = this.walletMap[accountAddress].thresholdSignatureScheme;
+        const suggestedFileName = getClientKeyShareExportFileName({
+            thresholdSignatureScheme,
+            accountAddress
+        });
+        const backupData = await downloadFileFromGoogleDrive({
             accessToken,
-            name
+            name: name != null ? name : suggestedFileName
         });
-        if (!file) {
-            throw new Error('No file found');
+        if (!backupData) {
+            throw new Error('No backup file found');
         }
-        const fileArray = Array.isArray(file) ? file : [
-            file
-        ];
-        const decryptedKeyShares = await Promise.all(fileArray.map((keyShare)=>this.decryptKeyShare({
+        // Validate the backup data structure
+        if (!backupData.keyShares || !backupData.metadata) {
+            throw new Error('Invalid backup format: missing keyShares or metadata');
+        }
+        const { keyShares } = backupData;
+        const decryptedKeyShares = await Promise.all(keyShares.map((keyShare)=>this.decryptKeyShare({
                 keyShare,
-                password: password != null ? password : this.environmentId
+                password
             })));
+        const existingKeyShares = this.walletMap[accountAddress].clientKeyShares || [];
+        const uniqueKeyShares = decryptedKeyShares.filter((newShare)=>!existingKeyShares.some((existingShare)=>{
+                if (!(newShare == null ? void 0 : newShare.pubkey) || !(existingShare == null ? void 0 : existingShare.pubkey)) return false;
+                return newShare.pubkey.toString() === existingShare.pubkey.toString() && newShare.secretShare === existingShare.secretShare;
+            }));
+        this.walletMap[accountAddress] = _extends({}, this.walletMap[accountAddress], {
+            clientKeyShares: [
+                ...existingKeyShares,
+                ...uniqueKeyShares
+            ]
+        });
         return decryptedKeyShares;
     }
     async importRawPrivateKey({ chainName, privateKey, thresholdSignatureScheme }) {
@@ -801,7 +898,7 @@ class DynamicWalletClient {
         const rawPublicKey = await this.derivePublicKey({
             chainName,
             keyShare: clientKeygenResult,
-            imported: true
+            derivationPath: undefined
         });
         return {
             rawPublicKey,
@@ -812,7 +909,14 @@ class DynamicWalletClient {
         const clientKeyShares = await this.getClientKeyShares({
             accountAddress
         });
-        const text = JSON.stringify(clientKeyShares);
+        if (!accountAddress) {
+            throw new Error('Must provide an account address');
+        }
+        const derivationPath = this.walletMap[accountAddress].derivationPath;
+        const text = JSON.stringify({
+            keyShares: clientKeyShares,
+            derivationPath
+        });
         const blob = new Blob([
             text
         ], {
@@ -832,7 +936,7 @@ class DynamicWalletClient {
     }
     async getWallet({ accountAddress }) {
         if (accountAddress) {
-            if (this.walletMap[accountAddress] && this.walletMap[accountAddress].clientKeyShares.length > 0) {
+            if (this.walletMap[accountAddress] && this.walletMap[accountAddress].clientKeyShares.length > 0 && this.walletMap[accountAddress].thresholdSignatureScheme && this.walletMap[accountAddress].derivationPath) {
                 this.logger.debug('Wallet already exists', this.walletMap[accountAddress]);
                 return this.walletMap[accountAddress];
             } else {
@@ -848,7 +952,8 @@ class DynamicWalletClient {
                     walletId: wallet.id,
                     chainName: wallet.chainName,
                     accountAddress,
-                    thresholdSignatureScheme: walletProperties.thresholdSignatureScheme
+                    thresholdSignatureScheme: walletProperties.thresholdSignatureScheme,
+                    derivationPath: walletProperties.derivationPath
                 });
                 // restore backup
                 const decryptedKeyShares = await this.recoverEncryptedBackupByWallet({
@@ -883,13 +988,15 @@ class DynamicWalletClient {
                 accountAddress: vc.address
             }));
         this.walletMap = wallets.reduce((acc, wallet)=>{
-            var _acc_wallet_accountAddress, _acc_wallet_accountAddress1;
+            var _acc_accountAddress, _acc_accountAddress1, _acc_accountAddress2;
+            const accountAddress = wallet.accountAddress;
             acc[wallet.accountAddress] = {
                 walletId: wallet.walletId,
                 chainName: wallet.chainName,
-                accountAddress: wallet.accountAddress,
-                clientKeyShares: ((_acc_wallet_accountAddress = acc[wallet.accountAddress]) == null ? void 0 : _acc_wallet_accountAddress.clientKeyShares) || [],
-                thresholdSignatureScheme: ((_acc_wallet_accountAddress1 = acc[wallet.accountAddress]) == null ? void 0 : _acc_wallet_accountAddress1.thresholdSignatureScheme) || undefined
+                accountAddress: accountAddress,
+                clientKeyShares: ((_acc_accountAddress = acc[accountAddress]) == null ? void 0 : _acc_accountAddress.clientKeyShares) || [],
+                thresholdSignatureScheme: ((_acc_accountAddress1 = acc[accountAddress]) == null ? void 0 : _acc_accountAddress1.thresholdSignatureScheme) || undefined,
+                derivationPath: ((_acc_accountAddress2 = acc[accountAddress]) == null ? void 0 : _acc_accountAddress2.derivationPath) || undefined
             };
             return acc;
         }, {});

package/package.json CHANGED Viewed

@@ -1,8 +1,8 @@
 {
   "name": "@dynamic-labs-wallet/browser",
-  "version": "0.0.29",
+  "version": "0.0.31",
   "dependencies": {
-    "@dynamic-labs-wallet/core": "0.0.29",
+    "@dynamic-labs-wallet/core": "0.0.31",
     "@dynamic-labs/logger": "^4.5.1"
   },
   "files": [

package/src/backup/encryption.d.ts CHANGED Viewed

@@ -1,3 +1,8 @@
+export declare const PBKDF2_ALGORITHM = "PBKDF2";
+export declare const PBKDF2_ITERATIONS = 100000;
+export declare const PBKDF2_HASH_ALGORITHM = "SHA-256";
+export declare const AES_GCM_ALGORITHM = "AES-GCM";
+export declare const AES_GCM_LENGTH = 256;
 export declare const encryptData: ({ data, password, }: {
     data: string;
     password: string;

package/src/backup/encryption.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"encryption.d.ts","sourceRoot":"","sources":["../../src/backup/encryption.ts"],"names":[],"mappings":"~~AAiCA~~,eAAO,MAAM,WAAW,wBAGrB;IACD,IAAI,EAAE,MAAM,CAAC;IACb,QAAQ,EAAE,MAAM,CAAC;CAClB;;;;EA4BA,CAAC;AAEF,eAAO,MAAM,WAAW,wBAGrB;IACD,IAAI,EAAE;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,EAAE,EAAE,MAAM,CAAC;QAAC,MAAM,EAAE,MAAM,CAAA;KAAE,CAAC;IACnD,QAAQ,EAAE,MAAM,CAAC;CAClB,oBA0BA,CAAC"}
1	+ {"version":3,"file":"encryption.d.ts","sourceRoot":"","sources":["../../src/backup/encryption.ts"],"names":[],"mappings":"AAOA,eAAO,MAAM,gBAAgB,WAAW,CAAC;AACzC,eAAO,MAAM,iBAAiB,SAAS,CAAC;AACxC,eAAO,MAAM,qBAAqB,YAAY,CAAC;AAE/C,eAAO,MAAM,iBAAiB,YAAY,CAAC;AAC3C,eAAO,MAAM,cAAc,MAAM,CAAC;AA4BlC,eAAO,MAAM,WAAW,wBAGrB;IACD,IAAI,EAAE,MAAM,CAAC;IACb,QAAQ,EAAE,MAAM,CAAC;CAClB;;;;EA4BA,CAAC;AAEF,eAAO,MAAM,WAAW,wBAGrB;IACD,IAAI,EAAE;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,EAAE,EAAE,MAAM,CAAC;QAAC,MAAM,EAAE,MAAM,CAAA;KAAE,CAAC;IACnD,QAAQ,EAAE,MAAM,CAAC;CAClB,oBA0BA,CAAC"}

package/src/backup/providers/googleDrive.d.ts CHANGED Viewed

@@ -1,7 +1,12 @@
-export declare const uploadFileToGoogleDrive: ({ accessToken, fileName, jsonData, }: {
+export declare const uploadFileToGoogleDriveAppStorage: ({ accessToken, fileName, jsonData, }: {
     accessToken: string;
     fileName: string;
-    jsonData: string[];
+    jsonData: unknown;
+}) => Promise<any>;
+export declare const uploadFileToGoogleDrivePersonal: ({ accessToken, fileName, jsonData, }: {
+    accessToken: string;
+    fileName: string;
+    jsonData: unknown;
 }) => Promise<any>;
 export declare const listFilesFromGoogleDrive: ({ accessToken, name, }: {
     accessToken: string;
@@ -10,5 +15,5 @@ export declare const listFilesFromGoogleDrive: ({ accessToken, name, }: {
 export declare const downloadFileFromGoogleDrive: ({ accessToken, name, }: {
     accessToken: string;
     name: string;
-}) => Promise<string[] | string | null>;
+}) => Promise<unknown | null>;
 //# sourceMappingURL=googleDrive.d.ts.map

package/src/backup/providers/googleDrive.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"googleDrive.d.ts","sourceRoot":"","sources":["../../../src/backup/providers/googleDrive.ts"],"names":[],"mappings":"AAEA,eAAO,MAAM,~~uBAAuB~~,~~yCAIjC~~;IACD,WAAW,EAAE,MAAM,CAAC;IACpB,QAAQ,EAAE,MAAM,CAAC;IACjB,QAAQ,EAAE,MAAM,EAAE,CAAC;~~CACpB~~,~~iBAkCA~~,CAAC;~~AAEF~~,eAAO,MAAM,wBAAwB,2BAGlC;IACD,WAAW,EAAE,MAAM,CAAC;IACpB,IAAI,EAAE,MAAM,CAAC;CACd,iBAsBA,CAAC;AAEF,eAAO,MAAM,2BAA2B,2BAGrC;IACD,WAAW,EAAE,MAAM,CAAC;IACpB,IAAI,EAAE,MAAM,CAAC;CACd,KAAG,OAAO,CAAC,~~MAAM~~,~~EAAE,~~GAAG,~~MAAM,GAAG,~~IAAI,~~CAsBnC~~,CAAC"}
1	+ {"version":3,"file":"googleDrive.d.ts","sourceRoot":"","sources":["../../../src/backup/providers/googleDrive.ts"],"names":[],"mappings":"AAEA,eAAO,MAAM,iCAAiC,yCAI3C;IACD,WAAW,EAAE,MAAM,CAAC;IACpB,QAAQ,EAAE,MAAM,CAAC;IACjB,QAAQ,EAAE,OAAO,CAAC;CACnB,iBAOA,CAAC;AAEF,eAAO,MAAM,+BAA+B,yCAIzC;IACD,WAAW,EAAE,MAAM,CAAC;IACpB,QAAQ,EAAE,MAAM,CAAC;IACjB,QAAQ,EAAE,OAAO,CAAC;CACnB,iBAOA,CAAC;AAiDF,eAAO,MAAM,wBAAwB,2BAGlC;IACD,WAAW,EAAE,MAAM,CAAC;IACpB,IAAI,EAAE,MAAM,CAAC;CACd,iBAsBA,CAAC;AAEF,eAAO,MAAM,2BAA2B,2BAGrC;IACD,WAAW,EAAE,MAAM,CAAC;IACpB,IAAI,EAAE,MAAM,CAAC;CACd,KAAG,OAAO,CAAC,OAAO,GAAG,IAAI,CAiCzB,CAAC"}

package/src/client.d.ts CHANGED Viewed

@@ -31,10 +31,10 @@ export declare class DynamicWalletClient {
         chainName: string;
         thresholdSignatureScheme: ThresholdSignatureScheme;
     }): Promise<ClientInitKeygenResult[]>;
-    derivePublicKey({ chainName, keyShare, imported, }: {
+    derivePublicKey({ chainName, keyShare, derivationPath, }: {
         chainName: string;
         keyShare: ClientKeyShare;
-        imported: boolean;
+        derivationPath: Uint32Array | undefined;
     }): Promise<EcdsaPublicKey | Uint8Array | undefined>;
     clientKeyGen({ chainName, roomId, serverKeygenIds, clientKeygenInitResults, thresholdSignatureScheme, }: {
         chainName: string;
@@ -57,18 +57,17 @@ export declare class DynamicWalletClient {
         walletId: string;
         message: string | Uint8Array;
     }): Promise<any>;
-    clientSign({ chainName, message, roomId, keyShare, imported, }: {
+    clientSign({ chainName, message, roomId, keyShare, derivationPath, }: {
         chainName: string;
         message: string | Uint8Array;
         roomId: string;
         keyShare: ClientKeyShare;
-        imported?: boolean;
+        derivationPath: Uint32Array | undefined;
     }): Promise<Uint8Array | EcdsaSignature>;
-    sign({ accountAddress, message, chainName, imported, }: {
+    sign({ accountAddress, message, chainName, }: {
         accountAddress?: string;
         message: string | Uint8Array;
         chainName: string;
-        imported?: boolean;
     }): Promise<Uint8Array | EcdsaSignature>;
     refreshWalletAccountShares({ accountAddress, chainName, }: {
         accountAddress: string;
@@ -115,9 +114,10 @@ export declare class DynamicWalletClient {
     }): Promise<{
         derivedPrivateKey: string | undefined;
     }>;
-    offlineExportKey({ chainName, keyShares, }: {
+    offlineExportKey({ chainName, keyShares, derivationPath, }: {
         chainName: string;
         keyShares: ClientKeyShare[];
+        derivationPath?: string;
     }): Promise<{
         derivedPrivateKey: string | undefined;
     }>;
@@ -132,28 +132,31 @@ export declare class DynamicWalletClient {
     decryptKeyShare({ keyShare, password, }: {
         keyShare: string;
         password?: string;
-    }): Promise<any>;
-    recoverEncryptedBackupByWallet({ accountAddress, password, keyShareIds, }: {
+    }): Promise<ClientKeyShare>;
+    recoverEncryptedBackupByWallet({ accountAddress, password, }: {
         accountAddress: string;
         password?: string;
-        keyShareIds?: string[];
     }): Promise<any[]>;
     restoreWallets(): Promise<void>;
-    restoreBackupShare({ walletId, accountAddress, chainName, keyShare, thresholdSignatureScheme, }: {
+    restoreBackupShare({ walletId, accountAddress, chainName, keyShare, thresholdSignatureScheme, derivationPath, }: {
         walletId: string;
         accountAddress: string;
         chainName: string;
         keyShare: ClientKeyShare;
         thresholdSignatureScheme: ThresholdSignatureScheme;
+        derivationPath?: string;
     }): Promise<void>;
-    backupKeySharesToGoogleDrive({ accountAddress, fileName, keyShares, oauthAccountId, password, }: {
+    backupKeySharesToGoogleDrive({ accountAddress, fileName, oauthAccountId, password, }: {
         accountAddress: string;
         fileName?: string;
-        keyShares: ClientKeyShare[];
         oauthAccountId: string;
         password?: string;
-    }): Promise<any>;
-    restoreBackupFromGoogleDrive({ oauthAccountId, name, password, }: {
+    }): Promise<{
+        appUpload: any;
+        personalUpload: any;
+    }>;
+    restoreBackupFromGoogleDrive({ accountAddress, oauthAccountId, name, password, }: {
+        accountAddress: string;
         oauthAccountId: string;
         name?: string;
         password?: string;

package/src/client.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"client.d.ts","sourceRoot":"","sources":["../../packages/src/client.ts"],"names":[],"mappings":"AAAA,OAAO,EAGL,wBAAwB,EACxB,gBAAgB,EAIjB,MAAM,2BAA2B,CAAC;AAEnC,OAAO,EAIL,cAAc,EACd,iBAAiB,EACjB,mBAAmB,EACnB,kBAAkB,EAElB,cAAc,EACf,MAAM,eAAe,CAAC;AAEvB,OAAO,EAAE,sBAAsB,EAAE,cAAc,EAAE,MAAM,aAAa,CAAC;~~AAYrE~~,OAAO,EAGL,gBAAgB,EAEjB,MAAM,yBAAyB,CAAC;AACjC,OAAO,~~EACL~~,wBAAwB,EACxB,gBAAgB,EAChB,gBAAgB,EACjB,MAAM,SAAS,CAAC;AAIjB,qBAAa,mBAAmB;IACvB,aAAa,EAAE,MAAM,CAAC;IACtB,UAAU,EAAE,MAAM,CAAC;IACnB,KAAK,EAAE,OAAO,CAAC;IAEtB,SAAS,CAAC,iBAAiB,EAAE,OAAO,CAAC,gBAAgB,CAAC,GAAG,IAAI,CAAQ;IACrE,SAAS,CAAC,MAAM,wCAAU;IAC1B,SAAS,CAAC,SAAS,EAAE,gBAAgB,CAAC;IACtC,SAAS,CAAC,SAAS,EAAE,MAAM,CAAC,MAAM,EAAE,gBAAgB,CAAC,CAAM;IAC3D,SAAS,CAAC,OAAO,EAAE,gBAAgB,CAAC;IACpC,SAAS,CAAC,aAAa,EAAE;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAAA;KAAE,GAAG,IAAI,CAAQ;IACjE,SAAS,CAAC,kBAAkB,CAAC,EAAE,MAAM,CAAC;gBAE1B,EACV,aAAa,EACb,SAAS,EACT,UAAU,EACV,kBAAkB,EAClB,UAAU,EACV,KAAK,GACN,EAAE,wBAAwB;IA0BrB,UAAU,IAAI,OAAO,CAAC,gBAAgB,CAAC;IAY7C;;OAEG;YACW,WAAW;IAanB,sBAAsB,CAAC,EAC3B,SAAS,EACT,eAAe,EACf,wBAAwB,GACzB,EAAE;QACD,SAAS,EAAE,MAAM,CAAC;QAClB,eAAe,EAAE,MAAM,EAAE,CAAC;QAC1B,wBAAwB,EAAE,wBAAwB,CAAC;KACpD;IAYK,sBAAsB,CAAC,EAC3B,SAAS,EACT,wBAAwB,GACzB,EAAE;QACD,SAAS,EAAE,MAAM,CAAC;QAClB,wBAAwB,EAAE,wBAAwB,CAAC;KACpD,GAAG,OAAO,CAAC,sBAAsB,EAAE,CAAC;IAkB/B,eAAe,CAAC,EACpB,SAAS,EACT,QAAQ,EACR,~~QAAgB~~,~~GACjB~~,EAAE;QACD,SAAS,EAAE,MAAM,CAAC;QAClB,QAAQ,EAAE,cAAc,CAAC;QACzB,~~QAAQ~~,EAAE,~~OAAO~~,CAAC;~~KACnB~~;~~IAmBK~~,YAAY,CAAC,EACjB,SAAS,EACT,MAAM,EACN,eAAe,EACf,uBAAuB,EACvB,wBAAwB,GACzB,EAAE;QACD,SAAS,EAAE,MAAM,CAAC;QAClB,MAAM,EAAE,MAAM,CAAC;QACf,eAAe,EAAE,MAAM,EAAE,CAAC;QAC1B,uBAAuB,EAAE,sBAAsB,EAAE,CAAC;QAClD,wBAAwB,EAAE,wBAAwB,CAAC;KACpD,GAAG,OAAO,CAAC;QACV,YAAY,EAAE,cAAc,GAAG,UAAU,GAAG,SAAS,CAAC;QACtD,mBAAmB,EAAE,cAAc,EAAE,CAAC;KACvC,CAAC;~~IA8CI~~,MAAM,CAAC,EACX,SAAS,EACT,wBAAwB,GACzB,EAAE;QACD,SAAS,EAAE,MAAM,CAAC;QAClB,wBAAwB,EAAE,wBAAwB,CAAC;KACpD,GAAG,OAAO,CAAC;QACV,YAAY,EAAE,cAAc,GAAG,UAAU,GAAG,SAAS,CAAC;QACtD,eAAe,EAAE,cAAc,EAAE,CAAC;KACnC,CAAC;IAkCI,UAAU,CAAC,EACf,QAAQ,EACR,OAAO,GACR,EAAE;QACD,QAAQ,EAAE,MAAM,CAAC;QACjB,OAAO,EAAE,MAAM,GAAG,UAAU,CAAC;KAC9B;IAWK,UAAU,CAAC,EACf,SAAS,EACT,OAAO,EACP,MAAM,EACN,QAAQ,EACR,~~QAAgB~~,~~GACjB~~,EAAE;QACD,SAAS,EAAE,MAAM,CAAC;QAClB,OAAO,EAAE,MAAM,GAAG,UAAU,CAAC;QAC7B,MAAM,EAAE,MAAM,CAAC;QACf,QAAQ,EAAE,cAAc,CAAC;QACzB,~~QAAQ~~,~~CAAC,~~EAAE,~~OAAO~~,CAAC;~~KACpB~~,GAAG,OAAO,CAAC,UAAU,GAAG,cAAc,CAAC;~~IA6ClC~~,IAAI,CAAC,EACT,cAAc,EACd,OAAO,EACP,SAAS,~~EACT~~,~~QAAgB,GACjB,~~EAAE;QACD,cAAc,CAAC,EAAE,MAAM,CAAC;QACxB,OAAO,EAAE,MAAM,GAAG,UAAU,CAAC;QAC7B,SAAS,EAAE,MAAM,CAAC;~~QAClB~~,~~QAAQ,CAAC,EAAE,OAAO,CAAC;KACpB,~~GAAG,OAAO,CAAC,UAAU,GAAG,cAAc,CAAC;~~IAkBlC~~,0BAA0B,CAAC,EAC/B,cAAc,EACd,SAAS,GACV,EAAE;QACD,cAAc,EAAE,MAAM,CAAC;QACvB,SAAS,EAAE,MAAM,CAAC;KACnB;IAiCK,WAAW,CAAC,EAChB,SAAS,EACT,cAAc,GACf,EAAE;QACD,SAAS,EAAE,MAAM,CAAC;QAClB,cAAc,EACV,iBAAiB,GACjB,mBAAmB,GACnB,kBAAkB,CAAC;KACxB;IASD;;;;;;;;;;;;;OAaG;IACG,eAAe,CAAC,EACpB,SAAS,EACT,MAAM,EACN,2BAA2B,EAC3B,2BAA2B,GAC5B,EAAE;QACD,SAAS,EAAE,MAAM,CAAC;QAClB,MAAM,EAAE,gBAAgB,CAAC;QACzB,2BAA2B,EAAE,wBAAwB,CAAC;QACtD,2BAA2B,EAAE,wBAAwB,CAAC;KACvD,GAAG,OAAO,CAAC;QACV,0BAA0B,EAAE,sBAAsB,EAAE,CAAC;QACrD,kBAAkB,EAAE,MAAM,EAAE,CAAC;QAC7B,uBAAuB,EAAE,MAAM,EAAE,CAAC;QAClC,uBAAuB,EAAE,cAAc,EAAE,CAAC;KAC3C,CAAC;IA2CI,OAAO,CAAC,EACZ,SAAS,EACT,cAAc,EACd,2BAA2B,EAC3B,2BAA2B,GAC5B,EAAE;QACD,SAAS,EAAE,MAAM,CAAC;QAClB,cAAc,EAAE,MAAM,CAAC;QACvB,2BAA2B,EAAE,wBAAwB,CAAC;QACtD,2BAA2B,EAAE,wBAAwB,CAAC;KACvD;IA6EK,SAAS,CAAC,EACd,cAAc,EACd,SAAS,GACV,EAAE;QACD,cAAc,EAAE,MAAM,CAAC;QACvB,SAAS,EAAE,MAAM,CAAC;KACnB;;;~~IA4CK~~,gBAAgB,CAAC,EACrB,SAAS,EACT,SAAS,~~GACV~~,EAAE;QACD,SAAS,EAAE,MAAM,CAAC;QAClB,SAAS,EAAE,cAAc,EAAE,CAAC;~~KAC7B~~;;;~~IA6DK~~,eAAe,CAAC,EACpB,QAAQ,EACR,QAAQ,GACT,EAAE;QACD,QAAQ,EAAE,cAAc,CAAC;QACzB,QAAQ,CAAC,EAAE,MAAM,CAAC;KACnB;IAaK,4BAA4B,CAAC,EACjC,cAAc,EACd,QAAQ,GACT,EAAE;QACD,cAAc,EAAE,MAAM,CAAC;QACvB,QAAQ,CAAC,EAAE,MAAM,CAAC;KACnB;IAiBK,eAAe,CAAC,EACpB,QAAQ,EACR,QAAQ,GACT,EAAE;QACD,QAAQ,EAAE,MAAM,CAAC;QACjB,QAAQ,CAAC,EAAE,MAAM,CAAC;KACnB;~~IAYK~~,8BAA8B,CAAC,EACnC,cAAc,EACd,QAAQ,~~EACR~~,~~WAAW,GACZ,~~EAAE;QACD,cAAc,EAAE,MAAM,CAAC;QACvB,QAAQ,CAAC,EAAE,MAAM,CAAC;~~QAClB,WAAW,CAAC,EAAE,MAAM,EAAE,CAAC~~;~~KACxB;IA2BK~~,cAAc;IASd,kBAAkB,CAAC,EACvB,QAAQ,EACR,cAAc,EACd,SAAS,EACT,QAAQ,EACR,wBAAwB,~~GACzB~~,EAAE;QACD,QAAQ,EAAE,MAAM,CAAC;QACjB,cAAc,EAAE,MAAM,CAAC;QACvB,SAAS,EAAE,MAAM,CAAC;QAClB,QAAQ,EAAE,cAAc,CAAC;QACzB,wBAAwB,EAAE,wBAAwB,CAAC;~~KACpD~~;~~IAcK~~,4BAA4B,CAAC,EACjC,cAAc,EACd,~~QAA0B~~,~~EAC1B~~,~~SAAS,EACT,~~cAAc,EACd,QAAQ,GACT,EAAE;QACD,cAAc,EAAE,MAAM,CAAC;QACvB,QAAQ,CAAC,EAAE,MAAM,CAAC;QAClB,~~SAAS,EAAE,~~cAAc,EAAE,~~CAAC;QAC5B,cAAc,EAAE,~~MAAM,CAAC;QACvB,QAAQ,CAAC,EAAE,MAAM,CAAC;KACnB~~;IAsBK~~,4BAA4B,CAAC,EACjC,cAAc,EACd,~~IAAsB~~,~~EACtB~~,QAAQ,GACT,EAAE;QACD,cAAc,EAAE,MAAM,CAAC;QACvB,IAAI,CAAC,EAAE,MAAM,CAAC;QACd,QAAQ,CAAC,EAAE,MAAM,CAAC;KACnB,GAAG,OAAO,CAAC,cAAc,EAAE,GAAG,IAAI,CAAC;~~IA2B9B~~,mBAAmB,CAAC,EACxB,SAAS,EACT,UAAU,EACV,wBAAwB,GACzB,EAAE;QACD,SAAS,EAAE,MAAM,CAAC;QAClB,UAAU,EAAE,MAAM,CAAC;QACnB,wBAAwB,EAAE,wBAAwB,CAAC;KACpD,GAAG,OAAO,CAAC;QACV,YAAY,EAAE,cAAc,GAAG,UAAU,GAAG,SAAS,CAAC;QACtD,eAAe,EAAE,cAAc,EAAE,CAAC;KACnC,CAAC;IAkEI,qBAAqB,CAAC,EAAE,cAAc,EAAE,EAAE;QAAE,cAAc,CAAC,EAAE,MAAM,CAAA;KAAE;~~IAarE~~,kBAAkB,CAAC,EAAE,cAAc,EAAE,EAAE;QAAE,cAAc,CAAC,EAAE,MAAM,CAAA;KAAE;IAKlE,SAAS,CAAC,EAAE,cAAc,EAAE,EAAE;QAAE,cAAc,CAAC,EAAE,MAAM,CAAA;KAAE;~~IA6DzD~~,UAAU;~~CA0BjB~~"}
1	+ {"version":3,"file":"client.d.ts","sourceRoot":"","sources":["../../packages/src/client.ts"],"names":[],"mappings":"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"}

package/src/types.d.ts CHANGED Viewed

@@ -9,6 +9,7 @@ export interface WalletProperties {
     accountAddress: string;
     clientKeyShares: ClientKeyShare[];
     thresholdSignatureScheme: ThresholdSignatureScheme;
+    derivationPath?: string;
 }
 export interface DynamicWalletClientProps {
     environmentId: string;
@@ -18,4 +19,21 @@ export interface DynamicWalletClientProps {
     debug?: boolean;
     baseMPCRelayApiUrl?: string;
 }
+export type BackupData = {
+    keyShares: string[];
+    metadata: {
+        version: string;
+        createdAt: string;
+        accountAddress: string;
+        thresholdSignatureScheme: ThresholdSignatureScheme;
+        hasPassword: boolean;
+        encryption?: {
+            algorithm: string;
+            keyDerivation: string;
+            iterations: number;
+            hashAlgorithm: string;
+        };
+        shareCount: number;
+    };
+};
 //# sourceMappingURL=types.d.ts.map

package/src/types.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../packages/src/types.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,wBAAwB,EAAE,MAAM,GAAG,CAAC;AAC7C,OAAO,EAAE,cAAc,EAAE,MAAM,aAAa,CAAC;AAE7C,MAAM,MAAM,gBAAgB,GAAG;IAAE,KAAK,EAAE,OAAO,GAAG,IAAI,CAAA;CAAE,CAAC;AAEzD,MAAM,WAAW,gBAAgB;IAC/B,SAAS,EAAE,MAAM,CAAC;IAClB,QAAQ,EAAE,MAAM,CAAC;IACjB,cAAc,EAAE,MAAM,CAAC;IACvB,eAAe,EAAE,cAAc,EAAE,CAAC;IAClC,wBAAwB,EAAE,wBAAwB,CAAC;~~CACpD~~;AAED,MAAM,WAAW,wBAAwB;IACvC,aAAa,EAAE,MAAM,CAAC;IACtB,SAAS,EAAE,MAAM,CAAC;IAClB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,KAAK,CAAC,EAAE,OAAO,CAAC;IAChB,kBAAkB,CAAC,EAAE,MAAM,CAAC;CAC7B"}
1	+ {"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../packages/src/types.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,wBAAwB,EAAE,MAAM,GAAG,CAAC;AAC7C,OAAO,EAAE,cAAc,EAAE,MAAM,aAAa,CAAC;AAE7C,MAAM,MAAM,gBAAgB,GAAG;IAAE,KAAK,EAAE,OAAO,GAAG,IAAI,CAAA;CAAE,CAAC;AAEzD,MAAM,WAAW,gBAAgB;IAC/B,SAAS,EAAE,MAAM,CAAC;IAClB,QAAQ,EAAE,MAAM,CAAC;IACjB,cAAc,EAAE,MAAM,CAAC;IACvB,eAAe,EAAE,cAAc,EAAE,CAAC;IAClC,wBAAwB,EAAE,wBAAwB,CAAC;IACnD,cAAc,CAAC,EAAE,MAAM,CAAC;CACzB;AAED,MAAM,WAAW,wBAAwB;IACvC,aAAa,EAAE,MAAM,CAAC;IACtB,SAAS,EAAE,MAAM,CAAC;IAClB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,KAAK,CAAC,EAAE,OAAO,CAAC;IAChB,kBAAkB,CAAC,EAAE,MAAM,CAAC;CAC7B;AAED,MAAM,MAAM,UAAU,GAAG;IACvB,SAAS,EAAE,MAAM,EAAE,CAAC;IACpB,QAAQ,EAAE;QACR,OAAO,EAAE,MAAM,CAAC;QAChB,SAAS,EAAE,MAAM,CAAC;QAClB,cAAc,EAAE,MAAM,CAAC;QACvB,wBAAwB,EAAE,wBAAwB,CAAC;QACnD,WAAW,EAAE,OAAO,CAAC;QACrB,UAAU,CAAC,EAAE;YACX,SAAS,EAAE,MAAM,CAAC;YAClB,aAAa,EAAE,MAAM,CAAC;YACtB,UAAU,EAAE,MAAM,CAAC;YACnB,aAAa,EAAE,MAAM,CAAC;SACvB,CAAC;QACF,UAAU,EAAE,MAAM,CAAC;KACpB,CAAC;CACH,CAAC"}

package/src/utils.d.ts CHANGED Viewed

@@ -1,7 +1,12 @@
+import { ThresholdSignatureScheme } from "@dynamic-labs-wallet/core";
 export declare const bytesToBase64: (arr: Uint8Array) => string;
 export declare const stringToBytes: (str: string) => Uint8Array;
 export declare const base64ToBytes: (base64: string) => Uint8Array;
 export declare const ensureBase64Padding: (str: string) => string;
 export declare const isBrowser: () => boolean;
 export declare const isHexString: (str: string) => boolean;
+export declare const getClientKeyShareExportFileName: ({ thresholdSignatureScheme, accountAddress, }: {
+    thresholdSignatureScheme: ThresholdSignatureScheme;
+    accountAddress: string;
+}) => string;
 //# sourceMappingURL=utils.d.ts.map

package/src/utils.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../packages/src/utils.ts"],"names":[],"mappings":"AAAA,eAAO,MAAM,aAAa,QAAS,UAAU,WAE5C,CAAC;AAEF,eAAO,MAAM,aAAa,QAAS,MAAM,eAExC,CAAC;AAEF,eAAO,MAAM,aAAa,WAAY,MAAM,eAE3C,CAAC;AAGF,eAAO,MAAM,mBAAmB,QAAS,MAAM,KAAG,MAEjD,CAAC;AAEF,eAAO,MAAM,SAAS,eAAsC,CAAC;AAE7D,eAAO,MAAM,WAAW,QAAS,MAAM,YAKtC,CAAC"}
1	+ {"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../packages/src/utils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,wBAAwB,EAAE,MAAM,2BAA2B,CAAC;AAGrE,eAAO,MAAM,aAAa,QAAS,UAAU,WAE5C,CAAC;AAEF,eAAO,MAAM,aAAa,QAAS,MAAM,eAExC,CAAC;AAEF,eAAO,MAAM,aAAa,WAAY,MAAM,eAE3C,CAAC;AAGF,eAAO,MAAM,mBAAmB,QAAS,MAAM,KAAG,MAEjD,CAAC;AAEF,eAAO,MAAM,SAAS,eAAsC,CAAC;AAE7D,eAAO,MAAM,WAAW,QAAS,MAAM,YAKtC,CAAC;AAEF,eAAO,MAAM,+BAA+B,kDAGzC;IACD,wBAAwB,EAAE,wBAAwB,CAAC;IACnD,cAAc,EAAE,MAAM,CAAC;CACxB,WAEE,CAAC"}