@dynamic-labs/ethereum-aa 3.0.0-alpha.21 → 3.0.0-alpha.23

package/CHANGELOG.md

@@ -1,4 +1,31 @@
 
+## [3.0.0-alpha.23](https://github.com/dynamic-labs/DynamicAuth/compare/v3.0.0-alpha.22...v3.0.0-alpha.23) (2024-07-19)
+
+
+### Features
+
+* show custom labels in the sdk ([#6352](https://github.com/dynamic-labs/DynamicAuth/issues/6352)) ([6eec9b2](https://github.com/dynamic-labs/DynamicAuth/commit/6eec9b26dbfd25c5138378aa92de8379a5cd0ddc))
+
+
+### Bug Fixes
+
+* add missing await to viem controller ([#6354](https://github.com/dynamic-labs/DynamicAuth/issues/6354)) ([32c7362](https://github.com/dynamic-labs/DynamicAuth/commit/32c73625c5575f9134edd541c7221aba08a741b5))
+* allow for react-native 0.74.x ([#6371](https://github.com/dynamic-labs/DynamicAuth/issues/6371)) ([37e08b6](https://github.com/dynamic-labs/DynamicAuth/commit/37e08b6b32bcaef7b7f6a4dedc45b2321f3f64a6))
+* not able to switch to secondary wallet ([#6373](https://github.com/dynamic-labs/DynamicAuth/issues/6373)) ([f85ed10](https://github.com/dynamic-labs/DynamicAuth/commit/f85ed10aca8bf41658eb1418cd87e1c5061d4b1b))
+
+## [3.0.0-alpha.22](https://github.com/dynamic-labs/DynamicAuth/compare/v3.0.0-alpha.21...v3.0.0-alpha.22) (2024-07-18)
+
+
+### Features
+
+* add support for aa kernel 3.1 ([#6333](https://github.com/dynamic-labs/DynamicAuth/issues/6333)) ([93c743a](https://github.com/dynamic-labs/DynamicAuth/commit/93c743a74d1af79f15baec343d15212a2feeac39))
+
+
+### Bug Fixes
+
+* ensure retryableFn props are passed through ([#6357](https://github.com/dynamic-labs/DynamicAuth/issues/6357)) ([246da78](https://github.com/dynamic-labs/DynamicAuth/commit/246da78ebaa0e623843d93fc990d8a0f3298af54))
+* removes wallet connect qr code from magic eden ([#6360](https://github.com/dynamic-labs/DynamicAuth/issues/6360)) ([5968c2e](https://github.com/dynamic-labs/DynamicAuth/commit/5968c2e220f98b0995a2067e6f5397f27da4dfb0))
+
 ## [3.0.0-alpha.21](https://github.com/dynamic-labs/DynamicAuth/compare/v3.0.0-alpha.20...v3.0.0-alpha.21) (2024-07-17)
 
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dynamic-labs/ethereum-aa",
-  "version": "3.0.0-alpha.21",
+  "version": "3.0.0-alpha.23",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/dynamic-labs/dynamic-auth.git",
@@ -26,17 +26,17 @@
     "./package.json": "./package.json"
   },
   "dependencies": {
-    "@dynamic-labs/sdk-api-core": "0.0.470",
-    "@zerodev/ecdsa-validator": "5.2.3",
-    "@zerodev/sdk": "5.2.8",
+    "@dynamic-labs/sdk-api-core": "0.0.489",
+    "@zerodev/ecdsa-validator": "5.3.1",
+    "@zerodev/sdk": "5.3.4",
     "permissionless": "0.1.20",
-    "@dynamic-labs/ethereum": "3.0.0-alpha.21",
-    "@dynamic-labs/logger": "3.0.0-alpha.21",
-    "@dynamic-labs/types": "3.0.0-alpha.21",
-    "@dynamic-labs/utils": "3.0.0-alpha.21",
-    "@dynamic-labs/viem-utils": "3.0.0-alpha.21",
-    "@dynamic-labs/wallet-book": "3.0.0-alpha.21",
-    "@dynamic-labs/wallet-connector-core": "3.0.0-alpha.21"
+    "@dynamic-labs/ethereum": "3.0.0-alpha.23",
+    "@dynamic-labs/logger": "3.0.0-alpha.23",
+    "@dynamic-labs/types": "3.0.0-alpha.23",
+    "@dynamic-labs/utils": "3.0.0-alpha.23",
+    "@dynamic-labs/viem-utils": "3.0.0-alpha.23",
+    "@dynamic-labs/wallet-book": "3.0.0-alpha.23",
+    "@dynamic-labs/wallet-connector-core": "3.0.0-alpha.23"
   },
   "peerDependencies": {
     "viem": "^2.7.6"

package/src/ZeroDevConnector.cjs

@@ -6,6 +6,7 @@ Object.defineProperty(exports, '__esModule', { value: true });
 var _tslib = require('../_virtual/_tslib.cjs');
 var viem = require('viem');
 var utils$1 = require('permissionless/utils');
+var constants = require('@zerodev/sdk/constants');
 var sdkApiCore = require('@dynamic-labs/sdk-api-core');
 var walletConnectorCore = require('@dynamic-labs/wallet-connector-core');
 var viemUtils = require('@dynamic-labs/viem-utils');
@@ -17,7 +18,7 @@ var createEcsdaKernelAccountClient = require('./utils/createEcsdaKernelAccountCl
 
 class ZeroDevConnector extends walletConnectorCore.WalletConnectorBase {
     constructor(opts) {
-        var _a, _b;
+        var _a, _b, _c;
         super(opts);
         this.connectedChain = 'EVM';
         this.supportedChains = ['ETH', 'EVM'];
@@ -39,11 +40,40 @@ class ZeroDevConnector extends walletConnectorCore.WalletConnectorBase {
         this.projectId = zeroDevProjectId;
         this._walletUiUtils = opts.walletUiUtils;
         this.evmNetworks = utils.parseEvmNetworks(opts.evmNetworks);
-        this.entryPoint =
-            ((_b = opts.apiProviders.zerodev) === null || _b === void 0 ? void 0 : _b.entryPointVersion) ===
-                sdkApiCore.ProviderEntryPointVersionEnum.V6
-                ? utils$1.ENTRYPOINT_ADDRESS_V06
-                : utils$1.ENTRYPOINT_ADDRESS_V07;
+        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);
+    }
+    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;
+        }
+        else {
+            logger.logger.error('Invalid entry point version', entryPoint);
+            return utils$1.ENTRYPOINT_ADDRESS_V07;
+        }
+    }
+    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;
+        }
     }
     getEOAConnector() {
         return this.eoaConnector;
@@ -80,6 +110,7 @@ class ZeroDevConnector extends walletConnectorCore.WalletConnectorBase {
                 bundlerRpc: ZeroDevConnector.bundlerRpc,
                 chain: yield fetchChain.fetchChain(this.projectId),
                 entryPointAddress: this.entryPoint,
+                kernelVersion: this.kernelVersion,
                 paymaster: 'NONE',
                 paymasterRpc: ZeroDevConnector.paymasterRpc,
                 projectId: this.projectId,
@@ -122,6 +153,7 @@ class ZeroDevConnector extends walletConnectorCore.WalletConnectorBase {
                 bundlerRpc: ZeroDevConnector.bundlerRpc,
                 chain: yield fetchChain.fetchChain(this.projectId),
                 entryPointAddress: this.entryPoint,
+                kernelVersion: this.kernelVersion,
                 paymaster: 'SPONSOR',
                 paymasterRpc: ZeroDevConnector.paymasterRpc,
                 projectId: this.projectId,

package/src/ZeroDevConnector.d.ts

@@ -3,6 +3,7 @@ import { KernelSmartAccount } from '@zerodev/sdk/accounts';
 import { Account, PublicClient, Transport, WalletClient } from 'viem';
 import { type Chain as ViemChain } from 'viem/chains';
 import { EntryPoint } from 'permissionless/types';
+import { KERNEL_VERSION_TYPE } from '@zerodev/sdk/types';
 import { Provider, ProviderEnum } from '@dynamic-labs/sdk-api-core';
 import { Chain, IAccountAbstractionWalletConnector, ISendBalanceWalletConnector, WalletConnector, WalletConnectorBase } from '@dynamic-labs/wallet-connector-core';
 import { WalletBookSchema } from '@dynamic-labs/wallet-book';
@@ -28,7 +29,8 @@ export declare class ZeroDevConnector extends WalletConnectorBase implements IZe
     evmNetworks: EvmNetwork[];
     private isGasSponsorshipDisabled;
     isEmbeddedWallet: boolean;
-    private entryPoint;
+    entryPoint: EntryPoint;
+    kernelVersion: KERNEL_VERSION_TYPE;
     static bundlerProvider: BundlerProvider | undefined;
     static bundlerRpc: string | undefined;
     static paymasterRpc: string | undefined;
@@ -49,6 +51,8 @@ export declare class ZeroDevConnector extends WalletConnectorBase implements IZe
     };
     private _walletUiUtils;
     constructor(opts: ZeroDevConnectorProps);
+    getEntryPoint(entryPoint: string | undefined): "0x5FF137D4b0FDCD49DcA30c7CF57E578a026d2789" | "0x0000000071727De22E5E9d8BAf0edAc6f37da032";
+    getKernelVersion(kernelVersion: string | undefined): KERNEL_VERSION_TYPE;
     getEOAConnector(): WalletConnector | undefined;
     getAccountAbstractionProvider({ withSponsorship, }?: {
         withSponsorship?: boolean;

package/src/ZeroDevConnector.js

@@ -1,8 +1,9 @@
 'use client'
 import { __awaiter } from '../_virtual/_tslib.js';
 import { publicActions, custom, createWalletClient, isHex, fromHex, formatEther } from 'viem';
-import { ENTRYPOINT_ADDRESS_V06, ENTRYPOINT_ADDRESS_V07, walletClientToSmartAccountSigner } from 'permissionless/utils';
-import { ProviderEntryPointVersionEnum } from '@dynamic-labs/sdk-api-core';
+import { ENTRYPOINT_ADDRESS_V07, ENTRYPOINT_ADDRESS_V06, walletClientToSmartAccountSigner } from 'permissionless/utils';
+import { KERNEL_V3_1, KERNEL_V3_0, KERNEL_V2_4 } from '@zerodev/sdk/constants';
+import { ProviderEntryPointVersionEnum, ProviderKernelVersionEnum } from '@dynamic-labs/sdk-api-core';
 import { WalletConnectorBase } from '@dynamic-labs/wallet-connector-core';
 import { confirmationTransport, chainsMap, unFormatTransaction, createViemUiTransaction } from '@dynamic-labs/viem-utils';
 import { parseEvmNetworks, DynamicError, DeferredPromise, wrapMethodWithCallback, TransactionGasCannotBeSponsoredError, InsufficientFundsError } from '@dynamic-labs/utils';
@@ -13,7 +14,7 @@ import { createEcdsaKernelAccountClient } from './utils/createEcsdaKernelAccount
 
 class ZeroDevConnector extends WalletConnectorBase {
     constructor(opts) {
-        var _a, _b;
+        var _a, _b, _c;
         super(opts);
         this.connectedChain = 'EVM';
         this.supportedChains = ['ETH', 'EVM'];
@@ -35,11 +36,40 @@ class ZeroDevConnector extends WalletConnectorBase {
         this.projectId = zeroDevProjectId;
         this._walletUiUtils = opts.walletUiUtils;
         this.evmNetworks = parseEvmNetworks(opts.evmNetworks);
-        this.entryPoint =
-            ((_b = opts.apiProviders.zerodev) === null || _b === void 0 ? void 0 : _b.entryPointVersion) ===
-                ProviderEntryPointVersionEnum.V6
-                ? ENTRYPOINT_ADDRESS_V06
-                : ENTRYPOINT_ADDRESS_V07;
+        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);
+    }
+    getEntryPoint(entryPoint) {
+        if (entryPoint === undefined ||
+            entryPoint === ProviderEntryPointVersionEnum.V7) {
+            return ENTRYPOINT_ADDRESS_V07;
+        }
+        else if (entryPoint === ProviderEntryPointVersionEnum.V6) {
+            return ENTRYPOINT_ADDRESS_V06;
+        }
+        else {
+            logger.error('Invalid entry point version', entryPoint);
+            return ENTRYPOINT_ADDRESS_V07;
+        }
+    }
+    getKernelVersion(kernelVersion) {
+        if (kernelVersion === ProviderKernelVersionEnum.V31 ||
+            (kernelVersion === undefined &&
+                this.entryPoint === ENTRYPOINT_ADDRESS_V07)) {
+            return KERNEL_V3_1;
+        }
+        else if (kernelVersion === ProviderKernelVersionEnum.V30) {
+            return KERNEL_V3_0;
+        }
+        else if (kernelVersion === ProviderKernelVersionEnum.V24 ||
+            this.entryPoint === ENTRYPOINT_ADDRESS_V06 // v0.6 only supports v2.4
+        ) {
+            return KERNEL_V2_4;
+        }
+        else {
+            logger.error('Invalid kernel version', kernelVersion);
+            return KERNEL_V3_1;
+        }
     }
     getEOAConnector() {
         return this.eoaConnector;
@@ -76,6 +106,7 @@ class ZeroDevConnector extends WalletConnectorBase {
                 bundlerRpc: ZeroDevConnector.bundlerRpc,
                 chain: yield fetchChain(this.projectId),
                 entryPointAddress: this.entryPoint,
+                kernelVersion: this.kernelVersion,
                 paymaster: 'NONE',
                 paymasterRpc: ZeroDevConnector.paymasterRpc,
                 projectId: this.projectId,
@@ -118,6 +149,7 @@ class ZeroDevConnector extends WalletConnectorBase {
                 bundlerRpc: ZeroDevConnector.bundlerRpc,
                 chain: yield fetchChain(this.projectId),
                 entryPointAddress: this.entryPoint,
+                kernelVersion: this.kernelVersion,
                 paymaster: 'SPONSOR',
                 paymasterRpc: ZeroDevConnector.paymasterRpc,
                 projectId: this.projectId,

package/src/utils/createEcsdaKernelAccountClient.cjs

@@ -24,7 +24,7 @@ const getZeroDevPaymasterRPC = (projectId, provider) => {
     return rpc;
 };
 const isERC20 = (value) => viem.isAddress(value);
-const createEcdsaKernelAccountClient = (_a) => _tslib.__awaiter(void 0, [_a], void 0, function* ({ bundlerRpc, chain, paymasterRpc, projectId, signer, provider, index, paymaster = 'SPONSOR', entryPointAddress, }) {
+const createEcdsaKernelAccountClient = (_a) => _tslib.__awaiter(void 0, [_a], void 0, function* ({ bundlerRpc, chain, paymasterRpc, projectId, signer, provider, index, paymaster = 'SPONSOR', entryPointAddress, kernelVersion, }) {
     const resolvedBundlerRpc = bundlerRpc !== null && bundlerRpc !== void 0 ? bundlerRpc : getZeroDevBundlerRPC(projectId, provider);
     const resolvedPaymasterRpc = paymasterRpc !== null && paymasterRpc !== void 0 ? paymasterRpc : getZeroDevPaymasterRPC(projectId, provider);
     const publicClient = viem.createPublicClient({
@@ -32,11 +32,13 @@ const createEcdsaKernelAccountClient = (_a) => _tslib.__awaiter(void 0, [_a], vo
     });
     const ecdsaValidator$1 = yield ecdsaValidator.signerToEcdsaValidator(publicClient, {
         entryPoint: entryPointAddress,
+        kernelVersion,
         signer,
     });
     const account = yield accounts.createKernelAccount(publicClient, {
         entryPoint: entryPointAddress,
         index,
+        kernelVersion,
         plugins: {
             sudo: ecdsaValidator$1,
         },

package/src/utils/createEcsdaKernelAccountClient.d.ts

@@ -3,12 +3,13 @@ import { KernelAccountClient } from '@zerodev/sdk/clients';
 import { SmartAccountSigner } from 'permissionless/accounts';
 import { EntryPoint } from 'permissionless/types';
 import { Address, HttpTransport, Chain } from 'viem';
+import { GetKernelVersion } from '@zerodev/sdk/types';
 export type BundlerProvider = 'STACKUP' | 'PIMLICO' | 'ALCHEMY' | 'GELATO';
 export type ERC20Paymaster = Address;
 export type PaymasterType = 'NONE' | 'SPONSOR' | ERC20Paymaster;
 export declare const getZeroDevBundlerRPC: (projectId: string, provider?: BundlerProvider) => string;
 export declare const getZeroDevPaymasterRPC: (projectId: string, provider?: BundlerProvider) => string;
-export declare const createEcdsaKernelAccountClient: <entryPoint extends EntryPoint, TChain extends Chain | undefined = Chain | undefined, TSource extends string = "custom", TAddress extends `0x${string}` = `0x${string}`>({ bundlerRpc, chain, paymasterRpc, projectId, signer, provider, index, paymaster, entryPointAddress, }: {
+export declare const createEcdsaKernelAccountClient: <entryPoint extends EntryPoint, TChain extends Chain | undefined = Chain | undefined, TSource extends string = "custom", TAddress extends `0x${string}` = `0x${string}`>({ bundlerRpc, chain, paymasterRpc, projectId, signer, provider, index, paymaster, entryPointAddress, kernelVersion, }: {
     bundlerRpc?: string;
     chain: TChain;
     projectId: string;
@@ -18,4 +19,5 @@ export declare const createEcdsaKernelAccountClient: <entryPoint extends EntryPo
     entryPointAddress: entryPoint;
     provider?: BundlerProvider;
     index?: bigint;
+    kernelVersion: GetKernelVersion<entryPoint>;
 }) => Promise<KernelAccountClient<entryPoint, HttpTransport, TChain, KernelSmartAccount<entryPoint, HttpTransport, TChain>>>;

package/src/utils/createEcsdaKernelAccountClient.js

@@ -20,7 +20,7 @@ const getZeroDevPaymasterRPC = (projectId, provider) => {
     return rpc;
 };
 const isERC20 = (value) => isAddress(value);
-const createEcdsaKernelAccountClient = (_a) => __awaiter(void 0, [_a], void 0, function* ({ bundlerRpc, chain, paymasterRpc, projectId, signer, provider, index, paymaster = 'SPONSOR', entryPointAddress, }) {
+const createEcdsaKernelAccountClient = (_a) => __awaiter(void 0, [_a], void 0, function* ({ bundlerRpc, chain, paymasterRpc, projectId, signer, provider, index, paymaster = 'SPONSOR', entryPointAddress, kernelVersion, }) {
     const resolvedBundlerRpc = bundlerRpc !== null && bundlerRpc !== void 0 ? bundlerRpc : getZeroDevBundlerRPC(projectId, provider);
     const resolvedPaymasterRpc = paymasterRpc !== null && paymasterRpc !== void 0 ? paymasterRpc : getZeroDevPaymasterRPC(projectId, provider);
     const publicClient = createPublicClient({
@@ -28,11 +28,13 @@ const createEcdsaKernelAccountClient = (_a) => __awaiter(void 0, [_a], void 0, f
     });
     const ecdsaValidator = yield signerToEcdsaValidator(publicClient, {
         entryPoint: entryPointAddress,
+        kernelVersion,
         signer,
     });
     const account = yield createKernelAccount(publicClient, {
         entryPoint: entryPointAddress,
         index,
+        kernelVersion,
         plugins: {
             sudo: ecdsaValidator,
         },