@dynamic-labs/sdk-react-core 3.0.0-alpha.51 → 3.0.0-alpha.53

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

@@ -3,7 +3,6 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
-const MISSING_ADDRESS_ERROR = 'missing_address';
 // HEADLESS ERRORS
 const ACTIVE_SESSION = 'session_active';
 const ERROR_SENDING_CODE = 'error_sending_code';
@@ -24,7 +23,6 @@ exports.ERROR_PROCESSING_REVEAL_REQUEST = ERROR_PROCESSING_REVEAL_REQUEST;
 exports.ERROR_SENDING_CODE = ERROR_SENDING_CODE;
 exports.INVALID_REQUEST = INVALID_REQUEST;
 exports.INVALID_WALLET_DATA = INVALID_WALLET_DATA;
-exports.MISSING_ADDRESS_ERROR = MISSING_ADDRESS_ERROR;
 exports.SECURE_ENCLAVE_PROVIDER_NOT_ENABLED = SECURE_ENCLAVE_PROVIDER_NOT_ENABLED;
 exports.SESSION_CREATED = SESSION_CREATED;
 exports.SESSION_RESTORED = SESSION_RESTORED;

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

@@ -1,5 +1,4 @@
 'use client'
-const MISSING_ADDRESS_ERROR = 'missing_address';
 // HEADLESS ERRORS
 const ACTIVE_SESSION = 'session_active';
 const ERROR_SENDING_CODE = 'error_sending_code';
@@ -13,4 +12,4 @@ const SESSION_CREATED = 'session_created';
 const SESSION_RESTORED = 'session_restored';
 const ACCESS_BLOCKED_ERROR_CODE = 451;
 
-export { ACCESS_BLOCKED_ERROR_CODE, ACTIVE_SESSION, CODE_SENT, ERROR_PROCESSING_REVEAL_REQUEST, ERROR_SENDING_CODE, INVALID_REQUEST, INVALID_WALLET_DATA, MISSING_ADDRESS_ERROR, SECURE_ENCLAVE_PROVIDER_NOT_ENABLED, SESSION_CREATED, SESSION_RESTORED, USER_NOT_LOGGED_IN };
+export { ACCESS_BLOCKED_ERROR_CODE, ACTIVE_SESSION, CODE_SENT, ERROR_PROCESSING_REVEAL_REQUEST, ERROR_SENDING_CODE, INVALID_REQUEST, INVALID_WALLET_DATA, SECURE_ENCLAVE_PROVIDER_NOT_ENABLED, SESSION_CREATED, SESSION_RESTORED, USER_NOT_LOGGED_IN };

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

@@ -1,10 +1,10 @@
 import { ChainConfiguration, JwtVerifiedCredential } from '@dynamic-labs/sdk-api-core';
-import { WalletConnector } from '@dynamic-labs/wallet-connector-core';
+import { InternalWalletConnector } from '@dynamic-labs/wallet-connector-core';
 import { WalletOption } from '../../../shared';
 export declare const findTurnkeyWalletByChain: (walletOptions: WalletOption[] | undefined, chainName: string | undefined) => WalletOption | undefined;
 type FindTurnkeyWalletByChainResult = (JwtVerifiedCredential & WalletOption) | WalletOption | undefined;
 export declare const findTurnkeyWalletByPrimaryChain: (walletOptions: WalletOption[] | undefined, chainConfigurations: ChainConfiguration[] | undefined, verifiedCredentials: JwtVerifiedCredential[]) => FindTurnkeyWalletByChainResult;
 export declare const findTurnkeyWalletByAddress: (walletOptions: WalletOption[] | undefined, verifiedCredentials: JwtVerifiedCredential[], address: string | undefined) => (JwtVerifiedCredential & {
-    walletConnector?: WalletConnector;
+    walletConnector?: InternalWalletConnector;
 }) | undefined;
 export {};

package/src/lib/utils/{hooks/useWalletConnectors/utils/findWallet/findWallet.cjs → functions/findWalletOptionFor/findWalletOptionFor.cjs}

@@ -3,9 +3,9 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
-var values = require('../../../../constants/values.cjs');
+var values = require('../../constants/values.cjs');
 
-const findWallet = (account, walletOptions) => {
+const findWalletOptionFor = (account, walletOptions) => {
     var _a;
     const walletKey = account.walletName;
     if (walletKey === 'turnkeyhd') {
@@ -20,4 +20,4 @@ const findWallet = (account, walletOptions) => {
     return ((_a = walletOptions.find((wallet) => walletKey === wallet.key)) !== null && _a !== void 0 ? _a : walletOptions.find((wallet) => wallet.key === 'fallbackconnector'));
 };
 
-exports.findWallet = findWallet;
+exports.findWalletOptionFor = findWalletOptionFor;

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

@@ -0,0 +1,3 @@
+import { JwtVerifiedCredential } from '@dynamic-labs/sdk-api-core';
+import { WalletOption } from '../../../shared/types/wallets';
+export declare const findWalletOptionFor: (account: JwtVerifiedCredential, walletOptions: WalletOption[]) => WalletOption | undefined;

package/src/lib/utils/{hooks/useWalletConnectors/utils/findWallet/findWallet.js → functions/findWalletOptionFor/findWalletOptionFor.js}

@@ -1,7 +1,7 @@
 'use client'
-import { VerifiedCredentialNameToChainEnum } from '../../../../constants/values.js';
+import { VerifiedCredentialNameToChainEnum } from '../../constants/values.js';
 
-const findWallet = (account, walletOptions) => {
+const findWalletOptionFor = (account, walletOptions) => {
     var _a;
     const walletKey = account.walletName;
     if (walletKey === 'turnkeyhd') {
@@ -16,4 +16,4 @@ const findWallet = (account, walletOptions) => {
     return ((_a = walletOptions.find((wallet) => walletKey === wallet.key)) !== null && _a !== void 0 ? _a : walletOptions.find((wallet) => wallet.key === 'fallbackconnector'));
 };
 
-export { findWallet };
+export { findWalletOptionFor };

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

@@ -0,0 +1 @@
+export * from './findWalletOptionFor';

package/src/lib/utils/functions/generateMessages/index.cjs

@@ -23,6 +23,7 @@ const generateMessages = (publicWalletAddress, walletConnector, nonce, projectEn
             chainId = 1;
         }
     }
+    const parsedAddress = walletConnector.parseAddress(publicWalletAddress);
     const messageToSign = multiWallet.generateMessageToSign({
         blockchain: walletConnector.connectedChain,
         chainId: chainId,
@@ -31,7 +32,7 @@ const generateMessages = (publicWalletAddress, walletConnector, nonce, projectEn
         // The SIWE parser library used to validate signed messages for EVM/Ethereum
         // checks that an address is in EIP55 format, so make sure we do that here.
         // see: https://eips.ethereum.org/EIPS/eip-55
-        publicKey: walletConnector.parseAddress(publicWalletAddress),
+        publicKey: parsedAddress,
         requestId: projectEnvironmentId,
         resources: walletConnector.providerResources,
         statement: displaySiweStatement
@@ -39,7 +40,7 @@ const generateMessages = (publicWalletAddress, walletConnector, nonce, projectEn
             : undefined,
         uri: window.location.href,
     });
-    const signedMessage = yield walletConnector.proveOwnership(messageToSign);
+    const signedMessage = yield walletConnector.proveOwnership(parsedAddress, messageToSign);
     if (!signedMessage) {
         throw new utils.DynamicError('Unable to sign the message');
     }

package/src/lib/utils/functions/generateMessages/index.js

@@ -19,6 +19,7 @@ const generateMessages = (publicWalletAddress, walletConnector, nonce, projectEn
             chainId = 1;
         }
     }
+    const parsedAddress = walletConnector.parseAddress(publicWalletAddress);
     const messageToSign = generateMessageToSign({
         blockchain: walletConnector.connectedChain,
         chainId: chainId,
@@ -27,7 +28,7 @@ const generateMessages = (publicWalletAddress, walletConnector, nonce, projectEn
         // The SIWE parser library used to validate signed messages for EVM/Ethereum
         // checks that an address is in EIP55 format, so make sure we do that here.
         // see: https://eips.ethereum.org/EIPS/eip-55
-        publicKey: walletConnector.parseAddress(publicWalletAddress),
+        publicKey: parsedAddress,
         requestId: projectEnvironmentId,
         resources: walletConnector.providerResources,
         statement: displaySiweStatement
@@ -35,7 +36,7 @@ const generateMessages = (publicWalletAddress, walletConnector, nonce, projectEn
             : undefined,
         uri: window.location.href,
     });
-    const signedMessage = yield walletConnector.proveOwnership(messageToSign);
+    const signedMessage = yield walletConnector.proveOwnership(parsedAddress, messageToSign);
     if (!signedMessage) {
         throw new DynamicError('Unable to sign the message');
     }

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

@@ -1,2 +1,2 @@
-import { WalletConnectorCore } from '@dynamic-labs/wallet-connector-core';
-export declare const getEmbeddedWalletAuthHandler: (walletConnector: WalletConnectorCore.WalletConnector | undefined) => import("@dynamic-labs/wallet-connector-core").AuthenticatorRecoveryHandler;
+import { WalletConnector } from '@dynamic-labs/wallet-connector-core';
+export declare const getEmbeddedWalletAuthHandler: (walletConnector: WalletConnector | undefined) => import("@dynamic-labs/wallet-connector-core").AuthenticatorRecoveryHandler;

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

@@ -4,13 +4,13 @@
 Object.defineProperty(exports, '__esModule', { value: true });
 
 var sdkApiCore = require('@dynamic-labs/sdk-api-core');
-require('@dynamic-labs/wallet-connector-core');
 require('../../constants/values.cjs');
 require('@dynamic-labs/utils');
 require('../../../../../_virtual/_tslib.cjs');
 require('@dynamic-labs/multi-wallet');
 require('../../../shared/logger.cjs');
 require('@dynamic-labs/iconic');
+require('@dynamic-labs/wallet-connector-core');
 require('react/jsx-runtime');
 require('../../../context/ViewContext/ViewContext.cjs');
 require('react');

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

@@ -1,12 +1,12 @@
 'use client'
 import { ProviderEnum } from '@dynamic-labs/sdk-api-core';
-import '@dynamic-labs/wallet-connector-core';
 import '../../constants/values.js';
 import '@dynamic-labs/utils';
 import '../../../../../_virtual/_tslib.js';
 import '@dynamic-labs/multi-wallet';
 import '../../../shared/logger.js';
 import '@dynamic-labs/iconic';
+import '@dynamic-labs/wallet-connector-core';
 import 'react/jsx-runtime';
 import '../../../context/ViewContext/ViewContext.js';
 import 'react';

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

@@ -3,7 +3,6 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
-require('@dynamic-labs/wallet-connector-core');
 require('@dynamic-labs/sdk-api-core');
 require('../../constants/values.cjs');
 require('@dynamic-labs/utils');
@@ -12,6 +11,7 @@ require('@dynamic-labs/multi-wallet');
 var getActiveOauthCredential = require('../getActiveOauthCredential/getActiveOauthCredential.cjs');
 require('../../../shared/logger.cjs');
 require('@dynamic-labs/iconic');
+require('@dynamic-labs/wallet-connector-core');
 require('react/jsx-runtime');
 require('../../../context/ViewContext/ViewContext.cjs');
 require('react');

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

@@ -1,5 +1,4 @@
 'use client'
-import '@dynamic-labs/wallet-connector-core';
 import '@dynamic-labs/sdk-api-core';
 import '../../constants/values.js';
 import '@dynamic-labs/utils';
@@ -8,6 +7,7 @@ import '@dynamic-labs/multi-wallet';
 import { getActiveOauthCredential } from '../getActiveOauthCredential/getActiveOauthCredential.js';
 import '../../../shared/logger.js';
 import '@dynamic-labs/iconic';
+import '@dynamic-labs/wallet-connector-core';
 import 'react/jsx-runtime';
 import '../../../context/ViewContext/ViewContext.js';
 import 'react';

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

@@ -1,6 +1,5 @@
-import { GetAddressOpts } from '@dynamic-labs/wallet-connector-core';
+import { GetAddressOpts, WalletConnector } from '@dynamic-labs/wallet-connector-core';
 import { WalletAdditionalAddress } from '@dynamic-labs/sdk-api-core';
-import { WalletConnector } from '../../../..';
 import { WalletProvider } from '../../../shared';
 export type GetVerifyArgsProps = {
     displaySiweStatement: boolean;

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

@@ -1,2 +1,2 @@
-import { WalletConnector, Wallet } from '@dynamic-labs/wallet-connector-core';
-export declare const getWalletConnectorForWallet: (wallet: Wallet | null) => WalletConnector | undefined;
+import { InternalWalletConnector, Wallet } from '@dynamic-labs/wallet-connector-core';
+export declare const getWalletConnectorForWallet: (wallet: Wallet | null) => InternalWalletConnector | undefined;

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

@@ -1,4 +1,3 @@
-export * from './createOwnerWallet';
 export * from './createUserProfile';
 export * from './digestSHA256';
 export * from './encodeBase64URL';
@@ -59,7 +58,6 @@ export * from './stringifyURIQuery';
 export * from './getEnabledEmbeddedWalletsAuthenticators';
 export * from './getWalletAdditionalAddressByType';
 export * from './isHardwareWalletEnabled';
-export * from './getEOAWallet';
 export * from './findCoinbaseMPCWallet';
 export * from './requiresPasswordForEmbeddedWallet';
 export * from './requiresPasswordForEmbeddedWalletOnSignup';

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

@@ -1,2 +1,2 @@
 import { Wallet } from '../../../shared';
-export declare const isAccountAbstractionWallet: (wallet: Wallet | unknown) => wallet is Wallet;
+export declare const isAccountAbstractionWallet: (wallet: Wallet | unknown) => wallet is Wallet<import("@dynamic-labs/wallet-connector-core").WalletConnectorCore.WalletConnector>;

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

@@ -3,7 +3,6 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
-require('@dynamic-labs/wallet-connector-core');
 require('@dynamic-labs/sdk-api-core');
 require('../../constants/values.cjs');
 require('@dynamic-labs/utils');
@@ -11,6 +10,7 @@ require('../../../../../_virtual/_tslib.cjs');
 require('@dynamic-labs/multi-wallet');
 require('../../../shared/logger.cjs');
 require('@dynamic-labs/iconic');
+require('@dynamic-labs/wallet-connector-core');
 require('react/jsx-runtime');
 require('../../../context/ViewContext/ViewContext.cjs');
 require('react');

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

@@ -1,5 +1,4 @@
 'use client'
-import '@dynamic-labs/wallet-connector-core';
 import '@dynamic-labs/sdk-api-core';
 import '../../constants/values.js';
 import '@dynamic-labs/utils';
@@ -7,6 +6,7 @@ import '../../../../../_virtual/_tslib.js';
 import '@dynamic-labs/multi-wallet';
 import '../../../shared/logger.js';
 import '@dynamic-labs/iconic';
+import '@dynamic-labs/wallet-connector-core';
 import 'react/jsx-runtime';
 import '../../../context/ViewContext/ViewContext.js';
 import 'react';

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

@@ -4,13 +4,13 @@
 Object.defineProperty(exports, '__esModule', { value: true });
 
 var sdkApiCore = require('@dynamic-labs/sdk-api-core');
-require('@dynamic-labs/wallet-connector-core');
 require('../../constants/values.cjs');
 require('@dynamic-labs/utils');
 require('../../../../../_virtual/_tslib.cjs');
 require('@dynamic-labs/multi-wallet');
 require('../../../shared/logger.cjs');
 require('@dynamic-labs/iconic');
+require('@dynamic-labs/wallet-connector-core');
 require('react/jsx-runtime');
 require('../../../context/ViewContext/ViewContext.cjs');
 require('react');

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

@@ -1,12 +1,12 @@
 'use client'
 import { ProviderEnum } from '@dynamic-labs/sdk-api-core';
-import '@dynamic-labs/wallet-connector-core';
 import '../../constants/values.js';
 import '@dynamic-labs/utils';
 import '../../../../../_virtual/_tslib.js';
 import '@dynamic-labs/multi-wallet';
 import '../../../shared/logger.js';
 import '@dynamic-labs/iconic';
+import '@dynamic-labs/wallet-connector-core';
 import 'react/jsx-runtime';
 import '../../../context/ViewContext/ViewContext.js';
 import 'react';

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

@@ -3,7 +3,6 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
-require('@dynamic-labs/wallet-connector-core');
 require('@dynamic-labs/sdk-api-core');
 require('../../constants/values.cjs');
 require('@dynamic-labs/utils');
@@ -11,6 +10,7 @@ require('../../../../../_virtual/_tslib.cjs');
 require('@dynamic-labs/multi-wallet');
 require('../../../shared/logger.cjs');
 require('@dynamic-labs/iconic');
+require('@dynamic-labs/wallet-connector-core');
 require('react/jsx-runtime');
 require('../../../context/ViewContext/ViewContext.cjs');
 require('react');

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

@@ -1,5 +1,4 @@
 'use client'
-import '@dynamic-labs/wallet-connector-core';
 import '@dynamic-labs/sdk-api-core';
 import '../../constants/values.js';
 import '@dynamic-labs/utils';
@@ -7,6 +6,7 @@ import '../../../../../_virtual/_tslib.js';
 import '@dynamic-labs/multi-wallet';
 import '../../../shared/logger.js';
 import '@dynamic-labs/iconic';
+import '@dynamic-labs/wallet-connector-core';
 import 'react/jsx-runtime';
 import '../../../context/ViewContext/ViewContext.js';
 import 'react';

package/src/lib/utils/hooks/authenticationHooks/useConnectAndSign/useConnectAndSign.d.ts

@@ -1,7 +1,7 @@
-import { GetAddressOpts, WalletConnector } from '@dynamic-labs/wallet-connector-core';
+import { GetAddressOpts, InternalWalletConnector } from '@dynamic-labs/wallet-connector-core';
 type Props = {
     getAddressOpts?: GetAddressOpts;
-    walletConnector: WalletConnector;
+    walletConnector: InternalWalletConnector;
 };
 export declare const useConnectAndSign: ({ shouldUpdateWallets, shouldCallCallback, }?: {
     shouldUpdateWallets?: boolean | undefined;

package/src/lib/utils/hooks/authenticationHooks/useConnectAndSignSplitSteps/useConnectAndSignSplitSteps.d.ts

@@ -1,7 +1,7 @@
-import { GetAddressOpts, WalletConnector } from '@dynamic-labs/wallet-connector-core';
+import { GetAddressOpts, InternalWalletConnector } from '@dynamic-labs/wallet-connector-core';
 type Props = {
     getAddressOpts?: GetAddressOpts;
-    walletConnector: WalletConnector;
+    walletConnector: InternalWalletConnector;
 };
 export declare const useConnectAndSignSplitSteps: () => {
     onlyConnectUser: ({ walletConnector, getAddressOpts, }: Props) => Promise<void>;

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

@@ -63,3 +63,4 @@ export { useRefreshUser } from './useRefreshUser';
 export { useWalletOptions } from './useWalletOptions';
 export { useResetCookieLocalStorage } from './useResetCookieLocalStorage';
 export { useSyncMfaFlow } from './useSyncMfaFlow';
+export * from './useSmartWallets';

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

@@ -1,3 +1,2 @@
 export * from './useMultiWalletWidgetState';
 export * from './useVerifyOnAwaitingSignature';
-export * from './useSyncPrimaryWallet';

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

@@ -158,14 +158,13 @@ const useConnectWallet = ({ authMode, clearPrimaryWalletId, enableVisitTrackingO
                 walletConnector.getAdditionalAddresses(walletAddress),
             ]);
             const walletChain = walletConnector.connectedChain;
-            const walletObject = new walletConnectorCore.Wallet({
+            const walletObject = walletConnector.createWallet({
                 additionalAddresses,
-                address: walletAddress || '',
-                chain: walletChain || '',
+                address: walletAddress,
+                chain: walletChain,
                 connector: walletConnector,
                 id: storedConnectedWalletInfo.id,
                 isAuthenticated: false,
-                isPrimary: primaryWalletId === storedConnectedWalletInfo.id,
                 key: walletConnector.key,
                 network: walletNetwork,
             });
@@ -177,7 +176,6 @@ const useConnectWallet = ({ authMode, clearPrimaryWalletId, enableVisitTrackingO
         disconnectWallet,
         setConnectedWallets,
         walletConnectorOptions,
-        primaryWalletId,
     ]);
     // Generate the connectedWallets list when connectedWalletsInfo (localStorage) or memoized wallet connector updates
     React.useEffect(() => {
@@ -201,9 +199,12 @@ const useConnectWallet = ({ authMode, clearPrimaryWalletId, enableVisitTrackingO
         const clonedConnectedWalletsList = [...connectedWallets];
         const connectedWalletIndex = clonedConnectedWalletsList.findIndex((connectedWallet) => connectedWallet.id === walletId);
         if (connectedWalletIndex > -1) {
-            clonedConnectedWalletsList[connectedWalletIndex] = new walletConnectorCore.Wallet(Object.assign(Object.assign({}, clonedConnectedWalletsList[connectedWalletIndex]), { address: (_a = walletObject.address) !== null && _a !== void 0 ? _a : clonedConnectedWalletsList[connectedWalletIndex].address, connector: clonedConnectedWalletsList[connectedWalletIndex].connector, network: (_b = walletObject.network) !== null && _b !== void 0 ? _b : clonedConnectedWalletsList[connectedWalletIndex].network }));
-            setConnectedWallets(clonedConnectedWalletsList);
+            clonedConnectedWalletsList[connectedWalletIndex].address =
+                (_a = walletObject.address) !== null && _a !== void 0 ? _a : clonedConnectedWalletsList[connectedWalletIndex].address;
+            clonedConnectedWalletsList[connectedWalletIndex].network =
+                (_b = walletObject.network) !== null && _b !== void 0 ? _b : clonedConnectedWalletsList[connectedWalletIndex].network;
         }
+        setConnectedWallets(clonedConnectedWalletsList);
     }, [connectedWallets, setConnectedWallets]);
     // Keeps connected wallet data inside localStorage
     const applyConnectedWalletToStore = ({ walletId, walletConnectorKey, walletChain, provider, }) => {

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

@@ -1,8 +1,8 @@
 import { UserProfile } from '@dynamic-labs/types';
-import { Chain, GetAddressOpts, Wallet, WalletConnector } from '@dynamic-labs/wallet-connector-core';
+import { Chain, GetAddressOpts, WalletConnector } from '@dynamic-labs/wallet-connector-core';
 import { SetShowAuthFlow } from '../../../context/DynamicContext/hooks';
 import { ConnectWalletResult } from '../../../context/DynamicContext/types';
-import { AuthModeType, HandleConnectedWallet, WalletOption } from '../../../shared';
+import { AuthModeType, HandleConnectedWallet, WalletOption, Wallet } from '../../../shared';
 export type ConnectedWalletConnectorType = {
     id: string;
     walletChain?: Chain;

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

@@ -2,7 +2,7 @@
 import { __awaiter } from '../../../../../_virtual/_tslib.js';
 import { useState, useCallback, useEffect } from 'react';
 import { MissingPublicAddressError } from '@dynamic-labs/utils';
-import { getWalletConnectorByKey, logger, Wallet } from '@dynamic-labs/wallet-connector-core';
+import { getWalletConnectorByKey, logger } from '@dynamic-labs/wallet-connector-core';
 import { useInternalUserWallets } from '../../../context/UserWalletsContext/UserWalletsContext.js';
 import '@dynamic-labs/sdk-api-core';
 import '../../../shared/logger.js';
@@ -154,14 +154,13 @@ const useConnectWallet = ({ authMode, clearPrimaryWalletId, enableVisitTrackingO
                 walletConnector.getAdditionalAddresses(walletAddress),
             ]);
             const walletChain = walletConnector.connectedChain;
-            const walletObject = new Wallet({
+            const walletObject = walletConnector.createWallet({
                 additionalAddresses,
-                address: walletAddress || '',
-                chain: walletChain || '',
+                address: walletAddress,
+                chain: walletChain,
                 connector: walletConnector,
                 id: storedConnectedWalletInfo.id,
                 isAuthenticated: false,
-                isPrimary: primaryWalletId === storedConnectedWalletInfo.id,
                 key: walletConnector.key,
                 network: walletNetwork,
             });
@@ -173,7 +172,6 @@ const useConnectWallet = ({ authMode, clearPrimaryWalletId, enableVisitTrackingO
         disconnectWallet,
         setConnectedWallets,
         walletConnectorOptions,
-        primaryWalletId,
     ]);
     // Generate the connectedWallets list when connectedWalletsInfo (localStorage) or memoized wallet connector updates
     useEffect(() => {
@@ -197,9 +195,12 @@ const useConnectWallet = ({ authMode, clearPrimaryWalletId, enableVisitTrackingO
         const clonedConnectedWalletsList = [...connectedWallets];
         const connectedWalletIndex = clonedConnectedWalletsList.findIndex((connectedWallet) => connectedWallet.id === walletId);
         if (connectedWalletIndex > -1) {
-            clonedConnectedWalletsList[connectedWalletIndex] = new Wallet(Object.assign(Object.assign({}, clonedConnectedWalletsList[connectedWalletIndex]), { address: (_a = walletObject.address) !== null && _a !== void 0 ? _a : clonedConnectedWalletsList[connectedWalletIndex].address, connector: clonedConnectedWalletsList[connectedWalletIndex].connector, network: (_b = walletObject.network) !== null && _b !== void 0 ? _b : clonedConnectedWalletsList[connectedWalletIndex].network }));
-            setConnectedWallets(clonedConnectedWalletsList);
+            clonedConnectedWalletsList[connectedWalletIndex].address =
+                (_a = walletObject.address) !== null && _a !== void 0 ? _a : clonedConnectedWalletsList[connectedWalletIndex].address;
+            clonedConnectedWalletsList[connectedWalletIndex].network =
+                (_b = walletObject.network) !== null && _b !== void 0 ? _b : clonedConnectedWalletsList[connectedWalletIndex].network;
         }
+        setConnectedWallets(clonedConnectedWalletsList);
     }, [connectedWallets, setConnectedWallets]);
     // Keeps connected wallet data inside localStorage
     const applyConnectedWalletToStore = ({ walletId, walletConnectorKey, walletChain, provider, }) => {

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

@@ -1,7 +1,7 @@
-import { IEmailWalletConnector, WalletConnector } from '@dynamic-labs/wallet-connector-core';
+import { IEmailWalletConnector, InternalWalletConnector } from '@dynamic-labs/wallet-connector-core';
 type ConnectWithEmailProps = {
     emailWalletConnector: IEmailWalletConnector | undefined;
-    handleConnect: (walletConnector: WalletConnector) => Promise<void>;
+    handleConnect: (walletConnector: InternalWalletConnector) => Promise<void>;
 };
 export declare const useConnectWithEmail: ({ emailWalletConnector, handleConnect, }: ConnectWithEmailProps) => {
     connectWithEmail: (email: string) => Promise<void>;

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

@@ -1,2 +1,2 @@
 import { Wallet, WalletConnector } from '../../../..';
-export declare const useConnectedAccountWallet: (connector: WalletConnector | undefined, secondaryWallets: Wallet[]) => import("../usePromise").PromiseState<Wallet | undefined, Error>;
+export declare const useConnectedAccountWallet: (connector: WalletConnector | undefined, secondaryWallets: Wallet[]) => import("../usePromise").PromiseState<Wallet<import("@dynamic-labs/wallet-connector-core").WalletConnectorCore.WalletConnector> | undefined, Error>;

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

@@ -6,11 +6,11 @@ Object.defineProperty(exports, '__esModule', { value: true });
 var _tslib = require('../../../../../_virtual/_tslib.cjs');
 var React = require('react');
 var sdkApiCore = require('@dynamic-labs/sdk-api-core');
-var walletConnectorCore = require('@dynamic-labs/wallet-connector-core');
 var utils = require('@dynamic-labs/utils');
 require('../../../context/DynamicContext/DynamicContext.cjs');
 var logger = require('../../../shared/logger.cjs');
 require('@dynamic-labs/iconic');
+require('@dynamic-labs/wallet-connector-core');
 require('react/jsx-runtime');
 require('../../../context/ViewContext/ViewContext.cjs');
 require('@dynamic-labs/wallet-book');
@@ -125,13 +125,12 @@ const useCreateDynamicEmbeddedWalletMutation = () => {
             const turnkeyVerifiedCredentials = (_d = updatedUser.verifiedCredentials) === null || _d === void 0 ? void 0 : _d.find(({ walletName }) => walletName === null || walletName === void 0 ? void 0 : walletName.startsWith('turnkey'));
             /** It's not authenticated if it's a turnkey wallet that still hasn't created a passkey */
             const isAuthenticated = Boolean((_e = turnkeyVerifiedCredentials === null || turnkeyVerifiedCredentials === void 0 ? void 0 : turnkeyVerifiedCredentials.walletProperties) === null || _e === void 0 ? void 0 : _e.isAuthenticatorAttached);
-            const passkeyWallet = new walletConnectorCore.Wallet({
+            const passkeyWallet = walletConnector.createWallet({
                 address: (yield walletConnector.getAddress()) || '',
-                chain: walletConnector.connectedChain || '',
+                chain: walletConnector.connectedChain,
                 connector: walletConnector,
                 id: embeddedWalletVerifiedCredential.id,
                 isAuthenticated,
-                isPrimary: true,
                 key: embeddedWalletVerifiedCredential.walletName || walletConnector.key,
             });
             const smartWallet$1 = smartWallet.findSmartWallet(embeddedWalletVerifiedCredential, updatedUser.verifiedCredentials);

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

@@ -2,11 +2,11 @@
 import { __awaiter } from '../../../../../_virtual/_tslib.js';
 import { useState, useCallback } from 'react';
 import { EmbeddedWalletChainEnum } from '@dynamic-labs/sdk-api-core';
-import { Wallet } from '@dynamic-labs/wallet-connector-core';
 import { DynamicError } from '@dynamic-labs/utils';
 import '../../../context/DynamicContext/DynamicContext.js';
 import { logger } from '../../../shared/logger.js';
 import '@dynamic-labs/iconic';
+import '@dynamic-labs/wallet-connector-core';
 import 'react/jsx-runtime';
 import '../../../context/ViewContext/ViewContext.js';
 import '@dynamic-labs/wallet-book';
@@ -121,13 +121,12 @@ const useCreateDynamicEmbeddedWalletMutation = () => {
             const turnkeyVerifiedCredentials = (_d = updatedUser.verifiedCredentials) === null || _d === void 0 ? void 0 : _d.find(({ walletName }) => walletName === null || walletName === void 0 ? void 0 : walletName.startsWith('turnkey'));
             /** It's not authenticated if it's a turnkey wallet that still hasn't created a passkey */
             const isAuthenticated = Boolean((_e = turnkeyVerifiedCredentials === null || turnkeyVerifiedCredentials === void 0 ? void 0 : turnkeyVerifiedCredentials.walletProperties) === null || _e === void 0 ? void 0 : _e.isAuthenticatorAttached);
-            const passkeyWallet = new Wallet({
+            const passkeyWallet = walletConnector.createWallet({
                 address: (yield walletConnector.getAddress()) || '',
-                chain: walletConnector.connectedChain || '',
+                chain: walletConnector.connectedChain,
                 connector: walletConnector,
                 id: embeddedWalletVerifiedCredential.id,
                 isAuthenticated,
-                isPrimary: true,
                 key: embeddedWalletVerifiedCredential.walletName || walletConnector.key,
             });
             const smartWallet = findSmartWallet(embeddedWalletVerifiedCredential, updatedUser.verifiedCredentials);

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

@@ -32,7 +32,7 @@ export declare const useEmbeddedWallet: () => {
     readonly getPasskeys: () => Promise<import("@dynamic-labs/sdk-api-core").UserPasskey[]>;
     readonly getWalletVersion: () => import(".").EmbeddedWalletVersion | undefined;
     readonly isLoadingEmbeddedWallet: boolean;
-    readonly isSessionActive: string | boolean | undefined;
+    readonly isSessionActive: boolean;
     readonly revealWalletKey: (options?: {
         type: "recoveryPhrase" | "privateKey";
         htmlContainerId?: string | undefined;

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

@@ -106,13 +106,12 @@ const useCoinbaseMPC = () => {
         var _a;
         connector.setVerifiedCredentials(validatedUser.verifiedCredentials);
         setPrimaryWalletId(embeddedWalletVerifiedCredential.id);
-        const coinbaseMPCWallet = new walletConnectorCore.Wallet({
+        const coinbaseMPCWallet = connector.createWallet({
             address: (yield (connector === null || connector === void 0 ? void 0 : connector.getAddress())) || '',
-            chain: (connector === null || connector === void 0 ? void 0 : connector.connectedChain) || '',
+            chain: connector.connectedChain,
             connector,
             id: embeddedWalletVerifiedCredential.id,
             isAuthenticated: true,
-            isPrimary: true,
             key: (_a = embeddedWalletVerifiedCredential.walletName) !== null && _a !== void 0 ? _a : connector.key,
         });
         return coinbaseMPCWallet;
@@ -173,13 +172,12 @@ const useCoinbaseMPC = () => {
                 password: initialWalletPassword,
                 source,
             });
-            const coinbaseMPCWallet = new walletConnectorCore.Wallet({
+            const coinbaseMPCWallet = connector.createWallet({
                 address: (yield (connector === null || connector === void 0 ? void 0 : connector.getAddress())) || '',
-                chain: (connector === null || connector === void 0 ? void 0 : connector.connectedChain) || '',
+                chain: connector === null || connector === void 0 ? void 0 : connector.connectedChain,
                 connector,
                 id: newSelectedCredentialWallet.id,
                 isAuthenticated: true,
-                isPrimary: true,
                 key: (_c = newSelectedCredentialWallet.walletName) !== null && _c !== void 0 ? _c : connector.key,
             });
             dynamicEvents.dynamicEvents.emit('embeddedWalletCreated', coinbaseMPCWallet, newSelectedCredentialWallet, updatedUser);

package/src/lib/utils/hooks/useEmbeddedWallet/useMPCEmbeddedWallet/useCoinbaseMPC/useCoinbaseMPC.d.ts

@@ -1,5 +1,5 @@
 import { EmbeddedWalletChainEnum } from '@dynamic-labs/sdk-api-core';
 import { Wallet } from '@dynamic-labs/wallet-connector-core';
 export declare const useCoinbaseMPC: () => {
-    createCoinbaseMPCWallet: (chains?: EmbeddedWalletChainEnum[], password?: string) => Promise<Wallet | undefined>;
+    createCoinbaseMPCWallet: (chains?: EmbeddedWalletChainEnum[], password?: string) => Promise<Wallet<import("@dynamic-labs/wallet-connector-core").WalletConnectorCore.WalletConnector> | undefined>;
 };