Revert genesis id migration

app/StyledApp.tsx

@@ -16,7 +16,6 @@ import { getThemeById } from './theme';
 import { init } from './sentry';
 import WriteFilePermissionError from './screens/modal/WriteFilePermissionError';
 import NoInternetConnection from './screens/modal/NoInternetConnection';
-import GenesisIDMigrationFailed from './screens/modal/GenesisIDMigrationFailed';
 
 const history = createMemoryHistory();
 
@@ -69,7 +68,6 @@ const StyledApp = () => {
             ))}
             <Redirect to="/auth" />
           </Switch>
-          <GenesisIDMigrationFailed />
           <WriteFilePermissionError />
           <NoInternetConnection />
           <CloseAppModal />

app/redux/ui/selectors.ts

@@ -3,9 +3,7 @@ import { RootState } from '../../types';
 
 export const getWarnings = (state: RootState) => state.ui.warnings;
 
-export const getWarningByType = <T extends WarningType>(type: T) => (
-  state: RootState
-) =>
+export const getWarningByType = (type: WarningType) => (state: RootState) =>
   getWarnings(state).find((w) => w.type === type) as
-    | WarningObject<T>
+    | WarningObject<WarningType.WriteFilePermission>
     | undefined;

desktop/main/Networks.ts

@@ -1,7 +1,6 @@
 import { hash } from '@spacemesh/sm-codec';
 import { app } from 'electron';
 import { Network, NodeConfig, PublicService } from '../../shared/types';
-import { parseISODate } from '../../shared/datetime';
 import { toHexString } from '../../shared/utils';
 import { getStandaloneNetwork, isTestMode } from '../testMode';
 import { fetchJSON, isDevNet } from '../utils';
@@ -12,8 +11,7 @@ import { toPublicService } from './utils';
 //
 
 export const generateGenesisID = (genesisTime: string, extraData: string) => {
-  const time = parseISODate(genesisTime).getTime() / 1000;
-  return toHexString(hash(`${time}${extraData}`)).substring(0, 40);
+  return `${toHexString(hash(genesisTime + extraData)).substring(0, 40)}`;
 };
 
 export const generateGenesisIDFromConfig = (nodeConfig: NodeConfig) => {
@@ -22,8 +20,8 @@ export const generateGenesisIDFromConfig = (nodeConfig: NodeConfig) => {
     nodeConfig?.genesis?.['genesis-extra-data']
   ) {
     return generateGenesisID(
-      nodeConfig.genesis['genesis-time'],
-      nodeConfig.genesis['genesis-extra-data']
+      nodeConfig.genesis['genesis-time'] || '',
+      nodeConfig.genesis['genesis-extra-data'] || ''
     );
   }
 

desktop/main/sources/currentNetwork.ts

@@ -6,7 +6,6 @@ import {
   iif,
   map,
   Observable,
-  share,
   Subject,
   switchMap,
 } from 'rxjs';
@@ -21,6 +20,7 @@ export default (
 ) =>
   $networks.pipe(
     combineLatestWith($runNodeBeforeLogin, $wallet),
+    distinctUntilChanged(),
     switchMap(([_, runNodeOnStart, wallet]) => {
       return iif(
         () => runNodeOnStart && !wallet,
@@ -34,12 +34,8 @@ export default (
         )
       );
     }),
-    distinctUntilChanged(
-      (prev, next) => prev[0] === next[0] && prev[1] === next[1]
-    ),
     map(
       ([networks, genesisID]) =>
         find((net) => net.genesisID === genesisID, networks) || null
-    ),
-    share()
+    )
   );

desktop/main/sources/fetchDiscovery.ts

@@ -26,7 +26,6 @@ import { handleIPC, handlerResult, makeSubscription } from '../rx.utils';
 import { fetchNodeConfig } from '../../utils';
 import { Managers } from '../app.types';
 import Logger from '../../logger';
-import { getWrongGenesisID } from '../../migrations/migrateWrongGenesisId';
 
 const logger = Logger({ className: 'fetchDiscovery' });
 
@@ -51,10 +50,6 @@ export const withGenesisID = () =>
           (net, i): Network => ({
             ...net,
             genesisID: generateGenesisIDFromConfig(configs[i]),
-            _wrongGenesisID: getWrongGenesisID(
-              configs[i].genesis['genesis-time'],
-              configs[i].genesis['genesis-extra-data']
-            ),
           })
         );
       })

desktop/main/sources/wallet.ipc.ts

@@ -1,4 +1,3 @@
-import { resolve } from 'path';
 import * as R from 'ramda';
 import {
   combineLatest,
@@ -34,7 +33,6 @@ import {
 } from '../../../shared/ipcMessages';
 import { Network, Wallet, WalletType } from '../../../shared/types';
 import {
-  getShortGenesisId,
   isLocalNodeApi,
   isRemoteNodeApi,
   stringifySocketAddress,
@@ -64,9 +62,6 @@ import {
   WRONG_PASSWORD_MESSAGE,
 } from '../walletFile';
 import { getLocalNodeConnectionConfig } from '../utils';
-import migrateWrongGenesisId from '../../migrations/migrateWrongGenesisId';
-import { getCustomNodeConfigPath } from '../NodeConfig';
-import StoreService from '../../storeService';
 
 type WalletData = {
   // path to wallet file
@@ -172,65 +167,11 @@ const handleWalletIpcRequests = (
     handleIPC(
       ipcConsts.W_M_UNLOCK_WALLET,
       ({ path, password }: UnlockWalletRequest) =>
-        loadAndMigrateWallet$(path, password).pipe(
-          withLatestFrom($networks),
-          map(([res, networks]) => {
-            if (res[0]) return res;
-            const { wallet } = res[1];
-            const gId = wallet.meta.genesisID;
-            const netByOldId = networks.find((n) => n._wrongGenesisID === gId);
-            if (!netByOldId) return res;
-            // Switch to the new id of the same network automatically
-            // and update the wallet file
-            // https://github.com/spacemeshos/smapp/issues/1377
-            migrateWrongGenesisId(
-              netByOldId._wrongGenesisID,
-              netByOldId.genesisID
-            ).catch((error) => {
-              logger.error('Cannot migrate Genesis ID:', error, netByOldId);
-              const nodeDataDir = StoreService.get('node.dataPath');
-              $warnings.next(
-                Warning.fromError(
-                  WarningType.GenesisIDMigrationFailed,
-                  {
-                    nodeConfig: {
-                      prev: getCustomNodeConfigPath(netByOldId._wrongGenesisID),
-                      next: getCustomNodeConfigPath(netByOldId.genesisID),
-                    },
-                    nodeData: {
-                      prev: resolve(
-                        nodeDataDir,
-                        getShortGenesisId(netByOldId._wrongGenesisID)
-                      ),
-                      next: resolve(
-                        nodeDataDir,
-                        getShortGenesisId(netByOldId.genesisID)
-                      ),
-                    },
-                  },
-                  error
-                )
-              );
-            });
-            return handlerResult(<WalletData>{
-              ...res[1],
-              wallet: {
-                ...wallet,
-                meta: {
-                  ...wallet.meta,
-                  genesisID: netByOldId.genesisID,
-                },
-              },
-              save: true,
-            });
-          })
-        ),
-      ({ wallet }): UnlockWalletResponse['payload'] => {
-        return {
-          meta: wallet.meta,
-          forceNetworkSelection: false,
-        };
-      }
+        loadAndMigrateWallet$(path, password),
+      ({ wallet }): UnlockWalletResponse['payload'] => ({
+        meta: wallet.meta,
+        forceNetworkSelection: false,
+      })
     ),
     //
     handleIPC(