@dynamic-labs-wallet/browser-wallet-client 0.0.0-beta-192.1 → 0.0.0-beta-272

package/index.cjs.js

@@ -1,60 +1,27 @@
 'use strict';
 
+var core = require('@dynamic-labs-wallet/core');
+var uuid = require('uuid');
 var messageTransport = require('@dynamic-labs/message-transport');
 var logger$1 = require('@dynamic-labs/logger');
-var core = require('@dynamic-labs-wallet/core');
 
-const setupMessageTransportBridge = (messageTransport$1, iframe, iframeOrigin)=>{
-    if (!(iframe == null ? void 0 : iframe.contentWindow)) {
-        throw new Error('Iframe or contentWindow not available');
-    }
-    const logger = new logger$1.Logger('debug');
-    messageTransport$1.on((message)=>{
-        // Forward the message to webview via postMessage
-        if (message.origin === 'host') {
-            var _iframe_contentWindow;
-            iframe == null ? void 0 : (_iframe_contentWindow = iframe.contentWindow) == null ? void 0 : _iframe_contentWindow.postMessage(message, iframeOrigin);
-        }
-    });
-    const handleIncomingMessage = (message)=>{
-        const { data } = message;
-        if (!data) return;
-        if ((data == null ? void 0 : data.origin) !== 'webview') {
-            return;
-        }
-        if (typeof data !== 'object') {
-            return;
-        }
-        try {
-            const message = messageTransport.parseMessageTransportData(data);
-            messageTransport$1.emit(message);
-        } catch (error) {
-            if (!(error instanceof SyntaxError)) {
-                logger.error('Error handling incoming message:', error);
-            }
+function _extends() {
+    _extends = Object.assign || function assign(target) {
+        for(var i = 1; i < arguments.length; i++){
+            var source = arguments[i];
+            for(var key in source)if (Object.prototype.hasOwnProperty.call(source, key)) target[key] = source[key];
         }
+        return target;
     };
-    /**
-   * Handle incoming message from android client
-   */ // eslint-disable-next-line @typescript-eslint/ban-ts-comment
-    // @ts-ignore
-    document.addEventListener('message', handleIncomingMessage);
-    /**
-   * Handle incoming message from iOS client
-   */ window.addEventListener('message', handleIncomingMessage);
-};
+    return _extends.apply(this, arguments);
+}
 
 class iframeMessageHandler {
     async getWallets(request) {
         return this.requestChannel.request('getWallets', request);
     }
-    async getWallet({ chainName, accountAddress, walletOperation, signedSessionId }) {
-        return this.requestChannel.request('getWallet', {
-            chainName,
-            accountAddress,
-            walletOperation,
-            signedSessionId
-        });
+    async getWallet(request) {
+        return this.requestChannel.request('getWallet', request);
     }
     async createWalletAccount(request) {
         return this.requestChannel.request('createWalletAccount', request);
@@ -107,6 +74,9 @@ class iframeMessageHandler {
     async offlineExportPrivateKey(request) {
         return this.requestChannel.request('offlineExportPrivateKey', request);
     }
+    async signTypedData(request) {
+        return this.requestChannel.request('signTypedData', request);
+    }
     async cleanup() {
         return this.requestChannel.request('cleanup');
     }
@@ -117,7 +87,47 @@ class iframeMessageHandler {
 
 const logger = new logger$1.Logger('DynamicWaasWalletClient');
 
-class DynamicWalletClient {
+const setupMessageTransportBridge = (messageTransport$1, iframe, iframeOrigin)=>{
+    if (!(iframe == null ? void 0 : iframe.contentWindow)) {
+        throw new Error('Iframe or contentWindow not available');
+    }
+    const logger = new logger$1.Logger('debug');
+    messageTransport$1.on((message)=>{
+        // Forward the message to webview via postMessage
+        if (message.origin === 'host') {
+            var _iframe_contentWindow;
+            iframe == null ? void 0 : (_iframe_contentWindow = iframe.contentWindow) == null ? void 0 : _iframe_contentWindow.postMessage(message, iframeOrigin);
+        }
+    });
+    const handleIncomingMessage = (message)=>{
+        const { data } = message;
+        if (!data) return;
+        if ((data == null ? void 0 : data.origin) !== 'webview') {
+            return;
+        }
+        if (typeof data !== 'object') {
+            return;
+        }
+        try {
+            const message = messageTransport.parseMessageTransportData(data);
+            messageTransport$1.emit(message);
+        } catch (error) {
+            if (!(error instanceof SyntaxError)) {
+                logger.error('Error handling incoming message:', error);
+            }
+        }
+    };
+    /**
+   * Handle incoming message from android client
+   */ // eslint-disable-next-line @typescript-eslint/ban-ts-comment
+    // @ts-ignore
+    document.addEventListener('message', handleIncomingMessage);
+    /**
+   * Handle incoming message from iOS client
+   */ window.addEventListener('message', handleIncomingMessage);
+};
+
+class IframeManager {
     // Simply load the iframe from localhost
     async initialize() {
         await this.doInitializeIframeCommunication();
@@ -126,10 +136,10 @@ class DynamicWalletClient {
    * this is called on class construction time
    * @returns {Promise<void>} that resolves when the iframe is loaded and the message transport and iframe storage are initialized
    */ initializeIframeCommunication() {
-        if (!DynamicWalletClient.iframeLoadPromise) {
-            DynamicWalletClient.iframeLoadPromise = this.doInitializeIframeCommunication();
-        }
-        return DynamicWalletClient.iframeLoadPromise;
+        var _IframeManager;
+        var _iframeLoadPromise;
+        (_iframeLoadPromise = (_IframeManager = IframeManager).iframeLoadPromise) != null ? _iframeLoadPromise : _IframeManager.iframeLoadPromise = this.doInitializeIframeCommunication();
+        return IframeManager.iframeLoadPromise;
     }
     /**
    * initialize the iframe communication by awaiting the iframe load promise
@@ -145,6 +155,10 @@ class DynamicWalletClient {
     /**
    * initialize the message transport after iframe is successfully loaded
    */ async initializeMessageTransport() {
+        if (this.messageTransport && this.iframeMessageHandler) {
+            this.logger.debug('Skipping initializeMessageTransport: transport and message handler already initialized');
+            return;
+        }
         await this.initializeIframeCommunication();
         const transport = messageTransport.applyDefaultMessageOrigin({
             defaultOrigin: 'host',
@@ -171,61 +185,145 @@ class DynamicWalletClient {
             throw new Error('Failed to establish secure token exchange: ' + error);
         }
     }
+    /**
+   * Reset the shared iframe and iframe load promise, and iframe instance count
+   */ async resetSharedIframe() {
+        IframeManager.sharedIframe = null;
+        IframeManager.iframeInstanceCount = 0;
+        IframeManager.iframeLoadPromise = null;
+        this.iframe = null;
+        this.iframeMessageHandler = null;
+        this.messageTransport = null;
+        // Double the timeout and cap at 60 seconds to give more time for slow networks
+        IframeManager.iframeLoadTimeout = Math.min(IframeManager.iframeLoadTimeout * 2, 60000);
+    }
     async loadIframe() {
         // If the iframe is already loaded, just assign and resolve
-        if (DynamicWalletClient.sharedIframe) {
-            this.iframe = DynamicWalletClient.sharedIframe;
-            DynamicWalletClient.iframeInstanceCount++;
+        if (IframeManager.sharedIframe) {
+            this.assignExistingIframe();
             return Promise.resolve();
         }
         // If a load is in progress, wait for it, then assign
-        if (DynamicWalletClient.iframeLoadPromise) {
-            return DynamicWalletClient.iframeLoadPromise.then(()=>{
-                this.iframe = DynamicWalletClient.sharedIframe;
-                DynamicWalletClient.iframeInstanceCount++;
+        if (IframeManager.iframeLoadPromise) {
+            return IframeManager.iframeLoadPromise.then(()=>{
+                this.assignExistingIframe();
             });
         }
-        DynamicWalletClient.iframeLoadPromise = new Promise((resolve, reject)=>{
-            const iframe = document.createElement('iframe');
-            const iframeTimeoutId = setTimeout(()=>{
-                reject(new Error('Iframe load timeout'));
-            }, 10000);
-            iframe.style.display = 'none';
-            iframe.setAttribute('title', 'Dynamic Wallet Iframe');
-            iframe.setAttribute('sandbox', 'allow-scripts allow-same-origin allow-downloads');
-            iframe.setAttribute('referrerpolicy', 'origin');
-            iframe.style.position = 'fixed';
-            iframe.style.top = '0';
-            iframe.style.left = '0';
-            iframe.style.width = '0';
-            iframe.style.height = '0';
-            iframe.style.border = 'none';
-            iframe.style.pointerEvents = 'none';
-            var _this_instanceId;
-            const params = new URLSearchParams({
-                instanceId: (_this_instanceId = this.instanceId) != null ? _this_instanceId : '',
-                hostOrigin: window.location.origin,
-                environmentId: this.environmentId,
-                baseApiUrl: this.baseApiUrl,
-                baseMPCRelayApiUrl: this.baseMPCRelayApiUrl
-            });
-            iframe.src = `${this.iframeDomain}/waas-v1/${this.environmentId}?${params.toString()}`;
-            this.logger.debug('Creating iframe with src:', iframe.src);
-            document.body.appendChild(iframe);
-            iframe.onload = ()=>{
+        IframeManager.iframeLoadPromise = this.createIframeLoadPromise();
+        return IframeManager.iframeLoadPromise;
+    }
+    assignExistingIframe() {
+        this.iframe = IframeManager.sharedIframe;
+        IframeManager.iframeInstanceCount++;
+    }
+    createIframeLoadPromise() {
+        return new Promise((resolve, reject)=>{
+            const attemptLoad = ()=>{
+                IframeManager.iframeLoadAttempts++;
+                this.logger.info(`Loading iframe for waas wallet client... (attempt ${IframeManager.iframeLoadAttempts}/${IframeManager.maxRetryAttempts + 1})`, this.getIframeContext());
+                const iframe = document.createElement('iframe');
+                let messageListener = null;
+                const context = _extends({}, this.getIframeContext(), {
+                    attempt: IframeManager.iframeLoadAttempts
+                });
+                // Set up timeout that will trigger iframe error, a retry will be triggered on this iframe error
+                const iframeTimeoutId = setTimeout(()=>{
+                    if (iframe.onerror) {
+                        iframe.onerror('Iframe load timeout');
+                    }
+                }, IframeManager.iframeLoadTimeout);
+                messageListener = this.createMessageListener(iframe, iframeTimeoutId, resolve);
+                window.addEventListener('message', messageListener);
+                this.configureIframe(iframe);
+                this.setIframeSource(iframe);
+                this.logger.debug('Creating iframe with src:', iframe.src);
+                document.body.appendChild(iframe);
+                this.setupIframeEventHandlersWithRetry(iframe, messageListener, iframeTimeoutId, reject, attemptLoad, context);
+            };
+            // Start the first attempt
+            attemptLoad();
+        });
+    }
+    setupIframeEventHandlersWithRetry(iframe, messageListener, iframeTimeoutId, reject, attemptLoad, context) {
+        iframe.onload = ()=>{
+            this.logger.debug('Iframe onload fired, waiting for ready message...');
+        };
+        iframe.onerror = (error)=>{
+            if (messageListener) {
+                window.removeEventListener('message', messageListener);
+            }
+            clearTimeout(iframeTimeoutId);
+            // Check if we should retry
+            if (IframeManager.iframeLoadAttempts <= IframeManager.maxRetryAttempts) {
+                const errorMsg = error instanceof Error ? error.message : 'Unknown error occurred.';
+                this.logger.warn(`(loadIframe) Iframe failed to load on attempt ${IframeManager.iframeLoadAttempts}, retrying... context: ${JSON.stringify(context)}, error: ${errorMsg}`);
+                // Clean up current attempt
+                if (iframe.parentNode) {
+                    iframe.parentNode.removeChild(iframe);
+                }
+                // Retry after a short delay
+                setTimeout(()=>{
+                    attemptLoad();
+                }, 1000); // 1 second delay between retries
+            } else {
+                // Max retries reached, give up
+                this.logger.error('Iframe failed to load after all retry attempts: ', error);
+                this.resetSharedIframe();
+                IframeManager.iframeLoadAttempts = 0;
+                reject(new Error(`Failed to load iframe after all retry attempts... context: ${JSON.stringify(context)}`));
+            }
+        };
+    }
+    getIframeContext() {
+        var _this_sdkVersion;
+        return {
+            iframeDomain: this.iframeDomain,
+            environmentId: this.environmentId,
+            sdkVersion: (_this_sdkVersion = this.sdkVersion) != null ? _this_sdkVersion : '',
+            instanceId: this.instanceId,
+            chainName: this.chainName,
+            iframeLoadTimeout: IframeManager.iframeLoadTimeout
+        };
+    }
+    createMessageListener(iframe, iframeTimeoutId, resolve) {
+        const messageListener = (event)=>{
+            if (event.source === iframe.contentWindow && event.data === `iframe-ready-${this.instanceId}`) {
+                window.removeEventListener('message', messageListener);
                 clearTimeout(iframeTimeoutId);
-                DynamicWalletClient.sharedIframe = iframe;
+                IframeManager.sharedIframe = iframe;
                 this.iframe = iframe;
-                DynamicWalletClient.iframeInstanceCount++;
+                IframeManager.iframeInstanceCount++;
+                IframeManager.iframeLoadAttempts = 0; // Reset retry counter on success
                 resolve();
-            };
-            iframe.onerror = (error)=>{
-                clearTimeout(iframeTimeoutId);
-                this.logger.error('Iframe failed to load:', error);
-                reject(new Error('Failed to load iframe'));
-            };
+                this.logger.info('Iframe loaded successfully...', this.getIframeContext());
+            }
+        };
+        return messageListener;
+    }
+    configureIframe(iframe) {
+        iframe.style.display = 'none';
+        iframe.setAttribute('title', 'Dynamic Wallet Iframe');
+        iframe.setAttribute('sandbox', 'allow-scripts allow-same-origin allow-downloads');
+        iframe.setAttribute('referrerpolicy', 'origin');
+        iframe.style.position = 'fixed';
+        iframe.style.top = '0';
+        iframe.style.left = '0';
+        iframe.style.width = '0';
+        iframe.style.height = '0';
+        iframe.style.border = 'none';
+        iframe.style.pointerEvents = 'none';
+    }
+    setIframeSource(iframe) {
+        var _this_instanceId, _this_sdkVersion;
+        const params = new URLSearchParams({
+            instanceId: (_this_instanceId = this.instanceId) != null ? _this_instanceId : '',
+            hostOrigin: window.location.origin,
+            environmentId: this.environmentId,
+            baseApiUrl: this.baseApiUrl,
+            baseMPCRelayApiUrl: this.baseMPCRelayApiUrl,
+            sdkVersion: (_this_sdkVersion = this.sdkVersion) != null ? _this_sdkVersion : ''
         });
-        return DynamicWalletClient.iframeLoadPromise;
+        iframe.src = `${this.iframeDomain}/waas-v1/${this.environmentId}?${params.toString()}`;
     }
     /**
    * Load an iframe for a specific container
@@ -233,39 +331,78 @@ class DynamicWalletClient {
    * @returns {Promise<HTMLIFrameElement>} that resolves when the iframe is loaded
    */ loadIframeForContainer(container) {
         return new Promise((resolve, reject)=>{
+            var _this_sdkVersion;
+            const context = {
+                iframeDomain: this.iframeDomain,
+                environmentId: this.environmentId,
+                sdkVersion: (_this_sdkVersion = this.sdkVersion) != null ? _this_sdkVersion : '',
+                instanceId: this.instanceId,
+                chainName: this.chainName,
+                iframeLoadTimeout: IframeManager.iframeLoadTimeout
+            };
+            this.logger.info(`Loading iframe for container...`, context);
             const iframe = document.createElement('iframe');
+            let messageListener = null;
             const iframeTimeoutId = setTimeout(()=>{
-                reject(new Error('Iframe load timeout'));
-            }, 10000);
+                if (messageListener) {
+                    window.removeEventListener('message', messageListener);
+                }
+                this.logger.error(`(loadIframeForContainer) Iframe load timeout due to no handshake message from iframe, this could be network issues, incorrect iframe domain, or CORS errors that prevents iframe from being loaded or sending handshake message, context: ${JSON.stringify(context)}`);
+                reject(new Error(`(loadIframeForContainer) Iframe load timeout due to no handshake message from iframe, this could be network issues, incorrect iframe domain, or CORS errors that prevents iframe from being loaded or sending handshake message, context: ${JSON.stringify(context)}`));
+            }, IframeManager.iframeLoadTimeout);
             iframe.style.display = 'block';
             iframe.style.width = '100%';
             iframe.style.height = '100%';
             iframe.setAttribute('title', 'Dynamic Wallet Storage');
             iframe.setAttribute('sandbox', 'allow-scripts allow-same-origin');
             iframe.setAttribute('referrerpolicy', 'origin');
-            var _this_instanceId;
+            var _this_instanceId, _this_sdkVersion1;
             const params = new URLSearchParams({
                 instanceId: (_this_instanceId = this.instanceId) != null ? _this_instanceId : '',
                 hostOrigin: window.location.origin,
                 environmentId: this.environmentId,
                 baseApiUrl: this.baseApiUrl,
                 baseMPCRelayApiUrl: this.baseMPCRelayApiUrl,
-                chain: this.chainName
+                sdkVersion: (_this_sdkVersion1 = this.sdkVersion) != null ? _this_sdkVersion1 : ''
             });
             iframe.src = `${this.iframeDomain}/waas-v1/${this.environmentId}?${params.toString()}`;
             this.logger.debug('Creating iframe with src:', iframe.src);
             // Add iframe to the provided container
             container.appendChild(iframe);
             iframe.onload = ()=>{
-                clearTimeout(iframeTimeoutId);
-                this.logger.debug('Iframe loaded successfully');
-                resolve(iframe);
+                // The message listener is already set up, so iframe can send ready message
+                this.logger.debug('Iframe onload fired, waiting for ready message...');
             };
             iframe.onerror = (error)=>{
+                if (messageListener) {
+                    window.removeEventListener('message', messageListener);
+                }
                 clearTimeout(iframeTimeoutId);
-                this.logger.error('Iframe failed to load:', error);
-                reject(new Error('Failed to load iframe'));
+                this.logger.error('Iframe failed to load due to errors: ', error);
+                reject(new Error('Failed to load iframe due to unknown load errors, this is likely a browser or network issue.'));
             };
+            // Set up message listener BEFORE creating iframe
+            messageListener = (event)=>{
+                if (event.source === iframe.contentWindow && event.data === `iframe-ready-${this.instanceId}`) {
+                    if (messageListener) {
+                        window.removeEventListener('message', messageListener);
+                    }
+                    clearTimeout(iframeTimeoutId);
+                    IframeManager.sharedIframe = iframe;
+                    this.iframe = iframe;
+                    IframeManager.iframeInstanceCount++;
+                    resolve(iframe);
+                    var _this_sdkVersion;
+                    this.logger.info('Iframe loaded successfully...', {
+                        iframeDomain: this.iframeDomain,
+                        environmentId: this.environmentId,
+                        sdkVersion: (_this_sdkVersion = this.sdkVersion) != null ? _this_sdkVersion : '',
+                        instanceId: this.instanceId,
+                        chainName: this.chainName
+                    });
+                }
+            };
+            window.addEventListener('message', messageListener);
         });
     }
     /**
@@ -299,6 +436,51 @@ class DynamicWalletClient {
             throw error;
         }
     }
+    async cleanup() {
+        await this.initializeMessageTransport();
+        if (!this.iframeMessageHandler) {
+            throw new Error('Iframe message handler not initialized');
+        }
+        await this.iframeMessageHandler.cleanup();
+        if (this.iframe) {
+            IframeManager.iframeInstanceCount--;
+            if (IframeManager.sharedIframe && IframeManager.iframeInstanceCount === 0) {
+                document.body.removeChild(IframeManager.sharedIframe);
+                IframeManager.sharedIframe = null;
+                IframeManager.iframeLoadPromise = null;
+            }
+            this.iframe = null;
+        }
+    }
+    constructor({ environmentId, authToken, baseApiUrl, baseMPCRelayApiUrl, chainName, sdkVersion, debug }){
+        this.logger = logger;
+        this.instanceId = null;
+        this.iframeDomain = null;
+        this.messageTransport = null;
+        this.iframeMessageHandler = null;
+        this.iframe = null;
+        this.environmentId = environmentId;
+        this.authToken = authToken;
+        this.baseApiUrl = baseApiUrl;
+        this.baseMPCRelayApiUrl = baseMPCRelayApiUrl;
+        this.chainName = chainName;
+        this.sdkVersion = sdkVersion;
+        const environment = core.getEnvironmentFromUrl(baseApiUrl);
+        this.iframeDomain = core.IFRAME_DOMAIN_MAP[environment];
+        // Generate unique instanceId when client is created
+        this.instanceId = uuid.v4();
+        this.debug = Boolean(debug);
+        this.logger.setLogLevel(this.debug ? 'DEBUG' : 'INFO');
+    }
+}
+IframeManager.iframeLoadPromise = null;
+IframeManager.iframeLoadTimeout = 10000;
+IframeManager.iframeLoadAttempts = 0;
+IframeManager.maxRetryAttempts = 1;
+IframeManager.sharedIframe = null;
+IframeManager.iframeInstanceCount = 0;
+
+class DynamicWalletClient extends IframeManager {
     async getWallets() {
         await this.initializeMessageTransport();
         if (!this.iframeMessageHandler) {
@@ -308,7 +490,7 @@ class DynamicWalletClient {
             chainName: this.chainName
         });
     }
-    async getWallet({ accountAddress, walletOperation = core.WalletOperation.NO_OPERATION, signedSessionId }) {
+    async getWallet({ accountAddress, walletOperation = core.WalletOperation.NO_OPERATION, signedSessionId, authToken }) {
         await this.initializeMessageTransport();
         if (!this.iframeMessageHandler) {
             throw new Error('Iframe message handler not initialized');
@@ -317,10 +499,11 @@ class DynamicWalletClient {
             chainName: this.chainName,
             accountAddress,
             walletOperation,
-            signedSessionId
+            signedSessionId,
+            authToken
         });
     }
-    async createWalletAccount({ thresholdSignatureScheme, password = undefined, signedSessionId }) {
+    async createWalletAccount({ thresholdSignatureScheme, password = undefined, signedSessionId, authToken }) {
         await this.initializeMessageTransport();
         if (!this.iframeMessageHandler) {
             throw new Error('Iframe message handler not initialized');
@@ -329,10 +512,11 @@ class DynamicWalletClient {
             chainName: this.chainName,
             thresholdSignatureScheme,
             password,
-            signedSessionId
+            signedSessionId,
+            authToken
         });
     }
-    async requiresPasswordForOperation({ accountAddress, walletOperation = core.WalletOperation.REACH_THRESHOLD }) {
+    async requiresPasswordForOperation({ accountAddress, walletOperation = core.WalletOperation.REACH_THRESHOLD, authToken }) {
         await this.initializeMessageTransport();
         if (!this.iframeMessageHandler) {
             throw new Error('Iframe message handler not initialized');
@@ -340,20 +524,22 @@ class DynamicWalletClient {
         return this.iframeMessageHandler.requiresPasswordForOperation({
             chainName: this.chainName,
             accountAddress,
-            walletOperation
+            walletOperation,
+            authToken
         });
     }
-    async isPasswordEncrypted({ accountAddress }) {
+    async isPasswordEncrypted({ accountAddress, authToken }) {
         await this.initializeMessageTransport();
         if (!this.iframeMessageHandler) {
             throw new Error('Iframe message handler not initialized');
         }
         return this.iframeMessageHandler.isPasswordEncrypted({
             chainName: this.chainName,
-            accountAddress
+            accountAddress,
+            authToken
         });
     }
-    async signMessage({ message, accountAddress, password = undefined, signedSessionId }) {
+    async signMessage({ message, accountAddress, password = undefined, signedSessionId, authToken }) {
         await this.initializeMessageTransport();
         if (!this.iframeMessageHandler) {
             throw new Error('Iframe message handler not initialized');
@@ -363,10 +549,11 @@ class DynamicWalletClient {
             message,
             accountAddress,
             password,
-            signedSessionId
+            signedSessionId,
+            authToken
         });
     }
-    async signRawMessage({ message, accountAddress, password = undefined, signedSessionId }) {
+    async signRawMessage({ message, accountAddress, password = undefined, signedSessionId, authToken }) {
         await this.initializeMessageTransport();
         if (!this.iframeMessageHandler) {
             throw new Error('Iframe message handler not initialized');
@@ -376,7 +563,8 @@ class DynamicWalletClient {
             message,
             accountAddress,
             password,
-            signedSessionId
+            signedSessionId,
+            authToken
         });
     }
     /**
@@ -389,7 +577,7 @@ class DynamicWalletClient {
    * SUI:
    *  const txBytes = await txb.build({ client });
    *  const txString = Buffer.from(txBytes).toString("hex");
-   */ async signTransaction({ senderAddress, transaction, password = undefined, signedSessionId }) {
+   */ async signTransaction({ senderAddress, transaction, password = undefined, signedSessionId, authToken }) {
         await this.initializeMessageTransport();
         if (!this.iframeMessageHandler) {
             throw new Error('Iframe message handler not initialized');
@@ -399,10 +587,25 @@ class DynamicWalletClient {
             senderAddress,
             transaction,
             password,
-            signedSessionId
+            signedSessionId,
+            authToken
+        });
+    }
+    async signTypedData({ accountAddress, typedData, password = undefined, signedSessionId, authToken }) {
+        await this.initializeMessageTransport();
+        if (!this.iframeMessageHandler) {
+            throw new Error('Iframe message handler not initialized');
+        }
+        return this.iframeMessageHandler.signTypedData({
+            chainName: this.chainName,
+            accountAddress,
+            typedData: JSON.stringify(typedData),
+            password,
+            signedSessionId,
+            authToken
         });
     }
-    async backupKeySharesToGoogleDrive({ accountAddress, password = undefined, signedSessionId }) {
+    async backupKeySharesToGoogleDrive({ accountAddress, password = undefined, signedSessionId, authToken }) {
         await this.initializeMessageTransport();
         if (!this.iframeMessageHandler) {
             throw new Error('Iframe message handler not initialized');
@@ -411,10 +614,11 @@ class DynamicWalletClient {
             chainName: this.chainName,
             accountAddress,
             password,
-            signedSessionId
+            signedSessionId,
+            authToken
         });
     }
-    async restoreBackupFromGoogleDrive({ accountAddress, displayContainer, password, signedSessionId }) {
+    async restoreBackupFromGoogleDrive({ accountAddress, displayContainer, password, signedSessionId, authToken }) {
         const { iframeDisplay } = await this.initializeIframeDisplayForContainer({
             container: displayContainer
         });
@@ -425,10 +629,11 @@ class DynamicWalletClient {
             chainName: this.chainName,
             accountAddress,
             password,
-            signedSessionId
+            signedSessionId,
+            authToken
         });
     }
-    async refreshWalletAccountShares({ accountAddress, password, signedSessionId }) {
+    async refreshWalletAccountShares({ accountAddress, password, signedSessionId, authToken }) {
         await this.initializeMessageTransport();
         if (!this.iframeMessageHandler) {
             throw new Error('Iframe message handler not initialized');
@@ -437,10 +642,11 @@ class DynamicWalletClient {
             chainName: this.chainName,
             accountAddress: accountAddress,
             password: password,
-            signedSessionId
+            signedSessionId,
+            authToken
         });
     }
-    async reshare({ accountAddress, oldThresholdSignatureScheme, newThresholdSignatureScheme, password, signedSessionId }) {
+    async reshare({ accountAddress, oldThresholdSignatureScheme, newThresholdSignatureScheme, password, signedSessionId, authToken }) {
         await this.initializeMessageTransport();
         if (!this.iframeMessageHandler) {
             throw new Error('Iframe message handler not initialized');
@@ -451,10 +657,11 @@ class DynamicWalletClient {
             oldThresholdSignatureScheme,
             newThresholdSignatureScheme,
             password,
-            signedSessionId
+            signedSessionId,
+            authToken
         });
     }
-    async exportPrivateKey({ accountAddress, displayContainer, password, signedSessionId }) {
+    async exportPrivateKey({ accountAddress, displayContainer, password, signedSessionId, authToken }) {
         const { iframeDisplay } = await this.initializeIframeDisplayForContainer({
             container: displayContainer
         });
@@ -465,10 +672,11 @@ class DynamicWalletClient {
             chainName: this.chainName,
             accountAddress,
             password,
-            signedSessionId
+            signedSessionId,
+            authToken
         });
     }
-    async verifyPassword({ accountAddress, password, walletOperation = core.WalletOperation.NO_OPERATION, signedSessionId }) {
+    async verifyPassword({ accountAddress, password, walletOperation = core.WalletOperation.NO_OPERATION, signedSessionId, authToken }) {
         await this.initializeMessageTransport();
         if (!this.iframeMessageHandler) {
             throw new Error('Iframe message handler not initialized');
@@ -478,10 +686,11 @@ class DynamicWalletClient {
             accountAddress,
             password,
             walletOperation,
-            signedSessionId
+            signedSessionId,
+            authToken
         });
     }
-    async updatePassword({ accountAddress, existingPassword, newPassword, signedSessionId }) {
+    async updatePassword({ accountAddress, existingPassword, newPassword, signedSessionId, authToken }) {
         await this.initializeMessageTransport();
         if (!this.iframeMessageHandler) {
             throw new Error('Iframe message handler not initialized');
@@ -491,10 +700,11 @@ class DynamicWalletClient {
             accountAddress,
             existingPassword,
             newPassword,
-            signedSessionId
+            signedSessionId,
+            authToken
         });
     }
-    async importPrivateKey({ privateKey, thresholdSignatureScheme }) {
+    async importPrivateKey({ privateKey, thresholdSignatureScheme, signedSessionId, authToken }) {
         await this.initializeMessageTransport();
         if (!this.iframeMessageHandler) {
             throw new Error('Iframe message handler not initialized');
@@ -502,10 +712,12 @@ class DynamicWalletClient {
         return this.iframeMessageHandler.importPrivateKey({
             chainName: this.chainName,
             privateKey,
-            thresholdSignatureScheme
+            thresholdSignatureScheme,
+            signedSessionId,
+            authToken
         });
     }
-    async exportClientKeyshares({ accountAddress, password, signedSessionId }) {
+    async exportClientKeyshares({ accountAddress, password, signedSessionId, authToken }) {
         await this.initializeMessageTransport();
         if (!this.iframeMessageHandler) {
             throw new Error('Iframe message handler not initialized');
@@ -514,7 +726,8 @@ class DynamicWalletClient {
             chainName: this.chainName,
             accountAddress,
             password,
-            signedSessionId
+            signedSessionId,
+            authToken
         });
     }
     /**
@@ -537,62 +750,33 @@ class DynamicWalletClient {
             base64Args
         });
     }
-    async cleanup() {
-        await this.initializeMessageTransport();
-        if (!this.iframeMessageHandler) {
-            throw new Error('Iframe message handler not initialized');
-        }
-        await this.iframeMessageHandler.cleanup();
-        if (this.iframe) {
-            DynamicWalletClient.iframeInstanceCount--;
-            if (DynamicWalletClient.sharedIframe && DynamicWalletClient.iframeInstanceCount === 0) {
-                document.body.removeChild(DynamicWalletClient.sharedIframe);
-                DynamicWalletClient.sharedIframe = null;
-                DynamicWalletClient.iframeLoadPromise = null;
-            }
-            this.iframe = null;
-        }
-    }
-    constructor({ environmentId, authToken, baseApiUrl, baseMPCRelayApiUrl, chainName, debug }){
-        this.logger = logger;
-        this.instanceId = null;
-        this.iframeDomain = null;
-        this.messageTransport = null;
-        this.iframeMessageHandler = null;
-        this.iframe = null;
-        this.environmentId = environmentId;
-        this.authToken = authToken;
-        this.baseApiUrl = baseApiUrl;
-        this.baseMPCRelayApiUrl = baseMPCRelayApiUrl;
-        this.chainName = chainName;
-        const environment = core.getEnvironmentFromUrl(baseApiUrl);
-        this.iframeDomain = core.IFRAME_DOMAIN_MAP[environment];
-        // Generate unique instanceId when client is created
-        this.instanceId = crypto.randomUUID();
-        this.debug = Boolean(debug);
-        this.logger.setLogLevel(this.debug ? 'DEBUG' : 'INFO');
-        // initialize the client
-        this.initialize();
+    constructor({ environmentId, authToken, baseApiUrl, baseMPCRelayApiUrl, chainName, sdkVersion, debug }){
+        super({
+            environmentId,
+            authToken,
+            baseApiUrl,
+            baseMPCRelayApiUrl,
+            chainName,
+            sdkVersion,
+            debug
+        });
     }
 }
-DynamicWalletClient.iframeLoadPromise = null;
-DynamicWalletClient.sharedIframe = null;
-DynamicWalletClient.iframeInstanceCount = 0;
 
 Object.defineProperty(exports, "MPC_RELAY_PREPROD_API_URL", {
-  enumerable: true,
-  get: function () { return core.MPC_RELAY_PREPROD_API_URL; }
+    enumerable: true,
+    get: function () { return core.MPC_RELAY_PREPROD_API_URL; }
 });
 Object.defineProperty(exports, "MPC_RELAY_PROD_API_URL", {
-  enumerable: true,
-  get: function () { return core.MPC_RELAY_PROD_API_URL; }
+    enumerable: true,
+    get: function () { return core.MPC_RELAY_PROD_API_URL; }
 });
 Object.defineProperty(exports, "ThresholdSignatureScheme", {
-  enumerable: true,
-  get: function () { return core.ThresholdSignatureScheme; }
+    enumerable: true,
+    get: function () { return core.ThresholdSignatureScheme; }
 });
 Object.defineProperty(exports, "WalletOperation", {
-  enumerable: true,
-  get: function () { return core.WalletOperation; }
+    enumerable: true,
+    get: function () { return core.WalletOperation; }
 });
 exports.DynamicWalletClient = DynamicWalletClient;