@dynamic-labs/waas-evm 4.25.3 → 4.25.4

package/CHANGELOG.md

@@ -1,4 +1,16 @@
 
+### [4.25.4](https://github.com/dynamic-labs/dynamic-auth/compare/v4.25.3...v4.25.4) (2025-07-25)
+
+
+### Features
+
+* add passkey as a sign in method ([#9210](https://github.com/dynamic-labs/dynamic-auth/issues/9210)) ([90a6938](https://github.com/dynamic-labs/dynamic-auth/commit/90a69389cf89d7092519e58b0052d85c53a19905))
+
+
+### Bug Fixes
+
+* **QNTM-3416:** fix rainbow wallet connection on base network ([#9227](https://github.com/dynamic-labs/dynamic-auth/issues/9227)) ([d6dcdc3](https://github.com/dynamic-labs/dynamic-auth/commit/d6dcdc3ead194d7580bb8387432dfd15555158de))
+
 ### [4.25.3](https://github.com/dynamic-labs/dynamic-auth/compare/v4.25.2...v4.25.3) (2025-07-22)
 
 

package/package.cjs

@@ -3,6 +3,6 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
-var version = "4.25.3";
+var version = "4.25.4";
 
 exports.version = version;

package/package.js

@@ -1,4 +1,4 @@
 'use client'
-var version = "4.25.3";
+var version = "4.25.4";
 
 export { version };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dynamic-labs/waas-evm",
-  "version": "4.25.3",
+  "version": "4.25.4",
   "description": "A React SDK for implementing wallet web3 authentication and authorization to your website.",
   "author": "Dynamic Labs, Inc.",
   "license": "MIT",
@@ -18,15 +18,15 @@
   },
   "homepage": "https://www.dynamic.xyz/",
   "dependencies": {
-    "@dynamic-labs/sdk-api-core": "0.0.724",
+    "@dynamic-labs/sdk-api-core": "0.0.728",
     "viem": "^2.28.4",
-    "@dynamic-labs/assert-package-version": "4.25.3",
-    "@dynamic-labs/ethereum-core": "4.25.3",
-    "@dynamic-labs/logger": "4.25.3",
-    "@dynamic-labs/types": "4.25.3",
-    "@dynamic-labs/utils": "4.25.3",
-    "@dynamic-labs/waas": "4.25.3",
-    "@dynamic-labs/wallet-connector-core": "4.25.3"
+    "@dynamic-labs/assert-package-version": "4.25.4",
+    "@dynamic-labs/ethereum-core": "4.25.4",
+    "@dynamic-labs/logger": "4.25.4",
+    "@dynamic-labs/types": "4.25.4",
+    "@dynamic-labs/utils": "4.25.4",
+    "@dynamic-labs/waas": "4.25.4",
+    "@dynamic-labs/wallet-connector-core": "4.25.4"
   },
   "peerDependencies": {}
 }

package/src/DynamicWaasEVMConnector.cjs

@@ -14,21 +14,6 @@ var waas = require('@dynamic-labs/waas');
 var walletConnectorCore = require('@dynamic-labs/wallet-connector-core');
 
 const logger = new logger$1.Logger('DynamicWaasConnector');
-// This will need to be moved to a base class once we have base classes for waas connectors
-class WaasExportHandler {
-    constructor() {
-        this.iframeStamper = null;
-    }
-    setIframeStamper(iframe) {
-        this.iframeStamper = iframe;
-    }
-    clear() {
-        if (this.iframeStamper) {
-            this.iframeStamper.remove();
-            this.iframeStamper = null;
-        }
-    }
-}
 class DynamicWaasEVMConnector extends waas.withDynamicWaas(ethereumCore.EthereumWalletConnector) {
     constructor(props) {
         super(props);
@@ -36,7 +21,7 @@ class DynamicWaasEVMConnector extends waas.withDynamicWaas(ethereumCore.Ethereum
         this.overrideKey = 'dynamicwaas';
         this.isEmbeddedWallet = true;
         this._selectedChainId = this.getLastUsedChainId();
-        this.__exportHandler = new WaasExportHandler();
+        this.__exportHandler = new waas.WaasExportHandler();
     }
     getLastUsedChainId() {
         var _a;
@@ -162,6 +147,9 @@ class DynamicWaasEVMConnector extends waas.withDynamicWaas(ethereumCore.Ethereum
             var _a, _b, _c;
             const walletClient = yield this.getWaasWalletClient();
             const signedSessionId = yield ((_a = this.getSignedSessionId) === null || _a === void 0 ? void 0 : _a.call(this));
+            if (!signedSessionId) {
+                throw new utils.DynamicError('Signed session ID is required');
+            }
             const targetWallet = yield walletClient.getWallet({
                 accountAddress: expectedAddress,
                 authToken: (_b = this.getAuthToken) === null || _b === void 0 ? void 0 : _b.call(this),
@@ -176,43 +164,58 @@ class DynamicWaasEVMConnector extends waas.withDynamicWaas(ethereumCore.Ethereum
             }
         });
     }
+    getActiveAccountAddress() {
+        return _tslib.__awaiter(this, void 0, void 0, function* () {
+            var _a;
+            return (_a = this.getActiveAccount()) === null || _a === void 0 ? void 0 : _a.address;
+        });
+    }
     getViemAccount(_a) {
         return _tslib.__awaiter(this, arguments, void 0, function* ({ accountAddress, }) {
             var _b;
             const client = yield this.getWaasWalletClient();
             const signedSessionId = yield ((_b = this.getSignedSessionId) === null || _b === void 0 ? void 0 : _b.call(this));
+            if (!signedSessionId) {
+                throw new utils.DynamicError('Signed session ID is required');
+            }
             return accounts.toAccount({
                 address: accountAddress,
                 signAuthorization: (parameters) => _tslib.__awaiter(this, void 0, void 0, function* () { return this.signAuthorization(parameters); }),
-                signMessage: ({ message }) => {
-                    var _a;
+                signMessage: (_c) => _tslib.__awaiter(this, [_c], void 0, function* ({ message, }) {
+                    var _d, _e;
+                    const mfaToken = yield ((_d = this.getMfaToken) === null || _d === void 0 ? void 0 : _d.call(this));
                     return client.signMessage({
                         accountAddress,
-                        authToken: (_a = this.getAuthToken) === null || _a === void 0 ? void 0 : _a.call(this),
+                        authToken: (_e = this.getAuthToken) === null || _e === void 0 ? void 0 : _e.call(this),
                         message: message,
+                        mfaToken,
                         signedSessionId,
                     });
-                },
-                signTransaction: (transaction) => {
-                    var _a;
+                }),
+                signTransaction: (transaction) => _tslib.__awaiter(this, void 0, void 0, function* () {
+                    var _f, _g;
+                    const mfaToken = yield ((_f = this.getMfaToken) === null || _f === void 0 ? void 0 : _f.call(this));
                     return client
                         .signTransaction({
-                        authToken: (_a = this.getAuthToken) === null || _a === void 0 ? void 0 : _a.call(this),
+                        authToken: (_g = this.getAuthToken) === null || _g === void 0 ? void 0 : _g.call(this),
+                        mfaToken,
                         senderAddress: accountAddress,
                         signedSessionId,
                         transaction: viem.serializeTransaction(transaction),
                     })
                         .then((tx) => tx);
-                },
-                signTypedData: (typedData) => {
-                    var _a;
+                }),
+                signTypedData: (typedData) => _tslib.__awaiter(this, void 0, void 0, function* () {
+                    var _h, _j;
+                    const mfaToken = yield ((_h = this.getMfaToken) === null || _h === void 0 ? void 0 : _h.call(this));
                     return client.signTypedData({
                         accountAddress,
-                        authToken: (_a = this.getAuthToken) === null || _a === void 0 ? void 0 : _a.call(this),
+                        authToken: (_j = this.getAuthToken) === null || _j === void 0 ? void 0 : _j.call(this),
+                        mfaToken,
                         signedSessionId,
                         typedData: typedData,
                     });
-                },
+                }),
             });
         });
     }
@@ -243,19 +246,6 @@ class DynamicWaasEVMConnector extends waas.withDynamicWaas(ethereumCore.Ethereum
             walletUiUtils: this.walletUiUtils,
         });
     }
-    createWalletAccount() {
-        return _tslib.__awaiter(this, arguments, void 0, function* ({ thresholdSignatureScheme = 'TWO_OF_TWO', } = {}) {
-            var _a, _b;
-            const walletClient = yield this.getWaasWalletClient();
-            const signedSessionId = yield ((_a = this.getSignedSessionId) === null || _a === void 0 ? void 0 : _a.call(this));
-            const createdWallet = yield walletClient.createWalletAccount({
-                authToken: (_b = this.getAuthToken) === null || _b === void 0 ? void 0 : _b.call(this),
-                signedSessionId,
-                thresholdSignatureScheme: thresholdSignatureScheme,
-            });
-            return createdWallet;
-        });
-    }
     signMessage(message) {
         var _a;
         return (_a = this.getWalletClient()) === null || _a === void 0 ? void 0 : _a.signMessage({ message });
@@ -269,127 +259,66 @@ class DynamicWaasEVMConnector extends waas.withDynamicWaas(ethereumCore.Ethereum
         this.setActiveAccount(accountAddress);
         return this.getWalletClient();
     }
-    exportPrivateKey() {
-        return _tslib.__awaiter(this, arguments, void 0, function* ({ accountAddress, displayContainer, password, } = {}) {
-            var _a, _b;
-            const walletClient = yield this.getWaasWalletClient();
-            const targetAccountAddress = accountAddress || ((_a = this.getActiveAccount()) === null || _a === void 0 ? void 0 : _a.address);
-            if (!targetAccountAddress) {
-                throw new Error('Account address is required');
-            }
-            if (!displayContainer) {
-                throw new Error('Missing display container for export private key');
-            }
-            this.__exportHandler.setIframeStamper(displayContainer);
-            yield walletClient.exportPrivateKey({
-                accountAddress: targetAccountAddress,
-                authToken: (_b = this.getAuthToken) === null || _b === void 0 ? void 0 : _b.call(this),
-                displayContainer,
-                password,
-            });
-        });
-    }
-    getExportHandler() {
-        return this.__exportHandler;
-    }
-    importPrivateKey(_a) {
-        return _tslib.__awaiter(this, arguments, void 0, function* ({ privateKey, thresholdSignatureScheme = 'TWO_OF_TWO', }) {
-            var _b, _c;
-            const walletClient = yield this.getWaasWalletClient();
-            const signedSessionId = yield ((_b = this.getSignedSessionId) === null || _b === void 0 ? void 0 : _b.call(this));
-            if (!signedSessionId) {
-                throw new Error('Signed session ID is required');
-            }
-            yield walletClient.importPrivateKey({
-                authToken: (_c = this.getAuthToken) === null || _c === void 0 ? void 0 : _c.call(this),
-                privateKey,
-                signedSessionId,
-                thresholdSignatureScheme: thresholdSignatureScheme,
-            });
-        });
-    }
+    // Chain-specific override for exportClientKeyshares - EVM needs to set active account first
     exportClientKeyshares(_a) {
+        const _super = Object.create(null, {
+            exportClientKeyshares: { get: () => super.exportClientKeyshares }
+        });
         return _tslib.__awaiter(this, arguments, void 0, function* ({ accountAddress, password, }) {
-            var _b, _c;
             if (!accountAddress) {
                 throw new Error('Account address is required');
             }
-            const signedSessionId = yield ((_b = this.getSignedSessionId) === null || _b === void 0 ? void 0 : _b.call(this));
+            // EVM-specific: set active account before exporting
             this.setActiveAccount(accountAddress);
-            const walletClient = yield this.getWaasWalletClient();
-            yield walletClient.exportClientKeyshares({
-                accountAddress,
-                authToken: (_c = this.getAuthToken) === null || _c === void 0 ? void 0 : _c.call(this),
-                password,
-                signedSessionId,
-            });
+            return _super.exportClientKeyshares.call(this, { accountAddress, password });
         });
     }
+    // Chain-specific override for backupKeySharesToGoogleDrive - EVM needs to set active account first
     backupKeySharesToGoogleDrive(_a) {
+        const _super = Object.create(null, {
+            backupKeySharesToGoogleDrive: { get: () => super.backupKeySharesToGoogleDrive }
+        });
         return _tslib.__awaiter(this, arguments, void 0, function* ({ accountAddress, password, }) {
-            var _b;
             if (!accountAddress) {
                 throw new Error('Account address is required');
             }
+            // EVM-specific: set active account before backing up
             this.setActiveAccount(accountAddress);
-            const walletClient = yield this.getWaasWalletClient();
-            return walletClient.backupKeySharesToGoogleDrive({
-                accountAddress,
-                authToken: (_b = this.getAuthToken) === null || _b === void 0 ? void 0 : _b.call(this),
-                password,
-            });
+            return _super.backupKeySharesToGoogleDrive.call(this, { accountAddress, password });
         });
     }
+    // Chain-specific override for refreshWalletAccountShares - EVM needs to set active account first
     refreshWalletAccountShares(_a) {
+        const _super = Object.create(null, {
+            refreshWalletAccountShares: { get: () => super.refreshWalletAccountShares }
+        });
         return _tslib.__awaiter(this, arguments, void 0, function* ({ accountAddress, password, }) {
-            var _b;
             if (!accountAddress) {
                 throw new Error('Account address is required');
             }
+            // EVM-specific: set active account before refreshing
             this.setActiveAccount(accountAddress);
-            const walletClient = yield this.getWaasWalletClient();
-            return walletClient.refreshWalletAccountShares({
-                accountAddress,
-                authToken: (_b = this.getAuthToken) === null || _b === void 0 ? void 0 : _b.call(this),
-                password,
-            });
+            return _super.refreshWalletAccountShares.call(this, { accountAddress, password });
         });
     }
+    // Chain-specific override for updatePassword - EVM needs to set active account first
     updatePassword(_a) {
+        const _super = Object.create(null, {
+            updatePassword: { get: () => super.updatePassword }
+        });
         return _tslib.__awaiter(this, arguments, void 0, function* ({ accountAddress, existingPassword, newPassword, }) {
-            var _b;
             if (!accountAddress) {
                 throw new Error('Account address is required');
             }
+            // EVM-specific: set active account before updating password
             this.setActiveAccount(accountAddress);
-            const walletClient = yield this.getWaasWalletClient();
-            return walletClient.updatePassword({
+            return _super.updatePassword.call(this, {
                 accountAddress,
-                authToken: (_b = this.getAuthToken) === null || _b === void 0 ? void 0 : _b.call(this),
                 existingPassword,
                 newPassword,
             });
         });
     }
-    signRawMessage(_a) {
-        return _tslib.__awaiter(this, arguments, void 0, function* ({ accountAddress, message, password, }) {
-            var _b;
-            if (!accountAddress) {
-                throw new Error('Account address is required');
-            }
-            if (message.length !== 64) {
-                throw new Error('Message must be 64 characters long');
-            }
-            this.setActiveAccount(accountAddress);
-            const walletClient = yield this.getWaasWalletClient();
-            return walletClient.signRawMessage({
-                accountAddress,
-                authToken: (_b = this.getAuthToken) === null || _b === void 0 ? void 0 : _b.call(this),
-                message,
-                password,
-            });
-        });
-    }
     createUiTransaction(from) {
         return _tslib.__awaiter(this, void 0, void 0, function* () {
             yield this.validateActiveWallet(from);
@@ -459,7 +388,7 @@ class DynamicWaasEVMConnector extends waas.withDynamicWaas(ethereumCore.Ethereum
     }
     signAuthorization(parameters, password) {
         return _tslib.__awaiter(this, void 0, void 0, function* () {
-            var _a, _b;
+            var _a, _b, _c;
             const { address: contractAddress, nonce, chainId } = parameters;
             if (!contractAddress) {
                 throw new Error('Contract address not found');
@@ -474,14 +403,19 @@ class DynamicWaasEVMConnector extends waas.withDynamicWaas(ethereumCore.Ethereum
             const { address } = signer.account;
             const walletClient = yield this.getWaasWalletClient();
             const signedSessionId = yield ((_a = this.getSignedSessionId) === null || _a === void 0 ? void 0 : _a.call(this));
+            if (!signedSessionId) {
+                throw new utils.DynamicError('Signed session ID is required');
+            }
+            const mfaToken = yield ((_b = this.getMfaToken) === null || _b === void 0 ? void 0 : _b.call(this));
             const signature = yield walletClient.signRawMessage({
                 accountAddress: address,
-                authToken: (_b = this.getAuthToken) === null || _b === void 0 ? void 0 : _b.call(this),
+                authToken: (_c = this.getAuthToken) === null || _c === void 0 ? void 0 : _c.call(this),
                 message: utils$1.hashAuthorization({
                     address: contractAddress,
                     chainId,
                     nonce,
                 }).slice(2),
+                mfaToken,
                 password,
                 signedSessionId,
             });
@@ -517,12 +451,11 @@ class DynamicWaasEVMConnector extends waas.withDynamicWaas(ethereumCore.Ethereum
         return true;
     }
     endSession() {
+        const _super = Object.create(null, {
+            endSession: { get: () => super.endSession }
+        });
         return _tslib.__awaiter(this, void 0, void 0, function* () {
-            const waasEvmClient = yield this.getWaasWalletClient();
-            if (!waasEvmClient) {
-                return;
-            }
-            yield waasEvmClient.cleanup();
+            yield _super.endSession.call(this);
         });
     }
 }

package/src/DynamicWaasEVMConnector.d.ts

@@ -3,6 +3,7 @@ import { LocalAccount, SignAuthorizationParameters, SignAuthorizationReturnType
 import { EthereumWalletConnector, EthereumWalletConnectorOpts, SwitchNetworkOps } from '@dynamic-labs/ethereum-core';
 import { JwtVerifiedCredential } from '@dynamic-labs/sdk-api-core';
 import { IUITransaction } from '@dynamic-labs/types';
+import { WaasExportHandler } from '@dynamic-labs/waas';
 import { IDynamicWaasConnector } from '@dynamic-labs/wallet-connector-core';
 interface JwtVerifiedCredentialWithSmartWalletRef extends JwtVerifiedCredential {
     smartWalletRefId?: string;
@@ -15,25 +16,82 @@ declare const DynamicWaasEVMConnector_base: (abstract new (...args: any[]) => {
     overrideKey: string;
     isEmbeddedWallet: boolean;
     getSignedSessionId?: (() => Promise<string>) | undefined;
+    getMfaToken?: (() => Promise<string | undefined>) | undefined;
     getAuthToken?: (() => string) | undefined;
     environmentId?: string | undefined;
     baseApiUrl?: string | undefined;
     relayUrl?: string | undefined;
     dynamicWaasClient: import("@dynamic-labs-wallet/browser-wallet-client").DynamicWalletClient | undefined;
     chainName: string;
+    __exportHandler: WaasExportHandler;
+    validateActiveWallet(expectedAddress: string): Promise<void>;
     setGetAuthTokenFunction(getAuthToken: () => string): void;
+    setGetMfaTokenFunction(getMfaToken: () => Promise<string | undefined>): void;
     setEnvironmentId(environmentId: string): void;
     setBaseApiUrl(baseApiUrl: string): void;
     setRelayUrl(relayUrl: string): void;
     setGetSignedSessionIdFunction(getSignedSessionId: () => Promise<string>): void;
+    delegateKeyShares({ accountAddress, password, }: {
+        accountAddress: string;
+        password?: string | undefined;
+    }): Promise<void>;
     createDynamicWaasClient(): Promise<import("@dynamic-labs-wallet/browser-wallet-client").DynamicWalletClient>;
     getWaasWalletClient(): Promise<import("@dynamic-labs-wallet/browser-wallet-client").DynamicWalletClient>;
+    createWalletAccount({ thresholdSignatureScheme, }?: {
+        thresholdSignatureScheme?: string | undefined;
+    } | undefined): Promise<{
+        chainName: string;
+        accountAddress: string; /**
+         * Relationship between verifiedCredential and verifiedCredentials:
+         * - verifiedCredential: The first/primary credential from the array (used for active account)
+         * - verifiedCredentials: The full array of all credentials
+         * When setVerifiedCredentials is called, it processes the input array and sets both properties
+         * The first credential (verifiedCredential) is specifically filtered to be a "dynamicwaas"
+         */
+        publicKeyHex: string;
+        rawPublicKey: string | Uint8Array | undefined;
+    }>;
+    importPrivateKey({ privateKey, thresholdSignatureScheme, }: {
+        privateKey: string;
+        thresholdSignatureScheme?: string | undefined;
+    }): Promise<void>;
+    exportPrivateKey({ accountAddress, displayContainer, password, }?: {
+        accountAddress?: string | undefined;
+        displayContainer?: HTMLIFrameElement | undefined;
+        password?: string | undefined;
+    } | undefined): Promise<void>;
+    getExportHandler(): {
+        clear: () => void;
+    };
+    exportClientKeyshares({ accountAddress, password, }: {
+        accountAddress: string;
+        password?: string | undefined;
+    }): Promise<void>;
+    backupKeySharesToGoogleDrive({ accountAddress, password, }: {
+        accountAddress: string;
+        password?: string | undefined;
+    }): Promise<void>;
+    refreshWalletAccountShares({ accountAddress, password, }: {
+        accountAddress: string;
+        password?: string | undefined;
+    }): Promise<void>;
+    updatePassword({ accountAddress, existingPassword, newPassword, }: {
+        accountAddress: string;
+        existingPassword: string;
+        newPassword: string;
+    }): Promise<void>;
+    signRawMessage({ accountAddress, message, password, }: {
+        accountAddress: string;
+        message: string;
+        password?: string | undefined;
+    }): Promise<string>;
+    endSession(): Promise<void>;
+    getActiveAccountAddress(): Promise<string | undefined>;
 }) & typeof EthereumWalletConnector;
 export declare class DynamicWaasEVMConnector extends DynamicWaasEVMConnector_base implements IDynamicWaasConnector {
     name: string;
     overrideKey: string;
     isEmbeddedWallet: boolean;
-    private __exportHandler;
     /**
      * Relationship between verifiedCredential and verifiedCredentials:
      * - verifiedCredential: The first/primary credential from the array (used for active account)
@@ -61,35 +119,16 @@ export declare class DynamicWaasEVMConnector extends DynamicWaasEVMConnector_bas
     switchNetwork({ networkChainId, }: SwitchNetworkOps): Promise<void>;
     private getRpcUrl;
     validateActiveWallet(expectedAddress: string): Promise<void>;
+    getActiveAccountAddress(): Promise<string | undefined>;
     getViemAccount({ accountAddress, }: {
         accountAddress: string;
     }): Promise<LocalAccount>;
     getWalletClient(chainId?: string): WalletClient<Transport, ViemChain, Account> | undefined;
-    createWalletAccount({ thresholdSignatureScheme, }?: {
-        thresholdSignatureScheme?: string;
-    }): Promise<{
-        chainName: string;
-        accountAddress: string;
-        publicKeyHex: string;
-        rawPublicKey: string | Uint8Array | undefined;
-    }>;
     signMessage(message: string): Promise<Hex>;
     getSigner(): Promise<any>;
     getWalletClientByAddress({ accountAddress, }: {
         accountAddress: string;
     }): WalletClient<Transport, ViemChain, Account> | undefined;
-    exportPrivateKey({ accountAddress, displayContainer, password, }?: {
-        accountAddress?: string;
-        displayContainer?: HTMLIFrameElement;
-        password?: string;
-    }): Promise<void>;
-    getExportHandler(): {
-        clear: () => void;
-    };
-    importPrivateKey({ privateKey, thresholdSignatureScheme, }: {
-        privateKey: string;
-        thresholdSignatureScheme?: string;
-    }): Promise<void>;
     exportClientKeyshares({ accountAddress, password, }: {
         accountAddress: string;
         password?: string;
@@ -107,11 +146,6 @@ export declare class DynamicWaasEVMConnector extends DynamicWaasEVMConnector_bas
         existingPassword: string;
         newPassword: string;
     }): Promise<void>;
-    signRawMessage({ accountAddress, message, password, }: {
-        accountAddress: string;
-        message: string;
-        password?: string;
-    }): Promise<string>;
     createUiTransaction(from: string): Promise<IUITransaction>;
     getConnectedAccounts(): Promise<string[]>;
     getAddress(): Promise<string>;

package/src/DynamicWaasEVMConnector.js

@@ -6,25 +6,10 @@ import { hashAuthorization } from 'viem/utils';
 import { EthereumWalletConnector, createWalletClientWithUiConfirmation, getOrMapViemChain, ViemUiTransaction } from '@dynamic-labs/ethereum-core';
 import { Logger } from '@dynamic-labs/logger';
 import { DynamicError } from '@dynamic-labs/utils';
-import { withDynamicWaas } from '@dynamic-labs/waas';
+import { withDynamicWaas, WaasExportHandler } from '@dynamic-labs/waas';
 import { isSameAddress } from '@dynamic-labs/wallet-connector-core';
 
 const logger = new Logger('DynamicWaasConnector');
-// This will need to be moved to a base class once we have base classes for waas connectors
-class WaasExportHandler {
-    constructor() {
-        this.iframeStamper = null;
-    }
-    setIframeStamper(iframe) {
-        this.iframeStamper = iframe;
-    }
-    clear() {
-        if (this.iframeStamper) {
-            this.iframeStamper.remove();
-            this.iframeStamper = null;
-        }
-    }
-}
 class DynamicWaasEVMConnector extends withDynamicWaas(EthereumWalletConnector) {
     constructor(props) {
         super(props);
@@ -158,6 +143,9 @@ class DynamicWaasEVMConnector extends withDynamicWaas(EthereumWalletConnector) {
             var _a, _b, _c;
             const walletClient = yield this.getWaasWalletClient();
             const signedSessionId = yield ((_a = this.getSignedSessionId) === null || _a === void 0 ? void 0 : _a.call(this));
+            if (!signedSessionId) {
+                throw new DynamicError('Signed session ID is required');
+            }
             const targetWallet = yield walletClient.getWallet({
                 accountAddress: expectedAddress,
                 authToken: (_b = this.getAuthToken) === null || _b === void 0 ? void 0 : _b.call(this),
@@ -172,43 +160,58 @@ class DynamicWaasEVMConnector extends withDynamicWaas(EthereumWalletConnector) {
             }
         });
     }
+    getActiveAccountAddress() {
+        return __awaiter(this, void 0, void 0, function* () {
+            var _a;
+            return (_a = this.getActiveAccount()) === null || _a === void 0 ? void 0 : _a.address;
+        });
+    }
     getViemAccount(_a) {
         return __awaiter(this, arguments, void 0, function* ({ accountAddress, }) {
             var _b;
             const client = yield this.getWaasWalletClient();
             const signedSessionId = yield ((_b = this.getSignedSessionId) === null || _b === void 0 ? void 0 : _b.call(this));
+            if (!signedSessionId) {
+                throw new DynamicError('Signed session ID is required');
+            }
             return toAccount({
                 address: accountAddress,
                 signAuthorization: (parameters) => __awaiter(this, void 0, void 0, function* () { return this.signAuthorization(parameters); }),
-                signMessage: ({ message }) => {
-                    var _a;
+                signMessage: (_c) => __awaiter(this, [_c], void 0, function* ({ message, }) {
+                    var _d, _e;
+                    const mfaToken = yield ((_d = this.getMfaToken) === null || _d === void 0 ? void 0 : _d.call(this));
                     return client.signMessage({
                         accountAddress,
-                        authToken: (_a = this.getAuthToken) === null || _a === void 0 ? void 0 : _a.call(this),
+                        authToken: (_e = this.getAuthToken) === null || _e === void 0 ? void 0 : _e.call(this),
                         message: message,
+                        mfaToken,
                         signedSessionId,
                     });
-                },
-                signTransaction: (transaction) => {
-                    var _a;
+                }),
+                signTransaction: (transaction) => __awaiter(this, void 0, void 0, function* () {
+                    var _f, _g;
+                    const mfaToken = yield ((_f = this.getMfaToken) === null || _f === void 0 ? void 0 : _f.call(this));
                     return client
                         .signTransaction({
-                        authToken: (_a = this.getAuthToken) === null || _a === void 0 ? void 0 : _a.call(this),
+                        authToken: (_g = this.getAuthToken) === null || _g === void 0 ? void 0 : _g.call(this),
+                        mfaToken,
                         senderAddress: accountAddress,
                         signedSessionId,
                         transaction: serializeTransaction(transaction),
                     })
                         .then((tx) => tx);
-                },
-                signTypedData: (typedData) => {
-                    var _a;
+                }),
+                signTypedData: (typedData) => __awaiter(this, void 0, void 0, function* () {
+                    var _h, _j;
+                    const mfaToken = yield ((_h = this.getMfaToken) === null || _h === void 0 ? void 0 : _h.call(this));
                     return client.signTypedData({
                         accountAddress,
-                        authToken: (_a = this.getAuthToken) === null || _a === void 0 ? void 0 : _a.call(this),
+                        authToken: (_j = this.getAuthToken) === null || _j === void 0 ? void 0 : _j.call(this),
+                        mfaToken,
                         signedSessionId,
                         typedData: typedData,
                     });
-                },
+                }),
             });
         });
     }
@@ -239,19 +242,6 @@ class DynamicWaasEVMConnector extends withDynamicWaas(EthereumWalletConnector) {
             walletUiUtils: this.walletUiUtils,
         });
     }
-    createWalletAccount() {
-        return __awaiter(this, arguments, void 0, function* ({ thresholdSignatureScheme = 'TWO_OF_TWO', } = {}) {
-            var _a, _b;
-            const walletClient = yield this.getWaasWalletClient();
-            const signedSessionId = yield ((_a = this.getSignedSessionId) === null || _a === void 0 ? void 0 : _a.call(this));
-            const createdWallet = yield walletClient.createWalletAccount({
-                authToken: (_b = this.getAuthToken) === null || _b === void 0 ? void 0 : _b.call(this),
-                signedSessionId,
-                thresholdSignatureScheme: thresholdSignatureScheme,
-            });
-            return createdWallet;
-        });
-    }
     signMessage(message) {
         var _a;
         return (_a = this.getWalletClient()) === null || _a === void 0 ? void 0 : _a.signMessage({ message });
@@ -265,127 +255,66 @@ class DynamicWaasEVMConnector extends withDynamicWaas(EthereumWalletConnector) {
         this.setActiveAccount(accountAddress);
         return this.getWalletClient();
     }
-    exportPrivateKey() {
-        return __awaiter(this, arguments, void 0, function* ({ accountAddress, displayContainer, password, } = {}) {
-            var _a, _b;
-            const walletClient = yield this.getWaasWalletClient();
-            const targetAccountAddress = accountAddress || ((_a = this.getActiveAccount()) === null || _a === void 0 ? void 0 : _a.address);
-            if (!targetAccountAddress) {
-                throw new Error('Account address is required');
-            }
-            if (!displayContainer) {
-                throw new Error('Missing display container for export private key');
-            }
-            this.__exportHandler.setIframeStamper(displayContainer);
-            yield walletClient.exportPrivateKey({
-                accountAddress: targetAccountAddress,
-                authToken: (_b = this.getAuthToken) === null || _b === void 0 ? void 0 : _b.call(this),
-                displayContainer,
-                password,
-            });
-        });
-    }
-    getExportHandler() {
-        return this.__exportHandler;
-    }
-    importPrivateKey(_a) {
-        return __awaiter(this, arguments, void 0, function* ({ privateKey, thresholdSignatureScheme = 'TWO_OF_TWO', }) {
-            var _b, _c;
-            const walletClient = yield this.getWaasWalletClient();
-            const signedSessionId = yield ((_b = this.getSignedSessionId) === null || _b === void 0 ? void 0 : _b.call(this));
-            if (!signedSessionId) {
-                throw new Error('Signed session ID is required');
-            }
-            yield walletClient.importPrivateKey({
-                authToken: (_c = this.getAuthToken) === null || _c === void 0 ? void 0 : _c.call(this),
-                privateKey,
-                signedSessionId,
-                thresholdSignatureScheme: thresholdSignatureScheme,
-            });
-        });
-    }
+    // Chain-specific override for exportClientKeyshares - EVM needs to set active account first
     exportClientKeyshares(_a) {
+        const _super = Object.create(null, {
+            exportClientKeyshares: { get: () => super.exportClientKeyshares }
+        });
         return __awaiter(this, arguments, void 0, function* ({ accountAddress, password, }) {
-            var _b, _c;
             if (!accountAddress) {
                 throw new Error('Account address is required');
             }
-            const signedSessionId = yield ((_b = this.getSignedSessionId) === null || _b === void 0 ? void 0 : _b.call(this));
+            // EVM-specific: set active account before exporting
             this.setActiveAccount(accountAddress);
-            const walletClient = yield this.getWaasWalletClient();
-            yield walletClient.exportClientKeyshares({
-                accountAddress,
-                authToken: (_c = this.getAuthToken) === null || _c === void 0 ? void 0 : _c.call(this),
-                password,
-                signedSessionId,
-            });
+            return _super.exportClientKeyshares.call(this, { accountAddress, password });
         });
     }
+    // Chain-specific override for backupKeySharesToGoogleDrive - EVM needs to set active account first
     backupKeySharesToGoogleDrive(_a) {
+        const _super = Object.create(null, {
+            backupKeySharesToGoogleDrive: { get: () => super.backupKeySharesToGoogleDrive }
+        });
         return __awaiter(this, arguments, void 0, function* ({ accountAddress, password, }) {
-            var _b;
             if (!accountAddress) {
                 throw new Error('Account address is required');
             }
+            // EVM-specific: set active account before backing up
             this.setActiveAccount(accountAddress);
-            const walletClient = yield this.getWaasWalletClient();
-            return walletClient.backupKeySharesToGoogleDrive({
-                accountAddress,
-                authToken: (_b = this.getAuthToken) === null || _b === void 0 ? void 0 : _b.call(this),
-                password,
-            });
+            return _super.backupKeySharesToGoogleDrive.call(this, { accountAddress, password });
         });
     }
+    // Chain-specific override for refreshWalletAccountShares - EVM needs to set active account first
     refreshWalletAccountShares(_a) {
+        const _super = Object.create(null, {
+            refreshWalletAccountShares: { get: () => super.refreshWalletAccountShares }
+        });
         return __awaiter(this, arguments, void 0, function* ({ accountAddress, password, }) {
-            var _b;
             if (!accountAddress) {
                 throw new Error('Account address is required');
             }
+            // EVM-specific: set active account before refreshing
             this.setActiveAccount(accountAddress);
-            const walletClient = yield this.getWaasWalletClient();
-            return walletClient.refreshWalletAccountShares({
-                accountAddress,
-                authToken: (_b = this.getAuthToken) === null || _b === void 0 ? void 0 : _b.call(this),
-                password,
-            });
+            return _super.refreshWalletAccountShares.call(this, { accountAddress, password });
         });
     }
+    // Chain-specific override for updatePassword - EVM needs to set active account first
     updatePassword(_a) {
+        const _super = Object.create(null, {
+            updatePassword: { get: () => super.updatePassword }
+        });
         return __awaiter(this, arguments, void 0, function* ({ accountAddress, existingPassword, newPassword, }) {
-            var _b;
             if (!accountAddress) {
                 throw new Error('Account address is required');
             }
+            // EVM-specific: set active account before updating password
             this.setActiveAccount(accountAddress);
-            const walletClient = yield this.getWaasWalletClient();
-            return walletClient.updatePassword({
+            return _super.updatePassword.call(this, {
                 accountAddress,
-                authToken: (_b = this.getAuthToken) === null || _b === void 0 ? void 0 : _b.call(this),
                 existingPassword,
                 newPassword,
             });
         });
     }
-    signRawMessage(_a) {
-        return __awaiter(this, arguments, void 0, function* ({ accountAddress, message, password, }) {
-            var _b;
-            if (!accountAddress) {
-                throw new Error('Account address is required');
-            }
-            if (message.length !== 64) {
-                throw new Error('Message must be 64 characters long');
-            }
-            this.setActiveAccount(accountAddress);
-            const walletClient = yield this.getWaasWalletClient();
-            return walletClient.signRawMessage({
-                accountAddress,
-                authToken: (_b = this.getAuthToken) === null || _b === void 0 ? void 0 : _b.call(this),
-                message,
-                password,
-            });
-        });
-    }
     createUiTransaction(from) {
         return __awaiter(this, void 0, void 0, function* () {
             yield this.validateActiveWallet(from);
@@ -455,7 +384,7 @@ class DynamicWaasEVMConnector extends withDynamicWaas(EthereumWalletConnector) {
     }
     signAuthorization(parameters, password) {
         return __awaiter(this, void 0, void 0, function* () {
-            var _a, _b;
+            var _a, _b, _c;
             const { address: contractAddress, nonce, chainId } = parameters;
             if (!contractAddress) {
                 throw new Error('Contract address not found');
@@ -470,14 +399,19 @@ class DynamicWaasEVMConnector extends withDynamicWaas(EthereumWalletConnector) {
             const { address } = signer.account;
             const walletClient = yield this.getWaasWalletClient();
             const signedSessionId = yield ((_a = this.getSignedSessionId) === null || _a === void 0 ? void 0 : _a.call(this));
+            if (!signedSessionId) {
+                throw new DynamicError('Signed session ID is required');
+            }
+            const mfaToken = yield ((_b = this.getMfaToken) === null || _b === void 0 ? void 0 : _b.call(this));
             const signature = yield walletClient.signRawMessage({
                 accountAddress: address,
-                authToken: (_b = this.getAuthToken) === null || _b === void 0 ? void 0 : _b.call(this),
+                authToken: (_c = this.getAuthToken) === null || _c === void 0 ? void 0 : _c.call(this),
                 message: hashAuthorization({
                     address: contractAddress,
                     chainId,
                     nonce,
                 }).slice(2),
+                mfaToken,
                 password,
                 signedSessionId,
             });
@@ -513,12 +447,11 @@ class DynamicWaasEVMConnector extends withDynamicWaas(EthereumWalletConnector) {
         return true;
     }
     endSession() {
+        const _super = Object.create(null, {
+            endSession: { get: () => super.endSession }
+        });
         return __awaiter(this, void 0, void 0, function* () {
-            const waasEvmClient = yield this.getWaasWalletClient();
-            if (!waasEvmClient) {
-                return;
-            }
-            yield waasEvmClient.cleanup();
+            yield _super.endSession.call(this);
         });
     }
 }