fix(smeshing): fix creating pos data and smesher initialization

spacemeshos · Jun 27, 2022 · 869fd21 · 869fd21
1 parent 0652d7d
commit 869fd21
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 24 deletions.
diff --git a/app/components/node/SmesherLog.tsx b/app/components/node/SmesherLog.tsx
@@ -237,7 +237,7 @@ const SmesherLog = ({
               <DateText>
                 <ReactTimeago date={initTimestamp} />
               </DateText>
-              <LogText>Initializing smesher</LogText>
+              <LogText>Started creating PoS data</LogText>
             </LogEntry>
           </>
         ) : null}

diff --git a/app/infra/eventsService/eventsService.ts b/app/infra/eventsService/eventsService.ts
@@ -31,7 +31,6 @@ import {
 import { showClosingAppModal } from '../../redux/ui/actions';
 // Temporary solution to provide types
 // Could be replaced using something like `electron-ipcfy`
-import { LOCAL_NODE_API_URL } from '../../../shared/constants';
 import TransactionManager from '../../../desktop/TransactionManager';
 import updaterSlice from '../../redux/updater/slice';
 import { CurrentLayer, GlobalStateHash } from '../../types/events';
@@ -157,12 +156,7 @@ class EventsService {
   static getEstimatedRewards = () =>
     ipcRenderer.invoke(ipcConsts.SMESHER_GET_ESTIMATED_REWARDS);
 
-  static startSmeshing = async (postSetupOpts: PostSetupOpts, netId) => {
-    await ipcRenderer.invoke(ipcConsts.SWITCH_API_PROVIDER, {
-      apiUrl: LOCAL_NODE_API_URL,
-      netId,
-    });
-    await ipcRenderer.invoke(ipcConsts.N_M_START_NODE);
+  static startSmeshing = async (postSetupOpts: PostSetupOpts) => {
     ipcRenderer.send(ipcConsts.SMESHER_START_SMESHING, postSetupOpts);
   };
 

diff --git a/app/redux/smesher/actions.ts b/app/redux/smesher/actions.ts
@@ -2,7 +2,6 @@ import { eventsService } from '../../infra/eventsService';
 import { AppThDispatch, GetState } from '../../types';
 import { SmeshingOpts } from '../../../shared/types';
 import { addErrorPrefix } from '../../infra/utils';
-import { getNetworkId } from '../network/selectors';
 import { setUiError } from '../ui/actions';
 import {
   getSmeshingOpts,
@@ -27,24 +26,21 @@ export const startSmeshing = ({
   numUnits,
   provider,
   throttle,
-}: SmeshingOpts) => async (dispatch: AppThDispatch, getState: GetState) => {
+}: SmeshingOpts) => async (dispatch: AppThDispatch) => {
   try {
-    const state = getState();
-    const curNetId = getNetworkId(state);
-    // TODO: Replace hardcoded `numFiles: 1` with something reasonable?
-    await eventsService.startSmeshing(
-      {
-        coinbase,
-        dataDir,
-        numUnits,
-        numFiles: 1,
-        computeProviderId: provider,
-        throttle,
-      },
-      curNetId
-    );
+    await eventsService.startSmeshing({
+      coinbase,
+      dataDir,
+      numUnits,
+      // TODO: Replace hardcoded `numFiles: 1` with something reasonable?
+      numFiles: 1,
+      computeProviderId: provider,
+      throttle,
+    });
+
     localStorage.setItem('smesherInitTimestamp', `${new Date().getTime()}`);
     localStorage.removeItem('smesherSmeshingTimestamp');
+
     dispatch({
       type: STARTED_SMESHING,
       payload: { coinbase, dataDir, numUnits, provider, throttle },

diff --git a/desktop/main/sources/wallet.ipc.ts b/desktop/main/sources/wallet.ipc.ts
@@ -307,6 +307,7 @@ const handleWalletIpcRequests = (
     //
     $smeshingStarted.pipe(
       switchMap(() => combineLatest([$wallet, $walletPath])),
+      first(),
       filter(
         (pair): pair is [Wallet, string] =>
           Boolean(pair[0]) && typeof pair[1] === 'string'