diff --git a/react/src/actions/actionCreators.js b/react/src/actions/actionCreators.js index 04c457d..731aee4 100644 --- a/react/src/actions/actionCreators.js +++ b/react/src/actions/actionCreators.js @@ -6,7 +6,6 @@ import { GET_ACTIVE_COINS, DASHBOARD_ACTIVE_ADDRESS, VIEW_CACHE_DATA, - DASHBOARD_DISPLAY_NOTARIES_MODAL, DASHBOARD_ACTIVE_COIN_MAIN_BASILISK_ADDR, DASHBOARD_ACTIVE_SECTION, DASHBOARD_ACTIVE_TXINFO_MODAL, @@ -47,7 +46,6 @@ export * from './actions/sendFullBasilisk'; export * from './actions/settings'; export * from './actions/syncOnly'; export * from './actions/iguanaInstance'; -export * from './actions/notary'; export * from './actions/edexBalance'; export * from './actions/addCoin'; export * from './actions/addressBalance'; @@ -87,13 +85,6 @@ export function toggleViewCacheModal(display) { } } -export function displayNotariesModal(display) { - return { - type: DASHBOARD_DISPLAY_NOTARIES_MODAL, - display, - } -} - export function changeMainBasiliskAddress(address) { return { type: DASHBOARD_ACTIVE_COIN_MAIN_BASILISK_ADDR, diff --git a/react/src/actions/actions/iguanaInstance.js b/react/src/actions/actions/iguanaInstance.js index ceba837..42856da 100644 --- a/react/src/actions/actions/iguanaInstance.js +++ b/react/src/actions/actions/iguanaInstance.js @@ -24,22 +24,6 @@ export function restartIguanaInstance(pmid) { }); } -export function restartBasiliskInstance() { - return dispatch => { - getIguanaInstancesList() - .then(function(json) { - for (let port in json.result) { - if (json.result[port].mode === 'basilisk') { - restartIguanaInstance(json.result[port].pmid) - .then(function(json) { - console.log('restartBasiliskInstance', json); - }); - } - } - }); - } -} - export function startIguanaInstance(mode, coin) { return new Promise((resolve, reject) => { fetch(`http://127.0.0.1:${Config.agamaPort}/shepherd/forks`, { diff --git a/react/src/actions/actions/notary.js b/react/src/actions/actions/notary.js deleted file mode 100644 index 9a81283..0000000 --- a/react/src/actions/actions/notary.js +++ /dev/null @@ -1,168 +0,0 @@ -import { - DASHBOARD_CONNECT_NOTARIES, - DASHBOARD_GET_NOTARIES_LIST -} from '../storeType'; -import { translate } from '../../translate/translate'; -import { triggerToaster } from '../actionCreators'; -import Config from '../../config'; - -function initNotaryNodesConSequence(nodes) { - return dispatch => { - Promise.all(nodes.map((node, index) => { - const payload = { - userpass: `tmpIgRPCUser@${sessionStorage.getItem('IguanaRPCAuth')}`, - agent: 'dex', - method: 'getinfo', - symbol: node, - timeout: 10000, - }; - - return new Promise((resolve, reject) => { - fetch(`http://127.0.0.1:${(Config.useBasiliskInstance ? Config.iguanaCorePort + 1 : Config.iguanaCorePort)}/api/dex/getinfo?userpass=${('tmpIgRPCUser@' + sessionStorage.getItem('IguanaRPCAuth'))}&symbol=${node}`, { - method: 'GET', - }) - .catch(function(error) { - console.log(error); - dispatch( - triggerToaster( - `getInfoDexNode+${node}`, - 'Error', - 'error' - ) - ); - }) - .then(response => response.json()) - .then(json => { - dispatch( - updateNotaryNodeConState( - json, - nodes.length, - index, - node - ) - ); - }) - }); - })); - } -} - -function updateNotaryNodeConState(json, totalNodes, currentNodeIndex, currentNodeName) { - if (currentNodeIndex === totalNodes - 1) { - return dispatch => { - dispatch(basiliskConnectionState(false)); - }; - } else { - if (json && - json.error === 'less than required responses') { - return { - type: DASHBOARD_CONNECT_NOTARIES, - total: totalNodes - 1, - current: currentNodeIndex, - name: currentNodeName, - failedNode: currentNodeName, - } - } else { - return { - type: DASHBOARD_CONNECT_NOTARIES, - total: totalNodes - 1, - current: currentNodeIndex, - name: currentNodeName, - } - } - } -} - -function connectAllNotaryNodes(json, dispatch) { - if (json && - json.length) { - dispatch(initNotaryNodesConSequence(json)); - - return { - type: DASHBOARD_CONNECT_NOTARIES, - total: json.length - 1, - current: 0, - name: json[0], - } - } -} - -export function connectNotaries() { - const payload = { - userpass: `tmpIgRPCUser@${sessionStorage.getItem('IguanaRPCAuth')}`, - agent: 'dpow', - method: 'notarychains', - }; - - return dispatch => { - return fetch(`http://127.0.0.1:${Config.iguanaCorePort}`, { - method: 'POST', - body: JSON.stringify(payload), - }) - .catch(function(error) { - console.log(error); - dispatch( - triggerToaster( - 'connectNotaries', - 'Error', - 'error' - ) - ); - }) - .then(response => response.json()) - .then( - json => dispatch( - connectAllNotaryNodes(json, dispatch) - ) - ) - } -} - -function getDexNotariesState(json) { - if (json.error === 'less than required responses') { - return dispatch => { - dispatch( - triggerToaster( - translate('TOASTR.LESS_RESPONSES_REQ'), - translate('TOASTR.BASILISK_NOTIFICATION'), - 'error' - ) - ); - } - } else { - return { - type: DASHBOARD_GET_NOTARIES_LIST, - notaries: json, - } - } -} - -export function getDexNotaries(coin) { - const payload = { - userpass: `tmpIgRPCUser@${sessionStorage.getItem('IguanaRPCAuth')}`, - agent: 'dex', - method: 'getnotaries', - symbol: coin, - }; - - return dispatch => { - return fetch(`http://127.0.0.1:${Config.useBasiliskInstance ? Config.iguanaCorePort + 1 : Config.iguanaCorePort}`, { - method: 'POST', - body: JSON.stringify(payload), - }) - .catch(function(error) { - console.log(error); - dispatch( - triggerToaster( - 'getDexNotaries', - 'Error', - 'error' - ) - ); - }) - .then(response => response.json()) - .then(json => { - dispatch(getDexNotariesState(json)); - }) - } -} \ No newline at end of file diff --git a/react/src/actions/storeType.js b/react/src/actions/storeType.js index 55e2857..6438740 100644 --- a/react/src/actions/storeType.js +++ b/react/src/actions/storeType.js @@ -30,9 +30,6 @@ export const DASHBOARD_ACTIVE_COIN_NATIVE_OPIDS = 'DASHBOARD_ACTIVE_COIN_NATIVE_ export const DASHBOARD_ACTIVE_COIN_SENDTO = 'DASHBOARD_ACTIVE_COIN_SENDTO'; export const DASHBOARD_ACTIVE_COIN_GET_CACHE = 'DASHBOARD_ACTIVE_COIN_GET_CACHE'; export const DASHBOARD_ACTIVE_COIN_MAIN_BASILISK_ADDR = 'DASHBOARD_ACTIVE_COIN_MAIN_BASILISK_ADDR'; -export const DASHBOARD_GET_NOTARIES_LIST = 'DASHBOARD_GET_NOTARIES_LIST'; -export const DASHBOARD_DISPLAY_NOTARIES_MODAL = 'DASHBOARD_DISPLAY_NOTARIES_MODAL'; -export const DASHBOARD_CONNECT_NOTARIES = 'DASHBOARD_CONNECT_NOTARIES'; export const VIEW_CACHE_DATA = 'VIEW_CACHE_DATA'; export const SYNC_ONLY_MODAL_TOGGLE = 'SYNC_ONLY_MODAL_TOGGLE'; export const SYNC_ONLY_DATA = 'SYNC_ONLY_DATA'; diff --git a/react/src/components/dashboard/walletsBasiliskConnection/walletsBasiliskConnection.js b/react/src/components/dashboard/walletsBasiliskConnection/walletsBasiliskConnection.js deleted file mode 100755 index eba514b..0000000 --- a/react/src/components/dashboard/walletsBasiliskConnection/walletsBasiliskConnection.js +++ /dev/null @@ -1,46 +0,0 @@ -import React from 'react'; -import { connect } from 'react-redux'; -import { basiliskConnection } from '../../../actions/actionCreators'; -import Store from '../../../store'; -import WalletsBasiliskConnectionRender from './walletsBasiliskConnection.render'; - -class WalletsBasiliskConnection extends React.Component { - constructor() { - super(); - this.basiliskConnectionAction = this.basiliskConnectionAction.bind(this); - } - - basiliskConnectionAction() { - Store.dispatch(basiliskConnection(false)); - } - - handleKeydown(e) { - if (e.key === 'Escape') { - this.basiliskConnectionAction(); - } - } - - isBasiliskConnection() { - return this.props && - this.props.Dashboard.basiliskConnection; - } - - render() { - if (this.isBasiliskConnection()) { - return WalletsBasiliskConnectionRender.call(this); - } else { - return null; - } - } -} - -const mapStateToProps = (state) => { - return { - Dashboard: { - basiliskConnection: state.Dashboard.basiliskConnection, - connectedNotaries: state.Dashboard.connectedNotaries, - } - }; -}; - -export default connect(mapStateToProps)(WalletsBasiliskConnection); diff --git a/react/src/components/dashboard/walletsBasiliskConnection/walletsBasiliskConnection.render.js b/react/src/components/dashboard/walletsBasiliskConnection/walletsBasiliskConnection.render.js deleted file mode 100644 index a9a8afd..0000000 --- a/react/src/components/dashboard/walletsBasiliskConnection/walletsBasiliskConnection.render.js +++ /dev/null @@ -1,83 +0,0 @@ -import React from 'react'; -import { translate } from '../../../translate/translate'; - -const WalletsBasiliskConnectionRender = function() { - return ( -
this.handleKeydown(event) }> -
-
-
-
-

- { translate('INDEX.REFRESHING_BASILISK_NET') }... -

- -
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- { `${translate('IAPI.CON_STATUS')}... ${this.props.Dashboard.connectedNotaries.current} / ${this.props.Dashboard.connectedNotaries.total}:${this.props.Dashboard.connectedNotaries.currentNodeName}` } { Math.floor(this.props.Dashboard.connectedNotaries.current * 100 / this.props.Dashboard.connectedNotaries.total) }% -
-
-
-
- 
-                { this.props.Dashboard.connectedNotaries.failedToConnectNodes ? `Failed: ${this.props.Dashboard.connectedNotaries.failedToConnectNodes}` : null }
-
-
-
-
-
-
-
- ); -}; - -export default WalletsBasiliskConnectionRender; \ No newline at end of file diff --git a/react/src/components/dashboard/walletsBasiliskRefresh/walletsBasiliskRefresh.js b/react/src/components/dashboard/walletsBasiliskRefresh/walletsBasiliskRefresh.js deleted file mode 100644 index aa60dd7..0000000 --- a/react/src/components/dashboard/walletsBasiliskRefresh/walletsBasiliskRefresh.js +++ /dev/null @@ -1,26 +0,0 @@ -import React from 'react'; -import { connect } from 'react-redux'; -import WalletsBasiliskRefreshRender from './walletsBasiliskRefresh.render'; - -class WalletsBasiliskRefresh extends React.Component { - isBasiliskRefresh() { - return this.props && - this.props.Dashboard.basiliskRefresh; - } - - render() { - if (this.isBasiliskRefresh()) { - return WalletsBasiliskRefreshRender.call(this); - } - - return null; - } -} -const mapStateToProps = (state) => { - return { - Dashboard: { - basiliskRefresh: state.Dashboard.basiliskRefresh, - } - }; -}; -export default connect(mapStateToProps)(WalletsBasiliskRefresh); diff --git a/react/src/components/dashboard/walletsBasiliskRefresh/walletsBasiliskRefresh.render.js b/react/src/components/dashboard/walletsBasiliskRefresh/walletsBasiliskRefresh.render.js deleted file mode 100644 index 2ca1658..0000000 --- a/react/src/components/dashboard/walletsBasiliskRefresh/walletsBasiliskRefresh.render.js +++ /dev/null @@ -1,36 +0,0 @@ -import React from 'react'; -import { translate } from '../../../translate/translate'; - -const WalletsBasiliskRefreshRender = function() { - return ( -
-
-
-
-
-

{ translate('INDEX.FETCHING_BASILISK_DATA') }

-
- -
-
-
- - - - - - - - - - -
{ translate('INDEX.ADDRESS') }{ translate('INDEX.LIST_UNSPENT') }{ translate('INDEX.LIST_TRANSACTIONS') }{ translate('INDEX.GET_BALANCE') }{ translate('INDEX.REFRESH') }
-
-
-
-
-
- ); -}; - -export default WalletsBasiliskRefreshRender; \ No newline at end of file diff --git a/react/src/components/dashboard/walletsData/walletsData.js b/react/src/components/dashboard/walletsData/walletsData.js index 684718c..e8367ac 100644 --- a/react/src/components/dashboard/walletsData/walletsData.js +++ b/react/src/components/dashboard/walletsData/walletsData.js @@ -10,12 +10,8 @@ import { toggleDashboardTxInfoModal, getBasiliskTransactionsList, changeMainBasiliskAddress, - displayNotariesModal, toggleViewCacheModal, changeActiveAddress, - restartBasiliskInstance, - connectNotaries, - getDexNotaries, deleteCacheFile, fetchNewCacheData, fetchUtxoCache, @@ -64,14 +60,10 @@ class WalletsData extends React.Component { this.toggleBasiliskActionsMenu = this.toggleBasiliskActionsMenu.bind(this); this.basiliskRefreshAction = this.basiliskRefreshAction.bind(this); - this.basiliskConnectionAction = this.basiliskConnectionAction.bind(this); - this.getDexNotariesAction = this.getDexNotariesAction.bind(this); this.openDropMenu = this.openDropMenu.bind(this); this.removeAndFetchNewCache = this.removeAndFetchNewCache.bind(this); this._toggleViewCacheModal = this._toggleViewCacheModal.bind(this); - this.toggleCacheApi = this.toggleCacheApi.bind(this); this._fetchUtxoCache = this._fetchUtxoCache.bind(this); - this.restartBasiliskInstance = this.restartBasiliskInstance.bind(this); this.basiliskRefreshActionOne = this.basiliskRefreshActionOne.bind(this); this.handleClickOutside = this.handleClickOutside.bind(this); this.refreshTxHistory = this.refreshTxHistory.bind(this); @@ -219,20 +211,6 @@ class WalletsData extends React.Component { } } - // deprecated - toggleCacheApi() { - const _useCache = !this.state.useCache; - - sessionStorage.setItem('useCache', _useCache); - this.setState(Object.assign({}, this.state, { - useCache: _useCache, - })); - } - - restartBasiliskInstance() { - Store.dispatch(restartBasiliskInstance()); - } - _toggleViewCacheModal() { Store.dispatch(toggleViewCacheModal(!this.props.Dashboard.displayViewCacheModal)); } @@ -340,18 +318,6 @@ class WalletsData extends React.Component { })); } - basiliskConnectionAction() { - if (this.props.Dashboard) { - Store.dispatch(basiliskConnection(!this.props.Dashboard.basiliskConnection)); - Store.dispatch(connectNotaries()); - } - } - - getDexNotariesAction() { - Store.dispatch(getDexNotaries(this.props.ActiveCoin.coin)); - Store.dispatch(displayNotariesModal(true)); - } - toggleTxInfoModal(display, txIndex) { Store.dispatch(toggleDashboardTxInfoModal(display, txIndex)); } @@ -697,9 +663,7 @@ const mapStateToProps = (state) => { Main: { coins: state.Main.coins, } - }; - }; export default connect(mapStateToProps)(WalletsData); \ No newline at end of file diff --git a/react/src/components/dashboard/walletsData/walletsData.render.js b/react/src/components/dashboard/walletsData/walletsData.render.js index f404a8f..3e50ece 100644 --- a/react/src/components/dashboard/walletsData/walletsData.render.js +++ b/react/src/components/dashboard/walletsData/walletsData.render.js @@ -1,8 +1,5 @@ import React from 'react'; import { translate } from '../../../translate/translate'; -import WalletsBasiliskRefresh from '../walletsBasiliskRefresh/walletsBasiliskRefresh'; -import WalletsBasiliskConnection from '../walletsBasiliskConnection/walletsBasiliskConnection'; -import WalletsNotariesList from '../walletsNotariesList/walletsNotariesList'; import WalletsCacheData from '../walletsCacheData/walletsCacheData'; import ReactTable from 'react-table'; import TablePaginationRenderer from './pagination'; @@ -192,9 +189,6 @@ export const WalletsDataRender = function() { return ( - - -
@@ -225,16 +219,6 @@ export const WalletsDataRender = function() {