@dynamic-labs/ethereum-aa 3.4.2 → 3.4.4

package/CHANGELOG.md

@@ -1,4 +1,18 @@
 
+### [3.4.4](https://github.com/dynamic-labs/DynamicAuth/compare/v3.4.3...v3.4.4) (2024-10-24)
+
+### [3.4.3](https://github.com/dynamic-labs/DynamicAuth/compare/v3.4.2...v3.4.3) (2024-10-23)
+
+
+### Features
+
+* add mobile wallet redirect view ([#7168](https://github.com/dynamic-labs/DynamicAuth/issues/7168)) ([#7194](https://github.com/dynamic-labs/DynamicAuth/issues/7194)) ([1d25423](https://github.com/dynamic-labs/DynamicAuth/commit/1d254236e8609847e9ad8a390593ce7741fc10a6))
+
+
+### Bug Fixes
+
+* sdkHasLoaded should check if primaryWallet has finished loading ([#7193](https://github.com/dynamic-labs/DynamicAuth/issues/7193)) ([1b9a0de](https://github.com/dynamic-labs/DynamicAuth/commit/1b9a0de0e279804f808f36a4945a8b2500cc2b7a))
+
 ### [3.4.2](https://github.com/dynamic-labs/DynamicAuth/compare/v3.4.1...v3.4.2) (2024-10-18)
 
 

package/package.cjs

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

package/package.js

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dynamic-labs/ethereum-aa",
-  "version": "3.4.2",
+  "version": "3.4.4",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/dynamic-labs/dynamic-auth.git",
@@ -31,13 +31,13 @@
     "@zerodev/multi-chain-validator": "5.3.3",
     "@zerodev/sdk": "5.3.4",
     "permissionless": "^0.1.20",
-    "@dynamic-labs/assert-package-version": "3.4.2",
-    "@dynamic-labs/ethereum-core": "3.4.2",
-    "@dynamic-labs/logger": "3.4.2",
-    "@dynamic-labs/types": "3.4.2",
-    "@dynamic-labs/utils": "3.4.2",
-    "@dynamic-labs/wallet-book": "3.4.2",
-    "@dynamic-labs/wallet-connector-core": "3.4.2"
+    "@dynamic-labs/assert-package-version": "3.4.4",
+    "@dynamic-labs/ethereum-core": "3.4.4",
+    "@dynamic-labs/logger": "3.4.4",
+    "@dynamic-labs/types": "3.4.4",
+    "@dynamic-labs/utils": "3.4.4",
+    "@dynamic-labs/wallet-book": "3.4.4",
+    "@dynamic-labs/wallet-connector-core": "3.4.4"
   },
   "peerDependencies": {
     "viem": "^2.7.6"

package/src/ZeroDevConnector.cjs

@@ -5,6 +5,7 @@ Object.defineProperty(exports, '__esModule', { value: true });
 
 var _tslib = require('../_virtual/_tslib.cjs');
 var viem = require('viem');
+var accounts = require('viem/accounts');
 var utils$1 = require('permissionless/utils');
 var ethereumCore = require('@dynamic-labs/ethereum-core');
 var walletConnectorCore = require('@dynamic-labs/wallet-connector-core');
@@ -20,7 +21,10 @@ class ZeroDevConnector extends walletConnectorCore.WalletConnectorBase {
     constructor(opts) {
         var _a, _b, _c, _d;
         super(opts);
+        // provider map maintains the kernel clients per chain
         this.providerMap = {};
+        // eoa connector map maintains the eoa address and connector for each smart wallet address
+        this.eoaConnectorMap = {};
         this.ChainWallet = ethereumCore.EthereumWallet;
         this.connectedChain = 'EVM';
         this.supportedChains = ['ETH', 'EVM'];
@@ -113,7 +117,19 @@ class ZeroDevConnector extends walletConnectorCore.WalletConnectorBase {
             utils.StorageService.removeItem(constants.ZERO_DEV_LAST_USED_CHAIN_ID_KEY);
         });
     }
-    setEoaConnector(connector) {
+    registerEoa(_a) {
+        return _tslib.__awaiter(this, arguments, void 0, function* ({ smartWalletAddress, eoaAddress, eoaConnector, shouldSetEoaConnector = false, }) {
+            this.eoaConnectorMap[smartWalletAddress] = {
+                eoaAddress,
+                eoaConnector,
+            };
+            // if this is the primary wallet, set the eoa connector and kernel clients
+            if (shouldSetEoaConnector && this.eoaAddress !== eoaAddress) {
+                yield this.setEoaConnector(eoaAddress, eoaConnector);
+            }
+        });
+    }
+    setEoaConnector(eoaAddress, connector) {
         return _tslib.__awaiter(this, void 0, void 0, function* () {
             if (!connector) {
                 logger.logger.error('No EOA connector provided');
@@ -121,15 +137,13 @@ class ZeroDevConnector extends walletConnectorCore.WalletConnectorBase {
             }
             this.kernelClientDeferredPromise = new utils.DeferredPromise();
             this.eoaConnector = connector;
+            this.eoaAddress = eoaAddress;
             if (ethereumCore.isEthWalletConnector(this.eoaConnector) &&
                 !this.eoaConnector.getActiveAccount()) {
                 yield this.eoaConnector.getConnectedAccounts();
             }
             const signer = yield this.eoaConnector.getSigner();
-            if (!(signer === null || signer === void 0 ? void 0 : signer.account)) {
-                logger.logger.error('No signer account found');
-                return;
-            }
+            signer.account = accounts.toAccount(eoaAddress);
             yield this.generateProviderMap(signer);
             this.evmNetworks = this.evmNetworks.filter((network) => Boolean(this.providerMap[network.chainId]));
             this.kernelClientDeferredPromise.resolve();
@@ -151,6 +165,8 @@ class ZeroDevConnector extends walletConnectorCore.WalletConnectorBase {
     }
     generateProviderMap(signer) {
         return _tslib.__awaiter(this, void 0, void 0, function* () {
+            // reset the chains provider map when eoa connector changes
+            this.providerMap = {};
             for (const provider of this.providersFromApi) {
                 if (!this.providerMap[provider.chain]) {
                     this.providerMap[provider.chain] = {
@@ -394,23 +410,14 @@ class ZeroDevConnector extends walletConnectorCore.WalletConnectorBase {
         });
     }
     validateActiveWallet(expectedAddress) {
-        const _super = Object.create(null, {
-            validateActiveWallet: { get: () => super.validateActiveWallet }
-        });
         return _tslib.__awaiter(this, void 0, void 0, function* () {
-            var _a;
-            const eoaConnector = this === null || this === void 0 ? void 0 : this.eoaConnector;
-            if (eoaConnector && walletConnectorCore.isTurnkeyWalletConnector(eoaConnector)) {
-                const verifiedCredentials = eoaConnector === null || eoaConnector === void 0 ? void 0 : eoaConnector.verifiedCredentials;
-                const expectedEoaAddress = (_a = verifiedCredentials === null || verifiedCredentials === void 0 ? void 0 : verifiedCredentials.find((vc) => vc.smartWalletRefAddress === expectedAddress)) === null || _a === void 0 ? void 0 : _a.address;
-                if (!expectedEoaAddress) {
-                    throw new utils.DynamicError('No EOA connector');
-                }
-                yield (eoaConnector === null || eoaConnector === void 0 ? void 0 : eoaConnector.validateActiveWallet(expectedEoaAddress));
-            }
-            else {
-                yield _super.validateActiveWallet.call(this, expectedAddress);
+            const eoa = this.eoaConnectorMap[expectedAddress];
+            if (!eoa) {
+                throw new utils.DynamicError('No EOA connector');
             }
+            const { eoaAddress, eoaConnector } = eoa;
+            yield eoaConnector.validateActiveWallet(eoaAddress);
+            yield this.setEoaConnector(eoaAddress, eoaConnector);
         });
     }
 }

package/src/ZeroDevConnector.d.ts

@@ -24,7 +24,9 @@ type KernelClient = KernelAccountClient<EntryPoint, Transport, ViemChain, Kernel
 export declare class ZeroDevConnector extends WalletConnectorBase<typeof EthereumWallet> implements IZeroDevConnector {
     clientId: string;
     eoaConnector: InternalWalletConnector | undefined;
+    eoaAddress: string | undefined;
     private providerMap;
+    private eoaConnectorMap;
     ChainWallet: typeof EthereumWallet;
     connectedChain: Chain;
     supportedChains: Chain[];
@@ -76,7 +78,13 @@ export declare class ZeroDevConnector extends WalletConnectorBase<typeof Ethereu
         withSponsorship?: boolean;
     }): KernelClient | undefined;
     endSession(): Promise<void>;
-    setEoaConnector(connector: InternalWalletConnector): Promise<void>;
+    registerEoa({ smartWalletAddress, eoaAddress, eoaConnector, shouldSetEoaConnector, }: {
+        smartWalletAddress: string;
+        eoaAddress: string;
+        eoaConnector: InternalWalletConnector;
+        shouldSetEoaConnector: boolean;
+    }): Promise<void>;
+    private setEoaConnector;
     private warnIfProjectChainNotEnabled;
     private generateProviderMap;
     private getKernelClientWithoutSponsorshipValidation;

package/src/ZeroDevConnector.js

@@ -1,9 +1,10 @@
 'use client'
 import { __awaiter } from '../_virtual/_tslib.js';
 import { publicActions, custom, createWalletClient, isHex, fromHex, formatEther } from 'viem';
+import { toAccount } from 'viem/accounts';
 import { walletClientToSmartAccountSigner } from 'permissionless/utils';
 import { EthereumWallet, confirmationTransport, chainsMap, isEthWalletConnector, unFormatTransaction, createViemUiTransaction } from '@dynamic-labs/ethereum-core';
-import { WalletConnectorBase, eventListenerHandlers, isTurnkeyWalletConnector } from '@dynamic-labs/wallet-connector-core';
+import { WalletConnectorBase, eventListenerHandlers } from '@dynamic-labs/wallet-connector-core';
 import { parseEvmNetworks, StorageService, DeferredPromise, parseChainId, DynamicError, wrapMethodWithCallback, TransactionGasCannotBeSponsoredError, InsufficientFundsError } from '@dynamic-labs/utils';
 import { ZERO_DEV_LAST_USED_CHAIN_ID_KEY } from './constants.js';
 import { logger } from './utils/logger.js';
@@ -16,7 +17,10 @@ class ZeroDevConnector extends WalletConnectorBase {
     constructor(opts) {
         var _a, _b, _c, _d;
         super(opts);
+        // provider map maintains the kernel clients per chain
         this.providerMap = {};
+        // eoa connector map maintains the eoa address and connector for each smart wallet address
+        this.eoaConnectorMap = {};
         this.ChainWallet = EthereumWallet;
         this.connectedChain = 'EVM';
         this.supportedChains = ['ETH', 'EVM'];
@@ -109,7 +113,19 @@ class ZeroDevConnector extends WalletConnectorBase {
             StorageService.removeItem(ZERO_DEV_LAST_USED_CHAIN_ID_KEY);
         });
     }
-    setEoaConnector(connector) {
+    registerEoa(_a) {
+        return __awaiter(this, arguments, void 0, function* ({ smartWalletAddress, eoaAddress, eoaConnector, shouldSetEoaConnector = false, }) {
+            this.eoaConnectorMap[smartWalletAddress] = {
+                eoaAddress,
+                eoaConnector,
+            };
+            // if this is the primary wallet, set the eoa connector and kernel clients
+            if (shouldSetEoaConnector && this.eoaAddress !== eoaAddress) {
+                yield this.setEoaConnector(eoaAddress, eoaConnector);
+            }
+        });
+    }
+    setEoaConnector(eoaAddress, connector) {
         return __awaiter(this, void 0, void 0, function* () {
             if (!connector) {
                 logger.error('No EOA connector provided');
@@ -117,15 +133,13 @@ class ZeroDevConnector extends WalletConnectorBase {
             }
             this.kernelClientDeferredPromise = new DeferredPromise();
             this.eoaConnector = connector;
+            this.eoaAddress = eoaAddress;
             if (isEthWalletConnector(this.eoaConnector) &&
                 !this.eoaConnector.getActiveAccount()) {
                 yield this.eoaConnector.getConnectedAccounts();
             }
             const signer = yield this.eoaConnector.getSigner();
-            if (!(signer === null || signer === void 0 ? void 0 : signer.account)) {
-                logger.error('No signer account found');
-                return;
-            }
+            signer.account = toAccount(eoaAddress);
             yield this.generateProviderMap(signer);
             this.evmNetworks = this.evmNetworks.filter((network) => Boolean(this.providerMap[network.chainId]));
             this.kernelClientDeferredPromise.resolve();
@@ -147,6 +161,8 @@ class ZeroDevConnector extends WalletConnectorBase {
     }
     generateProviderMap(signer) {
         return __awaiter(this, void 0, void 0, function* () {
+            // reset the chains provider map when eoa connector changes
+            this.providerMap = {};
             for (const provider of this.providersFromApi) {
                 if (!this.providerMap[provider.chain]) {
                     this.providerMap[provider.chain] = {
@@ -390,23 +406,14 @@ class ZeroDevConnector extends WalletConnectorBase {
         });
     }
     validateActiveWallet(expectedAddress) {
-        const _super = Object.create(null, {
-            validateActiveWallet: { get: () => super.validateActiveWallet }
-        });
         return __awaiter(this, void 0, void 0, function* () {
-            var _a;
-            const eoaConnector = this === null || this === void 0 ? void 0 : this.eoaConnector;
-            if (eoaConnector && isTurnkeyWalletConnector(eoaConnector)) {
-                const verifiedCredentials = eoaConnector === null || eoaConnector === void 0 ? void 0 : eoaConnector.verifiedCredentials;
-                const expectedEoaAddress = (_a = verifiedCredentials === null || verifiedCredentials === void 0 ? void 0 : verifiedCredentials.find((vc) => vc.smartWalletRefAddress === expectedAddress)) === null || _a === void 0 ? void 0 : _a.address;
-                if (!expectedEoaAddress) {
-                    throw new DynamicError('No EOA connector');
-                }
-                yield (eoaConnector === null || eoaConnector === void 0 ? void 0 : eoaConnector.validateActiveWallet(expectedEoaAddress));
-            }
-            else {
-                yield _super.validateActiveWallet.call(this, expectedAddress);
+            const eoa = this.eoaConnectorMap[expectedAddress];
+            if (!eoa) {
+                throw new DynamicError('No EOA connector');
             }
+            const { eoaAddress, eoaConnector } = eoa;
+            yield eoaConnector.validateActiveWallet(eoaAddress);
+            yield this.setEoaConnector(eoaAddress, eoaConnector);
         });
     }
 }