@dynamic-labs/sdk-react-core 3.0.0-alpha.3 → 3.0.0-alpha.30

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

@@ -2,14 +2,13 @@
 import { __awaiter } from '../../../../../../../_virtual/_tslib.js';
 import { useCallback } from 'react';
 import { PasswordSourceTypeEnum, ChainEnum } from '@dynamic-labs/sdk-api-core';
-import { isCoinbaseMpcWalletConnector } from '@dynamic-labs/wallet-connector-core';
+import { Wallet, isCoinbaseMpcWalletConnector } from '@dynamic-labs/wallet-connector-core';
 import { DynamicError } from '@dynamic-labs/utils';
 import { createUserProfileFromSdkUser } from '../../../../functions/createUserProfile/createUserProfile.js';
 import { findEmbeddedWalletFromVerifiedCredentials } from '../../../../functions/findEmbeddedWalletFromVerifiedCredentials/findEmbeddedWalletFromVerifiedCredentials.js';
 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';
@@ -26,12 +25,11 @@ 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';
@@ -41,6 +39,7 @@ import { getSiweStatement } from '../../../../functions/getSiweStatement/getSiwe
 import '../../../../../context/VerificationContext/VerificationContext.js';
 import 'react-dom';
 import '../../../../../context/WalletContext/WalletContext.js';
+import '../../useSecureEnclaveEmbeddedWallet/constants.js';
 import '../../../../../context/ThemeContext/ThemeContext.js';
 import '../../../useUserUpdateRequest/useUpdateUser/userFieldsSchema.js';
 import '@dynamic-labs/types';
@@ -83,26 +82,37 @@ 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';
+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';
 
 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 = {
+        const coinbaseMPCWallet = new Wallet({
             address: (yield (connector === null || connector === void 0 ? void 0 : connector.getAddress())) || '',
-            authenticated: true,
             chain: (connector === null || connector === void 0 ? void 0 : connector.connectedChain) || '',
-            connected: true,
             connector,
             id: embeddedWalletVerifiedCredential.id,
-        };
+            isAuthenticated: true,
+            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');
@@ -143,6 +153,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);
@@ -157,15 +168,15 @@ const useCoinbaseMPC = () => {
                 password: initialWalletPassword,
                 source,
             });
-            const coinbaseMPCWallet = {
+            const coinbaseMPCWallet = new Wallet({
                 address: (yield (connector === null || connector === void 0 ? void 0 : connector.getAddress())) || '',
-                authenticated: true,
                 chain: (connector === null || connector === void 0 ? void 0 : connector.connectedChain) || '',
-                connected: true,
                 connector,
                 id: newSelectedCredentialWallet.id,
-            };
-            dynamicEvents.emit('embeddedWalletCreated', coinbaseMPCWallet, newSelectedCredentialWallet, getAuthToken(), updatedUser);
+                isAuthenticated: true,
+                key: (_c = newSelectedCredentialWallet.walletName) !== null && _c !== void 0 ? _c : connector.key,
+            });
+            dynamicEvents.emit('embeddedWalletCreated', coinbaseMPCWallet, newSelectedCredentialWallet, updatedUser);
             return coinbaseMPCWallet;
         }
         catch (error) {
@@ -179,11 +190,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

@@ -30,8 +30,6 @@ 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');
@@ -43,6 +41,7 @@ require('../../../../context/VerificationContext/VerificationContext.cjs');
 require('react-dom');
 var WalletContext = require('../../../../context/WalletContext/WalletContext.cjs');
 var validateMPCProviderEnabled = require('../../../validations/validateMPCProviderEnabled/validateMPCProviderEnabled.cjs');
+require('../useSecureEnclaveEmbeddedWallet/constants.cjs');
 var useEmbeddedWalletPassword = require('../../useEmbeddedWalletPassword/useEmbeddedWalletPassword.cjs');
 var useCoinbaseMPC = require('./useCoinbaseMPC/useCoinbaseMPC.cjs');
 require('../../../../context/ThemeContext/ThemeContext.cjs');
@@ -87,6 +86,17 @@ require('../../../../widgets/DynamicWidget/components/DynamicWidgetHeader/Dynami
 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

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

@@ -26,8 +26,6 @@ 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';
@@ -39,6 +37,7 @@ import '../../../../context/VerificationContext/VerificationContext.js';
 import 'react-dom';
 import { useWalletContext } from '../../../../context/WalletContext/WalletContext.js';
 import { validateMPCProviderEnabled } from '../../../validations/validateMPCProviderEnabled/validateMPCProviderEnabled.js';
+import '../useSecureEnclaveEmbeddedWallet/constants.js';
 import { useEmbeddedWalletPassword } from '../../useEmbeddedWalletPassword/useEmbeddedWalletPassword.js';
 import { useCoinbaseMPC } from './useCoinbaseMPC/useCoinbaseMPC.js';
 import '../../../../context/ThemeContext/ThemeContext.js';
@@ -83,6 +82,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 and used internally to trigger embedded wallet creation

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

@@ -7,6 +7,11 @@ const iframeContainerId = 'dyn-secure-enclave-container-id';
 const iframeElementId = 'dyn-secure-enclave-element-id';
 const revealIframeContainerId = 'dyn-secure-enclave-export-container-id';
 const revealIframeElementId = 'dyn-secure-enclave-export-element-id';
+exports.EmbeddedWalletVersion = void 0;
+(function (EmbeddedWalletVersion) {
+    EmbeddedWalletVersion["V1"] = "V1";
+    EmbeddedWalletVersion["V2"] = "V2";
+})(exports.EmbeddedWalletVersion || (exports.EmbeddedWalletVersion = {}));
 
 exports.iframeContainerId = iframeContainerId;
 exports.iframeElementId = iframeElementId;

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

@@ -2,3 +2,7 @@ export declare const iframeContainerId = "dyn-secure-enclave-container-id";
 export declare const iframeElementId = "dyn-secure-enclave-element-id";
 export declare const revealIframeContainerId = "dyn-secure-enclave-export-container-id";
 export declare const revealIframeElementId = "dyn-secure-enclave-export-element-id";
+export declare enum EmbeddedWalletVersion {
+    V1 = "V1",// Non-silent signing compatible turnkey sub orgs (Legacy)
+    V2 = "V2"
+}

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

@@ -3,5 +3,10 @@ const iframeContainerId = 'dyn-secure-enclave-container-id';
 const iframeElementId = 'dyn-secure-enclave-element-id';
 const revealIframeContainerId = 'dyn-secure-enclave-export-container-id';
 const revealIframeElementId = 'dyn-secure-enclave-export-element-id';
+var EmbeddedWalletVersion;
+(function (EmbeddedWalletVersion) {
+    EmbeddedWalletVersion["V1"] = "V1";
+    EmbeddedWalletVersion["V2"] = "V2";
+})(EmbeddedWalletVersion || (EmbeddedWalletVersion = {}));
 
-export { iframeContainerId, iframeElementId, revealIframeContainerId, revealIframeElementId };
+export { EmbeddedWalletVersion, iframeContainerId, iframeElementId, revealIframeContainerId, revealIframeElementId };

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

@@ -33,8 +33,6 @@ require('@dynamic-labs/store');
 require('../../../../locale/locale.cjs');
 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');
 var getUserVerifiedCredentialType = require('../../../functions/getUserVerifiedCredentialType/getUserVerifiedCredentialType.cjs');
 var hasEmbeddedWallet = require('../../../functions/hasEmbeddedWallet/hasEmbeddedWallet.cjs');
@@ -96,6 +94,17 @@ require('../../../../widgets/DynamicWidget/components/DynamicWidgetHeader/Dynami
 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
@@ -114,7 +123,7 @@ var useInternalDynamicContext = require('../../../../context/DynamicContext/useD
  * }
  */
 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.useInternalDynamicContext();
     const { createTurnkeyWallet } = useTurnkey.useTurnkey();
     const { hasRecoveryEmail } = useIsTurnkeyWallet.useIsTurnkeyWallet();
@@ -122,6 +131,12 @@ const useSecureEnclaveEmbeddedWallet = () => {
     const { isLoadingEmbeddedWallet, setIsLoadingEmbeddedWallet } = WalletContext.useWalletContext();
     const wallet = getEOAWallet.getEOAWallet(primaryWallet, (user === null || user === void 0 ? void 0 : user.verifiedCredentials) || []);
     const userHasEmbeddedWallet = React.useCallback(() => hasEmbeddedWallet.hasEmbeddedWallet(user, 'turnkey'), [user]);
+    const getWalletVersion = () => {
+        if (walletConnectorCore.isSessionKeyCompatibleWalletConnector(wallet === null || wallet === void 0 ? void 0 : wallet.connector)) {
+            return constants.EmbeddedWalletVersion.V2;
+        }
+        return constants.EmbeddedWalletVersion.V1;
+    };
     /**
      * Creates a new secure enclave embedded wallet according to the settings from the dashboard
      * @param chain - optional chain parameter to create the wallet for
@@ -129,13 +144,13 @@ const useSecureEnclaveEmbeddedWallet = () => {
      * @returns Promise<Wallet | undefined>
      */
     const createEmbeddedWallet = React.useCallback((chains, options) => _tslib.__awaiter(void 0, void 0, void 0, function* () {
-        var _g;
+        var _l;
         if (!user) {
             throw new utils.DynamicError(errors.USER_NOT_LOGGED_IN);
         }
         const userWalletsCredentials = getUserWalletsFromVerifiedCredentials.getUserWalletsFromVerifiedCredentials(user);
         const embeddedWalletVerifiedCredential = findEmbeddedWalletFromVerifiedCredentials.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.
@@ -156,13 +171,18 @@ 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 _h, _j, _k, _l, _m, _o;
+        var _m, _o, _p, _q, _r, _s, _t, _u, _v;
         if (!user) {
             throw new utils.DynamicError(errors.USER_NOT_LOGGED_IN);
         }
-        if (walletConnectorCore.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'
+            ? walletConnectorCore.isSessionKeyCompatibleWalletConnector((primaryWallet === null || primaryWallet === void 0 ? void 0 : primaryWallet.connector).getEOAConnector())
+            : false;
+        if (walletConnectorCore.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.getEmbeddedWalletAuthHandler(wallet === null || wallet === void 0 ? void 0 : wallet.connector);
         if (turnkeyRecoveryHandler.isSessionActive()) {
@@ -170,12 +190,12 @@ const useSecureEnclaveEmbeddedWallet = () => {
         }
         const turnkeyAuthIframeContainerRef = createRootElement(constants.iframeContainerId);
         // try to restore session if possible
-        if (passkeyRecovery.canRestoreEmbeddedWalletSession((_h = projectSettings === null || projectSettings === void 0 ? void 0 : projectSettings.sdk.embeddedWallets) === null || _h === void 0 ? void 0 : _h.sessionKeyDuration)) {
+        if (passkeyRecovery.canRestoreEmbeddedWalletSession((_q = projectSettings === null || projectSettings === void 0 ? void 0 : projectSettings.sdk.embeddedWallets) === null || _q === void 0 ? void 0 : _q.sessionKeyDuration)) {
             try {
                 const sessionRestored = yield passkeyRecovery.restoreEmbeddedWalletSession({
                     iframeContainer: turnkeyAuthIframeContainerRef.current,
                     iframeElementId: constants.iframeElementId,
-                    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),
+                    sessionExpiration: getEmbeddedWalletSessionExpiration.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,
                 });
@@ -194,7 +214,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 = (_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(),
@@ -218,12 +238,12 @@ const useSecureEnclaveEmbeddedWallet = () => {
      * @returns Promise<WebAuthnAttestation>
      */
     const createPasskey = React.useCallback((options) => _tslib.__awaiter(void 0, void 0, void 0, function* () {
-        var _p, _q;
+        var _w, _x;
         if (!user) {
             throw new utils.DynamicError(errors.USER_NOT_LOGGED_IN);
         }
         validateTurnkeyProviderEnabled.validateTurnkeyProviderEnabled(projectSettings);
-        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);
+        const turnkeyWallet = findTurnkeyWallet.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 utils.DynamicError('Wallet connector not found', errors.INVALID_WALLET_DATA);
         }
@@ -238,7 +258,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 utils.DynamicError('No sub organization id found for the wallet', errors.INVALID_WALLET_DATA);
         }
@@ -284,30 +304,35 @@ const useSecureEnclaveEmbeddedWallet = () => {
     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 &&
+    const isSessionKeySessionAAActive = ((_e = wallet === null || wallet === void 0 ? void 0 : wallet.connector) === null || _e === void 0 ? void 0 : _e.key) === 'zerodev' &&
+        walletConnectorCore.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 &&
         walletConnectorCore.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) => _tslib.__awaiter(void 0, [_r], void 0, function* ({ type, htmlContainerId, }) {
-        var _s, _t;
+    const revealEmbeddedWalletKey = (_y) => _tslib.__awaiter(void 0, [_y], void 0, function* ({ type, htmlContainerId, }) {
+        var _z, _0, _1, _2, _3, _4;
         if (!user) {
             throw new utils.DynamicError(errors.USER_NOT_LOGGED_IN);
         }
         yield turnkeyExport.cleanupExport({
             wallet,
         });
-        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;
+        const turnkeyWallet = findTurnkeyWallet.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';
         }
@@ -315,17 +340,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 (walletConnectorCore.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 turnkeyExport.initExport({
             iframeContainer: iframeContainerElement.current,
             iframeElementId: constants.revealIframeElementId,
             wallet,
         });
-        yield turnkeyExport.exportCredential({
-            address: type === 'privateKey' ? wallet === null || wallet === void 0 ? void 0 : wallet.address : undefined,
-            environmentId,
-            user,
-            wallet,
-        });
+        try {
+            yield turnkeyExport.exportCredential({
+                address: type === 'privateKey' ? wallet === null || wallet === void 0 ? void 0 : wallet.address : undefined,
+                environmentId,
+                user,
+                wallet,
+            });
+        }
+        catch (_5) {
+            if (walletConnectorCore.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 turnkeyExport.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';
@@ -336,11 +381,11 @@ const useSecureEnclaveEmbeddedWallet = () => {
      * @returns Promise<'code_sent'>
      */
     const sendOneTimeCode = React.useCallback(() => _tslib.__awaiter(void 0, void 0, void 0, function* () {
-        var _u, _v;
+        var _6, _7;
         if (!user) {
             throw new utils.DynamicError(errors.USER_NOT_LOGGED_IN);
         }
-        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);
+        const targetTurnkeyWallet = findTurnkeyWallet.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 utils.DynamicError('User does not have a valid secure enclave wallet', errors.INVALID_WALLET_DATA);
         }
@@ -351,7 +396,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((_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, constants.iframeElementId, getEmbeddedWalletSessionExpiration.getEmbeddedWalletSessionExpiration((_7 = projectSettings === null || projectSettings === void 0 ? void 0 : projectSettings.sdk.embeddedWallets) === null || _7 === void 0 ? void 0 : _7.sessionKeyDuration));
         if (!publicKey) {
             throw new utils.DynamicError(errors.ERROR_SENDING_CODE);
         }
@@ -375,6 +420,7 @@ const useSecureEnclaveEmbeddedWallet = () => {
         createOrRestoreSession,
         createPasskey,
         getPasskeys,
+        getWalletVersion,
         isLoadingEmbeddedWallet,
         isSessionActive,
         revealEmbeddedWalletKey,

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

@@ -1,6 +1,7 @@
 import { ChainEnum } from '@dynamic-labs/sdk-api-core';
 import { WebAuthnAttestation } from '@dynamic-labs/wallet-connector-core';
 import { Wallet } from '../../../../shared';
+import { EmbeddedWalletVersion } from './constants';
 /**
  *
  * @returns {
@@ -26,8 +27,9 @@ export declare const useSecureEnclaveEmbeddedWallet: () => {
         oneTimeCode: string;
     } | undefined) => Promise<WebAuthnAttestation>;
     readonly getPasskeys: () => Promise<import("@dynamic-labs/sdk-api-core").UserPasskey[]>;
+    readonly getWalletVersion: () => EmbeddedWalletVersion;
     readonly isLoadingEmbeddedWallet: boolean;
-    readonly isSessionActive: boolean;
+    readonly isSessionActive: string | boolean | undefined;
     readonly revealEmbeddedWalletKey: ({ type, htmlContainerId, }: {
         type: 'recoveryPhrase' | 'privateKey';
         htmlContainerId?: string;