@dynamic-labs/sdk-react-core 3.0.0-alpha.2 → 3.0.0-alpha.20

package/src/lib/utils/hooks/useEmbeddedWallet/useSecureEnclaveEmbeddedWallet/useSecureEnclaveEmbeddedWallet.js

@@ -29,8 +29,6 @@ import '@dynamic-labs/store';
 import '../../../../locale/locale.js';
 import { getUserWalletsFromVerifiedCredentials } from '../../../functions/getUserWalletsFromVerifiedCredentials/getUserWalletsFromVerifiedCredentials.js';
 import { addPasskeyIdentifierToWalletConnector } from '../../../functions/addPasskeyIdentifierToWalletConnector/addPasskeyIdentifierToWalletConnector.js';
-import 'viem';
-import 'viem/chains';
 import { getEOAWallet } from '../../../functions/getEOAWallet/getEOAWallet.js';
 import { getUserVerifiedCredentialType } from '../../../functions/getUserVerifiedCredentialType/getUserVerifiedCredentialType.js';
 import { hasEmbeddedWallet } from '../../../functions/hasEmbeddedWallet/hasEmbeddedWallet.js';
@@ -92,6 +90,17 @@ import '../../../../widgets/DynamicWidget/components/DynamicWidgetHeader/Dynamic
 import '../../../../widgets/DynamicWidget/context/DynamicWidgetContext.js';
 import '../../../../views/TransactionConfirmationView/helpers/transactionErrorMessage.js';
 import '../../../../widgets/DynamicWidget/views/ManagePasskeysWidgetView/PasskeyCard/PasskeyCard.js';
+import '../../../../../polyfills.js';
+import '../../../../context/ErrorBoundary/ErrorBoundaryBase.js';
+import '../../../../context/ErrorBoundary/ErrorBoundaryContext.js';
+import '../../../../widgets/DynamicBridgeWidget/context/DynamicBridgeWidgetContext/DynamicBridgeWidgetContext.js';
+import '../../../../widgets/DynamicWidget/components/DynamicWidgetCard/DynamicWidgetCard.js';
+import '../../../../context/WidgetRegistry/WidgetRegistryContextProvider.js';
+import '../../../../context/FundingContext/FundingContext.js';
+import '../../../../context/SendBalanceContext/SendBalanceContext.js';
+import '../../../../context/ConnectWithOtpContext/ConnectWithOtpContext.js';
+import '../../../../context/ConnectWithOtpContext/constants.js';
+import '../../../../context/ReinitializeContext/ReinitializeContextProvider.js';
 import { useInternalDynamicContext } from '../../../../context/DynamicContext/useDynamicContext/useInternalDynamicContext.js';
 
 // Hook exposed to customers
@@ -110,7 +119,7 @@ import { useInternalDynamicContext } from '../../../../context/DynamicContext/us
  * }
  */
 const useSecureEnclaveEmbeddedWallet = () => {
-    var _a, _b, _c, _d, _e, _f;
+    var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k;
     const { projectSettings, primaryWallet, user, environmentId, walletConnectorOptions, walletConnector, } = useInternalDynamicContext();
     const { createTurnkeyWallet } = useTurnkey();
     const { hasRecoveryEmail } = useIsTurnkeyWallet();
@@ -125,13 +134,13 @@ const useSecureEnclaveEmbeddedWallet = () => {
      * @returns Promise<Wallet | undefined>
      */
     const createEmbeddedWallet = useCallback((chains, options) => __awaiter(void 0, void 0, void 0, function* () {
-        var _g;
+        var _l;
         if (!user) {
             throw new DynamicError(USER_NOT_LOGGED_IN);
         }
         const userWalletsCredentials = getUserWalletsFromVerifiedCredentials(user);
         const embeddedWalletVerifiedCredential = findEmbeddedWalletFromVerifiedCredentials(user, chains);
-        const isManualMode = ((_g = projectSettings === null || projectSettings === void 0 ? void 0 : projectSettings.sdk.embeddedWallets) === null || _g === void 0 ? void 0 : _g.automaticEmbeddedWalletCreation) === false;
+        const isManualMode = ((_l = projectSettings === null || projectSettings === void 0 ? void 0 : projectSettings.sdk.embeddedWallets) === null || _l === void 0 ? void 0 : _l.automaticEmbeddedWalletCreation) === false;
         // if user has a wallet and it's not embedded,
         // throw error to follow another flow and set up the right wallet
         // However, if the user is in manual mode continue.
@@ -152,13 +161,18 @@ const useSecureEnclaveEmbeddedWallet = () => {
      * @returns Promise<'session_created' | 'session_restored'> - returns a string indicating the status of the session
      */
     const createOrRestoreSession = useCallback((options) => __awaiter(void 0, void 0, void 0, function* () {
-        var _h, _j, _k, _l, _m, _o;
+        var _m, _o, _p, _q, _r, _s, _t, _u, _v;
         if (!user) {
             throw new DynamicError(USER_NOT_LOGGED_IN);
         }
-        if (isSessionKeyCompatibleWalletConnector(walletConnector)) {
-            const publicKey = yield walletConnector.createOrRestoreSession();
-            return publicKey;
+        const isSessionKeyCompatibleAAConnector = ((_m = primaryWallet === null || primaryWallet === void 0 ? void 0 : primaryWallet.connector) === null || _m === void 0 ? void 0 : _m.key) === 'zerodev'
+            ? isSessionKeyCompatibleWalletConnector((primaryWallet === null || primaryWallet === void 0 ? void 0 : primaryWallet.connector).getEOAConnector())
+            : false;
+        if (isSessionKeyCompatibleWalletConnector(primaryWallet === null || primaryWallet === void 0 ? void 0 : primaryWallet.connector)) {
+            return yield ((_o = primaryWallet === null || primaryWallet === void 0 ? void 0 : primaryWallet.connector) === null || _o === void 0 ? void 0 : _o.createOrRestoreSession());
+        }
+        else if (isSessionKeyCompatibleAAConnector) {
+            return yield ((_p = (primaryWallet === null || primaryWallet === void 0 ? void 0 : primaryWallet.connector).getEOAConnector()) === null || _p === void 0 ? void 0 : _p.createOrRestoreSession());
         }
         const turnkeyRecoveryHandler = getEmbeddedWalletAuthHandler(wallet === null || wallet === void 0 ? void 0 : wallet.connector);
         if (turnkeyRecoveryHandler.isSessionActive()) {
@@ -166,12 +180,12 @@ const useSecureEnclaveEmbeddedWallet = () => {
         }
         const turnkeyAuthIframeContainerRef = createRootElement(iframeContainerId);
         // try to restore session if possible
-        if (canRestoreEmbeddedWalletSession((_h = projectSettings === null || projectSettings === void 0 ? void 0 : projectSettings.sdk.embeddedWallets) === null || _h === void 0 ? void 0 : _h.sessionKeyDuration)) {
+        if (canRestoreEmbeddedWalletSession((_q = projectSettings === null || projectSettings === void 0 ? void 0 : projectSettings.sdk.embeddedWallets) === null || _q === void 0 ? void 0 : _q.sessionKeyDuration)) {
             try {
                 const sessionRestored = yield restoreEmbeddedWalletSession({
                     iframeContainer: turnkeyAuthIframeContainerRef.current,
                     iframeElementId,
-                    sessionExpiration: getEmbeddedWalletSessionExpiration((_k = (_j = projectSettings === null || projectSettings === void 0 ? void 0 : projectSettings.sdk) === null || _j === void 0 ? void 0 : _j.embeddedWallets) === null || _k === void 0 ? void 0 : _k.sessionKeyDuration),
+                    sessionExpiration: getEmbeddedWalletSessionExpiration((_s = (_r = projectSettings === null || projectSettings === void 0 ? void 0 : projectSettings.sdk) === null || _r === void 0 ? void 0 : _r.embeddedWallets) === null || _s === void 0 ? void 0 : _s.sessionKeyDuration),
                     user,
                     wallet: primaryWallet,
                 });
@@ -190,7 +204,7 @@ const useSecureEnclaveEmbeddedWallet = () => {
         if (!userHasEmbeddedWallet() || !hasRecoveryEmail) {
             throw new DynamicError('User does not have a secure enclave wallet or a verified email', INVALID_WALLET_DATA);
         }
-        const organizationId = (_o = (_m = (_l = user === null || user === void 0 ? void 0 : user.verifiedCredentials) === null || _l === void 0 ? void 0 : _l.find(({ walletName }) => walletName === null || walletName === void 0 ? void 0 : walletName.startsWith('turnkey'))) === null || _m === void 0 ? void 0 : _m.walletProperties) === null || _o === void 0 ? void 0 : _o.turnkeySubOrganizationId;
+        const organizationId = (_v = (_u = (_t = user === null || user === void 0 ? void 0 : user.verifiedCredentials) === null || _t === void 0 ? void 0 : _t.find(({ walletName }) => walletName === null || walletName === void 0 ? void 0 : walletName.startsWith('turnkey'))) === null || _u === void 0 ? void 0 : _u.walletProperties) === null || _v === void 0 ? void 0 : _v.turnkeySubOrganizationId;
         yield turnkeyRecoveryHandler.verifyRecoveryCode(options.oneTimeCode, organizationId);
         const sessionSettings = {
             createdAt: new Date().getTime(),
@@ -214,12 +228,12 @@ const useSecureEnclaveEmbeddedWallet = () => {
      * @returns Promise<WebAuthnAttestation>
      */
     const createPasskey = useCallback((options) => __awaiter(void 0, void 0, void 0, function* () {
-        var _p, _q;
+        var _w, _x;
         if (!user) {
             throw new DynamicError(USER_NOT_LOGGED_IN);
         }
         validateTurnkeyProviderEnabled(projectSettings);
-        const turnkeyWallet = findTurnkeyWalletByPrimaryChain(walletConnectorOptions, (_p = projectSettings === null || projectSettings === void 0 ? void 0 : projectSettings.sdk.embeddedWallets) === null || _p === void 0 ? void 0 : _p.chainConfigurations, user.verifiedCredentials);
+        const turnkeyWallet = findTurnkeyWalletByPrimaryChain(walletConnectorOptions, (_w = projectSettings === null || projectSettings === void 0 ? void 0 : projectSettings.sdk.embeddedWallets) === null || _w === void 0 ? void 0 : _w.chainConfigurations, user.verifiedCredentials);
         if (!(turnkeyWallet === null || turnkeyWallet === void 0 ? void 0 : turnkeyWallet.walletConnector)) {
             throw new DynamicError('Wallet connector not found', INVALID_WALLET_DATA);
         }
@@ -234,7 +248,7 @@ const useSecureEnclaveEmbeddedWallet = () => {
         if (!('id' in turnkeyWallet) || !hasEmailVC) {
             return walletConnector.getWebAuthnAttestation();
         }
-        const turnkeySubOrganizationId = (_q = turnkeyWallet === null || turnkeyWallet === void 0 ? void 0 : turnkeyWallet.walletProperties) === null || _q === void 0 ? void 0 : _q.turnkeySubOrganizationId;
+        const turnkeySubOrganizationId = (_x = turnkeyWallet === null || turnkeyWallet === void 0 ? void 0 : turnkeyWallet.walletProperties) === null || _x === void 0 ? void 0 : _x.turnkeySubOrganizationId;
         if (!turnkeySubOrganizationId) {
             throw new DynamicError('No sub organization id found for the wallet', INVALID_WALLET_DATA);
         }
@@ -280,30 +294,35 @@ const useSecureEnclaveEmbeddedWallet = () => {
     const isEmailAuthSessionActive = (_d = ((wallet === null || wallet === void 0 ? void 0 : wallet.connector) &&
         'getAuthenticatorHandler' in wallet.connector &&
         ((_c = getEmbeddedWalletAuthHandler(wallet.connector)) === null || _c === void 0 ? void 0 : _c.isSessionActive()))) !== null && _d !== void 0 ? _d : false;
-    const isSessionKeySessionActive = (_f = Boolean(walletConnector &&
+    const isSessionKeySessionAAActive = ((_e = wallet === null || wallet === void 0 ? void 0 : wallet.connector) === null || _e === void 0 ? void 0 : _e.key) === 'zerodev' &&
+        isSessionKeyCompatibleWalletConnector((wallet === null || wallet === void 0 ? void 0 : wallet.connector).getEOAConnector()) &&
+        ((_h = (_g = (_f = wallet === null || wallet === void 0 ? void 0 : wallet.connector) === null || _f === void 0 ? void 0 : _f.getEOAConnector()) === null || _g === void 0 ? void 0 : _g.sessionKeys) === null || _h === void 0 ? void 0 : _h.publicKey);
+    const isSessionKeySessionActive = (_k = Boolean(walletConnector &&
         isSessionKeyCompatibleWalletConnector(walletConnector) &&
-        ((_e = walletConnector.sessionKeys) === null || _e === void 0 ? void 0 : _e.publicKey))) !== null && _f !== void 0 ? _f : false;
+        ((_j = walletConnector.sessionKeys) === null || _j === void 0 ? void 0 : _j.publicKey))) !== null && _k !== void 0 ? _k : false;
     /**
      * Checks if the embedded wallet session is active
      * @returns boolean
      */
-    const isSessionActive = isEmailAuthSessionActive || isSessionKeySessionActive;
+    const isSessionActive = isEmailAuthSessionActive ||
+        isSessionKeySessionActive ||
+        isSessionKeySessionAAActive;
     /**
      * export the recovery phrase or private key of the embedded wallet
      * @param options - optional parameter object containing the type of key to reveal 'recoveryPhrase' | 'privateKey'
      * and the html container id to render the iframe into
      * @returns Promise<string> - returns the embedded wallet recovery phrase or private key
      */
-    const revealEmbeddedWalletKey = (_r) => __awaiter(void 0, [_r], void 0, function* ({ type, htmlContainerId, }) {
-        var _s, _t;
+    const revealEmbeddedWalletKey = (_y) => __awaiter(void 0, [_y], void 0, function* ({ type, htmlContainerId, }) {
+        var _z, _0, _1, _2, _3, _4;
         if (!user) {
             throw new DynamicError(USER_NOT_LOGGED_IN);
         }
         yield cleanupExport({
             wallet,
         });
-        const turnkeyWallet = findTurnkeyWalletByPrimaryChain(walletConnectorOptions, (_s = projectSettings === null || projectSettings === void 0 ? void 0 : projectSettings.sdk.embeddedWallets) === null || _s === void 0 ? void 0 : _s.chainConfigurations, user === null || user === void 0 ? void 0 : user.verifiedCredentials);
-        const turnkeyHDWalletId = (_t = turnkeyWallet === null || turnkeyWallet === void 0 ? void 0 : turnkeyWallet.walletProperties) === null || _t === void 0 ? void 0 : _t.turnkeyHDWalletId;
+        const turnkeyWallet = findTurnkeyWalletByPrimaryChain(walletConnectorOptions, (_z = projectSettings === null || projectSettings === void 0 ? void 0 : projectSettings.sdk.embeddedWallets) === null || _z === void 0 ? void 0 : _z.chainConfigurations, user === null || user === void 0 ? void 0 : user.verifiedCredentials);
+        const turnkeyHDWalletId = (_0 = turnkeyWallet === null || turnkeyWallet === void 0 ? void 0 : turnkeyWallet.walletProperties) === null || _0 === void 0 ? void 0 : _0.turnkeyHDWalletId;
         if (type === 'recoveryPhrase' && !turnkeyHDWalletId) {
             type = 'privateKey';
         }
@@ -311,17 +330,37 @@ const useSecureEnclaveEmbeddedWallet = () => {
         // hide the iframe container until the export is done
         // since it will show unrelated turnkey content
         iframeContainerElement.current.style.display = 'none';
+        if (isSessionKeyCompatibleWalletConnector(wallet === null || wallet === void 0 ? void 0 : wallet.connector)) {
+            yield ((_1 = wallet === null || wallet === void 0 ? void 0 : wallet.connector) === null || _1 === void 0 ? void 0 : _1.createOrRestoreSession());
+        }
         yield initExport({
             iframeContainer: iframeContainerElement.current,
             iframeElementId: revealIframeElementId,
             wallet,
         });
-        yield exportCredential({
-            address: type === 'privateKey' ? wallet === null || wallet === void 0 ? void 0 : wallet.address : undefined,
-            environmentId,
-            user,
-            wallet,
-        });
+        try {
+            yield exportCredential({
+                address: type === 'privateKey' ? wallet === null || wallet === void 0 ? void 0 : wallet.address : undefined,
+                environmentId,
+                user,
+                wallet,
+            });
+        }
+        catch (_5) {
+            if (isSessionKeyCompatibleWalletConnector(wallet === null || wallet === void 0 ? void 0 : wallet.connector) &&
+                ((_2 = wallet === null || wallet === void 0 ? void 0 : wallet.connector) === null || _2 === void 0 ? void 0 : _2.removeSessionKeys)) {
+                yield ((_3 = wallet === null || wallet === void 0 ? void 0 : wallet.connector) === null || _3 === void 0 ? void 0 : _3.removeSessionKeys());
+                yield ((_4 = wallet === null || wallet === void 0 ? void 0 : wallet.connector) === null || _4 === void 0 ? void 0 : _4.createOrRestoreSession({
+                    ignoreRestore: true,
+                }));
+            }
+            yield exportCredential({
+                address: type === 'privateKey' ? wallet === null || wallet === void 0 ? void 0 : wallet.address : undefined,
+                environmentId,
+                user,
+                wallet,
+            });
+        }
         // show the iframe container after the export is done
         // to show the exported content only
         iframeContainerElement.current.style.display = 'block';
@@ -332,11 +371,11 @@ const useSecureEnclaveEmbeddedWallet = () => {
      * @returns Promise<'code_sent'>
      */
     const sendOneTimeCode = useCallback(() => __awaiter(void 0, void 0, void 0, function* () {
-        var _u, _v;
+        var _6, _7;
         if (!user) {
             throw new DynamicError(USER_NOT_LOGGED_IN);
         }
-        const targetTurnkeyWallet = findTurnkeyWalletByPrimaryChain(walletConnectorOptions, (_u = projectSettings === null || projectSettings === void 0 ? void 0 : projectSettings.sdk.embeddedWallets) === null || _u === void 0 ? void 0 : _u.chainConfigurations, user.verifiedCredentials);
+        const targetTurnkeyWallet = findTurnkeyWalletByPrimaryChain(walletConnectorOptions, (_6 = projectSettings === null || projectSettings === void 0 ? void 0 : projectSettings.sdk.embeddedWallets) === null || _6 === void 0 ? void 0 : _6.chainConfigurations, user.verifiedCredentials);
         if (!targetTurnkeyWallet || !('id' in targetTurnkeyWallet)) {
             throw new DynamicError('User does not have a valid secure enclave wallet', INVALID_WALLET_DATA);
         }
@@ -347,7 +386,7 @@ const useSecureEnclaveEmbeddedWallet = () => {
             throw new DynamicError('Session is active. No need to create a new one', ACTIVE_SESSION);
         }
         const turnkeyAuthIframeContainerRef = createRootElement(iframeContainerId);
-        const publicKey = yield turnkeyAuthenticatorHandler.initRecovery('email', turnkeyAuthIframeContainerRef.current, iframeElementId, getEmbeddedWalletSessionExpiration((_v = projectSettings === null || projectSettings === void 0 ? void 0 : projectSettings.sdk.embeddedWallets) === null || _v === void 0 ? void 0 : _v.sessionKeyDuration));
+        const publicKey = yield turnkeyAuthenticatorHandler.initRecovery('email', turnkeyAuthIframeContainerRef.current, iframeElementId, getEmbeddedWalletSessionExpiration((_7 = projectSettings === null || projectSettings === void 0 ? void 0 : projectSettings.sdk.embeddedWallets) === null || _7 === void 0 ? void 0 : _7.sessionKeyDuration));
         if (!publicKey) {
             throw new DynamicError(ERROR_SENDING_CODE);
         }

package/src/lib/utils/hooks/useEmbeddedWallet/useSecureEnclaveEmbeddedWallet/useTurnkey/useTurnkey.cjs

@@ -6,9 +6,9 @@ Object.defineProperty(exports, '__esModule', { value: true });
 var _tslib = require('../../../../../../../_virtual/_tslib.cjs');
 var React = require('react');
 var sdkApiCore = require('@dynamic-labs/sdk-api-core');
+var walletConnectorCore = require('@dynamic-labs/wallet-connector-core');
 var logger = require('../../../../../shared/logger.cjs');
 require('@dynamic-labs/iconic');
-require('@dynamic-labs/wallet-connector-core');
 require('react/jsx-runtime');
 var ViewContext = require('../../../../../context/ViewContext/ViewContext.cjs');
 require('@dynamic-labs/wallet-book');
@@ -25,14 +25,11 @@ require('../../../../../context/ErrorContext/ErrorContext.cjs');
 var findEmbeddedWalletFromVerifiedCredentials = require('../../../../functions/findEmbeddedWalletFromVerifiedCredentials/findEmbeddedWalletFromVerifiedCredentials.cjs');
 var findTurnkeyWallet = require('../../../../functions/findTurnkeyWallet/findTurnkeyWallet.cjs');
 require('@dynamic-labs/multi-wallet');
-var getAuthToken = require('../../../../functions/getAuthToken/getAuthToken.cjs');
 require('react-international-phone');
 require('../../../../../config/ApiEndpoint.cjs');
 require('@dynamic-labs/store');
 require('../../../../../locale/locale.cjs');
 var getUserWalletsFromVerifiedCredentials = require('../../../../functions/getUserWalletsFromVerifiedCredentials/getUserWalletsFromVerifiedCredentials.cjs');
-require('viem');
-require('viem/chains');
 var getUserVerifiedCredentialType = require('../../../../functions/getUserVerifiedCredentialType/getUserVerifiedCredentialType.cjs');
 require('../../../../../context/AccessDeniedContext/AccessDeniedContext.cjs');
 require('../../../../../context/AccountExistsContext/AccountExistsContext.cjs');
@@ -87,11 +84,22 @@ require('../../../../../widgets/DynamicWidget/components/DynamicWidgetHeader/Dyn
 require('../../../../../widgets/DynamicWidget/context/DynamicWidgetContext.cjs');
 require('../../../../../views/TransactionConfirmationView/helpers/transactionErrorMessage.cjs');
 require('../../../../../widgets/DynamicWidget/views/ManagePasskeysWidgetView/PasskeyCard/PasskeyCard.cjs');
+require('../../../../../../polyfills.cjs');
+require('../../../../../context/ErrorBoundary/ErrorBoundaryBase.cjs');
+require('../../../../../context/ErrorBoundary/ErrorBoundaryContext.cjs');
+require('../../../../../widgets/DynamicBridgeWidget/context/DynamicBridgeWidgetContext/DynamicBridgeWidgetContext.cjs');
+require('../../../../../widgets/DynamicWidget/components/DynamicWidgetCard/DynamicWidgetCard.cjs');
+require('../../../../../context/WidgetRegistry/WidgetRegistryContextProvider.cjs');
+require('../../../../../context/FundingContext/FundingContext.cjs');
+require('../../../../../context/SendBalanceContext/SendBalanceContext.cjs');
+require('../../../../../context/ConnectWithOtpContext/ConnectWithOtpContext.cjs');
+require('../../../../../context/ConnectWithOtpContext/constants.cjs');
+require('../../../../../context/ReinitializeContext/ReinitializeContextProvider.cjs');
 var useInternalDynamicContext = require('../../../../../context/DynamicContext/useDynamicContext/useInternalDynamicContext.cjs');
 
 // Hook exposed to customers and used internally to trigger embedded wallet creation
 const useTurnkey = () => {
-    const { projectSettings, setPrimaryWalletId, walletConnectorOptions, setShowAuthFlow, environmentId, user, } = useInternalDynamicContext.useInternalDynamicContext();
+    const { projectSettings, setPrimaryWalletId, walletConnectorOptions, walletConnector, setShowAuthFlow, environmentId, user, } = useInternalDynamicContext.useInternalDynamicContext();
     const { setView } = ViewContext.useViewContext();
     const { createDynamicEmbeddedWalletMutation } = useCreateDynamicEmbeddedWalletMutation.useCreateDynamicEmbeddedWalletMutation();
     const startHeadlessEmbeddedWalletCreationFlow = React.useCallback((chains, options) => _tslib.__awaiter(void 0, void 0, void 0, function* () {
@@ -155,23 +163,28 @@ const useTurnkey = () => {
             }
         }
         /** It's not authenticated if it still hasn't created a passkey */
-        const authenticated = Boolean((_b = embeddedWalletVerifiedCredential.walletProperties) === null || _b === void 0 ? void 0 : _b.isAuthenticatorAttached);
-        const passkeyWallet = {
+        const isAuthenticated = Boolean((_b = embeddedWalletVerifiedCredential.walletProperties) === null || _b === void 0 ? void 0 : _b.isAuthenticatorAttached);
+        const passkeyWallet = new walletConnectorCore.Wallet({
             address: (yield ((_c = turnkeyWallet === null || turnkeyWallet === void 0 ? void 0 : turnkeyWallet.walletConnector) === null || _c === void 0 ? void 0 : _c.getAddress())) || '',
-            authenticated,
             chain: ((_d = turnkeyWallet === null || turnkeyWallet === void 0 ? void 0 : turnkeyWallet.walletConnector) === null || _d === void 0 ? void 0 : _d.connectedChain) || '',
-            connected: true,
             connector: (turnkeyWallet === null || turnkeyWallet === void 0 ? void 0 : turnkeyWallet.walletConnector) || {},
             id: embeddedWalletVerifiedCredential.id,
-        };
+            isAuthenticated,
+            key: embeddedWalletVerifiedCredential.walletName ||
+                (turnkeyWallet === null || turnkeyWallet === void 0 ? void 0 : turnkeyWallet.walletConnector.key) ||
+                '',
+        });
         return Promise.resolve(passkeyWallet);
     }), [setPrimaryWalletId, walletConnectorOptions, user]);
     const createTurnkeyWallet = React.useCallback((chains, options) => _tslib.__awaiter(void 0, void 0, void 0, function* () {
-        var _e, _f, _g, _h;
+        var _e, _f, _g, _h, _j;
         if (!user) {
             throw new Error(errors.USER_NOT_LOGGED_IN);
         }
         const isManualMode = ((_e = projectSettings === null || projectSettings === void 0 ? void 0 : projectSettings.sdk.embeddedWallets) === null || _e === void 0 ? void 0 : _e.automaticEmbeddedWalletCreation) === false;
+        const isSessionKeyCompatibleWallet = walletConnectorCore.isSessionKeyCompatibleWalletConnector(walletConnector) ||
+            ((walletConnector === null || walletConnector === void 0 ? void 0 : walletConnector.key) === 'zerodev' &&
+                walletConnectorCore.isSessionKeyCompatibleWalletConnector(walletConnector === null || walletConnector === void 0 ? void 0 : walletConnector.getEOAConnector()));
         const embeddedWalletVerifiedCredential = findEmbeddedWalletFromVerifiedCredentials.findEmbeddedWalletFromVerifiedCredentials(user, chains);
         const userWalletsCredentials = getUserWalletsFromVerifiedCredentials.getUserWalletsFromVerifiedCredentials(user);
         // If the user doesn't have a wallet, or if the customer is in Manual
@@ -183,7 +196,8 @@ const useTurnkey = () => {
             const hasEmailVC = getUserVerifiedCredentialType.getUserVerifiedCredentialType(user, sdkApiCore.JwtVerifiedCredentialFormatEnum.Email);
             if ((!((_f = projectSettings === null || projectSettings === void 0 ? void 0 : projectSettings.sdk.embeddedWallets) === null || _f === void 0 ? void 0 : _f.forceAuthenticatorAtSignup) &&
                 hasEmailVC) ||
-                (options === null || options === void 0 ? void 0 : options.webAuthnAttestation)) {
+                (options === null || options === void 0 ? void 0 : options.webAuthnAttestation) ||
+                isSessionKeyCompatibleWallet) {
                 // create embedded wallet fully headless
                 return startHeadlessEmbeddedWalletCreationFlow(chains, options);
             }
@@ -202,16 +216,16 @@ const useTurnkey = () => {
                 if (!walletConnector) {
                     throw new Error('Could not find the Embedded wallet connector');
                 }
-                const wallet = {
+                const wallet = new walletConnectorCore.Wallet({
                     address: (yield walletConnector.getAddress()) || '',
-                    authenticated: Boolean((_h = embeddedWalletVerifiedCredential === null || embeddedWalletVerifiedCredential === void 0 ? void 0 : embeddedWalletVerifiedCredential.walletProperties) === null || _h === void 0 ? void 0 : _h.isAuthenticatorAttached),
                     chain: walletConnector.connectedChain || '',
-                    connected: true,
                     connector: walletConnector,
                     id: embeddedWalletVerifiedCredential.id,
-                };
+                    isAuthenticated: Boolean((_h = embeddedWalletVerifiedCredential === null || embeddedWalletVerifiedCredential === void 0 ? void 0 : embeddedWalletVerifiedCredential.walletProperties) === null || _h === void 0 ? void 0 : _h.isAuthenticatorAttached),
+                    key: (_j = embeddedWalletVerifiedCredential.walletName) !== null && _j !== void 0 ? _j : walletConnector.key,
+                });
                 setPrimaryWalletId(embeddedWalletVerifiedCredential.id);
-                dynamicEvents.dynamicEvents.emit('embeddedWalletCreated', wallet, embeddedWalletVerifiedCredential, getAuthToken.getAuthToken(), user);
+                dynamicEvents.dynamicEvents.emit('embeddedWalletCreated', wallet, embeddedWalletVerifiedCredential, user);
             }
         }
         setShowAuthFlow(false, { performMultiWalletChecks: false });
@@ -230,6 +244,7 @@ const useTurnkey = () => {
         startHeadlessEmbeddedWalletCreationFlow,
         startPasskeyEmbeddedWalletCreationFlow,
         walletConnectorOptions,
+        walletConnector,
     ]);
     return {
         createTurnkeyWallet,

package/src/lib/utils/hooks/useEmbeddedWallet/useSecureEnclaveEmbeddedWallet/useTurnkey/useTurnkey.d.ts

@@ -1,6 +1,5 @@
 import { ChainEnum } from '@dynamic-labs/sdk-api-core';
-import { WebAuthnAttestation } from '@dynamic-labs/wallet-connector-core';
-import { Wallet } from '../../../../../shared';
+import { WebAuthnAttestation, Wallet } from '@dynamic-labs/wallet-connector-core';
 export declare const useTurnkey: () => {
     readonly createTurnkeyWallet: (chains?: ChainEnum[], options?: {
         webAuthnAttestation: WebAuthnAttestation;

package/src/lib/utils/hooks/useEmbeddedWallet/useSecureEnclaveEmbeddedWallet/useTurnkey/useTurnkey.js

@@ -2,9 +2,9 @@
 import { __awaiter } from '../../../../../../../_virtual/_tslib.js';
 import { useCallback } from 'react';
 import { JwtVerifiedCredentialFormatEnum } from '@dynamic-labs/sdk-api-core';
+import { Wallet, isSessionKeyCompatibleWalletConnector } from '@dynamic-labs/wallet-connector-core';
 import { logger } from '../../../../../shared/logger.js';
 import '@dynamic-labs/iconic';
-import '@dynamic-labs/wallet-connector-core';
 import 'react/jsx-runtime';
 import { useViewContext } from '../../../../../context/ViewContext/ViewContext.js';
 import '@dynamic-labs/wallet-book';
@@ -21,14 +21,11 @@ import '../../../../../context/ErrorContext/ErrorContext.js';
 import { findEmbeddedWalletFromVerifiedCredentials } from '../../../../functions/findEmbeddedWalletFromVerifiedCredentials/findEmbeddedWalletFromVerifiedCredentials.js';
 import { findTurnkeyWalletByChain } from '../../../../functions/findTurnkeyWallet/findTurnkeyWallet.js';
 import '@dynamic-labs/multi-wallet';
-import { getAuthToken } from '../../../../functions/getAuthToken/getAuthToken.js';
 import 'react-international-phone';
 import '../../../../../config/ApiEndpoint.js';
 import '@dynamic-labs/store';
 import '../../../../../locale/locale.js';
 import { getUserWalletsFromVerifiedCredentials } from '../../../../functions/getUserWalletsFromVerifiedCredentials/getUserWalletsFromVerifiedCredentials.js';
-import 'viem';
-import 'viem/chains';
 import { getUserVerifiedCredentialType } from '../../../../functions/getUserVerifiedCredentialType/getUserVerifiedCredentialType.js';
 import '../../../../../context/AccessDeniedContext/AccessDeniedContext.js';
 import '../../../../../context/AccountExistsContext/AccountExistsContext.js';
@@ -83,11 +80,22 @@ import '../../../../../widgets/DynamicWidget/components/DynamicWidgetHeader/Dyna
 import '../../../../../widgets/DynamicWidget/context/DynamicWidgetContext.js';
 import '../../../../../views/TransactionConfirmationView/helpers/transactionErrorMessage.js';
 import '../../../../../widgets/DynamicWidget/views/ManagePasskeysWidgetView/PasskeyCard/PasskeyCard.js';
+import '../../../../../../polyfills.js';
+import '../../../../../context/ErrorBoundary/ErrorBoundaryBase.js';
+import '../../../../../context/ErrorBoundary/ErrorBoundaryContext.js';
+import '../../../../../widgets/DynamicBridgeWidget/context/DynamicBridgeWidgetContext/DynamicBridgeWidgetContext.js';
+import '../../../../../widgets/DynamicWidget/components/DynamicWidgetCard/DynamicWidgetCard.js';
+import '../../../../../context/WidgetRegistry/WidgetRegistryContextProvider.js';
+import '../../../../../context/FundingContext/FundingContext.js';
+import '../../../../../context/SendBalanceContext/SendBalanceContext.js';
+import '../../../../../context/ConnectWithOtpContext/ConnectWithOtpContext.js';
+import '../../../../../context/ConnectWithOtpContext/constants.js';
+import '../../../../../context/ReinitializeContext/ReinitializeContextProvider.js';
 import { useInternalDynamicContext } from '../../../../../context/DynamicContext/useDynamicContext/useInternalDynamicContext.js';
 
 // Hook exposed to customers and used internally to trigger embedded wallet creation
 const useTurnkey = () => {
-    const { projectSettings, setPrimaryWalletId, walletConnectorOptions, setShowAuthFlow, environmentId, user, } = useInternalDynamicContext();
+    const { projectSettings, setPrimaryWalletId, walletConnectorOptions, walletConnector, setShowAuthFlow, environmentId, user, } = useInternalDynamicContext();
     const { setView } = useViewContext();
     const { createDynamicEmbeddedWalletMutation } = useCreateDynamicEmbeddedWalletMutation();
     const startHeadlessEmbeddedWalletCreationFlow = useCallback((chains, options) => __awaiter(void 0, void 0, void 0, function* () {
@@ -151,23 +159,28 @@ const useTurnkey = () => {
             }
         }
         /** It's not authenticated if it still hasn't created a passkey */
-        const authenticated = Boolean((_b = embeddedWalletVerifiedCredential.walletProperties) === null || _b === void 0 ? void 0 : _b.isAuthenticatorAttached);
-        const passkeyWallet = {
+        const isAuthenticated = Boolean((_b = embeddedWalletVerifiedCredential.walletProperties) === null || _b === void 0 ? void 0 : _b.isAuthenticatorAttached);
+        const passkeyWallet = new Wallet({
             address: (yield ((_c = turnkeyWallet === null || turnkeyWallet === void 0 ? void 0 : turnkeyWallet.walletConnector) === null || _c === void 0 ? void 0 : _c.getAddress())) || '',
-            authenticated,
             chain: ((_d = turnkeyWallet === null || turnkeyWallet === void 0 ? void 0 : turnkeyWallet.walletConnector) === null || _d === void 0 ? void 0 : _d.connectedChain) || '',
-            connected: true,
             connector: (turnkeyWallet === null || turnkeyWallet === void 0 ? void 0 : turnkeyWallet.walletConnector) || {},
             id: embeddedWalletVerifiedCredential.id,
-        };
+            isAuthenticated,
+            key: embeddedWalletVerifiedCredential.walletName ||
+                (turnkeyWallet === null || turnkeyWallet === void 0 ? void 0 : turnkeyWallet.walletConnector.key) ||
+                '',
+        });
         return Promise.resolve(passkeyWallet);
     }), [setPrimaryWalletId, walletConnectorOptions, user]);
     const createTurnkeyWallet = useCallback((chains, options) => __awaiter(void 0, void 0, void 0, function* () {
-        var _e, _f, _g, _h;
+        var _e, _f, _g, _h, _j;
         if (!user) {
             throw new Error(USER_NOT_LOGGED_IN);
         }
         const isManualMode = ((_e = projectSettings === null || projectSettings === void 0 ? void 0 : projectSettings.sdk.embeddedWallets) === null || _e === void 0 ? void 0 : _e.automaticEmbeddedWalletCreation) === false;
+        const isSessionKeyCompatibleWallet = isSessionKeyCompatibleWalletConnector(walletConnector) ||
+            ((walletConnector === null || walletConnector === void 0 ? void 0 : walletConnector.key) === 'zerodev' &&
+                isSessionKeyCompatibleWalletConnector(walletConnector === null || walletConnector === void 0 ? void 0 : walletConnector.getEOAConnector()));
         const embeddedWalletVerifiedCredential = findEmbeddedWalletFromVerifiedCredentials(user, chains);
         const userWalletsCredentials = getUserWalletsFromVerifiedCredentials(user);
         // If the user doesn't have a wallet, or if the customer is in Manual
@@ -179,7 +192,8 @@ const useTurnkey = () => {
             const hasEmailVC = getUserVerifiedCredentialType(user, JwtVerifiedCredentialFormatEnum.Email);
             if ((!((_f = projectSettings === null || projectSettings === void 0 ? void 0 : projectSettings.sdk.embeddedWallets) === null || _f === void 0 ? void 0 : _f.forceAuthenticatorAtSignup) &&
                 hasEmailVC) ||
-                (options === null || options === void 0 ? void 0 : options.webAuthnAttestation)) {
+                (options === null || options === void 0 ? void 0 : options.webAuthnAttestation) ||
+                isSessionKeyCompatibleWallet) {
                 // create embedded wallet fully headless
                 return startHeadlessEmbeddedWalletCreationFlow(chains, options);
             }
@@ -198,16 +212,16 @@ const useTurnkey = () => {
                 if (!walletConnector) {
                     throw new Error('Could not find the Embedded wallet connector');
                 }
-                const wallet = {
+                const wallet = new Wallet({
                     address: (yield walletConnector.getAddress()) || '',
-                    authenticated: Boolean((_h = embeddedWalletVerifiedCredential === null || embeddedWalletVerifiedCredential === void 0 ? void 0 : embeddedWalletVerifiedCredential.walletProperties) === null || _h === void 0 ? void 0 : _h.isAuthenticatorAttached),
                     chain: walletConnector.connectedChain || '',
-                    connected: true,
                     connector: walletConnector,
                     id: embeddedWalletVerifiedCredential.id,
-                };
+                    isAuthenticated: Boolean((_h = embeddedWalletVerifiedCredential === null || embeddedWalletVerifiedCredential === void 0 ? void 0 : embeddedWalletVerifiedCredential.walletProperties) === null || _h === void 0 ? void 0 : _h.isAuthenticatorAttached),
+                    key: (_j = embeddedWalletVerifiedCredential.walletName) !== null && _j !== void 0 ? _j : walletConnector.key,
+                });
                 setPrimaryWalletId(embeddedWalletVerifiedCredential.id);
-                dynamicEvents.emit('embeddedWalletCreated', wallet, embeddedWalletVerifiedCredential, getAuthToken(), user);
+                dynamicEvents.emit('embeddedWalletCreated', wallet, embeddedWalletVerifiedCredential, user);
             }
         }
         setShowAuthFlow(false, { performMultiWalletChecks: false });
@@ -226,6 +240,7 @@ const useTurnkey = () => {
         startHeadlessEmbeddedWalletCreationFlow,
         startPasskeyEmbeddedWalletCreationFlow,
         walletConnectorOptions,
+        walletConnector,
     ]);
     return {
         createTurnkeyWallet,

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

@@ -28,8 +28,6 @@ require('react-international-phone');
 require('../../../config/ApiEndpoint.cjs');
 require('@dynamic-labs/store');
 require('../../../locale/locale.cjs');
-require('viem');
-require('viem/chains');
 require('../../../context/AccessDeniedContext/AccessDeniedContext.cjs');
 require('../../../context/AccountExistsContext/AccountExistsContext.cjs');
 require('../../../context/UserWalletsContext/UserWalletsContext.cjs');
@@ -78,6 +76,17 @@ require('../../../widgets/DynamicWidget/components/DynamicWidgetHeader/DynamicWi
 require('../../../widgets/DynamicWidget/context/DynamicWidgetContext.cjs');
 require('../../../views/TransactionConfirmationView/helpers/transactionErrorMessage.cjs');
 require('../../../widgets/DynamicWidget/views/ManagePasskeysWidgetView/PasskeyCard/PasskeyCard.cjs');
+require('../../../../polyfills.cjs');
+require('../../../context/ErrorBoundary/ErrorBoundaryBase.cjs');
+require('../../../context/ErrorBoundary/ErrorBoundaryContext.cjs');
+require('../../../widgets/DynamicBridgeWidget/context/DynamicBridgeWidgetContext/DynamicBridgeWidgetContext.cjs');
+require('../../../widgets/DynamicWidget/components/DynamicWidgetCard/DynamicWidgetCard.cjs');
+require('../../../context/WidgetRegistry/WidgetRegistryContextProvider.cjs');
+require('../../../context/FundingContext/FundingContext.cjs');
+require('../../../context/SendBalanceContext/SendBalanceContext.cjs');
+require('../../../context/ConnectWithOtpContext/ConnectWithOtpContext.cjs');
+require('../../../context/ConnectWithOtpContext/constants.cjs');
+require('../../../context/ReinitializeContext/ReinitializeContextProvider.cjs');
 var useInternalDynamicContext = require('../../../context/DynamicContext/useDynamicContext/useInternalDynamicContext.cjs');
 
 const useEmbeddedWalletAuthenticator = () => {

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

@@ -1,5 +1,5 @@
 import { AuthenticatorType } from '@dynamic-labs/wallet-connector-core';
 export declare const useEmbeddedWalletAuthenticator: () => {
     addEmbeddedWalletRecoveryEmail: () => Promise<void>;
-    createOrRefreshAuthenticatorSession: (authenticatorType?: AuthenticatorType) => Promise<import("../../../shared").Wallet | undefined>;
+    createOrRefreshAuthenticatorSession: (authenticatorType?: AuthenticatorType) => Promise<import("@dynamic-labs/wallet-connector-core").Wallet | undefined>;
 };

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

@@ -24,8 +24,6 @@ import 'react-international-phone';
 import '../../../config/ApiEndpoint.js';
 import '@dynamic-labs/store';
 import '../../../locale/locale.js';
-import 'viem';
-import 'viem/chains';
 import '../../../context/AccessDeniedContext/AccessDeniedContext.js';
 import '../../../context/AccountExistsContext/AccountExistsContext.js';
 import '../../../context/UserWalletsContext/UserWalletsContext.js';
@@ -74,6 +72,17 @@ import '../../../widgets/DynamicWidget/components/DynamicWidgetHeader/DynamicWid
 import '../../../widgets/DynamicWidget/context/DynamicWidgetContext.js';
 import '../../../views/TransactionConfirmationView/helpers/transactionErrorMessage.js';
 import '../../../widgets/DynamicWidget/views/ManagePasskeysWidgetView/PasskeyCard/PasskeyCard.js';
+import '../../../../polyfills.js';
+import '../../../context/ErrorBoundary/ErrorBoundaryBase.js';
+import '../../../context/ErrorBoundary/ErrorBoundaryContext.js';
+import '../../../widgets/DynamicBridgeWidget/context/DynamicBridgeWidgetContext/DynamicBridgeWidgetContext.js';
+import '../../../widgets/DynamicWidget/components/DynamicWidgetCard/DynamicWidgetCard.js';
+import '../../../context/WidgetRegistry/WidgetRegistryContextProvider.js';
+import '../../../context/FundingContext/FundingContext.js';
+import '../../../context/SendBalanceContext/SendBalanceContext.js';
+import '../../../context/ConnectWithOtpContext/ConnectWithOtpContext.js';
+import '../../../context/ConnectWithOtpContext/constants.js';
+import '../../../context/ReinitializeContext/ReinitializeContextProvider.js';
 import { useInternalDynamicContext } from '../../../context/DynamicContext/useDynamicContext/useInternalDynamicContext.js';
 
 const useEmbeddedWalletAuthenticator = () => {

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

@@ -28,8 +28,6 @@ require('../../../config/ApiEndpoint.cjs');
 var embeddedWallets = require('../../../data/api/embeddedWallets/embeddedWallets.cjs');
 require('@dynamic-labs/store');
 require('../../../locale/locale.cjs');
-require('viem');
-require('viem/chains');
 require('../../../context/AccessDeniedContext/AccessDeniedContext.cjs');
 require('../../../context/AccountExistsContext/AccountExistsContext.cjs');
 require('../../../context/UserWalletsContext/UserWalletsContext.cjs');
@@ -78,6 +76,17 @@ require('../../../widgets/DynamicWidget/components/DynamicWidgetHeader/DynamicWi
 require('../../../widgets/DynamicWidget/context/DynamicWidgetContext.cjs');
 require('../../../views/TransactionConfirmationView/helpers/transactionErrorMessage.cjs');
 require('../../../widgets/DynamicWidget/views/ManagePasskeysWidgetView/PasskeyCard/PasskeyCard.cjs');
+require('../../../../polyfills.cjs');
+require('../../../context/ErrorBoundary/ErrorBoundaryBase.cjs');
+require('../../../context/ErrorBoundary/ErrorBoundaryContext.cjs');
+require('../../../widgets/DynamicBridgeWidget/context/DynamicBridgeWidgetContext/DynamicBridgeWidgetContext.cjs');
+require('../../../widgets/DynamicWidget/components/DynamicWidgetCard/DynamicWidgetCard.cjs');
+require('../../../context/WidgetRegistry/WidgetRegistryContextProvider.cjs');
+require('../../../context/FundingContext/FundingContext.cjs');
+require('../../../context/SendBalanceContext/SendBalanceContext.cjs');
+require('../../../context/ConnectWithOtpContext/ConnectWithOtpContext.cjs');
+require('../../../context/ConnectWithOtpContext/constants.cjs');
+require('../../../context/ReinitializeContext/ReinitializeContextProvider.cjs');
 var useInternalDynamicContext = require('../../../context/DynamicContext/useDynamicContext/useInternalDynamicContext.cjs');
 
 const useEmbeddedWalletPassword = () => {

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

@@ -24,8 +24,6 @@ import '../../../config/ApiEndpoint.js';
 import { claimEmbeddedWallet } from '../../../data/api/embeddedWallets/embeddedWallets.js';
 import '@dynamic-labs/store';
 import '../../../locale/locale.js';
-import 'viem';
-import 'viem/chains';
 import '../../../context/AccessDeniedContext/AccessDeniedContext.js';
 import '../../../context/AccountExistsContext/AccountExistsContext.js';
 import '../../../context/UserWalletsContext/UserWalletsContext.js';
@@ -74,6 +72,17 @@ import '../../../widgets/DynamicWidget/components/DynamicWidgetHeader/DynamicWid
 import '../../../widgets/DynamicWidget/context/DynamicWidgetContext.js';
 import '../../../views/TransactionConfirmationView/helpers/transactionErrorMessage.js';
 import '../../../widgets/DynamicWidget/views/ManagePasskeysWidgetView/PasskeyCard/PasskeyCard.js';
+import '../../../../polyfills.js';
+import '../../../context/ErrorBoundary/ErrorBoundaryBase.js';
+import '../../../context/ErrorBoundary/ErrorBoundaryContext.js';
+import '../../../widgets/DynamicBridgeWidget/context/DynamicBridgeWidgetContext/DynamicBridgeWidgetContext.js';
+import '../../../widgets/DynamicWidget/components/DynamicWidgetCard/DynamicWidgetCard.js';
+import '../../../context/WidgetRegistry/WidgetRegistryContextProvider.js';
+import '../../../context/FundingContext/FundingContext.js';
+import '../../../context/SendBalanceContext/SendBalanceContext.js';
+import '../../../context/ConnectWithOtpContext/ConnectWithOtpContext.js';
+import '../../../context/ConnectWithOtpContext/constants.js';
+import '../../../context/ReinitializeContext/ReinitializeContextProvider.js';
 import { useInternalDynamicContext } from '../../../context/DynamicContext/useDynamicContext/useInternalDynamicContext.js';
 
 const useEmbeddedWalletPassword = () => {