Backporting to beta (#4152)

* Fix broken transfer total balance (#4127)

* Add proper label to method decoding inputs (#4136)

* Another minor estimation fix (#4133)

* Return 0 instead of error with out of gas on estimate_gas

* Fix stuff up.

* Another estimate gas fix.

* Alter balance to maximum possible rather than GP=0.

* Only increase to amount strictly necessary.

* Get rid of unsafe code in ethkey, propagate incorrect Secret errors. (#4119)

* Implementing secret

* Fixing tests

* Refactor VoteCollector (#4101)

* dir

* simple validator list

* stub validator contract

* make the engine hold Weak<Client> instead of IoChannel

* validator set factory

* register weak client with ValidatorContract

* check chain security

* add address array to generator

* register provider contract

* update validator set on notify

* add validator contract spec

* simple list test

* split update and contract test

* contract change

* use client in tendermint

* fix deadlock

* step duration in params

* adapt tendermint tests

* add storage fields to test spec

* constructor spec

* execute under wrong address

* create under correct address

* revert

* validator contract constructor

* move genesis block lookup

* add removal ability to contract

* validator contract adding validators

* fix basic authority

* validator changing test

* more docs

* update sync tests

* remove env_logger

* another env_logger

* cameltoe

* hold EngineClient instead of Client

* return error on misbehaviour

* nicer return

* sprinkle docs

* Reenable mainnet update server. (#4137)

* basic tests for subscribeToEvents (#4115)

* subscribeToEvent fixtures ✅

* subscribeToEvent tests ✅

* temporarily skip failing test (#4138)

* Improvements and optimisations to estimate_gas (#4142)

* Return 0 instead of error with out of gas on estimate_gas

* Fix stuff up.

* Another estimate gas fix.

* Alter balance to maximum possible rather than GP=0.

* Only increase to amount strictly necessary.

* Improvements and optimisations to estimate_gas.

- Introduce proper error type
- Avoid building costly traces

* Fix tests.

* Actually fix testsActually fix tests

* Use estimateGas error (as per updated implementation) (#4131)

* Use estimateGas error (as per updated implementation)

* EXCEPTION_ERROR as per #4142

* Better error log reporting & handling (#4128)

* Don't pop-up notifications after network switch (#4076)

* Better notifications

* Don't pollute with notifs if switched networks

* Better connection close/open events / No more notifs on change network

* PR Grumbles

* Add close and open events to HTTP // Add tests

* Fix tests

* WIP Signer Fix

* Fix Signer // Better reconnection handling

* PR Grumbles

* PR Grumbles

* Fixes wrong fetching of balances + Notifications

* Secure API WIP

* Updated Secure API Connection + Status

* Linting

* Linting

* Updated Secure API Logic

* Proper handling of token updates // Fixing poping notifications

* PR Grumbles

* PR Grumbles

* Fixing tests

* Trim spaces from InputAddress (#4126)

* Trim spaces for addresses

* onSubmit has only value, not event

* onSubmit (again)

* Length check on trimmed value

* Remove bindActionCreators({}, dispatch) (empty) (#4135)

js/src/views/Account/Transactions/transactions.js

@@ -18,7 +18,6 @@ import { observer } from 'mobx-react';
 import React, { Component, PropTypes } from 'react';
 import { FormattedMessage } from 'react-intl';
 import { connect } from 'react-redux';
-import { bindActionCreators } from 'redux';
 
 import { Container, TxList, Loading } from '~/ui';
 
@@ -118,11 +117,7 @@ function mapStateToProps (state) {
   };
 }
 
-function mapDispatchToProps (dispatch) {
-  return bindActionCreators({}, dispatch);
-}
-
 export default connect(
   mapStateToProps,
-  mapDispatchToProps
+  null
 )(Transactions);

js/src/views/Application/Status/status.js

@@ -17,7 +17,6 @@
 import React, { Component, PropTypes } from 'react';
 import { FormattedMessage } from 'react-intl';
 import { connect } from 'react-redux';
-import { bindActionCreators } from 'redux';
 
 import { BlockStatus } from '~/ui';
 
@@ -60,6 +59,10 @@ class Status extends Component {
   renderConsensus () {
     const { upgradeStore } = this.props;
 
+    if (!upgradeStore || !upgradeStore.consensusCapability) {
+      return null;
+    }
+
     if (upgradeStore.consensusCapability === 'capable') {
       return (
         <div>
@@ -68,7 +71,9 @@ class Status extends Component {
             defaultMessage='Capable' />
         </div>
       );
-    } else if (upgradeStore.consensusCapability.capableUntil) {
+    }
+
+    if (upgradeStore.consensusCapability.capableUntil) {
       return (
         <div>
           <FormattedMessage
@@ -79,7 +84,9 @@ class Status extends Component {
             } } />
         </div>
       );
-    } else if (upgradeStore.consensusCapability.incapableSince) {
+    }
+
+    if (upgradeStore.consensusCapability.incapableSince) {
       return (
         <div>
           <FormattedMessage
@@ -133,11 +140,7 @@ function mapStateToProps (state) {
   };
 }
 
-function mapDispatchToProps (dispatch) {
-  return bindActionCreators({}, dispatch);
-}
-
 export default connect(
   mapStateToProps,
-  mapDispatchToProps
+  null
 )(Status);

js/src/views/Application/application.js

@@ -14,10 +14,9 @@
 // You should have received a copy of the GNU General Public License
 // along with Parity.  If not, see <http://www.gnu.org/licenses/>.
 
+import { observer } from 'mobx-react';
 import React, { Component, PropTypes } from 'react';
 import { connect } from 'react-redux';
-import { bindActionCreators } from 'redux';
-import { observer } from 'mobx-react';
 
 import UpgradeStore from '~/modals/UpgradeParity/store';
 
@@ -123,11 +122,7 @@ function mapStateToProps (state) {
   };
 }
 
-function mapDispatchToProps (dispatch) {
-  return bindActionCreators({}, dispatch);
-}
-
 export default connect(
   mapStateToProps,
-  mapDispatchToProps
+  null
 )(Application);

js/src/views/Connection/connection.js

@@ -41,9 +41,9 @@ class Connection extends Component {
   }
 
   render () {
-    const { isConnected, needsToken } = this.props;
+    const { isConnecting, isConnected, needsToken } = this.props;
 
-    if (isConnected) {
+    if (!isConnecting && isConnected) {
       return null;
     }
 

js/src/views/Dapps/dapps.js

@@ -14,13 +14,12 @@
 // You should have received a copy of the GNU General Public License
 // along with Parity.  If not, see <http://www.gnu.org/licenses/>.
 
+import { omitBy } from 'lodash';
 import { Checkbox } from 'material-ui';
 import { observer } from 'mobx-react';
 import React, { Component, PropTypes } from 'react';
 import { FormattedMessage } from 'react-intl';
 import { connect } from 'react-redux';
-import { bindActionCreators } from 'redux';
-import { omitBy } from 'lodash';
 
 import { AddDapps, DappPermissions } from '~/modals';
 import PermissionStore from '~/modals/DappPermissions/store';
@@ -169,11 +168,7 @@ function mapStateToProps (state) {
   };
 }
 
-function mapDispatchToProps (dispatch) {
-  return bindActionCreators({}, dispatch);
-}
-
 export default connect(
   mapStateToProps,
-  mapDispatchToProps
+  null
 )(Dapps);

js/src/views/Dapps/dappsStore.js

@@ -256,7 +256,7 @@ export default class DappsStore {
     store.set(LS_KEY_DISPLAY, this.displayApps);
   }
 
-  @action addApps = (_apps) => {
+  @action addApps = (_apps = []) => {
     transaction(() => {
       const apps = _apps.filter((app) => app);
 

js/src/views/ParityBar/parityBar.js

@@ -17,7 +17,6 @@
 import React, { Component, PropTypes } from 'react';
 import { Link } from 'react-router';
 import { connect } from 'react-redux';
-import { bindActionCreators } from 'redux';
 import ActionFingerprint from 'material-ui/svg-icons/action/fingerprint';
 import ContentClear from 'material-ui/svg-icons/content/clear';
 
@@ -162,11 +161,7 @@ function mapStateToProps (state) {
   };
 }
 
-function mapDispatchToProps (dispatch) {
-  return bindActionCreators({}, dispatch);
-}
-
 export default connect(
   mapStateToProps,
-  mapDispatchToProps
+  null
 )(ParityBar);

js/src/views/Settings/Parity/parity.js

@@ -51,7 +51,7 @@ export default class Parity extends Component {
     Object.keys(LOG_KEYS).map((logKey) => {
       const log = LOG_KEYS[logKey];
 
-      const logger = LogLevel.getLogger(log.path);
+      const logger = LogLevel.getLogger(log.key);
       const level = logger.getLevel();
 
       nextState[logKey] = { level, log };
@@ -133,11 +133,11 @@ export default class Parity extends Component {
 
     return Object.keys(logLevels).map((logKey) => {
       const { level, log } = logLevels[logKey];
-      const { path, desc } = log;
+      const { key, desc } = log;
 
       const onChange = (_, index) => {
         const nextLevel = Object.values(selectValues)[index].value;
-        LogLevel.getLogger(path).setLevel(nextLevel);
+        LogLevel.getLogger(key).setLevel(nextLevel);
         this.loadLogLevels();
       };
 

js/src/views/Signer/components/TransactionPendingForm/TransactionPendingFormConfirm/transactionPendingFormConfirm.js

@@ -14,13 +14,12 @@
 // You should have received a copy of the GNU General Public License
 // along with Parity.  If not, see <http://www.gnu.org/licenses/>.
 
+import keycode from 'keycode';
+import RaisedButton from 'material-ui/RaisedButton';
 import React, { Component, PropTypes } from 'react';
 import ReactDOM from 'react-dom';
 import { connect } from 'react-redux';
-import { bindActionCreators } from 'redux';
-import RaisedButton from 'material-ui/RaisedButton';
 import ReactTooltip from 'react-tooltip';
-import keycode from 'keycode';
 
 import { Form, Input, IdentityIcon } from '~/ui';
 
@@ -258,11 +257,7 @@ function mapStateToProps (_, initProps) {
   };
 }
 
-function mapDispatchToProps (dispatch) {
-  return bindActionCreators({}, dispatch);
-}
-
 export default connect(
   mapStateToProps,
-  mapDispatchToProps
+  null
 )(TransactionPendingFormConfirm);

js/src/views/Status/components/MiningSettings/miningSettings.js

@@ -37,6 +37,14 @@ export default class MiningSettings extends Component {
     const { nodeStatus } = this.props;
     const { coinbase, defaultExtraData, extraData, gasFloorTarget, minGasPrice } = nodeStatus;
 
+    const extradata = extraData
+      ? decodeExtraData(extraData)
+      : '';
+
+    const defaultExtradata = defaultExtraData
+      ? decodeExtraData(defaultExtraData)
+      : '';
+
     return (
       <div { ...this._testInherit() }>
         <ContainerTitle title='mining settings' />
@@ -53,9 +61,9 @@ export default class MiningSettings extends Component {
         <Input
           label='extradata'
           hint='extra data for mined blocks'
-          value={ decodeExtraData(extraData) }
+          value={ extradata }
           onSubmit={ this.onExtraDataChange }
-          defaultValue={ decodeExtraData(defaultExtraData) }
+          defaultValue={ defaultExtradata }
           allowCopy
           floatCopy
           { ...this._test('extra-data') }

js/src/views/Status/components/Status/status.js

@@ -95,9 +95,15 @@ export default class Status extends Component {
 
   renderSettings () {
     const { nodeStatus } = this.props;
-    const { rpcSettings, netPeers } = nodeStatus;
+    const { rpcSettings, netPeers, netPort = '' } = nodeStatus;
     const peers = `${netPeers.active}/${netPeers.connected}/${netPeers.max}`;
 
+    if (!rpcSettings) {
+      return null;
+    }
+
+    const rpcPort = rpcSettings.port || '';
+
     return (
       <div { ...this._test('settings') }>
         <ContainerTitle title='network settings' />
@@ -121,7 +127,7 @@ export default class Status extends Component {
               allowCopy
               readOnly
               label='network port'
-              value={ nodeStatus.netPort.toString() }
+              value={ netPort.toString() }
               { ...this._test('network-port') } />
           </div>
         </div>
@@ -146,7 +152,7 @@ export default class Status extends Component {
               allowCopy
               readOnly
               label='rpc port'
-              value={ rpcSettings.port.toString() }
+              value={ rpcPort.toString() }
               { ...this._test('rpc-port') } />
           </div>
         </div>