@dynamic-labs/ethereum-aa 4.0.0-alpha.3 → 4.0.0-alpha.31

package/src/ZeroDevConnector.cjs

@@ -4,28 +4,33 @@
 Object.defineProperty(exports, '__esModule', { value: true });
 
 var _tslib = require('../_virtual/_tslib.cjs');
-var multiChainValidator = require('@zerodev/multi-chain-validator');
 var viem = require('viem');
+var accounts = require('viem/accounts');
 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);
+        // 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'];
         this.isGasSponsorshipDisabled = false;
         this.isEmbeddedWallet = true;
+        this.providersFromApi = [];
         this.name = 'ZeroDev';
         this.overrideKey = 'zerodev';
         this.walletFallback = {
@@ -35,59 +40,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;
+    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 if (entryPoint === sdkApiCore.ProviderEntryPointVersionEnum.V6) {
-            return utils$1.ENTRYPOINT_ADDRESS_V06;
-        }
-        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,35 +114,120 @@ 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) {
-        return _tslib.__awaiter(this, void 0, void 0, function* () {
+    registerEoa(_a) {
+        return _tslib.__awaiter(this, arguments, void 0, function* ({ smartWalletAddress, eoaAddress, eoaConnector, shouldSetEoaConnector = false, ecdsaProviderType, kernelVersion, entryPointVersion, }) {
+            const properties = {
+                ecdsaProviderType,
+                entryPointVersion,
+                kernelVersion,
+            };
+            this.eoaConnectorMap[smartWalletAddress] = {
+                eoaAddress,
+                eoaConnector,
+                properties,
+            };
+            // if this is the primary wallet, set the eoa connector and kernel clients
+            if (shouldSetEoaConnector && this.eoaAddress !== eoaAddress) {
+                yield this.setEoaConnector({
+                    connector: eoaConnector,
+                    eoaAddress,
+                    properties,
+                });
+            }
+        });
+    }
+    setEoaConnector(_a) {
+        return _tslib.__awaiter(this, arguments, void 0, function* ({ eoaAddress, connector, properties, }) {
+            var _b;
             if (!connector) {
                 logger.logger.error('No EOA connector provided');
                 return;
             }
             this.kernelClientDeferredPromise = new utils.DeferredPromise();
             this.eoaConnector = connector;
+            this.eoaAddress = eoaAddress;
+            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;
+            }
             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();
+        });
+    }
+    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* () {
+            // reset the chains provider map when eoa connector changes
+            this.providerMap = {};
+            yield Promise.all(this.providersFromApi.map((provider) => _tslib.__awaiter(this, void 0, void 0, function* () {
+                if (!this.providerMap[provider.chain]) {
+                    const [kernelClient, kernelClientWithSponsorship] = yield Promise.all([
+                        this.getKernelClientWithoutSponsorshipValidation({
+                            chainId: provider.chain,
+                            projectId: provider.clientId,
+                            signer,
+                        }),
+                        this.getKernelClientWithSponsorshipValidation({
+                            chainId: provider.chain,
+                            projectId: provider.clientId,
+                            signer,
+                        }),
+                    ]);
+                    this.providerMap[provider.chain] = {
+                        kernelClient,
+                        kernelClientWithSponsorship,
+                    };
+                }
+                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 +235,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();
-        });
-    }
-    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).`);
-            }
+            return kernelClient;
         });
     }
-    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 +303,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 +344,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 +359,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 +371,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',
@@ -351,23 +435,18 @@ 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, properties } = eoa;
+            yield eoaConnector.validateActiveWallet(eoaAddress);
+            yield this.setEoaConnector({
+                connector: eoaConnector,
+                eoaAddress,
+                properties,
+            });
         });
     }
 }