@dynamic-labs/sdk-react-core 3.0.0-alpha.1 → 3.0.0-alpha.11

package/src/lib/utils/hooks/useEmbeddedWallet/useMPCEmbeddedWallet/useCoinbaseMPC/useCoinbaseMPC.js

@@ -9,7 +9,6 @@ import { findEmbeddedWalletFromVerifiedCredentials } from '../../../../functions
 import '../../../../constants/values.js';
 import { USER_NOT_LOGGED_IN } from '../../../../constants/errors.js';
 import '@dynamic-labs/multi-wallet';
-import { getAuthToken } from '../../../../functions/getAuthToken/getAuthToken.js';
 import { logger } from '../../../../../shared/logger.js';
 import '@dynamic-labs/iconic';
 import 'react/jsx-runtime';
@@ -17,25 +16,25 @@ import '../../../../../context/ViewContext/ViewContext.js';
 import '@dynamic-labs/wallet-book';
 import '../../../../constants/colors.js';
 import '../../../../../shared/utils/classes/storage/localStorage.js';
+import '../../../../../shared/utils/classes/storage/sessionStorage.js';
 import { generateRandomPassword } from '../../../../../shared/utils/functions/generateRandomPassword/generateRandomPassword.js';
 import '../../../../../shared/consts/index.js';
 import 'react-international-phone';
+import '../../../../../config/ApiEndpoint.js';
+import '@dynamic-labs/store';
+import '../../../../../locale/locale.js';
+import { linkWallet } from '../../../../../data/api/wallets/wallets.js';
 import { getVerifyArgs } from '../../../../functions/getVerifyArgs/getVerifyArgs.js';
-import 'viem';
-import 'viem/chains';
 import { findCoinbaseMPCWallet } from '../../../../functions/findCoinbaseMPCWallet/findCoinbaseMPCWallet.js';
 import { getCoinbaseMPCConnectorFetchers } from '../../../../functions/getCoinbaseMPCConnectorFetchers/getCoinbaseMPCConnectorFetchers.js';
-import '../../../../../context/DynamicContext/DynamicContext.js';
 import { dynamicEvents } from '../../../../../events/dynamicEvents.js';
+import '../../../../../context/DynamicContext/DynamicContext.js';
+import { useInternalDynamicContext } from '../../../../../context/DynamicContext/useDynamicContext/useInternalDynamicContext.js';
 import '../../../../../context/CaptchaContext/CaptchaContext.js';
 import { useErrorContext } from '../../../../../context/ErrorContext/ErrorContext.js';
 import '../../../../../context/AccessDeniedContext/AccessDeniedContext.js';
 import '../../../../../context/AccountExistsContext/AccountExistsContext.js';
 import '../../../../../context/UserWalletsContext/UserWalletsContext.js';
-import '../../../../../config/ApiEndpoint.js';
-import '@dynamic-labs/store';
-import '../../../../../locale/locale.js';
-import { linkWallet } from '../../../../../data/api/wallets/wallets.js';
 import { getSiweStatement } from '../../../../functions/getSiweStatement/getSiweStatement.js';
 import '../../../../../context/VerificationContext/VerificationContext.js';
 import 'react-dom';
@@ -82,13 +81,13 @@ 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 { useInternalDynamicContext } from '../../../../../context/DynamicContext/useDynamicContext/useInternalDynamicContext.js';
 
 const DYNAMIC_PASSWORD_LENGTH = 20;
 const useCoinbaseMPC = () => {
     const { user, setPrimaryWalletId, walletConnectorOptions, environmentId, consumeNonce, displaySiweStatement, appName, siweStatement, handleLogOut, setShowAuthFlow, } = useInternalDynamicContext();
     const { setError } = useErrorContext();
     const returnExistingCoinbaseMPCWallet = useCallback((validatedUser, connector, embeddedWalletVerifiedCredential) => __awaiter(void 0, void 0, void 0, function* () {
+        var _a;
         connector.setVerifiedCredentials(validatedUser.verifiedCredentials);
         setPrimaryWalletId(embeddedWalletVerifiedCredential.id);
         const coinbaseMPCWallet = {
@@ -98,10 +97,11 @@ const useCoinbaseMPC = () => {
             connected: true,
             connector,
             id: embeddedWalletVerifiedCredential.id,
+            key: (_a = embeddedWalletVerifiedCredential.walletName) !== null && _a !== void 0 ? _a : connector.key,
         };
         return coinbaseMPCWallet;
     }), [setPrimaryWalletId]);
-    const linkCoinbaseMPCWallet = useCallback((_a) => __awaiter(void 0, [_a], void 0, function* ({ connector, backupCode, password, source, }) {
+    const linkCoinbaseMPCWallet = useCallback((_b) => __awaiter(void 0, [_b], void 0, function* ({ connector, backupCode, password, source, }) {
         const nonce = consumeNonce();
         if (nonce === undefined)
             throw new DynamicError('Missing nonce');
@@ -142,6 +142,7 @@ const useCoinbaseMPC = () => {
         siweStatement,
     ]);
     const createNewCoinbaseMPCWallet = useCallback((connector, password) => __awaiter(void 0, void 0, void 0, function* () {
+        var _c;
         const initialWalletPassword = password
             ? password
             : generateRandomPassword(DYNAMIC_PASSWORD_LENGTH);
@@ -163,8 +164,9 @@ const useCoinbaseMPC = () => {
                 connected: true,
                 connector,
                 id: newSelectedCredentialWallet.id,
+                key: (_c = newSelectedCredentialWallet.walletName) !== null && _c !== void 0 ? _c : connector.key,
             };
-            dynamicEvents.emit('embeddedWalletCreated', coinbaseMPCWallet, newSelectedCredentialWallet, getAuthToken(), updatedUser);
+            dynamicEvents.emit('embeddedWalletCreated', coinbaseMPCWallet, newSelectedCredentialWallet, updatedUser);
             return coinbaseMPCWallet;
         }
         catch (error) {
@@ -178,11 +180,11 @@ const useCoinbaseMPC = () => {
         return undefined;
     }), [linkCoinbaseMPCWallet, handleLogOut, setError]);
     const createCoinbaseMPCWallet = useCallback((...args_1) => __awaiter(void 0, [...args_1], void 0, function* (chains = [ChainEnum.Evm], password) {
-        var _b;
+        var _d;
         if (!user) {
             throw new DynamicError(USER_NOT_LOGGED_IN);
         }
-        const connector = (_b = findCoinbaseMPCWallet(walletConnectorOptions)) === null || _b === void 0 ? void 0 : _b.walletConnector;
+        const connector = (_d = findCoinbaseMPCWallet(walletConnectorOptions)) === null || _d === void 0 ? void 0 : _d.walletConnector;
         if (!connector || !isCoinbaseMpcWalletConnector(connector)) {
             const error = new DynamicError('CoinbaseWaaSWalletConnectors not found');
             logger.error('Failed to create embedded wallet', error);

package/src/lib/utils/hooks/useEmbeddedWallet/useMPCEmbeddedWallet/useMPCEmbeddedWallet.cjs

@@ -17,6 +17,7 @@ require('@dynamic-labs/wallet-book');
 require('../../../constants/colors.cjs');
 require('../../../constants/values.cjs');
 require('../../../../shared/utils/classes/storage/localStorage.cjs');
+require('../../../../shared/utils/classes/storage/sessionStorage.cjs');
 require('../../../../shared/consts/index.cjs');
 require('../../../../events/dynamicEvents.cjs');
 require('../../../../context/CaptchaContext/CaptchaContext.cjs');
@@ -25,15 +26,13 @@ var findEmbeddedWalletFromVerifiedCredentials = require('../../../functions/find
 var errors = require('../../../constants/errors.cjs');
 require('@dynamic-labs/multi-wallet');
 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 findCoinbaseMPCWallet = require('../../../functions/findCoinbaseMPCWallet/findCoinbaseMPCWallet.cjs');
 var requiresPasswordForEmbeddedWallet = require('../../../functions/requiresPasswordForEmbeddedWallet/requiresPasswordForEmbeddedWallet.cjs');
 var requiresPasswordForEmbeddedWalletOnSignup = require('../../../functions/requiresPasswordForEmbeddedWalletOnSignup/requiresPasswordForEmbeddedWalletOnSignup.cjs');
-require('../../../../config/ApiEndpoint.cjs');
-require('@dynamic-labs/store');
-require('../../../../locale/locale.cjs');
 var hasEmbeddedWallet = require('../../../functions/hasEmbeddedWallet/hasEmbeddedWallet.cjs');
 require('../../../../context/AccessDeniedContext/AccessDeniedContext.cjs');
 require('../../../../context/AccountExistsContext/AccountExistsContext.cjs');

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

@@ -13,6 +13,7 @@ import '@dynamic-labs/wallet-book';
 import '../../../constants/colors.js';
 import '../../../constants/values.js';
 import '../../../../shared/utils/classes/storage/localStorage.js';
+import '../../../../shared/utils/classes/storage/sessionStorage.js';
 import '../../../../shared/consts/index.js';
 import '../../../../events/dynamicEvents.js';
 import '../../../../context/CaptchaContext/CaptchaContext.js';
@@ -21,15 +22,13 @@ import { findEmbeddedWalletFromVerifiedCredentials } from '../../../functions/fi
 import { USER_NOT_LOGGED_IN } from '../../../constants/errors.js';
 import '@dynamic-labs/multi-wallet';
 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 { findCoinbaseMPCWallet } from '../../../functions/findCoinbaseMPCWallet/findCoinbaseMPCWallet.js';
 import { requiresPasswordForEmbeddedWallet } from '../../../functions/requiresPasswordForEmbeddedWallet/requiresPasswordForEmbeddedWallet.js';
 import { requiresPasswordForEmbeddedWalletOnSignup } from '../../../functions/requiresPasswordForEmbeddedWalletOnSignup/requiresPasswordForEmbeddedWalletOnSignup.js';
-import '../../../../config/ApiEndpoint.js';
-import '@dynamic-labs/store';
-import '../../../../locale/locale.js';
 import { hasEmbeddedWallet } from '../../../functions/hasEmbeddedWallet/hasEmbeddedWallet.js';
 import '../../../../context/AccessDeniedContext/AccessDeniedContext.js';
 import '../../../../context/AccountExistsContext/AccountExistsContext.js';

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

@@ -7,10 +7,10 @@ var _tslib = require('../../../../../../_virtual/_tslib.cjs');
 var React = require('react');
 var sdkApiCore = require('@dynamic-labs/sdk-api-core');
 var utils = require('@dynamic-labs/utils');
+var walletConnectorCore = require('@dynamic-labs/wallet-connector-core');
 require('../../../../context/DynamicContext/DynamicContext.cjs');
 var logger = require('../../../../shared/logger.cjs');
 require('@dynamic-labs/iconic');
-require('@dynamic-labs/wallet-connector-core');
 require('react/jsx-runtime');
 require('../../../../context/ViewContext/ViewContext.cjs');
 require('@dynamic-labs/wallet-book');
@@ -18,6 +18,7 @@ var localStorage$1 = require('../../../constants/localStorage.cjs');
 require('../../../constants/colors.cjs');
 require('../../../constants/values.cjs');
 var localStorage = require('../../../../shared/utils/classes/storage/localStorage.cjs');
+require('../../../../shared/utils/classes/storage/sessionStorage.cjs');
 require('../../../../shared/consts/index.cjs');
 require('../../../../events/dynamicEvents.cjs');
 require('../../../../context/CaptchaContext/CaptchaContext.cjs');
@@ -26,15 +27,13 @@ var findEmbeddedWalletFromVerifiedCredentials = require('../../../functions/find
 var findTurnkeyWallet = require('../../../functions/findTurnkeyWallet/findTurnkeyWallet.cjs');
 require('@dynamic-labs/multi-wallet');
 require('react-international-phone');
-var getUserWalletsFromVerifiedCredentials = require('../../../functions/getUserWalletsFromVerifiedCredentials/getUserWalletsFromVerifiedCredentials.cjs');
-var addPasskeyIdentifierToWalletConnector = require('../../../functions/addPasskeyIdentifierToWalletConnector/addPasskeyIdentifierToWalletConnector.cjs');
-require('viem');
-require('viem/chains');
-var getEOAWallet = require('../../../functions/getEOAWallet/getEOAWallet.cjs');
 require('../../../../config/ApiEndpoint.cjs');
 var embeddedWallets = require('../../../../data/api/embeddedWallets/embeddedWallets.cjs');
 require('@dynamic-labs/store');
 require('../../../../locale/locale.cjs');
+var getUserWalletsFromVerifiedCredentials = require('../../../functions/getUserWalletsFromVerifiedCredentials/getUserWalletsFromVerifiedCredentials.cjs');
+var addPasskeyIdentifierToWalletConnector = require('../../../functions/addPasskeyIdentifierToWalletConnector/addPasskeyIdentifierToWalletConnector.cjs');
+var getEOAWallet = require('../../../functions/getEOAWallet/getEOAWallet.cjs');
 var getUserVerifiedCredentialType = require('../../../functions/getUserVerifiedCredentialType/getUserVerifiedCredentialType.cjs');
 var hasEmbeddedWallet = require('../../../functions/hasEmbeddedWallet/hasEmbeddedWallet.cjs');
 var getEmbeddedWalletAuthHandler = require('../../../functions/getEmbeddedWalletAuthHandler/getEmbeddedWalletAuthHandler.cjs');
@@ -113,8 +112,8 @@ var useInternalDynamicContext = require('../../../../context/DynamicContext/useD
  * }
  */
 const useSecureEnclaveEmbeddedWallet = () => {
-    var _a, _b, _c, _d;
-    const { projectSettings, primaryWallet, user, environmentId, walletConnectorOptions, } = useInternalDynamicContext.useInternalDynamicContext();
+    var _a, _b, _c, _d, _e, _f;
+    const { projectSettings, primaryWallet, user, environmentId, walletConnectorOptions, walletConnector, } = useInternalDynamicContext.useInternalDynamicContext();
     const { createTurnkeyWallet } = useTurnkey.useTurnkey();
     const { hasRecoveryEmail } = useIsTurnkeyWallet.useIsTurnkeyWallet();
     const { createRootElement } = useElementById.useElementById();
@@ -128,13 +127,13 @@ const useSecureEnclaveEmbeddedWallet = () => {
      * @returns Promise<Wallet | undefined>
      */
     const createEmbeddedWallet = React.useCallback((chains, options) => _tslib.__awaiter(void 0, void 0, void 0, function* () {
-        var _e;
+        var _g;
         if (!user) {
             throw new utils.DynamicError(errors.USER_NOT_LOGGED_IN);
         }
         const userWalletsCredentials = getUserWalletsFromVerifiedCredentials.getUserWalletsFromVerifiedCredentials(user);
         const embeddedWalletVerifiedCredential = findEmbeddedWalletFromVerifiedCredentials.findEmbeddedWalletFromVerifiedCredentials(user, chains);
-        const isManualMode = ((_e = projectSettings === null || projectSettings === void 0 ? void 0 : projectSettings.sdk.embeddedWallets) === null || _e === void 0 ? void 0 : _e.automaticEmbeddedWalletCreation) === false;
+        const isManualMode = ((_g = projectSettings === null || projectSettings === void 0 ? void 0 : projectSettings.sdk.embeddedWallets) === null || _g === void 0 ? void 0 : _g.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.
@@ -155,22 +154,26 @@ const useSecureEnclaveEmbeddedWallet = () => {
      * @returns Promise<'session_created' | 'session_restored'> - returns a string indicating the status of the session
      */
     const createOrRestoreSession = React.useCallback((options) => _tslib.__awaiter(void 0, void 0, void 0, function* () {
-        var _f, _g, _h, _j, _k, _l;
+        var _h, _j, _k, _l, _m, _o;
         if (!user) {
             throw new utils.DynamicError(errors.USER_NOT_LOGGED_IN);
         }
+        if (walletConnectorCore.isSessionKeyCompatibleWalletConnector(walletConnector)) {
+            const publicKey = yield walletConnector.createOrRestoreSession();
+            return publicKey;
+        }
         const turnkeyRecoveryHandler = getEmbeddedWalletAuthHandler.getEmbeddedWalletAuthHandler(wallet === null || wallet === void 0 ? void 0 : wallet.connector);
         if (turnkeyRecoveryHandler.isSessionActive()) {
             return errors.ACTIVE_SESSION;
         }
         const turnkeyAuthIframeContainerRef = createRootElement(constants.iframeContainerId);
         // try to restore session if possible
-        if (passkeyRecovery.canRestoreEmbeddedWalletSession((_f = projectSettings === null || projectSettings === void 0 ? void 0 : projectSettings.sdk.embeddedWallets) === null || _f === void 0 ? void 0 : _f.sessionKeyDuration)) {
+        if (passkeyRecovery.canRestoreEmbeddedWalletSession((_h = projectSettings === null || projectSettings === void 0 ? void 0 : projectSettings.sdk.embeddedWallets) === null || _h === void 0 ? void 0 : _h.sessionKeyDuration)) {
             try {
                 const sessionRestored = yield passkeyRecovery.restoreEmbeddedWalletSession({
                     iframeContainer: turnkeyAuthIframeContainerRef.current,
                     iframeElementId: constants.iframeElementId,
-                    sessionExpiration: getEmbeddedWalletSessionExpiration.getEmbeddedWalletSessionExpiration((_h = (_g = projectSettings === null || projectSettings === void 0 ? void 0 : projectSettings.sdk) === null || _g === void 0 ? void 0 : _g.embeddedWallets) === null || _h === void 0 ? void 0 : _h.sessionKeyDuration),
+                    sessionExpiration: getEmbeddedWalletSessionExpiration.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),
                     user,
                     wallet: primaryWallet,
                 });
@@ -189,7 +192,7 @@ const useSecureEnclaveEmbeddedWallet = () => {
         if (!userHasEmbeddedWallet() || !hasRecoveryEmail) {
             throw new utils.DynamicError('User does not have a secure enclave wallet or a verified email', errors.INVALID_WALLET_DATA);
         }
-        const organizationId = (_l = (_k = (_j = user === null || user === void 0 ? void 0 : user.verifiedCredentials) === null || _j === void 0 ? void 0 : _j.find(({ walletName }) => walletName === null || walletName === void 0 ? void 0 : walletName.startsWith('turnkey'))) === null || _k === void 0 ? void 0 : _k.walletProperties) === null || _l === void 0 ? void 0 : _l.turnkeySubOrganizationId;
+        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;
         yield turnkeyRecoveryHandler.verifyRecoveryCode(options.oneTimeCode, organizationId);
         const sessionSettings = {
             createdAt: new Date().getTime(),
@@ -213,12 +216,12 @@ const useSecureEnclaveEmbeddedWallet = () => {
      * @returns Promise<WebAuthnAttestation>
      */
     const createPasskey = React.useCallback((options) => _tslib.__awaiter(void 0, void 0, void 0, function* () {
-        var _m, _o;
+        var _p, _q;
         if (!user) {
             throw new utils.DynamicError(errors.USER_NOT_LOGGED_IN);
         }
         validateTurnkeyProviderEnabled.validateTurnkeyProviderEnabled(projectSettings);
-        const turnkeyWallet = findTurnkeyWallet.findTurnkeyWalletByPrimaryChain(walletConnectorOptions, (_m = projectSettings === null || projectSettings === void 0 ? void 0 : projectSettings.sdk.embeddedWallets) === null || _m === void 0 ? void 0 : _m.chainConfigurations, user.verifiedCredentials);
+        const turnkeyWallet = findTurnkeyWallet.findTurnkeyWalletByPrimaryChain(walletConnectorOptions, (_p = projectSettings === null || projectSettings === void 0 ? void 0 : projectSettings.sdk.embeddedWallets) === null || _p === void 0 ? void 0 : _p.chainConfigurations, user.verifiedCredentials);
         if (!(turnkeyWallet === null || turnkeyWallet === void 0 ? void 0 : turnkeyWallet.walletConnector)) {
             throw new utils.DynamicError('Wallet connector not found', errors.INVALID_WALLET_DATA);
         }
@@ -233,7 +236,7 @@ const useSecureEnclaveEmbeddedWallet = () => {
         if (!('id' in turnkeyWallet) || !hasEmailVC) {
             return walletConnector.getWebAuthnAttestation();
         }
-        const turnkeySubOrganizationId = (_o = turnkeyWallet === null || turnkeyWallet === void 0 ? void 0 : turnkeyWallet.walletProperties) === null || _o === void 0 ? void 0 : _o.turnkeySubOrganizationId;
+        const turnkeySubOrganizationId = (_q = turnkeyWallet === null || turnkeyWallet === void 0 ? void 0 : turnkeyWallet.walletProperties) === null || _q === void 0 ? void 0 : _q.turnkeySubOrganizationId;
         if (!turnkeySubOrganizationId) {
             throw new utils.DynamicError('No sub organization id found for the wallet', errors.INVALID_WALLET_DATA);
         }
@@ -276,29 +279,33 @@ const useSecureEnclaveEmbeddedWallet = () => {
         });
         return data.passkeys;
     }), [user, environmentId]);
+    const isEmailAuthSessionActive = (_d = ((wallet === null || wallet === void 0 ? void 0 : wallet.connector) &&
+        'getAuthenticatorHandler' in wallet.connector &&
+        ((_c = getEmbeddedWalletAuthHandler.getEmbeddedWalletAuthHandler(wallet.connector)) === null || _c === void 0 ? void 0 : _c.isSessionActive()))) !== null && _d !== void 0 ? _d : false;
+    const isSessionKeySessionActive = (_f = Boolean(walletConnector &&
+        walletConnectorCore.isSessionKeyCompatibleWalletConnector(walletConnector) &&
+        ((_e = walletConnector.sessionKeys) === null || _e === void 0 ? void 0 : _e.publicKey))) !== null && _f !== void 0 ? _f : false;
     /**
      * Checks if the embedded wallet session is active
      * @returns boolean
      */
-    const isSessionActive = (_d = ((wallet === null || wallet === void 0 ? void 0 : wallet.connector) &&
-        'getAuthenticatorHandler' in wallet.connector &&
-        ((_c = getEmbeddedWalletAuthHandler.getEmbeddedWalletAuthHandler(wallet.connector)) === null || _c === void 0 ? void 0 : _c.isSessionActive()))) !== null && _d !== void 0 ? _d : false;
+    const isSessionActive = isEmailAuthSessionActive || isSessionKeySessionActive;
     /**
      * 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 = (_p) => _tslib.__awaiter(void 0, [_p], void 0, function* ({ type, htmlContainerId, }) {
-        var _q, _r;
+    const revealEmbeddedWalletKey = (_r) => _tslib.__awaiter(void 0, [_r], void 0, function* ({ type, htmlContainerId, }) {
+        var _s, _t;
         if (!user) {
             throw new utils.DynamicError(errors.USER_NOT_LOGGED_IN);
         }
         yield turnkeyExport.cleanupExport({
             wallet,
         });
-        const turnkeyWallet = findTurnkeyWallet.findTurnkeyWalletByPrimaryChain(walletConnectorOptions, (_q = projectSettings === null || projectSettings === void 0 ? void 0 : projectSettings.sdk.embeddedWallets) === null || _q === void 0 ? void 0 : _q.chainConfigurations, user === null || user === void 0 ? void 0 : user.verifiedCredentials);
-        const turnkeyHDWalletId = (_r = turnkeyWallet === null || turnkeyWallet === void 0 ? void 0 : turnkeyWallet.walletProperties) === null || _r === void 0 ? void 0 : _r.turnkeyHDWalletId;
+        const turnkeyWallet = findTurnkeyWallet.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;
         if (type === 'recoveryPhrase' && !turnkeyHDWalletId) {
             type = 'privateKey';
         }
@@ -327,11 +334,11 @@ const useSecureEnclaveEmbeddedWallet = () => {
      * @returns Promise<'code_sent'>
      */
     const sendOneTimeCode = React.useCallback(() => _tslib.__awaiter(void 0, void 0, void 0, function* () {
-        var _s, _t;
+        var _u, _v;
         if (!user) {
             throw new utils.DynamicError(errors.USER_NOT_LOGGED_IN);
         }
-        const targetTurnkeyWallet = findTurnkeyWallet.findTurnkeyWalletByPrimaryChain(walletConnectorOptions, (_s = projectSettings === null || projectSettings === void 0 ? void 0 : projectSettings.sdk.embeddedWallets) === null || _s === void 0 ? void 0 : _s.chainConfigurations, user.verifiedCredentials);
+        const targetTurnkeyWallet = findTurnkeyWallet.findTurnkeyWalletByPrimaryChain(walletConnectorOptions, (_u = projectSettings === null || projectSettings === void 0 ? void 0 : projectSettings.sdk.embeddedWallets) === null || _u === void 0 ? void 0 : _u.chainConfigurations, user.verifiedCredentials);
         if (!targetTurnkeyWallet || !('id' in targetTurnkeyWallet)) {
             throw new utils.DynamicError('User does not have a valid secure enclave wallet', errors.INVALID_WALLET_DATA);
         }
@@ -342,7 +349,7 @@ const useSecureEnclaveEmbeddedWallet = () => {
             throw new utils.DynamicError('Session is active. No need to create a new one', errors.ACTIVE_SESSION);
         }
         const turnkeyAuthIframeContainerRef = createRootElement(constants.iframeContainerId);
-        const publicKey = yield turnkeyAuthenticatorHandler.initRecovery('email', turnkeyAuthIframeContainerRef.current, constants.iframeElementId, getEmbeddedWalletSessionExpiration.getEmbeddedWalletSessionExpiration((_t = projectSettings === null || projectSettings === void 0 ? void 0 : projectSettings.sdk.embeddedWallets) === null || _t === void 0 ? void 0 : _t.sessionKeyDuration));
+        const publicKey = yield turnkeyAuthenticatorHandler.initRecovery('email', turnkeyAuthIframeContainerRef.current, constants.iframeElementId, getEmbeddedWalletSessionExpiration.getEmbeddedWalletSessionExpiration((_v = projectSettings === null || projectSettings === void 0 ? void 0 : projectSettings.sdk.embeddedWallets) === null || _v === void 0 ? void 0 : _v.sessionKeyDuration));
         if (!publicKey) {
             throw new utils.DynamicError(errors.ERROR_SENDING_CODE);
         }

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

@@ -19,9 +19,9 @@ export declare const useSecureEnclaveEmbeddedWallet: () => {
     readonly createEmbeddedWallet: (chains?: ChainEnum[], options?: {
         webAuthnAttestation: WebAuthnAttestation;
     }) => Promise<Wallet | undefined>;
-    readonly createOrRestoreSession: (options: {
+    readonly createOrRestoreSession: (options?: {
         oneTimeCode: string;
-    } | undefined) => Promise<string>;
+    } | undefined) => Promise<string | undefined>;
     readonly createPasskey: (options: {
         oneTimeCode: string;
     } | undefined) => Promise<WebAuthnAttestation>;

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

@@ -3,10 +3,10 @@ import { __awaiter } from '../../../../../../_virtual/_tslib.js';
 import { useCallback } from 'react';
 import { JwtVerifiedCredentialFormatEnum } from '@dynamic-labs/sdk-api-core';
 import { DynamicError, EmbeddedWalletException } from '@dynamic-labs/utils';
+import { isSessionKeyCompatibleWalletConnector } from '@dynamic-labs/wallet-connector-core';
 import '../../../../context/DynamicContext/DynamicContext.js';
 import { logger } from '../../../../shared/logger.js';
 import '@dynamic-labs/iconic';
-import '@dynamic-labs/wallet-connector-core';
 import 'react/jsx-runtime';
 import '../../../../context/ViewContext/ViewContext.js';
 import '@dynamic-labs/wallet-book';
@@ -14,6 +14,7 @@ import { EMBEDDED_WALLET_SESSION_SETTINGS } from '../../../constants/localStorag
 import '../../../constants/colors.js';
 import '../../../constants/values.js';
 import { LocalStorage } from '../../../../shared/utils/classes/storage/localStorage.js';
+import '../../../../shared/utils/classes/storage/sessionStorage.js';
 import '../../../../shared/consts/index.js';
 import '../../../../events/dynamicEvents.js';
 import '../../../../context/CaptchaContext/CaptchaContext.js';
@@ -22,15 +23,13 @@ import { findEmbeddedWalletFromVerifiedCredentials } from '../../../functions/fi
 import { findTurnkeyWalletByPrimaryChain } from '../../../functions/findTurnkeyWallet/findTurnkeyWallet.js';
 import '@dynamic-labs/multi-wallet';
 import 'react-international-phone';
-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 '../../../../config/ApiEndpoint.js';
 import { completePasskeyRecovery, getUserPasskeys, initEmbeddedWalletSession } from '../../../../data/api/embeddedWallets/embeddedWallets.js';
 import '@dynamic-labs/store';
 import '../../../../locale/locale.js';
+import { getUserWalletsFromVerifiedCredentials } from '../../../functions/getUserWalletsFromVerifiedCredentials/getUserWalletsFromVerifiedCredentials.js';
+import { addPasskeyIdentifierToWalletConnector } from '../../../functions/addPasskeyIdentifierToWalletConnector/addPasskeyIdentifierToWalletConnector.js';
+import { getEOAWallet } from '../../../functions/getEOAWallet/getEOAWallet.js';
 import { getUserVerifiedCredentialType } from '../../../functions/getUserVerifiedCredentialType/getUserVerifiedCredentialType.js';
 import { hasEmbeddedWallet } from '../../../functions/hasEmbeddedWallet/hasEmbeddedWallet.js';
 import { getEmbeddedWalletAuthHandler } from '../../../functions/getEmbeddedWalletAuthHandler/getEmbeddedWalletAuthHandler.js';
@@ -109,8 +108,8 @@ import { useInternalDynamicContext } from '../../../../context/DynamicContext/us
  * }
  */
 const useSecureEnclaveEmbeddedWallet = () => {
-    var _a, _b, _c, _d;
-    const { projectSettings, primaryWallet, user, environmentId, walletConnectorOptions, } = useInternalDynamicContext();
+    var _a, _b, _c, _d, _e, _f;
+    const { projectSettings, primaryWallet, user, environmentId, walletConnectorOptions, walletConnector, } = useInternalDynamicContext();
     const { createTurnkeyWallet } = useTurnkey();
     const { hasRecoveryEmail } = useIsTurnkeyWallet();
     const { createRootElement } = useElementById();
@@ -124,13 +123,13 @@ const useSecureEnclaveEmbeddedWallet = () => {
      * @returns Promise<Wallet | undefined>
      */
     const createEmbeddedWallet = useCallback((chains, options) => __awaiter(void 0, void 0, void 0, function* () {
-        var _e;
+        var _g;
         if (!user) {
             throw new DynamicError(USER_NOT_LOGGED_IN);
         }
         const userWalletsCredentials = getUserWalletsFromVerifiedCredentials(user);
         const embeddedWalletVerifiedCredential = findEmbeddedWalletFromVerifiedCredentials(user, chains);
-        const isManualMode = ((_e = projectSettings === null || projectSettings === void 0 ? void 0 : projectSettings.sdk.embeddedWallets) === null || _e === void 0 ? void 0 : _e.automaticEmbeddedWalletCreation) === false;
+        const isManualMode = ((_g = projectSettings === null || projectSettings === void 0 ? void 0 : projectSettings.sdk.embeddedWallets) === null || _g === void 0 ? void 0 : _g.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.
@@ -151,22 +150,26 @@ 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 _f, _g, _h, _j, _k, _l;
+        var _h, _j, _k, _l, _m, _o;
         if (!user) {
             throw new DynamicError(USER_NOT_LOGGED_IN);
         }
+        if (isSessionKeyCompatibleWalletConnector(walletConnector)) {
+            const publicKey = yield walletConnector.createOrRestoreSession();
+            return publicKey;
+        }
         const turnkeyRecoveryHandler = getEmbeddedWalletAuthHandler(wallet === null || wallet === void 0 ? void 0 : wallet.connector);
         if (turnkeyRecoveryHandler.isSessionActive()) {
             return ACTIVE_SESSION;
         }
         const turnkeyAuthIframeContainerRef = createRootElement(iframeContainerId);
         // try to restore session if possible
-        if (canRestoreEmbeddedWalletSession((_f = projectSettings === null || projectSettings === void 0 ? void 0 : projectSettings.sdk.embeddedWallets) === null || _f === void 0 ? void 0 : _f.sessionKeyDuration)) {
+        if (canRestoreEmbeddedWalletSession((_h = projectSettings === null || projectSettings === void 0 ? void 0 : projectSettings.sdk.embeddedWallets) === null || _h === void 0 ? void 0 : _h.sessionKeyDuration)) {
             try {
                 const sessionRestored = yield restoreEmbeddedWalletSession({
                     iframeContainer: turnkeyAuthIframeContainerRef.current,
                     iframeElementId,
-                    sessionExpiration: getEmbeddedWalletSessionExpiration((_h = (_g = projectSettings === null || projectSettings === void 0 ? void 0 : projectSettings.sdk) === null || _g === void 0 ? void 0 : _g.embeddedWallets) === null || _h === void 0 ? void 0 : _h.sessionKeyDuration),
+                    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),
                     user,
                     wallet: primaryWallet,
                 });
@@ -185,7 +188,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 = (_l = (_k = (_j = user === null || user === void 0 ? void 0 : user.verifiedCredentials) === null || _j === void 0 ? void 0 : _j.find(({ walletName }) => walletName === null || walletName === void 0 ? void 0 : walletName.startsWith('turnkey'))) === null || _k === void 0 ? void 0 : _k.walletProperties) === null || _l === void 0 ? void 0 : _l.turnkeySubOrganizationId;
+        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;
         yield turnkeyRecoveryHandler.verifyRecoveryCode(options.oneTimeCode, organizationId);
         const sessionSettings = {
             createdAt: new Date().getTime(),
@@ -209,12 +212,12 @@ const useSecureEnclaveEmbeddedWallet = () => {
      * @returns Promise<WebAuthnAttestation>
      */
     const createPasskey = useCallback((options) => __awaiter(void 0, void 0, void 0, function* () {
-        var _m, _o;
+        var _p, _q;
         if (!user) {
             throw new DynamicError(USER_NOT_LOGGED_IN);
         }
         validateTurnkeyProviderEnabled(projectSettings);
-        const turnkeyWallet = findTurnkeyWalletByPrimaryChain(walletConnectorOptions, (_m = projectSettings === null || projectSettings === void 0 ? void 0 : projectSettings.sdk.embeddedWallets) === null || _m === void 0 ? void 0 : _m.chainConfigurations, user.verifiedCredentials);
+        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);
         if (!(turnkeyWallet === null || turnkeyWallet === void 0 ? void 0 : turnkeyWallet.walletConnector)) {
             throw new DynamicError('Wallet connector not found', INVALID_WALLET_DATA);
         }
@@ -229,7 +232,7 @@ const useSecureEnclaveEmbeddedWallet = () => {
         if (!('id' in turnkeyWallet) || !hasEmailVC) {
             return walletConnector.getWebAuthnAttestation();
         }
-        const turnkeySubOrganizationId = (_o = turnkeyWallet === null || turnkeyWallet === void 0 ? void 0 : turnkeyWallet.walletProperties) === null || _o === void 0 ? void 0 : _o.turnkeySubOrganizationId;
+        const turnkeySubOrganizationId = (_q = turnkeyWallet === null || turnkeyWallet === void 0 ? void 0 : turnkeyWallet.walletProperties) === null || _q === void 0 ? void 0 : _q.turnkeySubOrganizationId;
         if (!turnkeySubOrganizationId) {
             throw new DynamicError('No sub organization id found for the wallet', INVALID_WALLET_DATA);
         }
@@ -272,29 +275,33 @@ const useSecureEnclaveEmbeddedWallet = () => {
         });
         return data.passkeys;
     }), [user, environmentId]);
+    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 &&
+        isSessionKeyCompatibleWalletConnector(walletConnector) &&
+        ((_e = walletConnector.sessionKeys) === null || _e === void 0 ? void 0 : _e.publicKey))) !== null && _f !== void 0 ? _f : false;
     /**
      * Checks if the embedded wallet session is active
      * @returns boolean
      */
-    const isSessionActive = (_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 isSessionActive = isEmailAuthSessionActive || isSessionKeySessionActive;
     /**
      * 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 = (_p) => __awaiter(void 0, [_p], void 0, function* ({ type, htmlContainerId, }) {
-        var _q, _r;
+    const revealEmbeddedWalletKey = (_r) => __awaiter(void 0, [_r], void 0, function* ({ type, htmlContainerId, }) {
+        var _s, _t;
         if (!user) {
             throw new DynamicError(USER_NOT_LOGGED_IN);
         }
         yield cleanupExport({
             wallet,
         });
-        const turnkeyWallet = findTurnkeyWalletByPrimaryChain(walletConnectorOptions, (_q = projectSettings === null || projectSettings === void 0 ? void 0 : projectSettings.sdk.embeddedWallets) === null || _q === void 0 ? void 0 : _q.chainConfigurations, user === null || user === void 0 ? void 0 : user.verifiedCredentials);
-        const turnkeyHDWalletId = (_r = turnkeyWallet === null || turnkeyWallet === void 0 ? void 0 : turnkeyWallet.walletProperties) === null || _r === void 0 ? void 0 : _r.turnkeyHDWalletId;
+        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;
         if (type === 'recoveryPhrase' && !turnkeyHDWalletId) {
             type = 'privateKey';
         }
@@ -323,11 +330,11 @@ const useSecureEnclaveEmbeddedWallet = () => {
      * @returns Promise<'code_sent'>
      */
     const sendOneTimeCode = useCallback(() => __awaiter(void 0, void 0, void 0, function* () {
-        var _s, _t;
+        var _u, _v;
         if (!user) {
             throw new DynamicError(USER_NOT_LOGGED_IN);
         }
-        const targetTurnkeyWallet = findTurnkeyWalletByPrimaryChain(walletConnectorOptions, (_s = projectSettings === null || projectSettings === void 0 ? void 0 : projectSettings.sdk.embeddedWallets) === null || _s === void 0 ? void 0 : _s.chainConfigurations, user.verifiedCredentials);
+        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);
         if (!targetTurnkeyWallet || !('id' in targetTurnkeyWallet)) {
             throw new DynamicError('User does not have a valid secure enclave wallet', INVALID_WALLET_DATA);
         }
@@ -338,7 +345,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((_t = projectSettings === null || projectSettings === void 0 ? void 0 : projectSettings.sdk.embeddedWallets) === null || _t === void 0 ? void 0 : _t.sessionKeyDuration));
+        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));
         if (!publicKey) {
             throw new DynamicError(ERROR_SENDING_CODE);
         }