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/util/notifications.js

@@ -16,7 +16,6 @@
 
 import Push from 'push.js';
 import BigNumber from 'bignumber.js';
-import { noop } from 'lodash';
 
 import { fromWei } from '~/api/util/wei';
 
@@ -33,13 +32,34 @@ export function notifyTransaction (account, token, _value, onClick) {
     ? ethereumIcon
     : (token.image || unkownIcon);
 
-  Push.create(`${name}`, {
-    body: `You just received ${value.toFormat()} ${token.tag.toUpperCase()}`,
-    icon: {
-      x16: icon,
-      x32: icon
-    },
-    timeout: 20000,
-    onClick: onClick || noop
-  });
+  let _notification = null;
+
+  Push
+    .create(`${name}`, {
+      body: `You just received ${value.toFormat(3)} ${token.tag.toUpperCase()}`,
+      icon: {
+        x16: icon,
+        x32: icon
+      },
+      timeout: 20000,
+      onClick: () => {
+        // Focus on the UI
+        try {
+          window.focus();
+        } catch (e) {}
+
+        if (onClick && typeof onClick === 'function') {
+          onClick();
+        }
+
+        // Close the notification
+        if (_notification) {
+          _notification.close();
+          _notification = null;
+        }
+      }
+    })
+    .then((notification) => {
+      _notification = notification;
+    });
 }

js/src/util/subscribe-to-events.spec.js

@@ -0,0 +1,115 @@
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
+// This file is part of Parity.
+
+// Parity is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+
+// Parity is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+
+// You should have received a copy of the GNU General Public License
+// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
+
+import { spy, stub } from 'sinon';
+
+import subscribeToEvents from './subscribe-to-events';
+import {
+  pastLogs, liveLogs, createApi, createContract
+} from './subscribe-to-events.test.js';
+
+const delay = (t) => new Promise((resolve) => {
+  setTimeout(resolve, t);
+});
+
+describe('util/subscribe-to-events', () => {
+  beforeEach(function () {
+    this.api = createApi();
+    this.contract = createContract(this.api);
+  });
+
+  it('installs a filter', async function () {
+    const { api, contract } = this;
+
+    subscribeToEvents(contract, [ 'Foo', 'Bar' ]);
+    await delay(0);
+
+    expect(api.eth.newFilter.calledOnce).to.equal(true);
+    expect(api.eth.newFilter.firstCall.args).to.eql([ {
+      fromBlock: 0, toBlock: 'latest',
+      address: contract.address,
+      topics: [ [
+        contract.instance.Foo.signature,
+        contract.instance.Bar.signature
+      ] ]
+    } ]);
+  });
+
+  it('queries & parses logs in the beginning', async function () {
+    const { api, contract } = this;
+
+    subscribeToEvents(contract, [ 'Foo', 'Bar' ]);
+
+    await delay(0);
+    expect(api.eth.getFilterLogs.callCount).to.equal(1);
+    expect(api.eth.getFilterLogs.firstCall.args).to.eql([ 123 ]);
+
+    await delay(0);
+    expect(contract.parseEventLogs.callCount).to.equal(1);
+  });
+
+  it('emits logs in the beginning', async function () {
+    const { contract } = this;
+
+    const onLog = spy();
+    const onFoo = spy();
+    const onBar = spy();
+    subscribeToEvents(contract, [ 'Foo', 'Bar' ])
+      .on('log', onLog)
+      .on('Foo', onFoo)
+      .on('Bar', onBar);
+
+    await delay(0);
+
+    expect(onLog.callCount).to.equal(2);
+    expect(onLog.firstCall.args).to.eql([ pastLogs[0] ]);
+    expect(onLog.secondCall.args).to.eql([ pastLogs[1] ]);
+    expect(onFoo.callCount).to.equal(1);
+    expect(onFoo.firstCall.args).to.eql([ pastLogs[0] ]);
+    expect(onBar.callCount).to.equal(1);
+    expect(onBar.firstCall.args).to.eql([ pastLogs[1] ]);
+  });
+
+  it('uninstalls the filter on sunsubscribe', async function () {
+    const { api, contract } = this;
+
+    const s = subscribeToEvents(contract, [ 'Foo', 'Bar' ]);
+    await delay(0);
+    s.unsubscribe();
+    await delay(0);
+
+    expect(api.eth.uninstallFilter.calledOnce).to.equal(true);
+    expect(api.eth.uninstallFilter.firstCall.args).to.eql([ 123 ]);
+  });
+
+  it.skip('checks for new events regularly', async function () {
+    const { api, contract } = this;
+    api.eth.getFilterLogs = stub().resolves([]);
+
+    const onLog = spy();
+    const onBar = spy();
+    const s = subscribeToEvents(contract, [ 'Bar' ], { interval: 5 })
+      .on('log', onLog)
+      .on('Bar', onBar);
+    await delay(9);
+    s.unsubscribe();
+
+    expect(onLog.callCount).to.equal(1);
+    expect(onLog.firstCall.args).to.eql([ liveLogs[0] ]);
+    expect(onBar.callCount).to.equal(1);
+    expect(onBar.firstCall.args).to.eql([ liveLogs[0] ]);
+  });
+});

js/src/util/subscribe-to-events.test.js

@@ -0,0 +1,53 @@
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
+// This file is part of Parity.
+
+// Parity is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+
+// Parity is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+
+// You should have received a copy of the GNU General Public License
+// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
+
+import { stub } from 'sinon';
+
+export const ADDRESS = '0x1111111111111111111111111111111111111111';
+
+export const pastLogs = [
+  { event: 'Foo', type: 'mined', address: ADDRESS, params: {} },
+  { event: 'Bar', type: 'mined', address: ADDRESS, params: {} }
+];
+
+export const liveLogs = [
+  { event: 'Bar', type: 'mined', address: ADDRESS, params: { foo: 'bar' } }
+];
+
+export const createApi = () => ({
+  eth: {
+    newFilter: stub().resolves(123),
+    uninstallFilter: stub()
+      .rejects(new Error('unknown filter id'))
+      .withArgs(123).resolves(null),
+    getFilterLogs: stub()
+      .rejects(new Error('unknown filter id'))
+      .withArgs(123).resolves(pastLogs),
+    getFilterChanges: stub()
+      .rejects(new Error('unknown filter id'))
+      .withArgs(123).resolves(liveLogs)
+  }
+});
+
+export const createContract = (api) => ({
+  api,
+  address: ADDRESS,
+  instance: {
+    Foo: { signature: 'Foo signature' },
+    Bar: { signature: 'Bar signature' }
+  },
+  parseEventLogs: stub().returnsArg(0)
+});