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

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

@@ -57,7 +57,6 @@ 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');
@@ -107,7 +106,7 @@ require('../../../shared/utils/functions/getInitialUrl/getInitialUrl.cjs');
 const useVerifyWallet = ({ displaySiweStatement, environmentId, projectSettings, setIsSingleWalletAccount, }) => {
     const { setExistentAccountData } = AccountExistsContext.useAccountExistsContext();
     const { setDeniedAddress, setDeniedOauthProvider } = AccessDeniedContext.useAccessDeniedContext();
-    const { setView, goToInitialView } = ViewContext.useViewContext();
+    const { pushView, clearStackAndPushInitialView } = ViewContext.useViewContext();
     const { setErrorMessage, setError } = ErrorContext.useErrorContext();
     const { multiWalletWidgetState, debugError, multiWallet: multiWalletEnabled, appName, primaryWalletId, setShowAuthFlow, siweStatement, connectedWallets, authMode, user, setAuthMode, removeConnectedWalletsInfo, events, primaryWallet, enableConnectOnlyFallback, selectedWalletConnector, } = useInternalDynamicContext.useInternalDynamicContext();
     const { addedWalletsIds } = UserWalletsContext.useInternalUserWallets();
@@ -170,11 +169,11 @@ const useVerifyWallet = ({ displaySiweStatement, environmentId, projectSettings,
         // This is a special case where the user is trying to link a wallet
         // and the wallet is already linked and we don't want to kill the session.
         setShowAuthFlow(true);
-        setView('wallet-used');
+        pushView('wallet-used');
         setIsSingleWalletAccount(false);
         if (e.code === 'reassign_wallet_error') {
             if ((_a = projectSettings === null || projectSettings === void 0 ? void 0 : projectSettings.sdk) === null || _a === void 0 ? void 0 : _a.preventOrphanedAccounts) {
-                setView('wallet-cannot-be-transferred');
+                pushView('wallet-cannot-be-transferred');
             }
             setIsSingleWalletAccount(true);
         }
@@ -200,7 +199,7 @@ const useVerifyWallet = ({ displaySiweStatement, environmentId, projectSettings,
                 type: 'wallet',
             }, { error: e });
         if (e instanceof utils.EmbeddedWalletExistsError) {
-            setView('embedded-wallet-exists');
+            pushView('embedded-wallet-exists');
             setShowAuthFlow(true);
             return;
         }
@@ -209,24 +208,24 @@ const useVerifyWallet = ({ displaySiweStatement, environmentId, projectSettings,
             return handleWalletUsedError(e);
         }
         if (e instanceof utils.MergeAccountsConfirmationError) {
-            setView('merge-user-accounts', Object.assign({}, e));
+            pushView('merge-user-accounts', Object.assign({}, e));
             setShowAuthFlow(true);
             return;
         }
         if (e instanceof utils.ChainalysisError) {
             handleDisconnectWallet({ walletConnector });
             setDeniedAddress(address);
-            setView('chainalysis-blocked-wallet');
+            pushView('chainalysis-blocked-wallet');
             return;
         }
         if (e instanceof utils.GateBlockedError) {
             handleDisconnectWallet({ walletConnector });
             setDeniedAddress(address);
-            setView('gate-blocked-wallet');
+            pushView('gate-blocked-wallet');
             return;
         }
         if (e instanceof utils.SandboxMaximumThresholdReachedError) {
-            setView('sandbox-maximum-threshold-reached');
+            pushView('sandbox-maximum-threshold-reached');
             return;
         }
         if (e instanceof utils.NoAccessError) {
@@ -236,13 +235,13 @@ const useVerifyWallet = ({ displaySiweStatement, environmentId, projectSettings,
             if (walletConnectorCore.isSocialWalletConnector(walletConnector)) {
                 setDeniedOauthProvider(oauth === null || oauth === void 0 ? void 0 : oauth.provider);
             }
-            setView('no-access');
+            pushView('no-access');
             return;
         }
         if (e instanceof utils.AccountExistsError) {
             handleDisconnectWallet({ walletConnector });
             setExistentAccountData(e.errorPayload);
-            setView('account-exists');
+            pushView('account-exists');
             return;
         }
         if (connectedWallets.length && authMode === 'connect-only') {
@@ -254,12 +253,12 @@ const useVerifyWallet = ({ displaySiweStatement, environmentId, projectSettings,
             logger.logger.warn('Verification failed, changing to connect-only');
             // verification failed for unknown reason, set authmode to connect-only and show wallet list
             setAuthMode('connect-only');
-            setView('wallet-list');
+            pushView('wallet-list');
             return;
         }
         else {
             handleDisconnectWallet({ walletConnector });
-            goToInitialView();
+            clearStackAndPushInitialView();
         }
         logger.logger.error(e);
         if (debugError) {

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

@@ -53,7 +53,6 @@ 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';
@@ -103,7 +102,7 @@ import '../../../shared/utils/functions/getInitialUrl/getInitialUrl.js';
 const useVerifyWallet = ({ displaySiweStatement, environmentId, projectSettings, setIsSingleWalletAccount, }) => {
     const { setExistentAccountData } = useAccountExistsContext();
     const { setDeniedAddress, setDeniedOauthProvider } = useAccessDeniedContext();
-    const { setView, goToInitialView } = useViewContext();
+    const { pushView, clearStackAndPushInitialView } = useViewContext();
     const { setErrorMessage, setError } = useErrorContext();
     const { multiWalletWidgetState, debugError, multiWallet: multiWalletEnabled, appName, primaryWalletId, setShowAuthFlow, siweStatement, connectedWallets, authMode, user, setAuthMode, removeConnectedWalletsInfo, events, primaryWallet, enableConnectOnlyFallback, selectedWalletConnector, } = useInternalDynamicContext();
     const { addedWalletsIds } = useInternalUserWallets();
@@ -166,11 +165,11 @@ const useVerifyWallet = ({ displaySiweStatement, environmentId, projectSettings,
         // This is a special case where the user is trying to link a wallet
         // and the wallet is already linked and we don't want to kill the session.
         setShowAuthFlow(true);
-        setView('wallet-used');
+        pushView('wallet-used');
         setIsSingleWalletAccount(false);
         if (e.code === 'reassign_wallet_error') {
             if ((_a = projectSettings === null || projectSettings === void 0 ? void 0 : projectSettings.sdk) === null || _a === void 0 ? void 0 : _a.preventOrphanedAccounts) {
-                setView('wallet-cannot-be-transferred');
+                pushView('wallet-cannot-be-transferred');
             }
             setIsSingleWalletAccount(true);
         }
@@ -196,7 +195,7 @@ const useVerifyWallet = ({ displaySiweStatement, environmentId, projectSettings,
                 type: 'wallet',
             }, { error: e });
         if (e instanceof EmbeddedWalletExistsError) {
-            setView('embedded-wallet-exists');
+            pushView('embedded-wallet-exists');
             setShowAuthFlow(true);
             return;
         }
@@ -205,24 +204,24 @@ const useVerifyWallet = ({ displaySiweStatement, environmentId, projectSettings,
             return handleWalletUsedError(e);
         }
         if (e instanceof MergeAccountsConfirmationError) {
-            setView('merge-user-accounts', Object.assign({}, e));
+            pushView('merge-user-accounts', Object.assign({}, e));
             setShowAuthFlow(true);
             return;
         }
         if (e instanceof ChainalysisError) {
             handleDisconnectWallet({ walletConnector });
             setDeniedAddress(address);
-            setView('chainalysis-blocked-wallet');
+            pushView('chainalysis-blocked-wallet');
             return;
         }
         if (e instanceof GateBlockedError) {
             handleDisconnectWallet({ walletConnector });
             setDeniedAddress(address);
-            setView('gate-blocked-wallet');
+            pushView('gate-blocked-wallet');
             return;
         }
         if (e instanceof SandboxMaximumThresholdReachedError) {
-            setView('sandbox-maximum-threshold-reached');
+            pushView('sandbox-maximum-threshold-reached');
             return;
         }
         if (e instanceof NoAccessError) {
@@ -232,13 +231,13 @@ const useVerifyWallet = ({ displaySiweStatement, environmentId, projectSettings,
             if (isSocialWalletConnector(walletConnector)) {
                 setDeniedOauthProvider(oauth === null || oauth === void 0 ? void 0 : oauth.provider);
             }
-            setView('no-access');
+            pushView('no-access');
             return;
         }
         if (e instanceof AccountExistsError) {
             handleDisconnectWallet({ walletConnector });
             setExistentAccountData(e.errorPayload);
-            setView('account-exists');
+            pushView('account-exists');
             return;
         }
         if (connectedWallets.length && authMode === 'connect-only') {
@@ -250,12 +249,12 @@ const useVerifyWallet = ({ displaySiweStatement, environmentId, projectSettings,
             logger.warn('Verification failed, changing to connect-only');
             // verification failed for unknown reason, set authmode to connect-only and show wallet list
             setAuthMode('connect-only');
-            setView('wallet-list');
+            pushView('wallet-list');
             return;
         }
         else {
             handleDisconnectWallet({ walletConnector });
-            goToInitialView();
+            clearStackAndPushInitialView();
         }
         logger.error(e);
         if (debugError) {

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

@@ -50,7 +50,6 @@ 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

@@ -46,7 +46,6 @@ 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

@@ -29,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, enableEIP7702, separateSmartWalletAndSigner = false, }) => {
+const useWalletConnectors = ({ authMode, connectedWallets, walletConnectorOptions, setMultiWalletWidgetState, primaryWalletId, user, canHaveMultipleWalletsConnected, 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);
@@ -38,7 +38,6 @@ const useWalletConnectors = ({ authMode, connectedWallets, walletConnectorOption
             return [];
         }
         return createLinkedWalletsFromWalletOptions.createLinkedWalletsFromWalletOptions({
-            enableEIP7702,
             primaryWalletId,
             separateSmartWalletAndSigner,
             user,

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

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

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

@@ -25,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, enableEIP7702, separateSmartWalletAndSigner = false, }) => {
+const useWalletConnectors = ({ authMode, connectedWallets, walletConnectorOptions, setMultiWalletWidgetState, primaryWalletId, user, canHaveMultipleWalletsConnected, 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);
@@ -34,7 +34,6 @@ const useWalletConnectors = ({ authMode, connectedWallets, walletConnectorOption
             return [];
         }
         return createLinkedWalletsFromWalletOptions({
-            enableEIP7702,
             primaryWalletId,
             separateSmartWalletAndSigner,
             user,

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

@@ -5,13 +5,12 @@ 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, enableEIP7702, }) => {
+const createLinkedWalletsFromWalletOptions = ({ user, walletConnectorOptions, primaryWalletId, separateSmartWalletAndSigner, }) => {
     // wallet state should be null while loading all the wallets or when there is no user
     if (!walletConnectorOptions || !user) {
         return [];
@@ -19,7 +18,7 @@ const createLinkedWalletsFromWalletOptions = ({ user, walletConnectorOptions, pr
     return user.verifiedCredentials
         .map(convertLegacyPhantomLedger)
         .map((account) => {
-        var _a, _b, _c;
+        var _a, _b;
         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
@@ -46,27 +45,19 @@ 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,
+                address: account.address,
                 chain: wallet.walletConnector.connectedChain,
                 connector: wallet.walletConnector,
                 id: account.id,
                 isAuthenticated: true,
-                key: (_c = account.walletName) !== null && _c !== void 0 ? _c : wallet.walletConnector.key,
+                key: (_b = account.walletName) !== null && _b !== void 0 ? _b : wallet.walletConnector.key,
             });
         }
         return null;

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

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

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

@@ -1,13 +1,12 @@
 '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, enableEIP7702, }) => {
+const createLinkedWalletsFromWalletOptions = ({ user, walletConnectorOptions, primaryWalletId, separateSmartWalletAndSigner, }) => {
     // wallet state should be null while loading all the wallets or when there is no user
     if (!walletConnectorOptions || !user) {
         return [];
@@ -15,7 +14,7 @@ const createLinkedWalletsFromWalletOptions = ({ user, walletConnectorOptions, pr
     return user.verifiedCredentials
         .map(convertLegacyPhantomLedger)
         .map((account) => {
-        var _a, _b, _c;
+        var _a, _b;
         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
@@ -42,27 +41,19 @@ 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,
+                address: account.address,
                 chain: wallet.walletConnector.connectedChain,
                 connector: wallet.walletConnector,
                 id: account.id,
                 isAuthenticated: true,
-                key: (_c = account.walletName) !== null && _c !== void 0 ? _c : wallet.walletConnector.key,
+                key: (_b = account.walletName) !== null && _b !== void 0 ? _b : wallet.walletConnector.key,
             });
         }
         return null;

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

@@ -13,17 +13,8 @@ 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, 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 initializeSmartWallet = (_a) => _tslib.__awaiter(void 0, [_a], void 0, function* ({ account, verifiedCredentials, walletConnectorOptions, primaryWalletId, }) {
+    var _b, _c, _d, _e, _f;
     const owner = findOwner(account, verifiedCredentials);
     if (!owner) {
         throw new Error('could not find associated eoa account for smart wallet');
@@ -32,9 +23,6 @@ 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 &&
@@ -49,36 +37,26 @@ const initializeSmartWallet = (_a) => _tslib.__awaiter(void 0, [_a], void 0, fun
             ownerWallet.walletConnector.setVerifiedCredentials(sortedVcs);
         }
     }
-    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;
+    const smartWallet = findWalletOptionFor.findWalletOptionFor(account, walletConnectorOptions);
+    if (!smartWallet) {
+        throw new Error('could not find smart wallet from wallet options');
     }
-    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 connector = smartWallet.walletConnector;
+    if (!walletConnectorCore.isAccountAbstractionConnector(connector)) {
+        throw new Error('could not initialize smart wallet');
+    }
+    if (!owner.address || !account.address) {
+        throw new Error('could not find owner or smart wallet address');
     }
+    const shouldSetEoaConnector = primaryWalletId === owner.id || primaryWalletId === account.id;
     yield connector.registerEoa({
-        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,
+        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,
         shouldSetEoaConnector,
-        smartWalletAddress,
+        smartWalletAddress: account.address,
     });
 });
 

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

@@ -3,10 +3,9 @@ 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, isEip7702, }: {
+export declare const initializeSmartWallet: ({ account, verifiedCredentials, walletConnectorOptions, primaryWalletId, }: {
     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 { isAccountAbstractionConnector, isTurnkeyWalletConnector, isSameAddress } from '@dynamic-labs/wallet-connector-core';
+import { isTurnkeyWalletConnector, isSameAddress, isAccountAbstractionConnector } from '@dynamic-labs/wallet-connector-core';
 import { VerifiedCredentialNameToChainEnum } from '../../../../constants/values.js';
 import { findWalletOptionFor } from '../../../../functions/findWalletOptionFor/findWalletOptionFor.js';
 
@@ -9,17 +9,8 @@ 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, 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 initializeSmartWallet = (_a) => __awaiter(void 0, [_a], void 0, function* ({ account, verifiedCredentials, walletConnectorOptions, primaryWalletId, }) {
+    var _b, _c, _d, _e, _f;
     const owner = findOwner(account, verifiedCredentials);
     if (!owner) {
         throw new Error('could not find associated eoa account for smart wallet');
@@ -28,9 +19,6 @@ 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 &&
@@ -45,36 +33,26 @@ const initializeSmartWallet = (_a) => __awaiter(void 0, [_a], void 0, function*
             ownerWallet.walletConnector.setVerifiedCredentials(sortedVcs);
         }
     }
-    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;
+    const smartWallet = findWalletOptionFor(account, walletConnectorOptions);
+    if (!smartWallet) {
+        throw new Error('could not find smart wallet from wallet options');
     }
-    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 connector = smartWallet.walletConnector;
+    if (!isAccountAbstractionConnector(connector)) {
+        throw new Error('could not initialize smart wallet');
+    }
+    if (!owner.address || !account.address) {
+        throw new Error('could not find owner or smart wallet address');
     }
+    const shouldSetEoaConnector = primaryWalletId === owner.id || primaryWalletId === account.id;
     yield connector.registerEoa({
-        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,
+        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,
         shouldSetEoaConnector,
-        smartWalletAddress,
+        smartWalletAddress: account.address,
     });
 });