Skip to content

Commit

Permalink
Merge pull request #185 from SuperNETorg/v0.24
Browse files Browse the repository at this point in the history 
V0.24
  • Loading branch information
@pbca26
pbca26 authored Nov 16, 2017
2 parents 150ff11 + 85a7d82 commit b7591a0
Show file tree
Hide file tree
Showing 29 changed files with 872 additions and 107 deletions.
11 changes: 4 additions & 7 deletions react/src/actions/actions/nativeSyncInfo.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@ import {
import {
triggerToaster,
getDebugLog,
toggleCoindDownModal
} from '../actionCreators';
import Config from '../../config';
import { translate } from '../../translate/translate';
Expand Down Expand Up @@ -138,24 +137,23 @@ export function getSyncInfoNative(coin, skipDebug, skipRemote, suppressErrors) {
{
result: 'daemon is busy',
error: null,
id: null
id: null,
},
coin,
true,
skipRemote
)
);
} else {
if (!json) {
if (!json ||
json.indexOf('"code":-777') > -1) {
let _kmdMainPassiveMode;

try {
_kmdMainPassiveMode = window.require('electron').remote.getCurrentWindow().kmdMainPassiveMode;
} catch (e) {}

if (!_kmdMainPassiveMode) {
dispatch(nativeGetinfoFailureState());
} else {
if (_kmdMainPassiveMode) {
dispatch(
triggerToaster(
translate('API.KMD_PASSIVE_ERROR'),
Expand All @@ -171,7 +169,6 @@ export function getSyncInfoNative(coin, skipDebug, skipRemote, suppressErrors) {
} else {
dispatch(getDebugLog('komodo', 50, coin));
}
dispatch(toggleCoindDownModal(true));
} else {
json = JSON.parse(json);
}
Expand Down
92 changes: 92 additions & 0 deletions react/src/actions/actions/settings.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -386,4 +386,96 @@ export function resetAppConfig() {
);
})
}
}

export function coindGetStdout(chain) {
const _chain = chain === 'KMD' ? 'komodod' : chain;

return new Promise((resolve, reject) => {
fetch(`http://127.0.0.1:${Config.agamaPort}/shepherd/coind/stdout?chain=${chain}`, {
method: 'GET',
headers: {
'Content-Type': 'application/json',
},
})
.catch((error) => {
console.log(error);
dispatch(
triggerToaster(
'coindGetStdout',
'Error',
'error'
)
);
})
.then(response => response.json())
.then(json => {
resolve(json);
});
});
}

export function getWalletDatKeys(chain, keyMatchPattern) {
const _chain = chain === 'KMD' ? null : chain;

return new Promise((resolve, reject) => {
fetch(keyMatchPattern ? `http://127.0.0.1:${Config.agamaPort}/shepherd/coindwalletkeys?chain=${_chain}&search=${keyMatchPattern}` : `http://127.0.0.1:${Config.agamaPort}/shepherd/coindwalletkeys?chain=${_chain}`, {
method: 'GET',
headers: {
'Content-Type': 'application/json',
},
})
.catch((error) => {
console.log(error);
dispatch(
triggerToaster(
'getWalletDatKeys',
'Error',
'error'
)
);
})
.then(response => response.json())
.then(json => {
resolve(json);
});
});
}

export function dumpPrivKey(coin, address) {
return new Promise((resolve, reject) => {
const payload = {
mode: null,
chain: coin,
cmd: 'dumpprivkey',
params: [ address ]
};

const _fetchConfig = {
method: 'POST',
headers: {
'Content-Type': 'application/json',
},
body: JSON.stringify({ 'payload': payload }),
};

fetch(
`http://127.0.0.1:${Config.agamaPort}/shepherd/cli`,
_fetchConfig
)
.catch(function(error) {
console.log(error);
dispatch(
triggerToaster(
'dumpPrivKey',
'Error',
'error'
)
);
})
.then(response => response.json())
.then(json => {
resolve(json.result ? json.result : json);
})
});
}
76 changes: 60 additions & 16 deletions react/src/components/addcoin/addcoin.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,11 @@ import {
toggleAddcoinModal,
triggerToaster,
shepherdGetCoinList,
shepherdPostCoinList
shepherdPostCoinList,
toggleZcparamsFetchModal,
} from '../../actions/actionCreators';
import Store from '../../store';
import { zcashParamsCheckErrors } from '../../util/zcashParams';

import CoinSelectorsRender from './coin-selectors.render';
import AddCoinRender from './addcoin.render';
Expand Down Expand Up @@ -46,6 +48,43 @@ class AddCoin extends React.Component {
this.toggleActionsMenu = this.toggleActionsMenu.bind(this);
this.saveCoinSelection = this.saveCoinSelection.bind(this);
this.loadCoinSelection = this.loadCoinSelection.bind(this);
this.verifyZcashParamsExist = this.verifyZcashParamsExist.bind(this);
}

verifyZcashParamsExist(mode) {
return new Promise((resolve, reject) => {
if (Number(mode) === -1) {
const _res = window.require('electron').remote.getCurrentWindow().zcashParamsExist;
const __errors = zcashParamsCheckErrors(_res);

if (__errors) {
window.require('electron').remote.getCurrentWindow().zcashParamsExistPromise()
.then((res) => {
const _errors = zcashParamsCheckErrors(res);
window.require('electron').remote.getCurrentWindow().zcashParamsExist = res;

if (_errors) {
Store.dispatch(
triggerToaster(
_errors,
'Komodod',
'error',
false
)
);
Store.dispatch(toggleZcparamsFetchModal(true));
resolve(false);
} else {
resolve(true);
}
});
} else {
resolve(true);
}
} else {
resolve(true);
}
});
}

saveCoinSelection() {
Expand Down Expand Up @@ -206,23 +245,28 @@ class AddCoin extends React.Component {
return;
}

if (!_coin.daemonParam) {
Store.dispatch(addCoin(
coin,
_coin.mode,
));
} else {
Store.dispatch(addCoin(
coin,
_coin.mode,
{ type: _coin.daemonParam }
));
}
this.verifyZcashParamsExist(_coin.mode)
.then((res) => {
if (res) {
if (!_coin.daemonParam) {
Store.dispatch(addCoin(
coin,
_coin.mode,
));
} else {
Store.dispatch(addCoin(
coin,
_coin.mode,
{ type: _coin.daemonParam }
));
}

this.removeCoin();
this.addNewItem();
this.removeCoin();
this.addNewItem();

Store.dispatch(toggleAddcoinModal(false, false));
Store.dispatch(toggleAddcoinModal(false, false));
}
});
}

dismiss() {
Expand Down
38 changes: 34 additions & 4 deletions react/src/components/dashboard/coinTile/coinTileItem.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,13 +24,14 @@ import {
activeHandle,
triggerToaster,
shepherdRemoveCoin,
toggleCoindDownModal,
} from '../../../actions/actionCreators';
import Store from '../../../store';
import Config from '../../../config';

import CoinTileItemRender from './coinTileItem.render';

const SPV_DASHBOARD_UPDATE_TIMEOUT = 10000;
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;

Expand All @@ -39,10 +40,31 @@ class CoinTileItem extends React.Component {
super();
this.state = {
appConfig: {},
activeCoin: null,
activeCoinMode: null,
propsUpdatedCounter: 0,
};
this.autoSetActiveCoin = this.autoSetActiveCoin.bind(this);
}

openCoindDownModal() {
Store.dispatch(toggleCoindDownModal(true));
}

renderCoinConError(item) {
if (this.props.ActiveCoin.getinfoFetchFailures >= COIND_DOWN_MODAL_FETCH_FAILURES_THRESHOLD &&
(this.props.ActiveCoin.mode === 'native' &&
this.props.ActiveCoin.coin === this.state.activeCoin &&
this.props.ActiveCoin.coin === item.coin &&
this.state.activeCoin === item.coin &&
this.state.activeCoinMode === 'native' &&
this.props.ActiveCoin.mode === this.state.activeCoinMode &&
this.state.propsUpdatedCounter > 1) ||
(this.props.ActiveCoin.coins && this.props.ActiveCoin.coins[item.coin]) && this.props.ActiveCoin.coins[item.coin].getinfoFetchFailures >= COIND_DOWN_MODAL_FETCH_FAILURES_THRESHOLD) {
return true;
}
}

renderStopCoinButton() {
if (this.props.Main &&
this.props.Main.coins &&
Expand Down Expand Up @@ -87,11 +109,11 @@ class CoinTileItem extends React.Component {
_coinMode[coin] = mode;
});

if (_coinMode['KMD'] &&
_coinMode['KMD'] === 'native') {
if (_coinMode.KMD &&
_coinMode.KMD === 'native') {
_coin = 'KMD';
_mode = 'native';
} else if (_coinMode['KMD'] && _coinMode['KMD'] === 'spv') {
} else if (_coinMode.KMD && _coinMode.KMD === 'spv') {
_coin = 'KMD';
_mode = 'spv';
}
Expand Down Expand Up @@ -271,6 +293,13 @@ class CoinTileItem extends React.Component {
Store.dispatch(electrumServerChanged(false));
}, 100);
}

this.setState({
activeCoin: props.ActiveCoin.coin,
activeCoinMode: props.ActiveCoin.mode,
// prevent native con error icon flashing on coin switch
propsUpdatedCounter: this.state.activeCoin === props.ActiveCoin.coin && this.state.activeCoinMode === props.ActiveCoin.mode ? this.state.propsUpdatedCounter + 1 : 0,
});
}

render() {
Expand All @@ -282,6 +311,7 @@ const mapStateToProps = (state) => {
return {
ActiveCoin: {
coin: state.ActiveCoin.coin,
coins: state.ActiveCoin.coins,
mode: state.ActiveCoin.mode,
addresses: state.ActiveCoin.addresses,
mainBasiliskAddress: state.ActiveCoin.mainBasiliskAddress,
Expand Down
8 changes: 7 additions & 1 deletion react/src/components/dashboard/coinTile/coinTileItem.render.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ const CoinTileItemRender = function() {
<i
onClick={ () => this.removeCoin(item.coin, item.mode) }
title="Remove"
className={ 'icon fa-plus-circle ' + (item.mode === 'spv' ? 'coind-remove-icon coind-remove-icon-spv' : 'coind-remove-icon') }></i>
className={ 'icon fa-plus-circle coind-remove-icon' + (item.mode === 'spv' ? ' coind-remove-icon-spv' : '') }></i>
}
{ this.props.Dashboard &&
this.props.Dashboard.electrumCoins &&
Expand All @@ -45,6 +45,12 @@ const CoinTileItemRender = function() {
title={ translate('SETTINGS.SPV_SINGLE_SERVER_NOTICE') }
className="icon fa-info-circle icon-spv-connection-warning"></i>
}
{ this.renderCoinConError(item) &&
<i
onClick={ this.openCoindDownModal }
title={ `Unable to establish RPC connection! Retries count: ${this.props.ActiveCoin.getinfoFetchFailures}.` }
className="icon fa-warning icon-native-connection-warning"></i>
}
</div>
);
};
Expand Down
Loading

0 comments on commit b7591a0

Please sign in to comment.