@dynamic-labs-wallet/browser 0.0.66 → 0.0.68

package/index.cjs.js

@@ -2,6 +2,7 @@
 
 var core = require('@dynamic-labs-wallet/core');
 var web = require('./internal/web');
+var sdkApiCore = require('@dynamic-labs/sdk-api-core');
 var logger$1 = require('@dynamic-labs/logger');
 var messageTransport = require('@dynamic-labs/message-transport');
 
@@ -130,7 +131,9 @@ const timeoutPromise = ({ timeInMs, activity = 'Ceremony' })=>{
                 }));
                 throw error;
             }
-            await new Promise((resolve)=>setTimeout(resolve, retryInterval));
+            // Calculate exponential backoff delay
+            const exponentialDelay = retryInterval * 2 ** (attempts - 1);
+            await new Promise((resolve)=>setTimeout(resolve, exponentialDelay));
         }
     }
     // TypeScript needs this even though it's unreachable
@@ -166,6 +169,30 @@ const formatMessage = (chainName, message)=>{
             throw new Error('Unsupported chain name');
     }
 };
+const getGoogleOAuthAccountId = (verifiedCredentials)=>{
+    const googleVerifiedCredential = verifiedCredentials == null ? void 0 : verifiedCredentials.find((credential)=>credential.oauthProvider === sdkApiCore.ProviderEnum.Google);
+    return googleVerifiedCredential == null ? void 0 : googleVerifiedCredential.id;
+};
+const createBackupData = ({ encryptedKeyShares, accountAddress, thresholdSignatureScheme, hasPassword = true })=>{
+    return {
+        keyShares: encryptedKeyShares,
+        metadata: {
+            version: '1.0',
+            createdAt: new Date().toISOString(),
+            accountAddress,
+            thresholdSignatureScheme,
+            hasPassword,
+            encryption: {
+                algorithm: AES_GCM_ALGORITHM,
+                keyDerivation: PBKDF2_ALGORITHM,
+                iterations: PBKDF2_ITERATIONS,
+                hashAlgorithm: PBKDF2_HASH_ALGORITHM,
+                algorithmLength: AES_GCM_LENGTH
+            },
+            shareCount: encryptedKeyShares.length
+        }
+    };
+};
 
 const PBKDF2_ALGORITHM = 'PBKDF2';
 const PBKDF2_ITERATIONS = 100000;
@@ -293,9 +320,9 @@ const uploadFileToGoogleDrive = async ({ accessToken, fileName, jsonData, parent
     const result = await response.json();
     return result; // Return file metadata, including file ID
 };
-const listFilesFromGoogleDrive = async ({ accessToken, name })=>{
+const listFilesFromGoogleDrive = async ({ accessToken, fileName })=>{
     // Step 1: List all files inside `appDataFolder` with the specified backup filename
-    const resp = await fetch(`${GOOGLE_DRIVE_UPLOAD_API}/drive/v3/files?q=${encodeURIComponent(`name='${name}'`)}&spaces=appDataFolder&orderBy=createdTime desc`, {
+    const resp = await fetch(`${GOOGLE_DRIVE_UPLOAD_API}/drive/v3/files?q=${encodeURIComponent(`name='${fileName}'`)}&spaces=appDataFolder&orderBy=createdTime desc`, {
         headers: {
             Authorization: `Bearer ${accessToken}`
         }
@@ -308,10 +335,10 @@ const listFilesFromGoogleDrive = async ({ accessToken, name })=>{
     const files = data.files;
     return files;
 };
-const downloadFileFromGoogleDrive = async ({ accessToken, name })=>{
+const downloadFileFromGoogleDrive = async ({ accessToken, fileName })=>{
     const files = await listFilesFromGoogleDrive({
         accessToken,
-        name
+        fileName
     });
     if (!files || files.length === 0) {
         return null;
@@ -489,6 +516,56 @@ class IframeDisplayChannelAdapter {
     }
 }
 
+/**
+ * Updates the wallet map with backup information after successful backup to Google Drive
+ * @param data - Response data containing key shares information
+ * @param walletMap - The wallet map to update
+ * @param accountAddress - The account address associated with the wallet
+ * @param backupLocation - The location where the backup is stored
+ * @param storage - Storage interface for persisting the updated wallet map
+ * @param storageKey - Key used to store the wallet map
+ * @returns The array of key share IDs that were backed up
+ */ const updateWalletMapWithBackupInfo = async ({ data, walletMap, accountAddress, storage, storageKey })=>{
+    const ids = data.keyShares.map((keyShare)=>keyShare.id);
+    walletMap[accountAddress].clientKeySharesBackupInfo.backups[core.BackupLocation.GOOGLE_DRIVE] = ids;
+    await storage.setItem(storageKey, JSON.stringify(walletMap));
+    return ids;
+};
+/**
+ * Uploads a backup to Google Drive App
+ * @param accessToken - The access token for the Google Drive API
+ * @param fileName - The name of the file to upload
+ * @param backupData - The data to upload
+ * @param accountAddress - The account address associated with the backup
+ */ const uploadBackupToGoogleDrive = async ({ accessToken, fileName, backupData, accountAddress })=>{
+    try {
+        await retryPromise(()=>uploadFileToGoogleDriveAppStorage({
+                accessToken,
+                fileName,
+                jsonData: backupData
+            }));
+    } catch (error) {
+        logger.error('Failed to upload keyshares to Google Drive App Storage', {
+            accountAddress,
+            error
+        });
+        throw new Error(`Failed to backup keyshares to Google Drive App Storage: ${error instanceof Error ? error.message : String(error)}`);
+    }
+    try {
+        await retryPromise(()=>uploadFileToGoogleDrivePersonal({
+                accessToken,
+                fileName,
+                jsonData: backupData
+            }));
+    } catch (error) {
+        logger.error('Failed to upload keyshares to Google Drive Personal', {
+            accountAddress,
+            error
+        });
+        throw new Error(`Failed to backup keyshares to Google Drive Personal: ${error instanceof Error ? error.message : String(error)}`);
+    }
+};
+
 class DynamicWalletClient {
     async initialize() {
         if (this.initializePromise) {
@@ -1206,13 +1283,9 @@ class DynamicWalletClient {
         });
         const hasGoogleDriveBackup = this.walletMap[accountAddress].clientKeySharesBackupInfo.backups[core.BackupLocation.GOOGLE_DRIVE].length > 0;
         if (hasGoogleDriveBackup) {
-            var _user_verifiedCredentials_find;
-            const user = await this.apiClient.getUser();
-            const oauthAccountId = user == null ? void 0 : (_user_verifiedCredentials_find = user.verifiedCredentials.find((credential)=>credential.oauthProvider === 'google')) == null ? void 0 : _user_verifiedCredentials_find.id;
             const googleDriveKeyShareIds = await this.backupKeySharesToGoogleDrive({
                 accountAddress,
-                password,
-                oauthAccountId
+                password
             });
             data.keyShares.push({
                 backupLocation: core.BackupLocation.GOOGLE_DRIVE,
@@ -1269,6 +1342,23 @@ class DynamicWalletClient {
         return deserializedKeyShare;
     }
     /**
+   * Helper function to get Google OAuth Account ID or throw an error if not found.
+   * @param accountAddress - The account address for logging purposes
+   * @returns The Google OAuth Account ID
+   * @throws Error if no Google OAuth account ID is found
+   */ async getGoogleOauthAccountIdOrThrow(accountAddress) {
+        const user = await this.apiClient.getUser();
+        const oauthAccountId = getGoogleOAuthAccountId(user == null ? void 0 : user.verifiedCredentials);
+        if (!oauthAccountId) {
+            this.logger.error('No Google OAuth account ID found', {
+                user,
+                accountAddress
+            });
+            throw new Error('No Google OAuth account ID found');
+        }
+        return oauthAccountId;
+    }
+    /**
    * Helper function to determine keyshare recovery strategy for dynamic shares.
    * For REFRESH operations, retrieves enough shares to meet the client threshold.
    * For all other operations, retrieves just 1 share.
@@ -1331,7 +1421,7 @@ class DynamicWalletClient {
         }
         this.walletMap = JSON.parse(wallets);
     }
-    async backupKeySharesToGoogleDrive({ accountAddress, fileName, oauthAccountId, password }) {
+    async backupKeySharesToGoogleDrive({ accountAddress, password }) {
         await this.getWallet({
             accountAddress,
             walletOperation: core.WalletOperation.REACH_ALL_PARTIES,
@@ -1347,74 +1437,77 @@ class DynamicWalletClient {
                 keyShare,
                 password
             })));
+        const oauthAccountId = await this.getGoogleOauthAccountIdOrThrow(accountAddress);
         const accessToken = await this.apiClient.getAccessToken({
             oauthAccountId
         });
         const thresholdSignatureScheme = this.walletMap[accountAddress].thresholdSignatureScheme;
-        const suggestedFileName = getClientKeyShareExportFileName({
+        const fileName = 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
-        await Promise.all([
-            uploadFileToGoogleDriveAppStorage({
-                accessToken,
-                fileName: fileName != null ? fileName : suggestedFileName,
-                jsonData: backupData
-            }),
-            uploadFileToGoogleDrivePersonal({
-                accessToken,
-                fileName: fileName != null ? fileName : suggestedFileName,
-                jsonData: backupData
-            })
-        ]);
+        const backupData = createBackupData({
+            encryptedKeyShares,
+            accountAddress,
+            thresholdSignatureScheme
+        });
+        await uploadBackupToGoogleDrive({
+            accessToken,
+            fileName,
+            backupData,
+            accountAddress
+        });
         const data = await this.apiClient.markKeySharesAsBackedUpGoogleDrive({
             walletId: this.walletMap[accountAddress].walletId
         });
-        const ids = data.keyShares.map((keyShare)=>keyShare.id);
-        this.walletMap[accountAddress].clientKeySharesBackupInfo.backups[core.BackupLocation.GOOGLE_DRIVE] = ids;
-        await this.storage.setItem(this.storageKey, JSON.stringify(this.walletMap));
-        return ids;
+        await updateWalletMapWithBackupInfo({
+            data,
+            walletMap: this.walletMap,
+            accountAddress,
+            storage: this.storage,
+            storageKey: this.storageKey
+        });
     }
-    async restoreBackupFromGoogleDrive({ accountAddress, oauthAccountId, name, displayContainer, password }) {
+    async restoreBackupFromGoogleDrive({ accountAddress, displayContainer, password }) {
         await this.getWallet({
             accountAddress
         });
+        const oauthAccountId = await this.getGoogleOauthAccountIdOrThrow(accountAddress);
         const accessToken = await this.apiClient.getAccessToken({
             oauthAccountId
         });
         const thresholdSignatureScheme = this.walletMap[accountAddress].thresholdSignatureScheme;
-        const suggestedFileName = getClientKeyShareExportFileName({
+        const fileName = getClientKeyShareExportFileName({
             thresholdSignatureScheme,
             accountAddress
         });
-        const backupData = await downloadFileFromGoogleDrive({
-            accessToken,
-            name: name != null ? name : suggestedFileName
-        });
+        let backupData = null;
+        try {
+            backupData = await retryPromise(()=>downloadFileFromGoogleDrive({
+                    accessToken,
+                    fileName
+                }));
+        } catch (error) {
+            this.logger.error('Failed to download backup from Google Drive', {
+                accountAddress,
+                fileName,
+                error
+            });
+            throw new Error('Failed to restore backup from Google Drive');
+        }
         if (!backupData) {
+            this.logger.error('No backup file found', {
+                accountAddress,
+                fileName
+            });
             throw new Error('No backup file found');
         }
         // Validate the backup data structure
         if (!backupData.keyShares || !backupData.metadata) {
+            this.logger.error('Invalid backup format: missing keyShares or metadata', {
+                accountAddress,
+                fileName
+            });
             throw new Error('Invalid backup format: missing keyShares or metadata');
         }
         const { keyShares } = backupData;
@@ -1786,11 +1879,13 @@ Object.defineProperty(exports, "MessageHash", {
 exports.DynamicWalletClient = DynamicWalletClient;
 exports.base64ToBytes = base64ToBytes;
 exports.bytesToBase64 = bytesToBase64;
+exports.createBackupData = createBackupData;
 exports.ensureBase64Padding = ensureBase64Padding;
 exports.formatEvmMessage = formatEvmMessage;
 exports.formatMessage = formatMessage;
 exports.getClientKeyShareBackupInfo = getClientKeyShareBackupInfo;
 exports.getClientKeyShareExportFileName = getClientKeyShareExportFileName;
+exports.getGoogleOAuthAccountId = getGoogleOAuthAccountId;
 exports.getMPCSignatureScheme = getMPCSignatureScheme;
 exports.getMPCSigner = getMPCSigner;
 exports.isBrowser = isBrowser;

package/index.esm.js

@@ -2,6 +2,7 @@ import { SigningAlgorithm, MPC_RELAY_PROD_API_URL, getMPCChainConfig, BackupLoca
 export * from '@dynamic-labs-wallet/core';
 import { BIP340, Ed25519, Ecdsa, MessageHash, EcdsaKeygenResult, Ed25519KeygenResult, BIP340KeygenResult } from './internal/web';
 export { BIP340, BIP340InitKeygenResult, BIP340KeygenResult, Ecdsa, EcdsaInitKeygenResult, EcdsaKeygenResult, EcdsaPublicKey, EcdsaSignature, Ed25519, Ed25519InitKeygenResult, Ed25519KeygenResult, MessageHash } from './internal/web';
+import { ProviderEnum } from '@dynamic-labs/sdk-api-core';
 import { Logger } from '@dynamic-labs/logger';
 import { createRequestChannel, parseMessageTransportData, applyDefaultMessageOrigin, createMessageTransport } from '@dynamic-labs/message-transport';
 
@@ -130,7 +131,9 @@ const timeoutPromise = ({ timeInMs, activity = 'Ceremony' })=>{
                 }));
                 throw error;
             }
-            await new Promise((resolve)=>setTimeout(resolve, retryInterval));
+            // Calculate exponential backoff delay
+            const exponentialDelay = retryInterval * 2 ** (attempts - 1);
+            await new Promise((resolve)=>setTimeout(resolve, exponentialDelay));
         }
     }
     // TypeScript needs this even though it's unreachable
@@ -166,6 +169,30 @@ const formatMessage = (chainName, message)=>{
             throw new Error('Unsupported chain name');
     }
 };
+const getGoogleOAuthAccountId = (verifiedCredentials)=>{
+    const googleVerifiedCredential = verifiedCredentials == null ? void 0 : verifiedCredentials.find((credential)=>credential.oauthProvider === ProviderEnum.Google);
+    return googleVerifiedCredential == null ? void 0 : googleVerifiedCredential.id;
+};
+const createBackupData = ({ encryptedKeyShares, accountAddress, thresholdSignatureScheme, hasPassword = true })=>{
+    return {
+        keyShares: encryptedKeyShares,
+        metadata: {
+            version: '1.0',
+            createdAt: new Date().toISOString(),
+            accountAddress,
+            thresholdSignatureScheme,
+            hasPassword,
+            encryption: {
+                algorithm: AES_GCM_ALGORITHM,
+                keyDerivation: PBKDF2_ALGORITHM,
+                iterations: PBKDF2_ITERATIONS,
+                hashAlgorithm: PBKDF2_HASH_ALGORITHM,
+                algorithmLength: AES_GCM_LENGTH
+            },
+            shareCount: encryptedKeyShares.length
+        }
+    };
+};
 
 const PBKDF2_ALGORITHM = 'PBKDF2';
 const PBKDF2_ITERATIONS = 100000;
@@ -293,9 +320,9 @@ const uploadFileToGoogleDrive = async ({ accessToken, fileName, jsonData, parent
     const result = await response.json();
     return result; // Return file metadata, including file ID
 };
-const listFilesFromGoogleDrive = async ({ accessToken, name })=>{
+const listFilesFromGoogleDrive = async ({ accessToken, fileName })=>{
     // Step 1: List all files inside `appDataFolder` with the specified backup filename
-    const resp = await fetch(`${GOOGLE_DRIVE_UPLOAD_API}/drive/v3/files?q=${encodeURIComponent(`name='${name}'`)}&spaces=appDataFolder&orderBy=createdTime desc`, {
+    const resp = await fetch(`${GOOGLE_DRIVE_UPLOAD_API}/drive/v3/files?q=${encodeURIComponent(`name='${fileName}'`)}&spaces=appDataFolder&orderBy=createdTime desc`, {
         headers: {
             Authorization: `Bearer ${accessToken}`
         }
@@ -308,10 +335,10 @@ const listFilesFromGoogleDrive = async ({ accessToken, name })=>{
     const files = data.files;
     return files;
 };
-const downloadFileFromGoogleDrive = async ({ accessToken, name })=>{
+const downloadFileFromGoogleDrive = async ({ accessToken, fileName })=>{
     const files = await listFilesFromGoogleDrive({
         accessToken,
-        name
+        fileName
     });
     if (!files || files.length === 0) {
         return null;
@@ -489,6 +516,56 @@ class IframeDisplayChannelAdapter {
     }
 }
 
+/**
+ * Updates the wallet map with backup information after successful backup to Google Drive
+ * @param data - Response data containing key shares information
+ * @param walletMap - The wallet map to update
+ * @param accountAddress - The account address associated with the wallet
+ * @param backupLocation - The location where the backup is stored
+ * @param storage - Storage interface for persisting the updated wallet map
+ * @param storageKey - Key used to store the wallet map
+ * @returns The array of key share IDs that were backed up
+ */ const updateWalletMapWithBackupInfo = async ({ data, walletMap, accountAddress, storage, storageKey })=>{
+    const ids = data.keyShares.map((keyShare)=>keyShare.id);
+    walletMap[accountAddress].clientKeySharesBackupInfo.backups[BackupLocation.GOOGLE_DRIVE] = ids;
+    await storage.setItem(storageKey, JSON.stringify(walletMap));
+    return ids;
+};
+/**
+ * Uploads a backup to Google Drive App
+ * @param accessToken - The access token for the Google Drive API
+ * @param fileName - The name of the file to upload
+ * @param backupData - The data to upload
+ * @param accountAddress - The account address associated with the backup
+ */ const uploadBackupToGoogleDrive = async ({ accessToken, fileName, backupData, accountAddress })=>{
+    try {
+        await retryPromise(()=>uploadFileToGoogleDriveAppStorage({
+                accessToken,
+                fileName,
+                jsonData: backupData
+            }));
+    } catch (error) {
+        logger.error('Failed to upload keyshares to Google Drive App Storage', {
+            accountAddress,
+            error
+        });
+        throw new Error(`Failed to backup keyshares to Google Drive App Storage: ${error instanceof Error ? error.message : String(error)}`);
+    }
+    try {
+        await retryPromise(()=>uploadFileToGoogleDrivePersonal({
+                accessToken,
+                fileName,
+                jsonData: backupData
+            }));
+    } catch (error) {
+        logger.error('Failed to upload keyshares to Google Drive Personal', {
+            accountAddress,
+            error
+        });
+        throw new Error(`Failed to backup keyshares to Google Drive Personal: ${error instanceof Error ? error.message : String(error)}`);
+    }
+};
+
 class DynamicWalletClient {
     async initialize() {
         if (this.initializePromise) {
@@ -1206,13 +1283,9 @@ class DynamicWalletClient {
         });
         const hasGoogleDriveBackup = this.walletMap[accountAddress].clientKeySharesBackupInfo.backups[BackupLocation.GOOGLE_DRIVE].length > 0;
         if (hasGoogleDriveBackup) {
-            var _user_verifiedCredentials_find;
-            const user = await this.apiClient.getUser();
-            const oauthAccountId = user == null ? void 0 : (_user_verifiedCredentials_find = user.verifiedCredentials.find((credential)=>credential.oauthProvider === 'google')) == null ? void 0 : _user_verifiedCredentials_find.id;
             const googleDriveKeyShareIds = await this.backupKeySharesToGoogleDrive({
                 accountAddress,
-                password,
-                oauthAccountId
+                password
             });
             data.keyShares.push({
                 backupLocation: BackupLocation.GOOGLE_DRIVE,
@@ -1269,6 +1342,23 @@ class DynamicWalletClient {
         return deserializedKeyShare;
     }
     /**
+   * Helper function to get Google OAuth Account ID or throw an error if not found.
+   * @param accountAddress - The account address for logging purposes
+   * @returns The Google OAuth Account ID
+   * @throws Error if no Google OAuth account ID is found
+   */ async getGoogleOauthAccountIdOrThrow(accountAddress) {
+        const user = await this.apiClient.getUser();
+        const oauthAccountId = getGoogleOAuthAccountId(user == null ? void 0 : user.verifiedCredentials);
+        if (!oauthAccountId) {
+            this.logger.error('No Google OAuth account ID found', {
+                user,
+                accountAddress
+            });
+            throw new Error('No Google OAuth account ID found');
+        }
+        return oauthAccountId;
+    }
+    /**
    * Helper function to determine keyshare recovery strategy for dynamic shares.
    * For REFRESH operations, retrieves enough shares to meet the client threshold.
    * For all other operations, retrieves just 1 share.
@@ -1331,7 +1421,7 @@ class DynamicWalletClient {
         }
         this.walletMap = JSON.parse(wallets);
     }
-    async backupKeySharesToGoogleDrive({ accountAddress, fileName, oauthAccountId, password }) {
+    async backupKeySharesToGoogleDrive({ accountAddress, password }) {
         await this.getWallet({
             accountAddress,
             walletOperation: WalletOperation.REACH_ALL_PARTIES,
@@ -1347,74 +1437,77 @@ class DynamicWalletClient {
                 keyShare,
                 password
             })));
+        const oauthAccountId = await this.getGoogleOauthAccountIdOrThrow(accountAddress);
         const accessToken = await this.apiClient.getAccessToken({
             oauthAccountId
         });
         const thresholdSignatureScheme = this.walletMap[accountAddress].thresholdSignatureScheme;
-        const suggestedFileName = getClientKeyShareExportFileName({
+        const fileName = 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
-        await Promise.all([
-            uploadFileToGoogleDriveAppStorage({
-                accessToken,
-                fileName: fileName != null ? fileName : suggestedFileName,
-                jsonData: backupData
-            }),
-            uploadFileToGoogleDrivePersonal({
-                accessToken,
-                fileName: fileName != null ? fileName : suggestedFileName,
-                jsonData: backupData
-            })
-        ]);
+        const backupData = createBackupData({
+            encryptedKeyShares,
+            accountAddress,
+            thresholdSignatureScheme
+        });
+        await uploadBackupToGoogleDrive({
+            accessToken,
+            fileName,
+            backupData,
+            accountAddress
+        });
         const data = await this.apiClient.markKeySharesAsBackedUpGoogleDrive({
             walletId: this.walletMap[accountAddress].walletId
         });
-        const ids = data.keyShares.map((keyShare)=>keyShare.id);
-        this.walletMap[accountAddress].clientKeySharesBackupInfo.backups[BackupLocation.GOOGLE_DRIVE] = ids;
-        await this.storage.setItem(this.storageKey, JSON.stringify(this.walletMap));
-        return ids;
+        await updateWalletMapWithBackupInfo({
+            data,
+            walletMap: this.walletMap,
+            accountAddress,
+            storage: this.storage,
+            storageKey: this.storageKey
+        });
     }
-    async restoreBackupFromGoogleDrive({ accountAddress, oauthAccountId, name, displayContainer, password }) {
+    async restoreBackupFromGoogleDrive({ accountAddress, displayContainer, password }) {
         await this.getWallet({
             accountAddress
         });
+        const oauthAccountId = await this.getGoogleOauthAccountIdOrThrow(accountAddress);
         const accessToken = await this.apiClient.getAccessToken({
             oauthAccountId
         });
         const thresholdSignatureScheme = this.walletMap[accountAddress].thresholdSignatureScheme;
-        const suggestedFileName = getClientKeyShareExportFileName({
+        const fileName = getClientKeyShareExportFileName({
             thresholdSignatureScheme,
             accountAddress
         });
-        const backupData = await downloadFileFromGoogleDrive({
-            accessToken,
-            name: name != null ? name : suggestedFileName
-        });
+        let backupData = null;
+        try {
+            backupData = await retryPromise(()=>downloadFileFromGoogleDrive({
+                    accessToken,
+                    fileName
+                }));
+        } catch (error) {
+            this.logger.error('Failed to download backup from Google Drive', {
+                accountAddress,
+                fileName,
+                error
+            });
+            throw new Error('Failed to restore backup from Google Drive');
+        }
         if (!backupData) {
+            this.logger.error('No backup file found', {
+                accountAddress,
+                fileName
+            });
             throw new Error('No backup file found');
         }
         // Validate the backup data structure
         if (!backupData.keyShares || !backupData.metadata) {
+            this.logger.error('Invalid backup format: missing keyShares or metadata', {
+                accountAddress,
+                fileName
+            });
             throw new Error('Invalid backup format: missing keyShares or metadata');
         }
         const { keyShares } = backupData;
@@ -1735,4 +1828,4 @@ class DynamicWalletClient {
     }
 }
 
-export { DynamicWalletClient, base64ToBytes, bytesToBase64, ensureBase64Padding, formatEvmMessage, formatMessage, getClientKeyShareBackupInfo, getClientKeyShareExportFileName, getMPCSignatureScheme, getMPCSigner, isBrowser, isHexString, mergeUniqueKeyShares, retryPromise, stringToBytes, timeoutPromise };
+export { DynamicWalletClient, base64ToBytes, bytesToBase64, createBackupData, ensureBase64Padding, formatEvmMessage, formatMessage, getClientKeyShareBackupInfo, getClientKeyShareExportFileName, getGoogleOAuthAccountId, getMPCSignatureScheme, getMPCSigner, isBrowser, isHexString, mergeUniqueKeyShares, retryPromise, stringToBytes, timeoutPromise };

package/internal/core/ecdsa.d.ts

@@ -16,7 +16,7 @@ export declare class Ecdsa {
         derivePubkeyFromXpub(Xpub: string, derivationPath?: Uint32Array): Promise<EcdsaPublicKey>;
         exportFullPrivateKey(roomUuid: string, keygenResult: EcdsaKeygenResult | string, toExportID: string): Promise<string | undefined>;
         derivePrivateKeyFromXpriv(xpriv: string, derivationPath?: Uint32Array): Promise<string>;
-        offlineExportFullPrivateKey(keygenResults: (EcdsaKeygenResult[] | string[])): Promise<string>;
+        offlineExportFullPrivateKey(keygenResults: EcdsaKeygenResult[] | string[]): Promise<string>;
         importPrivateKeyRecipient(roomUuid: string, threshold: number, keygenInit: EcdsaInitKeygenResult, keygenIds: string[]): Promise<EcdsaKeygenResult>;
         importPrivateKeyImporter(roomUuid: string, threshold: number, privateKey: string, keygenInit: EcdsaInitKeygenResult, keygenIds: string[]): Promise<EcdsaKeygenResult>;
     protected getHostUrl(path?: string): string;

package/internal/core/ecdsa.js

@@ -1 +1 @@
-Object.defineProperty(exports,"__esModule",{value:!0}),exports.Ecdsa=void 0;let _1=require("./"),common_1=require("./common");class Ecdsa{constructor(e,t){this.NATIVE=e,this.URL=t}async createRoom(e,t){return(0,common_1.sanitizeNumberOfParties)(e),(await this.NATIVE).createRoom(this.URL,e,t)}async initKeygen(){var e=await(await this.NATIVE).initKeygen();return new _1.EcdsaInitKeygenResult(e.pubkey,e.keypair)}async exportID(e){e="string"==typeof e?e:e.secretShare;return(await this.NATIVE).ecdsaGetExportID(e)}async keygen(e,t,r,a,s){if((0,common_1.sanitizeNumberOfParties)(t,r),s.length!==t-1)throw new Error(`keygenIds length must be exactly: ${t-1}, it is: `+s.length);e=await(await this.NATIVE).ecdsaKeygen(e,this.URL,t,r,a.keygenSecret,s),t=new _1.EcdsaPublicKey(e.pubkey),r=e.secret_share;return new _1.EcdsaKeygenResult(t,r)}async sign(e,t,r,a=new Uint32Array){t="string"==typeof t?t:t.secretShare,e=await(await this.NATIVE).ecdsaSign(e,this.URL,t,r.toHex(),Array.from(a));return _1.EcdsaSignature.fromBuffer(e)}async refresh(e,t){t="string"==typeof t?t:t.secretShare,e=await(await this.NATIVE).ecdsaRefresh(e,this.URL,t),t=new _1.EcdsaPublicKey(e.pubkey),e=e.secret_share;return new _1.EcdsaKeygenResult(t,e)}async reshareNewParty(e,t,r,a,s){e=await(await this.NATIVE).ecdsaReshareNewParty(e,this.URL,t,r,a.keygenSecret,s),t=new _1.EcdsaPublicKey(e.pubkey),r=e.secret_share;return new _1.EcdsaKeygenResult(t,r)}async reshareRemainingParty(e,t,r,a){r="string"==typeof r?r:r.secretShare,e=await(await this.NATIVE).ecdsaReshareRemainingParty(e,this.URL,t,r,a),t=new _1.EcdsaPublicKey(e.pubkey),r=e.secret_share;return new _1.EcdsaKeygenResult(t,r)}async derivePubkey(e,t=new Uint32Array){e="string"==typeof e?e:e.secretShare,e=await(await this.NATIVE).ecdsaDerivePubkey(e,Array.from(t));return new _1.EcdsaPublicKey(e)}async getXpub(e){e="string"==typeof e?e:e.secretShare;return(await this.NATIVE).ecdsaGetXpub(e)}async derivePubkeyFromXpub(e,t=new Uint32Array){e=await(await this.NATIVE).ecdsaDerivePubkeyFromXpub(e,Array.from(t));return new _1.EcdsaPublicKey(e)}async exportFullPrivateKey(e,t,r){t="string"==typeof t?t:t.secretShare;return(await this.NATIVE).ecdsaExportFullPrivateKey(e,this.URL,t,r)}async derivePrivateKeyFromXpriv(e,t=new Uint32Array){return(await this.NATIVE).ecdsaDerivePrivateKeyFromXpriv(e,Array.from(t))}async offlineExportFullPrivateKey(e){e=e.map(e=>{if("string"==typeof e)return e;if(e instanceof _1.EcdsaKeygenResult)return e.secretShare;throw"UnknownType"});return(await this.NATIVE).ecdsaOfflineExportFullPrivateKey(e)}async importPrivateKeyRecipient(e,t,r,a){e=await(await this.NATIVE).ecdsaImportPrivateKeyRecipient(e,this.URL,t,r.keygenSecret,a),t=new _1.EcdsaPublicKey(e.pubkey),r=e.secret_share;return new _1.EcdsaKeygenResult(t,r)}async importPrivateKeyImporter(e,t,r,a,s){e=await(await this.NATIVE).ecdsaImportPrivateKeyImporter(e,this.URL,t,r,a.keygenSecret,s),t=new _1.EcdsaPublicKey(e.pubkey),r=e.secret_share;return new _1.EcdsaKeygenResult(t,r)}getHostUrl(e){return e||this.URL}}exports.Ecdsa=Ecdsa;
+Object.defineProperty(exports,"__esModule",{value:!0}),exports.Ecdsa=void 0;let _1=require("./"),common_1=require("./common");class Ecdsa{constructor(e,t){this.NATIVE=e,this.URL=t}async createRoom(e,t){return(0,common_1.sanitizeNumberOfParties)(e),(await this.NATIVE).createRoom(this.URL,e,t)}async initKeygen(){var e=await(await this.NATIVE).initKeygen();return new _1.EcdsaInitKeygenResult(e.pubkey,e.keypair)}async exportID(e){e="string"==typeof e?e:e.secretShare;return(await this.NATIVE).ecdsaGetExportID(e)}async keygen(e,t,r,a,s){if((0,common_1.sanitizeNumberOfParties)(t,r),s.length!==t-1)throw new Error(`keygenIds length must be exactly: ${t-1}, it is: `+s.length);e=await(await this.NATIVE).ecdsaKeygen(e,this.URL,t,r,a.keygenSecret,s),t=new _1.EcdsaPublicKey(e.pubkey),r=e.secret_share;return new _1.EcdsaKeygenResult(t,r)}async sign(e,t,r,a=new Uint32Array){t="string"==typeof t?t:t.secretShare,e=await(await this.NATIVE).ecdsaSign(e,this.URL,t,r.toHex(),Array.from(a));return _1.EcdsaSignature.fromBuffer(e)}async refresh(e,t){t="string"==typeof t?t:t.secretShare,e=await(await this.NATIVE).ecdsaRefresh(e,this.URL,t),t=new _1.EcdsaPublicKey(e.pubkey),e=e.secret_share;return new _1.EcdsaKeygenResult(t,e)}async reshareNewParty(e,t,r,a,s){e=await(await this.NATIVE).ecdsaReshareNewParty(e,this.URL,t,r,a.keygenSecret,s),t=new _1.EcdsaPublicKey(e.pubkey),r=e.secret_share;return new _1.EcdsaKeygenResult(t,r)}async reshareRemainingParty(e,t,r,a){r="string"==typeof r?r:r.secretShare,e=await(await this.NATIVE).ecdsaReshareRemainingParty(e,this.URL,t,r,a),t=new _1.EcdsaPublicKey(e.pubkey),r=e.secret_share;return new _1.EcdsaKeygenResult(t,r)}async derivePubkey(e,t=new Uint32Array){e="string"==typeof e?e:e.secretShare,e=await(await this.NATIVE).ecdsaDerivePubkey(e,Array.from(t));return new _1.EcdsaPublicKey(e)}async getXpub(e){e="string"==typeof e?e:e.secretShare;return(await this.NATIVE).ecdsaGetXpub(e)}async derivePubkeyFromXpub(e,t=new Uint32Array){e=await(await this.NATIVE).ecdsaDerivePubkeyFromXpub(e,Array.from(t));return new _1.EcdsaPublicKey(e)}async exportFullPrivateKey(e,t,r){t="string"==typeof t?t:t.secretShare,e=await(await this.NATIVE).ecdsaExportFullPrivateKey(e,this.URL,t,r);return e||void 0}async derivePrivateKeyFromXpriv(e,t=new Uint32Array){return(await this.NATIVE).ecdsaDerivePrivateKeyFromXpriv(e,Array.from(t))}async offlineExportFullPrivateKey(e){e=e.map(e=>{if("string"==typeof e)return e;if(e instanceof _1.EcdsaKeygenResult)return e.secretShare;throw"UnknownType"});return(await this.NATIVE).ecdsaOfflineExportFullPrivateKey(e)}async importPrivateKeyRecipient(e,t,r,a){e=await(await this.NATIVE).ecdsaImportPrivateKeyRecipient(e,this.URL,t,r.keygenSecret,a),t=new _1.EcdsaPublicKey(e.pubkey),r=e.secret_share;return new _1.EcdsaKeygenResult(t,r)}async importPrivateKeyImporter(e,t,r,a,s){e=await(await this.NATIVE).ecdsaImportPrivateKeyImporter(e,this.URL,t,r,a.keygenSecret,s),t=new _1.EcdsaPublicKey(e.pubkey),r=e.secret_share;return new _1.EcdsaKeygenResult(t,r)}getHostUrl(e){return e||this.URL}}exports.Ecdsa=Ecdsa;

package/internal/core/ed25519.js

@@ -1 +1 @@
-Object.defineProperty(exports,"__esModule",{value:!0}),exports.Ed25519=void 0;let _1=require("./"),utils_1=require("@noble/hashes/utils"),common_1=require("./common");class Ed25519{constructor(e,t){this.NATIVE=e,this.URL=t}async initKeygen(){var e=await(await this.NATIVE).initKeygen();return new _1.Ed25519InitKeygenResult(e.pubkey,e.keypair)}async exportID(e){e="string"==typeof e?e:e.secretShare;return(await this.NATIVE).ed25519GetExportID(e)}async createRoom(e,t){return(0,common_1.sanitizeNumberOfParties)(e),(await this.NATIVE).createRoom(this.URL,e,t)}async keygen(e,t,r,i,s){if((0,common_1.sanitizeNumberOfParties)(t,r),s.length!==t-1)throw new Error(`keygenIds length must be exactly: ${t-1}, it is: `+s.length);e=await(await this.NATIVE).ed25519Keygen(e,this.URL,t,r,i.keygenSecret,s);if(e.pubkey&&e.secret_share)return t=(0,utils_1.hexToBytes)(e.pubkey),r=e.secret_share,new _1.Ed25519KeygenResult(t,r);throw new Error("Keygen failed, no public key or secret share was returned.")}async sign(e,t,r,i=new Uint32Array){"string"!=typeof r&&(r=(0,utils_1.bytesToHex)(r));t="string"==typeof t?t:t.secretShare,e=await(await this.NATIVE).ed25519Sign(e,this.URL,t,r,Array.from(i));return(0,utils_1.hexToBytes)(e)}async refresh(e,t){var t="string"==typeof t?t:t.secretShare,e=await(await this.NATIVE).ed25519Refresh(e,this.URL,t);if(e.pubkey&&e.secret_share)return t=(0,utils_1.hexToBytes)(e.pubkey),e=e.secret_share,new _1.Ed25519KeygenResult(t,e);throw new Error("Keygen failed, no public key or secret share was returned.")}async reshareNewParty(e,t,r,i,s){e=await(await this.NATIVE).ed25519ReshareNewParty(e,this.URL,t,r,i.keygenSecret,s),t=(0,utils_1.hexToBytes)(e.pubkey),r=e.secret_share;return new _1.Ed25519KeygenResult(t,r)}async reshareRemainingParty(e,t,r,i){r="string"==typeof r?r:r.secretShare,e=await(await this.NATIVE).ed25519ReshareRemainingParty(e,this.URL,t,r,i),t=(0,utils_1.hexToBytes)(e.pubkey),r=e.secret_share;return new _1.Ed25519KeygenResult(t,r)}async derivePubkey(e,t=new Uint32Array){e="string"==typeof e?e:e.secretShare,e=await(await this.NATIVE).ed25519DerivePubkey(e,Array.from(t));return(0,utils_1.hexToBytes)(e)}async getSpub(e){e="string"==typeof e?e:e.secretShare;return(await this.NATIVE).ed25519GetSpub(e)}async derivePubkeyFromSpub(e,t){e=await(await this.NATIVE).ed25519DerivePubkeyFromSpub(e,Array.from(t));return(0,utils_1.hexToBytes)(e)}async exportFullPrivateKey(e,t,r){t="string"==typeof t?t:t.secretShare;return(await this.NATIVE).ed25519ExportFullPrivateKey(e,this.URL,t,r)}async derivePrivateKeyFromSpriv(e,t=new Uint32Array){return(await this.NATIVE).ed25519DerivePrivateKeyFromSpriv(e,Array.from(t))}async offlineExportFullPrivateKey(e){e=e.map(e=>{if("string"==typeof e)return e;if(e instanceof _1.Ed25519KeygenResult)return e.secretShare;throw"UnknownType"});return(await this.NATIVE).ed25519OfflineExportFullPrivateKey(e)}async importPrivateKeyRecipient(e,t,r,i){e=await(await this.NATIVE).ed25519ImportPrivateKeyRecipient(e,this.URL,t,r.keygenSecret,i),t=(0,utils_1.hexToBytes)(e.pubkey),r=e.secret_share;return new _1.Ed25519KeygenResult(t,r)}async importPrivateKeyImporter(e,t,r,i,s,a=!1){e=await(await this.NATIVE).ed25519ImportPrivateKeyImporter(e,this.URL,t,r,i.keygenSecret,s,a),t=(0,utils_1.hexToBytes)(e.pubkey),r=e.secret_share;return new _1.Ed25519KeygenResult(t,r)}}exports.Ed25519=Ed25519;
+Object.defineProperty(exports,"__esModule",{value:!0}),exports.Ed25519=void 0;let _1=require("./"),utils_1=require("@noble/hashes/utils"),common_1=require("./common");class Ed25519{constructor(e,t){this.NATIVE=e,this.URL=t}async initKeygen(){var e=await(await this.NATIVE).initKeygen();return new _1.Ed25519InitKeygenResult(e.pubkey,e.keypair)}async exportID(e){e="string"==typeof e?e:e.secretShare;return(await this.NATIVE).ed25519GetExportID(e)}async createRoom(e,t){return(0,common_1.sanitizeNumberOfParties)(e),(await this.NATIVE).createRoom(this.URL,e,t)}async keygen(e,t,r,i,s){if((0,common_1.sanitizeNumberOfParties)(t,r),s.length!==t-1)throw new Error(`keygenIds length must be exactly: ${t-1}, it is: `+s.length);e=await(await this.NATIVE).ed25519Keygen(e,this.URL,t,r,i.keygenSecret,s);if(e.pubkey&&e.secret_share)return t=(0,utils_1.hexToBytes)(e.pubkey),r=e.secret_share,new _1.Ed25519KeygenResult(t,r);throw new Error("Keygen failed, no public key or secret share was returned.")}async sign(e,t,r,i=new Uint32Array){"string"!=typeof r&&(r=(0,utils_1.bytesToHex)(r));t="string"==typeof t?t:t.secretShare,e=await(await this.NATIVE).ed25519Sign(e,this.URL,t,r,Array.from(i));return(0,utils_1.hexToBytes)(e)}async refresh(e,t){var t="string"==typeof t?t:t.secretShare,e=await(await this.NATIVE).ed25519Refresh(e,this.URL,t);if(e.pubkey&&e.secret_share)return t=(0,utils_1.hexToBytes)(e.pubkey),e=e.secret_share,new _1.Ed25519KeygenResult(t,e);throw new Error("Keygen failed, no public key or secret share was returned.")}async reshareNewParty(e,t,r,i,s){e=await(await this.NATIVE).ed25519ReshareNewParty(e,this.URL,t,r,i.keygenSecret,s),t=(0,utils_1.hexToBytes)(e.pubkey),r=e.secret_share;return new _1.Ed25519KeygenResult(t,r)}async reshareRemainingParty(e,t,r,i){r="string"==typeof r?r:r.secretShare,e=await(await this.NATIVE).ed25519ReshareRemainingParty(e,this.URL,t,r,i),t=(0,utils_1.hexToBytes)(e.pubkey),r=e.secret_share;return new _1.Ed25519KeygenResult(t,r)}async derivePubkey(e,t=new Uint32Array){e="string"==typeof e?e:e.secretShare,e=await(await this.NATIVE).ed25519DerivePubkey(e,Array.from(t));return(0,utils_1.hexToBytes)(e)}async getSpub(e){e="string"==typeof e?e:e.secretShare;return(await this.NATIVE).ed25519GetSpub(e)}async derivePubkeyFromSpub(e,t){e=await(await this.NATIVE).ed25519DerivePubkeyFromSpub(e,Array.from(t));return(0,utils_1.hexToBytes)(e)}async exportFullPrivateKey(e,t,r){t="string"==typeof t?t:t.secretShare,e=await(await this.NATIVE).ed25519ExportFullPrivateKey(e,this.URL,t,r);return e||void 0}async derivePrivateKeyFromSpriv(e,t=new Uint32Array){return(await this.NATIVE).ed25519DerivePrivateKeyFromSpriv(e,Array.from(t))}async offlineExportFullPrivateKey(e){e=e.map(e=>{if("string"==typeof e)return e;if(e instanceof _1.Ed25519KeygenResult)return e.secretShare;throw"UnknownType"});return(await this.NATIVE).ed25519OfflineExportFullPrivateKey(e)}async importPrivateKeyRecipient(e,t,r,i){e=await(await this.NATIVE).ed25519ImportPrivateKeyRecipient(e,this.URL,t,r.keygenSecret,i),t=(0,utils_1.hexToBytes)(e.pubkey),r=e.secret_share;return new _1.Ed25519KeygenResult(t,r)}async importPrivateKeyImporter(e,t,r,i,s,a=!1){e=await(await this.NATIVE).ed25519ImportPrivateKeyImporter(e,this.URL,t,r,i.keygenSecret,s,a),t=(0,utils_1.hexToBytes)(e.pubkey),r=e.secret_share;return new _1.Ed25519KeygenResult(t,r)}}exports.Ed25519=Ed25519;