@dynamic-labs/sdk-react-core 4.71.0 → 4.73.0

package/src/lib/utils/functions/clientSessionKeys/getClientSessionKeys.cjs

@@ -3,10 +3,8 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
-var _tslib = require('../../../../../_virtual/_tslib.cjs');
 var utils = require('@dynamic-labs/utils');
 var sessionStorage = require('../../constants/sessionStorage.cjs');
-var keyService = require('../keyService/keyService.cjs');
 require('@dynamic-labs/iconic');
 require('@dynamic-labs/wallet-connector-core');
 require('react');
@@ -18,21 +16,6 @@ require('../../constants/colors.cjs');
 require('../../constants/values.cjs');
 require('@dynamic-labs/sdk-api-core');
 require('../../../shared/consts/index.cjs');
-require('@dynamic-labs-sdk/client');
-require('@dynamic-labs-sdk/client/core');
-require('../../../client/client.cjs');
-require('../../../config/ApiEndpoint.cjs');
-require('@dynamic-labs/multi-wallet');
-require('react-international-phone');
-require('../../../store/state/nonce/nonce.cjs');
-require('../../../store/state/dynamicContextProps/dynamicContextProps.cjs');
-require('../../../store/state/primaryWalletId/primaryWalletId.cjs');
-require('../../../store/state/connectedWalletsInfo/connectedWalletsInfo.cjs');
-var constants = require('./constants.cjs');
-require('../getWaasAddressTypeLabel/getWaasAddressTypeLabel.cjs');
-require('../../../events/dynamicEvents.cjs');
-var utils$1 = require('../../../data/api/utils.cjs');
-require('@dynamic-labs/locale');
 
 const getClientSessionKeys = () => {
     const sessionKeysSS = utils.StorageService.getItem(sessionStorage.CLIENT_SESSION_KEYS, sessionStorage.CLIENT_SESSION_KEYS_STORAGE_OPTIONS);
@@ -41,70 +24,6 @@ const getClientSessionKeys = () => {
         : undefined;
     return decodedSessionKeys;
 };
-const generateKeyPair = () => _tslib.__awaiter(void 0, void 0, void 0, function* () {
-    const { private: privateKey, public: publicKey, privateJwk, } = yield keyService.p256Keygen();
-    // convert to base64 and store the session keys in session storage
-    utils.StorageService.setItem(sessionStorage.CLIENT_SESSION_KEYS, keyService.toEncodedFormat(publicKey, privateKey, privateJwk, false), sessionStorage.CLIENT_SESSION_KEYS_STORAGE_OPTIONS);
-    logger.logger.instrument('[SessionChaining] Generated new session key pair', {
-        key: 'generated_session_key_pair',
-        sessionPublicKey: publicKey,
-        time: 0,
-    });
-    utils.tracing.logEvent(constants.clientSessionKeyLogScope, 'Generated new session key pair', utils.tracing.formatObject({
-        publicKey,
-    }));
-    return { privateKey, privateKeyJwk: privateJwk, publicKey };
-});
-const generateSessionSignature = (_a) => _tslib.__awaiter(void 0, [_a], void 0, function* ({ privateKeyJwk, sessionId, }) { return keyService.p256Sign(privateKeyJwk, sessionId); });
-const generateNonceSignature = (_b) => _tslib.__awaiter(void 0, [_b], void 0, function* ({ privateKeyJwk, nonce, }) { return keyService.p256Sign(privateKeyJwk, nonce); });
-const generateClientSessionKeys = () => _tslib.__awaiter(void 0, void 0, void 0, function* () {
-    // check if session keys are already stored in session storage
-    const clientSessionKeysSS = getClientSessionKeys();
-    utils.tracing.logEvent(constants.clientSessionKeyLogScope, 'getClientSessionKeys', utils.tracing.formatObject({
-        hasDecodedSessionKeys: Boolean(clientSessionKeysSS),
-        publicKey: clientSessionKeysSS === null || clientSessionKeysSS === void 0 ? void 0 : clientSessionKeysSS.publicKey,
-    }));
-    let publicKey;
-    if (clientSessionKeysSS) {
-        ({ publicKey } = clientSessionKeysSS);
-    }
-    else {
-        ({ publicKey } = yield generateKeyPair());
-    }
-    return { publicKey };
-});
-const getClientSessionPublicKey = () => {
-    const clientSessionKeys = getClientSessionKeys();
-    return clientSessionKeys === null || clientSessionKeys === void 0 ? void 0 : clientSessionKeys.publicKey;
-};
-const getClientSessionSignature = (_c) => _tslib.__awaiter(void 0, [_c], void 0, function* ({ sessionId, }) {
-    const clientSessionKeys = getClientSessionKeys();
-    if (!clientSessionKeys) {
-        throw new Error('Client session keys not found');
-    }
-    const { publicKey, privateKeyJwk } = clientSessionKeys;
-    const sessionSignature = yield generateSessionSignature({
-        privateKeyJwk,
-        sessionId,
-    });
-    return { publicKey, sessionSignature };
-});
-const getClientSessionNonceSignature = (_d) => _tslib.__awaiter(void 0, [_d], void 0, function* ({ environmentId, }) {
-    const clientSessionKeys = getClientSessionKeys();
-    if (!clientSessionKeys) {
-        throw new Error('Client session keys not found');
-    }
-    const { publicKey, privateKeyJwk } = clientSessionKeys;
-    const nonce = yield utils$1.getNonce(environmentId);
-    if (!nonce) {
-        throw new Error('Nonce not found');
-    }
-    const nonceSignature = yield generateNonceSignature({
-        nonce,
-        privateKeyJwk,
-    });
-    return { nonce, nonceSignature, publicKey };
-});
 const clearClientSessionKeys = () => {
     const clientSessionKeys = getClientSessionKeys();
     logger.logger.instrument('[SessionChaining] Clearing client session keys', {
@@ -116,11 +35,4 @@ const clearClientSessionKeys = () => {
 };
 
 exports.clearClientSessionKeys = clearClientSessionKeys;
-exports.generateClientSessionKeys = generateClientSessionKeys;
-exports.generateKeyPair = generateKeyPair;
-exports.generateNonceSignature = generateNonceSignature;
-exports.generateSessionSignature = generateSessionSignature;
 exports.getClientSessionKeys = getClientSessionKeys;
-exports.getClientSessionNonceSignature = getClientSessionNonceSignature;
-exports.getClientSessionPublicKey = getClientSessionPublicKey;
-exports.getClientSessionSignature = getClientSessionSignature;

package/src/lib/utils/functions/clientSessionKeys/getClientSessionKeys.d.ts

@@ -1,29 +1,4 @@
 import { ClientSessionKey } from './types';
 export declare const getClientSessionKeys: () => ClientSessionKey | undefined;
-export declare const generateKeyPair: () => Promise<ClientSessionKey>;
-export declare const generateSessionSignature: ({ privateKeyJwk, sessionId, }: {
-    privateKeyJwk: JsonWebKey;
-    sessionId: string;
-}) => Promise<string>;
-export declare const generateNonceSignature: ({ privateKeyJwk, nonce, }: {
-    privateKeyJwk: JsonWebKey;
-    nonce: string;
-}) => Promise<string>;
-export declare const generateClientSessionKeys: () => Promise<{
-    publicKey: string;
-}>;
 export declare const getClientSessionPublicKey: () => string | undefined;
-export declare const getClientSessionSignature: ({ sessionId, }: {
-    sessionId: string;
-}) => Promise<{
-    publicKey: string;
-    sessionSignature: string;
-}>;
-export declare const getClientSessionNonceSignature: ({ environmentId, }: {
-    environmentId: string;
-}) => Promise<{
-    nonce: string;
-    nonceSignature: string;
-    publicKey: string;
-}>;
 export declare const clearClientSessionKeys: () => void;

package/src/lib/utils/functions/clientSessionKeys/getClientSessionKeys.js

@@ -1,8 +1,6 @@
 'use client'
-import { __awaiter } from '../../../../../_virtual/_tslib.js';
-import { StorageService, tracing } from '@dynamic-labs/utils';
+import { StorageService } from '@dynamic-labs/utils';
 import { CLIENT_SESSION_KEYS, CLIENT_SESSION_KEYS_STORAGE_OPTIONS } from '../../constants/sessionStorage.js';
-import { p256Keygen, toEncodedFormat, p256Sign } from '../keyService/keyService.js';
 import '@dynamic-labs/iconic';
 import '@dynamic-labs/wallet-connector-core';
 import 'react';
@@ -14,21 +12,6 @@ import '../../constants/colors.js';
 import '../../constants/values.js';
 import '@dynamic-labs/sdk-api-core';
 import '../../../shared/consts/index.js';
-import '@dynamic-labs-sdk/client';
-import '@dynamic-labs-sdk/client/core';
-import '../../../client/client.js';
-import '../../../config/ApiEndpoint.js';
-import '@dynamic-labs/multi-wallet';
-import 'react-international-phone';
-import '../../../store/state/nonce/nonce.js';
-import '../../../store/state/dynamicContextProps/dynamicContextProps.js';
-import '../../../store/state/primaryWalletId/primaryWalletId.js';
-import '../../../store/state/connectedWalletsInfo/connectedWalletsInfo.js';
-import { clientSessionKeyLogScope } from './constants.js';
-import '../getWaasAddressTypeLabel/getWaasAddressTypeLabel.js';
-import '../../../events/dynamicEvents.js';
-import { getNonce } from '../../../data/api/utils.js';
-import '@dynamic-labs/locale';
 
 const getClientSessionKeys = () => {
     const sessionKeysSS = StorageService.getItem(CLIENT_SESSION_KEYS, CLIENT_SESSION_KEYS_STORAGE_OPTIONS);
@@ -37,70 +20,6 @@ const getClientSessionKeys = () => {
         : undefined;
     return decodedSessionKeys;
 };
-const generateKeyPair = () => __awaiter(void 0, void 0, void 0, function* () {
-    const { private: privateKey, public: publicKey, privateJwk, } = yield p256Keygen();
-    // convert to base64 and store the session keys in session storage
-    StorageService.setItem(CLIENT_SESSION_KEYS, toEncodedFormat(publicKey, privateKey, privateJwk, false), CLIENT_SESSION_KEYS_STORAGE_OPTIONS);
-    logger.instrument('[SessionChaining] Generated new session key pair', {
-        key: 'generated_session_key_pair',
-        sessionPublicKey: publicKey,
-        time: 0,
-    });
-    tracing.logEvent(clientSessionKeyLogScope, 'Generated new session key pair', tracing.formatObject({
-        publicKey,
-    }));
-    return { privateKey, privateKeyJwk: privateJwk, publicKey };
-});
-const generateSessionSignature = (_a) => __awaiter(void 0, [_a], void 0, function* ({ privateKeyJwk, sessionId, }) { return p256Sign(privateKeyJwk, sessionId); });
-const generateNonceSignature = (_b) => __awaiter(void 0, [_b], void 0, function* ({ privateKeyJwk, nonce, }) { return p256Sign(privateKeyJwk, nonce); });
-const generateClientSessionKeys = () => __awaiter(void 0, void 0, void 0, function* () {
-    // check if session keys are already stored in session storage
-    const clientSessionKeysSS = getClientSessionKeys();
-    tracing.logEvent(clientSessionKeyLogScope, 'getClientSessionKeys', tracing.formatObject({
-        hasDecodedSessionKeys: Boolean(clientSessionKeysSS),
-        publicKey: clientSessionKeysSS === null || clientSessionKeysSS === void 0 ? void 0 : clientSessionKeysSS.publicKey,
-    }));
-    let publicKey;
-    if (clientSessionKeysSS) {
-        ({ publicKey } = clientSessionKeysSS);
-    }
-    else {
-        ({ publicKey } = yield generateKeyPair());
-    }
-    return { publicKey };
-});
-const getClientSessionPublicKey = () => {
-    const clientSessionKeys = getClientSessionKeys();
-    return clientSessionKeys === null || clientSessionKeys === void 0 ? void 0 : clientSessionKeys.publicKey;
-};
-const getClientSessionSignature = (_c) => __awaiter(void 0, [_c], void 0, function* ({ sessionId, }) {
-    const clientSessionKeys = getClientSessionKeys();
-    if (!clientSessionKeys) {
-        throw new Error('Client session keys not found');
-    }
-    const { publicKey, privateKeyJwk } = clientSessionKeys;
-    const sessionSignature = yield generateSessionSignature({
-        privateKeyJwk,
-        sessionId,
-    });
-    return { publicKey, sessionSignature };
-});
-const getClientSessionNonceSignature = (_d) => __awaiter(void 0, [_d], void 0, function* ({ environmentId, }) {
-    const clientSessionKeys = getClientSessionKeys();
-    if (!clientSessionKeys) {
-        throw new Error('Client session keys not found');
-    }
-    const { publicKey, privateKeyJwk } = clientSessionKeys;
-    const nonce = yield getNonce(environmentId);
-    if (!nonce) {
-        throw new Error('Nonce not found');
-    }
-    const nonceSignature = yield generateNonceSignature({
-        nonce,
-        privateKeyJwk,
-    });
-    return { nonce, nonceSignature, publicKey };
-});
 const clearClientSessionKeys = () => {
     const clientSessionKeys = getClientSessionKeys();
     logger.instrument('[SessionChaining] Clearing client session keys', {
@@ -111,4 +30,4 @@ const clearClientSessionKeys = () => {
     StorageService.removeItem(CLIENT_SESSION_KEYS, CLIENT_SESSION_KEYS_STORAGE_OPTIONS);
 };
 
-export { clearClientSessionKeys, generateClientSessionKeys, generateKeyPair, generateNonceSignature, generateSessionSignature, getClientSessionKeys, getClientSessionNonceSignature, getClientSessionPublicKey, getClientSessionSignature };
+export { clearClientSessionKeys, getClientSessionKeys };

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

@@ -74,7 +74,6 @@ export * from './getWalletUniqueId';
 export * from './openPopup';
 export * from './hasAllRequiredWalletsConnected';
 export * from './isZKSyncEnabled';
-export * from './clientSessionKeys';
 export * from './usingV3Wallets';
 export * from './isPasskeyProviderEnabled';
 export * from './exportWalletCredential';

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

@@ -35,7 +35,6 @@ require('@dynamic-labs/locale');
 require('../../../../store/state/dynamicContextProps/dynamicContextProps.cjs');
 require('../../../../store/state/primaryWalletId/primaryWalletId.cjs');
 require('../../../../store/state/connectedWalletsInfo/connectedWalletsInfo.cjs');
-var getClientSessionKeys = require('../../../functions/clientSessionKeys/getClientSessionKeys.cjs');
 require('../../../functions/getWaasAddressTypeLabel/getWaasAddressTypeLabel.cjs');
 var useHandleWalletsToConnect = require('../../useHandleWalletsToConnect/useHandleWalletsToConnect.cjs');
 var useVerifyWallet = require('../../useVerifyWallet/useVerifyWallet.cjs');
@@ -139,7 +138,6 @@ const useConnectAndSign = ({ shouldUpdateWallets = true, shouldCallCallback = tr
         else {
             walletUiUtils.disabledConfirmationOnce();
         }
-        yield getClientSessionKeys.generateClientSessionKeys();
         return verifyWallet({
             captchaToken,
             publicWalletAddress,

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

@@ -31,7 +31,6 @@ import '@dynamic-labs/locale';
 import '../../../../store/state/dynamicContextProps/dynamicContextProps.js';
 import '../../../../store/state/primaryWalletId/primaryWalletId.js';
 import '../../../../store/state/connectedWalletsInfo/connectedWalletsInfo.js';
-import { generateClientSessionKeys } from '../../../functions/clientSessionKeys/getClientSessionKeys.js';
 import '../../../functions/getWaasAddressTypeLabel/getWaasAddressTypeLabel.js';
 import { useHandleWalletsToConnect } from '../../useHandleWalletsToConnect/useHandleWalletsToConnect.js';
 import { useVerifyWallet } from '../../useVerifyWallet/useVerifyWallet.js';
@@ -135,7 +134,6 @@ const useConnectAndSign = ({ shouldUpdateWallets = true, shouldCallCallback = tr
         else {
             walletUiUtils.disabledConfirmationOnce();
         }
-        yield generateClientSessionKeys();
         return verifyWallet({
             captchaToken,
             publicWalletAddress,

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

@@ -35,7 +35,6 @@ require('@dynamic-labs/locale');
 require('../../../../store/state/dynamicContextProps/dynamicContextProps.cjs');
 require('../../../../store/state/primaryWalletId/primaryWalletId.cjs');
 require('../../../../store/state/connectedWalletsInfo/connectedWalletsInfo.cjs');
-var getClientSessionKeys = require('../../../functions/clientSessionKeys/getClientSessionKeys.cjs');
 require('../../../functions/getWaasAddressTypeLabel/getWaasAddressTypeLabel.cjs');
 var useHandleWalletsToConnect = require('../../useHandleWalletsToConnect/useHandleWalletsToConnect.cjs');
 var useVerifyWallet = require('../../useVerifyWallet/useVerifyWallet.cjs');
@@ -196,7 +195,6 @@ const useConnectAndSignSplitSteps = () => {
                 }
                 return pushView('network-not-supported');
             }
-            yield getClientSessionKeys.generateClientSessionKeys();
             yield verifyWallet({
                 captchaToken: getCaptchaToken(),
                 publicWalletAddress: connectionResult.address,

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

@@ -31,7 +31,6 @@ import '@dynamic-labs/locale';
 import '../../../../store/state/dynamicContextProps/dynamicContextProps.js';
 import '../../../../store/state/primaryWalletId/primaryWalletId.js';
 import '../../../../store/state/connectedWalletsInfo/connectedWalletsInfo.js';
-import { generateClientSessionKeys } from '../../../functions/clientSessionKeys/getClientSessionKeys.js';
 import '../../../functions/getWaasAddressTypeLabel/getWaasAddressTypeLabel.js';
 import { useHandleWalletsToConnect } from '../../useHandleWalletsToConnect/useHandleWalletsToConnect.js';
 import { useVerifyWallet } from '../../useVerifyWallet/useVerifyWallet.js';
@@ -192,7 +191,6 @@ const useConnectAndSignSplitSteps = () => {
                 }
                 return pushView('network-not-supported');
             }
-            yield generateClientSessionKeys();
             yield verifyWallet({
                 captchaToken: getCaptchaToken(),
                 publicWalletAddress: connectionResult.address,

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

@@ -32,7 +32,6 @@ require('@dynamic-labs/locale');
 require('../../../../store/state/dynamicContextProps/dynamicContextProps.cjs');
 require('../../../../store/state/primaryWalletId/primaryWalletId.cjs');
 require('../../../../store/state/connectedWalletsInfo/connectedWalletsInfo.cjs');
-var getClientSessionKeys = require('../../../functions/clientSessionKeys/getClientSessionKeys.cjs');
 require('../../../functions/getWaasAddressTypeLabel/getWaasAddressTypeLabel.cjs');
 var useVerifyWallet = require('../../useVerifyWallet/useVerifyWallet.cjs');
 require('../../../../store/state/authMode/authMode.cjs');
@@ -144,7 +143,6 @@ const useSignConnectOnlyUser = () => {
             if (!(connectionResult === null || connectionResult === void 0 ? void 0 : connectionResult.address)) {
                 return;
             }
-            yield getClientSessionKeys.generateClientSessionKeys();
             yield verifyWallet({
                 captchaToken: getCaptchaToken(),
                 publicWalletAddress: connectionResult.address,

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

@@ -28,7 +28,6 @@ import '@dynamic-labs/locale';
 import '../../../../store/state/dynamicContextProps/dynamicContextProps.js';
 import '../../../../store/state/primaryWalletId/primaryWalletId.js';
 import '../../../../store/state/connectedWalletsInfo/connectedWalletsInfo.js';
-import { generateClientSessionKeys } from '../../../functions/clientSessionKeys/getClientSessionKeys.js';
 import '../../../functions/getWaasAddressTypeLabel/getWaasAddressTypeLabel.js';
 import { useVerifyWallet } from '../../useVerifyWallet/useVerifyWallet.js';
 import '../../../../store/state/authMode/authMode.js';
@@ -140,7 +139,6 @@ const useSignConnectOnlyUser = () => {
             if (!(connectionResult === null || connectionResult === void 0 ? void 0 : connectionResult.address)) {
                 return;
             }
-            yield generateClientSessionKeys();
             yield verifyWallet({
                 captchaToken: getCaptchaToken(),
                 publicWalletAddress: connectionResult.address,

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

@@ -80,7 +80,6 @@ export { useDynamicWaas } from './useDynamicWaas';
 export { useSyncDynamicWaas } from './useSyncDynamicWaas';
 export { useExchangeAccounts } from './useExchangeAccounts';
 export { useConnectExchangeForFunding } from './useConnectExchangeForFunding';
-export { useClientSessionKeys } from './useClientSessionKeys';
 export { usePromptAmountAndFundWithExchange } from './usePromptAndFundWithExchange';
 export { usePayWithDynamic, type PayWithDynamicProps, } from './usePayWithDynamic';
 export { useSubmitExchangeFunding } from './useSubmitExchangeFunding';

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

@@ -36,6 +36,7 @@ var useUser = require('../../../client/extension/user/useUser/useUser.cjs');
 var useProjectSettings = require('../../../client/extension/projectSettings/useProjectSettings/useProjectSettings.cjs');
 var isCookieEnabled = require('../../../client/extension/functions/isCookieEnabled/isCookieEnabled.cjs');
 var getMinAuthToken = require('../../../client/extension/functions/getMinAuthToken/getMinAuthToken.cjs');
+var generateChainingSignature = require('../../../client/extension/functions/generateChainingSignature/generateChainingSignature.cjs');
 require('../../../context/DynamicContext/DynamicContext.cjs');
 require('../../../store/state/loadingAndLifecycle/loadingAndLifecycle.cjs');
 require('../../../context/CaptchaContext/CaptchaContext.cjs');
@@ -89,7 +90,6 @@ require('../../../context/WalletGroupContext/WalletGroupContext.cjs');
 require('../../../widgets/DynamicWidget/context/DynamicWidgetContext.cjs');
 var normalizeWaasChainName = require('./normalizeWaasChainName.cjs');
 var apiUrl = require('../../constants/waas/apiUrl.cjs');
-var useClientSessionKeys = require('../useClientSessionKeys/useClientSessionKeys.cjs');
 var useGetMfaToken = require('../useGetMfaToken/useGetMfaToken.cjs');
 var useGetWalletPassword = require('../useGetWalletPassword/useGetWalletPassword.cjs');
 var useRefreshAuth = require('../useRefreshAuth/useRefreshAuth.cjs');
@@ -183,7 +183,6 @@ const useDynamicWaas = () => {
     const svmGasSponsorshipEnabledRef = React.useRef(svmGasSponsorshipEnabled);
     svmGasSponsorshipEnabledRef.current = svmGasSponsorshipEnabled;
     const authToken = getMinAuthToken.getMinAuthToken();
-    const { getSignedSessionId } = useClientSessionKeys.useClientSessionKeys();
     const getMfaToken = useGetMfaToken.useGetMfaToken();
     const getWalletPassword = useGetWalletPassword.useGetWalletPassword();
     const getElevatedAccessToken = useGetElevatedAccessToken.useGetElevatedAccessToken();
@@ -210,7 +209,7 @@ const useDynamicWaas = () => {
             environmentId,
             getElevatedAccessToken,
             getMfaToken,
-            getSignedSessionId,
+            getSignedSessionId: generateChainingSignature.generateChainingSignature,
             getSvmGasSponsorshipEnabled: () => svmGasSponsorshipEnabledRef.current,
             getWalletPassword,
             relayUrl: relayUrl !== null && relayUrl !== void 0 ? relayUrl : '',
@@ -226,7 +225,6 @@ const useDynamicWaas = () => {
         getElevatedAccessToken,
         getMfaToken,
         getWalletPassword,
-        getSignedSessionId,
         relayUrl,
         baseClientKeysharesRelayApiUrl,
     ]);
@@ -303,7 +301,7 @@ const useDynamicWaas = () => {
                                     walletAddress: wallet.address,
                                 });
                                 const keyshareRestorationStart = new Date().getTime();
-                                const signedSessionId = yield getSignedSessionId();
+                                const signedSessionId = yield generateChainingSignature.generateChainingSignature();
                                 yield client.getWallet({
                                     accountAddress: wallet.address,
                                     authToken: getMinAuthToken.getMinAuthToken(),
@@ -361,13 +359,7 @@ const useDynamicWaas = () => {
                 userId: user.id,
             });
         }
-    }), [
-        enabledChainNames,
-        getSignedSessionId,
-        getWaasWalletConnector,
-        shouldInitializeWaas,
-        user,
-    ]);
+    }), [enabledChainNames, getWaasWalletConnector, shouldInitializeWaas, user]);
     // If no chain names are provided, filter out chains that already have a wallet
     // and make a wallet for each enabled chain
     const createWalletAccount = React.useCallback((requirementsOrChainNames, password, bitcoinConfig, options) => _tslib.__awaiter(void 0, void 0, void 0, function* () {

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

@@ -32,6 +32,7 @@ import { useUser } from '../../../client/extension/user/useUser/useUser.js';
 import { useProjectSettings } from '../../../client/extension/projectSettings/useProjectSettings/useProjectSettings.js';
 import { isCookieEnabled } from '../../../client/extension/functions/isCookieEnabled/isCookieEnabled.js';
 import { getMinAuthToken } from '../../../client/extension/functions/getMinAuthToken/getMinAuthToken.js';
+import { generateChainingSignature } from '../../../client/extension/functions/generateChainingSignature/generateChainingSignature.js';
 import '../../../context/DynamicContext/DynamicContext.js';
 import '../../../store/state/loadingAndLifecycle/loadingAndLifecycle.js';
 import '../../../context/CaptchaContext/CaptchaContext.js';
@@ -85,7 +86,6 @@ import '../../../context/WalletGroupContext/WalletGroupContext.js';
 import '../../../widgets/DynamicWidget/context/DynamicWidgetContext.js';
 import { normalizeWaasChainName } from './normalizeWaasChainName.js';
 import { DEFAULT_WAAS_API_URL } from '../../constants/waas/apiUrl.js';
-import { useClientSessionKeys } from '../useClientSessionKeys/useClientSessionKeys.js';
 import { useGetMfaToken } from '../useGetMfaToken/useGetMfaToken.js';
 import { useGetWalletPassword } from '../useGetWalletPassword/useGetWalletPassword.js';
 import { useRefreshAuth } from '../useRefreshAuth/useRefreshAuth.js';
@@ -179,7 +179,6 @@ const useDynamicWaas = () => {
     const svmGasSponsorshipEnabledRef = useRef(svmGasSponsorshipEnabled);
     svmGasSponsorshipEnabledRef.current = svmGasSponsorshipEnabled;
     const authToken = getMinAuthToken();
-    const { getSignedSessionId } = useClientSessionKeys();
     const getMfaToken = useGetMfaToken();
     const getWalletPassword = useGetWalletPassword();
     const getElevatedAccessToken = useGetElevatedAccessToken();
@@ -206,7 +205,7 @@ const useDynamicWaas = () => {
             environmentId,
             getElevatedAccessToken,
             getMfaToken,
-            getSignedSessionId,
+            getSignedSessionId: generateChainingSignature,
             getSvmGasSponsorshipEnabled: () => svmGasSponsorshipEnabledRef.current,
             getWalletPassword,
             relayUrl: relayUrl !== null && relayUrl !== void 0 ? relayUrl : '',
@@ -222,7 +221,6 @@ const useDynamicWaas = () => {
         getElevatedAccessToken,
         getMfaToken,
         getWalletPassword,
-        getSignedSessionId,
         relayUrl,
         baseClientKeysharesRelayApiUrl,
     ]);
@@ -299,7 +297,7 @@ const useDynamicWaas = () => {
                                     walletAddress: wallet.address,
                                 });
                                 const keyshareRestorationStart = new Date().getTime();
-                                const signedSessionId = yield getSignedSessionId();
+                                const signedSessionId = yield generateChainingSignature();
                                 yield client.getWallet({
                                     accountAddress: wallet.address,
                                     authToken: getMinAuthToken(),
@@ -357,13 +355,7 @@ const useDynamicWaas = () => {
                 userId: user.id,
             });
         }
-    }), [
-        enabledChainNames,
-        getSignedSessionId,
-        getWaasWalletConnector,
-        shouldInitializeWaas,
-        user,
-    ]);
+    }), [enabledChainNames, getWaasWalletConnector, shouldInitializeWaas, user]);
     // If no chain names are provided, filter out chains that already have a wallet
     // and make a wallet for each enabled chain
     const createWalletAccount = useCallback((requirementsOrChainNames, password, bitcoinConfig, options) => __awaiter(void 0, void 0, void 0, function* () {

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

@@ -29,10 +29,10 @@ require('@dynamic-labs/locale');
 require('../../../store/state/dynamicContextProps/dynamicContextProps.cjs');
 require('../../../store/state/primaryWalletId/primaryWalletId.cjs');
 require('../../../store/state/connectedWalletsInfo/connectedWalletsInfo.cjs');
-var keyService = require('../../functions/keyService/keyService.cjs');
 require('../../functions/getWaasAddressTypeLabel/getWaasAddressTypeLabel.cjs');
 var dynamicEvents = require('../../../events/dynamicEvents.cjs');
 var useOnboardingCompleteUser = require('../../../client/extension/user/useOnboardingCompleteUser/useOnboardingCompleteUser.cjs');
+var keyService = require('../../functions/keyService/keyService.cjs');
 var getTurnkeyWalletId = require('../../functions/getTurnkeyWalletId/getTurnkeyWalletId.cjs');
 var embeddedWalletSessionKeysUtils = require('../../functions/embeddedWalletSessionKeysUtils/embeddedWalletSessionKeysUtils.cjs');
 

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

@@ -25,10 +25,10 @@ import '@dynamic-labs/locale';
 import '../../../store/state/dynamicContextProps/dynamicContextProps.js';
 import '../../../store/state/primaryWalletId/primaryWalletId.js';
 import '../../../store/state/connectedWalletsInfo/connectedWalletsInfo.js';
-import { toEncodedFormat, p256Sign } from '../../functions/keyService/keyService.js';
 import '../../functions/getWaasAddressTypeLabel/getWaasAddressTypeLabel.js';
 import { dynamicEvents } from '../../../events/dynamicEvents.js';
 import { useOnboardingCompleteUserProfile } from '../../../client/extension/user/useOnboardingCompleteUser/useOnboardingCompleteUser.js';
+import { toEncodedFormat, p256Sign } from '../../functions/keyService/keyService.js';
 import { getTurnkeyWalletId } from '../../functions/getTurnkeyWalletId/getTurnkeyWalletId.js';
 import { generateAndSaveSessionKey, generateSessionKey } from '../../functions/embeddedWalletSessionKeysUtils/embeddedWalletSessionKeysUtils.js';
 

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

@@ -6,7 +6,6 @@ Object.defineProperty(exports, '__esModule', { value: true });
 var _tslib = require('../../../../../_virtual/_tslib.cjs');
 var React = require('react');
 var client = require('@dynamic-labs-sdk/client');
-var getClientSessionKeys = require('../../functions/clientSessionKeys/getClientSessionKeys.cjs');
 require('../../../context/DynamicContext/DynamicContext.cjs');
 require('../../../store/state/loadingAndLifecycle/loadingAndLifecycle.cjs');
 require('@dynamic-labs/iconic');
@@ -31,6 +30,7 @@ require('@dynamic-labs-sdk/client/core');
 require('../../../client/client.cjs');
 require('../../../config/ApiEndpoint.cjs');
 var convertSdkUserToUserProfile = require('../../../client/extension/user/convertSdkUserToUserProfile/convertSdkUserToUserProfile.cjs');
+var generateSessionKeys = require('../../../client/extension/functions/generateSessionKeys/generateSessionKeys.cjs');
 require('@dynamic-labs/locale');
 require('../../../store/state/dynamicContextProps/dynamicContextProps.cjs');
 require('../../../store/state/primaryWalletId/primaryWalletId.cjs');
@@ -134,7 +134,7 @@ const useExternalAuth = () => {
             const sessionPublicKey = shouldRegisterSessionKeysOnSignin()
                 ? (yield generateSessionKey()).publicKey
                 : undefined;
-            yield getClientSessionKeys.generateClientSessionKeys();
+            yield generateSessionKeys.generateSessionKeys();
             const response = yield client.signInWithExternalJwt({
                 externalJwt,
                 sessionPublicKey,

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

@@ -2,7 +2,6 @@
 import { __awaiter } from '../../../../../_virtual/_tslib.js';
 import { useCallback, useMemo } from 'react';
 import { signInWithExternalJwt, requestExternalAuthElevatedToken } from '@dynamic-labs-sdk/client';
-import { generateClientSessionKeys } from '../../functions/clientSessionKeys/getClientSessionKeys.js';
 import '../../../context/DynamicContext/DynamicContext.js';
 import '../../../store/state/loadingAndLifecycle/loadingAndLifecycle.js';
 import '@dynamic-labs/iconic';
@@ -27,6 +26,7 @@ import '@dynamic-labs-sdk/client/core';
 import '../../../client/client.js';
 import '../../../config/ApiEndpoint.js';
 import { convertSdkUserToUserProfile } from '../../../client/extension/user/convertSdkUserToUserProfile/convertSdkUserToUserProfile.js';
+import { generateSessionKeys } from '../../../client/extension/functions/generateSessionKeys/generateSessionKeys.js';
 import '@dynamic-labs/locale';
 import '../../../store/state/dynamicContextProps/dynamicContextProps.js';
 import '../../../store/state/primaryWalletId/primaryWalletId.js';
@@ -130,7 +130,7 @@ const useExternalAuth = () => {
             const sessionPublicKey = shouldRegisterSessionKeysOnSignin()
                 ? (yield generateSessionKey()).publicKey
                 : undefined;
-            yield generateClientSessionKeys();
+            yield generateSessionKeys();
             const response = yield signInWithExternalJwt({
                 externalJwt,
                 sessionPublicKey,

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

@@ -30,6 +30,7 @@ require('../../../client/client.cjs');
 require('@dynamic-labs-sdk/client');
 require('../../../config/ApiEndpoint.cjs');
 var isCookieEnabled = require('../../../client/extension/functions/isCookieEnabled/isCookieEnabled.cjs');
+var generateChainingSignature = require('../../../client/extension/functions/generateChainingSignature/generateChainingSignature.cjs');
 require('@dynamic-labs/locale');
 var dynamicContextProps = require('../../../store/state/dynamicContextProps/dynamicContextProps.cjs');
 require('../../../store/state/primaryWalletId/primaryWalletId.cjs');
@@ -111,13 +112,11 @@ var useGetMfaToken = require('../useGetMfaToken/useGetMfaToken.cjs');
 require('../../../store/state/tokenBalances.cjs');
 require('../../../store/state/multichainBalances.cjs');
 require('../../../shared/utils/functions/getInitialUrl/getInitialUrl.cjs');
-var useClientSessionKeys = require('../useClientSessionKeys/useClientSessionKeys.cjs');
 
 const useSetWalletConnectorFetchers = (walletOptions, environmentId, projectSettings) => {
     var _a, _b, _c;
     const apiBaseUrl = dynamicContextProps.useApiBaseUrl();
     const { registerEmbeddedWalletSessionKey, removeSessionKey } = useEmbeddedWalletSessionKeys.useEmbeddedWalletSessionKeys({ environmentId, projectSettings });
-    const { getSignedSessionId } = useClientSessionKeys.useClientSessionKeys();
     const getMfaToken = useGetMfaToken.useGetMfaToken();
     const isCookieAuthEnabled = projectSettings && isCookieEnabled.isCookieEnabled();
     const svmGasSponsorshipEnabled = (_c = (_b = (_a = projectSettings === null || projectSettings === void 0 ? void 0 : projectSettings.sdk) === null || _a === void 0 ? void 0 : _a.embeddedWallets) === null || _b === void 0 ? void 0 : _b.svmGasSponsorshipEnabled) !== null && _c !== void 0 ? _c : false;
@@ -137,7 +136,7 @@ const useSetWalletConnectorFetchers = (walletOptions, environmentId, projectSett
                 authMode: isCookieAuthEnabled ? 'cookie' : 'header',
                 environmentId,
                 getMfaToken,
-                getSignedSessionId,
+                getSignedSessionId: generateChainingSignature.generateChainingSignature,
                 getSvmGasSponsorshipEnabled: () => svmGasSponsorshipEnabledRef.current,
                 relayUrl: (_e = (_d = (_c = projectSettings === null || projectSettings === void 0 ? void 0 : projectSettings.sdk) === null || _c === void 0 ? void 0 : _c.waas) === null || _d === void 0 ? void 0 : _d.relayUrl) !== null && _e !== void 0 ? _e : '',
                 walletConnector: walletOption.walletConnector,