@dynamic-labs/ethereum-aa 4.58.0 → 4.58.1

package/CHANGELOG.md

@@ -1,4 +1,13 @@
 
+### [4.58.1](https://github.com/dynamic-labs/dynamic-auth/compare/v4.58.0...v4.58.1) (2026-01-29)
+
+
+### Bug Fixes
+
+* fix ZeroDev multi-wallet switching issue ([#10293](https://github.com/dynamic-labs/dynamic-auth/issues/10293)) ([f3ef7ea](https://github.com/dynamic-labs/dynamic-auth/commit/f3ef7ea5790a70304ef697a04417fdbcc043a620))
+* allow the web-extension to be recreated ([#10318](https://github.com/dynamic-labs/dynamic-auth/issues/10318)) ([3ad3ddb](https://github.com/dynamic-labs/dynamic-auth/commit/3ad3ddbfe80297889679f28679e25bb20d492c22))
+* patch critical vuln for @remix-run/node ([#10322](https://github.com/dynamic-labs/dynamic-auth/issues/10322)) ([a83a102](https://github.com/dynamic-labs/dynamic-auth/commit/a83a1025e992f8d04f0f9e3b3b3878ba6010ceb5))
+
 ## [4.58.0](https://github.com/dynamic-labs/dynamic-auth/compare/v4.57.2...v4.58.0) (2026-01-28)
 
 

package/package.cjs

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

package/package.js

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dynamic-labs/ethereum-aa",
-  "version": "4.58.0",
+  "version": "4.58.1",
   "description": "A React SDK for implementing wallet web3 authentication and authorization to your website.",
   "author": "Dynamic Labs, Inc.",
   "license": "MIT",
@@ -22,14 +22,14 @@
     "@zerodev/ecdsa-validator": "5.4.9",
     "@zerodev/multi-chain-ecdsa-validator": "5.4.5",
     "@zerodev/sdk": "5.5.7",
-    "@dynamic-labs/assert-package-version": "4.58.0",
-    "@dynamic-labs/ethereum-aa-core": "4.58.0",
-    "@dynamic-labs/ethereum-core": "4.58.0",
-    "@dynamic-labs/logger": "4.58.0",
-    "@dynamic-labs/types": "4.58.0",
-    "@dynamic-labs/utils": "4.58.0",
-    "@dynamic-labs/wallet-book": "4.58.0",
-    "@dynamic-labs/wallet-connector-core": "4.58.0"
+    "@dynamic-labs/assert-package-version": "4.58.1",
+    "@dynamic-labs/ethereum-aa-core": "4.58.1",
+    "@dynamic-labs/ethereum-core": "4.58.1",
+    "@dynamic-labs/logger": "4.58.1",
+    "@dynamic-labs/types": "4.58.1",
+    "@dynamic-labs/utils": "4.58.1",
+    "@dynamic-labs/wallet-book": "4.58.1",
+    "@dynamic-labs/wallet-connector-core": "4.58.1"
   },
   "peerDependencies": {
     "viem": "^2.28.4"

package/src/ZeroDevConnector.cjs

@@ -25,7 +25,8 @@ class ZeroDevConnector extends ethereumAaCore.AccountAbstractionBaseConnector {
     constructor(opts) {
         var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t, _u;
         super(opts);
-        // provider map maintains the kernel clients per chain
+        // Provider map maintains kernel clients per wallet address and chain
+        // Structure: { [walletAddress]: { [chainId]: { kernelClient, ... } } }
         this.providerMap = {};
         // eoa connector map maintains the eoa address and connector for each smart wallet address
         this.eoaConnectorMap = {};
@@ -90,15 +91,21 @@ class ZeroDevConnector extends ethereumAaCore.AccountAbstractionBaseConnector {
         throw new Error('confirmTransactionStatus not implemented in ZeroDevConnector');
     }
     get currentNetworkProvider() {
-        // check if the last used chain id is in the provider map
-        if (this.providerMap[this.lastUsedChainId]) {
-            return this.providerMap[this.lastUsedChainId];
+        if (!this.activeWalletAddress) {
+            return undefined;
+        }
+        const walletProviders = this.providerMap[this.activeWalletAddress];
+        if (!walletProviders) {
+            return undefined;
         }
-        // if not, check if the default chain id is in the provider map
-        if (this.defaultChainId) {
-            return this.providerMap[this.defaultChainId];
+        // Check if the last used chain id is in the provider map for this wallet
+        if (walletProviders[this.lastUsedChainId]) {
+            return walletProviders[this.lastUsedChainId];
+        }
+        // If not, check if the default chain id is in the provider map
+        if (this.defaultChainId && walletProviders[this.defaultChainId]) {
+            return walletProviders[this.defaultChainId];
         }
-        // if no chain id is found, return undefined
         return undefined;
     }
     get lastUsedChainId() {
@@ -116,7 +123,14 @@ class ZeroDevConnector extends ethereumAaCore.AccountAbstractionBaseConnector {
         return (_a = this.currentNetworkProvider) === null || _a === void 0 ? void 0 : _a.kernelClientWithSponsorship;
     }
     supportsNetworkSwitching() {
-        return (Object.keys(this.providerMap).length > 1 && this.evmNetworks.length > 1);
+        if (!this.activeWalletAddress) {
+            return false;
+        }
+        const walletProviders = this.providerMap[this.activeWalletAddress];
+        if (!walletProviders) {
+            return false;
+        }
+        return (Object.keys(walletProviders).length > 1 && this.evmNetworks.length > 1);
     }
     getPublicRpcForChain(chainId) {
         var _a, _b;
@@ -131,8 +145,11 @@ class ZeroDevConnector extends ethereumAaCore.AccountAbstractionBaseConnector {
                 return;
             if (!networkChainId)
                 return;
+            if (!this.activeWalletAddress)
+                return;
             const chainId = networkChainId.toString();
-            if (!this.providerMap[chainId]) {
+            const walletProviders = this.providerMap[this.activeWalletAddress];
+            if (!(walletProviders === null || walletProviders === void 0 ? void 0 : walletProviders[chainId])) {
                 throw new Error(`No provider found for chainId: ${chainId}`);
             }
             utils.StorageService.setItem(constants.ZERO_DEV_LAST_USED_CHAIN_ID_KEY, chainId);
@@ -173,32 +190,21 @@ class ZeroDevConnector extends ethereumAaCore.AccountAbstractionBaseConnector {
                 if (smartWalletAddress !== eoaAddress) {
                     throw new Error('In EIP-7702 mode, smart wallet and EOA addresses must be the same');
                 }
-                this.eoaConnectorMap[smartWalletAddress] = {
-                    eoaAddress,
-                    eoaConnector,
-                    properties,
-                };
-                yield this.setEoaConnector({
-                    connector: eoaConnector,
-                    eoaAddress,
-                    properties,
-                });
-            }
-            else {
-                // Existing implementation for regular ZeroDev
-                this.eoaConnectorMap[smartWalletAddress] = {
-                    eoaAddress,
-                    eoaConnector,
-                    properties,
-                };
-                if (shouldSetEoaConnector) {
-                    yield this.setEoaConnector({
-                        connector: eoaConnector,
-                        eoaAddress,
-                        properties,
-                    });
-                }
             }
+            // Register the EOA connector mapping
+            this.eoaConnectorMap[smartWalletAddress] = {
+                eoaAddress,
+                eoaConnector,
+                properties,
+            };
+            // Always generate providers for all wallets, but only set active state for primary
+            yield this.setEoaConnector({
+                connector: eoaConnector,
+                eoaAddress,
+                isPrimary: shouldSetEoaConnector,
+                properties,
+                smartWalletAddress,
+            });
         });
     }
     determineSmartAccountStatus(eoaConnector, verifiedCredentials) {
@@ -210,7 +216,7 @@ class ZeroDevConnector extends ethereumAaCore.AccountAbstractionBaseConnector {
             this.is7702EnabledOnDashboard && !this.hasExistingSmartAccount;
     }
     setEoaConnector(_a) {
-        return _tslib.__awaiter(this, arguments, void 0, function* ({ eoaAddress, connector, properties, }) {
+        return _tslib.__awaiter(this, arguments, void 0, function* ({ eoaAddress, connector, properties, smartWalletAddress, isPrimary = true, }) {
             var _b, _c;
             if (!connector) {
                 logger.logger.error('No EOA connector provided');
@@ -219,8 +225,12 @@ class ZeroDevConnector extends ethereumAaCore.AccountAbstractionBaseConnector {
             this.kernelClientDeferredPromise = this.kernelClientDeferredPromise
                 ? this.kernelClientDeferredPromise
                 : new utils.DeferredPromise();
-            this.eoaConnector = connector;
-            this.eoaAddress = eoaAddress;
+            // Only set active wallet state if this is the primary wallet
+            if (isPrimary) {
+                this.eoaConnector = connector;
+                this.eoaAddress = eoaAddress;
+                this.activeWalletAddress = smartWalletAddress;
+            }
             if (properties) {
                 this.ecdsaProviderType =
                     (_b = properties.ecdsaProviderType) !== null && _b !== void 0 ? _b : this.ecdsaProviderType;
@@ -233,12 +243,15 @@ class ZeroDevConnector extends ethereumAaCore.AccountAbstractionBaseConnector {
                 this.enableKernelV3Migration =
                     (_c = properties.enableKernelV3Migration) !== null && _c !== void 0 ? _c : this.enableKernelV3Migration;
             }
-            if (ethereumCore.isEthWalletConnector(this.eoaConnector) &&
-                !this.eoaConnector.getActiveAccount()) {
-                yield this.eoaConnector.getConnectedAccounts();
+            // Ensure the correct EOA account is active before getting the signer
+            if (walletConnectorCore.isDynamicWaasConnector(connector)) {
+                yield connector.validateActiveWallet(eoaAddress);
             }
-            const signer = yield this.eoaConnector.getSigner();
-            yield this.generateProviderMap(signer);
+            if (ethereumCore.isEthWalletConnector(connector) && !connector.getActiveAccount()) {
+                yield connector.getConnectedAccounts();
+            }
+            const signer = yield connector.getSigner();
+            yield this.generateProviderMap(signer, smartWalletAddress);
             this.kernelClientDeferredPromise.resolve();
         });
     }
@@ -261,10 +274,11 @@ class ZeroDevConnector extends ethereumAaCore.AccountAbstractionBaseConnector {
      * Each chain gets two clients: one without sponsorship and one with sponsorship
      *
      * @param signer - The wallet client to use for signing transactions
+     * @param walletAddress - The smart wallet address to store the providers under
      */
-    generateProviderMap(signer) {
+    generateProviderMap(signer, walletAddress) {
         return _tslib.__awaiter(this, void 0, void 0, function* () {
-            const providerMap = {};
+            const chainProviderMap = {};
             yield Promise.all(this.providersFromApi.map((provider) => _tslib.__awaiter(this, void 0, void 0, function* () {
                 const { chain, clientId } = provider;
                 const [kernelClient, kernelClientWithSponsorship] = yield Promise.all([
@@ -273,36 +287,37 @@ class ZeroDevConnector extends ethereumAaCore.AccountAbstractionBaseConnector {
                         paymaster: createEcdsaKernelAccountClient.PaymasterTypeEnum.NONE,
                         projectId: clientId,
                         signer,
+                        walletAddress,
                     }),
                     this.getOrCreateKernelClient({
                         chainId: chain,
                         paymaster: createEcdsaKernelAccountClient.PaymasterTypeEnum.SPONSOR,
                         projectId: clientId,
                         signer,
+                        walletAddress,
                     }),
                 ]);
-                providerMap[chain] = {
+                chainProviderMap[chain] = {
                     kernelClient,
                     kernelClientWithSponsorship,
                     signerAddress: signer.account.address,
                 };
                 yield this.warnIfProjectChainNotEnabled(utils.parseChainId(chain));
             })));
-            // Filter out duplicate chains and store the provider map
-            const uniqueChainProviderMap = Object.entries(providerMap).reduce((acc, [chain, providers]) => {
+            // Filter out duplicate chains and store under the wallet address
+            const uniqueChainProviderMap = Object.entries(chainProviderMap).reduce((acc, [chain, providers]) => {
                 if (!acc[chain]) {
                     acc[chain] = providers;
                 }
                 return acc;
             }, {});
-            this.providerMap = uniqueChainProviderMap;
+            this.providerMap[walletAddress] = uniqueChainProviderMap;
         });
     }
     createKernelClient(_a) {
         return _tslib.__awaiter(this, arguments, void 0, function* ({ chainId, projectId, signer, paymaster, paymasterRpcOverride, bundlerRpcOverride, }) {
-            const { eoaConnector } = this;
-            if (!eoaConnector)
-                throw new utils.DynamicError('No EOA connector');
+            if (!signer)
+                throw new utils.DynamicError('No signer provided');
             const chain = ethereumCore.chainsMap[chainId];
             let kernelClient;
             const params = {
@@ -335,13 +350,14 @@ class ZeroDevConnector extends ethereumAaCore.AccountAbstractionBaseConnector {
         });
     }
     getOrCreateKernelClient(_a) {
-        return _tslib.__awaiter(this, arguments, void 0, function* ({ chainId, projectId, signer, paymaster, }) {
+        return _tslib.__awaiter(this, arguments, void 0, function* ({ chainId, projectId, signer, paymaster, walletAddress, }) {
+            const walletProviders = this.providerMap[walletAddress];
             if (chainId &&
-                this.providerMap[chainId] &&
-                this.providerMap[chainId].signerAddress === signer.account.address) {
+                (walletProviders === null || walletProviders === void 0 ? void 0 : walletProviders[chainId]) &&
+                walletProviders[chainId].signerAddress === signer.account.address) {
                 return paymaster === createEcdsaKernelAccountClient.PaymasterTypeEnum.SPONSOR
-                    ? this.providerMap[chainId].kernelClientWithSponsorship
-                    : this.providerMap[chainId].kernelClient;
+                    ? walletProviders[chainId].kernelClientWithSponsorship
+                    : walletProviders[chainId].kernelClient;
             }
             return this.createKernelClient({
                 chainId,
@@ -705,8 +721,11 @@ class ZeroDevConnector extends ethereumAaCore.AccountAbstractionBaseConnector {
     }
     signMessageForChain(messageToSign, chainId) {
         return _tslib.__awaiter(this, void 0, void 0, function* () {
-            var _a;
-            const client = (_a = this.providerMap[chainId]) === null || _a === void 0 ? void 0 : _a.kernelClient;
+            var _a, _b;
+            if (!this.activeWalletAddress) {
+                throw new utils.DynamicError('No active wallet address');
+            }
+            const client = (_b = (_a = this.providerMap[this.activeWalletAddress]) === null || _a === void 0 ? void 0 : _a[chainId]) === null || _b === void 0 ? void 0 : _b.kernelClient;
             if (!client) {
                 throw new utils.DynamicError(`Provider for Chain ID ${chainId} not available. Please make sure that Chain ID ${chainId} is enabled in both the Dynamic dashboard and the ZeroDev dashboard.`);
             }
@@ -729,18 +748,45 @@ class ZeroDevConnector extends ethereumAaCore.AccountAbstractionBaseConnector {
             return this.kernelClient.signMessage({ message: messageToSign });
         });
     }
+    afterWalletSelectHook(walletAddress) {
+        return _tslib.__awaiter(this, void 0, void 0, function* () {
+            yield this.validateActiveWallet(walletAddress);
+        });
+    }
     validateActiveWallet(expectedAddress) {
         return _tslib.__awaiter(this, void 0, void 0, function* () {
+            var _a, _b;
             const eoa = this.eoaConnectorMap[expectedAddress];
             if (!eoa) {
                 throw new utils.DynamicError('No EOA connector');
             }
             const { eoaAddress, eoaConnector, properties } = eoa;
+            // Validate the underlying EOA connector
             yield eoaConnector.validateActiveWallet(eoaAddress);
+            // Check if we have providers for this wallet with the correct kernel account address
+            const existingProviders = this.providerMap[expectedAddress];
+            if (existingProviders) {
+                // Verify the kernel account address matches the expected address
+                const chainId = this.lastUsedChainId;
+                const provider = existingProviders[chainId];
+                const kernelAccountAddress = (_b = (_a = provider === null || provider === void 0 ? void 0 : provider.kernelClient) === null || _a === void 0 ? void 0 : _a.account) === null || _b === void 0 ? void 0 : _b.address;
+                if (kernelAccountAddress &&
+                    kernelAccountAddress.toLowerCase() === expectedAddress.toLowerCase()) {
+                    // Providers are valid, just switch to them
+                    this.activeWalletAddress = expectedAddress;
+                    this.eoaConnector = eoaConnector;
+                    this.eoaAddress = eoaAddress;
+                    this.userOperationCache = {};
+                    return;
+                }
+                // Providers have wrong kernel account, need to regenerate
+            }
+            // Generate providers for this wallet
             yield this.setEoaConnector({
                 connector: eoaConnector,
                 eoaAddress,
                 properties,
+                smartWalletAddress: expectedAddress,
             });
         });
     }

package/src/ZeroDevConnector.d.ts

@@ -12,6 +12,7 @@ export declare class ZeroDevConnector extends AccountAbstractionBaseConnector im
     clientId: string;
     eoaConnector: InternalWalletConnector | undefined;
     eoaAddress: string | undefined;
+    private activeWalletAddress;
     private providerMap;
     private eoaConnectorMap;
     ChainWallet: typeof EthereumWallet;
@@ -108,6 +109,7 @@ export declare class ZeroDevConnector extends AccountAbstractionBaseConnector im
      * Each chain gets two clients: one without sponsorship and one with sponsorship
      *
      * @param signer - The wallet client to use for signing transactions
+     * @param walletAddress - The smart wallet address to store the providers under
      */
     private generateProviderMap;
     private createKernelClient;
@@ -141,6 +143,7 @@ export declare class ZeroDevConnector extends AccountAbstractionBaseConnector im
     signMessage(messageToSign: string): Promise<string | undefined>;
     signMessageForChain(messageToSign: string, chainId: string): Promise<string | undefined>;
     private internalSignMessage;
+    afterWalletSelectHook(walletAddress: string): Promise<void>;
     validateActiveWallet(expectedAddress: string): Promise<void>;
     isAtomicSupported(chainId?: number): Promise<boolean>;
     isPaymasterServiceSupported(chainId?: number): Promise<boolean>;

package/src/ZeroDevConnector.js

@@ -21,7 +21,8 @@ class ZeroDevConnector extends AccountAbstractionBaseConnector {
     constructor(opts) {
         var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t, _u;
         super(opts);
-        // provider map maintains the kernel clients per chain
+        // Provider map maintains kernel clients per wallet address and chain
+        // Structure: { [walletAddress]: { [chainId]: { kernelClient, ... } } }
         this.providerMap = {};
         // eoa connector map maintains the eoa address and connector for each smart wallet address
         this.eoaConnectorMap = {};
@@ -86,15 +87,21 @@ class ZeroDevConnector extends AccountAbstractionBaseConnector {
         throw new Error('confirmTransactionStatus not implemented in ZeroDevConnector');
     }
     get currentNetworkProvider() {
-        // check if the last used chain id is in the provider map
-        if (this.providerMap[this.lastUsedChainId]) {
-            return this.providerMap[this.lastUsedChainId];
+        if (!this.activeWalletAddress) {
+            return undefined;
+        }
+        const walletProviders = this.providerMap[this.activeWalletAddress];
+        if (!walletProviders) {
+            return undefined;
         }
-        // if not, check if the default chain id is in the provider map
-        if (this.defaultChainId) {
-            return this.providerMap[this.defaultChainId];
+        // Check if the last used chain id is in the provider map for this wallet
+        if (walletProviders[this.lastUsedChainId]) {
+            return walletProviders[this.lastUsedChainId];
+        }
+        // If not, check if the default chain id is in the provider map
+        if (this.defaultChainId && walletProviders[this.defaultChainId]) {
+            return walletProviders[this.defaultChainId];
         }
-        // if no chain id is found, return undefined
         return undefined;
     }
     get lastUsedChainId() {
@@ -112,7 +119,14 @@ class ZeroDevConnector extends AccountAbstractionBaseConnector {
         return (_a = this.currentNetworkProvider) === null || _a === void 0 ? void 0 : _a.kernelClientWithSponsorship;
     }
     supportsNetworkSwitching() {
-        return (Object.keys(this.providerMap).length > 1 && this.evmNetworks.length > 1);
+        if (!this.activeWalletAddress) {
+            return false;
+        }
+        const walletProviders = this.providerMap[this.activeWalletAddress];
+        if (!walletProviders) {
+            return false;
+        }
+        return (Object.keys(walletProviders).length > 1 && this.evmNetworks.length > 1);
     }
     getPublicRpcForChain(chainId) {
         var _a, _b;
@@ -127,8 +141,11 @@ class ZeroDevConnector extends AccountAbstractionBaseConnector {
                 return;
             if (!networkChainId)
                 return;
+            if (!this.activeWalletAddress)
+                return;
             const chainId = networkChainId.toString();
-            if (!this.providerMap[chainId]) {
+            const walletProviders = this.providerMap[this.activeWalletAddress];
+            if (!(walletProviders === null || walletProviders === void 0 ? void 0 : walletProviders[chainId])) {
                 throw new Error(`No provider found for chainId: ${chainId}`);
             }
             StorageService.setItem(ZERO_DEV_LAST_USED_CHAIN_ID_KEY, chainId);
@@ -169,32 +186,21 @@ class ZeroDevConnector extends AccountAbstractionBaseConnector {
                 if (smartWalletAddress !== eoaAddress) {
                     throw new Error('In EIP-7702 mode, smart wallet and EOA addresses must be the same');
                 }
-                this.eoaConnectorMap[smartWalletAddress] = {
-                    eoaAddress,
-                    eoaConnector,
-                    properties,
-                };
-                yield this.setEoaConnector({
-                    connector: eoaConnector,
-                    eoaAddress,
-                    properties,
-                });
-            }
-            else {
-                // Existing implementation for regular ZeroDev
-                this.eoaConnectorMap[smartWalletAddress] = {
-                    eoaAddress,
-                    eoaConnector,
-                    properties,
-                };
-                if (shouldSetEoaConnector) {
-                    yield this.setEoaConnector({
-                        connector: eoaConnector,
-                        eoaAddress,
-                        properties,
-                    });
-                }
             }
+            // Register the EOA connector mapping
+            this.eoaConnectorMap[smartWalletAddress] = {
+                eoaAddress,
+                eoaConnector,
+                properties,
+            };
+            // Always generate providers for all wallets, but only set active state for primary
+            yield this.setEoaConnector({
+                connector: eoaConnector,
+                eoaAddress,
+                isPrimary: shouldSetEoaConnector,
+                properties,
+                smartWalletAddress,
+            });
         });
     }
     determineSmartAccountStatus(eoaConnector, verifiedCredentials) {
@@ -206,7 +212,7 @@ class ZeroDevConnector extends AccountAbstractionBaseConnector {
             this.is7702EnabledOnDashboard && !this.hasExistingSmartAccount;
     }
     setEoaConnector(_a) {
-        return __awaiter(this, arguments, void 0, function* ({ eoaAddress, connector, properties, }) {
+        return __awaiter(this, arguments, void 0, function* ({ eoaAddress, connector, properties, smartWalletAddress, isPrimary = true, }) {
             var _b, _c;
             if (!connector) {
                 logger.error('No EOA connector provided');
@@ -215,8 +221,12 @@ class ZeroDevConnector extends AccountAbstractionBaseConnector {
             this.kernelClientDeferredPromise = this.kernelClientDeferredPromise
                 ? this.kernelClientDeferredPromise
                 : new DeferredPromise();
-            this.eoaConnector = connector;
-            this.eoaAddress = eoaAddress;
+            // Only set active wallet state if this is the primary wallet
+            if (isPrimary) {
+                this.eoaConnector = connector;
+                this.eoaAddress = eoaAddress;
+                this.activeWalletAddress = smartWalletAddress;
+            }
             if (properties) {
                 this.ecdsaProviderType =
                     (_b = properties.ecdsaProviderType) !== null && _b !== void 0 ? _b : this.ecdsaProviderType;
@@ -229,12 +239,15 @@ class ZeroDevConnector extends AccountAbstractionBaseConnector {
                 this.enableKernelV3Migration =
                     (_c = properties.enableKernelV3Migration) !== null && _c !== void 0 ? _c : this.enableKernelV3Migration;
             }
-            if (isEthWalletConnector(this.eoaConnector) &&
-                !this.eoaConnector.getActiveAccount()) {
-                yield this.eoaConnector.getConnectedAccounts();
+            // Ensure the correct EOA account is active before getting the signer
+            if (isDynamicWaasConnector(connector)) {
+                yield connector.validateActiveWallet(eoaAddress);
             }
-            const signer = yield this.eoaConnector.getSigner();
-            yield this.generateProviderMap(signer);
+            if (isEthWalletConnector(connector) && !connector.getActiveAccount()) {
+                yield connector.getConnectedAccounts();
+            }
+            const signer = yield connector.getSigner();
+            yield this.generateProviderMap(signer, smartWalletAddress);
             this.kernelClientDeferredPromise.resolve();
         });
     }
@@ -257,10 +270,11 @@ class ZeroDevConnector extends AccountAbstractionBaseConnector {
      * Each chain gets two clients: one without sponsorship and one with sponsorship
      *
      * @param signer - The wallet client to use for signing transactions
+     * @param walletAddress - The smart wallet address to store the providers under
      */
-    generateProviderMap(signer) {
+    generateProviderMap(signer, walletAddress) {
         return __awaiter(this, void 0, void 0, function* () {
-            const providerMap = {};
+            const chainProviderMap = {};
             yield Promise.all(this.providersFromApi.map((provider) => __awaiter(this, void 0, void 0, function* () {
                 const { chain, clientId } = provider;
                 const [kernelClient, kernelClientWithSponsorship] = yield Promise.all([
@@ -269,36 +283,37 @@ class ZeroDevConnector extends AccountAbstractionBaseConnector {
                         paymaster: PaymasterTypeEnum.NONE,
                         projectId: clientId,
                         signer,
+                        walletAddress,
                     }),
                     this.getOrCreateKernelClient({
                         chainId: chain,
                         paymaster: PaymasterTypeEnum.SPONSOR,
                         projectId: clientId,
                         signer,
+                        walletAddress,
                     }),
                 ]);
-                providerMap[chain] = {
+                chainProviderMap[chain] = {
                     kernelClient,
                     kernelClientWithSponsorship,
                     signerAddress: signer.account.address,
                 };
                 yield this.warnIfProjectChainNotEnabled(parseChainId(chain));
             })));
-            // Filter out duplicate chains and store the provider map
-            const uniqueChainProviderMap = Object.entries(providerMap).reduce((acc, [chain, providers]) => {
+            // Filter out duplicate chains and store under the wallet address
+            const uniqueChainProviderMap = Object.entries(chainProviderMap).reduce((acc, [chain, providers]) => {
                 if (!acc[chain]) {
                     acc[chain] = providers;
                 }
                 return acc;
             }, {});
-            this.providerMap = uniqueChainProviderMap;
+            this.providerMap[walletAddress] = uniqueChainProviderMap;
         });
     }
     createKernelClient(_a) {
         return __awaiter(this, arguments, void 0, function* ({ chainId, projectId, signer, paymaster, paymasterRpcOverride, bundlerRpcOverride, }) {
-            const { eoaConnector } = this;
-            if (!eoaConnector)
-                throw new DynamicError('No EOA connector');
+            if (!signer)
+                throw new DynamicError('No signer provided');
             const chain = chainsMap[chainId];
             let kernelClient;
             const params = {
@@ -331,13 +346,14 @@ class ZeroDevConnector extends AccountAbstractionBaseConnector {
         });
     }
     getOrCreateKernelClient(_a) {
-        return __awaiter(this, arguments, void 0, function* ({ chainId, projectId, signer, paymaster, }) {
+        return __awaiter(this, arguments, void 0, function* ({ chainId, projectId, signer, paymaster, walletAddress, }) {
+            const walletProviders = this.providerMap[walletAddress];
             if (chainId &&
-                this.providerMap[chainId] &&
-                this.providerMap[chainId].signerAddress === signer.account.address) {
+                (walletProviders === null || walletProviders === void 0 ? void 0 : walletProviders[chainId]) &&
+                walletProviders[chainId].signerAddress === signer.account.address) {
                 return paymaster === PaymasterTypeEnum.SPONSOR
-                    ? this.providerMap[chainId].kernelClientWithSponsorship
-                    : this.providerMap[chainId].kernelClient;
+                    ? walletProviders[chainId].kernelClientWithSponsorship
+                    : walletProviders[chainId].kernelClient;
             }
             return this.createKernelClient({
                 chainId,
@@ -701,8 +717,11 @@ class ZeroDevConnector extends AccountAbstractionBaseConnector {
     }
     signMessageForChain(messageToSign, chainId) {
         return __awaiter(this, void 0, void 0, function* () {
-            var _a;
-            const client = (_a = this.providerMap[chainId]) === null || _a === void 0 ? void 0 : _a.kernelClient;
+            var _a, _b;
+            if (!this.activeWalletAddress) {
+                throw new DynamicError('No active wallet address');
+            }
+            const client = (_b = (_a = this.providerMap[this.activeWalletAddress]) === null || _a === void 0 ? void 0 : _a[chainId]) === null || _b === void 0 ? void 0 : _b.kernelClient;
             if (!client) {
                 throw new DynamicError(`Provider for Chain ID ${chainId} not available. Please make sure that Chain ID ${chainId} is enabled in both the Dynamic dashboard and the ZeroDev dashboard.`);
             }
@@ -725,18 +744,45 @@ class ZeroDevConnector extends AccountAbstractionBaseConnector {
             return this.kernelClient.signMessage({ message: messageToSign });
         });
     }
+    afterWalletSelectHook(walletAddress) {
+        return __awaiter(this, void 0, void 0, function* () {
+            yield this.validateActiveWallet(walletAddress);
+        });
+    }
     validateActiveWallet(expectedAddress) {
         return __awaiter(this, void 0, void 0, function* () {
+            var _a, _b;
             const eoa = this.eoaConnectorMap[expectedAddress];
             if (!eoa) {
                 throw new DynamicError('No EOA connector');
             }
             const { eoaAddress, eoaConnector, properties } = eoa;
+            // Validate the underlying EOA connector
             yield eoaConnector.validateActiveWallet(eoaAddress);
+            // Check if we have providers for this wallet with the correct kernel account address
+            const existingProviders = this.providerMap[expectedAddress];
+            if (existingProviders) {
+                // Verify the kernel account address matches the expected address
+                const chainId = this.lastUsedChainId;
+                const provider = existingProviders[chainId];
+                const kernelAccountAddress = (_b = (_a = provider === null || provider === void 0 ? void 0 : provider.kernelClient) === null || _a === void 0 ? void 0 : _a.account) === null || _b === void 0 ? void 0 : _b.address;
+                if (kernelAccountAddress &&
+                    kernelAccountAddress.toLowerCase() === expectedAddress.toLowerCase()) {
+                    // Providers are valid, just switch to them
+                    this.activeWalletAddress = expectedAddress;
+                    this.eoaConnector = eoaConnector;
+                    this.eoaAddress = eoaAddress;
+                    this.userOperationCache = {};
+                    return;
+                }
+                // Providers have wrong kernel account, need to regenerate
+            }
+            // Generate providers for this wallet
             yield this.setEoaConnector({
                 connector: eoaConnector,
                 eoaAddress,
                 properties,
+                smartWalletAddress: expectedAddress,
             });
         });
     }

package/src/types.d.ts

@@ -35,10 +35,13 @@ export type ZeroDevWalletProperties = {
     enableKernelV3Migration?: boolean;
     defaultToKernelWithSponsorship?: boolean;
 };
-export type ProviderMap = {
+export type ChainProviderMap = {
     [chainId: string]: {
         signerAddress: string;
         kernelClient: KernelClient;
         kernelClientWithSponsorship: KernelClient;
     };
 };
+export type ProviderMap = {
+    [walletAddress: string]: ChainProviderMap;
+};