input-output-hk · nikolaglumac · Nov 12, 2019 · Nov 10, 2019 · Nov 10, 2019 · Nov 10, 2019
diff --git a/nix/launcher-config.nix b/nix/launcher-config.nix
@@ -51,6 +51,8 @@ let
     "launch"
     "--genesis-block-hash" "${jormungandrLib.environments.${environment}.genesisHash}"
     "--state-dir" dataDir.${os}
+    "--sync-tolerance" "${jormungandrLib.environments.${environment}.syncTolerance}"
+    "--random-port"
     "--"
     "--config" finalJormungandrCfgPath
   ];
@@ -60,6 +62,7 @@ let
     "--port" "8088"
     "--state-dir" dataDir.${os}
     "--genesis-block" "${dataDir.${os}}${dirSep}block0.bin"
+    "--sync-tolerance" "300s"
     "--"
     "--secret" "${dataDir.${os}}${dirSep}secret.yaml"
   ];

diff --git a/nix/sources.json b/nix/sources.json
@@ -29,10 +29,10 @@
         "homepage": null,
         "owner": "input-output-hk",
         "repo": "cardano-wallet",
-        "rev": "bd3d5897659b32abbde77298cb7c665cd29fb3d5",
-        "sha256": "1gsk335705crpi5sz2fsakjvnyw6mk7hb2wycy984gab1xrlzz4f",
+        "rev": "ae3dfa0484f837eb16b1d5203236d0af694a5738",
+        "sha256": "03927p9g3xl8aqmkx6s5wdp8rrg4bby1jjmpx4py5c7v3wnw0529",
         "type": "tarball",
-        "url": "https://github.com/input-output-hk/cardano-wallet/archive/bd3d5897659b32abbde77298cb7c665cd29fb3d5.tar.gz",
+        "url": "https://github.com/input-output-hk/cardano-wallet/archive/ae3dfa0484f837eb16b1d5203236d0af694a5738.tar.gz",
         "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz",
         "version": "v2019-10-16"
     },
@@ -66,10 +66,10 @@
         "homepage": null,
         "owner": "input-output-hk",
         "repo": "iohk-nix",
-        "rev": "8f1720d5890b59781a0eb7b996f8ea33cbf02850",
-        "sha256": "1b29krkkaqz7amwha91paa9sb4i52qjkymr0vh8rprpdkjhag1nz",
+        "rev": "6b60b6ffa39d68fd3cf6da4ead2658a1181833cc",
+        "sha256": "05qm5m9wy6n8r0jwg9vvd8hmnw3w7jif491fdmyhbvsaikfsiwr6",
         "type": "tarball",
-        "url": "https://github.com/input-output-hk/iohk-nix/archive/8f1720d5890b59781a0eb7b996f8ea33cbf02850.tar.gz",
+        "url": "https://github.com/input-output-hk/iohk-nix/archive/6b60b6ffa39d68fd3cf6da4ead2658a1181833cc.tar.gz",
         "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
     },
     "js-chain-libs": {

diff --git a/source/common/types/cardano-node.types.js b/source/common/types/cardano-node.types.js
@@ -117,7 +117,6 @@ export type FaultInjectionIpcRequest = [FaultInjection, boolean];
 
 export type CardanoStatus = {
   isNodeResponding: boolean,
-  isNodeSubscribed: boolean,
   isNodeSyncing: boolean,
   isNodeInSync: boolean,
   hasBeenConnected: boolean,

diff --git a/source/common/types/logging.types.js b/source/common/types/logging.types.js
@@ -59,22 +59,15 @@ export type StateSnapshotLogParams = {
   currentLocale: string,
   isConnected: boolean,
   isDev: boolean,
-  isForceCheckingNodeTime: boolean,
   isMainnet: boolean,
   isNodeInSync: boolean,
   isNodeResponding: boolean,
-  isNodeSubscribed: boolean,
   isNodeSyncing: boolean,
-  isNodeTimeCorrect: boolean,
   isStaging: boolean,
   isSynced: boolean,
-  isSystemTimeCorrect: boolean,
-  isSystemTimeIgnored: boolean,
   isTestnet: boolean,
-  latestLocalBlockTimestamp: number,
-  latestNetworkBlockTimestamp: number,
-  localBlockHeight: number,
-  localTimeDifference: ?number,
-  networkBlockHeight: number,
   currentTime: string,
+  syncPercentage: string,
+  localTip: ?Object,
+  networkTip: ?Object,
 };
diff --git a/source/renderer/app/api/api.js b/source/renderer/app/api/api.js
@@ -89,7 +89,6 @@ import type {
   GetNetworkInfoResponse,
   NetworkInfoResponse,
 } from './network/types';
-import type { NetworkInfoQueryParams } from './network/requests/getNetworkInfo';
 
 // Nodes Types
 import type {
@@ -1048,19 +1047,13 @@ export default class AdaApi {
     }
   };
 
-  getNetworkInfo = async (
-    queryInfoParams?: NetworkInfoQueryParams
-  ): Promise<GetNetworkInfoResponse> => {
-    const isForceNTPCheck = !!queryInfoParams;
-    const loggerText = `AdaApi::getNetworkInfo${
-      isForceNTPCheck ? ' (FORCE-NTP-CHECK)' : ''
-    }`;
+  getNetworkInfo = async (): Promise<GetNetworkInfoResponse> => {
+    Logger.debug('AdaApi::getNetworkInfo called');
     try {
       const networkInfo: NetworkInfoResponse = await getNetworkInfo(
-        this.config,
-        queryInfoParams
+        this.config
       );
-      Logger.debug(`${loggerText} success`, { networkInfo });
+      Logger.debug('AdaApi::getNetworkInfo success', { networkInfo });
 
       /* eslint-disable-next-line camelcase */
       const { sync_progress, node_tip, network_tip } = networkInfo;
@@ -1080,13 +1073,9 @@ export default class AdaApi {
           epoch: get(network_tip, 'epoch_number', 0),
           slot: get(network_tip, 'slot_number', 0),
         },
-        localTimeInformation: {
-          status: 'available',
-          difference: 0,
-        },
       };
     } catch (error) {
-      Logger.error(`${loggerText} error`, { error });
+      Logger.error('AdaApi::getNetworkInfo error', { error });
       // @API TODO - Inspect this implementation once TLS support is implemented on the BE
       if (error.code === TlsCertificateNotValidError.API_ERROR) {
         throw new TlsCertificateNotValidError();
@@ -1173,8 +1162,6 @@ export default class AdaApi {
   };
 
   // No implementation here but can be overwritten
-  getLocalTimeDifference: Function;
-  setLocalTimeDifference: Function;
   setSyncProgress: Function;
   setNextUpdate: Function;
   setLatestAppVersion: Function;

diff --git a/source/renderer/app/api/network/requests/getNetworkInfo.js b/source/renderer/app/api/network/requests/getNetworkInfo.js
@@ -3,19 +3,11 @@ import type { RequestConfig } from '../../common/types';
 import type { NetworkInfoResponse } from '../types';
 import { request } from '../../utils/request';
 
-export type NetworkInfoQueryParams = {
-  force_ntp_check: boolean,
-};
-
 export const getNetworkInfo = (
-  config: RequestConfig,
-  queryInfoParams?: NetworkInfoQueryParams
+  config: RequestConfig
 ): Promise<NetworkInfoResponse> =>
-  request(
-    {
-      method: 'GET',
-      path: '/v2/network/information',
-      ...config,
-    },
-    queryInfoParams
-  );
+  request({
+    method: 'GET',
+    path: '/v2/network/information',
+    ...config,
+  });
diff --git a/source/renderer/app/api/network/types.js b/source/renderer/app/api/network/types.js
@@ -1,9 +1,4 @@
 // @flow
-export type LocalTimeInformationStatus =
-  | 'unavailable'
-  | 'pending'
-  | 'available';
-
 export type TipInfo = {
   epoch: number,
   slot: number,
@@ -13,10 +8,6 @@ export type GetNetworkInfoResponse = {
   syncProgress: number,
   localTip: TipInfo,
   networkTip: TipInfo,
-  localTimeInformation: {
-    status: LocalTimeInformationStatus,
-    difference: ?number,
-  },
 };
 
 export type NetworkInfoResponse = {

diff --git a/source/renderer/app/api/utils/patchAdaApi.js b/source/renderer/app/api/utils/patchAdaApi.js
@@ -5,7 +5,6 @@ import { getNetworkInfo } from '../network/requests/getNetworkInfo';
 import { getLatestAppVersion } from '../nodes/requests/getLatestAppVersion';
 import { GenericApiError } from '../common/errors';
 import { Logger } from '../../utils/logging';
-import type { NetworkInfoQueryParams } from '../network/requests/getNetworkInfo';
 import type {
   GetNetworkInfoResponse,
   NetworkInfoResponse,
@@ -17,28 +16,17 @@ import type {
 import type { GetNewsResponse } from '../news/types';
 
 let LATEST_APP_VERSION = null;
-let LOCAL_TIME_DIFFERENCE = 0;
 let SYNC_PROGRESS = null;
 let NEXT_ADA_UPDATE = null;
 let APPLICATION_VERSION = null;
 let FAKE_NEWSFEED_JSON: ?GetNewsResponse;
 
 export default (api: AdaApi) => {
-  api.getLocalTimeDifference = async () =>
-    Promise.resolve(LOCAL_TIME_DIFFERENCE);
-
-  api.getNetworkInfo = async (
-    queryInfoParams?: NetworkInfoQueryParams
-  ): Promise<GetNetworkInfoResponse> => {
+  api.getNetworkInfo = async (): Promise<GetNetworkInfoResponse> => {
     Logger.debug('AdaApi::getNetworkInfo (PATCHED) called');
     try {
-      const networkInfo: NetworkInfoResponse = await getNetworkInfo(
-        api.config,
-        queryInfoParams
-      );
-      Logger.debug('AdaApi::getNetworkInfo (PATCHED) success', {
-        networkInfo,
-      });
+      const networkInfo: NetworkInfoResponse = await getNetworkInfo(api.config);
+      Logger.debug('AdaApi::getNetworkInfo (PATCHED) success', { networkInfo });
 
       /* eslint-disable-next-line camelcase */
       const { sync_progress, node_tip, network_tip } = networkInfo;
@@ -48,7 +36,7 @@ export default (api: AdaApi) => {
           : get(sync_progress, 'quantity', 0);
 
       // extract relevant data before sending to NetworkStatusStore
-      const response = {
+      return {
         syncProgress: SYNC_PROGRESS || syncProgress,
         localTip: {
           epoch: get(node_tip, 'epoch_number', 0),
@@ -58,32 +46,13 @@ export default (api: AdaApi) => {
           epoch: get(network_tip, 'epoch_number', 0),
           slot: get(network_tip, 'slot_number', 0),
         },
-        localTimeInformation: {
-          status: 'available',
-          difference: 0 || LOCAL_TIME_DIFFERENCE,
-        },
       };
-
-      // Since in test environment we run multiple NTP force-checks
-      // we need to protect ourselves from getting punished by the NTP
-      // service which results in 30 second delay in NTP check response.
-      // In order to simulate NTP force-check we use 250ms timeout.
-      const isForcedTimeDifferenceCheck = !!queryInfoParams;
-      return isForcedTimeDifferenceCheck
-        ? new Promise(resolve => {
-            setTimeout(() => resolve(response), 250);
-          })
-        : response;
     } catch (error) {
       Logger.error('AdaApi::getNetworkInfo (PATCHED) error', { error });
       throw new GenericApiError();
     }
   };
 
-  api.setLocalTimeDifference = async timeDifference => {
-    LOCAL_TIME_DIFFERENCE = timeDifference;
-  };
-
   api.setSyncProgress = async syncProgress => {
     SYNC_PROGRESS = syncProgress;
   };
@@ -170,7 +139,6 @@ export default (api: AdaApi) => {
 
   api.resetTestOverrides = () => {
     LATEST_APP_VERSION = null;
-    LOCAL_TIME_DIFFERENCE = 0;
     NEXT_ADA_UPDATE = null;
     APPLICATION_VERSION = null;
   };

diff --git a/source/renderer/app/components/loading/syncing-connecting/SyncingConnecting.js b/source/renderer/app/components/loading/syncing-connecting/SyncingConnecting.js
@@ -37,11 +37,8 @@ type Props = {
   hasLoadedCurrentLocale: boolean,
   hasLoadedCurrentTheme: boolean,
   hasUnreadNews: boolean,
-  isCheckingSystemTime: boolean,
   isNodeResponding: boolean,
-  isNodeSubscribed: boolean,
   isNodeSyncing: boolean,
-  isNodeTimeCorrect: boolean,
   isNewAppVersionAvailable: boolean,
   isNewAppVersionLoading: boolean,
   isNewAppVersionLoaded: boolean,
@@ -212,10 +209,7 @@ export default class SyncingConnecting extends Component<Props, State> {
       onDownloadLogs,
       disableDownloadLogs,
       isNodeResponding,
-      isNodeSubscribed,
       isNodeSyncing,
-      isNodeTimeCorrect,
-      isCheckingSystemTime,
       hasBeenConnected,
       isTlsCertInvalid,
       isNodeStopping,
@@ -273,10 +267,6 @@ export default class SyncingConnecting extends Component<Props, State> {
           onIconClick={onStatusIconClick}
           nodeState={cardanoNodeState}
           isNodeResponding={isNodeResponding}
-          isNodeSubscribed={isNodeSubscribed}
-          isNodeTimeCorrect={
-            isCheckingSystemTime ? undefined : isNodeTimeCorrect
-          }
           isNodeSyncing={isNodeSyncing}
         />
       </div>

diff --git a/source/renderer/app/components/status/DaedalusDiagnostics.js b/source/renderer/app/components/status/DaedalusDiagnostics.js
@@ -8,12 +8,6 @@ import CopyToClipboard from 'react-copy-to-clipboard';
 import { Tooltip } from 'react-polymorph/lib/components/Tooltip';
 import { TooltipSkin } from 'react-polymorph/lib/skins/simple/TooltipSkin';
 import SVGInline from 'react-svg-inline';
-// import {
-//   ALLOWED_TIME_DIFFERENCE,
-//   MAX_ALLOWED_STALL_DURATION,
-// } from '../../config/timingConfig';
-// import { UNSYNCED_BLOCKS_ALLOWED } from '../../config/numbersConfig';
-// import { getNetworkEkgUrl } from '../../utils/network';
 import DialogCloseButton from '../widgets/DialogCloseButton';
 import closeCrossThin from '../../assets/images/close-cross-thin.inline.svg';
 import iconCopy from '../../assets/images/clipboard-ic.inline.svg';
@@ -372,7 +366,7 @@ type Props = {
   // localBlockHeight: number,
   // networkBlockHeight: number,
   currentLocale: string,
-  onForceCheckLocalTimeDifference: Function,
+  // onForceCheckLocalTimeDifference: Function,
   onOpenStateDirectory: Function,
   onOpenExternalLink: Function,
   onRestartNode: Function,
@@ -949,7 +943,7 @@ export default class DaedalusDiagnostics extends Component<Props, State> {
   };
 
   checkTime = () => {
-    this.props.onForceCheckLocalTimeDifference();
+    // this.props.onForceCheckLocalTimeDifference();
     this.restoreDialogCloseOnEscKey();
   };
 

diff --git a/source/renderer/app/config/numbersConfig.js b/source/renderer/app/config/numbersConfig.js
@@ -9,7 +9,5 @@ export const LOVELACES_PER_ADA = 1000000;
 export const MAX_INTEGER_PLACES_IN_ADA = 11;
 export const DECIMAL_PLACES_IN_ADA = 6;
 export const SIMPLE_DECIMAL_PLACES_IN_ADA = 2;
-export const UNSYNCED_BLOCKS_ALLOWED = 6;
 export const TX_UNCONFIRMED_THRESHOLD = 6;
 export const TX_AGE_POLLING_THRESHOLD = 15 * 60 * 1000; // 15 minutes | unit: milliseconds
-export const MAX_NTP_RECHECKS = 3;
diff --git a/source/renderer/app/config/timingConfig.js b/source/renderer/app/config/timingConfig.js
@@ -10,11 +10,7 @@ export const DELETE_WALLET_COUNTDOWN = 10; // unit: seconds
 export const FORM_VALIDATION_DEBOUNCE_WAIT = 250; // unit: milliseconds
 export const NODE_UPDATE_POLL_INTERVAL = 5000; // unit: milliseconds
 export const ALLOWED_TIME_DIFFERENCE = 15 * 1000000; // 15 seconds | unit: microseconds
-export const MAX_ALLOWED_STALL_DURATION = isTest ? 15000 : 2 * 60 * 1000; // 2 minutes / 15 seconds (isTest = true) | unit: milliseconds
-export const NETWORK_STATUS_REQUEST_TIMEOUT = 30 * 1000; // 30 seconds | unit: milliseconds
 export const NETWORK_STATUS_POLL_INTERVAL = 2000; // 2 seconds | unit: milliseconds
-export const NTP_IGNORE_CHECKS_GRACE_PERIOD = isTest ? 500 : 35 * 1000; // 35 seconds | unit: milliseconds
-export const NTP_RECHECK_TIMEOUT = 1 * 1000; // 1 second | unit: milliseconds;
 export const WALLET_UTXO_API_REQUEST_INTERVAL = 5 * 1000; // 5 seconds | unit: milliseconds
 export const STAKE_POOL_TOOLTIP_HOVER_WAIT = 700; // 700 milliseconds | unit: milliseconds
 export const COPY_STATE_DIRECTORY_PATH_NOTIFICATION_DURATION = 10; // unit: seconds

diff --git a/source/renderer/app/containers/Root.js b/source/renderer/app/containers/Root.js
@@ -21,7 +21,6 @@ export default class Root extends Component<Props> {
       isSynced,
       isNodeStopping,
       isNodeStopped,
-      isSystemTimeCorrect,
       isNotEnoughDiskSpace,
     } = networkStatus;
 
@@ -49,12 +48,7 @@ export default class Root extends Component<Props> {
       return React.Children.only(children);
     }
 
-    if (
-      !isSynced ||
-      !hasLoadedWallets ||
-      !isSystemTimeCorrect ||
-      isNotEnoughDiskSpace
-    ) {
+    if (!isSynced || !hasLoadedWallets || isNotEnoughDiskSpace) {
       return <LoadingPage stores={stores} actions={actions} />;
     }
 

diff --git a/source/renderer/app/containers/loading/LoadingPage.js b/source/renderer/app/containers/loading/LoadingPage.js
@@ -26,12 +26,13 @@ export default class LoadingPage extends Component<InjectedProps> {
   }
 
   get isSystemTimeError() {
-    const {
-      isSystemTimeCorrect,
-      isNodeStopping,
-      isNodeStopped,
-    } = this.networkStatus;
-    return !isSystemTimeCorrect && !isNodeStopping && !isNodeStopped;
+    return false;
+    // const {
+    //   isSystemTimeCorrect,
+    //   isNodeStopping,
+    //   isNodeStopped,
+    // } = this.networkStatus;
+    // return !isSystemTimeCorrect && !isNodeStopping && !isNodeStopped;
   }
 
   get networkStatus() {