@dynamic-labs/sdk-react-core 4.4.1 → 4.4.2-preview.1

package/src/lib/utils/hooks/useUserUpdateRequest/useUpdateUser/useUpdateUser.js

@@ -12,7 +12,6 @@ import '@dynamic-labs/wallet-book';
 import '@dynamic-labs/utils';
 import '../../../constants/colors.js';
 import '../../../constants/values.js';
-import '../../../../store/state/loadingAndLifecycle.js';
 import '../../../../shared/consts/index.js';
 import '../../../../events/dynamicEvents.js';
 import '../../../../context/CaptchaContext/CaptchaContext.js';
@@ -48,7 +47,9 @@ import { useFieldsState } from '../../../../context/FieldsStateContext/FieldsSta
 import { userFieldsSchema } from './userFieldsSchema.js';
 import '../../../../context/UserFieldEditorContext/UserFieldEditorContext.js';
 import '@dynamic-labs/rpc-providers';
+import '../../../../store/state/loadingAndLifecycle.js';
 import '../../../../store/state/walletOptions/walletOptions.js';
+import '@dynamic-labs/ethereum-aa';
 import 'react-i18next';
 import '../../../../components/Accordion/components/AccordionItem/AccordionItem.js';
 import '../../../../components/Alert/Alert.js';

package/src/lib/utils/hooks/useUserUpdateRequest/useUpdateUserWithModal/useUpdateUserWithModal.cjs

@@ -16,7 +16,6 @@ var ViewContext = require('../../../../context/ViewContext/ViewContext.cjs');
 require('@dynamic-labs/wallet-book');
 require('../../../constants/colors.cjs');
 require('../../../constants/values.cjs');
-require('../../../../store/state/loadingAndLifecycle.cjs');
 require('../../../../shared/consts/index.cjs');
 var dynamicEvents = require('../../../../events/dynamicEvents.cjs');
 require('../../../../context/CaptchaContext/CaptchaContext.cjs');
@@ -50,7 +49,9 @@ require('../../../../context/FieldsStateContext/FieldsStateContext.cjs');
 var UserFieldEditorContext = require('../../../../context/UserFieldEditorContext/UserFieldEditorContext.cjs');
 var validateUpdateRequest = require('./validateUpdateRequest/validateUpdateRequest.cjs');
 require('@dynamic-labs/rpc-providers');
+require('../../../../store/state/loadingAndLifecycle.cjs');
 require('../../../../store/state/walletOptions/walletOptions.cjs');
+require('@dynamic-labs/ethereum-aa');
 require('react-i18next');
 require('../../../../components/Accordion/components/AccordionItem/AccordionItem.cjs');
 require('../../../../components/Alert/Alert.cjs');

package/src/lib/utils/hooks/useUserUpdateRequest/useUpdateUserWithModal/useUpdateUserWithModal.js

@@ -12,7 +12,6 @@ import { useViewContext } from '../../../../context/ViewContext/ViewContext.js';
 import '@dynamic-labs/wallet-book';
 import '../../../constants/colors.js';
 import '../../../constants/values.js';
-import '../../../../store/state/loadingAndLifecycle.js';
 import '../../../../shared/consts/index.js';
 import { dynamicEvents } from '../../../../events/dynamicEvents.js';
 import '../../../../context/CaptchaContext/CaptchaContext.js';
@@ -46,7 +45,9 @@ import '../../../../context/FieldsStateContext/FieldsStateContext.js';
 import { UserFieldEditorContext } from '../../../../context/UserFieldEditorContext/UserFieldEditorContext.js';
 import { validateUpdateRequest } from './validateUpdateRequest/validateUpdateRequest.js';
 import '@dynamic-labs/rpc-providers';
+import '../../../../store/state/loadingAndLifecycle.js';
 import '../../../../store/state/walletOptions/walletOptions.js';
+import '@dynamic-labs/ethereum-aa';
 import 'react-i18next';
 import '../../../../components/Accordion/components/AccordionItem/AccordionItem.js';
 import '../../../../components/Alert/Alert.js';

package/src/lib/utils/hooks/useValidateSession/useValidateSession.cjs

@@ -6,7 +6,7 @@ Object.defineProperty(exports, '__esModule', { value: true });
 var _tslib = require('../../../../../_virtual/_tslib.cjs');
 var React = require('react');
 var logger = require('../../../shared/logger.cjs');
-var useEffectOnce = require('../../../shared/utils/hooks/useEffectOnce/useEffectOnce.cjs');
+var useEffectOnce = require('../useEffectOnce/useEffectOnce.cjs');
 var loadingAndLifecycle = require('../../../store/state/loadingAndLifecycle.cjs');
 var useDynamicEvents = require('../events/useDynamicEvents/useDynamicEvents.cjs');
 var handleStoreAndEnvironmentMismatch = require('./handleStoreAndEnvironmentMismatch/handleStoreAndEnvironmentMismatch.cjs');

package/src/lib/utils/hooks/useValidateSession/useValidateSession.js

@@ -2,7 +2,7 @@
 import { __awaiter } from '../../../../../_virtual/_tslib.js';
 import { useCallback } from 'react';
 import { logger } from '../../../shared/logger.js';
-import { useEffectOnce } from '../../../shared/utils/hooks/useEffectOnce/useEffectOnce.js';
+import { useEffectOnce } from '../useEffectOnce/useEffectOnce.js';
 import { setLoadingAndLifecycle } from '../../../store/state/loadingAndLifecycle.js';
 import { useInternalDynamicEvents } from '../events/useDynamicEvents/useDynamicEvents.js';
 import { handleStoreAndEnvironmentMismatch } from './handleStoreAndEnvironmentMismatch/handleStoreAndEnvironmentMismatch.js';

package/src/lib/utils/hooks/useVerifyWallet/useVerifyWallet.cjs

@@ -18,7 +18,6 @@ require('@dynamic-labs/wallet-book');
 var localStorage = require('../../constants/localStorage.cjs');
 require('../../constants/colors.cjs');
 require('../../constants/values.cjs');
-require('../../../store/state/loadingAndLifecycle.cjs');
 require('../../../shared/consts/index.cjs');
 var useInternalDynamicContext = require('../../../context/DynamicContext/useDynamicContext/useInternalDynamicContext.cjs');
 require('../../../context/CaptchaContext/CaptchaContext.cjs');
@@ -55,8 +54,10 @@ require('../../../views/CollectUserDataView/useFields.cjs');
 require('../../../context/FieldsStateContext/FieldsStateContext.cjs');
 require('../../../context/UserFieldEditorContext/UserFieldEditorContext.cjs');
 require('@dynamic-labs/rpc-providers');
+require('../../../store/state/loadingAndLifecycle.cjs');
 require('../../../store/state/dynamicContextProps/dynamicContextProps.cjs');
 require('../../../store/state/walletOptions/walletOptions.cjs');
+require('@dynamic-labs/ethereum-aa');
 require('react-i18next');
 require('../../../components/Accordion/components/AccordionItem/AccordionItem.cjs');
 require('../../../components/Alert/Alert.cjs');

package/src/lib/utils/hooks/useVerifyWallet/useVerifyWallet.js

@@ -14,7 +14,6 @@ import '@dynamic-labs/wallet-book';
 import { LAST_USED_WALLET } from '../../constants/localStorage.js';
 import '../../constants/colors.js';
 import '../../constants/values.js';
-import '../../../store/state/loadingAndLifecycle.js';
 import '../../../shared/consts/index.js';
 import { useInternalDynamicContext } from '../../../context/DynamicContext/useDynamicContext/useInternalDynamicContext.js';
 import '../../../context/CaptchaContext/CaptchaContext.js';
@@ -51,8 +50,10 @@ import '../../../views/CollectUserDataView/useFields.js';
 import '../../../context/FieldsStateContext/FieldsStateContext.js';
 import '../../../context/UserFieldEditorContext/UserFieldEditorContext.js';
 import '@dynamic-labs/rpc-providers';
+import '../../../store/state/loadingAndLifecycle.js';
 import '../../../store/state/dynamicContextProps/dynamicContextProps.js';
 import '../../../store/state/walletOptions/walletOptions.js';
+import '@dynamic-labs/ethereum-aa';
 import 'react-i18next';
 import '../../../components/Accordion/components/AccordionItem/AccordionItem.js';
 import '../../../components/Alert/Alert.js';

package/src/lib/utils/hooks/useViewSettings/useViewSettings.cjs

@@ -15,7 +15,6 @@ require('@dynamic-labs/wallet-book');
 require('@dynamic-labs/utils');
 require('../../constants/colors.cjs');
 require('../../constants/values.cjs');
-require('../../../store/state/loadingAndLifecycle.cjs');
 require('../../../shared/consts/index.cjs');
 require('../../../events/dynamicEvents.cjs');
 require('../../../../../_virtual/_tslib.cjs');
@@ -49,7 +48,9 @@ require('../../../views/CollectUserDataView/useFields.cjs');
 require('../../../context/FieldsStateContext/FieldsStateContext.cjs');
 require('../../../context/UserFieldEditorContext/UserFieldEditorContext.cjs');
 require('@dynamic-labs/rpc-providers');
+require('../../../store/state/loadingAndLifecycle.cjs');
 require('../../../store/state/walletOptions/walletOptions.cjs');
+require('@dynamic-labs/ethereum-aa');
 require('react-i18next');
 require('../../../components/Accordion/components/AccordionItem/AccordionItem.cjs');
 require('../../../components/Alert/Alert.cjs');

package/src/lib/utils/hooks/useViewSettings/useViewSettings.js

@@ -11,7 +11,6 @@ import '@dynamic-labs/wallet-book';
 import '@dynamic-labs/utils';
 import '../../constants/colors.js';
 import '../../constants/values.js';
-import '../../../store/state/loadingAndLifecycle.js';
 import '../../../shared/consts/index.js';
 import '../../../events/dynamicEvents.js';
 import '../../../../../_virtual/_tslib.js';
@@ -45,7 +44,9 @@ import '../../../views/CollectUserDataView/useFields.js';
 import '../../../context/FieldsStateContext/FieldsStateContext.js';
 import '../../../context/UserFieldEditorContext/UserFieldEditorContext.js';
 import '@dynamic-labs/rpc-providers';
+import '../../../store/state/loadingAndLifecycle.js';
 import '../../../store/state/walletOptions/walletOptions.js';
+import '@dynamic-labs/ethereum-aa';
 import 'react-i18next';
 import '../../../components/Accordion/components/AccordionItem/AccordionItem.js';
 import '../../../components/Alert/Alert.js';

package/src/lib/utils/hooks/useWalletConnectors/useWalletConnectors.cjs

@@ -16,7 +16,6 @@ require('../../../context/ViewContext/ViewContext.cjs');
 require('@dynamic-labs/wallet-book');
 require('../../constants/colors.cjs');
 require('../../constants/values.cjs');
-require('../../../store/state/loadingAndLifecycle.cjs');
 require('../../../shared/consts/index.cjs');
 var dynamicEvents = require('../../../events/dynamicEvents.cjs');
 require('@dynamic-labs/multi-wallet');
@@ -30,7 +29,7 @@ var updatePrimaryWalletId = require('../../functions/updatePrimaryWalletId/updat
 var createLinkedWalletsFromWalletOptions = require('./utils/createLinkedWalletsFromWalletOptions/createLinkedWalletsFromWalletOptions.cjs');
 var updateUserWalletsFromLinkedWallets = require('./utils/updateUserWalletsFromLinkedWallets/updateUserWalletsFromLinkedWallets.cjs');
 
-const useWalletConnectors = ({ authMode, connectedWallets, walletConnectorOptions, setMultiWalletWidgetState, primaryWalletId, user, canHaveMultipleWalletsConnected, separateSmartWalletAndSigner = false, }) => {
+const useWalletConnectors = ({ authMode, connectedWallets, walletConnectorOptions, setMultiWalletWidgetState, primaryWalletId, user, canHaveMultipleWalletsConnected, enableEIP7702, separateSmartWalletAndSigner = false, }) => {
     const [showQrcodeModal, setShowQrcodeModal] = React.useState(false);
     // keeps track of the last primary wallet id to avoid emitting the same event multiple times
     const lastPrimaryWalletId = React.useRef(primaryWalletId);
@@ -39,6 +38,7 @@ const useWalletConnectors = ({ authMode, connectedWallets, walletConnectorOption
             return [];
         }
         return createLinkedWalletsFromWalletOptions.createLinkedWalletsFromWalletOptions({
+            enableEIP7702,
             primaryWalletId,
             separateSmartWalletAndSigner,
             user,

package/src/lib/utils/hooks/useWalletConnectors/useWalletConnectors.d.ts

@@ -11,6 +11,7 @@ type Props = {
     user?: UserProfile;
     canHaveMultipleWalletsConnected?: boolean;
     separateSmartWalletAndSigner?: boolean;
+    enableEIP7702?: boolean;
 };
 export interface UseWalletConnectors {
     primaryWallet: Wallet | null;
@@ -20,5 +21,5 @@ export interface UseWalletConnectors {
     showQrcodeModal: boolean;
     wallets: Wallet[];
 }
-export declare const useWalletConnectors: ({ authMode, connectedWallets, walletConnectorOptions, setMultiWalletWidgetState, primaryWalletId, user, canHaveMultipleWalletsConnected, separateSmartWalletAndSigner, }: Props) => UseWalletConnectors;
+export declare const useWalletConnectors: ({ authMode, connectedWallets, walletConnectorOptions, setMultiWalletWidgetState, primaryWalletId, user, canHaveMultipleWalletsConnected, enableEIP7702, separateSmartWalletAndSigner, }: Props) => UseWalletConnectors;
 export {};

package/src/lib/utils/hooks/useWalletConnectors/useWalletConnectors.js

@@ -12,7 +12,6 @@ import '../../../context/ViewContext/ViewContext.js';
 import '@dynamic-labs/wallet-book';
 import '../../constants/colors.js';
 import '../../constants/values.js';
-import '../../../store/state/loadingAndLifecycle.js';
 import '../../../shared/consts/index.js';
 import { dynamicEvents } from '../../../events/dynamicEvents.js';
 import '@dynamic-labs/multi-wallet';
@@ -26,7 +25,7 @@ import { updatePrimaryWalletId } from '../../functions/updatePrimaryWalletId/upd
 import { createLinkedWalletsFromWalletOptions } from './utils/createLinkedWalletsFromWalletOptions/createLinkedWalletsFromWalletOptions.js';
 import { updateUserWalletsFromLinkedWallets } from './utils/updateUserWalletsFromLinkedWallets/updateUserWalletsFromLinkedWallets.js';
 
-const useWalletConnectors = ({ authMode, connectedWallets, walletConnectorOptions, setMultiWalletWidgetState, primaryWalletId, user, canHaveMultipleWalletsConnected, separateSmartWalletAndSigner = false, }) => {
+const useWalletConnectors = ({ authMode, connectedWallets, walletConnectorOptions, setMultiWalletWidgetState, primaryWalletId, user, canHaveMultipleWalletsConnected, enableEIP7702, separateSmartWalletAndSigner = false, }) => {
     const [showQrcodeModal, setShowQrcodeModal] = useState(false);
     // keeps track of the last primary wallet id to avoid emitting the same event multiple times
     const lastPrimaryWalletId = useRef(primaryWalletId);
@@ -35,6 +34,7 @@ const useWalletConnectors = ({ authMode, connectedWallets, walletConnectorOption
             return [];
         }
         return createLinkedWalletsFromWalletOptions({
+            enableEIP7702,
             primaryWalletId,
             separateSmartWalletAndSigner,
             user,

package/src/lib/utils/hooks/useWalletConnectors/utils/createLinkedWalletsFromWalletOptions/createLinkedWalletsFromWalletOptions.cjs

@@ -5,12 +5,13 @@ Object.defineProperty(exports, '__esModule', { value: true });
 
 var sdkApiCore = require('@dynamic-labs/sdk-api-core');
 var walletConnectorCore = require('@dynamic-labs/wallet-connector-core');
+var ethereumAa = require('@dynamic-labs/ethereum-aa');
 var findWalletOptionFor = require('../../../../functions/findWalletOptionFor/findWalletOptionFor.cjs');
 var shouldManuallyReconnectOnRefresh = require('../../../../functions/shouldManuallyReconnectOnRefresh/shouldManuallyReconnectOnRefresh.cjs');
 var convertLegacyPhantomLedgerConnector = require('../convertLegacyPhantomLedgerConnector/convertLegacyPhantomLedgerConnector.cjs');
 var smartWallet = require('../smartWallet/smartWallet.cjs');
 
-const createLinkedWalletsFromWalletOptions = ({ user, walletConnectorOptions, primaryWalletId, separateSmartWalletAndSigner, }) => {
+const createLinkedWalletsFromWalletOptions = ({ user, walletConnectorOptions, primaryWalletId, separateSmartWalletAndSigner, enableEIP7702, }) => {
     // wallet state should be null while loading all the wallets or when there is no user
     if (!walletConnectorOptions || !user) {
         return [];
@@ -18,7 +19,7 @@ const createLinkedWalletsFromWalletOptions = ({ user, walletConnectorOptions, pr
     return user.verifiedCredentials
         .map(convertLegacyPhantomLedger)
         .map((account) => {
-        var _a, _b;
+        var _a, _b, _c;
         const wallet = findWalletOptionFor.findWalletOptionFor(account, walletConnectorOptions);
         // this probably shouldn't happen. this would mean that the user has an account linked
         // with wallet W, but the customer has toggled off wallet W or the chain that
@@ -45,19 +46,27 @@ const createLinkedWalletsFromWalletOptions = ({ user, walletConnectorOptions, pr
             if (account.walletProvider === sdkApiCore.WalletProviderEnum.SmartContractWallet) {
                 smartWallet.initializeSmartWallet({
                     account,
+                    isEip7702: enableEIP7702,
                     primaryWalletId,
                     verifiedCredentials: user.verifiedCredentials,
                     walletConnectorOptions,
                 });
             }
+            const { walletConnector } = wallet;
+            let { address } = account;
+            if (ethereumAa.isZeroDevConnector(walletConnector)) {
+                if (walletConnector.isEip7702Mode) {
+                    address = (_b = walletConnector.eoaAddress) !== null && _b !== void 0 ? _b : account.address;
+                }
+            }
             return wallet.walletConnector.createWallet({
                 additionalAddresses: account.walletAdditionalAddresses,
-                address: account.address,
+                address,
                 chain: wallet.walletConnector.connectedChain,
                 connector: wallet.walletConnector,
                 id: account.id,
                 isAuthenticated: true,
-                key: (_b = account.walletName) !== null && _b !== void 0 ? _b : wallet.walletConnector.key,
+                key: (_c = account.walletName) !== null && _c !== void 0 ? _c : wallet.walletConnector.key,
             });
         }
         return null;

package/src/lib/utils/hooks/useWalletConnectors/utils/createLinkedWalletsFromWalletOptions/createLinkedWalletsFromWalletOptions.d.ts

@@ -5,6 +5,7 @@ type CreateWalletsFromWalletOptionsProps = {
     primaryWalletId: string | undefined;
     walletConnectorOptions: WalletOption[] | undefined;
     separateSmartWalletAndSigner?: boolean;
+    enableEIP7702?: boolean;
 };
-export declare const createLinkedWalletsFromWalletOptions: ({ user, walletConnectorOptions, primaryWalletId, separateSmartWalletAndSigner, }: CreateWalletsFromWalletOptionsProps) => Wallet[];
+export declare const createLinkedWalletsFromWalletOptions: ({ user, walletConnectorOptions, primaryWalletId, separateSmartWalletAndSigner, enableEIP7702, }: CreateWalletsFromWalletOptionsProps) => Wallet[];
 export {};

package/src/lib/utils/hooks/useWalletConnectors/utils/createLinkedWalletsFromWalletOptions/createLinkedWalletsFromWalletOptions.js

@@ -1,12 +1,13 @@
 'use client'
 import { HardwareWalletEnum, WalletProviderEnum } from '@dynamic-labs/sdk-api-core';
 import { isHardwareWalletConnector } from '@dynamic-labs/wallet-connector-core';
+import { isZeroDevConnector } from '@dynamic-labs/ethereum-aa';
 import { findWalletOptionFor } from '../../../../functions/findWalletOptionFor/findWalletOptionFor.js';
 import { shouldManuallyReconnectOnRefresh } from '../../../../functions/shouldManuallyReconnectOnRefresh/shouldManuallyReconnectOnRefresh.js';
 import { convertLegacyPhantomLedgerConnector } from '../convertLegacyPhantomLedgerConnector/convertLegacyPhantomLedgerConnector.js';
 import { isOwnerOfASmartWallet, initializeSmartWallet } from '../smartWallet/smartWallet.js';
 
-const createLinkedWalletsFromWalletOptions = ({ user, walletConnectorOptions, primaryWalletId, separateSmartWalletAndSigner, }) => {
+const createLinkedWalletsFromWalletOptions = ({ user, walletConnectorOptions, primaryWalletId, separateSmartWalletAndSigner, enableEIP7702, }) => {
     // wallet state should be null while loading all the wallets or when there is no user
     if (!walletConnectorOptions || !user) {
         return [];
@@ -14,7 +15,7 @@ const createLinkedWalletsFromWalletOptions = ({ user, walletConnectorOptions, pr
     return user.verifiedCredentials
         .map(convertLegacyPhantomLedger)
         .map((account) => {
-        var _a, _b;
+        var _a, _b, _c;
         const wallet = findWalletOptionFor(account, walletConnectorOptions);
         // this probably shouldn't happen. this would mean that the user has an account linked
         // with wallet W, but the customer has toggled off wallet W or the chain that
@@ -41,19 +42,27 @@ const createLinkedWalletsFromWalletOptions = ({ user, walletConnectorOptions, pr
             if (account.walletProvider === WalletProviderEnum.SmartContractWallet) {
                 initializeSmartWallet({
                     account,
+                    isEip7702: enableEIP7702,
                     primaryWalletId,
                     verifiedCredentials: user.verifiedCredentials,
                     walletConnectorOptions,
                 });
             }
+            const { walletConnector } = wallet;
+            let { address } = account;
+            if (isZeroDevConnector(walletConnector)) {
+                if (walletConnector.isEip7702Mode) {
+                    address = (_b = walletConnector.eoaAddress) !== null && _b !== void 0 ? _b : account.address;
+                }
+            }
             return wallet.walletConnector.createWallet({
                 additionalAddresses: account.walletAdditionalAddresses,
-                address: account.address,
+                address,
                 chain: wallet.walletConnector.connectedChain,
                 connector: wallet.walletConnector,
                 id: account.id,
                 isAuthenticated: true,
-                key: (_b = account.walletName) !== null && _b !== void 0 ? _b : wallet.walletConnector.key,
+                key: (_c = account.walletName) !== null && _c !== void 0 ? _c : wallet.walletConnector.key,
             });
         }
         return null;

package/src/lib/utils/hooks/useWalletConnectors/utils/smartWallet/smartWallet.cjs

@@ -13,8 +13,17 @@ var findWalletOptionFor = require('../../../../functions/findWalletOptionFor/fin
 const findOwner = (account, verifiedCredentials) => verifiedCredentials.find((credential) => credential.id === account.signerRefId);
 const findSmartWallet = (account, verifiedCredentials) => verifiedCredentials.find((credential) => credential.signerRefId === account.id);
 const isOwnerOfASmartWallet = (account, verifiedCredentials) => Boolean(findSmartWallet(account, verifiedCredentials));
-const initializeSmartWallet = (_a) => _tslib.__awaiter(void 0, [_a], void 0, function* ({ account, verifiedCredentials, walletConnectorOptions, primaryWalletId, }) {
-    var _b, _c, _d, _e, _f;
+const initializeSmartWallet = (_a) => _tslib.__awaiter(void 0, [_a], void 0, function* ({ account, verifiedCredentials, walletConnectorOptions, primaryWalletId, isEip7702 = false, }) {
+    var _b, _c, _d, _e, _f, _g;
+    const smartWallet = findWalletOptionFor.findWalletOptionFor(account, walletConnectorOptions);
+    if (!smartWallet) {
+        throw new Error('could not find smart wallet from wallet options');
+    }
+    const connector = smartWallet.walletConnector;
+    if (!walletConnectorCore.isAccountAbstractionConnector(connector)) {
+        throw new Error('could not initialize smart wallet');
+    }
+    // Existing implementation for regular ZeroDev
     const owner = findOwner(account, verifiedCredentials);
     if (!owner) {
         throw new Error('could not find associated eoa account for smart wallet');
@@ -23,6 +32,9 @@ const initializeSmartWallet = (_a) => _tslib.__awaiter(void 0, [_a], void 0, fun
     if (!ownerWallet) {
         throw new Error('could not find owner wallet from wallet options');
     }
+    if ((!isEip7702 && !owner.address) || !account.address) {
+        throw new Error('could not find owner or smart wallet address');
+    }
     if (ownerWallet && walletConnectorCore.isTurnkeyWalletConnector(ownerWallet.walletConnector)) {
         const sortedVcs = (_c = (_b = ownerWallet.walletConnector) === null || _b === void 0 ? void 0 : _b.verifiedCredentials) === null || _c === void 0 ? void 0 : _c.reduce((acc, vc) => {
             if (vc.smartWalletRefAddress &&
@@ -37,26 +49,36 @@ const initializeSmartWallet = (_a) => _tslib.__awaiter(void 0, [_a], void 0, fun
             ownerWallet.walletConnector.setVerifiedCredentials(sortedVcs);
         }
     }
-    const smartWallet = findWalletOptionFor.findWalletOptionFor(account, walletConnectorOptions);
-    if (!smartWallet) {
-        throw new Error('could not find smart wallet from wallet options');
-    }
-    const connector = smartWallet.walletConnector;
-    if (!walletConnectorCore.isAccountAbstractionConnector(connector)) {
-        throw new Error('could not initialize smart wallet');
+    let eoaAddress, eoaConnector, shouldSetEoaConnector, smartWalletAddress;
+    if (isEip7702) {
+        eoaAddress = (_d = verifiedCredentials.find((vc) => vc.walletName === 'turnkeyhd')) === null || _d === void 0 ? void 0 : _d.address;
+        if (!eoaAddress) {
+            throw new Error('could not find eoa address');
+        }
+        eoaConnector = walletConnectorCore.isTurnkeyWalletConnector(connector)
+            ? connector
+            : ownerWallet.walletConnector;
+        shouldSetEoaConnector = true;
+        smartWalletAddress = eoaAddress;
     }
-    if (!owner.address || !account.address) {
-        throw new Error('could not find owner or smart wallet address');
+    else {
+        if (!owner.address) {
+            throw new Error('could not find owner address');
+        }
+        eoaAddress = owner.address;
+        eoaConnector = ownerWallet.walletConnector;
+        shouldSetEoaConnector =
+            primaryWalletId === owner.id || primaryWalletId === account.id;
+        smartWalletAddress = account.address;
     }
-    const shouldSetEoaConnector = primaryWalletId === owner.id || primaryWalletId === account.id;
     yield connector.registerEoa({
-        ecdsaProviderType: (_d = account.walletProperties) === null || _d === void 0 ? void 0 : _d.ecdsaProviderType,
-        entryPointVersion: (_e = account.walletProperties) === null || _e === void 0 ? void 0 : _e.entryPointVersion,
-        eoaAddress: owner.address,
-        eoaConnector: ownerWallet.walletConnector,
-        kernelVersion: (_f = account.walletProperties) === null || _f === void 0 ? void 0 : _f.kernelVersion,
+        ecdsaProviderType: (_e = account.walletProperties) === null || _e === void 0 ? void 0 : _e.ecdsaProviderType,
+        entryPointVersion: (_f = account.walletProperties) === null || _f === void 0 ? void 0 : _f.entryPointVersion,
+        eoaAddress,
+        eoaConnector,
+        kernelVersion: (_g = account.walletProperties) === null || _g === void 0 ? void 0 : _g.kernelVersion,
         shouldSetEoaConnector,
-        smartWalletAddress: account.address,
+        smartWalletAddress,
     });
 });
 

package/src/lib/utils/hooks/useWalletConnectors/utils/smartWallet/smartWallet.d.ts

@@ -3,9 +3,10 @@ import { WalletOption } from '../../../../../shared';
 export declare const findOwner: (account: JwtVerifiedCredential, verifiedCredentials: JwtVerifiedCredential[]) => JwtVerifiedCredential | undefined;
 export declare const findSmartWallet: (account: JwtVerifiedCredential, verifiedCredentials: JwtVerifiedCredential[]) => JwtVerifiedCredential | undefined;
 export declare const isOwnerOfASmartWallet: (account: JwtVerifiedCredential, verifiedCredentials: JwtVerifiedCredential[]) => boolean;
-export declare const initializeSmartWallet: ({ account, verifiedCredentials, walletConnectorOptions, primaryWalletId, }: {
+export declare const initializeSmartWallet: ({ account, verifiedCredentials, walletConnectorOptions, primaryWalletId, isEip7702, }: {
     account: JwtVerifiedCredential;
     verifiedCredentials: JwtVerifiedCredential[];
     walletConnectorOptions: WalletOption[];
     primaryWalletId?: string;
+    isEip7702?: boolean;
 }) => Promise<void>;

package/src/lib/utils/hooks/useWalletConnectors/utils/smartWallet/smartWallet.js

@@ -1,6 +1,6 @@
 'use client'
 import { __awaiter } from '../../../../../../../_virtual/_tslib.js';
-import { isTurnkeyWalletConnector, isSameAddress, isAccountAbstractionConnector } from '@dynamic-labs/wallet-connector-core';
+import { isAccountAbstractionConnector, isTurnkeyWalletConnector, isSameAddress } from '@dynamic-labs/wallet-connector-core';
 import { VerifiedCredentialNameToChainEnum } from '../../../../constants/values.js';
 import { findWalletOptionFor } from '../../../../functions/findWalletOptionFor/findWalletOptionFor.js';
 
@@ -9,8 +9,17 @@ import { findWalletOptionFor } from '../../../../functions/findWalletOptionFor/f
 const findOwner = (account, verifiedCredentials) => verifiedCredentials.find((credential) => credential.id === account.signerRefId);
 const findSmartWallet = (account, verifiedCredentials) => verifiedCredentials.find((credential) => credential.signerRefId === account.id);
 const isOwnerOfASmartWallet = (account, verifiedCredentials) => Boolean(findSmartWallet(account, verifiedCredentials));
-const initializeSmartWallet = (_a) => __awaiter(void 0, [_a], void 0, function* ({ account, verifiedCredentials, walletConnectorOptions, primaryWalletId, }) {
-    var _b, _c, _d, _e, _f;
+const initializeSmartWallet = (_a) => __awaiter(void 0, [_a], void 0, function* ({ account, verifiedCredentials, walletConnectorOptions, primaryWalletId, isEip7702 = false, }) {
+    var _b, _c, _d, _e, _f, _g;
+    const smartWallet = findWalletOptionFor(account, walletConnectorOptions);
+    if (!smartWallet) {
+        throw new Error('could not find smart wallet from wallet options');
+    }
+    const connector = smartWallet.walletConnector;
+    if (!isAccountAbstractionConnector(connector)) {
+        throw new Error('could not initialize smart wallet');
+    }
+    // Existing implementation for regular ZeroDev
     const owner = findOwner(account, verifiedCredentials);
     if (!owner) {
         throw new Error('could not find associated eoa account for smart wallet');
@@ -19,6 +28,9 @@ const initializeSmartWallet = (_a) => __awaiter(void 0, [_a], void 0, function*
     if (!ownerWallet) {
         throw new Error('could not find owner wallet from wallet options');
     }
+    if ((!isEip7702 && !owner.address) || !account.address) {
+        throw new Error('could not find owner or smart wallet address');
+    }
     if (ownerWallet && isTurnkeyWalletConnector(ownerWallet.walletConnector)) {
         const sortedVcs = (_c = (_b = ownerWallet.walletConnector) === null || _b === void 0 ? void 0 : _b.verifiedCredentials) === null || _c === void 0 ? void 0 : _c.reduce((acc, vc) => {
             if (vc.smartWalletRefAddress &&
@@ -33,26 +45,36 @@ const initializeSmartWallet = (_a) => __awaiter(void 0, [_a], void 0, function*
             ownerWallet.walletConnector.setVerifiedCredentials(sortedVcs);
         }
     }
-    const smartWallet = findWalletOptionFor(account, walletConnectorOptions);
-    if (!smartWallet) {
-        throw new Error('could not find smart wallet from wallet options');
-    }
-    const connector = smartWallet.walletConnector;
-    if (!isAccountAbstractionConnector(connector)) {
-        throw new Error('could not initialize smart wallet');
+    let eoaAddress, eoaConnector, shouldSetEoaConnector, smartWalletAddress;
+    if (isEip7702) {
+        eoaAddress = (_d = verifiedCredentials.find((vc) => vc.walletName === 'turnkeyhd')) === null || _d === void 0 ? void 0 : _d.address;
+        if (!eoaAddress) {
+            throw new Error('could not find eoa address');
+        }
+        eoaConnector = isTurnkeyWalletConnector(connector)
+            ? connector
+            : ownerWallet.walletConnector;
+        shouldSetEoaConnector = true;
+        smartWalletAddress = eoaAddress;
     }
-    if (!owner.address || !account.address) {
-        throw new Error('could not find owner or smart wallet address');
+    else {
+        if (!owner.address) {
+            throw new Error('could not find owner address');
+        }
+        eoaAddress = owner.address;
+        eoaConnector = ownerWallet.walletConnector;
+        shouldSetEoaConnector =
+            primaryWalletId === owner.id || primaryWalletId === account.id;
+        smartWalletAddress = account.address;
     }
-    const shouldSetEoaConnector = primaryWalletId === owner.id || primaryWalletId === account.id;
     yield connector.registerEoa({
-        ecdsaProviderType: (_d = account.walletProperties) === null || _d === void 0 ? void 0 : _d.ecdsaProviderType,
-        entryPointVersion: (_e = account.walletProperties) === null || _e === void 0 ? void 0 : _e.entryPointVersion,
-        eoaAddress: owner.address,
-        eoaConnector: ownerWallet.walletConnector,
-        kernelVersion: (_f = account.walletProperties) === null || _f === void 0 ? void 0 : _f.kernelVersion,
+        ecdsaProviderType: (_e = account.walletProperties) === null || _e === void 0 ? void 0 : _e.ecdsaProviderType,
+        entryPointVersion: (_f = account.walletProperties) === null || _f === void 0 ? void 0 : _f.entryPointVersion,
+        eoaAddress,
+        eoaConnector,
+        kernelVersion: (_g = account.walletProperties) === null || _g === void 0 ? void 0 : _g.kernelVersion,
         shouldSetEoaConnector,
-        smartWalletAddress: account.address,
+        smartWalletAddress,
     });
 });
 

package/src/lib/utils/hooks/useWalletEventListeners/useWalletEventListeners.cjs

@@ -15,7 +15,6 @@ require('@dynamic-labs/wallet-book');
 require('@dynamic-labs/utils');
 require('../../constants/colors.cjs');
 require('../../constants/values.cjs');
-require('../../../store/state/loadingAndLifecycle.cjs');
 require('../../../shared/consts/index.cjs');
 var useDynamicEvents = require('../events/useDynamicEvents/useDynamicEvents.cjs');
 var useWalletConnectorEvent = require('../events/useWalletConnectorEvent/useWalletConnectorEvent.cjs');

package/src/lib/utils/hooks/useWalletEventListeners/useWalletEventListeners.js

@@ -11,7 +11,6 @@ import '@dynamic-labs/wallet-book';
 import '@dynamic-labs/utils';
 import '../../constants/colors.js';
 import '../../constants/values.js';
-import '../../../store/state/loadingAndLifecycle.js';
 import '../../../shared/consts/index.js';
 import { useInternalDynamicEvents } from '../events/useDynamicEvents/useDynamicEvents.js';
 import { useWalletConnectorEvent } from '../events/useWalletConnectorEvent/useWalletConnectorEvent.js';

package/src/lib/utils/hooks/useWalletItemActions/useHandleWalletItem/useHandleWalletItem.cjs

@@ -17,7 +17,6 @@ require('@dynamic-labs/wallet-book');
 var localStorage = require('../../../constants/localStorage.cjs');
 require('../../../constants/colors.cjs');
 require('../../../constants/values.cjs');
-require('../../../../store/state/loadingAndLifecycle.cjs');
 require('../../../../shared/consts/index.cjs');
 var dynamicEvents = require('../../../../events/dynamicEvents.cjs');
 require('../../../../context/CaptchaContext/CaptchaContext.cjs');
@@ -51,7 +50,9 @@ require('../../../../views/CollectUserDataView/useFields.cjs');
 require('../../../../context/FieldsStateContext/FieldsStateContext.cjs');
 require('../../../../context/UserFieldEditorContext/UserFieldEditorContext.cjs');
 require('@dynamic-labs/rpc-providers');
+require('../../../../store/state/loadingAndLifecycle.cjs');
 require('../../../../store/state/walletOptions/walletOptions.cjs');
+require('@dynamic-labs/ethereum-aa');
 var isSelectedWalletAlreadyConnected = require('../../../functions/isSelectedWalletAlreadyConnected/isSelectedWalletAlreadyConnected.cjs');
 require('react-i18next');
 require('../../../../components/Accordion/components/AccordionItem/AccordionItem.cjs');

package/src/lib/utils/hooks/useWalletItemActions/useHandleWalletItem/useHandleWalletItem.js

@@ -13,7 +13,6 @@ import '@dynamic-labs/wallet-book';
 import { PHANTOM_SIGNATURE_STATE } from '../../../constants/localStorage.js';
 import '../../../constants/colors.js';
 import '../../../constants/values.js';
-import '../../../../store/state/loadingAndLifecycle.js';
 import '../../../../shared/consts/index.js';
 import { dynamicEvents } from '../../../../events/dynamicEvents.js';
 import '../../../../context/CaptchaContext/CaptchaContext.js';
@@ -47,7 +46,9 @@ import '../../../../views/CollectUserDataView/useFields.js';
 import '../../../../context/FieldsStateContext/FieldsStateContext.js';
 import '../../../../context/UserFieldEditorContext/UserFieldEditorContext.js';
 import '@dynamic-labs/rpc-providers';
+import '../../../../store/state/loadingAndLifecycle.js';
 import '../../../../store/state/walletOptions/walletOptions.js';
+import '@dynamic-labs/ethereum-aa';
 import { isSelectedWalletAlreadyConnected } from '../../../functions/isSelectedWalletAlreadyConnected/isSelectedWalletAlreadyConnected.js';
 import 'react-i18next';
 import '../../../../components/Accordion/components/AccordionItem/AccordionItem.js';

package/src/lib/utils/hooks/useWalletItemActions/useWalletItemActions.cjs

@@ -16,7 +16,6 @@ require('@dynamic-labs/wallet-book');
 require('@dynamic-labs/utils');
 require('../../constants/colors.cjs');
 require('../../constants/values.cjs');
-require('../../../store/state/loadingAndLifecycle.cjs');
 require('../../../shared/consts/index.cjs');
 require('../../../events/dynamicEvents.cjs');
 var useConnectAndSign = require('../authenticationHooks/useConnectAndSign/useConnectAndSign.cjs');
@@ -51,7 +50,9 @@ require('../../../views/CollectUserDataView/useFields.cjs');
 require('../../../context/FieldsStateContext/FieldsStateContext.cjs');
 require('../../../context/UserFieldEditorContext/UserFieldEditorContext.cjs');
 require('@dynamic-labs/rpc-providers');
+require('../../../store/state/loadingAndLifecycle.cjs');
 require('../../../store/state/walletOptions/walletOptions.cjs');
+require('@dynamic-labs/ethereum-aa');
 var useHandleWalletItem = require('./useHandleWalletItem/useHandleWalletItem.cjs');
 require('react-i18next');
 require('../../../components/Accordion/components/AccordionItem/AccordionItem.cjs');