New storage structure

apps/desktop/src/app/App.tsx

@@ -39,7 +39,7 @@ import { DesktopWalletSettingsRouting } from '@tonkeeper/uikit/dist/desktop-page
 import { DesktopSwapPage } from '@tonkeeper/uikit/dist/desktop-pages/swap';
 import { DesktopTokens } from '@tonkeeper/uikit/dist/desktop-pages/tokens/DesktopTokens';
 import { AmplitudeAnalyticsContext, useTrackLocation } from '@tonkeeper/uikit/dist/hooks/amplitude';
-import { AppContext, WalletStateContext } from '@tonkeeper/uikit/dist/hooks/appContext';
+import { AppContext, IAppContext } from '@tonkeeper/uikit/dist/hooks/appContext';
 import {
     AfterImportAction,
     AppSdkContext,
@@ -55,12 +55,11 @@ import { UnlockNotification } from '@tonkeeper/uikit/dist/pages/home/UnlockNotif
 import ImportRouter from '@tonkeeper/uikit/dist/pages/import';
 import Initialize, { InitializeContainer } from '@tonkeeper/uikit/dist/pages/import/Initialize';
 import { UserThemeProvider } from '@tonkeeper/uikit/dist/providers/UserThemeProvider';
-import { useAccountState } from '@tonkeeper/uikit/dist/state/account';
 import { useUserFiat } from '@tonkeeper/uikit/dist/state/fiat';
-import { useAuthState, useCanPromptTouchId } from '@tonkeeper/uikit/dist/state/password';
+import { useCanPromptTouchId } from '@tonkeeper/uikit/dist/state/password';
 import { useProBackupState } from '@tonkeeper/uikit/dist/state/pro';
 import { useTonendpoint, useTonenpointConfig } from '@tonkeeper/uikit/dist/state/tonendpoint';
-import { useActiveWallet } from '@tonkeeper/uikit/dist/state/wallet';
+import { useActiveWalletQuery, useWalletsStateQuery } from '@tonkeeper/uikit/dist/state/wallet';
 import { Container, GlobalStyleCss } from '@tonkeeper/uikit/dist/styles/globalStyle';
 import { FC, Suspense, useEffect, useMemo } from 'react';
 import { useTranslation } from 'react-i18next';
@@ -80,6 +79,8 @@ import { DeepLinkSubscription } from './components/DeepLink';
 import { TonConnectSubscription } from './components/TonConnectSubscription';
 import { DesktopDns } from '@tonkeeper/uikit/dist/desktop-pages/nft/DesktopDns';
 import { DesktopCollectables } from '@tonkeeper/uikit/dist/desktop-pages/nft/DesktopCollectables';
+import { useUserLanguage } from '@tonkeeper/uikit/dist/state/language';
+import { useDebuggingTools } from '@tonkeeper/uikit/dist/hooks/useDebuggingTools';
 
 const queryClient = new QueryClient({
     defaultOptions: {
@@ -121,7 +122,6 @@ const sdk = new DesktopAppSdk();
 const TARGET_ENV = 'desktop';
 
 const langs = 'en,zh_CN,ru,it,tr';
-const listOfAuth: AuthState['kind'][] = ['keychain'];
 
 declare const REACT_APP_TONCONSOLE_API: string;
 declare const REACT_APP_TG_BOT_ID: string;
@@ -254,47 +254,44 @@ const FullSizeWrapperBounded = styled(FullSizeWrapper)`
 `;
 
 export const Loader: FC = () => {
-    const { data: activeWallet } = useActiveWallet();
+    const { data: activeWallet, isLoading: activeWalletLoading } = useActiveWalletQuery();
+    const { data: wallets, isLoading: isWalletsLoading } = useWalletsStateQuery();
+    const { data: lang, isLoading: isLangLoading } = useUserLanguage();
 
     const lock = useLock(sdk);
     const { i18n } = useTranslation();
-    const { data: account } = useAccountState();
-    const { data: auth } = useAuthState();
     const { data: fiat } = useUserFiat();
 
     const tonendpoint = useTonendpoint({
         targetEnv: TARGET_ENV,
         build: sdk.version,
         network: activeWallet?.network,
-        lang: activeWallet?.lang,
+        lang,
         platform: 'desktop'
     });
     const { data: config } = useTonenpointConfig(tonendpoint);
 
     const navigate = useNavigate();
     useAppHeight();
 
-    const { data: tracker } = useAnalytics(sdk.version, account, activeWallet);
+    const { data: tracker } = useAnalytics(sdk.version, activeWallet, wallets);
 
     useEffect(() => {
-        if (
-            activeWallet &&
-            activeWallet.lang &&
-            i18n.language !== localizationText(activeWallet.lang)
-        ) {
-            i18n.reloadResources([localizationText(activeWallet.lang)]).then(() =>
-                i18n.changeLanguage(localizationText(activeWallet.lang))
+        if (lang && i18n.language !== localizationText(lang)) {
+            i18n.reloadResources([localizationText(lang)]).then(() =>
+                i18n.changeLanguage(localizationText(lang))
             );
         }
-    }, [activeWallet, i18n]);
+    }, [lang, i18n]);
 
     useEffect(() => {
         window.backgroundApi.onRefresh(() => queryClient.invalidateQueries());
     }, []);
 
     if (
-        auth === undefined ||
-        account === undefined ||
+        activeWalletLoading ||
+        isLangLoading ||
+        isWalletsLoading ||
         config === undefined ||
         lock === undefined ||
         fiat === undefined
@@ -303,11 +300,9 @@ export const Loader: FC = () => {
     }
 
     const network = activeWallet?.network ?? Network.MAINNET;
-    const context = {
+    const context: IAppContext = {
         api: getApiConfig(config, network, REACT_APP_TONCONSOLE_API),
-        auth,
         fiat,
-        account,
         config,
         tonendpoint,
         standalone: true,
@@ -352,6 +347,7 @@ export const Content: FC<{
     useAppWidth();
     useTrackLocation();
     usePrefetch();
+    useDebuggingTools();
 
     if (lock) {
         return (
@@ -366,10 +362,7 @@ export const Content: FC<{
             <FullSizeWrapperBounded className="full-size-wrapper">
                 <InitializeContainer fullHeight={false}>
                     <Routes>
-                        <Route
-                            path={any(AppRoute.import)}
-                            element={<ImportRouter listOfAuth={listOfAuth} />}
-                        />
+                        <Route path={any(AppRoute.import)} element={<ImportRouter />} />
                         <Route path="*" element={<Initialize />} />
                     </Routes>
                 </InitializeContainer>
@@ -378,24 +371,19 @@ export const Content: FC<{
     }
 
     return (
-        <WalletStateContext.Provider value={activeWallet}>
-            <WideLayout>
-                <AsideMenu />
-                <WideContent>
-                    <Routes>
-                        <Route path={AppProRoute.dashboard} element={<DashboardPage />} />
-                        <Route path={AppRoute.browser} element={<DesktopBrowser />} />
-                        <Route path={any(AppRoute.settings)} element={<PreferencesContent />} />
-                        <Route
-                            path={any(AppProRoute.multiSend)}
-                            element={<DesktopMultiSendPage />}
-                        />
-                        <Route path="*" element={<WalletContent />} />
-                    </Routes>
-                </WideContent>
-                <BackgroundElements />
-            </WideLayout>
-        </WalletStateContext.Provider>
+        <WideLayout>
+            <AsideMenu />
+            <WideContent>
+                <Routes>
+                    <Route path={AppProRoute.dashboard} element={<DashboardPage />} />
+                    <Route path={AppRoute.browser} element={<DesktopBrowser />} />
+                    <Route path={any(AppRoute.settings)} element={<PreferencesContent />} />
+                    <Route path={any(AppProRoute.multiSend)} element={<DesktopMultiSendPage />} />
+                    <Route path="*" element={<WalletContent />} />
+                </Routes>
+            </WideContent>
+            <BackgroundElements />
+        </WideLayout>
     );
 };
 

apps/desktop/src/electron/sseEvetns.ts

@@ -1,5 +1,4 @@
 import { TonConnectAppRequest } from '@tonkeeper/core/dist/entries/tonConnect';
-import { accountSelectWallet, getAccountState } from '@tonkeeper/core/dist/service/accountService';
 import {
     replyBadRequestResponse,
     replyDisconnectResponse
@@ -13,20 +12,21 @@ import {
     getLastEventId,
     subscribeTonConnect
 } from '@tonkeeper/core/dist/service/tonConnect/httpBridge';
-import { getWalletState } from '@tonkeeper/core/dist/service/wallet/storeService';
+import { walletsStorage } from '@tonkeeper/core/dist/service/walletsService';
 import { delay } from '@tonkeeper/core/dist/utils/common';
 import { Buffer as BufferPolyfill } from 'buffer';
 import log from 'electron-log/main';
 import EventSourcePolyfill from 'eventsource';
 import { MainWindow } from './mainWindow';
 import { mainStorage } from './storageService';
+import { isStandardTonWallet, WalletId } from '@tonkeeper/core/dist/entries/wallet';
 
 globalThis.Buffer = BufferPolyfill;
 
 export class TonConnectSSE {
     private lastEventId: string;
     private connections: AccountConnection[];
-    private dist: Record<string, string>;
+    private dist: Record<string, WalletId>;
     private closeConnection: () => void | null = null;
 
     private static instance: TonConnectSSE = null;
@@ -48,18 +48,19 @@ export class TonConnectSSE {
     public async init() {
         this.lastEventId = await getLastEventId(mainStorage);
 
-        const account = await getAccountState(mainStorage);
+        const walletsState = (await walletsStorage(mainStorage).getWallets()).filter(
+            isStandardTonWallet
+        );
 
         this.connections = [];
         this.dist = {};
 
-        for (const key of account.publicKeys) {
-            const wallet = await getWalletState(mainStorage, key);
+        for (const wallet of walletsState) {
             const walletConnections = await getAccountConnection(mainStorage, wallet);
 
             this.connections = this.connections.concat(walletConnections);
             walletConnections.forEach(item => {
-                this.dist[item.clientSessionId] = key;
+                this.dist[item.clientSessionId] = wallet.id;
             });
         }
     }
@@ -78,7 +79,14 @@ export class TonConnectSSE {
     };
 
     private onDisconnect = async ({ connection, request }: TonConnectAppRequest) => {
-        const wallet = await getWalletState(mainStorage, this.dist[connection.clientSessionId]);
+        const wallet = await walletsStorage(mainStorage).getWallet(
+            this.dist[connection.clientSessionId]
+        );
+
+        if (!wallet || !isStandardTonWallet(wallet)) {
+            return;
+        }
+
         await disconnectAppConnection({
             storage: mainStorage,
             wallet,
@@ -101,14 +109,14 @@ export class TonConnectSSE {
                     payload: JSON.parse(params.request.params[0])
                 };
 
-                const walletPublicKey = this.dist[params.connection.clientSessionId];
+                const walletId = this.dist[params.connection.clientSessionId];
 
-                const account = await getAccountState(mainStorage);
+                const activeWalletId = await walletsStorage(mainStorage).getActiveWalletId();
 
                 const window = await MainWindow.bringToFront();
 
-                if (account.activePublicKey !== walletPublicKey) {
-                    await accountSelectWallet(mainStorage, walletPublicKey);
+                if (activeWalletId !== walletId) {
+                    await walletsStorage(mainStorage).setActiveWalletId(walletId);
                     window.webContents.send('refresh');
                     await delay(500);
                 }

apps/desktop/src/libs/aptabaseElectron.ts

@@ -1,23 +1,24 @@
 import { trackEvent } from '@aptabase/electron/renderer';
 import { Network } from '@tonkeeper/core/dist/entries/network';
 import { Analytics } from '@tonkeeper/uikit/dist/hooks/analytics';
+import { WalletsState, WalletState } from '@tonkeeper/core/dist/entries/wallet';
 
 export class AptabaseElectron implements Analytics {
     private user_properties: Record<string, any> = {};
 
     init = (
         application: string,
         walletType: string,
-        account?: any,
-        wallet?: any,
+        activeWallet?: WalletState,
+        wallets?: WalletsState,
         version?: string | undefined,
         platform?: string | undefined
     ) => {
         this.user_properties['application'] = application;
         this.user_properties['walletType'] = walletType;
         this.user_properties['network'] =
-            wallet?.network === Network.TESTNET ? 'testnet' : 'mainnet';
-        this.user_properties['accounts'] = account!.publicKeys.length;
+            activeWallet?.network === Network.TESTNET ? 'testnet' : 'mainnet';
+        this.user_properties['accounts'] = wallets?.length ?? 0;
         this.user_properties['version'] = version;
         this.user_properties['platform'] = platform;
     };

apps/desktop/src/libs/hooks.ts

@@ -1,7 +1,6 @@
 import { useQuery } from '@tanstack/react-query';
 import { AppKey } from '@tonkeeper/core/dist/Keys';
-import { AccountState } from '@tonkeeper/core/dist/entries/account';
-import { WalletState } from '@tonkeeper/core/dist/entries/wallet';
+import { WalletsState, WalletState } from '@tonkeeper/core/dist/entries/wallet';
 import { throttle } from '@tonkeeper/core/dist/utils/common';
 import { Analytics, AnalyticsGroup, toWalletType } from '@tonkeeper/uikit/dist/hooks/analytics';
 import { Amplitude } from '@tonkeeper/uikit/dist/hooks/analytics/amplitude';
@@ -50,8 +49,8 @@ declare const REACT_APP_AMPLITUDE: string;
 
 export const useAnalytics = (
     version: string,
-    account?: AccountState,
-    wallet?: WalletState | null
+    activeWallet?: WalletState,
+    wallets?: WalletsState
 ) => {
     const sdk = useAppSdk();
 
@@ -77,15 +76,15 @@ export const useAnalytics = (
 
             tracker.init(
                 'Desktop',
-                toWalletType(wallet),
-                account,
-                wallet,
+                toWalletType(activeWallet),
+                activeWallet,
+                wallets,
                 version,
                 `${window.backgroundApi.platform()}-${window.backgroundApi.arch()}`
             );
 
             return tracker;
         },
-        { enabled: account != null }
+        { enabled: wallets != null && activeWallet !== undefined }
     );
 };