@dynamic-labs/ethereum-aa 4.9.12 → 4.9.13-preview.1

package/src/ZeroDevConnector.js

@@ -4,7 +4,7 @@ import { publicActions, custom, createWalletClient, toHex, formatEther } from 'v
 import { toAccount } from 'viem/accounts';
 import { KERNEL_V3_3_BETA, KernelVersionToAddressesMap, getEntryPoint as getEntryPoint$1 } from '@zerodev/sdk/constants';
 import { EthereumWallet, isEthWalletConnector, chainsMap, confirmationTransport, unFormatTransaction, createViemUiTransaction } from '@dynamic-labs/ethereum-core';
-import { WalletConnectorBase, eventListenerHandlers, isTurnkeyWalletConnector } from '@dynamic-labs/wallet-connector-core';
+import { eventListenerHandlers, isTurnkeyWalletConnector } from '@dynamic-labs/wallet-connector-core';
 import { parseEvmNetworks, StorageService, DynamicError, DeferredPromise, parseChainId, wrapMethodWithCallback, TransactionGasCannotBeSponsoredError, InsufficientFundsError } from '@dynamic-labs/utils';
 import { ZERO_DEV_LAST_USED_CHAIN_ID_KEY } from './constants.js';
 import { logger } from './utils/logger.js';
@@ -12,8 +12,9 @@ import { createEcdsaKernelAccountClientWith7702, createEcdsaKernelAccountClient
 import { getEcdsaValidator } from './utils/getEcdsaValidator.js';
 import { getEntryPoint } from './utils/getEntryPoint.js';
 import { getKernelVersion } from './utils/getKernelVersion.js';
+import { AccountAbstractionConnector } from './AccountAbstractionConnector.js';
 
-class ZeroDevConnector extends WalletConnectorBase {
+class ZeroDevConnector extends AccountAbstractionConnector {
     constructor(opts) {
         var _a, _b, _c, _d, _e, _f, _g, _h, _j;
         super(opts);
@@ -24,7 +25,6 @@ class ZeroDevConnector extends WalletConnectorBase {
         this.ChainWallet = EthereumWallet;
         this.connectedChain = 'EVM';
         this.supportedChains = ['ETH', 'EVM'];
-        this.isGasSponsorshipDisabled = false;
         this.isEmbeddedWallet = true;
         this.providersFromApi = [];
         this.name = 'ZeroDev';
@@ -56,6 +56,9 @@ class ZeroDevConnector extends WalletConnectorBase {
         this.defaultChainId = defaultProvider === null || defaultProvider === void 0 ? void 0 : defaultProvider.chain;
         this.ecdsaProviderType = (_j = opts.apiProviders.zerodev) === null || _j === void 0 ? void 0 : _j.ecdsaProviderType;
     }
+    confirmTransactionStatus() {
+        throw new Error('confirmTransactionStatus not implemented in ZeroDevConnector');
+    }
     get currentNetworkProvider() {
         // check if the last used chain id is in the provider map
         if (this.providerMap[this.lastUsedChainId]) {
@@ -100,13 +103,6 @@ class ZeroDevConnector extends WalletConnectorBase {
             handleChainChange(chainId);
         });
     }
-    /**
-     * @deprecated You should get the EOA connector by passing the SCW to getEOAConnector,
-     * from the useSmartWallet hook
-     */
-    getEOAConnector() {
-        return this.eoaConnector;
-    }
     getAccountAbstractionProvider({ withSponsorship, } = {}) {
         if (withSponsorship && this.kernelClientWithSponsorship) {
             return this.kernelClientWithSponsorship;
@@ -118,6 +114,14 @@ class ZeroDevConnector extends WalletConnectorBase {
             StorageService.removeItem(ZERO_DEV_LAST_USED_CHAIN_ID_KEY);
         });
     }
+    initialize(_a) {
+        return __awaiter(this, arguments, void 0, function* ({ smartWalletAddress, eoaAddress, eoaConnector, properties, shouldSetEoaConnector, }) {
+            yield this.registerEoa(Object.assign({ eoaAddress,
+                eoaConnector,
+                shouldSetEoaConnector,
+                smartWalletAddress }, properties));
+        });
+    }
     registerEoa(_a) {
         return __awaiter(this, void 0, void 0, function* () {
             var { smartWalletAddress, eoaAddress, eoaConnector, shouldSetEoaConnector = false } = _a, properties = __rest(_a, ["smartWalletAddress", "eoaAddress", "eoaConnector", "shouldSetEoaConnector"]);
@@ -254,6 +258,7 @@ class ZeroDevConnector extends WalletConnectorBase {
                         signer,
                     }),
                     this.createKernelClient({
+                        authorization: this.authorization,
                         chainId: chain,
                         paymaster: 'SPONSOR',
                         projectId: clientId,
@@ -277,7 +282,7 @@ class ZeroDevConnector extends WalletConnectorBase {
         });
     }
     createKernelClient(_a) {
-        return __awaiter(this, arguments, void 0, function* ({ chainId, projectId, signer, paymaster, }) {
+        return __awaiter(this, arguments, void 0, function* ({ chainId, projectId, signer, paymaster, authorization, }) {
             if (chainId && this.providerMap[chainId]) {
                 return paymaster === 'SPONSOR'
                     ? this.providerMap[chainId].kernelClientWithSponsorship
@@ -288,9 +293,9 @@ class ZeroDevConnector extends WalletConnectorBase {
                 throw new DynamicError('No EOA connector');
             const chain = chainsMap[chainId];
             let kernelClient;
-            if (this.enableEIP7702Mode && this.authorization) {
+            if (this.enableEIP7702Mode) {
                 kernelClient = yield createEcdsaKernelAccountClientWith7702({
-                    authorization: this.authorization,
+                    authorization,
                     bundlerRpc: ZeroDevConnector.bundlerRpc,
                     chain,
                     ecdsaValidator: getEcdsaValidator(this.ecdsaProviderType),
@@ -364,7 +369,7 @@ class ZeroDevConnector extends WalletConnectorBase {
             onSendTransaction: (_b) => __awaiter(this, [_b], void 0, function* ({ transaction }) {
                 try {
                     this._walletUiUtils.disabledConfirmationOnce();
-                    const effectiveProvider = this.isGasSponsorshipDisabled
+                    const effectiveProvider = this.isGasSponsorshipDisabled()
                         ? provider
                         : this.kernelClientWithSponsorship;
                     if (!effectiveProvider) {
@@ -535,9 +540,6 @@ class ZeroDevConnector extends WalletConnectorBase {
             return sponsored;
         });
     }
-    disableGasSponsorshipOnce() {
-        this.isGasSponsorshipDisabled = true;
-    }
     getBalance(address) {
         return __awaiter(this, void 0, void 0, function* () {
             var _a;
@@ -599,6 +601,9 @@ class ZeroDevConnector extends WalletConnectorBase {
     getEnabledNetworks() {
         return this.evmNetworks;
     }
+    initializeZksyncConnector() {
+        throw new Error('Not implemented');
+    }
 }
 
 export { ZeroDevConnector };

package/src/index.cjs

@@ -6,6 +6,7 @@ Object.defineProperty(exports, '__esModule', { value: true });
 var assertPackageVersion = require('@dynamic-labs/assert-package-version');
 var _package = require('../package.cjs');
 var ZeroDevConnector = require('./ZeroDevConnector.cjs');
+var ZKsyncConnector = require('./ZKsyncConnector.cjs');
 var createEcsdaKernelAccountClient = require('./utils/createEcsdaKernelAccountClient.cjs');
 var fetchZeroDevChain = require('./utils/fetchZeroDevChain.cjs');
 var getEcdsaValidator = require('./utils/getEcdsaValidator.cjs');
@@ -13,6 +14,7 @@ var getEntryPoint = require('./utils/getEntryPoint.cjs');
 var getKernelVersion = require('./utils/getKernelVersion.cjs');
 var ethereumAa = require('./ethereum-aa.cjs');
 var isZeroDevConnector = require('./utils/isZeroDevConnector.cjs');
+var isZKsyncConnector = require('./utils/isZKsyncConnector.cjs');
 
 assertPackageVersion.assertPackageVersion('@dynamic-labs/ethereum-aa', _package.version);
 const ZeroDevSmartWalletConnectorsWithConfig = ({ bundlerProvider, bundlerRpc, paymasterRpc, kernelDelegationAddress, } = {}) => {
@@ -29,6 +31,13 @@ const ZeroDevSmartWalletConnectors = (props) => {
     }
     return [];
 };
+const ZKsyncSmartWalletConnectors = (props) => {
+    var _a;
+    if ((_a = props.apiProviders) === null || _a === void 0 ? void 0 : _a.zksync) {
+        return [ZKsyncConnector.ZKsyncConnector];
+    }
+    return [];
+};
 
 exports.createEcdsaKernelAccountClient = createEcsdaKernelAccountClient.createEcdsaKernelAccountClient;
 exports.fetchZeroDevChain = fetchZeroDevChain.fetchZeroDevChain;
@@ -37,5 +46,7 @@ exports.getEntryPoint = getEntryPoint.getEntryPoint;
 exports.getKernelVersion = getKernelVersion.getKernelVersion;
 exports.EthereumAaConnector = ethereumAa.EthereumAaConnector;
 exports.isZeroDevConnector = isZeroDevConnector.isZeroDevConnector;
+exports.isZKsyncConnector = isZKsyncConnector.isZKsyncConnector;
+exports.ZKsyncSmartWalletConnectors = ZKsyncSmartWalletConnectors;
 exports.ZeroDevSmartWalletConnectors = ZeroDevSmartWalletConnectors;
 exports.ZeroDevSmartWalletConnectorsWithConfig = ZeroDevSmartWalletConnectorsWithConfig;

package/src/index.d.ts

@@ -7,6 +7,7 @@ export { getEntryPoint } from './utils/getEntryPoint';
 export { getKernelVersion } from './utils/getKernelVersion';
 export * from './ethereum-aa';
 export { isZeroDevConnector } from './utils/isZeroDevConnector';
+export { isZKsyncConnector } from './utils/isZKsyncConnector';
 export declare const ZeroDevSmartWalletConnectorsWithConfig: ({ bundlerProvider, bundlerRpc, paymasterRpc, kernelDelegationAddress, }?: {
     bundlerProvider?: BundlerProvider;
     bundlerRpc?: string;
@@ -14,3 +15,4 @@ export declare const ZeroDevSmartWalletConnectorsWithConfig: ({ bundlerProvider,
     kernelDelegationAddress?: `0x${string}`;
 }) => (props: any) => WalletConnectorConstructor[];
 export declare const ZeroDevSmartWalletConnectors: (props: any) => WalletConnectorConstructor[];
+export declare const ZKsyncSmartWalletConnectors: (props: any) => WalletConnectorConstructor[];

package/src/index.js

@@ -2,6 +2,7 @@
 import { assertPackageVersion } from '@dynamic-labs/assert-package-version';
 import { version } from '../package.js';
 import { ZeroDevConnector } from './ZeroDevConnector.js';
+import { ZKsyncConnector } from './ZKsyncConnector.js';
 export { createEcdsaKernelAccountClient } from './utils/createEcsdaKernelAccountClient.js';
 export { fetchZeroDevChain } from './utils/fetchZeroDevChain.js';
 export { getEcdsaValidator } from './utils/getEcdsaValidator.js';
@@ -9,6 +10,7 @@ export { getEntryPoint } from './utils/getEntryPoint.js';
 export { getKernelVersion } from './utils/getKernelVersion.js';
 export { EthereumAaConnector } from './ethereum-aa.js';
 export { isZeroDevConnector } from './utils/isZeroDevConnector.js';
+export { isZKsyncConnector } from './utils/isZKsyncConnector.js';
 
 assertPackageVersion('@dynamic-labs/ethereum-aa', version);
 const ZeroDevSmartWalletConnectorsWithConfig = ({ bundlerProvider, bundlerRpc, paymasterRpc, kernelDelegationAddress, } = {}) => {
@@ -25,5 +27,12 @@ const ZeroDevSmartWalletConnectors = (props) => {
     }
     return [];
 };
+const ZKsyncSmartWalletConnectors = (props) => {
+    var _a;
+    if ((_a = props.apiProviders) === null || _a === void 0 ? void 0 : _a.zksync) {
+        return [ZKsyncConnector];
+    }
+    return [];
+};
 
-export { ZeroDevSmartWalletConnectors, ZeroDevSmartWalletConnectorsWithConfig };
+export { ZKsyncSmartWalletConnectors, ZeroDevSmartWalletConnectors, ZeroDevSmartWalletConnectorsWithConfig };

package/src/utils/abi.cjs

@@ -0,0 +1,88 @@
+'use client'
+'use strict';
+
+Object.defineProperty(exports, '__esModule', { value: true });
+
+const AAFactoryABI = [
+    {
+        inputs: [
+            {
+                internalType: 'bytes32',
+                name: '_beaconProxyBytecodeHash',
+                type: 'bytes32',
+            },
+            { internalType: 'address', name: '_beacon', type: 'address' },
+        ],
+        stateMutability: 'nonpayable',
+        type: 'constructor',
+    },
+    {
+        inputs: [{ internalType: 'address', name: 'account', type: 'address' }],
+        name: 'ACCOUNT_ALREADY_EXISTS',
+        type: 'error',
+    },
+    {
+        anonymous: false,
+        inputs: [
+            {
+                indexed: true,
+                internalType: 'address',
+                name: 'accountAddress',
+                type: 'address',
+            },
+            {
+                indexed: false,
+                internalType: 'bytes32',
+                name: 'uniqueAccountId',
+                type: 'bytes32',
+            },
+        ],
+        name: 'AccountCreated',
+        type: 'event',
+    },
+    {
+        inputs: [{ internalType: 'bytes32', name: 'accountId', type: 'bytes32' }],
+        name: 'accountMappings',
+        outputs: [
+            { internalType: 'address', name: 'deployedAccount', type: 'address' },
+        ],
+        stateMutability: 'view',
+        type: 'function',
+    },
+    {
+        inputs: [],
+        name: 'beacon',
+        outputs: [{ internalType: 'address', name: '', type: 'address' }],
+        stateMutability: 'view',
+        type: 'function',
+    },
+    {
+        inputs: [],
+        name: 'beaconProxyBytecodeHash',
+        outputs: [{ internalType: 'bytes32', name: '', type: 'bytes32' }],
+        stateMutability: 'view',
+        type: 'function',
+    },
+    {
+        inputs: [
+            { internalType: 'bytes32', name: 'uniqueId', type: 'bytes32' },
+            { internalType: 'bytes[]', name: 'initialValidators', type: 'bytes[]' },
+            { internalType: 'address[]', name: 'initialK1Owners', type: 'address[]' },
+        ],
+        name: 'deployProxySsoAccount',
+        outputs: [
+            { internalType: 'address', name: 'accountAddress', type: 'address' },
+        ],
+        stateMutability: 'nonpayable',
+        type: 'function',
+    },
+    {
+        inputs: [],
+        name: 'getEncodedBeacon',
+        outputs: [{ internalType: 'bytes', name: '', type: 'bytes' }],
+        stateMutability: 'view',
+        type: 'function',
+    },
+];
+
+exports.AAFactoryABI = AAFactoryABI;

package/src/utils/abi.d.ts

@@ -0,0 +1,102 @@
+export declare const AAFactoryABI: readonly [{
+    readonly inputs: readonly [{
+        readonly internalType: "bytes32";
+        readonly name: "_beaconProxyBytecodeHash";
+        readonly type: "bytes32";
+    }, {
+        readonly internalType: "address";
+        readonly name: "_beacon";
+        readonly type: "address";
+    }];
+    readonly stateMutability: "nonpayable";
+    readonly type: "constructor";
+}, {
+    readonly inputs: readonly [{
+        readonly internalType: "address";
+        readonly name: "account";
+        readonly type: "address";
+    }];
+    readonly name: "ACCOUNT_ALREADY_EXISTS";
+    readonly type: "error";
+}, {
+    readonly anonymous: false;
+    readonly inputs: readonly [{
+        readonly indexed: true;
+        readonly internalType: "address";
+        readonly name: "accountAddress";
+        readonly type: "address";
+    }, {
+        readonly indexed: false;
+        readonly internalType: "bytes32";
+        readonly name: "uniqueAccountId";
+        readonly type: "bytes32";
+    }];
+    readonly name: "AccountCreated";
+    readonly type: "event";
+}, {
+    readonly inputs: readonly [{
+        readonly internalType: "bytes32";
+        readonly name: "accountId";
+        readonly type: "bytes32";
+    }];
+    readonly name: "accountMappings";
+    readonly outputs: readonly [{
+        readonly internalType: "address";
+        readonly name: "deployedAccount";
+        readonly type: "address";
+    }];
+    readonly stateMutability: "view";
+    readonly type: "function";
+}, {
+    readonly inputs: readonly [];
+    readonly name: "beacon";
+    readonly outputs: readonly [{
+        readonly internalType: "address";
+        readonly name: "";
+        readonly type: "address";
+    }];
+    readonly stateMutability: "view";
+    readonly type: "function";
+}, {
+    readonly inputs: readonly [];
+    readonly name: "beaconProxyBytecodeHash";
+    readonly outputs: readonly [{
+        readonly internalType: "bytes32";
+        readonly name: "";
+        readonly type: "bytes32";
+    }];
+    readonly stateMutability: "view";
+    readonly type: "function";
+}, {
+    readonly inputs: readonly [{
+        readonly internalType: "bytes32";
+        readonly name: "uniqueId";
+        readonly type: "bytes32";
+    }, {
+        readonly internalType: "bytes[]";
+        readonly name: "initialValidators";
+        readonly type: "bytes[]";
+    }, {
+        readonly internalType: "address[]";
+        readonly name: "initialK1Owners";
+        readonly type: "address[]";
+    }];
+    readonly name: "deployProxySsoAccount";
+    readonly outputs: readonly [{
+        readonly internalType: "address";
+        readonly name: "accountAddress";
+        readonly type: "address";
+    }];
+    readonly stateMutability: "nonpayable";
+    readonly type: "function";
+}, {
+    readonly inputs: readonly [];
+    readonly name: "getEncodedBeacon";
+    readonly outputs: readonly [{
+        readonly internalType: "bytes";
+        readonly name: "";
+        readonly type: "bytes";
+    }];
+    readonly stateMutability: "view";
+    readonly type: "function";
+}];

package/src/utils/abi.js

@@ -0,0 +1,84 @@
+'use client'
+const AAFactoryABI = [
+    {
+        inputs: [
+            {
+                internalType: 'bytes32',
+                name: '_beaconProxyBytecodeHash',
+                type: 'bytes32',
+            },
+            { internalType: 'address', name: '_beacon', type: 'address' },
+        ],
+        stateMutability: 'nonpayable',
+        type: 'constructor',
+    },
+    {
+        inputs: [{ internalType: 'address', name: 'account', type: 'address' }],
+        name: 'ACCOUNT_ALREADY_EXISTS',
+        type: 'error',
+    },
+    {
+        anonymous: false,
+        inputs: [
+            {
+                indexed: true,
+                internalType: 'address',
+                name: 'accountAddress',
+                type: 'address',
+            },
+            {
+                indexed: false,
+                internalType: 'bytes32',
+                name: 'uniqueAccountId',
+                type: 'bytes32',
+            },
+        ],
+        name: 'AccountCreated',
+        type: 'event',
+    },
+    {
+        inputs: [{ internalType: 'bytes32', name: 'accountId', type: 'bytes32' }],
+        name: 'accountMappings',
+        outputs: [
+            { internalType: 'address', name: 'deployedAccount', type: 'address' },
+        ],
+        stateMutability: 'view',
+        type: 'function',
+    },
+    {
+        inputs: [],
+        name: 'beacon',
+        outputs: [{ internalType: 'address', name: '', type: 'address' }],
+        stateMutability: 'view',
+        type: 'function',
+    },
+    {
+        inputs: [],
+        name: 'beaconProxyBytecodeHash',
+        outputs: [{ internalType: 'bytes32', name: '', type: 'bytes32' }],
+        stateMutability: 'view',
+        type: 'function',
+    },
+    {
+        inputs: [
+            { internalType: 'bytes32', name: 'uniqueId', type: 'bytes32' },
+            { internalType: 'bytes[]', name: 'initialValidators', type: 'bytes[]' },
+            { internalType: 'address[]', name: 'initialK1Owners', type: 'address[]' },
+        ],
+        name: 'deployProxySsoAccount',
+        outputs: [
+            { internalType: 'address', name: 'accountAddress', type: 'address' },
+        ],
+        stateMutability: 'nonpayable',
+        type: 'function',
+    },
+    {
+        inputs: [],
+        name: 'getEncodedBeacon',
+        outputs: [{ internalType: 'bytes', name: '', type: 'bytes' }],
+        stateMutability: 'view',
+        type: 'function',
+    },
+];
+
+export { AAFactoryABI };

package/src/utils/createEcsdaKernelAccountClient.d.ts

@@ -24,6 +24,6 @@ type CommonClientParams<TChain extends Chain | undefined = Chain | undefined> =
 };
 export declare const createEcdsaKernelAccountClient: <entryPoint extends EntryPointVersion, TChain extends ViemChain | undefined = ViemChain | undefined>({ bundlerRpc, chain, paymasterRpc, projectId, signer, provider, paymaster, entryPoint, kernelVersion, ecdsaValidator, enableKernelV3Migration, }: CommonClientParams<TChain>) => Promise<KernelAccountClient<Transport, ViemChain, SmartAccount, Client, RpcSchema>>;
 export declare const createEcdsaKernelAccountClientWith7702: <TChain extends ViemChain | undefined = ViemChain | undefined>({ bundlerRpc, chain, paymasterRpc, projectId, signer, provider, authorization, paymaster, entryPoint, kernelVersion, ecdsaValidator, }: CommonClientParams<TChain> & {
-    authorization: SignAuthorizationReturnType;
+    authorization?: SignAuthorizationReturnType;
 }) => Promise<KernelAccountClient<Transport, ViemChain, SmartAccount, Client, RpcSchema>>;
 export {};

package/src/utils/isZKsyncConnector.cjs

@@ -0,0 +1,8 @@
+'use client'
+'use strict';
+
+Object.defineProperty(exports, '__esModule', { value: true });
+
+const isZKsyncConnector = (connector) => (connector === null || connector === void 0 ? void 0 : connector.key) === 'zksync';
+
+exports.isZKsyncConnector = isZKsyncConnector;

package/src/utils/isZKsyncConnector.d.ts

@@ -0,0 +1,3 @@
+import { WalletConnector } from '@dynamic-labs/wallet-connector-core';
+import { ZKsyncConnector } from '../ZKsyncConnector';
+export declare const isZKsyncConnector: (connector: ZKsyncConnector | WalletConnector) => connector is ZKsyncConnector;

package/src/utils/isZKsyncConnector.js

@@ -0,0 +1,4 @@
+'use client'
+const isZKsyncConnector = (connector) => (connector === null || connector === void 0 ? void 0 : connector.key) === 'zksync';
+
+export { isZKsyncConnector };