@dynamic-labs/ethereum-aa 4.0.0-alpha.6 → 4.0.0-alpha.8

package/CHANGELOG.md

@@ -1,4 +1,36 @@
 
+## [4.0.0-alpha.8](https://github.com/dynamic-labs/dynamic-auth/compare/v4.0.0-alpha.7...v4.0.0-alpha.8) (2024-10-07)
+
+
+### Features
+
+* add support for dynamic event callbacks in rn ([#6997](https://github.com/dynamic-labs/dynamic-auth/issues/6997)) ([f9ac402](https://github.com/dynamic-labs/dynamic-auth/commit/f9ac40259d9168dfe69dafd5fd44478ba0e69505))
+* add support for dynamic handlers in rn ([#7032](https://github.com/dynamic-labs/dynamic-auth/issues/7032)) ([f61f926](https://github.com/dynamic-labs/dynamic-auth/commit/f61f92666b6df8483dde2c47304fd4fb02690f7d))
+* Support for multi-chain AA ([#6829](https://github.com/dynamic-labs/dynamic-auth/issues/6829)) ([b4a0c0a](https://github.com/dynamic-labs/dynamic-auth/commit/b4a0c0a4de48231a3748826600407c25abf6894d))
+
+
+### Bug Fixes
+
+* persist isHardwareWalletEnabled on wallet connector ([#7025](https://github.com/dynamic-labs/dynamic-auth/issues/7025)) ([#7034](https://github.com/dynamic-labs/dynamic-auth/issues/7034)) ([4bfc301](https://github.com/dynamic-labs/dynamic-auth/commit/4bfc301d891f10db8c0bd31e5164c489a882c5c3))
+
+## [4.0.0-alpha.7](https://github.com/dynamic-labs/dynamic-auth/compare/v4.0.0-alpha.6...v4.0.0-alpha.7) (2024-10-03)
+
+
+### Features
+
+* add account abstraction module to client ([#7002](https://github.com/dynamic-labs/dynamic-auth/issues/7002)) ([2f06975](https://github.com/dynamic-labs/dynamic-auth/commit/2f06975083dfa9d40537ef4a99b414eda1a68e01))
+* add support for wallet events in rn ([#7061](https://github.com/dynamic-labs/dynamic-auth/issues/7061)) ([c7c4ce5](https://github.com/dynamic-labs/dynamic-auth/commit/c7c4ce51f27a2b84a1710c120d7006a00920c1e7))
+* add zerodev extension for react native ([#7028](https://github.com/dynamic-labs/dynamic-auth/issues/7028)) ([858b8a8](https://github.com/dynamic-labs/dynamic-auth/commit/858b8a851cfa0cddc8e4559541b03992cf5ccdfc))
+
+
+### Bug Fixes
+
+* do not modify sol tx blockhash as tx could have been signed already ([#7050](https://github.com/dynamic-labs/dynamic-auth/issues/7050)) ([770edb4](https://github.com/dynamic-labs/dynamic-auth/commit/770edb49ddc231b75fb45a9f6d563f22e5185df2))
+* ensure the correct auth mode is used on social redirect ([#7047](https://github.com/dynamic-labs/dynamic-auth/issues/7047)) ([7c27172](https://github.com/dynamic-labs/dynamic-auth/commit/7c271721d5ddf19e3fd1bf56ddb1d49e0e2bca07))
+* prevent react native message timeout before sdk is ready ([#7051](https://github.com/dynamic-labs/dynamic-auth/issues/7051)) ([6421237](https://github.com/dynamic-labs/dynamic-auth/commit/6421237d677d788b824d53432c1a75b9d571aa78))
+* update version error text ([#7054](https://github.com/dynamic-labs/dynamic-auth/issues/7054)) ([713dacb](https://github.com/dynamic-labs/dynamic-auth/commit/713dacb79c2513323c2e6840d7418716011c2dcd))
+* use project settings sdk network for send flow ([#7011](https://github.com/dynamic-labs/dynamic-auth/issues/7011)) ([983e796](https://github.com/dynamic-labs/dynamic-auth/commit/983e79632762f71ee0502c92057a32ea985ae19c))
+
 ## [4.0.0-alpha.6](https://github.com/dynamic-labs/dynamic-auth/compare/v4.0.0-alpha.5...v4.0.0-alpha.6) (2024-10-01)
 
 

package/package.cjs

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

package/package.js

@@ -1,4 +1,4 @@
 'use client'
-var version = "4.0.0-alpha.6";
+var version = "4.0.0-alpha.8";
 
 export { version };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dynamic-labs/ethereum-aa",
-  "version": "4.0.0-alpha.6",
+  "version": "4.0.0-alpha.8",
   "description": "A React SDK for implementing wallet web3 authentication and authorization to your website.",
   "author": "Dynamic Labs, Inc.",
   "license": "MIT",
@@ -23,13 +23,13 @@
     "@zerodev/multi-chain-validator": "5.3.3",
     "@zerodev/sdk": "5.3.4",
     "permissionless": "^0.1.20",
-    "@dynamic-labs/assert-package-version": "4.0.0-alpha.6",
-    "@dynamic-labs/ethereum-core": "4.0.0-alpha.6",
-    "@dynamic-labs/logger": "4.0.0-alpha.6",
-    "@dynamic-labs/types": "4.0.0-alpha.6",
-    "@dynamic-labs/utils": "4.0.0-alpha.6",
-    "@dynamic-labs/wallet-book": "4.0.0-alpha.6",
-    "@dynamic-labs/wallet-connector-core": "4.0.0-alpha.6"
+    "@dynamic-labs/assert-package-version": "4.0.0-alpha.8",
+    "@dynamic-labs/ethereum-core": "4.0.0-alpha.8",
+    "@dynamic-labs/logger": "4.0.0-alpha.8",
+    "@dynamic-labs/types": "4.0.0-alpha.8",
+    "@dynamic-labs/utils": "4.0.0-alpha.8",
+    "@dynamic-labs/wallet-book": "4.0.0-alpha.8",
+    "@dynamic-labs/wallet-connector-core": "4.0.0-alpha.8"
   },
   "peerDependencies": {
     "viem": "^2.7.6"

package/src/ZeroDevConnector.cjs

@@ -4,28 +4,29 @@
 Object.defineProperty(exports, '__esModule', { value: true });
 
 var _tslib = require('../_virtual/_tslib.cjs');
-var multiChainValidator = require('@zerodev/multi-chain-validator');
 var viem = require('viem');
 var utils$1 = require('permissionless/utils');
-var constants = require('@zerodev/sdk/constants');
-var ecdsaValidator = require('@zerodev/ecdsa-validator');
-var sdkApiCore = require('@dynamic-labs/sdk-api-core');
-var walletConnectorCore = require('@dynamic-labs/wallet-connector-core');
 var ethereumCore = require('@dynamic-labs/ethereum-core');
+var walletConnectorCore = require('@dynamic-labs/wallet-connector-core');
 var utils = require('@dynamic-labs/utils');
-var fetchChain = require('./utils/fetchChain.cjs');
+var constants = require('./constants.cjs');
 var logger = require('./utils/logger.cjs');
 var createEcsdaKernelAccountClient = require('./utils/createEcsdaKernelAccountClient.cjs');
+var getEcdsaValidator = require('./utils/getEcdsaValidator.cjs');
+var getEntryPoint = require('./utils/getEntryPoint.cjs');
+var getKernelVersion = require('./utils/getKernelVersion.cjs');
 
 class ZeroDevConnector extends walletConnectorCore.WalletConnectorBase {
     constructor(opts) {
         var _a, _b, _c, _d;
         super(opts);
+        this.providerMap = {};
         this.ChainWallet = ethereumCore.EthereumWallet;
         this.connectedChain = 'EVM';
         this.supportedChains = ['ETH', 'EVM'];
         this.isGasSponsorshipDisabled = false;
         this.isEmbeddedWallet = true;
+        this.providersFromApi = [];
         this.name = 'ZeroDev';
         this.overrideKey = 'zerodev';
         this.walletFallback = {
@@ -35,59 +36,64 @@ class ZeroDevConnector extends walletConnectorCore.WalletConnectorBase {
             },
             name: 'ZeroDev',
         };
-        const zeroDevProjectId = (_a = opts.apiProviders.zerodev) === null || _a === void 0 ? void 0 : _a.clientId;
-        if (!zeroDevProjectId) {
-            throw new Error('Missing ZeroDev project ID provided. Add your ZeroDev project id to your project configuration via the Dynamic Labs dashboard.');
-        }
-        this.projectId = zeroDevProjectId;
         this._walletUiUtils = opts.walletUiUtils;
         this.evmNetworks = utils.parseEvmNetworks(opts.evmNetworks);
-        this.entryPoint = this.getEntryPoint((_b = opts.apiProviders.zerodev) === null || _b === void 0 ? void 0 : _b.entryPointVersion);
-        this.kernelVersion = this.getKernelVersion((_c = opts.apiProviders.zerodev) === null || _c === void 0 ? void 0 : _c.kernelVersion);
+        this.entryPoint = getEntryPoint.getEntryPoint((_a = opts.apiProviders.zerodev) === null || _a === void 0 ? void 0 : _a.entryPointVersion);
+        this.kernelVersion = getKernelVersion.getKernelVersion((_b = opts.apiProviders.zerodev) === null || _b === void 0 ? void 0 : _b.kernelVersion, this.entryPoint);
+        // this is the list of providers from the api that are used for multi-chain account abstraction
+        this.providersFromApi =
+            ((_c = opts.apiProviders.zerodev) === null || _c === void 0 ? void 0 : _c.multichainAccountAbstractionProviders) || [];
+        const [defaultProvider] = this.providersFromApi;
+        this.clientId = defaultProvider === null || defaultProvider === void 0 ? void 0 : defaultProvider.clientId;
+        if (!this.clientId) {
+            throw new Error('Missing ZeroDev project ID provided. Add your ZeroDev project id to your project configuration via the Dynamic Labs dashboard.');
+        }
+        this.defaultChainId = defaultProvider === null || defaultProvider === void 0 ? void 0 : defaultProvider.chain;
         this.ecdsaProviderType = (_d = opts.apiProviders.zerodev) === null || _d === void 0 ? void 0 : _d.ecdsaProviderType;
     }
-    getEntryPoint(entryPoint) {
-        if (entryPoint === undefined ||
-            entryPoint === sdkApiCore.ProviderEntryPointVersionEnum.V7) {
-            return utils$1.ENTRYPOINT_ADDRESS_V07;
-        }
-        else if (entryPoint === sdkApiCore.ProviderEntryPointVersionEnum.V6) {
-            return utils$1.ENTRYPOINT_ADDRESS_V06;
+    get currentNetworkProvider() {
+        // check if the last used chain id is in the provider map
+        if (this.providerMap[this.lastUsedChainId]) {
+            return this.providerMap[this.lastUsedChainId];
         }
-        else {
-            logger.logger.error('Invalid entry point version', entryPoint);
-            return utils$1.ENTRYPOINT_ADDRESS_V07;
+        // if not, check if the default chain id is in the provider map
+        if (this.defaultChainId) {
+            return this.providerMap[this.defaultChainId];
         }
+        // if no chain id is found, return undefined
+        return undefined;
     }
-    getKernelVersion(kernelVersion) {
-        if (kernelVersion === sdkApiCore.ProviderKernelVersionEnum.V31 ||
-            (kernelVersion === undefined &&
-                this.entryPoint === utils$1.ENTRYPOINT_ADDRESS_V07)) {
-            return constants.KERNEL_V3_1;
-        }
-        else if (kernelVersion === sdkApiCore.ProviderKernelVersionEnum.V30) {
-            return constants.KERNEL_V3_0;
-        }
-        else if (kernelVersion === sdkApiCore.ProviderKernelVersionEnum.V24 ||
-            this.entryPoint === utils$1.ENTRYPOINT_ADDRESS_V06 // v0.6 only supports v2.4
-        ) {
-            return constants.KERNEL_V2_4;
-        }
-        else {
-            logger.logger.error('Invalid kernel version', kernelVersion);
-            return constants.KERNEL_V3_1;
-        }
+    get lastUsedChainId() {
+        var _a;
+        const storedChainId = utils.StorageService.getItem(constants.ZERO_DEV_LAST_USED_CHAIN_ID_KEY);
+        // returning string of unknown if no chain id is found to result in undefined provider lookup
+        return (_a = storedChainId !== null && storedChainId !== void 0 ? storedChainId : this.defaultChainId) !== null && _a !== void 0 ? _a : 'unknown';
     }
-    getEcdsaValidator(ecdsaProviderType) {
-        if (ecdsaProviderType === 'zerodev_signer_to_ecdsa') {
-            return ecdsaValidator.signerToEcdsaValidator;
-        }
-        else if (ecdsaProviderType === 'zerodev_multi_chain') {
-            return multiChainValidator.toMultiChainECDSAValidator;
-        }
-        else {
-            return ecdsaValidator.signerToEcdsaValidator;
-        }
+    get kernelClient() {
+        var _a;
+        return (_a = this.currentNetworkProvider) === null || _a === void 0 ? void 0 : _a.kernelClient;
+    }
+    get kernelClientWithSponsorship() {
+        var _a;
+        return (_a = this.currentNetworkProvider) === null || _a === void 0 ? void 0 : _a.kernelClientWithSponsorship;
+    }
+    supportsNetworkSwitching() {
+        return (Object.keys(this.providerMap).length > 1 && this.evmNetworks.length > 1);
+    }
+    switchNetwork(_a) {
+        return _tslib.__awaiter(this, arguments, void 0, function* ({ networkChainId, }) {
+            if (!this.supportsNetworkSwitching())
+                return;
+            if (!networkChainId)
+                return;
+            const chainId = networkChainId.toString();
+            if (!this.providerMap[chainId]) {
+                throw new Error(`No provider found for chainId: ${chainId}`);
+            }
+            utils.StorageService.setItem(constants.ZERO_DEV_LAST_USED_CHAIN_ID_KEY, chainId);
+            const { handleChainChange } = walletConnectorCore.eventListenerHandlers(this);
+            handleChainChange(chainId);
+        });
     }
     /**
      * @deprecated You should get the EOA connector by passing the SCW to getEOAConnector,
@@ -104,7 +110,7 @@ class ZeroDevConnector extends walletConnectorCore.WalletConnectorBase {
     }
     endSession() {
         return _tslib.__awaiter(this, void 0, void 0, function* () {
-            localStorage.removeItem(fetchChain.cachedChainIdKey);
+            utils.StorageService.removeItem(constants.ZERO_DEV_LAST_USED_CHAIN_ID_KEY);
         });
     }
     setEoaConnector(connector) {
@@ -124,15 +130,63 @@ class ZeroDevConnector extends walletConnectorCore.WalletConnectorBase {
                 logger.logger.error('No signer account found');
                 return;
             }
+            yield this.generateProviderMap(signer);
+            this.evmNetworks = this.evmNetworks.filter((network) => Boolean(this.providerMap[network.chainId]));
+            this.kernelClientDeferredPromise.resolve();
+        });
+    }
+    warnIfProjectChainNotEnabled(chainId) {
+        return _tslib.__awaiter(this, void 0, void 0, function* () {
+            var _a;
+            let chainIdToCheck = chainId;
+            if (!chainIdToCheck) {
+                const client = yield this.getPublicClient();
+                chainIdToCheck = (_a = client === null || client === void 0 ? void 0 : client.chain) === null || _a === void 0 ? void 0 : _a.id;
+            }
+            const isProjectChainEnabled = this.evmNetworks.some((network) => network.chainId === chainIdToCheck);
+            if (!isProjectChainEnabled) {
+                logger.logger.error(`Please make sure to enable (${chainIdToCheck}) in the Dynamic dashboard (https://app.dynamic.xyz/dashboard/configurations#evm).`);
+            }
+        });
+    }
+    generateProviderMap(signer) {
+        return _tslib.__awaiter(this, void 0, void 0, function* () {
+            for (const provider of this.providersFromApi) {
+                if (!this.providerMap[provider.chain]) {
+                    this.providerMap[provider.chain] = {
+                        kernelClient: yield this.getKernelClientWithoutSponsorshipValidation({
+                            chainId: provider.chain,
+                            projectId: provider.clientId,
+                            signer,
+                        }),
+                        kernelClientWithSponsorship: yield this.getKernelClientWithSponsorshipValidation({
+                            chainId: provider.chain,
+                            projectId: provider.clientId,
+                            signer,
+                        }),
+                    };
+                }
+                yield this.warnIfProjectChainNotEnabled(utils.parseChainId(provider.chain));
+            }
+        });
+    }
+    getKernelClientWithoutSponsorshipValidation(_a) {
+        return _tslib.__awaiter(this, arguments, void 0, function* ({ projectId, signer, chainId, }) {
+            if (chainId && this.providerMap[chainId]) {
+                return this.providerMap[chainId].kernelClient;
+            }
+            const { eoaConnector } = this;
+            if (!eoaConnector)
+                throw new utils.DynamicError('No EOA connector');
             const kernelClient = yield createEcsdaKernelAccountClient.createEcdsaKernelAccountClient({
                 bundlerRpc: ZeroDevConnector.bundlerRpc,
-                chain: yield fetchChain.fetchChain(this.projectId),
-                ecdsaValidator: this.getEcdsaValidator(this.ecdsaProviderType),
+                chain: ethereumCore.chainsMap[chainId],
+                ecdsaValidator: getEcdsaValidator.getEcdsaValidator(this.ecdsaProviderType),
                 entryPointAddress: this.entryPoint,
                 kernelVersion: this.kernelVersion,
                 paymaster: 'NONE',
                 paymasterRpc: ZeroDevConnector.paymasterRpc,
-                projectId: this.projectId,
+                projectId,
                 provider: ZeroDevConnector.bundlerProvider,
                 signer: utils$1.walletClientToSmartAccountSigner(signer),
             });
@@ -140,51 +194,34 @@ class ZeroDevConnector extends walletConnectorCore.WalletConnectorBase {
                 this._walletUiUtils.disabledConfirmationOnce();
                 return original(...args);
             });
-            this.kernelClient = kernelClient;
-            // set the provider with sponsorship enabled
-            yield this.getKernelClientWithSponsorshipValidation();
-            yield this.checkIsProjectChainEnabled();
-            this.kernelClientDeferredPromise.resolve();
+            return kernelClient;
         });
     }
-    checkIsProjectChainEnabled() {
-        return _tslib.__awaiter(this, void 0, void 0, function* () {
-            var _a, _b;
-            const client = yield this.getPublicClient();
-            const chainName = (_a = client === null || client === void 0 ? void 0 : client.chain) === null || _a === void 0 ? void 0 : _a.name;
-            const chainId = (_b = client === null || client === void 0 ? void 0 : client.chain) === null || _b === void 0 ? void 0 : _b.id;
-            const isProjectChainEnabled = this.evmNetworks.some((network) => network.chainId === chainId);
-            if (!isProjectChainEnabled) {
-                logger.logger.error(`Please make sure to enable ${chainName} (${chainId}) in the Dynamic dashboard (https://app.dynamic.xyz/dashboard/configurations#evm).`);
-            }
-        });
-    }
-    getKernelClientWithSponsorshipValidation() {
-        return _tslib.__awaiter(this, void 0, void 0, function* () {
-            if (this.kernelClientWithSponsorship) {
-                return this.kernelClientWithSponsorship;
+    getKernelClientWithSponsorshipValidation(_a) {
+        return _tslib.__awaiter(this, arguments, void 0, function* ({ projectId, signer, chainId, }) {
+            if (chainId && this.providerMap[chainId]) {
+                return this.providerMap[chainId].kernelClientWithSponsorship;
             }
             const { eoaConnector } = this;
             if (!eoaConnector)
                 throw new utils.DynamicError('No EOA connector');
-            const signer = yield eoaConnector.getSigner();
-            this.kernelClientWithSponsorship = yield createEcsdaKernelAccountClient.createEcdsaKernelAccountClient({
+            const kernelClientWithSponsorship = yield createEcsdaKernelAccountClient.createEcdsaKernelAccountClient({
                 bundlerRpc: ZeroDevConnector.bundlerRpc,
-                chain: yield fetchChain.fetchChain(this.projectId),
-                ecdsaValidator: this.getEcdsaValidator(this.ecdsaProviderType),
+                chain: ethereumCore.chainsMap[chainId],
+                ecdsaValidator: getEcdsaValidator.getEcdsaValidator(this.ecdsaProviderType),
                 entryPointAddress: this.entryPoint,
                 kernelVersion: this.kernelVersion,
                 paymaster: 'SPONSOR',
                 paymasterRpc: ZeroDevConnector.paymasterRpc,
-                projectId: this.projectId,
+                projectId,
                 provider: ZeroDevConnector.bundlerProvider,
                 signer: utils$1.walletClientToSmartAccountSigner(signer),
             });
-            utils.wrapMethodWithCallback(this.kernelClientWithSponsorship, 'sendUserOperation', (original, ...args) => {
+            utils.wrapMethodWithCallback(kernelClientWithSponsorship, 'sendUserOperation', (original, ...args) => {
                 this._walletUiUtils.disabledConfirmationOnce();
                 return original(...args);
             });
-            return this.kernelClientWithSponsorship;
+            return kernelClientWithSponsorship;
         });
     }
     getAddress() {
@@ -225,7 +262,10 @@ class ZeroDevConnector extends walletConnectorCore.WalletConnectorBase {
                     this._walletUiUtils.disabledConfirmationOnce();
                     const effectiveProvider = this.isGasSponsorshipDisabled
                         ? provider
-                        : yield this.getKernelClientWithSponsorshipValidation();
+                        : this.kernelClientWithSponsorship;
+                    if (!effectiveProvider) {
+                        throw new utils.DynamicError('No provider');
+                    }
                     const response = yield effectiveProvider.sendTransaction(ethereumCore.unFormatTransaction(transaction));
                     return response;
                 }
@@ -263,7 +303,7 @@ class ZeroDevConnector extends walletConnectorCore.WalletConnectorBase {
         var _a;
         const provider = this.kernelClient;
         if (!provider)
-            throw new utils.DynamicError('No provider');
+            return undefined;
         const transport = this.getTransport(provider);
         const address = (_a = provider.account) === null || _a === void 0 ? void 0 : _a.address;
         const walletClient = viem.createWalletClient({
@@ -278,7 +318,7 @@ class ZeroDevConnector extends walletConnectorCore.WalletConnectorBase {
             var _a;
             const provider = (_a = this.kernelClient) === null || _a === void 0 ? void 0 : _a.extend(viem.publicActions);
             if (!provider)
-                throw new utils.DynamicError('No provider');
+                return undefined;
             return provider;
         });
     }
@@ -290,7 +330,10 @@ class ZeroDevConnector extends walletConnectorCore.WalletConnectorBase {
     canSponsorTransactionGas(transaction) {
         return _tslib.__awaiter(this, void 0, void 0, function* () {
             try {
-                const kernelClientWithSponsorship = yield this.getKernelClientWithSponsorshipValidation();
+                const { kernelClientWithSponsorship } = this;
+                if (!kernelClientWithSponsorship) {
+                    throw new utils.DynamicError('No kernel client with sponsorship found');
+                }
                 const userOperation = {
                     callData: yield kernelClientWithSponsorship.account.encodeCallData({
                         data: transaction.data ? transaction.data : '0x',