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

package/src/ZeroDevConnector.js

@@ -1,15 +1,15 @@
 import { __awaiter } from '../_virtual/_tslib.js';
-import { ECDSAProvider, convertWalletClientToAccountSigner } from '@zerodev/sdk';
-import { custom, createWalletClient, isHex, fromHex, formatEther } from 'viem';
+import { createEcdsaKernelAccountClient } from '@zerodev/presets';
+import { publicActions, custom, createWalletClient, isHex, fromHex, formatEther } from 'viem';
+import { walletClientToSmartAccountSigner } from 'permissionless';
 import { WalletConnectorBase } from '@dynamic-labs/wallet-connector-core';
-import { confirmationTransport, unFormatTransaction } from '@dynamic-labs/viem-utils';
+import { confirmationTransport, chainsMap, unFormatTransaction, createViemUiTransaction } from '@dynamic-labs/viem-utils';
 import { parseEvmNetworks, DynamicError, DeferredPromise, wrapMethodWithCallback, TransactionGasCannotBeSponsoredError, InsufficientFundsError } from '@dynamic-labs/utils';
+import { isEthWalletConnector } from '@dynamic-labs/ethereum';
+import { cachedChainIdKey, fetchChain } from './utils/fetchChain.js';
 import { logger } from './utils/logger.js';
 
 class ZeroDevConnector extends WalletConnectorBase {
-    get key() {
-        return 'zerodev';
-    }
     constructor(opts) {
         var _a;
         super(opts);
@@ -18,6 +18,14 @@ class ZeroDevConnector extends WalletConnectorBase {
         this.isGasSponsorshipDisabled = false;
         this.isEmbeddedWallet = true;
         this.name = 'ZeroDev';
+        this.overrideKey = 'zerodev';
+        this.walletFallback = {
+            brand: {
+                alt: 'Smart Wallet',
+                spriteId: 'smartwallet',
+            },
+            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.');
@@ -30,28 +38,44 @@ class ZeroDevConnector extends WalletConnectorBase {
         return this.eoaConnector;
     }
     getAccountAbstractionProvider() {
-        return this.zeroDevProvider;
+        return this.kernelClient;
+    }
+    endSession() {
+        return __awaiter(this, void 0, void 0, function* () {
+            localStorage.removeItem(cachedChainIdKey);
+        });
     }
     setEoaConnector(connector) {
         return __awaiter(this, void 0, void 0, function* () {
-            this.zeroDevProviderDeferredPromise = new DeferredPromise();
+            if (!connector) {
+                logger.error('No EOA connector provided');
+                return;
+            }
+            this.kernelClientDeferredPromise = new DeferredPromise();
             this.eoaConnector = connector;
+            if (isEthWalletConnector(this.eoaConnector) &&
+                !this.eoaConnector.getActiveAccount()) {
+                yield this.eoaConnector.getConnectedAccounts();
+            }
             const signer = yield this.eoaConnector.getSigner();
-            if (!signer) {
+            if (!(signer === null || signer === void 0 ? void 0 : signer.account)) {
+                logger.error('No signer account found');
                 return;
             }
-            const zeroDevProvider = yield ECDSAProvider.init({
-                bundlerProvider: 'STACKUP',
-                owner: convertWalletClientToAccountSigner(signer),
+            const kernelClient = yield createEcdsaKernelAccountClient({
+                chain: yield fetchChain(this.projectId),
+                paymaster: 'NONE',
                 projectId: this.projectId,
+                provider: ZeroDevConnector.bundlerProvider,
+                signer: walletClientToSmartAccountSigner(signer),
             });
-            wrapMethodWithCallback(zeroDevProvider, 'sendUserOperation', (original, ...args) => {
+            wrapMethodWithCallback(kernelClient, 'sendUserOperation', (original, ...args) => {
                 this._walletUiUtils.disabledConfirmationOnce();
                 return original(...args);
             });
-            this.zeroDevProvider = zeroDevProvider;
+            this.kernelClient = kernelClient;
             yield this.checkIsProjectChainEnabled();
-            this.zeroDevProviderDeferredPromise.resolve();
+            this.kernelClientDeferredPromise.resolve();
         });
     }
     checkIsProjectChainEnabled() {
@@ -66,69 +90,67 @@ class ZeroDevConnector extends WalletConnectorBase {
             }
         });
     }
-    getProviderWithSponsorshipValidation() {
+    getKernelClientWithSponsorshipValidation() {
         return __awaiter(this, void 0, void 0, function* () {
-            if (this.providerWithSponsorship) {
-                return this.providerWithSponsorship;
+            if (this.kernelClientWithSponsorship) {
+                return this.kernelClientWithSponsorship;
             }
             const { eoaConnector } = this;
             if (!eoaConnector)
                 throw new DynamicError('No EOA connector');
             const signer = yield eoaConnector.getSigner();
-            this.providerWithSponsorship = yield ECDSAProvider.init({
-                bundlerProvider: 'STACKUP',
-                opts: {
-                    paymasterConfig: {
-                        onlySendSponsoredTransaction: true,
-                        policy: 'VERIFYING_PAYMASTER',
-                    },
-                },
-                owner: convertWalletClientToAccountSigner(signer),
+            this.kernelClientWithSponsorship = yield createEcdsaKernelAccountClient({
+                chain: yield fetchChain(this.projectId),
+                paymaster: 'SPONSOR',
                 projectId: this.projectId,
+                provider: ZeroDevConnector.bundlerProvider,
+                signer: walletClientToSmartAccountSigner(signer),
             });
-            wrapMethodWithCallback(this.providerWithSponsorship, 'sendUserOperation', (original, ...args) => {
+            wrapMethodWithCallback(this.kernelClientWithSponsorship, 'sendUserOperation', (original, ...args) => {
                 this._walletUiUtils.disabledConfirmationOnce();
                 return original(...args);
             });
-            return this.providerWithSponsorship;
+            return this.kernelClientWithSponsorship;
         });
     }
-    fetchPublicAddress() {
-        var _a, _b;
+    getAddress() {
+        var _a, _b, _c;
         return __awaiter(this, void 0, void 0, function* () {
-            yield ((_a = this.zeroDevProviderDeferredPromise) === null || _a === void 0 ? void 0 : _a.promise);
-            return (_b = this.zeroDevProvider) === null || _b === void 0 ? void 0 : _b.getAddress();
+            yield ((_a = this.kernelClientDeferredPromise) === null || _a === void 0 ? void 0 : _a.promise);
+            return (_c = (_b = this.kernelClient) === null || _b === void 0 ? void 0 : _b.account) === null || _c === void 0 ? void 0 : _c.address;
         });
     }
     getConnectedAccounts() {
-        var _a;
+        var _a, _b, _c;
         return __awaiter(this, void 0, void 0, function* () {
-            yield ((_a = this.zeroDevProviderDeferredPromise) === null || _a === void 0 ? void 0 : _a.promise);
-            return this.zeroDevProvider
-                ? [yield this.zeroDevProvider.getAddress()]
+            yield ((_a = this.kernelClientDeferredPromise) === null || _a === void 0 ? void 0 : _a.promise);
+            return ((_c = (_b = this.kernelClient) === null || _b === void 0 ? void 0 : _b.account) === null || _c === void 0 ? void 0 : _c.address)
+                ? [yield this.kernelClient.account.address]
                 : [];
         });
     }
     getNetwork() {
-        var _a, _b;
+        var _a, _b, _c;
         return __awaiter(this, void 0, void 0, function* () {
-            yield ((_a = this.zeroDevProviderDeferredPromise) === null || _a === void 0 ? void 0 : _a.promise);
-            return (_b = this.zeroDevProvider) === null || _b === void 0 ? void 0 : _b.rpcClient.chain.id;
+            yield ((_a = this.kernelClientDeferredPromise) === null || _a === void 0 ? void 0 : _a.promise);
+            return (_c = (_b = this.kernelClient) === null || _b === void 0 ? void 0 : _b.chain) === null || _c === void 0 ? void 0 : _c.id;
         });
     }
     getTransport(provider) {
         const transport = confirmationTransport({
-            connector: this,
             onPersonalSign: ({ message }) => __awaiter(this, void 0, void 0, function* () {
                 this._walletUiUtils.disabledConfirmationOnce();
-                return provider.signMessage(message);
+                return provider.signMessage({
+                    account: provider.account,
+                    message,
+                });
             }),
             onSendTransaction: ({ transaction }) => __awaiter(this, void 0, void 0, function* () {
                 try {
                     this._walletUiUtils.disabledConfirmationOnce();
                     const effectiveProvider = this.isGasSponsorshipDisabled
                         ? provider
-                        : yield this.getProviderWithSponsorshipValidation();
+                        : yield this.getKernelClientWithSponsorshipValidation();
                     const response = yield effectiveProvider.sendTransaction(unFormatTransaction(transaction));
                     return response;
                 }
@@ -146,58 +168,69 @@ class ZeroDevConnector extends WalletConnectorBase {
             onSignTypedData: ({ message }) => __awaiter(this, void 0, void 0, function* () {
                 this._walletUiUtils.disabledConfirmationOnce();
                 const signTypedData = JSON.parse(message);
-                return provider.signTypedData(signTypedData);
+                return provider.signTypedData({
+                    account: provider.account,
+                    domain: signTypedData.domain,
+                    message: signTypedData.message,
+                    primaryType: signTypedData.primaryType,
+                    types: signTypedData.types,
+                });
             }),
-            provider: provider.rpcClient,
+            provider: provider.extend(publicActions),
             transport: custom(provider),
+            walletConnector: this,
             walletUiUtils: this._walletUiUtils,
         });
         return transport;
     }
-    getWalletClient() {
-        const provider = this.zeroDevProvider;
+    getWalletClient(chainId) {
+        var _a;
+        const provider = this.kernelClient;
         if (!provider)
             throw new DynamicError('No provider');
         const transport = this.getTransport(provider);
+        const address = (_a = provider.account) === null || _a === void 0 ? void 0 : _a.address;
         const walletClient = createWalletClient({
+            account: address,
+            chain: chainId ? chainsMap[chainId] : provider.chain,
             transport,
         });
         return walletClient;
     }
     getPublicClient() {
         return __awaiter(this, void 0, void 0, function* () {
-            const provider = this.zeroDevProvider;
+            const provider = this.kernelClient.extend(publicActions);
             if (!provider)
                 throw new DynamicError('No provider');
-            return provider.rpcClient;
+            return provider;
         });
     }
     getSigner() {
         return __awaiter(this, void 0, void 0, function* () {
-            const provider = this.zeroDevProvider;
-            if (!provider)
-                throw new DynamicError('No provider');
-            const transport = this.getTransport(provider);
-            const address = yield provider.getAddress();
-            const walletClient = createWalletClient({
-                account: address,
-                transport,
-            });
-            return walletClient;
+            return this.getWalletClient();
         });
     }
     canSponsorTransactionGas(transaction) {
-        var _a;
         return __awaiter(this, void 0, void 0, function* () {
             try {
+                yield this.getKernelClientWithSponsorshipValidation();
                 const userOperation = {
-                    data: transaction.data ? transaction.data : '0x',
-                    target: transaction.to,
-                    value: isHex(transaction.value)
-                        ? fromHex(transaction.value, 'bigint')
-                        : transaction.value,
+                    callData: yield this.kernelClientWithSponsorship.account.encodeCallData({
+                        data: transaction.data ? transaction.data : '0x',
+                        to: transaction.to,
+                        /**
+                         * if value is undefined, it will be set to 0x0 so the sponsorship
+                         * check does not fail
+                         */
+                        value: transaction.value && isHex(transaction.value)
+                            ? fromHex(transaction.value, 'bigint')
+                            : '0x0',
+                    }),
                 };
-                const result = yield ((_a = this.zeroDevProvider) === null || _a === void 0 ? void 0 : _a.buildUserOperation(userOperation));
+                const result = yield this.kernelClientWithSponsorship.prepareUserOperationRequest({
+                    account: this.kernelClientWithSponsorship.account,
+                    userOperation,
+                });
                 if (!result)
                     return false;
                 return result.paymasterAndData !== '0x';
@@ -212,12 +245,11 @@ class ZeroDevConnector extends WalletConnectorBase {
         this.isGasSponsorshipDisabled = true;
     }
     getBalance() {
-        var _a;
         return __awaiter(this, void 0, void 0, function* () {
-            const rpcClient = yield ((_a = this.zeroDevProvider) === null || _a === void 0 ? void 0 : _a.rpcClient);
+            const rpcClient = this.kernelClient.extend(publicActions);
             if (!rpcClient)
                 throw new DynamicError('No RPC client');
-            const address = yield this.fetchPublicAddress();
+            const address = yield this.getAddress();
             if (!address)
                 return;
             return formatEther(yield rpcClient.getBalance({ address: address }));
@@ -226,7 +258,7 @@ class ZeroDevConnector extends WalletConnectorBase {
     signMessage(messageToSign) {
         return __awaiter(this, void 0, void 0, function* () {
             const client = yield this.getSigner();
-            const account = yield this.fetchPublicAddress();
+            const account = yield this.getAddress();
             if (!account || !client)
                 return;
             return client.signMessage({
@@ -235,6 +267,16 @@ class ZeroDevConnector extends WalletConnectorBase {
             });
         });
     }
+    createUiTransaction(from) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const walletClient = this.getWalletClient();
+            const publicClient = yield this.getPublicClient();
+            if (!publicClient || !walletClient) {
+                throw new DynamicError('No public client available');
+            }
+            return createViemUiTransaction({ from, publicClient, walletClient });
+        });
+    }
 }
 
 export { ZeroDevConnector };

package/src/index.cjs

@@ -6,6 +6,12 @@ var ZeroDevConnector = require('./ZeroDevConnector.cjs');
 var ethereumAa = require('./ethereum-aa.cjs');
 var isZeroDevConnector = require('./utils/isZeroDevConnector.cjs');
 
+const ZeroDevSmartWalletConnectorsWithConfig = ({ bundlerProvider, } = {}) => {
+    if (bundlerProvider) {
+        ZeroDevConnector.ZeroDevConnector.bundlerProvider = bundlerProvider;
+    }
+    return ZeroDevSmartWalletConnectors;
+};
 const ZeroDevSmartWalletConnectors = (props) => {
     var _a;
     if ((_a = props.apiProviders) === null || _a === void 0 ? void 0 : _a.zerodev) {
@@ -17,3 +23,4 @@ const ZeroDevSmartWalletConnectors = (props) => {
 exports.EthereumAaConnector = ethereumAa.EthereumAaConnector;
 exports.isZeroDevConnector = isZeroDevConnector.isZeroDevConnector;
 exports.ZeroDevSmartWalletConnectors = ZeroDevSmartWalletConnectors;
+exports.ZeroDevSmartWalletConnectorsWithConfig = ZeroDevSmartWalletConnectorsWithConfig;

package/src/index.d.ts

@@ -1,4 +1,8 @@
+import { Provider as BundlerProvider } from '@zerodev/presets';
 import { WalletConnectorConstructor } from '@dynamic-labs/wallet-connector-core';
 export * from './ethereum-aa';
 export { isZeroDevConnector } from './utils/isZeroDevConnector';
+export declare const ZeroDevSmartWalletConnectorsWithConfig: ({ bundlerProvider, }?: {
+    bundlerProvider?: BundlerProvider | undefined;
+}) => (props: any) => WalletConnectorConstructor[];
 export declare const ZeroDevSmartWalletConnectors: (props: any) => WalletConnectorConstructor[];

package/src/index.js

@@ -2,6 +2,12 @@ import { ZeroDevConnector } from './ZeroDevConnector.js';
 export { EthereumAaConnector } from './ethereum-aa.js';
 export { isZeroDevConnector } from './utils/isZeroDevConnector.js';
 
+const ZeroDevSmartWalletConnectorsWithConfig = ({ bundlerProvider, } = {}) => {
+    if (bundlerProvider) {
+        ZeroDevConnector.bundlerProvider = bundlerProvider;
+    }
+    return ZeroDevSmartWalletConnectors;
+};
 const ZeroDevSmartWalletConnectors = (props) => {
     var _a;
     if ((_a = props.apiProviders) === null || _a === void 0 ? void 0 : _a.zerodev) {
@@ -10,4 +16,4 @@ const ZeroDevSmartWalletConnectors = (props) => {
     return [];
 };
 
-export { ZeroDevSmartWalletConnectors };
+export { ZeroDevSmartWalletConnectors, ZeroDevSmartWalletConnectorsWithConfig };

package/src/utils/fetchChain.cjs

@@ -0,0 +1,28 @@
+'use strict';
+
+Object.defineProperty(exports, '__esModule', { value: true });
+
+var _tslib = require('../../_virtual/_tslib.cjs');
+var viemUtils = require('@dynamic-labs/viem-utils');
+var logger = require('./logger.cjs');
+
+const cachedChainIdKey = 'dynamic_zd_chain_id';
+const fetchChain = (projectId) => _tslib.__awaiter(void 0, void 0, void 0, function* () {
+    try {
+        const cachedChainId = localStorage.getItem(cachedChainIdKey);
+        if (cachedChainId) {
+            return viemUtils.chainsMap[cachedChainId];
+        }
+        const response = yield (yield fetch(`https://prod-api.zerodev.app/projects/${projectId}`)).json();
+        localStorage.setItem(cachedChainIdKey, response.chainId);
+        return viemUtils.chainsMap[response.chainId];
+    }
+    catch (err) {
+        logger.logger.error('Failed to fetch ZeroDev project settings from ZeroDev API ' +
+            'This is needed to fetch the chain id so that we know which chain the smart contract is on');
+        throw err;
+    }
+});
+
+exports.cachedChainIdKey = cachedChainIdKey;
+exports.fetchChain = fetchChain;

package/src/utils/fetchChain.d.ts

@@ -0,0 +1,3 @@
+import { type Chain } from 'viem/chains';
+export declare const cachedChainIdKey = "dynamic_zd_chain_id";
+export declare const fetchChain: (projectId: string) => Promise<Chain>;

package/src/utils/fetchChain.js

@@ -0,0 +1,23 @@
+import { __awaiter } from '../../_virtual/_tslib.js';
+import { chainsMap } from '@dynamic-labs/viem-utils';
+import { logger } from './logger.js';
+
+const cachedChainIdKey = 'dynamic_zd_chain_id';
+const fetchChain = (projectId) => __awaiter(void 0, void 0, void 0, function* () {
+    try {
+        const cachedChainId = localStorage.getItem(cachedChainIdKey);
+        if (cachedChainId) {
+            return chainsMap[cachedChainId];
+        }
+        const response = yield (yield fetch(`https://prod-api.zerodev.app/projects/${projectId}`)).json();
+        localStorage.setItem(cachedChainIdKey, response.chainId);
+        return chainsMap[response.chainId];
+    }
+    catch (err) {
+        logger.error('Failed to fetch ZeroDev project settings from ZeroDev API ' +
+            'This is needed to fetch the chain id so that we know which chain the smart contract is on');
+        throw err;
+    }
+});
+
+export { cachedChainIdKey, fetchChain };

package/src/utils/index.d.ts

@@ -0,0 +1,3 @@
+export * from './fetchChain';
+export * from './logger';
+export * from './isZeroDevConnector';