Browse Source

suppress rpc failures during native rescan

v0.25
pbca26 7 years ago
parent
commit
f6573aed84
  1. 3
      react/src/actions/actions/nativeDashboardUpdate.js
  2. 11
      react/src/actions/actions/nativeSyncInfo.js
  3. 9
      react/src/components/dashboard/coinTile/coinTileItem.js
  4. 1
      react/src/components/dashboard/coinTile/coinTileItem.render.js

3
react/src/actions/actions/nativeDashboardUpdate.js

@ -57,6 +57,7 @@ export function getDashboardUpdateState(json, coin, fakeResponse) {
balance: null,
addresses: null,
coin: coin,
getinfoFetchFailures: 0,
rescanInProgress: true,
};
} else {
@ -83,6 +84,7 @@ export function getDashboardUpdateState(json, coin, fakeResponse) {
},
addresses: json.result.addresses,
coin: coin,
getinfoFetchFailures: 0,
rescanInProgress: false,
};
} else {
@ -109,6 +111,7 @@ export function getDashboardUpdateState(json, coin, fakeResponse) {
balance: json.result.z_gettotalbalance.result,
addresses: json.result.addresses,
coin: coin,
getinfoFetchFailures: 0,
rescanInProgress: false,
};
}

11
react/src/actions/actions/nativeSyncInfo.js

@ -8,6 +8,7 @@ import {
} from '../actionCreators';
import Config from '../../config';
import { translate } from '../../translate/translate';
import mainWindow from '../../util/mainWindow';
export function nativeGetinfoFailureState() {
return {
@ -48,11 +49,11 @@ export function getSyncInfoNativeKMD(skipDebug, json, skipRemote) {
_json['remoteKMDNode'] = json.info;
dispatch(getSyncInfoNativeState(_json));
})
.then(function() {
.then(() => {
if (!skipDebug) {
dispatch(getDebugLog('komodo', 1));
}
})
});
}
}
}
@ -147,11 +148,7 @@ export function getSyncInfoNative(coin, skipDebug, skipRemote, suppressErrors) {
} else {
if (!json ||
json.indexOf('"code":-777') > -1) {
let _kmdMainPassiveMode;
try {
_kmdMainPassiveMode = window.require('electron').remote.getCurrentWindow().kmdMainPassiveMode;
} catch (e) {}
const _kmdMainPassiveMode = mainWindow.kmdMainPassiveMode;
if (_kmdMainPassiveMode) {
dispatch(

9
react/src/components/dashboard/coinTile/coinTileItem.js

@ -29,12 +29,13 @@ import {
} from '../../../actions/actionCreators';
import Store from '../../../store';
import Config from '../../../config';
import mainWindow from '../../../util/mainWindow';
import CoinTileItemRender from './coinTileItem.render';
const SPV_DASHBOARD_UPDATE_TIMEOUT = 60000;
const ACTIVE_HANDLE_TIMEOUT_COIND_NATIVE = 15000;
const COIND_DOWN_MODAL_FETCH_FAILURES_THRESHOLD = window.require('electron').remote.getCurrentWindow().appConfig.failedRPCAttemptsThreshold || 10;
const COIND_DOWN_MODAL_FETCH_FAILURES_THRESHOLD = mainWindow.appConfig.failedRPCAttemptsThreshold || 10;
class CoinTileItem extends React.Component {
constructor() {
@ -133,11 +134,7 @@ class CoinTileItem extends React.Component {
this.autoSetActiveCoin();
}
let appConfig;
try {
appConfig = window.require('electron').remote.getCurrentWindow().appConfig;
} catch (e) {}
const appConfig = mainWindow.appConfig;
this.setState({
appConfig,

1
react/src/components/dashboard/coinTile/coinTileItem.render.js

@ -46,6 +46,7 @@ const CoinTileItemRender = function() {
className="icon fa-info-circle icon-spv-connection-warning"></i>
}
{ this.renderCoinConError(item) &&
!this.props.ActiveCoin.rescanInProgress &&
<i
onClick={ this.openCoindDownModal }
title={ `Unable to establish RPC connection! Retries count: ${this.props.ActiveCoin.getinfoFetchFailures}.` }

Loading…
Cancel
Save