@dynamic-labs/ethereum-aa 5.0.0-rc.0 → 5.0.0-rc.2

package/CHANGELOG.md

@@ -1,5 +1,78 @@
 
-## [5.0.0-rc.0](https://github.com/dynamic-labs/dynamic-auth/compare/v4.91.6...v5.0.0-rc.0) (2026-07-05)
+## [5.0.0-rc.2](https://github.com/dynamic-labs/dynamic-auth/compare/v5.0.0-rc.1...v5.0.0-rc.2) (2026-07-17)
+
+## [5.0.0-rc.1](https://github.com/dynamic-labs/dynamic-auth/compare/v5.0.0-rc.0...v5.0.0-rc.1) (2026-07-17)
+
+
+### ⚠ BREAKING CHANGES
+
+* move legacy embedded wallet to waas upgrade flow to new legacy-embedded-wallet-migration package (#11841)
+* drop default injection of legacy embedded wallet connectors (#11833)
+* remove legacy embedded wallet support (#11979)
+* throw when legacy embedded wallet is detected without migration provider (#11855)
+* remove deprecated eclipse package (#11831)
+* remove deprecated functions and props (#11832)
+
+
+### [4.92.4](https://github.com/dynamic-labs/dynamic-auth/compare/v4.92.3...v4.92.4) (2026-07-16)
+
+
+### Features
+
+* **bitcoin:** per-network address switching and dust-limit send validation [v4] ([#11970](https://github.com/dynamic-labs/dynamic-auth/issues/11970)) ([76a4a9a](https://github.com/dynamic-labs/dynamic-auth/commit/76a4a9a5025d78798ebd1beffe6c0af59d2d029a)), closes [#11896](https://github.com/dynamic-labs/dynamic-auth/issues/11896) [#11800](https://github.com/dynamic-labs/dynamic-auth/issues/11800)
+* **midnight:** per-network addresses in deposit and wallet info views [v4] ([#11949](https://github.com/dynamic-labs/dynamic-auth/issues/11949)) ([978446a](https://github.com/dynamic-labs/dynamic-auth/commit/978446aca8546eb038ba9ed3be0503d10594ee15))
+* **midnight:** resolve wallet address per selected network [v4] ([#11948](https://github.com/dynamic-labs/dynamic-auth/issues/11948)) ([d6f858c](https://github.com/dynamic-labs/dynamic-auth/commit/d6f858c5e35defda7ed73cf97b3fdbe5ed9d131d))
+* set useMetamaskSdk to true by default ([#11926](https://github.com/dynamic-labs/dynamic-auth/issues/11926)) ([75b5a4a](https://github.com/dynamic-labs/dynamic-auth/commit/75b5a4a0fe8b1a375afce145c0b8bdc3ce761117))
+
+
+### Bug Fixes
+
+* **midnight:** align per-network code with the final main iteration [v4] ([#11971](https://github.com/dynamic-labs/dynamic-auth/issues/11971)) ([3ef3ba8](https://github.com/dynamic-labs/dynamic-auth/commit/3ef3ba8c090dfd9e4286b4e51bf350ea5e6feac7))
+* settle social sign-in when captcha is backed out or oauth popup never responds (v4) ([#11956](https://github.com/dynamic-labs/dynamic-auth/issues/11956)) ([ad49477](https://github.com/dynamic-labs/dynamic-auth/commit/ad49477f2acf61a154bb79cbe26b24f803cdb0e2))
+* validate that private key is not empty before upgrading to WaaS ([#11952](https://github.com/dynamic-labs/dynamic-auth/issues/11952)) ([21dfb83](https://github.com/dynamic-labs/dynamic-auth/commit/21dfb83cb29e42b335bc94a0cdd2062cf14a262a))
+
+### [4.92.3](https://github.com/dynamic-labs/dynamic-auth/compare/v4.92.2...v4.92.3) (2026-07-10)
+
+
+### Bug Fixes
+
+* **sdk-react-core:** fix deterministic 'Wallet not found' crash in embedded wallet export (v4) ([#11906](https://github.com/dynamic-labs/dynamic-auth/issues/11906)) ([913ef23](https://github.com/dynamic-labs/dynamic-auth/commit/913ef236b26245488e1cd5db7e874601b65ff0a2)), closes [#11905](https://github.com/dynamic-labs/dynamic-auth/issues/11905) [#11729](https://github.com/dynamic-labs/dynamic-auth/issues/11729)
+
+### [4.92.2](https://github.com/dynamic-labs/dynamic-auth/compare/v4.92.1...v4.92.2) (2026-07-09)
+
+
+### Bug Fixes
+
+* engage captcha during step-up OTP re-auth ([#11879](https://github.com/dynamic-labs/dynamic-auth/issues/11879)) ([585460a](https://github.com/dynamic-labs/dynamic-auth/commit/585460a8976803a8ed0aad16a4a00047bd6c115a))
+* **waas:** gate v1 wallet upgrade on recovery for email-only wallets ([#11897](https://github.com/dynamic-labs/dynamic-auth/issues/11897)) ([5a6f0c6](https://github.com/dynamic-labs/dynamic-auth/commit/5a6f0c6bf3120e59cf502004d09fae56f193e977))
+
+### [4.92.1](https://github.com/dynamic-labs/dynamic-auth/compare/v4.92.0...v4.92.1) (2026-07-09)
+
+
+### Bug Fixes
+
+* **ethereum:** fire in-app-browser redirect on sign for injected EVM wallets that use in-app-browser experience ([#11888](https://github.com/dynamic-labs/dynamic-auth/issues/11888)) ([5116d91](https://github.com/dynamic-labs/dynamic-auth/commit/5116d91ab2c71000a490d72c5d278549d4d8ae9a))
+* **sdk-react-core:** show clear message for Phantom redirect signing failures (v4 backport) ([#11886](https://github.com/dynamic-labs/dynamic-auth/issues/11886)) ([60ac897](https://github.com/dynamic-labs/dynamic-auth/commit/60ac897ba81f7758ccd7a05f97b619785e1f50a7))
+* **social:** use redirect strategy for step-up OAuth on mobile [V4 backport] ([#11881](https://github.com/dynamic-labs/dynamic-auth/issues/11881)) ([42a202e](https://github.com/dynamic-labs/dynamic-auth/commit/42a202e6255de8db73df02eff37c0b10b24fef1a))
+* **solana:** fire in-app-browser redirect on sign and wallet switch ([#11871](https://github.com/dynamic-labs/dynamic-auth/issues/11871)) ([4e2d6b7](https://github.com/dynamic-labs/dynamic-auth/commit/4e2d6b7ac8fdef5bf7c62b8a726ecaef1c6210ec))
+* **solana:** resolve Phantom/Backpack provider collision and Backpack >=0.10.x connect hangs ([#11856](https://github.com/dynamic-labs/dynamic-auth/issues/11856)) ([#11882](https://github.com/dynamic-labs/dynamic-auth/issues/11882)) ([5784aff](https://github.com/dynamic-labs/dynamic-auth/commit/5784aff9641bbc85445fb466f3ab1d6a14331e73))
+
+## [4.92.0](https://github.com/dynamic-labs/dynamic-auth/compare/v4.91.6...v4.92.0) (2026-07-08)
+
+
+### Features
+
+* **captcha:** add Cloudflare Turnstile provider support alongside hCaptcha (v4) ([#11798](https://github.com/dynamic-labs/dynamic-auth/issues/11798)) ([114c770](https://github.com/dynamic-labs/dynamic-auth/commit/114c7702e900d8dedeebe7be867de35d11a93f31))
+
+
+### Bug Fixes
+
+* **ethereum-aa:** resolve kernel client config per wallet (v4) ([#11870](https://github.com/dynamic-labs/dynamic-auth/issues/11870)) ([1b66d79](https://github.com/dynamic-labs/dynamic-auth/commit/1b66d79b4a32b4b6de433b7536bc46e6719224c6))
+* **iframe-setup:** block dangerous URL schemes and verify sender in OPEN_URL ([#11819](https://github.com/dynamic-labs/dynamic-auth/issues/11819)) ([329b27e](https://github.com/dynamic-labs/dynamic-auth/commit/329b27e9fac825916ab227ec8cf93dc343898923))
+* improve social OAuth error messages ([#11837](https://github.com/dynamic-labs/dynamic-auth/issues/11837)) ([8e57c06](https://github.com/dynamic-labs/dynamic-auth/commit/8e57c067c5a89111a32a12fb82e190cf6c46ad67))
+* **react-native-extension:** reject path traversal in downloadFile fileName ([#11816](https://github.com/dynamic-labs/dynamic-auth/issues/11816)) ([9367a56](https://github.com/dynamic-labs/dynamic-auth/commit/9367a56b6daa853d7f7e7f5534261bc68825b239))
+* **sdk-react-core:** display exactly the bytes signed in personal_sign preview ([#11818](https://github.com/dynamic-labs/dynamic-auth/issues/11818)) ([30b9382](https://github.com/dynamic-labs/dynamic-auth/commit/30b93829122f00060cb484aef09a03294c03f651))
+  
 
 ### [4.91.6](https://github.com/dynamic-labs/dynamic-auth/compare/v4.91.5...v4.91.6) (2026-07-03)
 

package/package.cjs

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

package/package.js

@@ -1,4 +1,4 @@
 'use client'
-var version = "5.0.0-rc.0";
+var version = "5.0.0-rc.2";
 
 export { version };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dynamic-labs/ethereum-aa",
-  "version": "5.0.0-rc.0",
+  "version": "5.0.0-rc.2",
   "description": "A React SDK for implementing wallet web3 authentication and authorization to your website.",
   "author": "Dynamic Labs, Inc.",
   "license": "MIT",
@@ -18,18 +18,18 @@
   },
   "homepage": "https://www.dynamic.xyz/",
   "dependencies": {
-    "@dynamic-labs/sdk-api-core": "0.0.1046",
+    "@dynamic-labs/sdk-api-core": "0.0.1082",
     "@zerodev/ecdsa-validator": "5.4.9",
     "@zerodev/multi-chain-ecdsa-validator": "5.4.5",
     "@zerodev/sdk": "5.5.7",
-    "@dynamic-labs/assert-package-version": "5.0.0-rc.0",
-    "@dynamic-labs/ethereum-aa-core": "5.0.0-rc.0",
-    "@dynamic-labs/ethereum-core": "5.0.0-rc.0",
-    "@dynamic-labs/logger": "5.0.0-rc.0",
-    "@dynamic-labs/types": "5.0.0-rc.0",
-    "@dynamic-labs/utils": "5.0.0-rc.0",
-    "@dynamic-labs/wallet-book": "5.0.0-rc.0",
-    "@dynamic-labs/wallet-connector-core": "5.0.0-rc.0"
+    "@dynamic-labs/assert-package-version": "5.0.0-rc.2",
+    "@dynamic-labs/ethereum-aa-core": "5.0.0-rc.2",
+    "@dynamic-labs/ethereum-core": "5.0.0-rc.2",
+    "@dynamic-labs/logger": "5.0.0-rc.2",
+    "@dynamic-labs/types": "5.0.0-rc.2",
+    "@dynamic-labs/utils": "5.0.0-rc.2",
+    "@dynamic-labs/wallet-book": "5.0.0-rc.2",
+    "@dynamic-labs/wallet-connector-core": "5.0.0-rc.2"
   },
   "peerDependencies": {
     "viem": "^2.45.3"

package/src/ZeroDevConnector.cjs

@@ -190,8 +190,16 @@ class ZeroDevConnector extends ethereumAaCore.AccountAbstractionBaseConnector {
             }
             // Determine per-wallet 7702 mode: address equality is the defining property of EIP-7702
             // (the EOA itself IS the smart wallet). A 4337 wallet always has a different counterfactual address.
-            const is7702 = this.is7702EnabledOnDashboard &&
-                smartWalletAddress.toLowerCase() === eoaAddress.toLowerCase();
+            const isAddressEqual = smartWalletAddress.toLowerCase() === eoaAddress.toLowerCase();
+            const is7702 = this.is7702EnabledOnDashboard && isAddressEqual;
+            // An address-equal smart wallet is only meaningful under EIP-7702. When 7702
+            // is disabled on the dashboard this shape reaches the SDK only because the
+            // EOA row was stamped during a since-reverted 7702 window; registering it
+            // would surface a broken 4337 wallet at the EOA address, so skip it.
+            if (!this.is7702EnabledOnDashboard && isAddressEqual) {
+                logger.logger.warn(`Skipping registration of smart wallet ${smartWalletAddress}: it shares the EOA address but EIP-7702 is disabled on the dashboard.`);
+                return;
+            }
             // Register the EOA connector mapping
             this.eoaConnectorMap[smartWalletAddress] = {
                 eoaAddress,
@@ -274,8 +282,7 @@ class ZeroDevConnector extends ethereumAaCore.AccountAbstractionBaseConnector {
         });
     }
     setEoaConnector(_a) {
-        return _tslib.__awaiter(this, arguments, void 0, function* ({ eoaAddress, connector, is7702 = false, properties, smartWalletAddress, isPrimary = true, }) {
-            var _b, _c;
+        return _tslib.__awaiter(this, arguments, void 0, function* ({ eoaAddress, connector, is7702 = false, smartWalletAddress, isPrimary = true, }) {
             if (!connector) {
                 logger.logger.error('No EOA connector provided');
                 return;
@@ -289,18 +296,6 @@ class ZeroDevConnector extends ethereumAaCore.AccountAbstractionBaseConnector {
                 this.eoaAddress = eoaAddress;
                 this.activeWalletAddress = smartWalletAddress;
             }
-            if (properties) {
-                this.ecdsaProviderType =
-                    (_b = properties.ecdsaProviderType) !== null && _b !== void 0 ? _b : this.ecdsaProviderType;
-                this.entryPoint = properties.entryPointVersion
-                    ? getEntryPoint.getEntryPoint(properties.entryPointVersion)
-                    : this.entryPoint;
-                this.kernelVersion = properties.entryPointVersion
-                    ? getKernelVersion.getKernelVersion(properties.kernelVersion, this.entryPoint)
-                    : this.kernelVersion;
-                this.enableKernelV3Migration =
-                    (_c = properties.enableKernelV3Migration) !== null && _c !== void 0 ? _c : this.enableKernelV3Migration;
-            }
             // Ensure the correct EOA account is active before getting the signer
             if (walletConnectorCore.isDynamicWaasConnector(connector)) {
                 yield connector.validateActiveWallet(eoaAddress);
@@ -379,20 +374,49 @@ class ZeroDevConnector extends ethereumAaCore.AccountAbstractionBaseConnector {
             this.providerMap[walletAddress] = uniqueChainProviderMap;
         });
     }
+    /**
+     * Resolves the EntryPoint / kernel configuration for a single smart wallet
+     * from that wallet's own persisted version properties, falling back to the
+     * dashboard-level defaults. Resolving per wallet — rather than reading shared
+     * instance state — is what lets a user's pre-existing 4337 wallet keep its
+     * original EntryPoint while a newer EIP-7702 wallet on the same signer uses a
+     * different one.
+     */
+    resolveKernelConfig(walletAddress) {
+        var _a, _b, _c;
+        const properties = walletAddress
+            ? (_a = this.eoaConnectorMap[walletAddress]) === null || _a === void 0 ? void 0 : _a.properties
+            : undefined;
+        // A wallet record without entryPointVersion predates per-wallet AA columns;
+        // the dashboard-level config is the only signal for which kernel it was
+        // created with, so fall back to it rather than assuming a version.
+        const entryPoint = (properties === null || properties === void 0 ? void 0 : properties.entryPointVersion)
+            ? getEntryPoint.getEntryPoint(properties.entryPointVersion)
+            : this.entryPoint;
+        return {
+            ecdsaProviderType: (_b = properties === null || properties === void 0 ? void 0 : properties.ecdsaProviderType) !== null && _b !== void 0 ? _b : this.ecdsaProviderType,
+            enableKernelV3Migration: (_c = properties === null || properties === void 0 ? void 0 : properties.enableKernelV3Migration) !== null && _c !== void 0 ? _c : this.enableKernelV3Migration,
+            entryPoint,
+            kernelVersion: (properties === null || properties === void 0 ? void 0 : properties.entryPointVersion)
+                ? getKernelVersion.getKernelVersion(properties.kernelVersion, entryPoint)
+                : this.kernelVersion,
+        };
+    }
     createKernelClient(_a) {
-        return _tslib.__awaiter(this, arguments, void 0, function* ({ chainId, eip7702Auth, is7702 = false, projectId, signer, paymaster, paymasterRpcOverride, bundlerRpcOverride, }) {
+        return _tslib.__awaiter(this, arguments, void 0, function* ({ chainId, eip7702Auth, is7702 = false, projectId, signer, paymaster, paymasterRpcOverride, bundlerRpcOverride, walletAddress, }) {
             if (!signer)
                 throw new utils.DynamicError('No signer provided', 'no_signer_provided');
             const chain = ethereumCore.chainsMap[chainId];
+            const { ecdsaProviderType, enableKernelV3Migration, entryPoint, kernelVersion, } = this.resolveKernelConfig(walletAddress);
             let kernelClient;
             const params = {
                 apiKernelVersion: this.apiKernelVersion,
                 bundlerRpc: bundlerRpcOverride !== null && bundlerRpcOverride !== void 0 ? bundlerRpcOverride : this.bundlerRpc,
                 chain,
                 chainId: utils.parseChainId(chainId),
-                enableKernelV3Migration: this.enableKernelV3Migration,
-                entryPoint: this.entryPoint,
-                kernelVersion: this.kernelVersion,
+                enableKernelV3Migration,
+                entryPoint,
+                kernelVersion,
                 paymaster,
                 paymasterRpc: paymasterRpcOverride !== null && paymasterRpcOverride !== void 0 ? paymasterRpcOverride : this.paymasterRpc,
                 projectId,
@@ -405,7 +429,7 @@ class ZeroDevConnector extends ethereumAaCore.AccountAbstractionBaseConnector {
                 kernelClient = yield createEcdsaKernelAccountClient.createEcdsaKernelAccountClientWith7702(Object.assign(Object.assign({}, params), { eip7702Auth, kernelVersion: constants$1.KERNEL_V3_3 }));
             }
             else {
-                kernelClient = yield createEcdsaKernelAccountClient.createEcdsaKernelAccountClient(Object.assign(Object.assign({}, params), { ecdsaValidator: getEcdsaValidator.getEcdsaValidator(this.ecdsaProviderType) }));
+                kernelClient = yield createEcdsaKernelAccountClient.createEcdsaKernelAccountClient(Object.assign(Object.assign({}, params), { ecdsaValidator: getEcdsaValidator.getEcdsaValidator(ecdsaProviderType) }));
             }
             utils.wrapMethodWithCallback(kernelClient, 'sendUserOperation', (original, ...args) => {
                 if (!this.isInOnSendTransactionFlow) {
@@ -433,6 +457,7 @@ class ZeroDevConnector extends ethereumAaCore.AccountAbstractionBaseConnector {
                 paymaster,
                 projectId,
                 signer,
+                walletAddress,
             });
         });
     }
@@ -504,6 +529,7 @@ class ZeroDevConnector extends ethereumAaCore.AccountAbstractionBaseConnector {
                 paymasterRpcOverride: paymasterUrl,
                 projectId: clientId,
                 signer,
+                walletAddress: this.activeWalletAddress,
             });
             if (!client) {
                 throw new utils.DynamicError('No kernel client', 'no_kernel_client');
@@ -699,10 +725,14 @@ class ZeroDevConnector extends ethereumAaCore.AccountAbstractionBaseConnector {
                 throw new utils.DynamicError('Failed to prepare user operation for transaction', 'prepare_user_operation_for_transaction');
             }
             const chainId = Number(this.lastUsedChainId);
+            // The userOp hash and WaaS signing context must match the EntryPoint of the
+            // client that prepared this operation — not shared instance state, which can
+            // reflect a different wallet (e.g. a 7702 wallet registered afterwards).
+            const { entryPoint } = provider.account;
             const hash = accountAbstraction.getUserOperationHash({
                 chainId: chainId,
-                entryPointAddress: this.entryPoint.address,
-                entryPointVersion: this.entryPoint.version,
+                entryPointAddress: entryPoint.address,
+                entryPointVersion: entryPoint.version,
                 userOperation,
             });
             // At this point we know eoaConnector is a WAAS connector
@@ -710,7 +740,7 @@ class ZeroDevConnector extends ethereumAaCore.AccountAbstractionBaseConnector {
                 context: {
                     evmUserOperation: {
                         chainId,
-                        entryPoint: this.entryPoint.address,
+                        entryPoint: entryPoint.address,
                         operation: userOperation,
                     },
                 },

package/src/ZeroDevConnector.d.ts

@@ -121,6 +121,15 @@ export declare class ZeroDevConnector extends AccountAbstractionBaseConnector im
      * @param walletAddress - The smart wallet address to store the providers under
      */
     private generateProviderMap;
+    /**
+     * Resolves the EntryPoint / kernel configuration for a single smart wallet
+     * from that wallet's own persisted version properties, falling back to the
+     * dashboard-level defaults. Resolving per wallet — rather than reading shared
+     * instance state — is what lets a user's pre-existing 4337 wallet keep its
+     * original EntryPoint while a newer EIP-7702 wallet on the same signer uses a
+     * different one.
+     */
+    private resolveKernelConfig;
     private createKernelClient;
     private getOrCreateKernelClient;
     getAddress(): Promise<string | undefined>;

package/src/ZeroDevConnector.js

@@ -186,8 +186,16 @@ class ZeroDevConnector extends AccountAbstractionBaseConnector {
             }
             // Determine per-wallet 7702 mode: address equality is the defining property of EIP-7702
             // (the EOA itself IS the smart wallet). A 4337 wallet always has a different counterfactual address.
-            const is7702 = this.is7702EnabledOnDashboard &&
-                smartWalletAddress.toLowerCase() === eoaAddress.toLowerCase();
+            const isAddressEqual = smartWalletAddress.toLowerCase() === eoaAddress.toLowerCase();
+            const is7702 = this.is7702EnabledOnDashboard && isAddressEqual;
+            // An address-equal smart wallet is only meaningful under EIP-7702. When 7702
+            // is disabled on the dashboard this shape reaches the SDK only because the
+            // EOA row was stamped during a since-reverted 7702 window; registering it
+            // would surface a broken 4337 wallet at the EOA address, so skip it.
+            if (!this.is7702EnabledOnDashboard && isAddressEqual) {
+                logger.warn(`Skipping registration of smart wallet ${smartWalletAddress}: it shares the EOA address but EIP-7702 is disabled on the dashboard.`);
+                return;
+            }
             // Register the EOA connector mapping
             this.eoaConnectorMap[smartWalletAddress] = {
                 eoaAddress,
@@ -270,8 +278,7 @@ class ZeroDevConnector extends AccountAbstractionBaseConnector {
         });
     }
     setEoaConnector(_a) {
-        return __awaiter(this, arguments, void 0, function* ({ eoaAddress, connector, is7702 = false, properties, smartWalletAddress, isPrimary = true, }) {
-            var _b, _c;
+        return __awaiter(this, arguments, void 0, function* ({ eoaAddress, connector, is7702 = false, smartWalletAddress, isPrimary = true, }) {
             if (!connector) {
                 logger.error('No EOA connector provided');
                 return;
@@ -285,18 +292,6 @@ class ZeroDevConnector extends AccountAbstractionBaseConnector {
                 this.eoaAddress = eoaAddress;
                 this.activeWalletAddress = smartWalletAddress;
             }
-            if (properties) {
-                this.ecdsaProviderType =
-                    (_b = properties.ecdsaProviderType) !== null && _b !== void 0 ? _b : this.ecdsaProviderType;
-                this.entryPoint = properties.entryPointVersion
-                    ? getEntryPoint(properties.entryPointVersion)
-                    : this.entryPoint;
-                this.kernelVersion = properties.entryPointVersion
-                    ? getKernelVersion(properties.kernelVersion, this.entryPoint)
-                    : this.kernelVersion;
-                this.enableKernelV3Migration =
-                    (_c = properties.enableKernelV3Migration) !== null && _c !== void 0 ? _c : this.enableKernelV3Migration;
-            }
             // Ensure the correct EOA account is active before getting the signer
             if (isDynamicWaasConnector(connector)) {
                 yield connector.validateActiveWallet(eoaAddress);
@@ -375,20 +370,49 @@ class ZeroDevConnector extends AccountAbstractionBaseConnector {
             this.providerMap[walletAddress] = uniqueChainProviderMap;
         });
     }
+    /**
+     * Resolves the EntryPoint / kernel configuration for a single smart wallet
+     * from that wallet's own persisted version properties, falling back to the
+     * dashboard-level defaults. Resolving per wallet — rather than reading shared
+     * instance state — is what lets a user's pre-existing 4337 wallet keep its
+     * original EntryPoint while a newer EIP-7702 wallet on the same signer uses a
+     * different one.
+     */
+    resolveKernelConfig(walletAddress) {
+        var _a, _b, _c;
+        const properties = walletAddress
+            ? (_a = this.eoaConnectorMap[walletAddress]) === null || _a === void 0 ? void 0 : _a.properties
+            : undefined;
+        // A wallet record without entryPointVersion predates per-wallet AA columns;
+        // the dashboard-level config is the only signal for which kernel it was
+        // created with, so fall back to it rather than assuming a version.
+        const entryPoint = (properties === null || properties === void 0 ? void 0 : properties.entryPointVersion)
+            ? getEntryPoint(properties.entryPointVersion)
+            : this.entryPoint;
+        return {
+            ecdsaProviderType: (_b = properties === null || properties === void 0 ? void 0 : properties.ecdsaProviderType) !== null && _b !== void 0 ? _b : this.ecdsaProviderType,
+            enableKernelV3Migration: (_c = properties === null || properties === void 0 ? void 0 : properties.enableKernelV3Migration) !== null && _c !== void 0 ? _c : this.enableKernelV3Migration,
+            entryPoint,
+            kernelVersion: (properties === null || properties === void 0 ? void 0 : properties.entryPointVersion)
+                ? getKernelVersion(properties.kernelVersion, entryPoint)
+                : this.kernelVersion,
+        };
+    }
     createKernelClient(_a) {
-        return __awaiter(this, arguments, void 0, function* ({ chainId, eip7702Auth, is7702 = false, projectId, signer, paymaster, paymasterRpcOverride, bundlerRpcOverride, }) {
+        return __awaiter(this, arguments, void 0, function* ({ chainId, eip7702Auth, is7702 = false, projectId, signer, paymaster, paymasterRpcOverride, bundlerRpcOverride, walletAddress, }) {
             if (!signer)
                 throw new DynamicError('No signer provided', 'no_signer_provided');
             const chain = chainsMap[chainId];
+            const { ecdsaProviderType, enableKernelV3Migration, entryPoint, kernelVersion, } = this.resolveKernelConfig(walletAddress);
             let kernelClient;
             const params = {
                 apiKernelVersion: this.apiKernelVersion,
                 bundlerRpc: bundlerRpcOverride !== null && bundlerRpcOverride !== void 0 ? bundlerRpcOverride : this.bundlerRpc,
                 chain,
                 chainId: parseChainId(chainId),
-                enableKernelV3Migration: this.enableKernelV3Migration,
-                entryPoint: this.entryPoint,
-                kernelVersion: this.kernelVersion,
+                enableKernelV3Migration,
+                entryPoint,
+                kernelVersion,
                 paymaster,
                 paymasterRpc: paymasterRpcOverride !== null && paymasterRpcOverride !== void 0 ? paymasterRpcOverride : this.paymasterRpc,
                 projectId,
@@ -401,7 +425,7 @@ class ZeroDevConnector extends AccountAbstractionBaseConnector {
                 kernelClient = yield createEcdsaKernelAccountClientWith7702(Object.assign(Object.assign({}, params), { eip7702Auth, kernelVersion: KERNEL_V3_3 }));
             }
             else {
-                kernelClient = yield createEcdsaKernelAccountClient(Object.assign(Object.assign({}, params), { ecdsaValidator: getEcdsaValidator(this.ecdsaProviderType) }));
+                kernelClient = yield createEcdsaKernelAccountClient(Object.assign(Object.assign({}, params), { ecdsaValidator: getEcdsaValidator(ecdsaProviderType) }));
             }
             wrapMethodWithCallback(kernelClient, 'sendUserOperation', (original, ...args) => {
                 if (!this.isInOnSendTransactionFlow) {
@@ -429,6 +453,7 @@ class ZeroDevConnector extends AccountAbstractionBaseConnector {
                 paymaster,
                 projectId,
                 signer,
+                walletAddress,
             });
         });
     }
@@ -500,6 +525,7 @@ class ZeroDevConnector extends AccountAbstractionBaseConnector {
                 paymasterRpcOverride: paymasterUrl,
                 projectId: clientId,
                 signer,
+                walletAddress: this.activeWalletAddress,
             });
             if (!client) {
                 throw new DynamicError('No kernel client', 'no_kernel_client');
@@ -695,10 +721,14 @@ class ZeroDevConnector extends AccountAbstractionBaseConnector {
                 throw new DynamicError('Failed to prepare user operation for transaction', 'prepare_user_operation_for_transaction');
             }
             const chainId = Number(this.lastUsedChainId);
+            // The userOp hash and WaaS signing context must match the EntryPoint of the
+            // client that prepared this operation — not shared instance state, which can
+            // reflect a different wallet (e.g. a 7702 wallet registered afterwards).
+            const { entryPoint } = provider.account;
             const hash = getUserOperationHash({
                 chainId: chainId,
-                entryPointAddress: this.entryPoint.address,
-                entryPointVersion: this.entryPoint.version,
+                entryPointAddress: entryPoint.address,
+                entryPointVersion: entryPoint.version,
                 userOperation,
             });
             // At this point we know eoaConnector is a WAAS connector
@@ -706,7 +736,7 @@ class ZeroDevConnector extends AccountAbstractionBaseConnector {
                 context: {
                     evmUserOperation: {
                         chainId,
-                        entryPoint: this.entryPoint.address,
+                        entryPoint: entryPoint.address,
                         operation: userOperation,
                     },
                 },

package/src/index.d.ts

@@ -8,9 +8,6 @@ export { getKernelVersion } from './utils/getKernelVersion';
 export { signEip7702Authorization, type SignEip7702AuthorizationParams, } from './utils/signEip7702Authorization';
 export { isZeroDevConnector } from './utils/isZeroDevConnector';
 export type { SignAuthorizationReturnType as Eip7702Authorization } from 'viem/accounts';
-export type { 
-/** @deprecated Use ZerodevBundlerProvider from \@dynamic-labs/sdk-api-core instead */
-ZerodevBundlerProvider as BundlerProvider, } from '@dynamic-labs/sdk-api-core';
 /**
  * Allows defining default values for zerodev configs.
  * Values configured in the dashboard will take precedence over these values.