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

package/src/ZeroDevConnector.cjs

@@ -5,7 +5,8 @@ Object.defineProperty(exports, '__esModule', { value: true });
 
 var _tslib = require('../_virtual/_tslib.cjs');
 var viem = require('viem');
-var utils$1 = require('permissionless/utils');
+var accounts = require('viem/accounts');
+var constants$1 = require('@zerodev/sdk/constants');
 var ethereumCore = require('@dynamic-labs/ethereum-core');
 var walletConnectorCore = require('@dynamic-labs/wallet-connector-core');
 var utils = require('@dynamic-labs/utils');
@@ -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,23 +117,54 @@ class ZeroDevConnector extends walletConnectorCore.WalletConnectorBase {
             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();
@@ -151,23 +186,29 @@ class ZeroDevConnector extends walletConnectorCore.WalletConnectorBase {
     }
     generateProviderMap(signer) {
         return _tslib.__awaiter(this, void 0, void 0, function* () {
-            for (const provider of this.providersFromApi) {
+            // 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]) {
-                    this.providerMap[provider.chain] = {
-                        kernelClient: yield this.getKernelClientWithoutSponsorshipValidation({
+                    const [kernelClient, kernelClientWithSponsorship] = yield Promise.all([
+                        this.getKernelClientWithoutSponsorshipValidation({
                             chainId: provider.chain,
                             projectId: provider.clientId,
                             signer,
                         }),
-                        kernelClientWithSponsorship: yield this.getKernelClientWithSponsorshipValidation({
+                        this.getKernelClientWithSponsorshipValidation({
                             chainId: provider.chain,
                             projectId: provider.clientId,
                             signer,
                         }),
+                    ]);
+                    this.providerMap[provider.chain] = {
+                        kernelClient,
+                        kernelClientWithSponsorship,
                     };
                 }
                 yield this.warnIfProjectChainNotEnabled(utils.parseChainId(provider.chain));
-            }
+            })));
         });
     }
     getKernelClientWithoutSponsorshipValidation(_a) {
@@ -182,13 +223,13 @@ class ZeroDevConnector extends walletConnectorCore.WalletConnectorBase {
                 bundlerRpc: ZeroDevConnector.bundlerRpc,
                 chain: ethereumCore.chainsMap[chainId],
                 ecdsaValidator: getEcdsaValidator.getEcdsaValidator(this.ecdsaProviderType),
-                entryPointAddress: this.entryPoint,
+                entryPoint: this.entryPoint,
                 kernelVersion: this.kernelVersion,
                 paymaster: 'NONE',
                 paymasterRpc: ZeroDevConnector.paymasterRpc,
                 projectId,
                 provider: ZeroDevConnector.bundlerProvider,
-                signer: utils$1.walletClientToSmartAccountSigner(signer),
+                signer,
             });
             utils.wrapMethodWithCallback(kernelClient, 'sendUserOperation', (original, ...args) => {
                 this._walletUiUtils.disabledConfirmationOnce();
@@ -209,13 +250,13 @@ class ZeroDevConnector extends walletConnectorCore.WalletConnectorBase {
                 bundlerRpc: ZeroDevConnector.bundlerRpc,
                 chain: ethereumCore.chainsMap[chainId],
                 ecdsaValidator: getEcdsaValidator.getEcdsaValidator(this.ecdsaProviderType),
-                entryPointAddress: this.entryPoint,
+                entryPoint: this.entryPoint,
                 kernelVersion: this.kernelVersion,
                 paymaster: 'SPONSOR',
                 paymasterRpc: ZeroDevConnector.paymasterRpc,
                 projectId,
                 provider: ZeroDevConnector.bundlerProvider,
-                signer: utils$1.walletClientToSmartAccountSigner(signer),
+                signer,
             });
             utils.wrapMethodWithCallback(kernelClientWithSponsorship, 'sendUserOperation', (original, ...args) => {
                 this._walletUiUtils.disabledConfirmationOnce();
@@ -253,7 +294,6 @@ class ZeroDevConnector extends walletConnectorCore.WalletConnectorBase {
             onPersonalSign: (_a) => _tslib.__awaiter(this, [_a], void 0, function* ({ message }) {
                 this._walletUiUtils.disabledConfirmationOnce();
                 return provider.signMessage({
-                    account: provider.account,
                     message,
                 });
             }),
@@ -284,7 +324,6 @@ class ZeroDevConnector extends walletConnectorCore.WalletConnectorBase {
                 this._walletUiUtils.disabledConfirmationOnce();
                 const signTypedData = JSON.parse(message);
                 return provider.signTypedData({
-                    account: provider.account,
                     domain: signTypedData.domain,
                     message: signTypedData.message,
                     primaryType: signTypedData.primaryType,
@@ -300,14 +339,12 @@ class ZeroDevConnector extends walletConnectorCore.WalletConnectorBase {
         return transport;
     }
     getWalletClient(chainId) {
-        var _a;
         const provider = this.kernelClient;
         if (!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({
-            account: address,
+            account: accounts.toAccount(provider.account.address),
             chain: chainId ? ethereumCore.chainsMap[chainId] : provider.chain,
             transport,
         });
@@ -327,38 +364,109 @@ class ZeroDevConnector extends walletConnectorCore.WalletConnectorBase {
             return this.getWalletClient();
         });
     }
-    canSponsorTransactionGas(transaction) {
+    formatUserOperation(params) {
+        return _tslib.__awaiter(this, void 0, void 0, function* () {
+            var _a;
+            const kernelAccount = (_a = this.getAccountAbstractionProvider()) === null || _a === void 0 ? void 0 : _a.account;
+            const entryPoint = kernelAccount === null || kernelAccount === void 0 ? void 0 : kernelAccount.entryPoint;
+            const isV6 = (entryPoint === null || entryPoint === void 0 ? void 0 : entryPoint.address.toLowerCase()) ===
+                constants$1.getEntryPoint('0.6').address.toLowerCase();
+            if (isV6) {
+                return {
+                    callData: params.callData,
+                    callGasLimit: viem.toHex(params.callGasLimit),
+                    // setting initCode to 0x since it is only used for transaction simulation
+                    initCode: '0x',
+                    maxFeePerGas: viem.toHex(params.maxFeePerGas),
+                    maxPriorityFeePerGas: viem.toHex(params.maxPriorityFeePerGas),
+                    nonce: viem.toHex(params.nonce),
+                    paymasterAndData: params.paymasterAndData.toLowerCase(),
+                    preVerificationGas: viem.toHex(params.preVerificationGas),
+                    sender: params.sender,
+                    signature: '0x',
+                    verificationGasLimit: viem.toHex(params.verificationGasLimit),
+                };
+            }
+            const accountGasLimits = '0x' +
+                '000000000000000000000000000' + // 27 zeros
+                viem.toHex(params.verificationGasLimit).slice(2) +
+                '000000000000000000000000000' + // 27 zeros
+                viem.toHex(params.callGasLimit).slice(2);
+            const preVerificationGas = viem.toHex(params.preVerificationGas);
+            const gasFees = '0x' +
+                '00000000000000000000000000' + // 26 zeros
+                viem.toHex(params.maxPriorityFeePerGas).slice(2).padStart(6, '0') +
+                '0000000000000000000000' + // 22 zeros
+                viem.toHex(params.maxFeePerGas).slice(2).padStart(10, '0');
+            const paymasterAndData = params.paymaster
+                ? '0x' +
+                    params.paymaster.slice(2).toLowerCase() +
+                    viem.toHex(params.paymasterVerificationGasLimit).slice(2).padStart(32, '0') + // Make sure it's 32 chars
+                    viem.toHex(params.paymasterPostOpGasLimit).slice(2).padStart(32, '0') + // Make sure it's 32 chars
+                    params.paymasterData.slice(2) // Include full paymaster data
+                : '0x';
+            return {
+                accountGasLimits: accountGasLimits,
+                callData: params.callData,
+                gasFees: gasFees,
+                // setting initCode to 0x since it is only used for transaction simulation
+                initCode: '0x',
+                nonce: viem.toHex(params.nonce),
+                paymasterAndData: paymasterAndData.toLowerCase(),
+                preVerificationGas: preVerificationGas,
+                sender: params.sender,
+                signature: '0x',
+            };
+        });
+    }
+    getCurrentUserOperation(transaction) {
         return _tslib.__awaiter(this, void 0, void 0, function* () {
+            var _a, _b;
             try {
                 const { kernelClientWithSponsorship } = this;
                 if (!kernelClientWithSponsorship) {
                     throw new utils.DynamicError('No kernel client with sponsorship found');
                 }
-                const userOperation = {
-                    callData: yield kernelClientWithSponsorship.account.encodeCallData({
+                const value = BigInt((_a = transaction.value) !== null && _a !== void 0 ? _a : 0);
+                const callData = yield kernelClientWithSponsorship.account.encodeCalls([
+                    {
                         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 && viem.isHex(transaction.value)
-                            ? viem.fromHex(transaction.value, 'bigint')
-                            : viem.fromHex('0x0', 'bigint'),
-                    }),
-                };
-                const result = yield kernelClientWithSponsorship.prepareUserOperationRequest({
-                    account: kernelClientWithSponsorship.account,
-                    userOperation,
-                });
-                if (!result)
-                    return false;
-                return result.paymasterAndData !== '0x';
+                        value,
+                    },
+                ]);
+                let sponsorResult;
+                let unsponsoredResult;
+                try {
+                    sponsorResult = yield kernelClientWithSponsorship.prepareUserOperation({
+                        callData,
+                    });
+                }
+                catch (err) {
+                    logger.logger.debug('[ZeroDevConnector] Sponsored UserOp Attempt Failed:', err);
+                    unsponsoredResult = yield ((_b = this.kernelClient) === null || _b === void 0 ? void 0 : _b.prepareUserOperation({
+                        callData,
+                    }));
+                }
+                if ((sponsorResult === null || sponsorResult === void 0 ? void 0 : sponsorResult.paymasterAndData) === '0x')
+                    return { sponsored: false, userOperation: sponsorResult };
+                return sponsorResult
+                    ? { sponsored: true, userOperation: sponsorResult }
+                    : { sponsored: false, userOperation: unsponsoredResult };
             }
             catch (err) {
-                logger.logger.debug(err);
+                logger.logger.debug('[ZeroDevConnector] Error in getCurrentUserOperation:', err);
+                return { sponsored: false, userOperation: undefined };
+            }
+        });
+    }
+    canSponsorTransactionGas(transaction) {
+        return _tslib.__awaiter(this, void 0, void 0, function* () {
+            const { sponsored } = yield this.getCurrentUserOperation(transaction);
+            if (!sponsored) {
                 return false;
             }
+            return sponsored;
         });
     }
     disableGasSponsorshipOnce() {
@@ -394,23 +502,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,
+            });
         });
     }
 }