@dynamic-labs/sdk-react-core 4.0.0-alpha.0 → 4.0.0-alpha.1

package/src/lib/utils/constants/localStorage.cjs

@@ -26,6 +26,10 @@ const CAPTCHA_TOKEN = 'dynamic_captcha_token';
  */
 const PHANTOM_SIGNATURE_STATE = 'phantom_verification_type';
 const STORE_STORAGE_KEY = 'dynamic_store';
+const SECURE_ENCLAVE_WALLET_SESSION_KEYS = 'dynamic_secure_enclave_session_keys';
+const SECURE_ENCLAVE_WALLET_SESSION_KEYS_STORAGE_OPTIONS = {
+    priority: ['secureStorage', 'localStorage'],
+};
 
 exports.AUTH_EXPIRES_AT = AUTH_EXPIRES_AT;
 exports.AUTH_MIN_TOKEN = AUTH_MIN_TOKEN;
@@ -44,6 +48,8 @@ exports.NONCE_STORAGE_KEY = NONCE_STORAGE_KEY;
 exports.PHANTOM_SIGNATURE_STATE = PHANTOM_SIGNATURE_STATE;
 exports.PHONE_INPUT_DEFAULT_COUNTRY = PHONE_INPUT_DEFAULT_COUNTRY;
 exports.PRIMARY_WALLET_ID = PRIMARY_WALLET_ID;
+exports.SECURE_ENCLAVE_WALLET_SESSION_KEYS = SECURE_ENCLAVE_WALLET_SESSION_KEYS;
+exports.SECURE_ENCLAVE_WALLET_SESSION_KEYS_STORAGE_OPTIONS = SECURE_ENCLAVE_WALLET_SESSION_KEYS_STORAGE_OPTIONS;
 exports.STORE_STORAGE_KEY = STORE_STORAGE_KEY;
 exports.WAGMI_LAST_SESSION_SETTINGS = WAGMI_LAST_SESSION_SETTINGS;
 exports.WALLET_PICKER_SEARCH_KEY = WALLET_PICKER_SEARCH_KEY;

package/src/lib/utils/constants/localStorage.d.ts

@@ -1,3 +1,4 @@
+import { StorageOptions } from '@dynamic-labs/utils';
 export declare const AUTH_TOKEN = "dynamic_authentication_token";
 export declare const AUTH_MIN_TOKEN = "dynamic_min_authentication_token";
 export declare const AUTH_EXPIRES_AT = "dynamic_auth_expires_at";
@@ -33,3 +34,5 @@ export type PhantomSignatureState = {
 export declare const PHANTOM_SIGNATURE_STATE = "phantom_verification_type";
 export declare const STORE_STORAGE_KEY = "dynamic_store";
 export declare const IP_LOOKUP_STORAGE_KEY = "dynamic_ip_lookup";
+export declare const SECURE_ENCLAVE_WALLET_SESSION_KEYS = "dynamic_secure_enclave_session_keys";
+export declare const SECURE_ENCLAVE_WALLET_SESSION_KEYS_STORAGE_OPTIONS: StorageOptions;

package/src/lib/utils/constants/localStorage.js

@@ -22,5 +22,9 @@ const CAPTCHA_TOKEN = 'dynamic_captcha_token';
  */
 const PHANTOM_SIGNATURE_STATE = 'phantom_verification_type';
 const STORE_STORAGE_KEY = 'dynamic_store';
+const SECURE_ENCLAVE_WALLET_SESSION_KEYS = 'dynamic_secure_enclave_session_keys';
+const SECURE_ENCLAVE_WALLET_SESSION_KEYS_STORAGE_OPTIONS = {
+    priority: ['secureStorage', 'localStorage'],
+};
 
-export { AUTH_EXPIRES_AT, AUTH_MIN_TOKEN, AUTH_MODE, AUTH_TOKEN, BRIDGE_ONBOARDING_COMPLETED, CAPTCHA_TOKEN, CONNECTED_WALLETS_INFO, CONNECTED_WALLET_NAME_SERVICE, DYNAMIC_CONTEXT_LAST_SESSION_SETTINGS, EMBEDDED_WALLET_SECURE_BANNER, EMBEDDED_WALLET_SESSION_SETTINGS, LAST_USED_WALLET, NEWTOWEB3_WALLET_EXTENSION_FLAG_KEY, NONCE_STORAGE_KEY, PHANTOM_SIGNATURE_STATE, PHONE_INPUT_DEFAULT_COUNTRY, PRIMARY_WALLET_ID, STORE_STORAGE_KEY, WAGMI_LAST_SESSION_SETTINGS, WALLET_PICKER_SEARCH_KEY };
+export { AUTH_EXPIRES_AT, AUTH_MIN_TOKEN, AUTH_MODE, AUTH_TOKEN, BRIDGE_ONBOARDING_COMPLETED, CAPTCHA_TOKEN, CONNECTED_WALLETS_INFO, CONNECTED_WALLET_NAME_SERVICE, DYNAMIC_CONTEXT_LAST_SESSION_SETTINGS, EMBEDDED_WALLET_SECURE_BANNER, EMBEDDED_WALLET_SESSION_SETTINGS, LAST_USED_WALLET, NEWTOWEB3_WALLET_EXTENSION_FLAG_KEY, NONCE_STORAGE_KEY, PHANTOM_SIGNATURE_STATE, PHONE_INPUT_DEFAULT_COUNTRY, PRIMARY_WALLET_ID, SECURE_ENCLAVE_WALLET_SESSION_KEYS, SECURE_ENCLAVE_WALLET_SESSION_KEYS_STORAGE_OPTIONS, STORE_STORAGE_KEY, WAGMI_LAST_SESSION_SETTINGS, WALLET_PICKER_SEARCH_KEY };

package/src/lib/utils/functions/getNewVerifiedCredentialsFromDiff/getNewVerifiedCredentialsFromDiff.cjs

@@ -0,0 +1,11 @@
+'use client'
+'use strict';
+
+Object.defineProperty(exports, '__esModule', { value: true });
+
+const getNewVerifiedCredentialsFromDiff = (verifiedCredentialsA, verifiedCredentialsB) => {
+    const knownIds = verifiedCredentialsA.map((vc) => vc.id);
+    return verifiedCredentialsB.filter((vc) => !knownIds.includes(vc.id));
+};
+
+exports.getNewVerifiedCredentialsFromDiff = getNewVerifiedCredentialsFromDiff;

package/src/lib/utils/functions/getNewVerifiedCredentialsFromDiff/getNewVerifiedCredentialsFromDiff.d.ts

@@ -0,0 +1,2 @@
+import { JwtVerifiedCredential } from '@dynamic-labs/sdk-api-core';
+export declare const getNewVerifiedCredentialsFromDiff: (verifiedCredentialsA: JwtVerifiedCredential[], verifiedCredentialsB: JwtVerifiedCredential[]) => JwtVerifiedCredential[];

package/src/lib/utils/functions/getNewVerifiedCredentialsFromDiff/getNewVerifiedCredentialsFromDiff.js

@@ -0,0 +1,7 @@
+'use client'
+const getNewVerifiedCredentialsFromDiff = (verifiedCredentialsA, verifiedCredentialsB) => {
+    const knownIds = verifiedCredentialsA.map((vc) => vc.id);
+    return verifiedCredentialsB.filter((vc) => !knownIds.includes(vc.id));
+};
+
+export { getNewVerifiedCredentialsFromDiff };

package/src/lib/utils/functions/getNewVerifiedCredentialsFromDiff/index.d.ts

@@ -0,0 +1 @@
+export { getNewVerifiedCredentialsFromDiff } from './getNewVerifiedCredentialsFromDiff';

package/src/lib/utils/hooks/authenticationHooks/useConnectAndSign/useConnectAndSign.cjs

@@ -37,6 +37,7 @@ var isConnectOnly = require('../helpers/isConnectOnly.cjs');
 require('../../../../context/VerificationContext/VerificationContext.cjs');
 require('react-dom');
 require('../../../../context/WalletContext/WalletContext.cjs');
+require('../../../../context/UserWalletsContext/UserWalletsContext.cjs');
 require('../../useEmbeddedWallet/useSecureEnclaveEmbeddedWallet/constants.cjs');
 require('../../../../context/ThemeContext/ThemeContext.cjs');
 require('../../useUserUpdateRequest/useUpdateUser/userFieldsSchema.cjs');
@@ -52,7 +53,6 @@ require('../../../../context/UserFieldEditorContext/UserFieldEditorContext.cjs')
 require('@dynamic-labs/rpc-providers');
 require('../../../../store/state/environmentId.cjs');
 require('../../../../store/state/walletConnectorOptions.cjs');
-require('../../../../context/UserWalletsContext/UserWalletsContext.cjs');
 require('react-i18next');
 require('../../../../components/Accordion/components/AccordionItem/AccordionItem.cjs');
 require('../../../../components/Alert/Alert.cjs');

package/src/lib/utils/hooks/authenticationHooks/useConnectAndSign/useConnectAndSign.js

@@ -33,6 +33,7 @@ import { isConnectOnly } from '../helpers/isConnectOnly.js';
 import '../../../../context/VerificationContext/VerificationContext.js';
 import 'react-dom';
 import '../../../../context/WalletContext/WalletContext.js';
+import '../../../../context/UserWalletsContext/UserWalletsContext.js';
 import '../../useEmbeddedWallet/useSecureEnclaveEmbeddedWallet/constants.js';
 import '../../../../context/ThemeContext/ThemeContext.js';
 import '../../useUserUpdateRequest/useUpdateUser/userFieldsSchema.js';
@@ -48,7 +49,6 @@ import '../../../../context/UserFieldEditorContext/UserFieldEditorContext.js';
 import '@dynamic-labs/rpc-providers';
 import '../../../../store/state/environmentId.js';
 import '../../../../store/state/walletConnectorOptions.js';
-import '../../../../context/UserWalletsContext/UserWalletsContext.js';
 import 'react-i18next';
 import '../../../../components/Accordion/components/AccordionItem/AccordionItem.js';
 import '../../../../components/Alert/Alert.js';

package/src/lib/utils/hooks/authenticationHooks/useConnectAndSignSplitSteps/useConnectAndSignSplitSteps.cjs

@@ -37,6 +37,7 @@ var isConnectOnly = require('../helpers/isConnectOnly.cjs');
 require('../../../../context/VerificationContext/VerificationContext.cjs');
 require('react-dom');
 require('../../../../context/WalletContext/WalletContext.cjs');
+require('../../../../context/UserWalletsContext/UserWalletsContext.cjs');
 require('../../useEmbeddedWallet/useSecureEnclaveEmbeddedWallet/constants.cjs');
 require('../../../../context/ThemeContext/ThemeContext.cjs');
 require('../../useUserUpdateRequest/useUpdateUser/userFieldsSchema.cjs');
@@ -52,7 +53,6 @@ require('../../../../context/UserFieldEditorContext/UserFieldEditorContext.cjs')
 require('@dynamic-labs/rpc-providers');
 require('../../../../store/state/environmentId.cjs');
 require('../../../../store/state/walletConnectorOptions.cjs');
-require('../../../../context/UserWalletsContext/UserWalletsContext.cjs');
 require('react-i18next');
 require('../../../../components/Accordion/components/AccordionItem/AccordionItem.cjs');
 require('../../../../components/Alert/Alert.cjs');

package/src/lib/utils/hooks/authenticationHooks/useConnectAndSignSplitSteps/useConnectAndSignSplitSteps.js

@@ -33,6 +33,7 @@ import { isConnectOnly } from '../helpers/isConnectOnly.js';
 import '../../../../context/VerificationContext/VerificationContext.js';
 import 'react-dom';
 import '../../../../context/WalletContext/WalletContext.js';
+import '../../../../context/UserWalletsContext/UserWalletsContext.js';
 import '../../useEmbeddedWallet/useSecureEnclaveEmbeddedWallet/constants.js';
 import '../../../../context/ThemeContext/ThemeContext.js';
 import '../../useUserUpdateRequest/useUpdateUser/userFieldsSchema.js';
@@ -48,7 +49,6 @@ import '../../../../context/UserFieldEditorContext/UserFieldEditorContext.js';
 import '@dynamic-labs/rpc-providers';
 import '../../../../store/state/environmentId.js';
 import '../../../../store/state/walletConnectorOptions.js';
-import '../../../../context/UserWalletsContext/UserWalletsContext.js';
 import 'react-i18next';
 import '../../../../components/Accordion/components/AccordionItem/AccordionItem.js';
 import '../../../../components/Alert/Alert.js';

package/src/lib/utils/hooks/authenticationHooks/useSignConnectOnlyUser/useSignConnectOnlyUser.cjs

@@ -31,6 +31,7 @@ var useVerifyWallet = require('../../useVerifyWallet/useVerifyWallet.cjs');
 require('../../../../context/VerificationContext/VerificationContext.cjs');
 require('react-dom');
 require('../../../../context/WalletContext/WalletContext.cjs');
+require('../../../../context/UserWalletsContext/UserWalletsContext.cjs');
 require('../../useEmbeddedWallet/useSecureEnclaveEmbeddedWallet/constants.cjs');
 require('../../../../context/ThemeContext/ThemeContext.cjs');
 require('../../useUserUpdateRequest/useUpdateUser/userFieldsSchema.cjs');
@@ -46,7 +47,6 @@ require('../../../../context/UserFieldEditorContext/UserFieldEditorContext.cjs')
 require('@dynamic-labs/rpc-providers');
 require('../../../../store/state/environmentId.cjs');
 require('../../../../store/state/walletConnectorOptions.cjs');
-require('../../../../context/UserWalletsContext/UserWalletsContext.cjs');
 require('react-i18next');
 require('../../../../components/Accordion/components/AccordionItem/AccordionItem.cjs');
 require('../../../../components/Alert/Alert.cjs');

package/src/lib/utils/hooks/authenticationHooks/useSignConnectOnlyUser/useSignConnectOnlyUser.js

@@ -27,6 +27,7 @@ import { useVerifyWallet } from '../../useVerifyWallet/useVerifyWallet.js';
 import '../../../../context/VerificationContext/VerificationContext.js';
 import 'react-dom';
 import '../../../../context/WalletContext/WalletContext.js';
+import '../../../../context/UserWalletsContext/UserWalletsContext.js';
 import '../../useEmbeddedWallet/useSecureEnclaveEmbeddedWallet/constants.js';
 import '../../../../context/ThemeContext/ThemeContext.js';
 import '../../useUserUpdateRequest/useUpdateUser/userFieldsSchema.js';
@@ -42,7 +43,6 @@ import '../../../../context/UserFieldEditorContext/UserFieldEditorContext.js';
 import '@dynamic-labs/rpc-providers';
 import '../../../../store/state/environmentId.js';
 import '../../../../store/state/walletConnectorOptions.js';
-import '../../../../context/UserWalletsContext/UserWalletsContext.js';
 import 'react-i18next';
 import '../../../../components/Accordion/components/AccordionItem/AccordionItem.js';
 import '../../../../components/Alert/Alert.js';

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

@@ -66,3 +66,4 @@ export { useSyncMfaFlow } from './useSyncMfaFlow';
 export * from './useSmartWallets';
 export { useEmbeddedWalletSessionKeys } from './useEmbeddedWalletSessionKeys';
 export { useTelegramLogin } from './useTelegramLogin';
+export { useEndUserWarning } from './useEndUserWarning';

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

@@ -145,6 +145,7 @@ const useAuthLayoutChecks = () => {
         view.type !== 'wallet-claim-intro' &&
         view.type !== 'passkey-recovery-add-email' &&
         view.type !== 'global-wallet-confirm' &&
+        view.type !== 'global-wallet-malicious' &&
         view.type !== 'global-wallet-info' &&
         view.type !== 'mfa-choose-device' &&
         view.type !== 'mfa-verification';

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

@@ -141,6 +141,7 @@ const useAuthLayoutChecks = () => {
         view.type !== 'wallet-claim-intro' &&
         view.type !== 'passkey-recovery-add-email' &&
         view.type !== 'global-wallet-confirm' &&
+        view.type !== 'global-wallet-malicious' &&
         view.type !== 'global-wallet-info' &&
         view.type !== 'mfa-choose-device' &&
         view.type !== 'mfa-verification';

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

@@ -40,7 +40,7 @@ var getEmbeddedWalletSessionExpiration = require('../../../functions/getEmbedded
 require('../../../../store/state/projectSettings/projectSettings.cjs');
 require('../../../../context/AccessDeniedContext/AccessDeniedContext.cjs');
 require('../../../../context/AccountExistsContext/AccountExistsContext.cjs');
-require('../../../../context/UserWalletsContext/UserWalletsContext.cjs');
+var UserWalletsContext = require('../../../../context/UserWalletsContext/UserWalletsContext.cjs');
 var errors = require('../../../constants/errors.cjs');
 require('../../../../context/VerificationContext/VerificationContext.cjs');
 require('react-dom');
@@ -52,6 +52,7 @@ var passkeyRecovery = require('../../../../views/Passkey/utils/passkeyRecovery/p
 var validateTurnkeyProviderEnabled = require('../../../validations/validateTurnkeyProviderEnabled/validateTurnkeyProviderEnabled.cjs');
 var usePasskeyRecovery = require('../../usePasskeyRecovery/usePasskeyRecovery.cjs');
 var useSmartWallets = require('../../useSmartWallets/useSmartWallets.cjs');
+var getNewVerifiedCredentialsFromDiff = require('../../../functions/getNewVerifiedCredentialsFromDiff/getNewVerifiedCredentialsFromDiff.cjs');
 var constants = require('./constants.cjs');
 var useTurnkey = require('./useTurnkey/useTurnkey.cjs');
 require('../../../../context/ThemeContext/ThemeContext.cjs');
@@ -135,6 +136,7 @@ const isConnectorSessionKeyActive = (connector) => {
 const useSecureEnclaveEmbeddedWallet = () => {
     var _a, _b, _c, _d;
     const { projectSettings, primaryWallet, user: user$1, environmentId, walletConnectorOptions, } = useInternalDynamicContext.useInternalDynamicContext();
+    const { addedWalletsIds } = UserWalletsContext.useInternalUserWallets();
     const { createTurnkeyWallet } = useTurnkey.useTurnkey();
     const { hasRecoveryEmail } = useIsTurnkeyWallet.useIsTurnkeyWallet();
     const { createRootElement } = useElementById.useElementById();
@@ -207,10 +209,14 @@ const useSecureEnclaveEmbeddedWallet = () => {
         const signedRequest = yield ((_j = wallet === null || wallet === void 0 ? void 0 : wallet.connector) === null || _j === void 0 ? void 0 : _j.stampCreateWalletAccountRequest({
             request: requestToStamp,
         }));
-        yield embeddedWallets.createEmbeddedWalletAccount({
+        const verifiedUser = yield embeddedWallets.createEmbeddedWalletAccount({
             createEmbeddedWalletAccountRequest: signedRequest,
             environmentId,
         });
+        const newWalletIds = getNewVerifiedCredentialsFromDiff.getNewVerifiedCredentialsFromDiff(user$1.verifiedCredentials, verifiedUser.user.verifiedCredentials)
+            .filter(({ format }) => format === sdkApiCore.JwtVerifiedCredentialFormatEnum.Blockchain)
+            .map(({ id }) => id);
+        addedWalletsIds.current = addedWalletsIds.current.concat(newWalletIds);
         return user.refreshUserJwt({ environmentId });
     }), [
         environmentId,
@@ -219,6 +225,7 @@ const useSecureEnclaveEmbeddedWallet = () => {
         projectSettings,
         shouldInitRecovery,
         user$1,
+        addedWalletsIds,
     ]);
     /**
      * Creates or restores a secure enclave embedded wallet session

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

@@ -36,7 +36,7 @@ import { getEmbeddedWalletSessionExpiration } from '../../../functions/getEmbedd
 import '../../../../store/state/projectSettings/projectSettings.js';
 import '../../../../context/AccessDeniedContext/AccessDeniedContext.js';
 import '../../../../context/AccountExistsContext/AccountExistsContext.js';
-import '../../../../context/UserWalletsContext/UserWalletsContext.js';
+import { useInternalUserWallets } from '../../../../context/UserWalletsContext/UserWalletsContext.js';
 import { USER_NOT_LOGGED_IN, ACTIVE_SESSION, SESSION_RESTORED, INVALID_REQUEST, INVALID_WALLET_DATA, SESSION_CREATED, ERROR_SENDING_CODE, CODE_SENT } from '../../../constants/errors.js';
 import '../../../../context/VerificationContext/VerificationContext.js';
 import 'react-dom';
@@ -48,6 +48,7 @@ import { canRestoreEmbeddedWalletSession, restoreEmbeddedWalletSession } from '.
 import { validateTurnkeyProviderEnabled } from '../../../validations/validateTurnkeyProviderEnabled/validateTurnkeyProviderEnabled.js';
 import { usePasskeyRecovery } from '../../usePasskeyRecovery/usePasskeyRecovery.js';
 import { useSmartWallets } from '../../useSmartWallets/useSmartWallets.js';
+import { getNewVerifiedCredentialsFromDiff } from '../../../functions/getNewVerifiedCredentialsFromDiff/getNewVerifiedCredentialsFromDiff.js';
 import { EmbeddedWalletVersion, iframeContainerId, iframeElementId, revealIframeElementId, revealIframeContainerId } from './constants.js';
 import { useTurnkey } from './useTurnkey/useTurnkey.js';
 import '../../../../context/ThemeContext/ThemeContext.js';
@@ -131,6 +132,7 @@ const isConnectorSessionKeyActive = (connector) => {
 const useSecureEnclaveEmbeddedWallet = () => {
     var _a, _b, _c, _d;
     const { projectSettings, primaryWallet, user, environmentId, walletConnectorOptions, } = useInternalDynamicContext();
+    const { addedWalletsIds } = useInternalUserWallets();
     const { createTurnkeyWallet } = useTurnkey();
     const { hasRecoveryEmail } = useIsTurnkeyWallet();
     const { createRootElement } = useElementById();
@@ -203,10 +205,14 @@ const useSecureEnclaveEmbeddedWallet = () => {
         const signedRequest = yield ((_j = wallet === null || wallet === void 0 ? void 0 : wallet.connector) === null || _j === void 0 ? void 0 : _j.stampCreateWalletAccountRequest({
             request: requestToStamp,
         }));
-        yield createEmbeddedWalletAccount({
+        const verifiedUser = yield createEmbeddedWalletAccount({
             createEmbeddedWalletAccountRequest: signedRequest,
             environmentId,
         });
+        const newWalletIds = getNewVerifiedCredentialsFromDiff(user.verifiedCredentials, verifiedUser.user.verifiedCredentials)
+            .filter(({ format }) => format === JwtVerifiedCredentialFormatEnum.Blockchain)
+            .map(({ id }) => id);
+        addedWalletsIds.current = addedWalletsIds.current.concat(newWalletIds);
         return refreshUserJwt({ environmentId });
     }), [
         environmentId,
@@ -215,6 +221,7 @@ const useSecureEnclaveEmbeddedWallet = () => {
         projectSettings,
         shouldInitRecovery,
         user,
+        addedWalletsIds,
     ]);
     /**
      * Creates or restores a secure enclave embedded wallet session

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

@@ -41,13 +41,26 @@ const p256Keygen = () => _tslib.__awaiter(void 0, void 0, void 0, function* () {
     const compressedPublicKeyBuffer = compressRawPublicKey(rawPublicKey);
     const privateKeyBuffer = base64urlDecode(privateKeyJwk.d);
     return {
-        private: buf2hex(privateKeyBuffer),
+        private: buf2hex(privateKeyBuffer), // format for Turnkey API key stamper
+        privateJwk: privateKeyJwk, // format required for use in signing redcoast signatures
         public: buf2hex(compressedPublicKeyBuffer),
-        public_uncompressed: buf2hex(rawPublicKey),
+        publicUncompressed: buf2hex(rawPublicKey),
     };
 });
+const p256Sign = (privateKeyJwk, message) => _tslib.__awaiter(void 0, void 0, void 0, function* () {
+    const privateKey = yield crypto.subtle.importKey('jwk', privateKeyJwk, {
+        name: 'ECDSA',
+        namedCurve: 'P-256',
+    }, false, ['sign']);
+    const signature = yield crypto.subtle.sign({
+        hash: 'SHA-256',
+        name: 'ECDSA',
+    }, privateKey, new TextEncoder().encode(message));
+    return buf2hex(signature);
+});
 
 exports.base64urlDecode = base64urlDecode;
 exports.buf2hex = buf2hex;
 exports.compressRawPublicKey = compressRawPublicKey;
 exports.p256Keygen = p256Keygen;
+exports.p256Sign = p256Sign;

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

@@ -3,6 +3,8 @@ export declare const base64urlDecode: (s?: string) => Uint8Array;
 export declare const compressRawPublicKey: (rawPublicKey: ArrayBuffer) => ArrayBufferLike;
 export declare const p256Keygen: () => Promise<{
     private: string;
+    privateJwk: JsonWebKey;
     public: string;
-    public_uncompressed: string;
+    publicUncompressed: string;
 }>;
+export declare const p256Sign: (privateKeyJwk: JsonWebKey, message: string) => Promise<string>;

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

@@ -37,10 +37,22 @@ const p256Keygen = () => __awaiter(void 0, void 0, void 0, function* () {
     const compressedPublicKeyBuffer = compressRawPublicKey(rawPublicKey);
     const privateKeyBuffer = base64urlDecode(privateKeyJwk.d);
     return {
-        private: buf2hex(privateKeyBuffer),
+        private: buf2hex(privateKeyBuffer), // format for Turnkey API key stamper
+        privateJwk: privateKeyJwk, // format required for use in signing redcoast signatures
         public: buf2hex(compressedPublicKeyBuffer),
-        public_uncompressed: buf2hex(rawPublicKey),
+        publicUncompressed: buf2hex(rawPublicKey),
     };
 });
+const p256Sign = (privateKeyJwk, message) => __awaiter(void 0, void 0, void 0, function* () {
+    const privateKey = yield crypto.subtle.importKey('jwk', privateKeyJwk, {
+        name: 'ECDSA',
+        namedCurve: 'P-256',
+    }, false, ['sign']);
+    const signature = yield crypto.subtle.sign({
+        hash: 'SHA-256',
+        name: 'ECDSA',
+    }, privateKey, new TextEncoder().encode(message));
+    return buf2hex(signature);
+});
 
-export { base64urlDecode, buf2hex, compressRawPublicKey, p256Keygen };
+export { base64urlDecode, buf2hex, compressRawPublicKey, p256Keygen, p256Sign };

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

@@ -6,9 +6,9 @@ Object.defineProperty(exports, '__esModule', { value: true });
 var _tslib = require('../../../../../_virtual/_tslib.cjs');
 var React = require('react');
 var utils = require('@dynamic-labs/utils');
-var sessionStorage = require('../../constants/sessionStorage.cjs');
+var sdkApiCore = require('@dynamic-labs/sdk-api-core');
+var localStorage = require('../../constants/localStorage.cjs');
 var utils$1 = require('../useEmbeddedWallet/useSecureEnclaveEmbeddedWallet/utils.cjs');
-require('@dynamic-labs/sdk-api-core');
 require('../../../shared/logger.cjs');
 require('@dynamic-labs/iconic');
 require('@dynamic-labs/wallet-connector-core');
@@ -24,39 +24,95 @@ require('@dynamic-labs/multi-wallet');
 require('react-international-phone');
 require('../../../store/state/projectSettings/projectSettings.cjs');
 var embeddedWallets = require('../../../data/api/embeddedWallets/embeddedWallets.cjs');
-require('../../../store/state/user/user.cjs');
+var user = require('../../../store/state/user/user.cjs');
 require('../../../locale/locale.cjs');
+var dynamicEvents = require('../../../events/dynamicEvents.cjs');
 
-const useEmbeddedWalletSessionKeys = (environmentId) => {
+const useEmbeddedWalletSessionKeys = ({ environmentId, projectSettings, }) => {
+    const { user: user$1 } = user.useUser();
+    // scenario 1: first time session register on first transaction.
+    // Keys will have been previously generated at this point in local storage but marked as not registered
+    // scenario 2: 2nd time register after expiration (key refresh)
+    // scenario 3: refresh/rerender page - session still active
+    // scenario 4: refresh/rerender page - session no longer active
     const registerEmbeddedWalletSessionKey = (...args_1) => _tslib.__awaiter(void 0, [...args_1], void 0, function* ({ ignoreRestore = false, } = {}) {
         // check if session keys are already stored in session storage
-        const sessionKeysSS = utils.StorageService.getItem(sessionStorage.SECURE_ENCLAVE_WALLET_SESSION_KEYS, sessionStorage.SECURE_ENCLAVE_WALLET_SESSION_KEYS_STORAGE_OPTIONS);
-        if (sessionKeysSS && !ignoreRestore) {
-            const sessionKeysInSS = JSON.parse(Buffer.from(sessionKeysSS, 'base64').toString());
-            return sessionKeysInSS;
+        const sessionKeysSS = utils.StorageService.getItem(localStorage.SECURE_ENCLAVE_WALLET_SESSION_KEYS, localStorage.SECURE_ENCLAVE_WALLET_SESSION_KEYS_STORAGE_OPTIONS);
+        const decodedSessionKeys = sessionKeysSS
+            ? JSON.parse(Buffer.from(sessionKeysSS, 'base64').toString())
+            : undefined;
+        if (!decodedSessionKeys) {
+            dynamicEvents.dynamicEvents.emit('triggerLogout');
+            throw new Error('Could not find session keys. Re-authentication is required to create new session keys.');
         }
-        const { publicKey, privateKey } = yield generateSessionKey();
-        yield embeddedWallets.registerSessionKey({
-            environmentId,
-            publicKey,
-        });
-        return { privateKey, publicKey };
+        if (!user$1) {
+            throw new Error('User not found');
+        }
+        if (decodedSessionKeys.expirationDate &&
+            new Date() <= new Date(decodedSessionKeys.expirationDate) &&
+            !ignoreRestore) {
+            // scenario 3
+            return decodedSessionKeys;
+        }
+        let publicKey;
+        let privateKey;
+        let privateKeyJwk;
+        let prevSessionKeySignature = undefined;
+        if (!decodedSessionKeys.registered) {
+            // scenario 1
+            ({ publicKey, privateKey, privateKeyJwk } = decodedSessionKeys);
+        }
+        else {
+            // scenario 2 and 4
+            const { publicKey: nextPublicKey, privateKey: nextPrivateKey, privateKeyJwk: nextPrivateKeyJwk, } = yield generateSessionKey();
+            publicKey = nextPublicKey;
+            privateKey = nextPrivateKey;
+            privateKeyJwk = nextPrivateKeyJwk;
+            prevSessionKeySignature = yield utils$1.p256Sign(decodedSessionKeys.privateKeyJwk, user$1.sessionId);
+        }
+        let resp;
+        try {
+            resp = yield embeddedWallets.registerSessionKey({
+                environmentId,
+                prevSessionKeySignature,
+                publicKey,
+            });
+        }
+        catch (error) {
+            if (error instanceof utils.InvalidEmbeddedWalletSessionKeyError) {
+                // this can happen if the public key passed during initial registration
+                // does not match the root session public key that the backend expects
+                dynamicEvents.dynamicEvents.emit('triggerLogout');
+            }
+            throw error;
+        }
+        const expirationDate = new Date(resp.expiresAt * 1000);
+        utils.StorageService.setItem(localStorage.SECURE_ENCLAVE_WALLET_SESSION_KEYS, toEncodedFormat(publicKey, privateKey, privateKeyJwk, true, expirationDate), localStorage.SECURE_ENCLAVE_WALLET_SESSION_KEYS_STORAGE_OPTIONS);
+        return { expirationDate, privateKey, publicKey };
     });
     const generateSessionKey = () => _tslib.__awaiter(void 0, void 0, void 0, function* () {
-        const { private: privateKey, public: publicKey } = yield utils$1.p256Keygen();
+        const { private: privateKey, public: publicKey, privateJwk, } = yield utils$1.p256Keygen();
         // convert to base64 and store the session keys in session storage
-        const newSessionKeys = { privateKey, publicKey };
-        const sessionKeysString = JSON.stringify(newSessionKeys);
-        const sessionKeysBase64 = Buffer.from(sessionKeysString).toString('base64');
-        utils.StorageService.setItem(sessionStorage.SECURE_ENCLAVE_WALLET_SESSION_KEYS, sessionKeysBase64, sessionStorage.SECURE_ENCLAVE_WALLET_SESSION_KEYS_STORAGE_OPTIONS);
-        return { privateKey, publicKey };
+        utils.StorageService.setItem(localStorage.SECURE_ENCLAVE_WALLET_SESSION_KEYS, toEncodedFormat(publicKey, privateKey, privateJwk, false), localStorage.SECURE_ENCLAVE_WALLET_SESSION_KEYS_STORAGE_OPTIONS);
+        return { privateKey, privateKeyJwk: privateJwk, publicKey };
     });
-    const removeSessionKey = React.useCallback(() => utils.StorageService.removeItem(sessionStorage.SECURE_ENCLAVE_WALLET_SESSION_KEYS, sessionStorage.SECURE_ENCLAVE_WALLET_SESSION_KEYS_STORAGE_OPTIONS), []);
-    const shouldRegisterSessionKeysOnSignin = () => false;
-    // TODO: uncomment this once we actually implement and enforce session key chaining
-    // GVTY-2206
-    // projectSettings?.sdk?.embeddedWallets?.defaultWalletVersion ===
-    // EmbeddedWalletVersionEnum.V2;
+    const shouldRegisterSessionKeysOnSignin = () => {
+        var _a;
+        return ((_a = projectSettings === null || projectSettings === void 0 ? void 0 : projectSettings.sdk.embeddedWallets) === null || _a === void 0 ? void 0 : _a.defaultWalletVersion) ===
+            sdkApiCore.EmbeddedWalletVersionEnum.V2;
+    };
+    const toEncodedFormat = (publicKey, privateKey, privateKeyJwk, registered, expirationDate) => {
+        const sessionKeys = {
+            expirationDate,
+            privateKey,
+            privateKeyJwk,
+            publicKey,
+            registered,
+        };
+        const sessionKeysString = JSON.stringify(sessionKeys);
+        return Buffer.from(sessionKeysString).toString('base64');
+    };
+    const removeSessionKey = React.useCallback(() => utils.StorageService.removeItem(localStorage.SECURE_ENCLAVE_WALLET_SESSION_KEYS, localStorage.SECURE_ENCLAVE_WALLET_SESSION_KEYS_STORAGE_OPTIONS), []);
     return {
         generateSessionKey,
         registerEmbeddedWalletSessionKey,

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

@@ -1,11 +1,28 @@
-export declare const useEmbeddedWalletSessionKeys: (environmentId: string) => {
+import { ProjectSettings } from '@dynamic-labs/sdk-api-core';
+type SessionKey = {
+    publicKey: string;
+    privateKey: string;
+    privateKeyJwk: JsonWebKey;
+    registered: boolean;
+    expirationDate?: Date;
+};
+export declare const useEmbeddedWalletSessionKeys: ({ environmentId, projectSettings, }: {
+    environmentId: string;
+    projectSettings?: ProjectSettings;
+}) => {
     generateSessionKey: () => Promise<{
         privateKey: string;
+        privateKeyJwk: JsonWebKey;
         publicKey: string;
     }>;
     registerEmbeddedWalletSessionKey: ({ ignoreRestore, }?: {
         ignoreRestore?: boolean;
-    }) => Promise<any>;
+    }) => Promise<SessionKey | {
+        expirationDate: Date;
+        privateKey: string;
+        publicKey: string;
+    }>;
     removeSessionKey: () => void;
     shouldRegisterSessionKeysOnSignin: () => boolean;
 };
+export {};