From 600a7e5ccc84609f8e088d9eb33624cff6ae8bf6 Mon Sep 17 00:00:00 2001
From: Jannis R <mail@jannisr.de>
Date: Tue, 6 Dec 2016 15:09:11 +0100
Subject: [PATCH 01/64] make SMS verification contract general purpose

---
 js/src/contracts/contracts.js                             | 7 +++++--
 js/src/contracts/{sms-verification.js => verification.js} | 0
 js/src/modals/SMSVerification/store.js                    | 2 +-
 3 files changed, 6 insertions(+), 3 deletions(-)
 rename js/src/contracts/{sms-verification.js => verification.js} (100%)

diff --git a/js/src/contracts/contracts.js b/js/src/contracts/contracts.js
index f61a636909..f30f67efbf 100644
--- a/js/src/contracts/contracts.js
+++ b/js/src/contracts/contracts.js
@@ -19,7 +19,7 @@ import Registry from './registry';
 import SignatureReg from './signaturereg';
 import TokenReg from './tokenreg';
 import GithubHint from './githubhint';
-import * as smsVerification from './sms-verification';
+import * as verification from './verification';
 import BadgeReg from './badgereg';
 
 let instance = null;
@@ -58,7 +58,10 @@ export default class Contracts {
   }
 
   get smsVerification () {
-    return smsVerification;
+    return verification;
+  }
+  get emailVerification () {
+    return verification;
   }
 
   static create (api) {
diff --git a/js/src/contracts/sms-verification.js b/js/src/contracts/verification.js
similarity index 100%
rename from js/src/contracts/sms-verification.js
rename to js/src/contracts/verification.js
diff --git a/js/src/modals/SMSVerification/store.js b/js/src/modals/SMSVerification/store.js
index 49b91fa70f..279329ca5c 100644
--- a/js/src/modals/SMSVerification/store.js
+++ b/js/src/modals/SMSVerification/store.js
@@ -20,7 +20,7 @@ import { sha3 } from '~/api/util/sha3';
 
 import Contracts from '~/contracts';
 
-import { checkIfVerified, checkIfRequested, awaitPuzzle } from '~/contracts/sms-verification';
+import { checkIfVerified, checkIfRequested, awaitPuzzle } from '~/contracts/verification';
 import { postToServer } from '../../3rdparty/sms-verification';
 import checkIfTxFailed from '../../util/check-if-tx-failed';
 import waitForConfirmations from '../../util/wait-for-block-confirmations';
-- 
GitLab


From b5b529f8c2442bbeb6675225f46141dd7a583085 Mon Sep 17 00:00:00 2001
From: Jannis R <mail@jannisr.de>
Date: Tue, 6 Dec 2016 15:09:54 +0100
Subject: [PATCH 02/64] modals/SMSVerification -> modals/Verification

---
 .../modals/{SMSVerification => Verification}/Done/done.css  | 0
 .../modals/{SMSVerification => Verification}/Done/done.js   | 0
 .../modals/{SMSVerification => Verification}/Done/index.js  | 0
 .../GatherData/gatherData.css                               | 0
 .../GatherData/gatherData.js                                | 0
 .../{SMSVerification => Verification}/GatherData/index.js   | 0
 .../{SMSVerification => Verification}/QueryCode/index.js    | 0
 .../QueryCode/queryCode.js                                  | 0
 .../SendConfirmation/index.js                               | 0
 .../SendConfirmation/sendConfirmation.css                   | 0
 .../SendConfirmation/sendConfirmation.js                    | 0
 .../{SMSVerification => Verification}/SendRequest/index.js  | 0
 .../SendRequest/sendRequest.css                             | 0
 .../SendRequest/sendRequest.js                              | 0
 js/src/modals/{SMSVerification => Verification}/index.js    | 2 +-
 js/src/modals/{SMSVerification => Verification}/store.js    | 0
 .../SMSVerification.js => Verification/verification.js}     | 4 ++--
 js/src/modals/index.js                                      | 4 ++--
 js/src/views/Account/account.js                             | 6 +++---
 19 files changed, 8 insertions(+), 8 deletions(-)
 rename js/src/modals/{SMSVerification => Verification}/Done/done.css (100%)
 rename js/src/modals/{SMSVerification => Verification}/Done/done.js (100%)
 rename js/src/modals/{SMSVerification => Verification}/Done/index.js (100%)
 rename js/src/modals/{SMSVerification => Verification}/GatherData/gatherData.css (100%)
 rename js/src/modals/{SMSVerification => Verification}/GatherData/gatherData.js (100%)
 rename js/src/modals/{SMSVerification => Verification}/GatherData/index.js (100%)
 rename js/src/modals/{SMSVerification => Verification}/QueryCode/index.js (100%)
 rename js/src/modals/{SMSVerification => Verification}/QueryCode/queryCode.js (100%)
 rename js/src/modals/{SMSVerification => Verification}/SendConfirmation/index.js (100%)
 rename js/src/modals/{SMSVerification => Verification}/SendConfirmation/sendConfirmation.css (100%)
 rename js/src/modals/{SMSVerification => Verification}/SendConfirmation/sendConfirmation.js (100%)
 rename js/src/modals/{SMSVerification => Verification}/SendRequest/index.js (100%)
 rename js/src/modals/{SMSVerification => Verification}/SendRequest/sendRequest.css (100%)
 rename js/src/modals/{SMSVerification => Verification}/SendRequest/sendRequest.js (100%)
 rename js/src/modals/{SMSVerification => Verification}/index.js (94%)
 rename js/src/modals/{SMSVerification => Verification}/store.js (100%)
 rename js/src/modals/{SMSVerification/SMSVerification.js => Verification/verification.js} (97%)

diff --git a/js/src/modals/SMSVerification/Done/done.css b/js/src/modals/Verification/Done/done.css
similarity index 100%
rename from js/src/modals/SMSVerification/Done/done.css
rename to js/src/modals/Verification/Done/done.css
diff --git a/js/src/modals/SMSVerification/Done/done.js b/js/src/modals/Verification/Done/done.js
similarity index 100%
rename from js/src/modals/SMSVerification/Done/done.js
rename to js/src/modals/Verification/Done/done.js
diff --git a/js/src/modals/SMSVerification/Done/index.js b/js/src/modals/Verification/Done/index.js
similarity index 100%
rename from js/src/modals/SMSVerification/Done/index.js
rename to js/src/modals/Verification/Done/index.js
diff --git a/js/src/modals/SMSVerification/GatherData/gatherData.css b/js/src/modals/Verification/GatherData/gatherData.css
similarity index 100%
rename from js/src/modals/SMSVerification/GatherData/gatherData.css
rename to js/src/modals/Verification/GatherData/gatherData.css
diff --git a/js/src/modals/SMSVerification/GatherData/gatherData.js b/js/src/modals/Verification/GatherData/gatherData.js
similarity index 100%
rename from js/src/modals/SMSVerification/GatherData/gatherData.js
rename to js/src/modals/Verification/GatherData/gatherData.js
diff --git a/js/src/modals/SMSVerification/GatherData/index.js b/js/src/modals/Verification/GatherData/index.js
similarity index 100%
rename from js/src/modals/SMSVerification/GatherData/index.js
rename to js/src/modals/Verification/GatherData/index.js
diff --git a/js/src/modals/SMSVerification/QueryCode/index.js b/js/src/modals/Verification/QueryCode/index.js
similarity index 100%
rename from js/src/modals/SMSVerification/QueryCode/index.js
rename to js/src/modals/Verification/QueryCode/index.js
diff --git a/js/src/modals/SMSVerification/QueryCode/queryCode.js b/js/src/modals/Verification/QueryCode/queryCode.js
similarity index 100%
rename from js/src/modals/SMSVerification/QueryCode/queryCode.js
rename to js/src/modals/Verification/QueryCode/queryCode.js
diff --git a/js/src/modals/SMSVerification/SendConfirmation/index.js b/js/src/modals/Verification/SendConfirmation/index.js
similarity index 100%
rename from js/src/modals/SMSVerification/SendConfirmation/index.js
rename to js/src/modals/Verification/SendConfirmation/index.js
diff --git a/js/src/modals/SMSVerification/SendConfirmation/sendConfirmation.css b/js/src/modals/Verification/SendConfirmation/sendConfirmation.css
similarity index 100%
rename from js/src/modals/SMSVerification/SendConfirmation/sendConfirmation.css
rename to js/src/modals/Verification/SendConfirmation/sendConfirmation.css
diff --git a/js/src/modals/SMSVerification/SendConfirmation/sendConfirmation.js b/js/src/modals/Verification/SendConfirmation/sendConfirmation.js
similarity index 100%
rename from js/src/modals/SMSVerification/SendConfirmation/sendConfirmation.js
rename to js/src/modals/Verification/SendConfirmation/sendConfirmation.js
diff --git a/js/src/modals/SMSVerification/SendRequest/index.js b/js/src/modals/Verification/SendRequest/index.js
similarity index 100%
rename from js/src/modals/SMSVerification/SendRequest/index.js
rename to js/src/modals/Verification/SendRequest/index.js
diff --git a/js/src/modals/SMSVerification/SendRequest/sendRequest.css b/js/src/modals/Verification/SendRequest/sendRequest.css
similarity index 100%
rename from js/src/modals/SMSVerification/SendRequest/sendRequest.css
rename to js/src/modals/Verification/SendRequest/sendRequest.css
diff --git a/js/src/modals/SMSVerification/SendRequest/sendRequest.js b/js/src/modals/Verification/SendRequest/sendRequest.js
similarity index 100%
rename from js/src/modals/SMSVerification/SendRequest/sendRequest.js
rename to js/src/modals/Verification/SendRequest/sendRequest.js
diff --git a/js/src/modals/SMSVerification/index.js b/js/src/modals/Verification/index.js
similarity index 94%
rename from js/src/modals/SMSVerification/index.js
rename to js/src/modals/Verification/index.js
index d9b0990db8..9c29a71655 100644
--- a/js/src/modals/SMSVerification/index.js
+++ b/js/src/modals/Verification/index.js
@@ -14,4 +14,4 @@
 // You should have received a copy of the GNU General Public License
 // along with Parity.  If not, see <http://www.gnu.org/licenses/>.
 
-export default from './SMSVerification';
+export default from './verification';
diff --git a/js/src/modals/SMSVerification/store.js b/js/src/modals/Verification/store.js
similarity index 100%
rename from js/src/modals/SMSVerification/store.js
rename to js/src/modals/Verification/store.js
diff --git a/js/src/modals/SMSVerification/SMSVerification.js b/js/src/modals/Verification/verification.js
similarity index 97%
rename from js/src/modals/SMSVerification/SMSVerification.js
rename to js/src/modals/Verification/verification.js
index 86f027a524..65447c4f9f 100644
--- a/js/src/modals/SMSVerification/SMSVerification.js
+++ b/js/src/modals/Verification/verification.js
@@ -37,7 +37,7 @@ import SendConfirmation from './SendConfirmation';
 import Done from './Done';
 
 @observer
-export default class SMSVerification extends Component {
+export default class Verification extends Component {
   static propTypes = {
     store: PropTypes.any.isRequired,
     account: PropTypes.string.isRequired,
@@ -54,7 +54,7 @@ export default class SMSVerification extends Component {
   }
 
   render () {
-    const phase = SMSVerification.phases[this.props.store.step];
+    const phase = Verification.phases[this.props.store.step];
     const { error, isStepValid } = this.props.store;
 
     return (
diff --git a/js/src/modals/index.js b/js/src/modals/index.js
index 0f0844e402..1daee86636 100644
--- a/js/src/modals/index.js
+++ b/js/src/modals/index.js
@@ -24,7 +24,7 @@ import EditMeta from './EditMeta';
 import ExecuteContract from './ExecuteContract';
 import FirstRun from './FirstRun';
 import Shapeshift from './Shapeshift';
-import SMSVerification from './SMSVerification';
+import Verification from './Verification';
 import Transfer from './Transfer';
 import PasswordManager from './PasswordManager';
 import SaveContract from './SaveContract';
@@ -42,7 +42,7 @@ export {
   ExecuteContract,
   FirstRun,
   Shapeshift,
-  SMSVerification,
+  Verification,
   Transfer,
   PasswordManager,
   LoadContract,
diff --git a/js/src/views/Account/account.js b/js/src/views/Account/account.js
index 98b0a5e975..1fd654fdec 100644
--- a/js/src/views/Account/account.js
+++ b/js/src/views/Account/account.js
@@ -23,7 +23,7 @@ import ContentSend from 'material-ui/svg-icons/content/send';
 import LockIcon from 'material-ui/svg-icons/action/lock';
 import VerifyIcon from 'material-ui/svg-icons/action/verified-user';
 
-import { EditMeta, DeleteAccount, Shapeshift, SMSVerification, Transfer, PasswordManager } from '~/modals';
+import { EditMeta, DeleteAccount, Shapeshift, Verification, Transfer, PasswordManager } from '~/modals';
 import { Actionbar, Button, Page } from '~/ui';
 
 import shapeshiftBtn from '../../../assets/images/shapeshift-btn.png';
@@ -32,7 +32,7 @@ import Header from './Header';
 import Transactions from './Transactions';
 import { setVisibleAccounts } from '~/redux/providers/personalActions';
 
-import VerificationStore from '~/modals/SMSVerification/store';
+import VerificationStore from '~/modals/Verification/store';
 
 import styles from './account.css';
 
@@ -228,7 +228,7 @@ class Account extends Component {
     const { address } = this.props.params;
 
     return (
-      <SMSVerification
+      <Verification
         store={ store } account={ address }
         onClose={ this.onVerificationClose }
       />
-- 
GitLab


From 1672cbad7be46f49af7e2b0b1eaf66b08f9a95a4 Mon Sep 17 00:00:00 2001
From: Jannis R <mail@jannisr.de>
Date: Tue, 6 Dec 2016 16:09:02 +0100
Subject: [PATCH 03/64] factor out SMS-specific logic

---
 .../Verification/SendRequest/sendRequest.js   |  6 +-
 js/src/modals/Verification/sms-store.js       | 66 +++++++++++++++++++
 js/src/modals/Verification/store.js           | 55 +++-------------
 js/src/modals/Verification/verification.js    |  8 +--
 js/src/views/Account/account.js               |  2 +-
 5 files changed, 83 insertions(+), 54 deletions(-)
 create mode 100644 js/src/modals/Verification/sms-store.js

diff --git a/js/src/modals/Verification/SendRequest/sendRequest.js b/js/src/modals/Verification/SendRequest/sendRequest.js
index 933de92651..41dc7c06c1 100644
--- a/js/src/modals/Verification/SendRequest/sendRequest.js
+++ b/js/src/modals/Verification/SendRequest/sendRequest.js
@@ -19,7 +19,7 @@ import React, { Component, PropTypes } from 'react';
 import { nullableProptype } from '~/util/proptypes';
 import TxHash from '~/ui/TxHash';
 import {
-  POSTING_REQUEST, POSTED_REQUEST, REQUESTING_SMS
+  POSTING_REQUEST, POSTED_REQUEST, REQUESTING_CODE
 } from '../store';
 
 import styles from './sendRequest.css';
@@ -45,9 +45,9 @@ export default class SendRequest extends Component {
           </div>
         );
 
-      case REQUESTING_SMS:
+      case REQUESTING_CODE:
         return (
-          <p>Requesting an SMS from the Parity server and waiting for the puzzle to be put into the contract.</p>
+          <p>Requesting a code from the Parity server and waiting for the puzzle to be put into the contract.</p>
         );
 
       default:
diff --git a/js/src/modals/Verification/sms-store.js b/js/src/modals/Verification/sms-store.js
new file mode 100644
index 0000000000..58b79ebfb7
--- /dev/null
+++ b/js/src/modals/Verification/sms-store.js
@@ -0,0 +1,66 @@
+// Copyright 2015, 2016 Ethcore (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 { observable, computed, action } from 'mobx';
+import phone from 'phoneformat.js';
+
+import VerificationStore, {
+  LOADING, QUERY_DATA, QUERY_CODE, POSTED_CONFIRMATION, DONE
+} from './store';
+import { postToServer } from '../../3rdparty/sms-verification';
+
+export default class SMSVerificationStore extends VerificationStore {
+  @observable number = '';
+
+  @computed get isNumberValid () {
+    return phone.isValidNumber(this.number);
+  }
+
+  @computed get isStepValid () {
+    if (this.step === DONE) {
+      return true;
+    }
+    if (this.error) {
+      return false;
+    }
+
+    switch (this.step) {
+      case LOADING:
+        return this.contract && this.fee && this.isVerified !== null && this.hasRequested !== null;
+      case QUERY_DATA:
+        return this.isNumberValid && this.consentGiven;
+      case QUERY_CODE:
+        return this.requestTx && this.isCodeValid === true;
+      case POSTED_CONFIRMATION:
+        return !!this.confirmationTx;
+      default:
+        return false;
+    }
+  }
+
+  constructor (api, account, isTestnet) {
+    return super(api, account, isTestnet, 'smsverification');
+  }
+
+  @action setNumber = (number) => {
+    this.number = number;
+  }
+
+  requestCode = () => {
+    const { number, account, isTestnet } = this;
+    return postToServer({ number, address: account }, isTestnet);
+  }
+}
diff --git a/js/src/modals/Verification/store.js b/js/src/modals/Verification/store.js
index 279329ca5c..f8542786b4 100644
--- a/js/src/modals/Verification/store.js
+++ b/js/src/modals/Verification/store.js
@@ -14,14 +14,11 @@
 // You should have received a copy of the GNU General Public License
 // along with Parity.  If not, see <http://www.gnu.org/licenses/>.
 
-import { observable, computed, autorun, action } from 'mobx';
-import phone from 'phoneformat.js';
+import { observable, autorun, action } from 'mobx';
 import { sha3 } from '~/api/util/sha3';
-
 import Contracts from '~/contracts';
 
 import { checkIfVerified, checkIfRequested, awaitPuzzle } from '~/contracts/verification';
-import { postToServer } from '../../3rdparty/sms-verification';
 import checkIfTxFailed from '../../util/check-if-tx-failed';
 import waitForConfirmations from '../../util/wait-for-block-confirmations';
 
@@ -29,7 +26,7 @@ export const LOADING = 'fetching-contract';
 export const QUERY_DATA = 'query-data';
 export const POSTING_REQUEST = 'posting-request';
 export const POSTED_REQUEST = 'posted-request';
-export const REQUESTING_SMS = 'requesting-sms';
+export const REQUESTING_CODE = 'requesting-code';
 export const QUERY_CODE = 'query-code';
 export const POSTING_CONFIRMATION = 'posting-confirmation';
 export const POSTED_CONFIRMATION = 'posted-confirmation';
@@ -44,45 +41,18 @@ export default class VerificationStore {
   @observable isVerified = null;
   @observable hasRequested = null;
   @observable consentGiven = false;
-  @observable number = '';
   @observable requestTx = null;
   @observable code = '';
   @observable isCodeValid = null;
   @observable confirmationTx = null;
 
-  @computed get isNumberValid () {
-    return phone.isValidNumber(this.number);
-  }
-
-  @computed get isStepValid () {
-    if (this.step === DONE) {
-      return true;
-    }
-    if (this.error) {
-      return false;
-    }
-
-    switch (this.step) {
-      case LOADING:
-        return this.contract && this.fee && this.isVerified !== null && this.hasRequested !== null;
-      case QUERY_DATA:
-        return this.isNumberValid && this.consentGiven;
-      case QUERY_CODE:
-        return this.requestTx && this.isCodeValid === true;
-      case POSTED_CONFIRMATION:
-        return !!this.confirmationTx;
-      default:
-        return false;
-    }
-  }
-
-  constructor (api, account, isTestnet) {
+  constructor (api, account, isTestnet, name) {
     this.api = api;
     this.account = account;
     this.isTestnet = isTestnet;
 
     this.step = LOADING;
-    Contracts.create(api).registry.getContract('smsverification')
+    Contracts.create(api).registry.getContract(name)
       .then((contract) => {
         this.contract = contract;
         this.load();
@@ -93,7 +63,7 @@ export default class VerificationStore {
 
     autorun(() => {
       if (this.error) {
-        console.error('sms verification: ' + this.error);
+        console.error('verification: ' + this.error);
       }
     });
   }
@@ -136,10 +106,6 @@ export default class VerificationStore {
       });
   }
 
-  @action setNumber = (number) => {
-    this.number = number;
-  }
-
   @action setConsentGiven = (consentGiven) => {
     this.consentGiven = consentGiven;
   }
@@ -168,7 +134,7 @@ export default class VerificationStore {
   }
 
   @action sendRequest = () => {
-    const { api, account, contract, fee, number, hasRequested } = this;
+    const { api, account, contract, fee, hasRequested } = this;
 
     const request = contract.functions.find((fn) => fn.name === 'request');
     const options = { from: account, value: fee.toString() };
@@ -201,18 +167,15 @@ export default class VerificationStore {
 
     chain
       .then(() => {
-        return api.parity.netChain();
-      })
-      .then((chain) => {
-        this.step = REQUESTING_SMS;
-        return postToServer({ number, address: account }, this.isTestnet);
+        this.step = REQUESTING_CODE;
+        return this.requestCode();
       })
       .then(() => awaitPuzzle(api, contract, account))
       .then(() => {
         this.step = QUERY_CODE;
       })
       .catch((err) => {
-        this.error = 'Failed to request a confirmation SMS: ' + err.message;
+        this.error = 'Failed to request a confirmation code: ' + err.message;
       });
   }
 
diff --git a/js/src/modals/Verification/verification.js b/js/src/modals/Verification/verification.js
index 65447c4f9f..b05ed353ae 100644
--- a/js/src/modals/Verification/verification.js
+++ b/js/src/modals/Verification/verification.js
@@ -25,7 +25,7 @@ import {
   LOADING,
   QUERY_DATA,
   POSTING_REQUEST, POSTED_REQUEST,
-  REQUESTING_SMS, QUERY_CODE,
+  REQUESTING_CODE, QUERY_CODE,
   POSTING_CONFIRMATION, POSTED_CONFIRMATION,
   DONE
 } from './store';
@@ -47,7 +47,7 @@ export default class Verification extends Component {
   static phases = { // mapping (store steps -> steps)
     [LOADING]: 0,
     [QUERY_DATA]: 1,
-    [POSTING_REQUEST]: 2, [POSTED_REQUEST]: 2, [REQUESTING_SMS]: 2,
+    [POSTING_REQUEST]: 2, [POSTED_REQUEST]: 2, [REQUESTING_CODE]: 2,
     [QUERY_CODE]: 3,
     [POSTING_CONFIRMATION]: 4, [POSTED_CONFIRMATION]: 4,
     [DONE]: 5
@@ -60,7 +60,7 @@ export default class Verification extends Component {
     return (
       <Modal
         actions={ this.renderDialogActions(phase, error, isStepValid) }
-        title='verify your account via SMS'
+        title='verify your account'
         visible
         current={ phase }
         steps={ ['Prepare', 'Enter Data', 'Request', 'Enter Code', 'Confirm', 'Done!'] }
@@ -143,7 +143,7 @@ export default class Verification extends Component {
     switch (phase) {
       case 0:
         return (
-          <p>Loading SMS Verification.</p>
+          <p>Loading Verification.</p>
         );
 
       case 1:
diff --git a/js/src/views/Account/account.js b/js/src/views/Account/account.js
index 1fd654fdec..240ca2f9b7 100644
--- a/js/src/views/Account/account.js
+++ b/js/src/views/Account/account.js
@@ -32,7 +32,7 @@ import Header from './Header';
 import Transactions from './Transactions';
 import { setVisibleAccounts } from '~/redux/providers/personalActions';
 
-import VerificationStore from '~/modals/Verification/store';
+import VerificationStore from '~/modals/Verification/sms-store';
 
 import styles from './account.css';
 
-- 
GitLab


From 1ac3421f3327778306c21997e9acdcecde32ad6d Mon Sep 17 00:00:00 2001
From: Jannis R <mail@jannisr.de>
Date: Tue, 6 Dec 2016 17:16:54 +0100
Subject: [PATCH 04/64] step to select verification method

---
 js/src/modals/Verification/verification.js | 109 ++++++++++++++++-----
 js/src/views/Account/account.js            |  29 ++++--
 2 files changed, 105 insertions(+), 33 deletions(-)

diff --git a/js/src/modals/Verification/verification.js b/js/src/modals/Verification/verification.js
index b05ed353ae..5982933a9e 100644
--- a/js/src/modals/Verification/verification.js
+++ b/js/src/modals/Verification/verification.js
@@ -20,6 +20,13 @@ import DoneIcon from 'material-ui/svg-icons/action/done-all';
 import CancelIcon from 'material-ui/svg-icons/content/clear';
 
 import { Button, IdentityIcon, Modal } from '~/ui';
+import RadioButtons from '~/ui/Form/RadioButtons';
+import { nullableProptype } from '~/util/proptypes';
+
+const methods = {
+  sms: { label: 'SMS Verification', key: 0, value: 'sms' },
+  email: { label: 'E-mail Verification', key: 1, value: 'email' }
+};
 
 import {
   LOADING,
@@ -39,23 +46,34 @@ import Done from './Done';
 @observer
 export default class Verification extends Component {
   static propTypes = {
-    store: PropTypes.any.isRequired,
+    store: nullableProptype(PropTypes.object).isRequired,
     account: PropTypes.string.isRequired,
+    onSelectMethod: PropTypes.func.isRequired,
     onClose: PropTypes.func.isRequired
   }
 
   static phases = { // mapping (store steps -> steps)
-    [LOADING]: 0,
-    [QUERY_DATA]: 1,
-    [POSTING_REQUEST]: 2, [POSTED_REQUEST]: 2, [REQUESTING_CODE]: 2,
-    [QUERY_CODE]: 3,
-    [POSTING_CONFIRMATION]: 4, [POSTED_CONFIRMATION]: 4,
-    [DONE]: 5
+    [LOADING]: 1,
+    [QUERY_DATA]: 2,
+    [POSTING_REQUEST]: 3, [POSTED_REQUEST]: 3, [REQUESTING_CODE]: 3,
+    [QUERY_CODE]: 4,
+    [POSTING_CONFIRMATION]: 5, [POSTED_CONFIRMATION]: 5,
+    [DONE]: 6
   }
 
+  state = {
+    method: 'sms'
+  };
+
   render () {
-    const phase = Verification.phases[this.props.store.step];
-    const { error, isStepValid } = this.props.store;
+    const { store } = this.props;
+    let phase = 0; let error = false; let isStepValid = true;
+
+    if (store) {
+      phase = Verification.phases[store.step];
+      error = store.error;
+      isStepValid = store.isStepValid;
+    }
 
     return (
       <Modal
@@ -63,8 +81,8 @@ export default class Verification extends Component {
         title='verify your account'
         visible
         current={ phase }
-        steps={ ['Prepare', 'Enter Data', 'Request', 'Enter Code', 'Confirm', 'Done!'] }
-        waiting={ error ? [] : [ 0, 2, 4 ] }
+        steps={ ['Method', 'Prepare', 'Enter Data', 'Request', 'Enter Code', 'Confirm', 'Done!'] }
+        waiting={ error ? [] : [ 1, 3, 5 ] }
       >
         { this.renderStep(phase, error) }
       </Modal>
@@ -85,7 +103,7 @@ export default class Verification extends Component {
       return (<div>{ cancel }</div>);
     }
 
-    if (phase === 5) {
+    if (phase === 6) {
       return (
         <div>
           { cancel }
@@ -101,16 +119,23 @@ export default class Verification extends Component {
 
     let action = () => {};
     switch (phase) {
-      case 1:
-        action = store.sendRequest;
+      case 0:
+        action = () => {
+          const { onSelectMethod } = this.props;
+          const { method } = this.state;
+          onSelectMethod(method);
+        };
         break;
       case 2:
-        action = store.queryCode;
+        action = store.sendRequest;
         break;
       case 3:
-        action = store.sendConfirmation;
+        action = store.queryCode;
         break;
       case 4:
+        action = store.sendConfirmation;
+        break;
+      case 5:
         action = store.done;
         break;
     }
@@ -133,6 +158,19 @@ export default class Verification extends Component {
       return (<p>{ error }</p>);
     }
 
+    if (phase === 0) {
+      const { method } = this.state;
+      const values = Object.values(methods);
+      const value = values.findIndex((v) => v.value === method);
+      return (
+        <RadioButtons
+          value={ value < 0 ? 0 : value }
+          values={ values }
+          onChange={ this.selectMethod }
+        />
+      );
+    }
+
     const {
       step,
       fee, number, isNumberValid, isVerified, hasRequested,
@@ -141,13 +179,34 @@ export default class Verification extends Component {
     } = this.props.store;
 
     switch (phase) {
-      case 0:
+      case 1:
         return (
           <p>Loading Verification.</p>
         );
 
-      case 1:
-        const { setNumber, setConsentGiven } = this.props.store;
+      case 2:
+        const { method } = this.state;
+        const { setConsentGiven } = this.props.store;
+
+        const fields = []
+        if (method === 'sms') {
+          fields.push({
+            key: 'number',
+            label: 'phone number in international format',
+            hint: 'the SMS will be sent to this number',
+            error: this.props.store.isNumberValid ? null : 'invalid number',
+            onChange: this.props.store.setNumber
+          });
+        } else if (method === 'email') {
+          fields.push({
+            key: 'email',
+            label: 'email address',
+            hint: 'the code will be sent to this address',
+            error: this.props.store.isEmailValid ? null : 'invalid email',
+            onChange: this.props.store.setEmail
+          });
+        }
+
         return (
           <GatherData
             fee={ fee } isNumberValid={ isNumberValid }
@@ -156,12 +215,12 @@ export default class Verification extends Component {
           />
         );
 
-      case 2:
+      case 3:
         return (
           <SendRequest step={ step } tx={ requestTx } />
         );
 
-      case 3:
+      case 4:
         return (
           <QueryCode
             number={ number } fee={ fee } isCodeValid={ isCodeValid }
@@ -169,12 +228,12 @@ export default class Verification extends Component {
           />
         );
 
-      case 4:
+      case 5:
         return (
           <SendConfirmation step={ step } tx={ confirmationTx } />
         );
 
-      case 5:
+      case 6:
         return (
           <Done />
         );
@@ -183,4 +242,8 @@ export default class Verification extends Component {
         return null;
     }
   }
+
+  selectMethod = (choice, i) => {
+    this.setState({ method: choice.value });
+  }
 }
diff --git a/js/src/views/Account/account.js b/js/src/views/Account/account.js
index 240ca2f9b7..3f262bce41 100644
--- a/js/src/views/Account/account.js
+++ b/js/src/views/Account/account.js
@@ -32,7 +32,8 @@ import Header from './Header';
 import Transactions from './Transactions';
 import { setVisibleAccounts } from '~/redux/providers/personalActions';
 
-import VerificationStore from '~/modals/Verification/sms-store';
+import SMSVerificationStore from '~/modals/Verification/sms-store';
+import EmailVerificationStore from '~/modals/Verification/email-store';
 
 import styles from './account.css';
 
@@ -72,15 +73,6 @@ class Account extends Component {
     if (prevAddress !== nextAddress) {
       this.setVisibleAccounts(nextProps);
     }
-
-    const { isTestnet } = nextProps;
-    if (typeof isTestnet === 'boolean' && !this.state.verificationStore) {
-      const { api } = this.context;
-      const { address } = nextProps.params;
-      this.setState({
-        verificationStore: new VerificationStore(api, address, isTestnet)
-      });
-    }
   }
 
   componentWillUnmount () {
@@ -230,6 +222,7 @@ class Account extends Component {
     return (
       <Verification
         store={ store } account={ address }
+        onSelectMethod={ this.selectVerificationMethod }
         onClose={ this.onVerificationClose }
       />
     );
@@ -303,6 +296,22 @@ class Account extends Component {
     this.setState({ showVerificationDialog: true });
   }
 
+  selectVerificationMethod = (name) => {
+    const { isTestnet } = this.props;
+    if (typeof isTestnet !== 'boolean' || this.state.verificationStore) return;
+
+    const { api } = this.context;
+    const { address } = this.props.params;
+
+    let verificationStore = null;
+    if (name === 'sms') {
+      verificationStore = new SMSVerificationStore(api, address, isTestnet);
+    } else if (name === 'email') {
+      verificationStore = new EmailVerificationStore(api, address, isTestnet);
+    }
+    this.setState({ verificationStore });
+  }
+
   onVerificationClose = () => {
     this.setState({ showVerificationDialog: false });
   }
-- 
GitLab


From d3fd71d9534ac540d72f7d8263e13a5e8461fa53 Mon Sep 17 00:00:00 2001
From: Jannis R <mail@jannisr.de>
Date: Tue, 6 Dec 2016 17:45:34 +0100
Subject: [PATCH 05/64] add email-specific contract, helpers, store

---
 js/src/3rdparty/email-verification/index.js   | 53 +++++++++++++++
 js/src/3rdparty/email-verification/styles.css | 20 ++++++
 js/src/3rdparty/sms-verification/index.js     | 13 ++++
 js/src/3rdparty/sms-verification/styles.css   | 20 ++++++
 js/src/contracts/abi/email-verification.json  |  1 +
 js/src/contracts/abi/index.js                 |  2 +
 js/src/modals/Verification/email-store.js     | 66 +++++++++++++++++++
 7 files changed, 175 insertions(+)
 create mode 100644 js/src/3rdparty/email-verification/index.js
 create mode 100644 js/src/3rdparty/email-verification/styles.css
 create mode 100644 js/src/3rdparty/sms-verification/styles.css
 create mode 100644 js/src/contracts/abi/email-verification.json
 create mode 100644 js/src/modals/Verification/email-store.js

diff --git a/js/src/3rdparty/email-verification/index.js b/js/src/3rdparty/email-verification/index.js
new file mode 100644
index 0000000000..5f4885f3be
--- /dev/null
+++ b/js/src/3rdparty/email-verification/index.js
@@ -0,0 +1,53 @@
+// Copyright 2015, 2016 Ethcore (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 { stringify } from 'querystring';
+import React from 'react';
+
+import styles from './styles.css';
+
+export const howItWorks = (
+  <div>
+    <p>The following steps will let you prove that you control both an account and an e-mail address.</p>
+    <ol className={ styles.list }>
+      <li>You send a verification request to a specific contract.</li>
+      <li>Our server puts a puzzle into this contract.</li>
+      <li>The code you receive via e-mail is the solution to this puzzle.</li>
+    </ol>
+  </div>
+);
+
+export const termsOfService = (
+  <ul>
+    <li>todo</li>
+  </ul>
+);
+
+export const postToServer = (query, isTestnet = false) => {
+  const port = isTestnet ? 28443 : 18443;
+  query = stringify(query);
+  return fetch(`https://email-verification.parity.io:${port}/?` + query, {
+    method: 'POST', mode: 'cors', cache: 'no-store'
+  })
+  .then((res) => {
+    return res.json().then((data) => {
+      if (res.ok) {
+        return data.message;
+      }
+      throw new Error(data.message || 'unknown error');
+    });
+  });
+};
diff --git a/js/src/3rdparty/email-verification/styles.css b/js/src/3rdparty/email-verification/styles.css
new file mode 100644
index 0000000000..daa4c605ce
--- /dev/null
+++ b/js/src/3rdparty/email-verification/styles.css
@@ -0,0 +1,20 @@
+/* Copyright 2015, 2016 Ethcore (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/>.
+*/
+
+.list li {
+  padding: .1em 0;
+}
diff --git a/js/src/3rdparty/sms-verification/index.js b/js/src/3rdparty/sms-verification/index.js
index c50b2331a8..46faf084cd 100644
--- a/js/src/3rdparty/sms-verification/index.js
+++ b/js/src/3rdparty/sms-verification/index.js
@@ -17,6 +17,19 @@
 import { stringify } from 'querystring';
 import React from 'react';
 
+import styles from './styles.css';
+
+export const howItWorks = (
+  <div>
+    <p>The following steps will let you prove that you control both an account and a phone number.</p>
+    <ol className={ styles.list }>
+      <li>You send a verification request to a specific contract.</li>
+      <li>Our server puts a puzzle into this contract.</li>
+      <li>The code you receive via SMS is the solution to this puzzle.</li>
+    </ol>
+  </div>
+);
+
 export const termsOfService = (
   <ul>
     <li>This privacy notice relates to your use of the Parity SMS verification service. We take your privacy seriously and deal in an honest, direct and transparent way when it comes to your data.</li>
diff --git a/js/src/3rdparty/sms-verification/styles.css b/js/src/3rdparty/sms-verification/styles.css
new file mode 100644
index 0000000000..daa4c605ce
--- /dev/null
+++ b/js/src/3rdparty/sms-verification/styles.css
@@ -0,0 +1,20 @@
+/* Copyright 2015, 2016 Ethcore (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/>.
+*/
+
+.list li {
+  padding: .1em 0;
+}
diff --git a/js/src/contracts/abi/email-verification.json b/js/src/contracts/abi/email-verification.json
new file mode 100644
index 0000000000..baa6db4832
--- /dev/null
+++ b/js/src/contracts/abi/email-verification.json
@@ -0,0 +1 @@
+[{"constant":false,"inputs":[{"name":"_new","type":"address"}],"name":"setOwner","outputs":[],"payable":false,"type":"function"},{"constant":true,"inputs":[{"name":"","type":"bytes32"}],"name":"reverse","outputs":[{"name":"","type":"address"}],"payable":false,"type":"function"},{"constant":false,"inputs":[{"name":"_who","type":"address"},{"name":"_puzzle","type":"bytes32"},{"name":"_emailHash","type":"bytes32"}],"name":"puzzle","outputs":[],"payable":false,"type":"function"},{"constant":true,"inputs":[{"name":"_who","type":"address"},{"name":"_field","type":"string"}],"name":"getAddress","outputs":[{"name":"","type":"address"}],"payable":false,"type":"function"},{"constant":false,"inputs":[{"name":"_emailHash","type":"bytes32"}],"name":"request","outputs":[],"payable":true,"type":"function"},{"constant":false,"inputs":[{"name":"_new","type":"uint256"}],"name":"setFee","outputs":[],"payable":false,"type":"function"},{"constant":false,"inputs":[{"name":"_code","type":"bytes32"}],"name":"confirm","outputs":[],"payable":false,"type":"function"},{"constant":true,"inputs":[],"name":"owner","outputs":[{"name":"","type":"address"}],"payable":false,"type":"function"},{"constant":false,"inputs":[],"name":"drain","outputs":[],"payable":false,"type":"function"},{"constant":true,"inputs":[{"name":"_who","type":"address"},{"name":"_field","type":"string"}],"name":"getUint","outputs":[{"name":"","type":"uint256"}],"payable":false,"type":"function"},{"constant":true,"inputs":[{"name":"_who","type":"address"}],"name":"certified","outputs":[{"name":"","type":"bool"}],"payable":false,"type":"function"},{"constant":true,"inputs":[],"name":"fee","outputs":[{"name":"","type":"uint256"}],"payable":false,"type":"function"},{"constant":true,"inputs":[{"name":"_who","type":"address"},{"name":"_field","type":"string"}],"name":"get","outputs":[{"name":"","type":"bytes32"}],"payable":false,"type":"function"},{"anonymous":false,"inputs":[{"indexed":true,"name":"who","type":"address"},{"indexed":false,"name":"emailHash","type":"bytes32"}],"name":"Requested","type":"event"},{"anonymous":false,"inputs":[{"indexed":true,"name":"who","type":"address"},{"indexed":true,"name":"emailHash","type":"bytes32"},{"indexed":false,"name":"puzzle","type":"bytes32"}],"name":"Puzzled","type":"event"},{"anonymous":false,"inputs":[{"indexed":true,"name":"who","type":"address"}],"name":"Confirmed","type":"event"},{"anonymous":false,"inputs":[{"indexed":true,"name":"who","type":"address"}],"name":"Revoked","type":"event"},{"anonymous":false,"inputs":[{"indexed":true,"name":"old","type":"address"},{"indexed":true,"name":"current","type":"address"}],"name":"NewOwner","type":"event"}]
\ No newline at end of file
diff --git a/js/src/contracts/abi/index.js b/js/src/contracts/abi/index.js
index f15765b1aa..c8cb851dd4 100644
--- a/js/src/contracts/abi/index.js
+++ b/js/src/contracts/abi/index.js
@@ -19,6 +19,7 @@ import basiccoin from './basiccoin.json';
 import basiccoinmanager from './basiccoinmanager.json';
 import dappreg from './dappreg.json';
 import eip20 from './eip20.json';
+import emailverification from './email-verification.json';
 import gavcoin from './gavcoin.json';
 import githubhint from './githubhint.json';
 import owned from './owned.json';
@@ -34,6 +35,7 @@ export {
   basiccoinmanager,
   dappreg,
   eip20,
+  emailverification,
   gavcoin,
   githubhint,
   owned,
diff --git a/js/src/modals/Verification/email-store.js b/js/src/modals/Verification/email-store.js
new file mode 100644
index 0000000000..14179cfe28
--- /dev/null
+++ b/js/src/modals/Verification/email-store.js
@@ -0,0 +1,66 @@
+// Copyright 2015, 2016 Ethcore (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 { observable, computed, action } from 'mobx';
+
+import VerificationStore, {
+  LOADING, QUERY_DATA, QUERY_CODE, POSTED_CONFIRMATION, DONE
+} from './store';
+import { postToServer } from '../../3rdparty/email-verification';
+
+export default class EmailVerificationStore extends VerificationStore {
+  @observable email = '';
+
+  @computed get isEmailValid () {
+    // See https://davidcel.is/posts/stop-validating-email-addresses-with-regex/
+    return this.email && this.email.indexOf('@') >= 0;
+  }
+
+  @computed get isStepValid () {
+    if (this.step === DONE) {
+      return true;
+    }
+    if (this.error) {
+      return false;
+    }
+
+    switch (this.step) {
+      case LOADING:
+        return this.contract && this.fee && this.isVerified !== null && this.hasRequested !== null;
+      case QUERY_DATA:
+        return this.isEmailValid && this.consentGiven;
+      case QUERY_CODE:
+        return this.requestTx && this.isCodeValid === true;
+      case POSTED_CONFIRMATION:
+        return !!this.confirmationTx;
+      default:
+        return false;
+    }
+  }
+
+  constructor (api, account, isTestnet) {
+    return super(api, account, isTestnet, 'emailverification');
+  }
+
+  @action setEmail = (email) => {
+    this.email = email;
+  }
+
+  requestCode = () => {
+    const { email, account, isTestnet } = this;
+    return postToServer({ email, address: account }, isTestnet);
+  }
+}
-- 
GitLab


From 052f9258a5f1c596adac6e3b2ab490032303da5b Mon Sep 17 00:00:00 2001
From: Jannis R <mail@jannisr.de>
Date: Wed, 7 Dec 2016 11:53:48 +0100
Subject: [PATCH 06/64] pass fields to query into GatherData

---
 .../Verification/GatherData/gatherData.css    |  4 --
 .../Verification/GatherData/gatherData.js     | 52 +++++++++++--------
 js/src/modals/Verification/verification.js    |  8 +--
 3 files changed, 33 insertions(+), 31 deletions(-)

diff --git a/js/src/modals/Verification/GatherData/gatherData.css b/js/src/modals/Verification/GatherData/gatherData.css
index 6809869815..13563b6a54 100644
--- a/js/src/modals/Verification/GatherData/gatherData.css
+++ b/js/src/modals/Verification/GatherData/gatherData.css
@@ -15,10 +15,6 @@
 /* along with Parity.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-.list li {
-  padding: .1em 0;
-}
-
 .spacing {
   margin-top: 1.5em;
 }
diff --git a/js/src/modals/Verification/GatherData/gatherData.js b/js/src/modals/Verification/GatherData/gatherData.js
index f5f09578ec..24f870fc68 100644
--- a/js/src/modals/Verification/GatherData/gatherData.js
+++ b/js/src/modals/Verification/GatherData/gatherData.js
@@ -25,41 +25,31 @@ import { fromWei } from '~/api/util/wei';
 import { Form, Input } from '~/ui';
 import { nullableProptype } from '~/util/proptypes';
 
-import { termsOfService } from '../../../3rdparty/sms-verification';
+import * as sms from '../../../3rdparty/sms-verification';
+import * as email from '../../../3rdparty/email-verification';
 import styles from './gatherData.css';
 
 export default class GatherData extends Component {
   static propTypes = {
     fee: React.PropTypes.instanceOf(BigNumber),
-    isNumberValid: PropTypes.bool.isRequired,
+    method: PropTypes.string.isRequired,
+    fields: PropTypes.array.isRequired,
     isVerified: nullableProptype(PropTypes.bool.isRequired),
     hasRequested: nullableProptype(PropTypes.bool.isRequired),
-    setNumber: PropTypes.func.isRequired,
     setConsentGiven: PropTypes.func.isRequired
   }
 
   render () {
-    const { isNumberValid, isVerified } = this.props;
+    const { method, isVerified } = this.props;
+    const { howItWorks, termsOfService } = method === 'email' ? email : sms;
 
     return (
       <Form>
-        <p>The following steps will let you prove that you control both an account and a phone number.</p>
-        <ol className={ styles.list }>
-          <li>You send a verification request to a specific contract.</li>
-          <li>Our server puts a puzzle into this contract.</li>
-          <li>The code you receive via SMS is the solution to this puzzle.</li>
-        </ol>
+        { howItWorks }
         { this.renderFee() }
         { this.renderCertified() }
         { this.renderRequested() }
-        <Input
-          label={ 'phone number in international format' }
-          hint={ 'the SMS will be sent to this number' }
-          error={ isNumberValid ? null : 'invalid number' }
-          disabled={ isVerified }
-          onChange={ this.numberOnChange }
-          onSubmit={ this.numberOnSubmit }
-        />
+        { this.renderFields() }
         <Checkbox
           className={ styles.spacing }
           label={ 'I agree to the terms and conditions below.' }
@@ -136,12 +126,28 @@ export default class GatherData extends Component {
     );
   }
 
-  numberOnSubmit = (value) => {
-    this.props.setNumber(value);
-  }
+  renderFields () {
+    const { isVerified, fields } = this.props;
+
+    const rendered = fields.map((field) => {
+      const onChange = (_, v) => {
+        field.onChange(v);
+      };
+      const onSubmit = field.onChange;
+      return (
+        <Input
+          key={ field.key }
+          label={ field.label }
+          hint={ field.hint }
+          error={ field.error }
+          disabled={ isVerified }
+          onChange={ onChange }
+          onSubmit={ onSubmit }
+        />
+      );
+    });
 
-  numberOnChange = (_, value) => {
-    this.props.setNumber(value);
+    return (<div>{rendered}</div>);
   }
 
   consentOnChange = (_, consentGiven) => {
diff --git a/js/src/modals/Verification/verification.js b/js/src/modals/Verification/verification.js
index 5982933a9e..276dfbd1ca 100644
--- a/js/src/modals/Verification/verification.js
+++ b/js/src/modals/Verification/verification.js
@@ -46,7 +46,7 @@ import Done from './Done';
 @observer
 export default class Verification extends Component {
   static propTypes = {
-    store: nullableProptype(PropTypes.object).isRequired,
+    store: nullableProptype(PropTypes.object.isRequired),
     account: PropTypes.string.isRequired,
     onSelectMethod: PropTypes.func.isRequired,
     onClose: PropTypes.func.isRequired
@@ -209,9 +209,9 @@ export default class Verification extends Component {
 
         return (
           <GatherData
-            fee={ fee } isNumberValid={ isNumberValid }
-            isVerified={ isVerified } hasRequested={ hasRequested }
-            setNumber={ setNumber } setConsentGiven={ setConsentGiven }
+            method={ method } fields={ fields }
+            fee={ fee } isVerified={ isVerified } hasRequested={ hasRequested }
+            setConsentGiven={ setConsentGiven }
           />
         );
 
-- 
GitLab


From 0e0f602d5e1423eb1665bc794e03e81a1c17fb61 Mon Sep 17 00:00:00 2001
From: Jannis R <mail@jannisr.de>
Date: Wed, 7 Dec 2016 19:21:29 +0100
Subject: [PATCH 07/64] pass fields to query into QueryCode

---
 js/src/modals/Verification/QueryCode/queryCode.js | 13 +++++++++----
 js/src/modals/Verification/verification.js        | 15 ++++++++++++---
 2 files changed, 21 insertions(+), 7 deletions(-)

diff --git a/js/src/modals/Verification/QueryCode/queryCode.js b/js/src/modals/Verification/QueryCode/queryCode.js
index 03b2283678..db0ae25eb5 100644
--- a/js/src/modals/Verification/QueryCode/queryCode.js
+++ b/js/src/modals/Verification/QueryCode/queryCode.js
@@ -20,20 +20,25 @@ import { Form, Input } from '~/ui';
 
 export default class QueryCode extends Component {
   static propTypes = {
-    number: PropTypes.string.isRequired,
+    receiver: PropTypes.string.isRequired,
+    hint: PropTypes.string,
     isCodeValid: PropTypes.bool.isRequired,
     setCode: PropTypes.func.isRequired
   }
 
+  static defaultProps = {
+    hint: 'Enter the code you received.'
+  }
+
   render () {
-    const { number, isCodeValid } = this.props;
+    const { receiver, hint, isCodeValid } = this.props;
 
     return (
       <Form>
-        <p>The verification code has been sent to { number }.</p>
+        <p>The verification code has been sent to { receiver }.</p>
         <Input
           label={ 'verification code' }
-          hint={ 'Enter the code you received via SMS.' }
+          hint={ hint }
           error={ isCodeValid ? null : 'invalid code' }
           onChange={ this.onChange }
           onSubmit={ this.onSubmit }
diff --git a/js/src/modals/Verification/verification.js b/js/src/modals/Verification/verification.js
index 276dfbd1ca..094c4d0749 100644
--- a/js/src/modals/Verification/verification.js
+++ b/js/src/modals/Verification/verification.js
@@ -158,8 +158,8 @@ export default class Verification extends Component {
       return (<p>{ error }</p>);
     }
 
+    const { method } = this.state;
     if (phase === 0) {
-      const { method } = this.state;
       const values = Object.values(methods);
       const value = values.findIndex((v) => v.value === method);
       return (
@@ -185,7 +185,6 @@ export default class Verification extends Component {
         );
 
       case 2:
-        const { method } = this.state;
         const { setConsentGiven } = this.props.store;
 
         const fields = []
@@ -221,9 +220,19 @@ export default class Verification extends Component {
         );
 
       case 4:
+        let receiver, hint;
+        if (method === 'sms') {
+          receiver = this.props.store.number;
+          hint = 'Enter the code you received via SMS.';
+        } else if (method === 'email') {
+          receiver = this.props.store.email;
+          hint = 'Enter the code you received via e-mail.';
+        }
         return (
           <QueryCode
-            number={ number } fee={ fee } isCodeValid={ isCodeValid }
+            receiver={ receiver }
+            hint={ hint }
+            isCodeValid={ isCodeValid }
             setCode={ setCode }
           />
         );
-- 
GitLab


From 162420f4c2f790808de5c0086e6990ac84368cd4 Mon Sep 17 00:00:00 2001
From: Jannis R <mail@jannisr.de>
Date: Wed, 7 Dec 2016 19:22:13 +0100
Subject: [PATCH 08/64] send emailHash with request, update ABI

---
 js/src/contracts/abi/email-verification.json | 2 +-
 js/src/modals/Verification/email-store.js    | 5 +++++
 js/src/modals/Verification/store.js          | 7 +++++--
 3 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/js/src/contracts/abi/email-verification.json b/js/src/contracts/abi/email-verification.json
index baa6db4832..6a7f5a6d0b 100644
--- a/js/src/contracts/abi/email-verification.json
+++ b/js/src/contracts/abi/email-verification.json
@@ -1 +1 @@
-[{"constant":false,"inputs":[{"name":"_new","type":"address"}],"name":"setOwner","outputs":[],"payable":false,"type":"function"},{"constant":true,"inputs":[{"name":"","type":"bytes32"}],"name":"reverse","outputs":[{"name":"","type":"address"}],"payable":false,"type":"function"},{"constant":false,"inputs":[{"name":"_who","type":"address"},{"name":"_puzzle","type":"bytes32"},{"name":"_emailHash","type":"bytes32"}],"name":"puzzle","outputs":[],"payable":false,"type":"function"},{"constant":true,"inputs":[{"name":"_who","type":"address"},{"name":"_field","type":"string"}],"name":"getAddress","outputs":[{"name":"","type":"address"}],"payable":false,"type":"function"},{"constant":false,"inputs":[{"name":"_emailHash","type":"bytes32"}],"name":"request","outputs":[],"payable":true,"type":"function"},{"constant":false,"inputs":[{"name":"_new","type":"uint256"}],"name":"setFee","outputs":[],"payable":false,"type":"function"},{"constant":false,"inputs":[{"name":"_code","type":"bytes32"}],"name":"confirm","outputs":[],"payable":false,"type":"function"},{"constant":true,"inputs":[],"name":"owner","outputs":[{"name":"","type":"address"}],"payable":false,"type":"function"},{"constant":false,"inputs":[],"name":"drain","outputs":[],"payable":false,"type":"function"},{"constant":true,"inputs":[{"name":"_who","type":"address"},{"name":"_field","type":"string"}],"name":"getUint","outputs":[{"name":"","type":"uint256"}],"payable":false,"type":"function"},{"constant":true,"inputs":[{"name":"_who","type":"address"}],"name":"certified","outputs":[{"name":"","type":"bool"}],"payable":false,"type":"function"},{"constant":true,"inputs":[],"name":"fee","outputs":[{"name":"","type":"uint256"}],"payable":false,"type":"function"},{"constant":true,"inputs":[{"name":"_who","type":"address"},{"name":"_field","type":"string"}],"name":"get","outputs":[{"name":"","type":"bytes32"}],"payable":false,"type":"function"},{"anonymous":false,"inputs":[{"indexed":true,"name":"who","type":"address"},{"indexed":false,"name":"emailHash","type":"bytes32"}],"name":"Requested","type":"event"},{"anonymous":false,"inputs":[{"indexed":true,"name":"who","type":"address"},{"indexed":true,"name":"emailHash","type":"bytes32"},{"indexed":false,"name":"puzzle","type":"bytes32"}],"name":"Puzzled","type":"event"},{"anonymous":false,"inputs":[{"indexed":true,"name":"who","type":"address"}],"name":"Confirmed","type":"event"},{"anonymous":false,"inputs":[{"indexed":true,"name":"who","type":"address"}],"name":"Revoked","type":"event"},{"anonymous":false,"inputs":[{"indexed":true,"name":"old","type":"address"},{"indexed":true,"name":"current","type":"address"}],"name":"NewOwner","type":"event"}]
\ No newline at end of file
+[{"constant":false,"inputs":[{"name":"_new","type":"address"}],"name":"setOwner","outputs":[],"payable":false,"type":"function"},{"constant":true,"inputs":[{"name":"","type":"bytes32"}],"name":"reverse","outputs":[{"name":"","type":"address"}],"payable":false,"type":"function"},{"constant":false,"inputs":[{"name":"_who","type":"address"},{"name":"_puzzle","type":"bytes32"},{"name":"_emailHash","type":"bytes32"}],"name":"puzzle","outputs":[],"payable":false,"type":"function"},{"constant":true,"inputs":[{"name":"_who","type":"address"},{"name":"_field","type":"string"}],"name":"getAddress","outputs":[{"name":"","type":"address"}],"payable":false,"type":"function"},{"constant":false,"inputs":[{"name":"_emailHash","type":"bytes32"}],"name":"request","outputs":[],"payable":true,"type":"function"},{"constant":false,"inputs":[{"name":"_new","type":"uint256"}],"name":"setFee","outputs":[],"payable":false,"type":"function"},{"constant":false,"inputs":[{"name":"_code","type":"bytes32"}],"name":"confirm","outputs":[{"name":"","type":"bool"}],"payable":false,"type":"function"},{"constant":true,"inputs":[],"name":"owner","outputs":[{"name":"","type":"address"}],"payable":false,"type":"function"},{"constant":false,"inputs":[],"name":"drain","outputs":[],"payable":false,"type":"function"},{"constant":true,"inputs":[{"name":"_who","type":"address"},{"name":"_field","type":"string"}],"name":"getUint","outputs":[{"name":"","type":"uint256"}],"payable":false,"type":"function"},{"constant":true,"inputs":[{"name":"_who","type":"address"}],"name":"certified","outputs":[{"name":"","type":"bool"}],"payable":false,"type":"function"},{"constant":true,"inputs":[],"name":"fee","outputs":[{"name":"","type":"uint256"}],"payable":false,"type":"function"},{"constant":true,"inputs":[{"name":"_who","type":"address"},{"name":"_field","type":"string"}],"name":"get","outputs":[{"name":"","type":"bytes32"}],"payable":false,"type":"function"},{"anonymous":false,"inputs":[{"indexed":true,"name":"who","type":"address"},{"indexed":false,"name":"emailHash","type":"bytes32"}],"name":"Requested","type":"event"},{"anonymous":false,"inputs":[{"indexed":true,"name":"who","type":"address"},{"indexed":true,"name":"emailHash","type":"bytes32"},{"indexed":false,"name":"puzzle","type":"bytes32"}],"name":"Puzzled","type":"event"},{"anonymous":false,"inputs":[{"indexed":true,"name":"who","type":"address"}],"name":"Confirmed","type":"event"},{"anonymous":false,"inputs":[{"indexed":true,"name":"who","type":"address"}],"name":"Revoked","type":"event"},{"anonymous":false,"inputs":[{"indexed":true,"name":"old","type":"address"},{"indexed":true,"name":"current","type":"address"}],"name":"NewOwner","type":"event"}]
\ No newline at end of file
diff --git a/js/src/modals/Verification/email-store.js b/js/src/modals/Verification/email-store.js
index 14179cfe28..f0a65300f4 100644
--- a/js/src/modals/Verification/email-store.js
+++ b/js/src/modals/Verification/email-store.js
@@ -15,6 +15,7 @@
 // along with Parity.  If not, see <http://www.gnu.org/licenses/>.
 
 import { observable, computed, action } from 'mobx';
+import { sha3 } from '~/api/util/sha3';
 
 import VerificationStore, {
   LOADING, QUERY_DATA, QUERY_CODE, POSTED_CONFIRMATION, DONE
@@ -55,10 +56,14 @@ export default class EmailVerificationStore extends VerificationStore {
     return super(api, account, isTestnet, 'emailverification');
   }
 
+  requestValues = () => [ sha3(this.email) ]
+
   @action setEmail = (email) => {
     this.email = email;
   }
 
+  requestValues = () => [ sha3(this.email) ]
+
   requestCode = () => {
     const { email, account, isTestnet } = this;
     return postToServer({ email, address: account }, isTestnet);
diff --git a/js/src/modals/Verification/store.js b/js/src/modals/Verification/store.js
index f8542786b4..fc89ad8ac4 100644
--- a/js/src/modals/Verification/store.js
+++ b/js/src/modals/Verification/store.js
@@ -133,19 +133,22 @@ export default class VerificationStore {
       });
   }
 
+  requestValues = () => []
+
   @action sendRequest = () => {
     const { api, account, contract, fee, hasRequested } = this;
 
     const request = contract.functions.find((fn) => fn.name === 'request');
     const options = { from: account, value: fee.toString() };
+    const values = this.requestValues();
 
     let chain = Promise.resolve();
     if (!hasRequested) {
       this.step = POSTING_REQUEST;
-      chain = request.estimateGas(options, [])
+      chain = request.estimateGas(options, values)
         .then((gas) => {
           options.gas = gas.mul(1.2).toFixed(0);
-          return request.postTransaction(options, []);
+          return request.postTransaction(options, values);
         })
         .then((handle) => {
           // TODO: The "request rejected" error doesn't have any property to
-- 
GitLab


From dfc445b6d66b4752d92e9460dede40df7696b8b2 Mon Sep 17 00:00:00 2001
From: Jannis R <mail@jannisr.de>
Date: Thu, 8 Dec 2016 11:55:51 +0100
Subject: [PATCH 09/64] fix bugs & linting issues

---
 js/src/modals/Verification/email-store.js  | 4 +---
 js/src/modals/Verification/sms-store.js    | 2 +-
 js/src/modals/Verification/store.js        | 2 +-
 js/src/modals/Verification/verification.js | 4 ++--
 4 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/js/src/modals/Verification/email-store.js b/js/src/modals/Verification/email-store.js
index f0a65300f4..5d4ddb4b7f 100644
--- a/js/src/modals/Verification/email-store.js
+++ b/js/src/modals/Verification/email-store.js
@@ -53,7 +53,7 @@ export default class EmailVerificationStore extends VerificationStore {
   }
 
   constructor (api, account, isTestnet) {
-    return super(api, account, isTestnet, 'emailverification');
+    super(api, account, isTestnet, 'emailverification3');
   }
 
   requestValues = () => [ sha3(this.email) ]
@@ -62,8 +62,6 @@ export default class EmailVerificationStore extends VerificationStore {
     this.email = email;
   }
 
-  requestValues = () => [ sha3(this.email) ]
-
   requestCode = () => {
     const { email, account, isTestnet } = this;
     return postToServer({ email, address: account }, isTestnet);
diff --git a/js/src/modals/Verification/sms-store.js b/js/src/modals/Verification/sms-store.js
index 58b79ebfb7..d0f3163580 100644
--- a/js/src/modals/Verification/sms-store.js
+++ b/js/src/modals/Verification/sms-store.js
@@ -52,7 +52,7 @@ export default class SMSVerificationStore extends VerificationStore {
   }
 
   constructor (api, account, isTestnet) {
-    return super(api, account, isTestnet, 'smsverification');
+    super(api, account, isTestnet, 'smsverification');
   }
 
   @action setNumber = (number) => {
diff --git a/js/src/modals/Verification/store.js b/js/src/modals/Verification/store.js
index fc89ad8ac4..88c86e2061 100644
--- a/js/src/modals/Verification/store.js
+++ b/js/src/modals/Verification/store.js
@@ -52,7 +52,7 @@ export default class VerificationStore {
     this.isTestnet = isTestnet;
 
     this.step = LOADING;
-    Contracts.create(api).registry.getContract(name)
+    Contracts.get().registry.getContract(name)
       .then((contract) => {
         this.contract = contract;
         this.load();
diff --git a/js/src/modals/Verification/verification.js b/js/src/modals/Verification/verification.js
index 094c4d0749..cb40d83514 100644
--- a/js/src/modals/Verification/verification.js
+++ b/js/src/modals/Verification/verification.js
@@ -173,7 +173,7 @@ export default class Verification extends Component {
 
     const {
       step,
-      fee, number, isNumberValid, isVerified, hasRequested,
+      fee, isVerified, hasRequested,
       requestTx, isCodeValid, confirmationTx,
       setCode
     } = this.props.store;
@@ -187,7 +187,7 @@ export default class Verification extends Component {
       case 2:
         const { setConsentGiven } = this.props.store;
 
-        const fields = []
+        const fields = [];
         if (method === 'sms') {
           fields.push({
             key: 'number',
-- 
GitLab


From 5418c56b019c934ac850577b0f70aa189b26b240 Mon Sep 17 00:00:00 2001
From: Jannis R <mail@jannisr.de>
Date: Thu, 8 Dec 2016 12:11:17 +0100
Subject: [PATCH 10/64] remove Prepare step

The modal got really crowded and the preparation step had
only been shown for fractions of a second anyways. The
"loading" message is now part of the next step.
---
 js/src/modals/Verification/verification.js | 40 ++++++++++------------
 1 file changed, 19 insertions(+), 21 deletions(-)

diff --git a/js/src/modals/Verification/verification.js b/js/src/modals/Verification/verification.js
index cb40d83514..82792a7060 100644
--- a/js/src/modals/Verification/verification.js
+++ b/js/src/modals/Verification/verification.js
@@ -53,12 +53,11 @@ export default class Verification extends Component {
   }
 
   static phases = { // mapping (store steps -> steps)
-    [LOADING]: 1,
-    [QUERY_DATA]: 2,
-    [POSTING_REQUEST]: 3, [POSTED_REQUEST]: 3, [REQUESTING_CODE]: 3,
-    [QUERY_CODE]: 4,
-    [POSTING_CONFIRMATION]: 5, [POSTED_CONFIRMATION]: 5,
-    [DONE]: 6
+    [LOADING]: 1, [QUERY_DATA]: 1,
+    [POSTING_REQUEST]: 2, [POSTED_REQUEST]: 2, [REQUESTING_CODE]: 2,
+    [QUERY_CODE]: 3,
+    [POSTING_CONFIRMATION]: 4, [POSTED_CONFIRMATION]: 4,
+    [DONE]: 5
   }
 
   state = {
@@ -81,8 +80,8 @@ export default class Verification extends Component {
         title='verify your account'
         visible
         current={ phase }
-        steps={ ['Method', 'Prepare', 'Enter Data', 'Request', 'Enter Code', 'Confirm', 'Done!'] }
-        waiting={ error ? [] : [ 1, 3, 5 ] }
+        steps={ ['Method', 'Enter Data', 'Request', 'Enter Code', 'Confirm', 'Done!'] }
+        waiting={ error ? [] : [ 2, 4 ] }
       >
         { this.renderStep(phase, error) }
       </Modal>
@@ -103,7 +102,7 @@ export default class Verification extends Component {
       return (<div>{ cancel }</div>);
     }
 
-    if (phase === 6) {
+    if (phase === 5) {
       return (
         <div>
           { cancel }
@@ -126,16 +125,16 @@ export default class Verification extends Component {
           onSelectMethod(method);
         };
         break;
-      case 2:
+      case 1:
         action = store.sendRequest;
         break;
-      case 3:
+      case 2:
         action = store.queryCode;
         break;
-      case 4:
+      case 3:
         action = store.sendConfirmation;
         break;
-      case 5:
+      case 4:
         action = store.done;
         break;
     }
@@ -180,11 +179,10 @@ export default class Verification extends Component {
 
     switch (phase) {
       case 1:
-        return (
-          <p>Loading Verification.</p>
-        );
+        if (step === LOADING) {
+          return (<p>Loading verification data.</p>);
+        }
 
-      case 2:
         const { setConsentGiven } = this.props.store;
 
         const fields = [];
@@ -214,12 +212,12 @@ export default class Verification extends Component {
           />
         );
 
-      case 3:
+      case 2:
         return (
           <SendRequest step={ step } tx={ requestTx } />
         );
 
-      case 4:
+      case 3:
         let receiver, hint;
         if (method === 'sms') {
           receiver = this.props.store.number;
@@ -237,12 +235,12 @@ export default class Verification extends Component {
           />
         );
 
-      case 5:
+      case 4:
         return (
           <SendConfirmation step={ step } tx={ confirmationTx } />
         );
 
-      case 6:
+      case 5:
         return (
           <Done />
         );
-- 
GitLab


From a94bbea7a578a7ddc4adaf4342533a039793d6ca Mon Sep 17 00:00:00 2001
From: Jannis R <mail@jannisr.de>
Date: Fri, 9 Dec 2016 12:37:36 +0100
Subject: [PATCH 11/64] more user-friendly method selection

---
 js/src/modals/Verification/verification.css | 21 +++++++++++++++++++++
 js/src/modals/Verification/verification.js  | 12 ++++++++++--
 2 files changed, 31 insertions(+), 2 deletions(-)
 create mode 100644 js/src/modals/Verification/verification.css

diff --git a/js/src/modals/Verification/verification.css b/js/src/modals/Verification/verification.css
new file mode 100644
index 0000000000..f1a39ac4f2
--- /dev/null
+++ b/js/src/modals/Verification/verification.css
@@ -0,0 +1,21 @@
+/* Copyright 2015, 2016 Ethcore (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/>.
+*/
+
+.noSpacing {
+  margin-top: 0;
+  margin-bottom: 0;
+}
diff --git a/js/src/modals/Verification/verification.js b/js/src/modals/Verification/verification.js
index 82792a7060..af9a3a45ea 100644
--- a/js/src/modals/Verification/verification.js
+++ b/js/src/modals/Verification/verification.js
@@ -23,9 +23,17 @@ import { Button, IdentityIcon, Modal } from '~/ui';
 import RadioButtons from '~/ui/Form/RadioButtons';
 import { nullableProptype } from '~/util/proptypes';
 
+import styles from './verification.css';
+
 const methods = {
-  sms: { label: 'SMS Verification', key: 0, value: 'sms' },
-  email: { label: 'E-mail Verification', key: 1, value: 'email' }
+  sms: {
+    label: 'SMS Verification', key: 0, value: 'sms',
+    description: (<p className={ styles.noSpacing }>It will be stored on the blockchain that you control a phone number (not <em>which</em>).</p>)
+  },
+  email: {
+    label: 'E-mail Verification', key: 1, value: 'email',
+    description: (<p className={ styles.noSpacing }>The hash of the e-mail address you prove control over will be stored on the blockchain.</p>)
+  }
 };
 
 import {
-- 
GitLab


From 452b8c9c74735834ea4a0301f60305b1bf3eabde Mon Sep 17 00:00:00 2001
From: Jannis R <mail@jannisr.de>
Date: Fri, 9 Dec 2016 16:20:35 +0100
Subject: [PATCH 12/64] split sms & email verification 3rdparty code

We might want to bundle the code in `3rdparty`.

React & presentational components don't belong in there. At the
same time, the terms of service are strictly related to the use
of these external services. We decided to not bundle them, but
still keep them in a file called `terms-of-service.js`.

The commit also moves the "how it works" section into the
presentational part in `modals/Verification`.
---
 js/src/3rdparty/email-verification/index.js   | 20 ---------
 js/src/3rdparty/email-verification/styles.css | 20 ---------
 .../email-verification/terms-of-service.js    | 23 +++++++++++
 js/src/3rdparty/sms-verification/index.js     | 24 -----------
 js/src/3rdparty/sms-verification/styles.css   | 20 ---------
 .../sms-verification/terms-of-service.js      | 27 ++++++++++++
 js/src/contracts/contracts.js                 |  1 +
 .../Verification/GatherData/gatherData.js     |  8 ++--
 js/src/modals/Verification/how-it-works.js    | 41 +++++++++++++++++++
 js/src/modals/Verification/verification.css   |  4 ++
 10 files changed, 101 insertions(+), 87 deletions(-)
 delete mode 100644 js/src/3rdparty/email-verification/styles.css
 create mode 100644 js/src/3rdparty/email-verification/terms-of-service.js
 delete mode 100644 js/src/3rdparty/sms-verification/styles.css
 create mode 100644 js/src/3rdparty/sms-verification/terms-of-service.js
 create mode 100644 js/src/modals/Verification/how-it-works.js

diff --git a/js/src/3rdparty/email-verification/index.js b/js/src/3rdparty/email-verification/index.js
index 5f4885f3be..5b81f3f95a 100644
--- a/js/src/3rdparty/email-verification/index.js
+++ b/js/src/3rdparty/email-verification/index.js
@@ -15,26 +15,6 @@
 // along with Parity.  If not, see <http://www.gnu.org/licenses/>.
 
 import { stringify } from 'querystring';
-import React from 'react';
-
-import styles from './styles.css';
-
-export const howItWorks = (
-  <div>
-    <p>The following steps will let you prove that you control both an account and an e-mail address.</p>
-    <ol className={ styles.list }>
-      <li>You send a verification request to a specific contract.</li>
-      <li>Our server puts a puzzle into this contract.</li>
-      <li>The code you receive via e-mail is the solution to this puzzle.</li>
-    </ol>
-  </div>
-);
-
-export const termsOfService = (
-  <ul>
-    <li>todo</li>
-  </ul>
-);
 
 export const postToServer = (query, isTestnet = false) => {
   const port = isTestnet ? 28443 : 18443;
diff --git a/js/src/3rdparty/email-verification/styles.css b/js/src/3rdparty/email-verification/styles.css
deleted file mode 100644
index daa4c605ce..0000000000
--- a/js/src/3rdparty/email-verification/styles.css
+++ /dev/null
@@ -1,20 +0,0 @@
-/* Copyright 2015, 2016 Ethcore (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/>.
-*/
-
-.list li {
-  padding: .1em 0;
-}
diff --git a/js/src/3rdparty/email-verification/terms-of-service.js b/js/src/3rdparty/email-verification/terms-of-service.js
new file mode 100644
index 0000000000..263b7e8f06
--- /dev/null
+++ b/js/src/3rdparty/email-verification/terms-of-service.js
@@ -0,0 +1,23 @@
+// Copyright 2015, 2016 Ethcore (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 React from 'react';
+
+export default (
+  <ul>
+    <li>todo</li>
+  </ul>
+);
diff --git a/js/src/3rdparty/sms-verification/index.js b/js/src/3rdparty/sms-verification/index.js
index 46faf084cd..65761223b5 100644
--- a/js/src/3rdparty/sms-verification/index.js
+++ b/js/src/3rdparty/sms-verification/index.js
@@ -15,30 +15,6 @@
 // along with Parity.  If not, see <http://www.gnu.org/licenses/>.
 
 import { stringify } from 'querystring';
-import React from 'react';
-
-import styles from './styles.css';
-
-export const howItWorks = (
-  <div>
-    <p>The following steps will let you prove that you control both an account and a phone number.</p>
-    <ol className={ styles.list }>
-      <li>You send a verification request to a specific contract.</li>
-      <li>Our server puts a puzzle into this contract.</li>
-      <li>The code you receive via SMS is the solution to this puzzle.</li>
-    </ol>
-  </div>
-);
-
-export const termsOfService = (
-  <ul>
-    <li>This privacy notice relates to your use of the Parity SMS verification service. We take your privacy seriously and deal in an honest, direct and transparent way when it comes to your data.</li>
-    <li>We collect your phone number when you use this service. This is temporarily kept in memory, and then encrypted and stored in our EU servers. We only retain the cryptographic hash of the number to prevent duplicated accounts. You consent to this use.</li>
-    <li>You pay a fee for the cost of this service using the account you want to verify.</li>
-    <li>Your phone number is transmitted to a third party US SMS verification service Twilio for the sole purpose of the SMS verification. You consent to this use. Twilio’s privacy policy is here: <a href={ 'https://www.twilio.com/legal/privacy/developer' }>https://www.twilio.com/legal/privacy/developer</a>.</li>
-    <li><i>Parity Technology Limited</i> is registered in England and Wales under company number <code>09760015</code> and complies with the Data Protection Act 1998 (UK). You may contact us via email at <a href={ 'mailto:admin@parity.io' }>admin@parity.io</a>. Our general privacy policy can be found here: <a href={ 'https://ethcore.io/legal.html' }>https://ethcore.io/legal.html</a>.</li>
-  </ul>
-);
 
 export const postToServer = (query, isTestnet = false) => {
   const port = isTestnet ? 8443 : 443;
diff --git a/js/src/3rdparty/sms-verification/styles.css b/js/src/3rdparty/sms-verification/styles.css
deleted file mode 100644
index daa4c605ce..0000000000
--- a/js/src/3rdparty/sms-verification/styles.css
+++ /dev/null
@@ -1,20 +0,0 @@
-/* Copyright 2015, 2016 Ethcore (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/>.
-*/
-
-.list li {
-  padding: .1em 0;
-}
diff --git a/js/src/3rdparty/sms-verification/terms-of-service.js b/js/src/3rdparty/sms-verification/terms-of-service.js
new file mode 100644
index 0000000000..f61b3c97d4
--- /dev/null
+++ b/js/src/3rdparty/sms-verification/terms-of-service.js
@@ -0,0 +1,27 @@
+// Copyright 2015, 2016 Ethcore (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 React from 'react';
+
+export default (
+  <ul>
+    <li>This privacy notice relates to your use of the Parity SMS verification service. We take your privacy seriously and deal in an honest, direct and transparent way when it comes to your data.</li>
+    <li>We collect your phone number when you use this service. This is temporarily kept in memory, and then encrypted and stored in our EU servers. We only retain the cryptographic hash of the number to prevent duplicated accounts. You consent to this use.</li>
+    <li>You pay a fee for the cost of this service using the account you want to verify.</li>
+    <li>Your phone number is transmitted to a third party US SMS verification service Twilio for the sole purpose of the SMS verification. You consent to this use. Twilio’s privacy policy is here: <a href={ 'https://www.twilio.com/legal/privacy/developer' }>https://www.twilio.com/legal/privacy/developer</a>.</li>
+    <li><i>Parity Technology Limited</i> is registered in England and Wales under company number <code>09760015</code> and complies with the Data Protection Act 1998 (UK). You may contact us via email at <a href={ 'mailto:admin@parity.io' }>admin@parity.io</a>. Our general privacy policy can be found here: <a href={ 'https://ethcore.io/legal.html' }>https://ethcore.io/legal.html</a>.</li>
+  </ul>
+);
diff --git a/js/src/contracts/contracts.js b/js/src/contracts/contracts.js
index f30f67efbf..f21ca98037 100644
--- a/js/src/contracts/contracts.js
+++ b/js/src/contracts/contracts.js
@@ -60,6 +60,7 @@ export default class Contracts {
   get smsVerification () {
     return verification;
   }
+
   get emailVerification () {
     return verification;
   }
diff --git a/js/src/modals/Verification/GatherData/gatherData.js b/js/src/modals/Verification/GatherData/gatherData.js
index 24f870fc68..ecebd4da88 100644
--- a/js/src/modals/Verification/GatherData/gatherData.js
+++ b/js/src/modals/Verification/GatherData/gatherData.js
@@ -25,8 +25,9 @@ import { fromWei } from '~/api/util/wei';
 import { Form, Input } from '~/ui';
 import { nullableProptype } from '~/util/proptypes';
 
-import * as sms from '../../../3rdparty/sms-verification';
-import * as email from '../../../3rdparty/email-verification';
+import smsTermsOfService from '~/3rdparty/sms-verification/terms-of-service';
+import emailTermsOfService from '~/3rdparty/email-verification/terms-of-service';
+import { howSMSVerificationWorks, howEmailVerificationWorks } from '../how-it-works';
 import styles from './gatherData.css';
 
 export default class GatherData extends Component {
@@ -41,7 +42,8 @@ export default class GatherData extends Component {
 
   render () {
     const { method, isVerified } = this.props;
-    const { howItWorks, termsOfService } = method === 'email' ? email : sms;
+    const termsOfService = method === 'email' ? emailTermsOfService : smsTermsOfService;
+    const howItWorks = method === 'email' ? howEmailVerificationWorks : howSMSVerificationWorks;
 
     return (
       <Form>
diff --git a/js/src/modals/Verification/how-it-works.js b/js/src/modals/Verification/how-it-works.js
new file mode 100644
index 0000000000..6abdc80dd2
--- /dev/null
+++ b/js/src/modals/Verification/how-it-works.js
@@ -0,0 +1,41 @@
+// Copyright 2015, 2016 Ethcore (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 React from 'react';
+
+import styles from './verification.css';
+
+export const howSMSVerificationWorks = (
+  <div>
+    <p>The following steps will let you prove that you control both an account and a phone number.</p>
+    <ol className={ styles.list }>
+      <li>You send a verification request to a specific contract.</li>
+      <li>Our server puts a puzzle into this contract.</li>
+      <li>The code you receive via SMS is the solution to this puzzle.</li>
+    </ol>
+  </div>
+);
+
+export const howEmailVerificationWorks = (
+  <div>
+    <p>The following steps will let you prove that you control both an account and an e-mail address.</p>
+    <ol className={ styles.list }>
+      <li>You send a verification request to a specific contract.</li>
+      <li>Our server puts a puzzle into this contract.</li>
+      <li>The code you receive via e-mail is the solution to this puzzle.</li>
+    </ol>
+  </div>
+);
diff --git a/js/src/modals/Verification/verification.css b/js/src/modals/Verification/verification.css
index f1a39ac4f2..968671e631 100644
--- a/js/src/modals/Verification/verification.css
+++ b/js/src/modals/Verification/verification.css
@@ -19,3 +19,7 @@
   margin-top: 0;
   margin-bottom: 0;
 }
+
+.list li {
+  padding: .1em 0;
+}
-- 
GitLab


From c249c51dd3430ba144c7345889f97d863a15d1cb Mon Sep 17 00:00:00 2001
From: Jannis R <mail@jannisr.de>
Date: Fri, 9 Dec 2016 16:40:45 +0100
Subject: [PATCH 13/64] certification: use BadgeReg to load the contract

---
 js/src/modals/Verification/email-store.js |  3 ++-
 js/src/modals/Verification/sms-store.js   |  3 ++-
 js/src/modals/Verification/store.js       | 10 ++++++----
 3 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/js/src/modals/Verification/email-store.js b/js/src/modals/Verification/email-store.js
index 5d4ddb4b7f..3d7faa9e16 100644
--- a/js/src/modals/Verification/email-store.js
+++ b/js/src/modals/Verification/email-store.js
@@ -17,6 +17,7 @@
 import { observable, computed, action } from 'mobx';
 import { sha3 } from '~/api/util/sha3';
 
+import EmailVerificationABI from '~/contracts/abi/email-verification.json';
 import VerificationStore, {
   LOADING, QUERY_DATA, QUERY_CODE, POSTED_CONFIRMATION, DONE
 } from './store';
@@ -53,7 +54,7 @@ export default class EmailVerificationStore extends VerificationStore {
   }
 
   constructor (api, account, isTestnet) {
-    super(api, account, isTestnet, 'emailverification3');
+    super(api, EmailVerificationABI, 'emailverification3', account, isTestnet);
   }
 
   requestValues = () => [ sha3(this.email) ]
diff --git a/js/src/modals/Verification/sms-store.js b/js/src/modals/Verification/sms-store.js
index d0f3163580..44c5aa39cc 100644
--- a/js/src/modals/Verification/sms-store.js
+++ b/js/src/modals/Verification/sms-store.js
@@ -17,6 +17,7 @@
 import { observable, computed, action } from 'mobx';
 import phone from 'phoneformat.js';
 
+import SMSVerificationABI from '~/contracts/abi/sms-verification.json';
 import VerificationStore, {
   LOADING, QUERY_DATA, QUERY_CODE, POSTED_CONFIRMATION, DONE
 } from './store';
@@ -52,7 +53,7 @@ export default class SMSVerificationStore extends VerificationStore {
   }
 
   constructor (api, account, isTestnet) {
-    super(api, account, isTestnet, 'smsverification');
+    super(api, SMSVerificationABI, 'smsverification', account, isTestnet);
   }
 
   @action setNumber = (number) => {
diff --git a/js/src/modals/Verification/store.js b/js/src/modals/Verification/store.js
index 88c86e2061..21213e7240 100644
--- a/js/src/modals/Verification/store.js
+++ b/js/src/modals/Verification/store.js
@@ -16,6 +16,7 @@
 
 import { observable, autorun, action } from 'mobx';
 import { sha3 } from '~/api/util/sha3';
+import Contract from '~/api/contract';
 import Contracts from '~/contracts';
 
 import { checkIfVerified, checkIfRequested, awaitPuzzle } from '~/contracts/verification';
@@ -46,18 +47,19 @@ export default class VerificationStore {
   @observable isCodeValid = null;
   @observable confirmationTx = null;
 
-  constructor (api, account, isTestnet, name) {
+  constructor (api, abi, name, account, isTestnet) {
     this.api = api;
     this.account = account;
     this.isTestnet = isTestnet;
 
     this.step = LOADING;
-    Contracts.get().registry.getContract(name)
-      .then((contract) => {
-        this.contract = contract;
+    Contracts.get().badgeReg.fetchCertifier(name)
+      .then(({ address }) => {
+        this.contract = new Contract(api, abi).at(address);
         this.load();
       })
       .catch((err) => {
+        console.error('error', err);
         this.error = 'Failed to fetch the contract: ' + err.message;
       });
 
-- 
GitLab


From e1ade5b3750561101ce8519e3767ae7b63886e05 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tomasz=20Drwi=C4=99ga?= <tomasz@ethcore.io>
Date: Sat, 10 Dec 2016 14:56:41 +0100
Subject: [PATCH 14/64] Maintaining a list of transactions propagated from
 other peers

---
 ethcore/src/client/chain_notify.rs            | 11 ++++-
 ethcore/src/client/client.rs                  | 15 ++++---
 ethcore/src/client/test_client.rs             |  2 +-
 ethcore/src/client/traits.rs                  |  8 ++--
 ethcore/src/service.rs                        |  6 ++-
 .../dapps/localtx/Transaction/transaction.js  | 26 ++++++++++--
 .../localtx/Transaction/transaction.spec.js   |  2 +-
 rpc/src/v1/tests/helpers/sync_provider.rs     | 10 ++++-
 rpc/src/v1/types/sync.rs                      | 16 ++++++--
 sync/src/api.rs                               | 20 +++++++---
 sync/src/chain.rs                             | 10 ++++-
 sync/src/transactions_stats.rs                | 40 +++++++++++++++++++
 12 files changed, 137 insertions(+), 29 deletions(-)

diff --git a/ethcore/src/client/chain_notify.rs b/ethcore/src/client/chain_notify.rs
index e0282d4603..50ff20e387 100644
--- a/ethcore/src/client/chain_notify.rs
+++ b/ethcore/src/client/chain_notify.rs
@@ -15,7 +15,7 @@
 // along with Parity.  If not, see <http://www.gnu.org/licenses/>.
 
 use ipc::IpcConfig;
-use util::H256;
+use util::{H256, H512};
 
 /// Represents what has to be handled by actor listening to chain events
 #[ipc]
@@ -40,6 +40,15 @@ pub trait ChainNotify : Send + Sync {
 	fn stop(&self) {
 		// does nothing by default
 	}
+
+	/// fires when new transactions are imported
+	fn transactions_imported(&self,
+		_hashes: Vec<H256>,
+		_peer_id: Option<H512>,
+		_block_num: u64,
+	) {
+		// does nothing by default
+	}
 }
 
 impl IpcConfig for ChainNotify { }
diff --git a/ethcore/src/client/client.rs b/ethcore/src/client/client.rs
index dfd899b290..9add41e4fd 100644
--- a/ethcore/src/client/client.rs
+++ b/ethcore/src/client/client.rs
@@ -25,7 +25,7 @@ use time::precise_time_ns;
 use util::{Bytes, PerfTimer, Itertools, Mutex, RwLock, Hashable};
 use util::{journaldb, TrieFactory, Trie};
 use util::trie::TrieSpec;
-use util::{U256, H256, Address, H2048, Uint, FixedHash};
+use util::{U256, H256, H512, Address, H2048, Uint, FixedHash};
 use util::kvdb::*;
 
 // other
@@ -559,11 +559,16 @@ impl Client {
 	}
 
 	/// Import transactions from the IO queue
-	pub fn import_queued_transactions(&self, transactions: &[Bytes]) -> usize {
+	pub fn import_queued_transactions(&self, transactions: &[Bytes], peer_id: Option<H512>) -> usize {
 		trace!(target: "external_tx", "Importing queued");
 		let _timer = PerfTimer::new("import_queued_transactions");
 		self.queue_transactions.fetch_sub(transactions.len(), AtomicOrdering::SeqCst);
-		let txs = transactions.iter().filter_map(|bytes| UntrustedRlp::new(bytes).as_val().ok()).collect();
+		let txs: Vec<SignedTransaction> = transactions.iter().filter_map(|bytes| UntrustedRlp::new(bytes).as_val().ok()).collect();
+		let hashes: Vec<_> = txs.iter().map(|tx| tx.hash()).collect();
+		let block_number = self.chain_info().best_block_number;
+		self.notify(|notify| {
+			notify.transactions_imported(hashes.clone(), peer_id.clone(), block_number);
+		});
 		let results = self.miner.import_external_transactions(self, txs);
 		results.len()
 	}
@@ -1264,14 +1269,14 @@ impl BlockChainClient for Client {
 		(*self.build_last_hashes(self.chain.read().best_block_hash())).clone()
 	}
 
-	fn queue_transactions(&self, transactions: Vec<Bytes>) {
+	fn queue_transactions(&self, transactions: Vec<Bytes>, node_id: Option<H512>) {
 		let queue_size = self.queue_transactions.load(AtomicOrdering::Relaxed);
 		trace!(target: "external_tx", "Queue size: {}", queue_size);
 		if queue_size > MAX_TX_QUEUE_SIZE {
 			debug!("Ignoring {} transactions: queue is full", transactions.len());
 		} else {
 			let len = transactions.len();
-			match self.io_channel.lock().send(ClientIoMessage::NewTransactions(transactions)) {
+			match self.io_channel.lock().send(ClientIoMessage::NewTransactions(transactions, node_id)) {
 				Ok(_) => {
 					self.queue_transactions.fetch_add(len, AtomicOrdering::SeqCst);
 				}
diff --git a/ethcore/src/client/test_client.rs b/ethcore/src/client/test_client.rs
index 317a481c71..44efade66f 100644
--- a/ethcore/src/client/test_client.rs
+++ b/ethcore/src/client/test_client.rs
@@ -657,7 +657,7 @@ impl BlockChainClient for TestBlockChainClient {
 		unimplemented!();
 	}
 
-	fn queue_transactions(&self, transactions: Vec<Bytes>) {
+	fn queue_transactions(&self, transactions: Vec<Bytes>, _peer_id: Option<H512>) {
 		// import right here
 		let txs = transactions.into_iter().filter_map(|bytes| UntrustedRlp::new(&bytes).as_val().ok()).collect();
 		self.miner.import_external_transactions(self, txs);
diff --git a/ethcore/src/client/traits.rs b/ethcore/src/client/traits.rs
index e23a564d4a..c032d40594 100644
--- a/ethcore/src/client/traits.rs
+++ b/ethcore/src/client/traits.rs
@@ -15,7 +15,7 @@
 // along with Parity.  If not, see <http://www.gnu.org/licenses/>.
 
 use std::collections::BTreeMap;
-use util::{U256, Address, H256, H2048, Bytes, Itertools};
+use util::{U256, Address, H256, H512, H2048, Bytes, Itertools};
 use util::stats::Histogram;
 use blockchain::TreeRoute;
 use verification::queue::QueueInfo as BlockQueueInfo;
@@ -200,7 +200,7 @@ pub trait BlockChainClient : Sync + Send {
 	fn last_hashes(&self) -> LastHashes;
 
 	/// Queue transactions for importing.
-	fn queue_transactions(&self, transactions: Vec<Bytes>);
+	fn queue_transactions(&self, transactions: Vec<Bytes>, peer_id: Option<H512>);
 
 	/// list all transactions
 	fn pending_transactions(&self) -> Vec<SignedTransaction>;
@@ -294,9 +294,9 @@ pub trait ProvingBlockChainClient: BlockChainClient {
 	/// The key is the keccak hash of the account's address.
 	/// Returns a vector of raw trie nodes (in order from the root) proving the query.
 	/// Nodes after `from_level` may be omitted.
-	/// An empty vector indicates unservable query.	
+	/// An empty vector indicates unservable query.
 	fn prove_account(&self, key1: H256, from_level: u32, id: BlockID) -> Vec<Bytes>;
 
 	/// Get code by address hash.
 	fn code_by_hash(&self, account_key: H256, id: BlockID) -> Bytes;
-}
\ No newline at end of file
+}
diff --git a/ethcore/src/service.rs b/ethcore/src/service.rs
index 36b5e71572..b595843a89 100644
--- a/ethcore/src/service.rs
+++ b/ethcore/src/service.rs
@@ -39,7 +39,7 @@ pub enum ClientIoMessage {
 	/// A block is ready
 	BlockVerified,
 	/// New transaction RLPs are ready to be imported
-	NewTransactions(Vec<Bytes>),
+	NewTransactions(Vec<Bytes>, Option<H512>),
 	/// Begin snapshot restoration
 	BeginRestoration(ManifestData),
 	/// Feed a state chunk to the snapshot service
@@ -196,7 +196,9 @@ impl IoHandler<ClientIoMessage> for ClientIoHandler {
 
 		match *net_message {
 			ClientIoMessage::BlockVerified => { self.client.import_verified_blocks(); }
-			ClientIoMessage::NewTransactions(ref transactions) => { self.client.import_queued_transactions(transactions); }
+			ClientIoMessage::NewTransactions(ref transactions, ref peer_id) => {
+				self.client.import_queued_transactions(transactions, peer_id.clone());
+			}
 			ClientIoMessage::BeginRestoration(ref manifest) => {
 				if let Err(e) = self.snapshot.init_restore(manifest.clone(), true) {
 					warn!("Failed to initialize snapshot restoration: {}", e);
diff --git a/js/src/dapps/localtx/Transaction/transaction.js b/js/src/dapps/localtx/Transaction/transaction.js
index 17a45ecd60..c9ca10ba5f 100644
--- a/js/src/dapps/localtx/Transaction/transaction.js
+++ b/js/src/dapps/localtx/Transaction/transaction.js
@@ -48,7 +48,6 @@ class BaseTransaction extends Component {
         <IdentityIcon
           address={ transaction.from }
           />
-        0x{ transaction.nonce.toString(16) }
       </div>
     );
   }
@@ -87,6 +86,17 @@ class BaseTransaction extends Component {
       </span>
     );
   }
+
+  renderReceived (stats) {
+    const noOfPeers = Object.keys(stats.receivedFrom).length;
+    const noOfPropagations = Object.values(stats.receivedFrom).reduce((sum, val) => sum + val, 0);
+
+    return (
+      <span className={ styles.nowrap }>
+        { noOfPropagations } ({ noOfPeers } peers)
+      </span>
+    );
+  }
 }
 
 export class Transaction extends BaseTransaction {
@@ -103,7 +113,8 @@ export class Transaction extends BaseTransaction {
     isLocal: false,
     stats: {
       firstSeen: 0,
-      propagatedTo: {}
+      propagatedTo: {},
+      receivedFrom: {}
     }
   };
 
@@ -129,6 +140,9 @@ export class Transaction extends BaseTransaction {
         <th>
           # Propagated
         </th>
+        <th>
+          # Received
+        </th>
         <th />
       </tr>
     );
@@ -165,6 +179,9 @@ export class Transaction extends BaseTransaction {
         <td>
           { this.renderPropagation(stats) }
         </td>
+        <td>
+          { this.renderReceived(stats) }
+        </td>
       </tr>
     );
   }
@@ -193,7 +210,8 @@ export class LocalTransaction extends BaseTransaction {
 
   static defaultProps = {
     stats: {
-      propagatedTo: {}
+      propagatedTo: {},
+      receivedFrom: {}
     }
   };
 
@@ -317,6 +335,8 @@ export class LocalTransaction extends BaseTransaction {
           { this.renderStatus() }
           <br />
           { status === 'pending' ? this.renderPropagation(stats) : null }
+          <br />
+          { status === 'pending' ? this.renderReceived(stats) : null }
         </td>
       </tr>
     );
diff --git a/js/src/dapps/localtx/Transaction/transaction.spec.js b/js/src/dapps/localtx/Transaction/transaction.spec.js
index 04f2f8de84..2bd3691db2 100644
--- a/js/src/dapps/localtx/Transaction/transaction.spec.js
+++ b/js/src/dapps/localtx/Transaction/transaction.spec.js
@@ -34,7 +34,7 @@ describe('dapps/localtx/Transaction', () => {
     it('renders without crashing', () => {
       const transaction = {
         hash: '0x1234567890',
-        nonce: 15,
+        nonce: new BigNumber(15),
         gasPrice: new BigNumber(10),
         gas: new BigNumber(10)
       };
diff --git a/rpc/src/v1/tests/helpers/sync_provider.rs b/rpc/src/v1/tests/helpers/sync_provider.rs
index 8800d926a8..aa7e8d8497 100644
--- a/rpc/src/v1/tests/helpers/sync_provider.rs
+++ b/rpc/src/v1/tests/helpers/sync_provider.rs
@@ -105,13 +105,19 @@ impl SyncProvider for TestSyncProvider {
 				first_seen: 10,
 				propagated_to: map![
 					128.into() => 16
-				]
+				],
+				received_from: map![
+					1.into() => 10
+				],
 			},
 			5.into() => TransactionStats {
 				first_seen: 16,
 				propagated_to: map![
 					16.into() => 1
-				]
+				],
+				received_from: map![
+					256.into() => 2
+				],
 			}
 		]
 	}
diff --git a/rpc/src/v1/types/sync.rs b/rpc/src/v1/types/sync.rs
index 6f8938be95..65d9891566 100644
--- a/rpc/src/v1/types/sync.rs
+++ b/rpc/src/v1/types/sync.rs
@@ -127,6 +127,9 @@ pub struct TransactionStats {
 	/// Peers this transaction was propagated to with count.
 	#[serde(rename="propagatedTo")]
 	pub propagated_to: BTreeMap<H512, usize>,
+	/// Peers that propagated this transaction back.
+	#[serde(rename="receivedFrom")]
+	pub received_from: BTreeMap<H512, usize>,
 }
 
 impl From<SyncPeerInfo> for PeerInfo {
@@ -157,7 +160,11 @@ impl From<SyncTransactionStats> for TransactionStats {
 			propagated_to: s.propagated_to
 				.into_iter()
 				.map(|(id, count)| (id.into(), count))
-				.collect()
+				.collect(),
+			received_from: s.received_from
+				.into_iter()
+				.map(|(id, count)| (id.into(), count))
+				.collect(),
 		}
 	}
 }
@@ -208,10 +215,13 @@ mod tests {
 			first_seen: 100,
 			propagated_to: map![
 				10.into() => 50
-			]
+			],
+			received_from: map![
+				1.into() => 1000
+			],
 		};
 
 		let serialized = serde_json::to_string(&stats).unwrap();
-		assert_eq!(serialized, r#"{"firstSeen":100,"propagatedTo":{"0x0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a":50}}"#)
+		assert_eq!(serialized, r#"{"firstSeen":100,"propagatedTo":{"0x0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a":50},"receivedFrom":{"0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001":1000}}"#)
 	}
 }
diff --git a/sync/src/api.rs b/sync/src/api.rs
index 7c531bf7c8..10434ce26f 100644
--- a/sync/src/api.rs
+++ b/sync/src/api.rs
@@ -99,6 +99,8 @@ pub struct TransactionStats {
 	pub first_seen: u64,
 	/// Peers it was propagated to.
 	pub propagated_to: BTreeMap<H512, usize>,
+	/// Peers that propagated the transaction back.
+	pub received_from: BTreeMap<H512, usize>,
 }
 
 /// Peer connection information
@@ -144,7 +146,7 @@ pub struct EthSync {
 	network: NetworkService,
 	/// Main (eth/par) protocol handler
 	sync_handler: Arc<SyncProtocolHandler>,
-	/// Light (les) protocol handler 
+	/// Light (les) protocol handler
 	light_proto: Option<Arc<LightProtocol>>,
 	/// The main subprotocol name
 	subprotocol_name: [u8; 3],
@@ -155,7 +157,7 @@ pub struct EthSync {
 impl EthSync {
 	/// Creates and register protocol with the network service
 	pub fn new(params: Params) -> Result<Arc<EthSync>, NetworkError> {
-		let pruning_info = params.chain.pruning_info();		
+		let pruning_info = params.chain.pruning_info();
 		let light_proto = match params.config.serve_light {
 			false => None,
 			true => Some({
@@ -297,7 +299,7 @@ impl ChainNotify for EthSync {
 				Some(lp) => lp,
 				None => return,
 			};
-			
+
 			let chain_info = self.sync_handler.chain.chain_info();
 			light_proto.make_announcement(context, Announcement {
 				head_hash: chain_info.best_block_hash,
@@ -323,7 +325,7 @@ impl ChainNotify for EthSync {
 		// register the warp sync subprotocol
 		self.network.register_protocol(self.sync_handler.clone(), WARP_SYNC_PROTOCOL_ID, SNAPSHOT_SYNC_PACKET_COUNT, &[1u8])
 			.unwrap_or_else(|e| warn!("Error registering snapshot sync protocol: {:?}", e));
-		
+
 		// register the light protocol.
 		if let Some(light_proto) = self.light_proto.as_ref().map(|x| x.clone()) {
 			self.network.register_protocol(light_proto, self.light_subprotocol_name, ::light::net::PACKET_COUNT, ::light::net::PROTOCOL_VERSIONS)
@@ -335,6 +337,11 @@ impl ChainNotify for EthSync {
 		self.sync_handler.snapshot_service.abort_restore();
 		self.network.stop().unwrap_or_else(|e| warn!("Error stopping network: {:?}", e));
 	}
+
+	fn transactions_imported(&self, hashes: Vec<H256>, peer_id: Option<H512>, block_number: u64) {
+		let mut sync = self.sync_handler.sync.write();
+		sync.transactions_imported(hashes, peer_id, block_number);
+	}
 }
 
 /// LES event handler.
@@ -344,7 +351,8 @@ struct TxRelay(Arc<BlockChainClient>);
 impl LightHandler for TxRelay {
 	fn on_transactions(&self, ctx: &EventContext, relay: &[::ethcore::transaction::SignedTransaction]) {
 		trace!(target: "les", "Relaying {} transactions from peer {}", relay.len(), ctx.peer());
-		self.0.queue_transactions(relay.iter().map(|tx| ::rlp::encode(tx).to_vec()).collect())
+		// TODO [ToDr] Can we get a peer enode somehow?
+		self.0.queue_transactions(relay.iter().map(|tx| ::rlp::encode(tx).to_vec()).collect(), None)
 	}
 }
 
@@ -547,4 +555,4 @@ pub struct ServiceConfiguration {
 	pub net: NetworkConfiguration,
 	/// IPC path.
 	pub io_path: String,
-}
\ No newline at end of file
+}
diff --git a/sync/src/chain.rs b/sync/src/chain.rs
index 2d53ad5ee8..9115ac297e 100644
--- a/sync/src/chain.rs
+++ b/sync/src/chain.rs
@@ -432,6 +432,13 @@ impl ChainSync {
 		self.transactions_stats.stats()
 	}
 
+	/// Updates statistics for imported transactions.
+	pub fn transactions_imported(&mut self, hashes: Vec<H256>, peer_id: Option<H512>, block_number: u64) {
+		for hash in hashes {
+			self.transactions_stats.received(hash, peer_id, block_number);
+		}
+	}
+
 	/// Abort all sync activity
 	pub fn abort(&mut self, io: &mut SyncIo) {
 		self.reset_and_continue(io);
@@ -1409,7 +1416,8 @@ impl ChainSync {
 			let tx = rlp.as_raw().to_vec();
 			transactions.push(tx);
 		}
-		io.chain().queue_transactions(transactions);
+		let id = io.peer_session_info(peer_id).and_then(|info| info.id);
+		io.chain().queue_transactions(transactions, id);
 		Ok(())
 	}
 
diff --git a/sync/src/transactions_stats.rs b/sync/src/transactions_stats.rs
index 8c5eb6dda6..a91a860e54 100644
--- a/sync/src/transactions_stats.rs
+++ b/sync/src/transactions_stats.rs
@@ -26,6 +26,7 @@ type BlockNumber = u64;
 pub struct Stats {
 	first_seen: BlockNumber,
 	propagated_to: HashMap<NodeId, usize>,
+	received_from: HashMap<NodeId, usize>,
 }
 
 impl Stats {
@@ -33,6 +34,7 @@ impl Stats {
 		Stats {
 			first_seen: number,
 			propagated_to: Default::default(),
+			received_from: Default::default(),
 		}
 	}
 }
@@ -45,6 +47,10 @@ impl<'a> From<&'a Stats> for TransactionStats {
 				.iter()
 				.map(|(hash, size)| (*hash, *size))
 				.collect(),
+			received_from: other.received_from
+				.iter()
+				.map(|(hash, size)| (*hash, *size))
+				.collect(),
 		}
 	}
 }
@@ -63,6 +69,14 @@ impl TransactionsStats {
 		*count = count.saturating_add(1);
 	}
 
+	/// Increase number of back-propagations from given `enodeid`.
+	pub fn received(&mut self, hash: H256, enode_id: Option<NodeId>, current_block_num: BlockNumber) {
+		let enode_id = enode_id.unwrap_or_default();
+		let mut stats = self.pending_transactions.entry(hash).or_insert_with(|| Stats::new(current_block_num));
+		let mut count = stats.received_from.entry(enode_id).or_insert(0);
+		*count = count.saturating_add(1);
+	}
+
 	/// Returns propagation stats for given hash or `None` if hash is not known.
 	#[cfg(test)]
 	pub fn get(&self, hash: &H256) -> Option<&Stats> {
@@ -112,6 +126,32 @@ mod tests {
 			propagated_to: hash_map![
 				enodeid1 => 2,
 				enodeid2 => 1
+			],
+			received_from: Default::default(),
+		}));
+	}
+
+	#[test]
+	fn should_keep_track_of_back_propagations() {
+		// given
+		let mut stats = TransactionsStats::default();
+		let hash = 5.into();
+		let enodeid1 = 2.into();
+		let enodeid2 = 5.into();
+
+		// when
+		stats.received(hash, Some(enodeid1), 5);
+		stats.received(hash, Some(enodeid1), 10);
+		stats.received(hash, Some(enodeid2), 15);
+
+		// then
+		let stats = stats.get(&hash);
+		assert_eq!(stats, Some(&Stats {
+			first_seen: 5,
+			propagated_to: Default::default(),
+			received_from: hash_map![
+				enodeid1 => 2,
+				enodeid2 => 1
 			]
 		}));
 	}
-- 
GitLab


From e66157f9227606d8c4b07115b0ac2d91faebc7fb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tomasz=20Drwi=C4=99ga?= <tomasz@ethcore.io>
Date: Sat, 10 Dec 2016 16:40:32 +0100
Subject: [PATCH 15/64] fixing test

---
 rpc/src/v1/tests/mocked/parity.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/rpc/src/v1/tests/mocked/parity.rs b/rpc/src/v1/tests/mocked/parity.rs
index 9b4daaccd7..45ee4aa754 100644
--- a/rpc/src/v1/tests/mocked/parity.rs
+++ b/rpc/src/v1/tests/mocked/parity.rs
@@ -363,7 +363,7 @@ fn rpc_parity_transactions_stats() {
 	let io = deps.default_client();
 
 	let request = r#"{"jsonrpc": "2.0", "method": "parity_pendingTransactionsStats", "params":[], "id": 1}"#;
-	let response = r#"{"jsonrpc":"2.0","result":{"0x0000000000000000000000000000000000000000000000000000000000000001":{"firstSeen":10,"propagatedTo":{"0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000080":16}},"0x0000000000000000000000000000000000000000000000000000000000000005":{"firstSeen":16,"propagatedTo":{"0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000010":1}}},"id":1}"#;
+	let response = r#"{"jsonrpc":"2.0","result":{"0x0000000000000000000000000000000000000000000000000000000000000001":{"firstSeen":10,"propagatedTo":{"0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000080":16},"receivedFrom":{"0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001":10}},"0x0000000000000000000000000000000000000000000000000000000000000005":{"firstSeen":16,"propagatedTo":{"0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000010":1},"receivedFrom":{"0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000100":2}}},"id":1}"#;
 
 	assert_eq!(io.handle_request_sync(request), Some(response.to_owned()));
 }
-- 
GitLab


From aaf6da4c0003aeee8778b7954a4f48f055603351 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tomasz=20Drwi=C4=99ga?= <tomasz@ethcore.io>
Date: Sat, 10 Dec 2016 16:51:50 +0100
Subject: [PATCH 16/64] Returning persistent node id

---
 ethcore/light/src/net/context.rs   | 29 +++++++---
 ethcore/light/src/net/tests/mod.rs | 86 ++++++++++++++++--------------
 sync/src/api.rs                    |  3 +-
 util/network/src/lib.rs            |  2 +-
 4 files changed, 70 insertions(+), 50 deletions(-)

diff --git a/ethcore/light/src/net/context.rs b/ethcore/light/src/net/context.rs
index c05e69b0f3..af1f4c6775 100644
--- a/ethcore/light/src/net/context.rs
+++ b/ethcore/light/src/net/context.rs
@@ -16,13 +16,13 @@
 
 //! I/O and event context generalizations.
 
-use network::{NetworkContext, PeerId};
+use network::{NetworkContext, PeerId, NodeId};
 
 use super::{Announcement, LightProtocol, ReqId};
 use super::error::Error;
 use request::Request;
 
-/// An I/O context which allows sending and receiving packets as well as 
+/// An I/O context which allows sending and receiving packets as well as
 /// disconnecting peers. This is used as a generalization of the portions
 /// of a p2p network which the light protocol structure makes use of.
 pub trait IoContext {
@@ -41,6 +41,9 @@ pub trait IoContext {
 
     /// Get a peer's protocol version.
     fn protocol_version(&self, peer: PeerId) -> Option<u8>;
+
+	/// Persistent peer id
+	fn persistent_peer_id(&self, peer: PeerId) -> Option<NodeId>;
 }
 
 impl<'a> IoContext for NetworkContext<'a> {
@@ -67,6 +70,10 @@ impl<'a> IoContext for NetworkContext<'a> {
     fn protocol_version(&self, peer: PeerId) -> Option<u8> {
         self.protocol_version(self.subprotocol_name(), peer)
     }
+
+	fn persistent_peer_id(&self, peer: PeerId) -> Option<NodeId> {
+		self.session_info(peer).and_then(|info| info.id)
+	}
 }
 
 /// Context for a protocol event.
@@ -75,6 +82,9 @@ pub trait EventContext {
     /// disconnected/connected peer.
     fn peer(&self) -> PeerId;
 
+	/// Returns the relevant's peer persistent Id (aka NodeId).
+	fn persistent_peer_id(&self) -> Option<NodeId>;
+
     /// Make a request from a peer.
     fn request_from(&self, peer: PeerId, request: Request) -> Result<ReqId, Error>;
 
@@ -89,7 +99,7 @@ pub trait EventContext {
     fn disable_peer(&self, peer: PeerId);
 }
 
-/// Concrete implementation of `EventContext` over the light protocol struct and 
+/// Concrete implementation of `EventContext` over the light protocol struct and
 /// an io context.
 pub struct Ctx<'a> {
     /// Io context to enable immediate response to events.
@@ -97,11 +107,18 @@ pub struct Ctx<'a> {
     /// Protocol implementation.
     pub proto: &'a LightProtocol,
     /// Relevant peer for event.
-    pub peer: PeerId, 
+    pub peer: PeerId,
 }
 
 impl<'a> EventContext for Ctx<'a> {
-    fn peer(&self) -> PeerId { self.peer }
+
+    fn peer(&self) -> PeerId {
+		self.peer
+	}
+
+	fn persistent_peer_id(&self) -> Option<NodeId> {
+		self.io.persistent_peer_id(self.peer)
+	}
     fn request_from(&self, peer: PeerId, request: Request) -> Result<ReqId, Error> {
         self.proto.request_from(self.io, &peer, request)
     }
@@ -117,4 +134,4 @@ impl<'a> EventContext for Ctx<'a> {
     fn disable_peer(&self, peer: PeerId) {
         self.io.disable_peer(peer);
     }
-}
\ No newline at end of file
+}
diff --git a/ethcore/light/src/net/tests/mod.rs b/ethcore/light/src/net/tests/mod.rs
index 876432ce29..e2a17a41e7 100644
--- a/ethcore/light/src/net/tests/mod.rs
+++ b/ethcore/light/src/net/tests/mod.rs
@@ -15,13 +15,13 @@
 // along with Parity.  If not, see <http://www.gnu.org/licenses/>.
 
 //! Tests for the `LightProtocol` implementation.
-//! These don't test of the higher level logic on top of 
+//! These don't test of the higher level logic on top of
 
 use ethcore::blockchain_info::BlockChainInfo;
 use ethcore::client::{BlockChainClient, EachBlockWith, TestBlockChainClient};
 use ethcore::ids::BlockId;
 use ethcore::transaction::SignedTransaction;
-use network::PeerId;
+use network::{PeerId, NodeId};
 
 use net::buffer_flow::FlowParams;
 use net::context::IoContext;
@@ -68,6 +68,10 @@ impl IoContext for Expect {
 	fn protocol_version(&self, _peer: PeerId) -> Option<u8> {
 		Some(super::MAX_PROTOCOL_VERSION)
 	}
+
+	fn persistent_peer_id(&self, _peer: PeerId) -> Option<NodeId> {
+		None
+	}
 }
 
 // can't implement directly for Arc due to cross-crate orphan rules.
@@ -106,7 +110,7 @@ impl Provider for TestProvider {
 			.map(|x: u64| x.saturating_mul(req.skip + 1))
 			.take_while(|x| if req.reverse { x < &start_num } else { best_num - start_num >= *x })
 			.map(|x| if req.reverse { start_num - x } else { start_num + x })
-			.map(|x| self.0.client.block_header(BlockId::Number(x))) 
+			.map(|x| self.0.client.block_header(BlockId::Number(x)))
 			.take_while(|x| x.is_some())
 			.flat_map(|x| x)
 			.collect()
@@ -139,12 +143,12 @@ impl Provider for TestProvider {
 					}
 				}
 			})
-			.collect()		
+			.collect()
 	}
 
 	fn contract_code(&self, req: request::ContractCodes) -> Vec<Bytes> {
 		req.code_requests.into_iter()
-			.map(|req| { 
+			.map(|req| {
                 req.account_key.iter().chain(req.account_key.iter()).cloned().collect()
 			 })
 			.collect()
@@ -202,9 +206,9 @@ fn status(chain_info: BlockChainInfo) -> Status {
 #[test]
 fn handshake_expected() {
 	let flow_params = make_flow_params();
-	let capabilities = capabilities();	
+	let capabilities = capabilities();
 
-	let (provider, proto) = setup(flow_params.clone(), capabilities.clone());	
+	let (provider, proto) = setup(flow_params.clone(), capabilities.clone());
 
 	let status = status(provider.client.chain_info());
 
@@ -217,9 +221,9 @@ fn handshake_expected() {
 #[should_panic]
 fn genesis_mismatch() {
 	let flow_params = make_flow_params();
-	let capabilities = capabilities();	
+	let capabilities = capabilities();
 
-	let (provider, proto) = setup(flow_params.clone(), capabilities.clone());	
+	let (provider, proto) = setup(flow_params.clone(), capabilities.clone());
 
 	let mut status = status(provider.client.chain_info());
 	status.genesis_hash = H256::default();
@@ -232,15 +236,15 @@ fn genesis_mismatch() {
 #[test]
 fn buffer_overflow() {
 	let flow_params = make_flow_params();
-	let capabilities = capabilities();	
+	let capabilities = capabilities();
 
-	let (provider, proto) = setup(flow_params.clone(), capabilities.clone());	
+	let (provider, proto) = setup(flow_params.clone(), capabilities.clone());
 
 	let status = status(provider.client.chain_info());
 
 	{
-		let packet_body = write_handshake(&status, &capabilities, Some(&flow_params));	
-		proto.on_connect(&1, &Expect::Send(1, packet::STATUS, packet_body));	
+		let packet_body = write_handshake(&status, &capabilities, Some(&flow_params));
+		proto.on_connect(&1, &Expect::Send(1, packet::STATUS, packet_body));
 	}
 
 	{
@@ -266,9 +270,9 @@ fn buffer_overflow() {
 #[test]
 fn get_block_headers() {
 	let flow_params = FlowParams::new(5_000_000.into(), Default::default(), 0.into());
-	let capabilities = capabilities();	
+	let capabilities = capabilities();
 
-	let (provider, proto) = setup(flow_params.clone(), capabilities.clone());	
+	let (provider, proto) = setup(flow_params.clone(), capabilities.clone());
 
 	let cur_status = status(provider.client.chain_info());
 	let my_status = write_handshake(&cur_status, &capabilities, Some(&flow_params));
@@ -278,8 +282,8 @@ fn get_block_headers() {
 	let cur_status = status(provider.client.chain_info());
 
 	{
-		let packet_body = write_handshake(&cur_status, &capabilities, Some(&flow_params));	
-		proto.on_connect(&1, &Expect::Send(1, packet::STATUS, packet_body));	
+		let packet_body = write_handshake(&cur_status, &capabilities, Some(&flow_params));
+		proto.on_connect(&1, &Expect::Send(1, packet::STATUS, packet_body));
 		proto.handle_packet(&Expect::Nothing, &1, packet::STATUS, &my_status);
 	}
 
@@ -300,7 +304,7 @@ fn get_block_headers() {
 		let new_buf = *flow_params.limit() - flow_params.compute_cost(request::Kind::Headers, 10);
 
 		let mut response_stream = RlpStream::new_list(12);
-		
+
 		response_stream.append(&req_id).append(&new_buf);
 		for header in headers {
 			response_stream.append_raw(&header, 1);
@@ -316,9 +320,9 @@ fn get_block_headers() {
 #[test]
 fn get_block_bodies() {
 	let flow_params = FlowParams::new(5_000_000.into(), Default::default(), 0.into());
-	let capabilities = capabilities();	
+	let capabilities = capabilities();
 
-	let (provider, proto) = setup(flow_params.clone(), capabilities.clone());	
+	let (provider, proto) = setup(flow_params.clone(), capabilities.clone());
 
 	let cur_status = status(provider.client.chain_info());
 	let my_status = write_handshake(&cur_status, &capabilities, Some(&flow_params));
@@ -328,8 +332,8 @@ fn get_block_bodies() {
 	let cur_status = status(provider.client.chain_info());
 
 	{
-		let packet_body = write_handshake(&cur_status, &capabilities, Some(&flow_params));	
-		proto.on_connect(&1, &Expect::Send(1, packet::STATUS, packet_body));	
+		let packet_body = write_handshake(&cur_status, &capabilities, Some(&flow_params));
+		proto.on_connect(&1, &Expect::Send(1, packet::STATUS, packet_body));
 		proto.handle_packet(&Expect::Nothing, &1, packet::STATUS, &my_status);
 	}
 
@@ -347,7 +351,7 @@ fn get_block_bodies() {
 		let new_buf = *flow_params.limit() - flow_params.compute_cost(request::Kind::Bodies, 10);
 
 		let mut response_stream = RlpStream::new_list(12);
-		
+
 		response_stream.append(&req_id).append(&new_buf);
 		for body in bodies {
 			response_stream.append_raw(&body, 1);
@@ -363,9 +367,9 @@ fn get_block_bodies() {
 #[test]
 fn get_block_receipts() {
 	let flow_params = FlowParams::new(5_000_000.into(), Default::default(), 0.into());
-	let capabilities = capabilities();	
+	let capabilities = capabilities();
 
-	let (provider, proto) = setup(flow_params.clone(), capabilities.clone());	
+	let (provider, proto) = setup(flow_params.clone(), capabilities.clone());
 
 	let cur_status = status(provider.client.chain_info());
 	let my_status = write_handshake(&cur_status, &capabilities, Some(&flow_params));
@@ -375,8 +379,8 @@ fn get_block_receipts() {
 	let cur_status = status(provider.client.chain_info());
 
 	{
-		let packet_body = write_handshake(&cur_status, &capabilities, Some(&flow_params));	
-		proto.on_connect(&1, &Expect::Send(1, packet::STATUS, packet_body));	
+		let packet_body = write_handshake(&cur_status, &capabilities, Some(&flow_params));
+		proto.on_connect(&1, &Expect::Send(1, packet::STATUS, packet_body));
 		proto.handle_packet(&Expect::Nothing, &1, packet::STATUS, &my_status);
 	}
 
@@ -400,7 +404,7 @@ fn get_block_receipts() {
 		let new_buf = *flow_params.limit() - flow_params.compute_cost(request::Kind::Receipts, receipts.len());
 
 		let mut response_stream = RlpStream::new_list(2 + receipts.len());
-		
+
 		response_stream.append(&req_id).append(&new_buf);
 		for block_receipts in receipts {
 			response_stream.append_raw(&block_receipts, 1);
@@ -416,15 +420,15 @@ fn get_block_receipts() {
 #[test]
 fn get_state_proofs() {
 	let flow_params = FlowParams::new(5_000_000.into(), Default::default(), 0.into());
-	let capabilities = capabilities();	
+	let capabilities = capabilities();
 
-	let (provider, proto) = setup(flow_params.clone(), capabilities.clone());	
+	let (provider, proto) = setup(flow_params.clone(), capabilities.clone());
 
 	let cur_status = status(provider.client.chain_info());
 
 	{
-		let packet_body = write_handshake(&cur_status, &capabilities, Some(&flow_params));	
-		proto.on_connect(&1, &Expect::Send(1, packet::STATUS, packet_body.clone()));	
+		let packet_body = write_handshake(&cur_status, &capabilities, Some(&flow_params));
+		proto.on_connect(&1, &Expect::Send(1, packet::STATUS, packet_body.clone()));
 		proto.handle_packet(&Expect::Nothing, &1, packet::STATUS, &packet_body);
 	}
 
@@ -432,7 +436,7 @@ fn get_state_proofs() {
 	let key1 = U256::from(11223344).into();
 	let key2 = U256::from(99988887).into();
 
-	let request = Request::StateProofs (request::StateProofs { 
+	let request = Request::StateProofs (request::StateProofs {
 		requests: vec![
 			request::StateProof { block: H256::default(), key1: key1, key2: None, from_level: 0 },
 			request::StateProof { block: H256::default(), key1: key1, key2: Some(key2), from_level: 0},
@@ -449,7 +453,7 @@ fn get_state_proofs() {
 		let new_buf = *flow_params.limit() - flow_params.compute_cost(request::Kind::StateProofs, 2);
 
 		let mut response_stream = RlpStream::new_list(4);
-		
+
 		response_stream.append(&req_id).append(&new_buf);
 		for proof in proofs {
 			response_stream.append_raw(&proof, 1);
@@ -465,15 +469,15 @@ fn get_state_proofs() {
 #[test]
 fn get_contract_code() {
 	let flow_params = FlowParams::new(5_000_000.into(), Default::default(), 0.into());
-	let capabilities = capabilities();	
+	let capabilities = capabilities();
 
-	let (provider, proto) = setup(flow_params.clone(), capabilities.clone());	
+	let (provider, proto) = setup(flow_params.clone(), capabilities.clone());
 
 	let cur_status = status(provider.client.chain_info());
 
 	{
-		let packet_body = write_handshake(&cur_status, &capabilities, Some(&flow_params));	
-		proto.on_connect(&1, &Expect::Send(1, packet::STATUS, packet_body.clone()));	
+		let packet_body = write_handshake(&cur_status, &capabilities, Some(&flow_params));
+		proto.on_connect(&1, &Expect::Send(1, packet::STATUS, packet_body.clone()));
 		proto.handle_packet(&Expect::Nothing, &1, packet::STATUS, &packet_body);
 	}
 
@@ -481,7 +485,7 @@ fn get_contract_code() {
 	let key1 = U256::from(11223344).into();
 	let key2 = U256::from(99988887).into();
 
-	let request = Request::Codes (request::ContractCodes { 
+	let request = Request::Codes (request::ContractCodes {
 		code_requests: vec![
 			request::ContractCode { block_hash: H256::default(), account_key: key1 },
 			request::ContractCode { block_hash: H256::default(), account_key: key2 },
@@ -498,7 +502,7 @@ fn get_contract_code() {
 		let new_buf = *flow_params.limit() - flow_params.compute_cost(request::Kind::Codes, 2);
 
 		let mut response_stream = RlpStream::new_list(4);
-		
+
 		response_stream.append(&req_id).append(&new_buf);
 		for code in codes {
 			response_stream.append(&code);
@@ -509,4 +513,4 @@ fn get_contract_code() {
 
 	let expected = Expect::Respond(packet::CONTRACT_CODES, response);
 	proto.handle_packet(&expected, &1, packet::GET_CONTRACT_CODES, &request_body);
-}
\ No newline at end of file
+}
diff --git a/sync/src/api.rs b/sync/src/api.rs
index 10434ce26f..0f3695fe9c 100644
--- a/sync/src/api.rs
+++ b/sync/src/api.rs
@@ -351,8 +351,7 @@ struct TxRelay(Arc<BlockChainClient>);
 impl LightHandler for TxRelay {
 	fn on_transactions(&self, ctx: &EventContext, relay: &[::ethcore::transaction::SignedTransaction]) {
 		trace!(target: "les", "Relaying {} transactions from peer {}", relay.len(), ctx.peer());
-		// TODO [ToDr] Can we get a peer enode somehow?
-		self.0.queue_transactions(relay.iter().map(|tx| ::rlp::encode(tx).to_vec()).collect(), None)
+		self.0.queue_transactions(relay.iter().map(|tx| ::rlp::encode(tx).to_vec()).collect(), ctx.persistent_peer_id())
 	}
 }
 
diff --git a/util/network/src/lib.rs b/util/network/src/lib.rs
index f21cb498d9..a1eef68fa8 100644
--- a/util/network/src/lib.rs
+++ b/util/network/src/lib.rs
@@ -99,7 +99,7 @@ pub use stats::NetworkStats;
 pub use session::SessionInfo;
 
 use io::TimerToken;
-pub use node_table::is_valid_node_url;
+pub use node_table::{is_valid_node_url, NodeId};
 
 const PROTOCOL_VERSION: u32 = 4;
 
-- 
GitLab


From 76a93d4eff8a69d4774c5a576c4df588608919df Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tomasz=20Drwi=C4=99ga?= <tomasz@ethcore.io>
Date: Sat, 10 Dec 2016 20:01:04 +0100
Subject: [PATCH 17/64] eth_sign RPC now hashes given data

---
 rpc/src/v1/impls/signing.rs        | 5 +++--
 rpc/src/v1/impls/signing_unsafe.rs | 4 +++-
 rpc/src/v1/tests/mocked/eth.rs     | 8 ++++----
 rpc/src/v1/tests/mocked/signing.rs | 9 +++++----
 rpc/src/v1/traits/eth_signing.rs   | 6 +++---
 5 files changed, 18 insertions(+), 14 deletions(-)

diff --git a/rpc/src/v1/impls/signing.rs b/rpc/src/v1/impls/signing.rs
index 262e04dfb5..efb7ed7825 100644
--- a/rpc/src/v1/impls/signing.rs
+++ b/rpc/src/v1/impls/signing.rs
@@ -18,7 +18,7 @@
 
 use std::sync::{Arc, Weak};
 use transient_hashmap::TransientHashMap;
-use util::{U256, Mutex};
+use util::{U256, Mutex, Hashable};
 
 use ethcore::account_provider::AccountProvider;
 use ethcore::miner::MinerService;
@@ -180,7 +180,8 @@ impl<C: 'static, M: 'static> EthSigning for SigningQueueClient<C, M> where
 	C: MiningBlockChainClient,
 	M: MinerService,
 {
-	fn sign(&self, ready: Ready<RpcH520>, address: RpcH160, hash: RpcH256) {
+	fn sign(&self, ready: Ready<RpcH520>, address: RpcH160, data: RpcBytes) {
+		let hash = data.0.sha3().into();
 		let res = self.active().and_then(|_| self.dispatch(RpcConfirmationPayload::Signature((address, hash).into())));
 		self.handle_dispatch(res, |response| {
 			match response {
diff --git a/rpc/src/v1/impls/signing_unsafe.rs b/rpc/src/v1/impls/signing_unsafe.rs
index 46ffe6dedb..4796cc85d2 100644
--- a/rpc/src/v1/impls/signing_unsafe.rs
+++ b/rpc/src/v1/impls/signing_unsafe.rs
@@ -17,6 +17,7 @@
 //! Unsafe Signing RPC implementation.
 
 use std::sync::{Arc, Weak};
+use util::Hashable;
 
 use ethcore::account_provider::AccountProvider;
 use ethcore::miner::MinerService;
@@ -83,7 +84,8 @@ impl<C: 'static, M: 'static> EthSigning for SigningUnsafeClient<C, M> where
 	C: MiningBlockChainClient,
 	M: MinerService,
 {
-	fn sign(&self, ready: Ready<RpcH520>, address: RpcH160, hash: RpcH256) {
+	fn sign(&self, ready: Ready<RpcH520>, address: RpcH160, data: RpcBytes) {
+		let hash = data.0.sha3().into();
 		let result = match self.handle(RpcConfirmationPayload::Signature((address, hash).into())) {
 			Ok(RpcConfirmationResponse::Signature(signature)) => Ok(signature),
 			Err(e) => Err(e),
diff --git a/rpc/src/v1/tests/mocked/eth.rs b/rpc/src/v1/tests/mocked/eth.rs
index 7a7a1f682c..bc321be5c8 100644
--- a/rpc/src/v1/tests/mocked/eth.rs
+++ b/rpc/src/v1/tests/mocked/eth.rs
@@ -18,11 +18,11 @@ use std::str::FromStr;
 use std::collections::HashMap;
 use std::sync::Arc;
 use std::time::{Instant, Duration};
-use rustc_serialize::hex::ToHex;
+use rustc_serialize::hex::{FromHex, ToHex};
 use time::get_time;
 use rlp;
 
-use util::{Uint, U256, Address, H256, FixedHash, Mutex};
+use util::{Uint, U256, Address, H256, FixedHash, Mutex, Hashable};
 use ethcore::account_provider::AccountProvider;
 use ethcore::client::{TestBlockChainClient, EachBlockWith, Executed, TransactionId};
 use ethcore::log_entry::{LocalizedLogEntry, LogEntry};
@@ -294,8 +294,8 @@ fn rpc_eth_sign() {
 
 	let account = tester.accounts_provider.new_account("abcd").unwrap();
 	tester.accounts_provider.unlock_account_permanently(account, "abcd".into()).unwrap();
-	let message = H256::from("0x0cc175b9c0f1b6a831c399e26977266192eb5ffee6ae2fec3ad71c777531578f");
-	let signed = tester.accounts_provider.sign(account, None, message).unwrap();
+	let message = "0cc175b9c0f1b6a831c399e26977266192eb5ffee6ae2fec3ad71c777531578f".from_hex().unwrap();
+	let signed = tester.accounts_provider.sign(account, None, message.sha3()).unwrap();
 
 	let req = r#"{
 		"jsonrpc": "2.0",
diff --git a/rpc/src/v1/tests/mocked/signing.rs b/rpc/src/v1/tests/mocked/signing.rs
index 31a7004431..27a751701f 100644
--- a/rpc/src/v1/tests/mocked/signing.rs
+++ b/rpc/src/v1/tests/mocked/signing.rs
@@ -26,7 +26,7 @@ use v1::types::ConfirmationResponse;
 use v1::tests::helpers::TestMinerService;
 use v1::tests::mocked::parity;
 
-use util::{Address, FixedHash, Uint, U256, H256, ToPretty};
+use util::{Address, FixedHash, Uint, U256, ToPretty, Hashable};
 use ethcore::account_provider::AccountProvider;
 use ethcore::client::TestBlockChainClient;
 use ethcore::transaction::{Transaction, Action};
@@ -186,11 +186,11 @@ fn should_check_status_of_request_when_its_resolved() {
 fn should_sign_if_account_is_unlocked() {
 	// given
 	let tester = eth_signing();
-	let hash: H256 = 5.into();
+	let data = vec![5u8];
 	let acc = tester.accounts.new_account("test").unwrap();
 	tester.accounts.unlock_account_permanently(acc, "test".into()).unwrap();
 
-	let signature = tester.accounts.sign(acc, None, hash).unwrap();
+	let signature = tester.accounts.sign(acc, None, data.sha3()).unwrap();
 
 	// when
 	let request = r#"{
@@ -198,10 +198,11 @@ fn should_sign_if_account_is_unlocked() {
 		"method": "eth_sign",
 		"params": [
 			""#.to_owned() + format!("0x{:?}", acc).as_ref() + r#"",
-			""# + format!("0x{:?}", hash).as_ref() + r#""
+			""# + format!("0x{}", data.to_hex()).as_ref() + r#""
 		],
 		"id": 1
 	}"#;
+println!("{:?}", request);
 	let response = r#"{"jsonrpc":"2.0","result":""#.to_owned() + format!("0x{}", signature).as_ref() + r#"","id":1}"#;
 	assert_eq!(tester.io.handle_request_sync(&request), Some(response.to_owned()));
 	assert_eq!(tester.signer.requests().len(), 0);
diff --git a/rpc/src/v1/traits/eth_signing.rs b/rpc/src/v1/traits/eth_signing.rs
index 09f8c5e031..1248b47689 100644
--- a/rpc/src/v1/traits/eth_signing.rs
+++ b/rpc/src/v1/traits/eth_signing.rs
@@ -17,14 +17,14 @@
 //! Eth rpc interface.
 
 use v1::helpers::auto_args::{WrapAsync, Ready};
-use v1::types::{H160, H256, H520, TransactionRequest, RichRawTransaction};
+use v1::types::{Bytes, H160, H256, H520, TransactionRequest, RichRawTransaction};
 
 build_rpc_trait! {
 	/// Signing methods implementation relying on unlocked accounts.
 	pub trait EthSigning {
-		/// Signs the data with given address signature.
+		/// Signs the hash of data with given address signature.
 		#[rpc(async, name = "eth_sign")]
-		fn sign(&self, Ready<H520>, H160, H256);
+		fn sign(&self, Ready<H520>, H160, Bytes);
 
 		/// Sends transaction; will block waiting for signer to return the
 		/// transaction hash.
-- 
GitLab


From 9b5fd932905ce397de29a15ac788cd02ee7fc530 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tomasz=20Drwi=C4=99ga?= <tomasz@ethcore.io>
Date: Sat, 10 Dec 2016 20:07:12 +0100
Subject: [PATCH 18/64] removing println [ci:skip]

---
 rpc/src/v1/tests/mocked/signing.rs | 1 -
 1 file changed, 1 deletion(-)

diff --git a/rpc/src/v1/tests/mocked/signing.rs b/rpc/src/v1/tests/mocked/signing.rs
index 27a751701f..7d79ef59ff 100644
--- a/rpc/src/v1/tests/mocked/signing.rs
+++ b/rpc/src/v1/tests/mocked/signing.rs
@@ -202,7 +202,6 @@ fn should_sign_if_account_is_unlocked() {
 		],
 		"id": 1
 	}"#;
-println!("{:?}", request);
 	let response = r#"{"jsonrpc":"2.0","result":""#.to_owned() + format!("0x{}", signature).as_ref() + r#"","id":1}"#;
 	assert_eq!(tester.io.handle_request_sync(&request), Some(response.to_owned()));
 	assert_eq!(tester.signer.requests().len(), 0);
-- 
GitLab


From 19ca9ad460cbf1fa3fced7197420935473580b41 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tomasz=20Drwi=C4=99ga?= <tomasz@ethcore.io>
Date: Sat, 10 Dec 2016 21:22:19 +0100
Subject: [PATCH 19/64] Prevent broadcasting transactions to peer that send
 them.

---
 ethcore/src/client/chain_notify.rs            |  7 ++--
 ethcore/src/client/client.rs                  |  9 ++---
 ethcore/src/client/test_client.rs             |  2 +-
 ethcore/src/client/traits.rs                  |  4 +-
 ethcore/src/service.rs                        |  6 +--
 .../dapps/localtx/Transaction/transaction.js  | 25 +-----------
 rpc/src/v1/tests/helpers/sync_provider.rs     |  6 ---
 rpc/src/v1/tests/mocked/parity.rs             |  2 +-
 rpc/src/v1/types/sync.rs                      | 12 +-----
 sync/src/api.rs                               |  8 ++--
 sync/src/chain.rs                             | 11 +++--
 sync/src/transactions_stats.rs                | 40 -------------------
 12 files changed, 25 insertions(+), 107 deletions(-)

diff --git a/ethcore/src/client/chain_notify.rs b/ethcore/src/client/chain_notify.rs
index 50ff20e387..ddab542fb9 100644
--- a/ethcore/src/client/chain_notify.rs
+++ b/ethcore/src/client/chain_notify.rs
@@ -41,11 +41,10 @@ pub trait ChainNotify : Send + Sync {
 		// does nothing by default
 	}
 
-	/// fires when new transactions are imported
-	fn transactions_imported(&self,
+	/// fires when new transactions are received from a peer
+	fn transactions_received(&self,
 		_hashes: Vec<H256>,
-		_peer_id: Option<H512>,
-		_block_num: u64,
+		_peer_id: usize,
 	) {
 		// does nothing by default
 	}
diff --git a/ethcore/src/client/client.rs b/ethcore/src/client/client.rs
index 1387dad9a4..c258ed1ebd 100644
--- a/ethcore/src/client/client.rs
+++ b/ethcore/src/client/client.rs
@@ -559,15 +559,14 @@ impl Client {
 	}
 
 	/// Import transactions from the IO queue
-	pub fn import_queued_transactions(&self, transactions: &[Bytes], peer_id: Option<H512>) -> usize {
+	pub fn import_queued_transactions(&self, transactions: &[Bytes], peer_id: usize) -> usize {
 		trace!(target: "external_tx", "Importing queued");
 		let _timer = PerfTimer::new("import_queued_transactions");
 		self.queue_transactions.fetch_sub(transactions.len(), AtomicOrdering::SeqCst);
 		let txs: Vec<SignedTransaction> = transactions.iter().filter_map(|bytes| UntrustedRlp::new(bytes).as_val().ok()).collect();
 		let hashes: Vec<_> = txs.iter().map(|tx| tx.hash()).collect();
-		let block_number = self.chain_info().best_block_number;
 		self.notify(|notify| {
-			notify.transactions_imported(hashes.clone(), peer_id.clone(), block_number);
+			notify.transactions_received(hashes.clone(), peer_id);
 		});
 		let results = self.miner.import_external_transactions(self, txs);
 		results.len()
@@ -1269,14 +1268,14 @@ impl BlockChainClient for Client {
 		(*self.build_last_hashes(self.chain.read().best_block_hash())).clone()
 	}
 
-	fn queue_transactions(&self, transactions: Vec<Bytes>, node_id: Option<H512>) {
+	fn queue_transactions(&self, transactions: Vec<Bytes>, peer_id: usize) {
 		let queue_size = self.queue_transactions.load(AtomicOrdering::Relaxed);
 		trace!(target: "external_tx", "Queue size: {}", queue_size);
 		if queue_size > MAX_TX_QUEUE_SIZE {
 			debug!("Ignoring {} transactions: queue is full", transactions.len());
 		} else {
 			let len = transactions.len();
-			match self.io_channel.lock().send(ClientIoMessage::NewTransactions(transactions, node_id)) {
+			match self.io_channel.lock().send(ClientIoMessage::NewTransactions(transactions, peer_id)) {
 				Ok(_) => {
 					self.queue_transactions.fetch_add(len, AtomicOrdering::SeqCst);
 				}
diff --git a/ethcore/src/client/test_client.rs b/ethcore/src/client/test_client.rs
index a2af137948..7f27c9151f 100644
--- a/ethcore/src/client/test_client.rs
+++ b/ethcore/src/client/test_client.rs
@@ -657,7 +657,7 @@ impl BlockChainClient for TestBlockChainClient {
 		unimplemented!();
 	}
 
-	fn queue_transactions(&self, transactions: Vec<Bytes>, _peer_id: Option<H512>) {
+	fn queue_transactions(&self, transactions: Vec<Bytes>, _peer_id: usize) {
 		// import right here
 		let txs = transactions.into_iter().filter_map(|bytes| UntrustedRlp::new(&bytes).as_val().ok()).collect();
 		self.miner.import_external_transactions(self, txs);
diff --git a/ethcore/src/client/traits.rs b/ethcore/src/client/traits.rs
index ccf07ea3fa..fed8646072 100644
--- a/ethcore/src/client/traits.rs
+++ b/ethcore/src/client/traits.rs
@@ -15,7 +15,7 @@
 // along with Parity.  If not, see <http://www.gnu.org/licenses/>.
 
 use std::collections::BTreeMap;
-use util::{U256, Address, H256, H512, H2048, Bytes, Itertools};
+use util::{U256, Address, H256, H2048, Bytes, Itertools};
 use util::stats::Histogram;
 use blockchain::TreeRoute;
 use verification::queue::QueueInfo as BlockQueueInfo;
@@ -200,7 +200,7 @@ pub trait BlockChainClient : Sync + Send {
 	fn last_hashes(&self) -> LastHashes;
 
 	/// Queue transactions for importing.
-	fn queue_transactions(&self, transactions: Vec<Bytes>, peer_id: Option<H512>);
+	fn queue_transactions(&self, transactions: Vec<Bytes>, peer_id: usize);
 
 	/// list all transactions
 	fn pending_transactions(&self) -> Vec<SignedTransaction>;
diff --git a/ethcore/src/service.rs b/ethcore/src/service.rs
index b595843a89..9b96911e47 100644
--- a/ethcore/src/service.rs
+++ b/ethcore/src/service.rs
@@ -39,7 +39,7 @@ pub enum ClientIoMessage {
 	/// A block is ready
 	BlockVerified,
 	/// New transaction RLPs are ready to be imported
-	NewTransactions(Vec<Bytes>, Option<H512>),
+	NewTransactions(Vec<Bytes>, usize),
 	/// Begin snapshot restoration
 	BeginRestoration(ManifestData),
 	/// Feed a state chunk to the snapshot service
@@ -196,8 +196,8 @@ impl IoHandler<ClientIoMessage> for ClientIoHandler {
 
 		match *net_message {
 			ClientIoMessage::BlockVerified => { self.client.import_verified_blocks(); }
-			ClientIoMessage::NewTransactions(ref transactions, ref peer_id) => {
-				self.client.import_queued_transactions(transactions, peer_id.clone());
+			ClientIoMessage::NewTransactions(ref transactions, peer_id) => {
+				self.client.import_queued_transactions(transactions, peer_id);
 			}
 			ClientIoMessage::BeginRestoration(ref manifest) => {
 				if let Err(e) = self.snapshot.init_restore(manifest.clone(), true) {
diff --git a/js/src/dapps/localtx/Transaction/transaction.js b/js/src/dapps/localtx/Transaction/transaction.js
index c9ca10ba5f..d1c98f360d 100644
--- a/js/src/dapps/localtx/Transaction/transaction.js
+++ b/js/src/dapps/localtx/Transaction/transaction.js
@@ -86,17 +86,6 @@ class BaseTransaction extends Component {
       </span>
     );
   }
-
-  renderReceived (stats) {
-    const noOfPeers = Object.keys(stats.receivedFrom).length;
-    const noOfPropagations = Object.values(stats.receivedFrom).reduce((sum, val) => sum + val, 0);
-
-    return (
-      <span className={ styles.nowrap }>
-        { noOfPropagations } ({ noOfPeers } peers)
-      </span>
-    );
-  }
 }
 
 export class Transaction extends BaseTransaction {
@@ -113,8 +102,7 @@ export class Transaction extends BaseTransaction {
     isLocal: false,
     stats: {
       firstSeen: 0,
-      propagatedTo: {},
-      receivedFrom: {}
+      propagatedTo: {}
     }
   };
 
@@ -140,9 +128,6 @@ export class Transaction extends BaseTransaction {
         <th>
           # Propagated
         </th>
-        <th>
-          # Received
-        </th>
         <th />
       </tr>
     );
@@ -179,9 +164,6 @@ export class Transaction extends BaseTransaction {
         <td>
           { this.renderPropagation(stats) }
         </td>
-        <td>
-          { this.renderReceived(stats) }
-        </td>
       </tr>
     );
   }
@@ -210,8 +192,7 @@ export class LocalTransaction extends BaseTransaction {
 
   static defaultProps = {
     stats: {
-      propagatedTo: {},
-      receivedFrom: {}
+      propagatedTo: {}
     }
   };
 
@@ -335,8 +316,6 @@ export class LocalTransaction extends BaseTransaction {
           { this.renderStatus() }
           <br />
           { status === 'pending' ? this.renderPropagation(stats) : null }
-          <br />
-          { status === 'pending' ? this.renderReceived(stats) : null }
         </td>
       </tr>
     );
diff --git a/rpc/src/v1/tests/helpers/sync_provider.rs b/rpc/src/v1/tests/helpers/sync_provider.rs
index aa7e8d8497..2517abd467 100644
--- a/rpc/src/v1/tests/helpers/sync_provider.rs
+++ b/rpc/src/v1/tests/helpers/sync_provider.rs
@@ -106,18 +106,12 @@ impl SyncProvider for TestSyncProvider {
 				propagated_to: map![
 					128.into() => 16
 				],
-				received_from: map![
-					1.into() => 10
-				],
 			},
 			5.into() => TransactionStats {
 				first_seen: 16,
 				propagated_to: map![
 					16.into() => 1
 				],
-				received_from: map![
-					256.into() => 2
-				],
 			}
 		]
 	}
diff --git a/rpc/src/v1/tests/mocked/parity.rs b/rpc/src/v1/tests/mocked/parity.rs
index 45ee4aa754..9b4daaccd7 100644
--- a/rpc/src/v1/tests/mocked/parity.rs
+++ b/rpc/src/v1/tests/mocked/parity.rs
@@ -363,7 +363,7 @@ fn rpc_parity_transactions_stats() {
 	let io = deps.default_client();
 
 	let request = r#"{"jsonrpc": "2.0", "method": "parity_pendingTransactionsStats", "params":[], "id": 1}"#;
-	let response = r#"{"jsonrpc":"2.0","result":{"0x0000000000000000000000000000000000000000000000000000000000000001":{"firstSeen":10,"propagatedTo":{"0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000080":16},"receivedFrom":{"0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001":10}},"0x0000000000000000000000000000000000000000000000000000000000000005":{"firstSeen":16,"propagatedTo":{"0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000010":1},"receivedFrom":{"0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000100":2}}},"id":1}"#;
+	let response = r#"{"jsonrpc":"2.0","result":{"0x0000000000000000000000000000000000000000000000000000000000000001":{"firstSeen":10,"propagatedTo":{"0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000080":16}},"0x0000000000000000000000000000000000000000000000000000000000000005":{"firstSeen":16,"propagatedTo":{"0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000010":1}}},"id":1}"#;
 
 	assert_eq!(io.handle_request_sync(request), Some(response.to_owned()));
 }
diff --git a/rpc/src/v1/types/sync.rs b/rpc/src/v1/types/sync.rs
index 65d9891566..8d3726e7a7 100644
--- a/rpc/src/v1/types/sync.rs
+++ b/rpc/src/v1/types/sync.rs
@@ -127,9 +127,6 @@ pub struct TransactionStats {
 	/// Peers this transaction was propagated to with count.
 	#[serde(rename="propagatedTo")]
 	pub propagated_to: BTreeMap<H512, usize>,
-	/// Peers that propagated this transaction back.
-	#[serde(rename="receivedFrom")]
-	pub received_from: BTreeMap<H512, usize>,
 }
 
 impl From<SyncPeerInfo> for PeerInfo {
@@ -161,10 +158,6 @@ impl From<SyncTransactionStats> for TransactionStats {
 				.into_iter()
 				.map(|(id, count)| (id.into(), count))
 				.collect(),
-			received_from: s.received_from
-				.into_iter()
-				.map(|(id, count)| (id.into(), count))
-				.collect(),
 		}
 	}
 }
@@ -216,12 +209,9 @@ mod tests {
 			propagated_to: map![
 				10.into() => 50
 			],
-			received_from: map![
-				1.into() => 1000
-			],
 		};
 
 		let serialized = serde_json::to_string(&stats).unwrap();
-		assert_eq!(serialized, r#"{"firstSeen":100,"propagatedTo":{"0x0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a":50},"receivedFrom":{"0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001":1000}}"#)
+		assert_eq!(serialized, r#"{"firstSeen":100,"propagatedTo":{"0x0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a":50}}"#)
 	}
 }
diff --git a/sync/src/api.rs b/sync/src/api.rs
index 0f3695fe9c..c675ee6d3a 100644
--- a/sync/src/api.rs
+++ b/sync/src/api.rs
@@ -99,8 +99,6 @@ pub struct TransactionStats {
 	pub first_seen: u64,
 	/// Peers it was propagated to.
 	pub propagated_to: BTreeMap<H512, usize>,
-	/// Peers that propagated the transaction back.
-	pub received_from: BTreeMap<H512, usize>,
 }
 
 /// Peer connection information
@@ -338,9 +336,9 @@ impl ChainNotify for EthSync {
 		self.network.stop().unwrap_or_else(|e| warn!("Error stopping network: {:?}", e));
 	}
 
-	fn transactions_imported(&self, hashes: Vec<H256>, peer_id: Option<H512>, block_number: u64) {
+	fn transactions_received(&self, hashes: Vec<H256>, peer_id: PeerId) {
 		let mut sync = self.sync_handler.sync.write();
-		sync.transactions_imported(hashes, peer_id, block_number);
+		sync.transactions_received(hashes, peer_id);
 	}
 }
 
@@ -351,7 +349,7 @@ struct TxRelay(Arc<BlockChainClient>);
 impl LightHandler for TxRelay {
 	fn on_transactions(&self, ctx: &EventContext, relay: &[::ethcore::transaction::SignedTransaction]) {
 		trace!(target: "les", "Relaying {} transactions from peer {}", relay.len(), ctx.peer());
-		self.0.queue_transactions(relay.iter().map(|tx| ::rlp::encode(tx).to_vec()).collect(), ctx.persistent_peer_id())
+		self.0.queue_transactions(relay.iter().map(|tx| ::rlp::encode(tx).to_vec()).collect(), ctx.peer())
 	}
 }
 
diff --git a/sync/src/chain.rs b/sync/src/chain.rs
index 243c6b4313..ecd95c68ab 100644
--- a/sync/src/chain.rs
+++ b/sync/src/chain.rs
@@ -432,10 +432,10 @@ impl ChainSync {
 		self.transactions_stats.stats()
 	}
 
-	/// Updates statistics for imported transactions.
-	pub fn transactions_imported(&mut self, hashes: Vec<H256>, peer_id: Option<H512>, block_number: u64) {
-		for hash in hashes {
-			self.transactions_stats.received(hash, peer_id, block_number);
+	/// Updates transactions were received by a peer
+	pub fn transactions_received(&mut self, hashes: Vec<H256>, peer_id: PeerId) {
+		if let Some(mut peer_info) = self.peers.get_mut(&peer_id) {
+			peer_info.last_sent_transactions.extend(&hashes);
 		}
 	}
 
@@ -1416,8 +1416,7 @@ impl ChainSync {
 			let tx = rlp.as_raw().to_vec();
 			transactions.push(tx);
 		}
-		let id = io.peer_session_info(peer_id).and_then(|info| info.id);
-		io.chain().queue_transactions(transactions, id);
+		io.chain().queue_transactions(transactions, peer_id);
 		Ok(())
 	}
 
diff --git a/sync/src/transactions_stats.rs b/sync/src/transactions_stats.rs
index a91a860e54..fa8eb6e82d 100644
--- a/sync/src/transactions_stats.rs
+++ b/sync/src/transactions_stats.rs
@@ -26,7 +26,6 @@ type BlockNumber = u64;
 pub struct Stats {
 	first_seen: BlockNumber,
 	propagated_to: HashMap<NodeId, usize>,
-	received_from: HashMap<NodeId, usize>,
 }
 
 impl Stats {
@@ -34,7 +33,6 @@ impl Stats {
 		Stats {
 			first_seen: number,
 			propagated_to: Default::default(),
-			received_from: Default::default(),
 		}
 	}
 }
@@ -47,10 +45,6 @@ impl<'a> From<&'a Stats> for TransactionStats {
 				.iter()
 				.map(|(hash, size)| (*hash, *size))
 				.collect(),
-			received_from: other.received_from
-				.iter()
-				.map(|(hash, size)| (*hash, *size))
-				.collect(),
 		}
 	}
 }
@@ -69,14 +63,6 @@ impl TransactionsStats {
 		*count = count.saturating_add(1);
 	}
 
-	/// Increase number of back-propagations from given `enodeid`.
-	pub fn received(&mut self, hash: H256, enode_id: Option<NodeId>, current_block_num: BlockNumber) {
-		let enode_id = enode_id.unwrap_or_default();
-		let mut stats = self.pending_transactions.entry(hash).or_insert_with(|| Stats::new(current_block_num));
-		let mut count = stats.received_from.entry(enode_id).or_insert(0);
-		*count = count.saturating_add(1);
-	}
-
 	/// Returns propagation stats for given hash or `None` if hash is not known.
 	#[cfg(test)]
 	pub fn get(&self, hash: &H256) -> Option<&Stats> {
@@ -127,32 +113,6 @@ mod tests {
 				enodeid1 => 2,
 				enodeid2 => 1
 			],
-			received_from: Default::default(),
-		}));
-	}
-
-	#[test]
-	fn should_keep_track_of_back_propagations() {
-		// given
-		let mut stats = TransactionsStats::default();
-		let hash = 5.into();
-		let enodeid1 = 2.into();
-		let enodeid2 = 5.into();
-
-		// when
-		stats.received(hash, Some(enodeid1), 5);
-		stats.received(hash, Some(enodeid1), 10);
-		stats.received(hash, Some(enodeid2), 15);
-
-		// then
-		let stats = stats.get(&hash);
-		assert_eq!(stats, Some(&Stats {
-			first_seen: 5,
-			propagated_to: Default::default(),
-			received_from: hash_map![
-				enodeid1 => 2,
-				enodeid2 => 1
-			]
 		}));
 	}
 
-- 
GitLab


From b5020d3c8d387ed3a51a1779688eb904e1b165d2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tomasz=20Drwi=C4=99ga?= <tomasz@ethcore.io>
Date: Sat, 10 Dec 2016 21:25:08 +0100
Subject: [PATCH 20/64] Fixing Light context API

---
 ethcore/light/src/net/context.rs | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/ethcore/light/src/net/context.rs b/ethcore/light/src/net/context.rs
index af1f4c6775..522722bcdb 100644
--- a/ethcore/light/src/net/context.rs
+++ b/ethcore/light/src/net/context.rs
@@ -43,7 +43,7 @@ pub trait IoContext {
     fn protocol_version(&self, peer: PeerId) -> Option<u8>;
 
 	/// Persistent peer id
-	fn persistent_peer_id(&self, peer: PeerId) -> Option<NodeId>;
+	fn persistent_peer_id(&self, peer: &PeerId) -> Option<NodeId>;
 }
 
 impl<'a> IoContext for NetworkContext<'a> {
@@ -71,8 +71,8 @@ impl<'a> IoContext for NetworkContext<'a> {
         self.protocol_version(self.subprotocol_name(), peer)
     }
 
-	fn persistent_peer_id(&self, peer: PeerId) -> Option<NodeId> {
-		self.session_info(peer).and_then(|info| info.id)
+	fn persistent_peer_id(&self, peer: &PeerId) -> Option<NodeId> {
+		self.session_info(*peer).and_then(|info| info.id)
 	}
 }
 
@@ -83,7 +83,7 @@ pub trait EventContext {
     fn peer(&self) -> PeerId;
 
 	/// Returns the relevant's peer persistent Id (aka NodeId).
-	fn persistent_peer_id(&self) -> Option<NodeId>;
+	fn persistent_peer_id(&self, id: &PeerId) -> Option<NodeId>;
 
     /// Make a request from a peer.
     fn request_from(&self, peer: PeerId, request: Request) -> Result<ReqId, Error>;
@@ -116,8 +116,8 @@ impl<'a> EventContext for Ctx<'a> {
 		self.peer
 	}
 
-	fn persistent_peer_id(&self) -> Option<NodeId> {
-		self.io.persistent_peer_id(self.peer)
+	fn persistent_peer_id(&self, id: &PeerId) -> Option<NodeId> {
+		self.io.persistent_peer_id(id)
 	}
     fn request_from(&self, peer: PeerId, request: Request) -> Result<ReqId, Error> {
         self.proto.request_from(self.io, &peer, request)
-- 
GitLab


From 1e8638608c3ccc5db718bf3f6d2e77918e585abe Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tomasz=20Drwi=C4=99ga?= <tomasz@ethcore.io>
Date: Sat, 10 Dec 2016 22:59:35 +0100
Subject: [PATCH 21/64] fixing tests

---
 ethcore/light/src/net/tests/mod.rs | 2 +-
 ethcore/src/client/chain_notify.rs | 2 +-
 ethcore/src/client/client.rs       | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/ethcore/light/src/net/tests/mod.rs b/ethcore/light/src/net/tests/mod.rs
index e2a17a41e7..227eb9b7c4 100644
--- a/ethcore/light/src/net/tests/mod.rs
+++ b/ethcore/light/src/net/tests/mod.rs
@@ -69,7 +69,7 @@ impl IoContext for Expect {
 		Some(super::MAX_PROTOCOL_VERSION)
 	}
 
-	fn persistent_peer_id(&self, _peer: PeerId) -> Option<NodeId> {
+	fn persistent_peer_id(&self, _peer: &PeerId) -> Option<NodeId> {
 		None
 	}
 }
diff --git a/ethcore/src/client/chain_notify.rs b/ethcore/src/client/chain_notify.rs
index ddab542fb9..eb695e0637 100644
--- a/ethcore/src/client/chain_notify.rs
+++ b/ethcore/src/client/chain_notify.rs
@@ -15,7 +15,7 @@
 // along with Parity.  If not, see <http://www.gnu.org/licenses/>.
 
 use ipc::IpcConfig;
-use util::{H256, H512};
+use util::H256;
 
 /// Represents what has to be handled by actor listening to chain events
 #[ipc]
diff --git a/ethcore/src/client/client.rs b/ethcore/src/client/client.rs
index c258ed1ebd..70f1989878 100644
--- a/ethcore/src/client/client.rs
+++ b/ethcore/src/client/client.rs
@@ -25,7 +25,7 @@ use time::precise_time_ns;
 use util::{Bytes, PerfTimer, Itertools, Mutex, RwLock, Hashable};
 use util::{journaldb, TrieFactory, Trie};
 use util::trie::TrieSpec;
-use util::{U256, H256, H512, Address, H2048, Uint, FixedHash};
+use util::{U256, H256, Address, H2048, Uint, FixedHash};
 use util::kvdb::*;
 
 // other
-- 
GitLab


From 9252ebf93d0a62d6306f3306ccc08fef28a57807 Mon Sep 17 00:00:00 2001
From: Robert Habermeier <rphmeier@gmail.com>
Date: Sun, 11 Dec 2016 12:50:48 +0100
Subject: [PATCH 22/64] block: enforce gas limit falls within engine bounds

---
 ethcore/src/block.rs       | 3 ++-
 ethcore/src/engines/mod.rs | 5 +++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/ethcore/src/block.rs b/ethcore/src/block.rs
index bcbceb9aa2..d37920c3ed 100644
--- a/ethcore/src/block.rs
+++ b/ethcore/src/block.rs
@@ -266,7 +266,8 @@ impl<'x> OpenBlock<'x> {
 		r.block.base.header.set_extra_data(extra_data);
 		r.block.base.header.note_dirty();
 
-		engine.populate_from_parent(&mut r.block.base.header, parent, gas_range_target.0, gas_range_target.1);
+		let gas_floor_target = ::std::cmp::max(gas_range_target.0, engine.params().min_gas_limit);
+		engine.populate_from_parent(&mut r.block.base.header, parent, gas_floor_target, gas_range_target.1);
 		engine.on_new_block(&mut r.block);
 		Ok(r)
 	}
diff --git a/ethcore/src/engines/mod.rs b/ethcore/src/engines/mod.rs
index 8e407f0b71..1aab5f8f4a 100644
--- a/ethcore/src/engines/mod.rs
+++ b/ethcore/src/engines/mod.rs
@@ -125,8 +125,9 @@ pub trait Engine : Sync + Send {
 		self.verify_block_basic(header, None).and_then(|_| self.verify_block_unordered(header, None))
 	}
 
-	/// Don't forget to call Super::populate_from_parent when subclassing & overriding.
-	// TODO: consider including State in the params.
+	/// Populate a header's fields based on its parent's header.
+	/// Takes gas floor and ceiling targets.
+	/// The gas floor target must not be lower than the engine's minimum gas limit.
 	fn populate_from_parent(&self, header: &mut Header, parent: &Header, _gas_floor_target: U256, _gas_ceil_target: U256) {
 		header.set_difficulty(parent.difficulty().clone());
 		header.set_gas_limit(parent.gas_limit().clone());
-- 
GitLab


From a56443aa6c208cca1450d4af7564e7557980d71d Mon Sep 17 00:00:00 2001
From: arkpar <arkady.paronyan@gmail.com>
Date: Sun, 11 Dec 2016 13:00:49 +0100
Subject: [PATCH 23/64] Tolerate error is user_defaults

---
 parity/user_defaults.rs | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/parity/user_defaults.rs b/parity/user_defaults.rs
index a1078b634e..652abfea10 100644
--- a/parity/user_defaults.rs
+++ b/parity/user_defaults.rs
@@ -128,7 +128,13 @@ impl Default for UserDefaults {
 impl UserDefaults {
 	pub fn load<P>(path: P) -> Result<Self, String> where P: AsRef<Path> {
 		match File::open(path) {
-			Ok(file) => from_reader(file).map_err(|e| e.to_string()),
+			Ok(file) => match from_reader(file) {
+				Ok(defaults) => Ok(defaults),
+				Err(e) => {
+					warn!("Error loading user defaults file: {:?}", e);
+					Ok(UserDefaults::default())
+				},
+			},
 			_ => Ok(UserDefaults::default()),
 		}
 	}
-- 
GitLab


From 592ff53bab593fe5fb0ae3dfc0f2e9cb714fdcaf Mon Sep 17 00:00:00 2001
From: Igor Artamonov <igor@artamonov.ru>
Date: Sun, 11 Dec 2016 18:28:37 +0600
Subject: [PATCH 24/64] EIP-155 configuration for Ethereum Classic

---
 ethcore/res/ethereum/classic.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/ethcore/res/ethereum/classic.json b/ethcore/res/ethereum/classic.json
index 7c1e9454e5..ca4e0ea995 100644
--- a/ethcore/res/ethereum/classic.json
+++ b/ethcore/res/ethereum/classic.json
@@ -12,7 +12,7 @@
 				"registrar" : "0xc6d9d2cd449a754c494264e1809c50e34d64562b",
 				"homesteadTransition": "0x118c30",
 				"eip150Transition": "0x2625a0",
-				"eip155Transition": "0x7fffffffffffffff",
+				"eip155Transition": 3000000,
 				"eip160Transition": "0x7fffffffffffffff",
 				"eip161abcTransition": "0x7fffffffffffffff",
 				"eip161dTransition": "0x7fffffffffffffff",
@@ -25,7 +25,7 @@
 		"accountStartNonce": "0x00",
 		"maximumExtraDataSize": "0x20",
 		"minGasLimit": "0x1388",
-		"networkID" : "0x1",
+		"networkID" : "0x3d",
 		"forkBlock": "0x1d4c00",
 		"forkCanonHash": "0x94365e3a8c0b35089c1d1195081fe7489b528a84b22199c916180db8b28ade7f"
 	},
-- 
GitLab


From 7b5bc115e9b2c5f163760733cf5d426b3cfa08b6 Mon Sep 17 00:00:00 2001
From: Igor Artamonov <igor@artamonov.ru>
Date: Sun, 11 Dec 2016 18:29:40 +0600
Subject: [PATCH 25/64] EIP-160 configuration for Ethereum Classic

---
 ethcore/res/ethereum/classic.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ethcore/res/ethereum/classic.json b/ethcore/res/ethereum/classic.json
index ca4e0ea995..9373a20410 100644
--- a/ethcore/res/ethereum/classic.json
+++ b/ethcore/res/ethereum/classic.json
@@ -13,7 +13,7 @@
 				"homesteadTransition": "0x118c30",
 				"eip150Transition": "0x2625a0",
 				"eip155Transition": 3000000,
-				"eip160Transition": "0x7fffffffffffffff",
+				"eip160Transition": 3000000,
 				"eip161abcTransition": "0x7fffffffffffffff",
 				"eip161dTransition": "0x7fffffffffffffff",
 				"ecip1010PauseTransition": "0x2dc6c0",
-- 
GitLab


From aed633d7dfe8b3350627aa140b9891306e86ba8d Mon Sep 17 00:00:00 2001
From: Igor Artamonov <igor@artamonov.ru>
Date: Sun, 11 Dec 2016 19:25:02 +0600
Subject: [PATCH 26/64] Testnet for Ethereum Classic

---
 ethcore/res/ethereum/classic-morden.json | 58 ++++++++++++++++++++++++
 ethcore/src/ethereum/mod.rs              |  3 ++
 parity/cli/usage.txt                     |  4 +-
 parity/params.rs                         |  6 +++
 4 files changed, 69 insertions(+), 2 deletions(-)
 create mode 100644 ethcore/res/ethereum/classic-morden.json

diff --git a/ethcore/res/ethereum/classic-morden.json b/ethcore/res/ethereum/classic-morden.json
new file mode 100644
index 0000000000..40c1d4dcf2
--- /dev/null
+++ b/ethcore/res/ethereum/classic-morden.json
@@ -0,0 +1,58 @@
+{
+	"name": "Ethereum Classic Morden Testnet",
+	"forkName": "classic",
+	"engine": {
+		"Ethash": {
+			"params": {
+				"gasLimitBoundDivisor": "0x0400",
+				"minimumDifficulty": "0x020000",
+				"difficultyBoundDivisor": "0x0800",
+				"durationLimit": "0x0d",
+				"blockReward": "0x4563918244F40000",
+				"registrar": "0x52dff57a8a1532e6afb3dc07e2af58bb9eb05b3d",
+				"homesteadTransition": 494000,
+				"eip150Transition": 1783000,
+				"eip155Transition": 1915000,
+				"eip160Transition": 1915000,
+				"ecip1010PauseTransition": 1915000,
+				"ecip1010ContinueTransition": 3415000,
+
+				"eip161abcTransition": "0x7fffffffffffffff",
+				"eip161dTransition": "0x7fffffffffffffff"
+			}
+		}
+	},
+	"params": {
+		"accountStartNonce": "0x0100000",
+		"maximumExtraDataSize": "0x20",
+		"minGasLimit": "0x1388",
+		"networkID" : "0x3e",
+		"forkBlock": "0x1b34d8",
+		"forkCanonHash": "0xf376243aeff1f256d970714c3de9fd78fa4e63cf63e32a51fe1169e375d98145"
+	},
+	"genesis": {
+		"seal": {
+			"ethereum": {
+				"nonce": "0x00006d6f7264656e",
+				"mixHash": "0x00000000000000000000000000000000000000647572616c65787365646c6578"
+			}
+		},
+		"difficulty": "0x20000",
+		"author": "0x0000000000000000000000000000000000000000",
+		"timestamp": "0x00",
+		"parentHash": "0x0000000000000000000000000000000000000000000000000000000000000000",
+		"extraData": "0x",
+		"gasLimit": "0x2fefd8"
+	},
+	"nodes": [
+		"enode://e731347db0521f3476e6bbbb83375dcd7133a1601425ebd15fd10f3835fd4c304fba6282087ca5a0deeafadf0aa0d4fd56c3323331901c1f38bd181c283e3e35@128.199.55.137:30303",
+		"enode://ceb5c0f85eb994dbe9693bf46d99b03f6b838d17cc74e68d5eb003171ff39e5f120b17f965b267c319303f94d80b9d994b77062fb1486d76ce95d9f3d8fe1cb4@46.101.122.141:30303"
+	],
+	"accounts": {
+		"0000000000000000000000000000000000000001": { "balance": "1", "nonce": "1048576", "builtin": { "name": "ecrecover", "pricing": { "linear": { "base": 3000, "word": 0 } } } },
+		"0000000000000000000000000000000000000002": { "balance": "1", "nonce": "1048576", "builtin": { "name": "sha256", "pricing": { "linear": { "base": 60, "word": 12 } } } },
+		"0000000000000000000000000000000000000003": { "balance": "1", "nonce": "1048576", "builtin": { "name": "ripemd160", "pricing": { "linear": { "base": 600, "word": 120 } } } },
+		"0000000000000000000000000000000000000004": { "balance": "1", "nonce": "1048576", "builtin": { "name": "identity", "pricing": { "linear": { "base": 15, "word": 3 } } } },
+		"102e61f5d8f9bc71d0ad4a084df4e65e05ce0e1c": { "balance": "1606938044258990275541962092341162602522202993782792835301376", "nonce": "1048576" }
+	}
+}
diff --git a/ethcore/src/ethereum/mod.rs b/ethcore/src/ethereum/mod.rs
index 3916e5ccc7..4dd0d2b73c 100644
--- a/ethcore/src/ethereum/mod.rs
+++ b/ethcore/src/ethereum/mod.rs
@@ -42,6 +42,9 @@ pub fn new_frontier() -> Spec { load(include_bytes!("../../res/ethereum/frontier
 /// Create a new Frontier mainnet chain spec without the DAO hardfork.
 pub fn new_classic() -> Spec { load(include_bytes!("../../res/ethereum/classic.json")) }
 
+/// Create a new Morden chain spec configured for Thereum Classic
+pub fn new_classic_morden() -> Spec { load(include_bytes!("../../res/ethereum/classic-morden.json")) }
+
 /// Create a new Frontier mainnet chain spec without the DAO hardfork.
 pub fn new_expanse() -> Spec { load(include_bytes!("../../res/ethereum/expanse.json")) }
 
diff --git a/parity/cli/usage.txt b/parity/cli/usage.txt
index c586725426..0a5b854dca 100644
--- a/parity/cli/usage.txt
+++ b/parity/cli/usage.txt
@@ -33,7 +33,7 @@ Operating Options:
   --chain CHAIN            Specify the blockchain type. CHAIN may be either a
                            JSON chain specification file or olympic, frontier,
                            homestead, mainnet, morden, ropsten, classic, expanse,
-                           testnet or dev (default: {flag_chain}).
+                           testnet, classic-morden or dev (default: {flag_chain}).
   -d --db-path PATH        Specify the database & configuration directory path
                            (default: {flag_db_path}).
   --keys-path PATH         Specify the path for JSON key files to be found
@@ -266,7 +266,7 @@ Footprint Options:
                            of all accounts and storage keys. Doubles the size
                            of the state database. BOOL may be one of on, off
                            or auto. (default: {flag_fat_db})
-  --scale-verifiers        Automatically scale amount of verifier threads based on 
+  --scale-verifiers        Automatically scale amount of verifier threads based on
                            workload. Not guaranteed to be faster.
                            (default: {flag_scale_verifiers})
   --num-verifiers INT      Amount of verifier threads to use or to begin with, if verifier
diff --git a/parity/params.rs b/parity/params.rs
index 25ddc8814a..d8c3db2bc0 100644
--- a/parity/params.rs
+++ b/parity/params.rs
@@ -31,6 +31,7 @@ pub enum SpecType {
 	Ropsten,
 	Olympic,
 	Classic,
+	ClassicTestnet,
 	Expanse,
 	Dev,
 	Custom(String),
@@ -49,6 +50,7 @@ impl str::FromStr for SpecType {
 		let spec = match s {
 			"frontier" | "homestead" | "mainnet" => SpecType::Mainnet,
 			"frontier-dogmatic" | "homestead-dogmatic" | "classic" => SpecType::Classic,
+			"classic-testnet" | "classic-morden" => SpecType::ClassicTestnet,
 			"morden" | "testnet" => SpecType::Testnet,
 			"ropsten" => SpecType::Ropsten,
 			"olympic" => SpecType::Olympic,
@@ -68,6 +70,7 @@ impl SpecType {
 			SpecType::Ropsten => Ok(ethereum::new_ropsten()),
 			SpecType::Olympic => Ok(ethereum::new_olympic()),
 			SpecType::Classic => Ok(ethereum::new_classic()),
+			SpecType::ClassicTestnet => Ok(ethereum::new_classic_morden()),
 			SpecType::Expanse => Ok(ethereum::new_expanse()),
 			SpecType::Dev => Ok(Spec::new_instant()),
 			SpecType::Custom(ref filename) => {
@@ -288,6 +291,9 @@ mod tests {
 		assert_eq!(SpecType::Testnet, "morden".parse().unwrap());
 		assert_eq!(SpecType::Ropsten, "ropsten".parse().unwrap());
 		assert_eq!(SpecType::Olympic, "olympic".parse().unwrap());
+		assert_eq!(SpecType::Classic, "classic".parse().unwrap());
+		assert_eq!(SpecType::ClassicTestnet, "classic-testnet".parse().unwrap());
+		assert_eq!(SpecType::ClassicTestnet, "classic-morden".parse().unwrap());
 	}
 
 	#[test]
-- 
GitLab


From d3077c51fcd0638878ba3478987a954f7a1adbc1 Mon Sep 17 00:00:00 2001
From: Nicolas Gotchac <ngotchac@gmail.com>
Date: Sun, 11 Dec 2016 15:05:10 +0100
Subject: [PATCH 27/64] Target Babel to latest Chrome Versions in dev (#3806)

* Use `babel-preset-env` to target Babel to latest Chrome Versions

* Opt-In mechanism for Babel Preset Env
---
 js/package.json      |  1 +
 js/webpack/shared.js | 23 +++++++++++++++++++++++
 2 files changed, 24 insertions(+)

diff --git a/js/package.json b/js/package.json
index a8b156dd29..120ebb094c 100644
--- a/js/package.json
+++ b/js/package.json
@@ -59,6 +59,7 @@
     "babel-plugin-transform-runtime": "6.15.0",
     "babel-plugin-webpack-alias": "2.1.2",
     "babel-polyfill": "6.20.0",
+    "babel-preset-env": "1.0.2",
     "babel-preset-es2015": "6.18.0",
     "babel-preset-es2016": "6.16.0",
     "babel-preset-es2017": "6.16.0",
diff --git a/js/webpack/shared.js b/js/webpack/shared.js
index 8b6807b2a0..3c593fd87e 100644
--- a/js/webpack/shared.js
+++ b/js/webpack/shared.js
@@ -36,6 +36,29 @@ function getBabelrc () {
   // [ "es2015", { "modules": false } ]
   babelrc.presets[es2015Index] = [ 'es2015', { modules: false } ];
   babelrc['babelrc'] = false;
+
+  const BABEL_PRESET_ENV = process.env.BABEL_PRESET_ENV;
+  const npmStart = process.env.npm_lifecycle_event === 'start';
+  const npmStartApp = process.env.npm_lifecycle_event === 'start:app';
+
+  if (BABEL_PRESET_ENV && (npmStart || npmStartApp)) {
+    console.log('using babel-preset-env');
+
+    babelrc.presets = [
+      // 'es2017',
+      'stage-0', 'react',
+      [
+        'env',
+        {
+          targets: { browsers: ['last 2 Chrome versions'] },
+          modules: false,
+          loose: true,
+          useBuiltIns: true
+        }
+      ]
+    ];
+  }
+
   return babelrc;
 }
 
-- 
GitLab


From 778f5bbfaf285fcdcf4ab4852696980638d975ed Mon Sep 17 00:00:00 2001
From: GitLab Build Bot <jaco+gitlab@ethcore.io>
Date: Sun, 11 Dec 2016 14:14:41 +0000
Subject: [PATCH 28/64] [ci skip] js-precompiled 20161211-141210

---
 Cargo.lock      | 2 +-
 js/package.json | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index c15b82879d..cae9d6744d 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1290,7 +1290,7 @@ dependencies = [
 [[package]]
 name = "parity-ui-precompiled"
 version = "1.4.0"
-source = "git+https://github.com/ethcore/js-precompiled.git#4465ba44b8f698640f2355508245f7f9e370343b"
+source = "git+https://github.com/ethcore/js-precompiled.git#3e04f32403aab917a149d54f4191263f1c79f5ce"
 dependencies = [
  "parity-dapps-glue 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
diff --git a/js/package.json b/js/package.json
index 120ebb094c..577ec6f145 100644
--- a/js/package.json
+++ b/js/package.json
@@ -1,6 +1,6 @@
 {
   "name": "parity.js",
-  "version": "0.2.110",
+  "version": "0.2.111",
   "main": "release/index.js",
   "jsnext:main": "src/index.js",
   "author": "Parity Team <admin@parity.io>",
-- 
GitLab


From 4e3c49c809589d4347c350af599951eb3c1995ae Mon Sep 17 00:00:00 2001
From: Igor Artamonov <igor@artamonov.ru>
Date: Sun, 11 Dec 2016 20:34:46 +0600
Subject: [PATCH 29/64] revert ETC to correct Network ID

---
 ethcore/res/ethereum/classic-morden.json | 2 +-
 ethcore/res/ethereum/classic.json        | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/ethcore/res/ethereum/classic-morden.json b/ethcore/res/ethereum/classic-morden.json
index 40c1d4dcf2..bc0bf4c02d 100644
--- a/ethcore/res/ethereum/classic-morden.json
+++ b/ethcore/res/ethereum/classic-morden.json
@@ -26,7 +26,7 @@
 		"accountStartNonce": "0x0100000",
 		"maximumExtraDataSize": "0x20",
 		"minGasLimit": "0x1388",
-		"networkID" : "0x3e",
+		"networkID" : "0x2",
 		"forkBlock": "0x1b34d8",
 		"forkCanonHash": "0xf376243aeff1f256d970714c3de9fd78fa4e63cf63e32a51fe1169e375d98145"
 	},
diff --git a/ethcore/res/ethereum/classic.json b/ethcore/res/ethereum/classic.json
index 9373a20410..9c189e8d82 100644
--- a/ethcore/res/ethereum/classic.json
+++ b/ethcore/res/ethereum/classic.json
@@ -25,7 +25,7 @@
 		"accountStartNonce": "0x00",
 		"maximumExtraDataSize": "0x20",
 		"minGasLimit": "0x1388",
-		"networkID" : "0x3d",
+		"networkID" : "0x1",
 		"forkBlock": "0x1d4c00",
 		"forkCanonHash": "0x94365e3a8c0b35089c1d1195081fe7489b528a84b22199c916180db8b28ade7f"
 	},
-- 
GitLab


From 6742b080f556def243e1151631355b79c330289e Mon Sep 17 00:00:00 2001
From: Igor Artamonov <igor@artamonov.ru>
Date: Sun, 11 Dec 2016 20:38:37 +0600
Subject: [PATCH 30/64] use decimals for block numbers in config

---
 ethcore/res/ethereum/classic.json | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/ethcore/res/ethereum/classic.json b/ethcore/res/ethereum/classic.json
index 9c189e8d82..a08dde33bd 100644
--- a/ethcore/res/ethereum/classic.json
+++ b/ethcore/res/ethereum/classic.json
@@ -10,14 +10,15 @@
 				"durationLimit": "0x0d",
 				"blockReward": "0x4563918244F40000",
 				"registrar" : "0xc6d9d2cd449a754c494264e1809c50e34d64562b",
-				"homesteadTransition": "0x118c30",
-				"eip150Transition": "0x2625a0",
+				"homesteadTransition": 1150000,
+				"eip150Transition": 2500000,
 				"eip155Transition": 3000000,
 				"eip160Transition": 3000000,
+				"ecip1010PauseTransition": 3000000,
+				"ecip1010ContinueTransition": 5000000,
+
 				"eip161abcTransition": "0x7fffffffffffffff",
-				"eip161dTransition": "0x7fffffffffffffff",
-				"ecip1010PauseTransition": "0x2dc6c0",
-				"ecip1010ContinueTransition": "0x4c4b40"
+				"eip161dTransition": "0x7fffffffffffffff"
 			}
 		}
 	},
-- 
GitLab


From 6724f574d639fb9df6b9dd9c464a8a5aecd9bdbe Mon Sep 17 00:00:00 2001
From: Robert Habermeier <rphmeier@gmail.com>
Date: Sun, 11 Dec 2016 15:40:31 +0100
Subject: [PATCH 31/64] Light server improvements and protocol adjustments
 (#3801)

* light: basic transaction pool

* light: network timeouts

* fix dead code warnings

* les: update to new message format

* fix indentation

* les: hash or number in headers req, not both
---
 ethcore/light/src/client.rs            |  19 +-
 ethcore/light/src/lib.rs               |   3 +-
 ethcore/light/src/net/context.rs       | 136 ++++++------
 ethcore/light/src/net/mod.rs           | 277 +++++++++++++++----------
 ethcore/light/src/net/tests/mod.rs     |  55 +++--
 ethcore/light/src/provider.rs          |  30 ++-
 ethcore/light/src/types/les_request.rs |  29 ++-
 7 files changed, 321 insertions(+), 228 deletions(-)

diff --git a/ethcore/light/src/client.rs b/ethcore/light/src/client.rs
index 0035406dc1..fcfff81e6f 100644
--- a/ethcore/light/src/client.rs
+++ b/ethcore/light/src/client.rs
@@ -14,8 +14,7 @@
 // You should have received a copy of the GNU General Public License
 // along with Parity.  If not, see <http://www.gnu.org/licenses/>.
 
-//! Light client implementation. Used for raw data queries as well as the header
-//! sync.
+//! Light client implementation. Stores data from light sync
 
 use std::sync::Arc;
 
@@ -29,7 +28,7 @@ use ethcore::transaction::SignedTransaction;
 use ethcore::blockchain_info::BlockChainInfo;
 
 use io::IoChannel;
-use util::hash::H256;
+use util::hash::{H256, H256FastMap};
 use util::{Bytes, Mutex};
 
 use provider::Provider;
@@ -37,9 +36,10 @@ use request;
 
 /// Light client implementation.
 pub struct Client {
-	engine: Arc<Engine>,
+	_engine: Arc<Engine>,
 	header_queue: HeaderQueue,
-	message_channel: Mutex<IoChannel<ClientIoMessage>>,
+	_message_channel: Mutex<IoChannel<ClientIoMessage>>,
+	tx_pool: Mutex<H256FastMap<SignedTransaction>>,
 }
 
 impl Client {
@@ -55,12 +55,17 @@ impl Client {
 		false
 	}
 
+	/// Import a local transaction.
+	pub fn import_own_transaction(&self, tx: SignedTransaction) {
+		self.tx_pool.lock().insert(tx.hash(), tx);
+	} 
+
 	/// Fetch a vector of all pending transactions.
 	pub fn pending_transactions(&self) -> Vec<SignedTransaction> {
-		vec![]
+		self.tx_pool.lock().values().cloned().collect()
 	}
 
-	/// Inquire about the status of a given block.
+	/// Inquire about the status of a given block (or header).
 	pub fn status(&self, _id: BlockId) -> BlockStatus {
 		BlockStatus::Unknown
 	}
diff --git a/ethcore/light/src/lib.rs b/ethcore/light/src/lib.rs
index 7fa2f59118..f9008ac7c3 100644
--- a/ethcore/light/src/lib.rs
+++ b/ethcore/light/src/lib.rs
@@ -28,8 +28,7 @@
 //! It starts by performing a header-only sync, verifying random samples
 //! of members of the chain to varying degrees.
 
-// TODO: remove when integrating with the rest of parity.
-#![allow(dead_code)]
+#![deny(missing_docs)]
 
 pub mod client;
 pub mod net;
diff --git a/ethcore/light/src/net/context.rs b/ethcore/light/src/net/context.rs
index c05e69b0f3..96c2178956 100644
--- a/ethcore/light/src/net/context.rs
+++ b/ethcore/light/src/net/context.rs
@@ -26,95 +26,95 @@ use request::Request;
 /// disconnecting peers. This is used as a generalization of the portions
 /// of a p2p network which the light protocol structure makes use of.
 pub trait IoContext {
-    /// Send a packet to a specific peer.
-    fn send(&self, peer: PeerId, packet_id: u8, packet_body: Vec<u8>);
+	/// Send a packet to a specific peer.
+	fn send(&self, peer: PeerId, packet_id: u8, packet_body: Vec<u8>);
 
-    /// Respond to a peer's message. Only works if this context is a byproduct
-    /// of a packet handler.
-    fn respond(&self, packet_id: u8, packet_body: Vec<u8>);
+	/// Respond to a peer's message. Only works if this context is a byproduct
+	/// of a packet handler.
+	fn respond(&self, packet_id: u8, packet_body: Vec<u8>);
 
-    /// Disconnect a peer.
-    fn disconnect_peer(&self, peer: PeerId);
+	/// Disconnect a peer.
+	fn disconnect_peer(&self, peer: PeerId);
 
-    /// Disable a peer -- this is a disconnect + a time-out.
-    fn disable_peer(&self, peer: PeerId);
+	/// Disable a peer -- this is a disconnect + a time-out.
+	fn disable_peer(&self, peer: PeerId);
 
-    /// Get a peer's protocol version.
-    fn protocol_version(&self, peer: PeerId) -> Option<u8>;
+	/// Get a peer's protocol version.
+	fn protocol_version(&self, peer: PeerId) -> Option<u8>;
 }
 
 impl<'a> IoContext for NetworkContext<'a> {
-    fn send(&self, peer: PeerId, packet_id: u8, packet_body: Vec<u8>) {
-        if let Err(e) = self.send(peer, packet_id, packet_body) {
-            debug!(target: "les", "Error sending packet to peer {}: {}", peer, e);
-        }
-    }
-
-    fn respond(&self, packet_id: u8, packet_body: Vec<u8>) {
-        if let Err(e) = self.respond(packet_id, packet_body) {
-            debug!(target: "les", "Error responding to peer message: {}", e);
-        }
-    }
-
-    fn disconnect_peer(&self, peer: PeerId) {
-        NetworkContext::disconnect_peer(self, peer);
-    }
-
-    fn disable_peer(&self, peer: PeerId) {
-        NetworkContext::disable_peer(self, peer);
-    }
-
-    fn protocol_version(&self, peer: PeerId) -> Option<u8> {
-        self.protocol_version(self.subprotocol_name(), peer)
-    }
+	fn send(&self, peer: PeerId, packet_id: u8, packet_body: Vec<u8>) {
+		if let Err(e) = self.send(peer, packet_id, packet_body) {
+			debug!(target: "les", "Error sending packet to peer {}: {}", peer, e);
+		}
+	}
+
+	fn respond(&self, packet_id: u8, packet_body: Vec<u8>) {
+		if let Err(e) = self.respond(packet_id, packet_body) {
+			debug!(target: "les", "Error responding to peer message: {}", e);
+		}
+	}
+
+	fn disconnect_peer(&self, peer: PeerId) {
+		NetworkContext::disconnect_peer(self, peer);
+	}
+
+	fn disable_peer(&self, peer: PeerId) {
+		NetworkContext::disable_peer(self, peer);
+	}
+
+	fn protocol_version(&self, peer: PeerId) -> Option<u8> {
+		self.protocol_version(self.subprotocol_name(), peer)
+	}
 }
 
 /// Context for a protocol event.
 pub trait EventContext {
-    /// Get the peer relevant to the event e.g. message sender,
-    /// disconnected/connected peer.
-    fn peer(&self) -> PeerId;
+	/// Get the peer relevant to the event e.g. message sender,
+	/// disconnected/connected peer.
+	fn peer(&self) -> PeerId;
 
-    /// Make a request from a peer.
-    fn request_from(&self, peer: PeerId, request: Request) -> Result<ReqId, Error>;
+	/// Make a request from a peer.
+	fn request_from(&self, peer: PeerId, request: Request) -> Result<ReqId, Error>;
 
-    /// Make an announcement of new capabilities to the rest of the peers.
-    // TODO: maybe just put this on a timer in LightProtocol?
-    fn make_announcement(&self, announcement: Announcement);
+	/// Make an announcement of new capabilities to the rest of the peers.
+	// TODO: maybe just put this on a timer in LightProtocol?
+	fn make_announcement(&self, announcement: Announcement);
 
-    /// Disconnect a peer.
-    fn disconnect_peer(&self, peer: PeerId);
+	/// Disconnect a peer.
+	fn disconnect_peer(&self, peer: PeerId);
 
-    /// Disable a peer.
-    fn disable_peer(&self, peer: PeerId);
+	/// Disable a peer.
+	fn disable_peer(&self, peer: PeerId);
 }
 
 /// Concrete implementation of `EventContext` over the light protocol struct and 
 /// an io context.
 pub struct Ctx<'a> {
-    /// Io context to enable immediate response to events.
-    pub io: &'a IoContext,
-    /// Protocol implementation.
-    pub proto: &'a LightProtocol,
-    /// Relevant peer for event.
-    pub peer: PeerId, 
+	/// Io context to enable immediate response to events.
+	pub io: &'a IoContext,
+	/// Protocol implementation.
+	pub proto: &'a LightProtocol,
+	/// Relevant peer for event.
+	pub peer: PeerId, 
 }
 
 impl<'a> EventContext for Ctx<'a> {
-    fn peer(&self) -> PeerId { self.peer }
-    fn request_from(&self, peer: PeerId, request: Request) -> Result<ReqId, Error> {
-        self.proto.request_from(self.io, &peer, request)
-    }
-
-    fn make_announcement(&self, announcement: Announcement) {
-        self.proto.make_announcement(self.io, announcement);
-    }
-
-    fn disconnect_peer(&self, peer: PeerId) {
-        self.io.disconnect_peer(peer);
-    }
-
-    fn disable_peer(&self, peer: PeerId) {
-        self.io.disable_peer(peer);
-    }
+	fn peer(&self) -> PeerId { self.peer }
+	fn request_from(&self, peer: PeerId, request: Request) -> Result<ReqId, Error> {
+		self.proto.request_from(self.io, &peer, request)
+	}
+
+	fn make_announcement(&self, announcement: Announcement) {
+		self.proto.make_announcement(self.io, announcement);
+	}
+
+	fn disconnect_peer(&self, peer: PeerId) {
+		self.io.disconnect_peer(peer);
+	}
+
+	fn disable_peer(&self, peer: PeerId) {
+		self.io.disable_peer(peer);
+	}
 }
\ No newline at end of file
diff --git a/ethcore/light/src/net/mod.rs b/ethcore/light/src/net/mod.rs
index 481740a48f..e5bf0cb2b8 100644
--- a/ethcore/light/src/net/mod.rs
+++ b/ethcore/light/src/net/mod.rs
@@ -34,7 +34,7 @@ use std::sync::Arc;
 use std::sync::atomic::{AtomicUsize, Ordering};
 
 use provider::Provider;
-use request::{self, Request};
+use request::{self, HashOrNumber, Request};
 
 use self::buffer_flow::{Buffer, FlowParams};
 use self::context::Ctx;
@@ -57,13 +57,13 @@ const TIMEOUT_INTERVAL_MS: u64 = 1000;
 // minimum interval between updates.
 const UPDATE_INTERVAL_MS: i64 = 5000;
 
-// Supported protocol versions.
+/// Supported protocol versions.
 pub const PROTOCOL_VERSIONS: &'static [u8] = &[1];
 
-// Max protocol version.
+/// Max protocol version.
 pub const MAX_PROTOCOL_VERSION: u8 = 1;
 
-// Packet count for LES.
+/// Packet count for LES.
 pub const PACKET_COUNT: u8 = 15;
 
 // packet ID definitions.
@@ -102,6 +102,18 @@ mod packet {
 	pub const HEADER_PROOFS: u8 = 0x0e;
 }
 
+// timeouts for different kinds of requests. all values are in milliseconds.
+// TODO: variable timeouts based on request count.
+mod timeout {
+	pub const HANDSHAKE: i64 = 2500;
+	pub const HEADERS: i64 = 5000;
+	pub const BODIES: i64 = 5000;
+	pub const RECEIPTS: i64 = 3500;
+	pub const PROOFS: i64 = 4000;
+	pub const CONTRACT_CODES: i64 = 5000;
+	pub const HEADER_PROOFS: i64 = 3500;
+}
+
 /// A request id.
 #[derive(Debug, Clone, Copy, PartialEq, Eq, Hash)]
 pub struct ReqId(usize);
@@ -111,7 +123,6 @@ pub struct ReqId(usize);
 struct PendingPeer {
 	sent_head: H256,
 	last_update: SteadyTime,
-	proto_version: u8,
 }
 
 // data about each peer.
@@ -122,7 +133,6 @@ struct Peer {
 	remote_flow: Option<(Buffer, FlowParams)>,
 	sent_head: H256, // last head we've given them.
 	last_update: SteadyTime,
-	proto_version: u8,
 }
 
 impl Peer {
@@ -443,17 +453,54 @@ impl LightProtocol {
 			}
 		};
 
-		// if something went wrong, figure out how much to punish the peer.
 		if let Err(e) = res {
-			match e.punishment() {
-				Punishment::None => {}
-				Punishment::Disconnect => {
-					debug!(target: "les", "Disconnecting peer {}: {}", peer, e);
-					io.disconnect_peer(*peer)
-				}
-				Punishment::Disable => {
-					debug!(target: "les", "Disabling peer {}: {}", peer, e);
-					io.disable_peer(*peer)
+			punish(*peer, io, e);
+		}
+	}
+
+	// check timeouts and punish peers.
+	fn timeout_check(&self, io: &IoContext) {
+		let now = SteadyTime::now();
+
+		// handshake timeout
+		{
+			let mut pending = self.pending_peers.write();
+			let slowpokes: Vec<_> = pending.iter()
+				.filter(|&(_, ref peer)| {
+					peer.last_update + Duration::milliseconds(timeout::HANDSHAKE) <= now
+				})
+				.map(|(&p, _)| p)
+				.collect();
+
+			for slowpoke in slowpokes {
+				debug!(target: "les", "Peer {} handshake timed out", slowpoke);
+				pending.remove(&slowpoke);
+				io.disconnect_peer(slowpoke);
+			}
+		}
+
+		// request timeouts
+		{
+			for r in self.pending_requests.read().values() {
+				let kind_timeout = match r.request.kind() {
+					request::Kind::Headers => timeout::HEADERS,
+					request::Kind::Bodies => timeout::BODIES,
+					request::Kind::Receipts => timeout::RECEIPTS,
+					request::Kind::StateProofs => timeout::PROOFS,
+					request::Kind::Codes => timeout::CONTRACT_CODES,
+					request::Kind::HeaderProofs => timeout::HEADER_PROOFS,					
+				};
+
+				if r.timestamp + Duration::milliseconds(kind_timeout) <= now {
+					debug!(target: "les", "Request for {:?} from peer {} timed out", 
+						r.request.kind(), r.peer_id);
+					
+					// keep the request in the `pending` set for now so
+					// on_disconnect will pass unfulfilled ReqIds to handlers.
+					// in the case that a response is received after this, the
+					// disconnect won't be cancelled but the ReqId won't be 
+					// marked as abandoned.
+					io.disconnect_peer(r.peer_id);
 				}
 			}
 		}
@@ -463,19 +510,37 @@ impl LightProtocol {
 impl LightProtocol {
 	// called when a peer connects.
 	fn on_connect(&self, peer: &PeerId, io: &IoContext) {
-		let peer = *peer;
-
-		trace!(target: "les", "Peer {} connecting", peer);
+		let proto_version = match io.protocol_version(*peer).ok_or(Error::WrongNetwork) {
+			Ok(pv) => pv,
+			Err(e) => { punish(*peer, io, e); return }
+		};
 
-		match self.send_status(peer, io) {
-			Ok(pending_peer) => {
-				self.pending_peers.write().insert(peer, pending_peer);
-			}
-			Err(e) => {
-				trace!(target: "les", "Error while sending status: {}", e);
-				io.disconnect_peer(peer);
-			}
+		if PROTOCOL_VERSIONS.iter().find(|x| **x == proto_version).is_none() {
+			punish(*peer, io, Error::UnsupportedProtocolVersion(proto_version));
+			return;
 		}
+		
+		let chain_info = self.provider.chain_info();
+
+		let status = Status {
+			head_td: chain_info.total_difficulty,
+			head_hash: chain_info.best_block_hash,
+			head_num: chain_info.best_block_number,
+			genesis_hash: chain_info.genesis_hash,
+			protocol_version: proto_version as u32, // match peer proto version
+			network_id: self.network_id,
+			last_head: None,
+		};
+
+		let capabilities = self.capabilities.read().clone();
+		let status_packet = status::write_handshake(&status, &capabilities, Some(&self.flow_params));
+
+		self.pending_peers.write().insert(*peer, PendingPeer {
+			sent_head: chain_info.best_block_hash,
+			last_update: SteadyTime::now(),
+		});
+
+		io.send(*peer, packet::STATUS, status_packet);		
 	}
 
 	// called when a peer disconnects.
@@ -508,38 +573,6 @@ impl LightProtocol {
 		}
 	}
 
-	// send status to a peer.
-	fn send_status(&self, peer: PeerId, io: &IoContext) -> Result<PendingPeer, Error> {
-		let proto_version = try!(io.protocol_version(peer).ok_or(Error::WrongNetwork));
-
-		if PROTOCOL_VERSIONS.iter().find(|x| **x == proto_version).is_none() {
-			return Err(Error::UnsupportedProtocolVersion(proto_version));
-		}
-		
-		let chain_info = self.provider.chain_info();
-
-		let status = Status {
-			head_td: chain_info.total_difficulty,
-			head_hash: chain_info.best_block_hash,
-			head_num: chain_info.best_block_number,
-			genesis_hash: chain_info.genesis_hash,
-			protocol_version: proto_version as u32, // match peer proto version
-			network_id: self.network_id,
-			last_head: None,
-		};
-
-		let capabilities = self.capabilities.read().clone();
-		let status_packet = status::write_handshake(&status, &capabilities, Some(&self.flow_params));
-
-		io.send(peer, packet::STATUS, status_packet);
-
-		Ok(PendingPeer {
-			sent_head: chain_info.best_block_hash,
-			last_update: SteadyTime::now(),
-			proto_version: proto_version,			
-		})
-	}
-
 	// Handle status message from peer.
 	fn status(&self, peer: &PeerId, io: &IoContext, data: UntrustedRlp) -> Result<(), Error> {
 		let pending = match self.pending_peers.write().remove(peer) {
@@ -570,7 +603,6 @@ impl LightProtocol {
 			remote_flow: remote_flow,
 			sent_head: pending.sent_head,
 			last_update: pending.last_update,
-			proto_version: pending.proto_version,
 		}));
 
 		for handler in &self.handlers {
@@ -630,7 +662,7 @@ impl LightProtocol {
 	}
 
 	// Handle a request for block headers.
-	fn get_block_headers(&self, peer: &PeerId, io: &IoContext, data: UntrustedRlp) -> Result<(), Error> {
+	fn get_block_headers(&self, peer: &PeerId, io: &IoContext, data: UntrustedRlp) -> Result<(), Error> {		
 		const MAX_HEADERS: usize = 512;
 
 		let peers = self.peers.read();
@@ -645,18 +677,21 @@ impl LightProtocol {
 		let mut peer = peer.lock();
 
 		let req_id: u64 = try!(data.val_at(0));
+		let data = try!(data.at(1));
 
-		let block = {
-			let rlp = try!(data.at(1));
-			(try!(rlp.val_at(0)), try!(rlp.val_at(1)))
+		let start_block = {
+			if try!(data.at(0)).size() == 32 {
+				HashOrNumber::Hash(try!(data.val_at(0)))
+			} else {
+				HashOrNumber::Number(try!(data.val_at(0)))
+			}
 		};
 
 		let req = request::Headers {
-			block_num: block.0,
-			block_hash: block.1,
-			max: ::std::cmp::min(MAX_HEADERS, try!(data.val_at(2))),
-			skip: try!(data.val_at(3)),
-			reverse: try!(data.val_at(4)),
+			start: start_block,
+			max: ::std::cmp::min(MAX_HEADERS, try!(data.val_at(1))),
+			skip: try!(data.val_at(2)),
+			reverse: try!(data.val_at(3)),
 		};
 
 		let max_cost = try!(peer.deduct_max(&self.flow_params, request::Kind::Headers, req.max));
@@ -667,8 +702,8 @@ impl LightProtocol {
 
 		let cur_buffer = peer.refund(&self.flow_params, max_cost - actual_cost);
 		io.respond(packet::BLOCK_HEADERS, {
-			let mut stream = RlpStream::new_list(response.len() + 2);
-			stream.append(&req_id).append(&cur_buffer);
+			let mut stream = RlpStream::new_list(3);
+			stream.append(&req_id).append(&cur_buffer).begin_list(response.len());
 
 			for header in response {
 				stream.append_raw(&header, 1);
@@ -683,7 +718,7 @@ impl LightProtocol {
 	// Receive a response for block headers.
 	fn block_headers(&self, peer: &PeerId, io: &IoContext, raw: UntrustedRlp) -> Result<(), Error> {
 		let req_id = try!(self.pre_verify_response(peer, request::Kind::Headers, &raw));
-		let raw_headers: Vec<_> = raw.iter().skip(2).map(|x| x.as_raw().to_owned()).collect();
+		let raw_headers: Vec<_> = try!(raw.at(2)).iter().map(|x| x.as_raw().to_owned()).collect();
 
 		for handler in &self.handlers {
 			handler.on_block_headers(&Ctx {
@@ -713,7 +748,7 @@ impl LightProtocol {
 		let req_id: u64 = try!(data.val_at(0));
 
 		let req = request::Bodies {
-			block_hashes: try!(data.iter().skip(1).take(MAX_BODIES).map(|x| x.as_val()).collect())
+			block_hashes: try!(try!(data.at(1)).iter().take(MAX_BODIES).map(|x| x.as_val()).collect())
 		};
 
 		let max_cost = try!(peer.deduct_max(&self.flow_params, request::Kind::Bodies, req.block_hashes.len()));
@@ -726,8 +761,8 @@ impl LightProtocol {
 		let cur_buffer = peer.refund(&self.flow_params, max_cost - actual_cost);
 
 		io.respond(packet::BLOCK_BODIES, {
-			let mut stream = RlpStream::new_list(response.len() + 2);
-			stream.append(&req_id).append(&cur_buffer);
+			let mut stream = RlpStream::new_list(3);
+			stream.append(&req_id).append(&cur_buffer).begin_list(response.len());
 
 			for body in response {
 				stream.append_raw(&body, 1);
@@ -742,7 +777,7 @@ impl LightProtocol {
 	// Receive a response for block bodies.
 	fn block_bodies(&self, peer: &PeerId, io: &IoContext, raw: UntrustedRlp) -> Result<(), Error> {
 		let req_id = try!(self.pre_verify_response(peer, request::Kind::Bodies, &raw));
-		let raw_bodies: Vec<Bytes> = raw.iter().skip(2).map(|x| x.as_raw().to_owned()).collect();
+		let raw_bodies: Vec<Bytes> = try!(raw.at(2)).iter().map(|x| x.as_raw().to_owned()).collect();
 
 		for handler in &self.handlers {
 			handler.on_block_bodies(&Ctx {
@@ -772,7 +807,7 @@ impl LightProtocol {
 		let req_id: u64 = try!(data.val_at(0));
 
 		let req = request::Receipts {
-			block_hashes: try!(data.iter().skip(1).take(MAX_RECEIPTS).map(|x| x.as_val()).collect())
+			block_hashes: try!(try!(data.at(1)).iter().take(MAX_RECEIPTS).map(|x| x.as_val()).collect())
 		};
 
 		let max_cost = try!(peer.deduct_max(&self.flow_params, request::Kind::Receipts, req.block_hashes.len()));
@@ -785,8 +820,8 @@ impl LightProtocol {
 		let cur_buffer = peer.refund(&self.flow_params, max_cost - actual_cost);
 
 		io.respond(packet::RECEIPTS, {
-			let mut stream = RlpStream::new_list(response.len() + 2);
-			stream.append(&req_id).append(&cur_buffer);
+			let mut stream = RlpStream::new_list(3);
+			stream.append(&req_id).append(&cur_buffer).begin_list(response.len());
 
 			for receipts in response {
 				stream.append_raw(&receipts, 1);
@@ -801,9 +836,8 @@ impl LightProtocol {
 	// Receive a response for receipts.
 	fn receipts(&self, peer: &PeerId, io: &IoContext, raw: UntrustedRlp) -> Result<(), Error> {
 		let req_id = try!(self.pre_verify_response(peer, request::Kind::Receipts, &raw));
-		let raw_receipts: Vec<Vec<Receipt>> = try!(raw
+		let raw_receipts: Vec<Vec<Receipt>> = try!(try!(raw.at(2))
 			.iter()
-			.skip(2)
 			.map(|x| x.as_val())
 			.collect());
 
@@ -835,7 +869,7 @@ impl LightProtocol {
 		let req_id: u64 = try!(data.val_at(0));
 
 		let req = {
-			let requests: Result<Vec<_>, Error> = data.iter().skip(1).take(MAX_PROOFS).map(|x| {
+			let requests: Result<Vec<_>, Error> = try!(data.at(1)).iter().take(MAX_PROOFS).map(|x| {
 				Ok(request::StateProof {
 					block: try!(x.val_at(0)),
 					key1: try!(x.val_at(1)),
@@ -859,8 +893,8 @@ impl LightProtocol {
 		let cur_buffer = peer.refund(&self.flow_params, max_cost - actual_cost);
 
 		io.respond(packet::PROOFS, {
-			let mut stream = RlpStream::new_list(response.len() + 2);
-			stream.append(&req_id).append(&cur_buffer);
+			let mut stream = RlpStream::new_list(3);
+			stream.append(&req_id).append(&cur_buffer).begin_list(response.len());
 
 			for proof in response {
 				stream.append_raw(&proof, 1);
@@ -876,8 +910,7 @@ impl LightProtocol {
 	fn proofs(&self, peer: &PeerId, io: &IoContext, raw: UntrustedRlp) -> Result<(), Error> {
 		let req_id = try!(self.pre_verify_response(peer, request::Kind::StateProofs, &raw));
 
-		let raw_proofs: Vec<Vec<Bytes>> = raw.iter()
-			.skip(2)
+		let raw_proofs: Vec<Vec<Bytes>> = try!(raw.at(2)).iter()
 			.map(|x| x.iter().map(|node| node.as_raw().to_owned()).collect())
 			.collect();
 
@@ -909,7 +942,7 @@ impl LightProtocol {
 		let req_id: u64 = try!(data.val_at(0));
 
 		let req = {
-			let requests: Result<Vec<_>, Error> = data.iter().skip(1).take(MAX_CODES).map(|x| {
+			let requests: Result<Vec<_>, Error> = try!(data.at(1)).iter().take(MAX_CODES).map(|x| {
 				Ok(request::ContractCode {
 					block_hash: try!(x.val_at(0)),
 					account_key: try!(x.val_at(1)),
@@ -931,8 +964,8 @@ impl LightProtocol {
 		let cur_buffer = peer.refund(&self.flow_params, max_cost - actual_cost);
 
 		io.respond(packet::CONTRACT_CODES, {
-			let mut stream = RlpStream::new_list(response.len() + 2);
-			stream.append(&req_id).append(&cur_buffer);
+			let mut stream = RlpStream::new_list(3);
+			stream.append(&req_id).append(&cur_buffer).begin_list(response.len());
 
 			for code in response {
 				stream.append(&code);
@@ -948,7 +981,7 @@ impl LightProtocol {
 	fn contract_code(&self, peer: &PeerId, io: &IoContext, raw: UntrustedRlp) -> Result<(), Error> {
 		let req_id = try!(self.pre_verify_response(peer, request::Kind::Codes, &raw));
 
-		let raw_code: Vec<Bytes> = try!(raw.iter().skip(2).map(|x| x.as_val()).collect());
+		let raw_code: Vec<Bytes> = try!(try!(raw.at(2)).iter().map(|x| x.as_val()).collect());
 
 		for handler in &self.handlers { 
 			handler.on_code(&Ctx {
@@ -978,7 +1011,7 @@ impl LightProtocol {
 		let req_id: u64 = try!(data.val_at(0));
 
 		let req = {
-			let requests: Result<Vec<_>, Error> = data.iter().skip(1).take(MAX_PROOFS).map(|x| {
+			let requests: Result<Vec<_>, Error> = try!(data.at(1)).iter().take(MAX_PROOFS).map(|x| {
 				Ok(request::HeaderProof {
 					cht_number: try!(x.val_at(0)),
 					block_number: try!(x.val_at(1)),
@@ -1001,8 +1034,8 @@ impl LightProtocol {
 		let cur_buffer = peer.refund(&self.flow_params, max_cost - actual_cost);
 
 		io.respond(packet::HEADER_PROOFS, {
-			let mut stream = RlpStream::new_list(response.len() + 2);
-			stream.append(&req_id).append(&cur_buffer);
+			let mut stream = RlpStream::new_list(3);
+			stream.append(&req_id).append(&cur_buffer).begin_list(response.len());
 
 			for proof in response {
 				stream.append_raw(&proof, 1);
@@ -1023,9 +1056,8 @@ impl LightProtocol {
 			))
 		}
 		
-		
 		let req_id = try!(self.pre_verify_response(peer, request::Kind::HeaderProofs, &raw));
-		let raw_proofs: Vec<_> = try!(raw.iter().skip(2).map(decode_res).collect());
+		let raw_proofs: Vec<_> = try!(try!(raw.at(2)).iter().map(decode_res).collect());
 
 		for handler in &self.handlers { 
 			handler.on_header_proofs(&Ctx {
@@ -1058,6 +1090,21 @@ impl LightProtocol {
 	}
 }
 
+// if something went wrong, figure out how much to punish the peer.
+fn punish(peer: PeerId, io: &IoContext, e: Error) {
+	match e.punishment() {
+		Punishment::None => {}
+		Punishment::Disconnect => {
+			debug!(target: "les", "Disconnecting peer {}: {}", peer, e);
+			io.disconnect_peer(peer)
+		}
+		Punishment::Disable => {
+			debug!(target: "les", "Disabling peer {}: {}", peer, e);
+			io.disable_peer(peer)
+		}
+	}
+}
+
 impl NetworkProtocolHandler for LightProtocol {
 	fn initialize(&self, io: &NetworkContext) {
 		io.register_timer(TIMEOUT, TIMEOUT_INTERVAL_MS).expect("Error registering sync timer.");
@@ -1075,11 +1122,9 @@ impl NetworkProtocolHandler for LightProtocol {
 		self.on_disconnect(*peer, io);
 	}
 
-	fn timeout(&self, _io: &NetworkContext, timer: TimerToken) {
+	fn timeout(&self, io: &NetworkContext, timer: TimerToken) {
 		match timer {
-			TIMEOUT => {
-				// broadcast transactions to peers.
-			}
+			TIMEOUT => self.timeout_check(io),
 			_ => warn!(target: "les", "received timeout on unknown token {}", timer),
 		}
 	}
@@ -1089,20 +1134,24 @@ impl NetworkProtocolHandler for LightProtocol {
 fn encode_request(req: &Request, req_id: usize) -> Vec<u8> {
 	match *req {
 		Request::Headers(ref headers) => {
-			let mut stream = RlpStream::new_list(5);
+			let mut stream = RlpStream::new_list(2);
+			stream.append(&req_id).begin_list(4);
+				
+			match headers.start {
+				HashOrNumber::Hash(ref hash) => stream.append(hash),
+				HashOrNumber::Number(ref num) => stream.append(num),
+			};
+			
 			stream
-				.append(&req_id)
-				.begin_list(2)
-					.append(&headers.block_num)
-					.append(&headers.block_hash)
 				.append(&headers.max)
 				.append(&headers.skip)
 				.append(&headers.reverse);
+
 			stream.out()
 		}
 		Request::Bodies(ref request) => {
-			let mut stream = RlpStream::new_list(request.block_hashes.len() + 1);
-			stream.append(&req_id);
+			let mut stream = RlpStream::new_list(2);
+			stream.append(&req_id).begin_list(request.block_hashes.len());
 
 			for hash in &request.block_hashes {
 				stream.append(hash);
@@ -1111,8 +1160,8 @@ fn encode_request(req: &Request, req_id: usize) -> Vec<u8> {
 			stream.out()
 		}
 		Request::Receipts(ref request) => {
-			let mut stream = RlpStream::new_list(request.block_hashes.len() + 1);
-			stream.append(&req_id);
+			let mut stream = RlpStream::new_list(2);
+			stream.append(&req_id).begin_list(request.block_hashes.len());
 
 			for hash in &request.block_hashes {
 				stream.append(hash);
@@ -1121,8 +1170,8 @@ fn encode_request(req: &Request, req_id: usize) -> Vec<u8> {
 			stream.out()
 		}
 		Request::StateProofs(ref request) => {
-			let mut stream = RlpStream::new_list(request.requests.len() + 1);
-			stream.append(&req_id);
+			let mut stream = RlpStream::new_list(2);
+			stream.append(&req_id).begin_list(request.requests.len());
 
 			for proof_req in &request.requests {
 				stream.begin_list(4)
@@ -1140,8 +1189,8 @@ fn encode_request(req: &Request, req_id: usize) -> Vec<u8> {
 			stream.out()
 		}
 		Request::Codes(ref request) => {
-			let mut stream = RlpStream::new_list(request.code_requests.len() + 1);
-			stream.append(&req_id);
+			let mut stream = RlpStream::new_list(2);
+			stream.append(&req_id).begin_list(request.code_requests.len());
 
 			for code_req in &request.code_requests {
 				stream.begin_list(2)
@@ -1152,8 +1201,8 @@ fn encode_request(req: &Request, req_id: usize) -> Vec<u8> {
 			stream.out()
 		}
 		Request::HeaderProofs(ref request) => {
-			let mut stream = RlpStream::new_list(request.requests.len() + 1);
-			stream.append(&req_id);
+			let mut stream = RlpStream::new_list(2);
+			stream.append(&req_id).begin_list(request.requests.len());
 
 			for proof_req in &request.requests {
 				stream.begin_list(3)
diff --git a/ethcore/light/src/net/tests/mod.rs b/ethcore/light/src/net/tests/mod.rs
index 876432ce29..7c0928cdd9 100644
--- a/ethcore/light/src/net/tests/mod.rs
+++ b/ethcore/light/src/net/tests/mod.rs
@@ -91,16 +91,27 @@ impl Provider for TestProvider {
 	}
 
 	fn block_headers(&self, req: request::Headers) -> Vec<Bytes> {
-		let best_num = self.0.client.chain_info().best_block_number;
-		let start_num = req.block_num;
-
-		match self.0.client.block_hash(BlockId::Number(req.block_num)) {
-			Some(hash) if hash == req.block_hash => {}
-			_=> {
-				trace!(target: "les_provider", "unknown/non-canonical start block in header request: {:?}", (req.block_num, req.block_hash));
-				return vec![]
+		use request::HashOrNumber;
+		use ethcore::views::HeaderView;
+
+		let best_num = self.chain_info().best_block_number;
+		let start_num = match req.start {
+			HashOrNumber::Number(start_num) => start_num,
+			HashOrNumber::Hash(hash) => match self.0.client.block_header(BlockId::Hash(hash)) {
+				None => {
+					return Vec::new();
+				}
+				Some(header) => {
+					let num = HeaderView::new(&header).number();
+					if req.max == 1 || self.0.client.block_hash(BlockId::Number(num)) != Some(hash) {
+						// Non-canonical header or single header requested.
+						return vec![header];
+					}
+
+					num
+				}
 			}
-		}
+		};
 
 		(0u64..req.max as u64)
 			.map(|x: u64| x.saturating_mul(req.skip + 1))
@@ -250,8 +261,7 @@ fn buffer_overflow() {
 
 	// 1000 requests is far too many for the default flow params.
 	let request = encode_request(&Request::Headers(Headers {
-		block_num: 1,
-		block_hash: provider.client.chain_info().genesis_hash,
+		start: 1.into(),
 		max: 1000,
 		skip: 0,
 		reverse: false,
@@ -284,8 +294,7 @@ fn get_block_headers() {
 	}
 
 	let request = Headers {
-		block_num: 1,
-		block_hash: provider.client.block_hash(BlockId::Number(1)).unwrap(),
+		start: 1.into(),
 		max: 10,
 		skip: 0,
 		reverse: false,
@@ -299,9 +308,9 @@ fn get_block_headers() {
 
 		let new_buf = *flow_params.limit() - flow_params.compute_cost(request::Kind::Headers, 10);
 
-		let mut response_stream = RlpStream::new_list(12);
+		let mut response_stream = RlpStream::new_list(3);
 		
-		response_stream.append(&req_id).append(&new_buf);
+		response_stream.append(&req_id).append(&new_buf).begin_list(10);
 		for header in headers {
 			response_stream.append_raw(&header, 1);
 		}
@@ -346,9 +355,9 @@ fn get_block_bodies() {
 
 		let new_buf = *flow_params.limit() - flow_params.compute_cost(request::Kind::Bodies, 10);
 
-		let mut response_stream = RlpStream::new_list(12);
+		let mut response_stream = RlpStream::new_list(3);
 		
-		response_stream.append(&req_id).append(&new_buf);
+		response_stream.append(&req_id).append(&new_buf).begin_list(10);
 		for body in bodies {
 			response_stream.append_raw(&body, 1);
 		}
@@ -399,9 +408,9 @@ fn get_block_receipts() {
 
 		let new_buf = *flow_params.limit() - flow_params.compute_cost(request::Kind::Receipts, receipts.len());
 
-		let mut response_stream = RlpStream::new_list(2 + receipts.len());
+		let mut response_stream = RlpStream::new_list(3);
 		
-		response_stream.append(&req_id).append(&new_buf);
+		response_stream.append(&req_id).append(&new_buf).begin_list(receipts.len());
 		for block_receipts in receipts {
 			response_stream.append_raw(&block_receipts, 1);
 		}
@@ -448,9 +457,9 @@ fn get_state_proofs() {
 
 		let new_buf = *flow_params.limit() - flow_params.compute_cost(request::Kind::StateProofs, 2);
 
-		let mut response_stream = RlpStream::new_list(4);
+		let mut response_stream = RlpStream::new_list(3);
 		
-		response_stream.append(&req_id).append(&new_buf);
+		response_stream.append(&req_id).append(&new_buf).begin_list(2);
 		for proof in proofs {
 			response_stream.append_raw(&proof, 1);
 		}
@@ -497,9 +506,9 @@ fn get_contract_code() {
 
 		let new_buf = *flow_params.limit() - flow_params.compute_cost(request::Kind::Codes, 2);
 
-		let mut response_stream = RlpStream::new_list(4);
+		let mut response_stream = RlpStream::new_list(3);
 		
-		response_stream.append(&req_id).append(&new_buf);
+		response_stream.append(&req_id).append(&new_buf).begin_list(2);
 		for code in codes {
 			response_stream.append(&code);
 		}
diff --git a/ethcore/light/src/provider.rs b/ethcore/light/src/provider.rs
index ad8d8ea165..ed2f49f5d5 100644
--- a/ethcore/light/src/provider.rs
+++ b/ethcore/light/src/provider.rs
@@ -97,17 +97,29 @@ impl<T: ProvingBlockChainClient + ?Sized> Provider for T {
 	}
 
 	fn block_headers(&self, req: request::Headers) -> Vec<Bytes> {
-		let best_num = self.chain_info().best_block_number;
-		let start_num = req.block_num;
+		use request::HashOrNumber;
+		use ethcore::views::HeaderView;
 
-		match self.block_hash(BlockId::Number(req.block_num)) {
-			Some(hash) if hash == req.block_hash => {}
-			_=> {
-				trace!(target: "les_provider", "unknown/non-canonical start block in header request: {:?}", (req.block_num, req.block_hash));
-				return vec![]
+		let best_num = self.chain_info().best_block_number;
+		let start_num = match req.start {
+			HashOrNumber::Number(start_num) => start_num,
+			HashOrNumber::Hash(hash) => match self.block_header(BlockId::Hash(hash)) {
+				None => {
+					trace!(target: "les_provider", "Unknown block hash {} requested", hash);
+					return Vec::new();
+				}
+				Some(header) => {
+					let num = HeaderView::new(&header).number();
+					if req.max == 1 || self.block_hash(BlockId::Number(num)) != Some(hash) {
+						// Non-canonical header or single header requested.
+						return vec![header];
+					}
+
+					num
+				}
 			}
-		}
-
+		};
+		
 		(0u64..req.max as u64)
 			.map(|x: u64| x.saturating_mul(req.skip + 1))
 			.take_while(|x| if req.reverse { x < &start_num } else { best_num - start_num >= *x })
diff --git a/ethcore/light/src/types/les_request.rs b/ethcore/light/src/types/les_request.rs
index 49bd2e9cc6..2c7bfb380f 100644
--- a/ethcore/light/src/types/les_request.rs
+++ b/ethcore/light/src/types/les_request.rs
@@ -18,15 +18,34 @@
 
 use util::H256;
 
+/// Either a hash or a number.
+#[derive(Debug, Clone, PartialEq, Eq)]
+#[cfg_attr(feature = "ipc", derive(Binary))]
+pub enum HashOrNumber {
+	/// Block hash variant.
+	Hash(H256),
+	/// Block number variant.
+	Number(u64),
+}
+
+impl From<H256> for HashOrNumber {
+	fn from(hash: H256) -> Self {
+		HashOrNumber::Hash(hash)
+	}
+}
+
+impl From<u64> for HashOrNumber {
+	fn from(num: u64) -> Self {
+		HashOrNumber::Number(num)
+	}
+}
+
 /// A request for block headers.
 #[derive(Debug, Clone, PartialEq, Eq)]
 #[cfg_attr(feature = "ipc", derive(Binary))]
 pub struct Headers {
-	/// Starting block number
-	pub block_num: u64,
-	/// Starting block hash. This and number could be combined but IPC codegen is
-	/// not robust enough to support it.
-	pub block_hash: H256,
+	/// Starting block number or hash.
+	pub start: HashOrNumber,
 	/// The maximum amount of headers which can be returned.
 	pub max: usize,
 	/// The amount of headers to skip between each response entry.
-- 
GitLab


From 13509a9e83d384363a0762e0fa339ed0c12db576 Mon Sep 17 00:00:00 2001
From: Nicolas Gotchac <ngotchac@gmail.com>
Date: Sun, 11 Dec 2016 16:49:38 +0100
Subject: [PATCH 32/64] Fix padding in App, again... (#3813)

---
 js/src/views/Application/application.css | 3 +++
 js/src/views/Application/application.js  | 6 +++++-
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/js/src/views/Application/application.css b/js/src/views/Application/application.css
index 4ce748a30f..e6f97f1052 100644
--- a/js/src/views/Application/application.css
+++ b/js/src/views/Application/application.css
@@ -19,5 +19,8 @@
   display: flex;
   flex-direction: column;
   min-height: 100vh;
+}
+
+.content {
   padding-bottom: 1em;
 }
diff --git a/js/src/views/Application/application.js b/js/src/views/Application/application.js
index 830a44f6c9..d954849701 100644
--- a/js/src/views/Application/application.js
+++ b/js/src/views/Application/application.js
@@ -30,6 +30,8 @@ import Status from './Status';
 import Store from './store';
 import TabBar from './TabBar';
 
+import styles from './application.css';
+
 const inFrame = window.parent !== window && window.parent.frames.length !== 0;
 
 @observer
@@ -79,7 +81,9 @@ class Application extends Component {
           netChain={ netChain }
           isTest={ isTest }
           pending={ pending } />
-        { children }
+        <div className={ styles.content }>
+          { children }
+        </div>
         { blockNumber ? (<Status />) : null }
         <Snackbar />
       </Container>
-- 
GitLab


From 839e3385dd30552b14fac1ad6e389e86edb7b348 Mon Sep 17 00:00:00 2001
From: GitLab Build Bot <jaco+gitlab@ethcore.io>
Date: Sun, 11 Dec 2016 16:00:49 +0000
Subject: [PATCH 33/64] [ci skip] js-precompiled 20161211-155716

---
 Cargo.lock      | 2 +-
 js/package.json | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index cae9d6744d..fcf12f1f6a 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1290,7 +1290,7 @@ dependencies = [
 [[package]]
 name = "parity-ui-precompiled"
 version = "1.4.0"
-source = "git+https://github.com/ethcore/js-precompiled.git#3e04f32403aab917a149d54f4191263f1c79f5ce"
+source = "git+https://github.com/ethcore/js-precompiled.git#e1c4592ba60727af643c54941bf97f63cd9b5737"
 dependencies = [
  "parity-dapps-glue 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
diff --git a/js/package.json b/js/package.json
index 577ec6f145..9f8eabc2c1 100644
--- a/js/package.json
+++ b/js/package.json
@@ -1,6 +1,6 @@
 {
   "name": "parity.js",
-  "version": "0.2.111",
+  "version": "0.2.112",
   "main": "release/index.js",
   "jsnext:main": "src/index.js",
   "author": "Parity Team <admin@parity.io>",
-- 
GitLab


From 885d6eaa4d7c4b99f4233e42a1fec85a3f685927 Mon Sep 17 00:00:00 2001
From: Jaco Greeff <jacogr@gmail.com>
Date: Sun, 11 Dec 2016 17:42:35 +0100
Subject: [PATCH 34/64] i18n string dictionaries (#3532)

* TabBar & Settings -> Views i18n enabled

* Proxy i18n

* Settings i18n

* defaultLocale

* Introduce thin Translate wrapper

* PropTypes util caters for multiples

* Translate & LanguageSelector under ui

* Update location & proptypes

* Add UI Language selector

* German settings pages

* Add German language selection

* Corrected umlaut encoding

* Lint

* Re-apply pre-merge conflict changes

* better German i18n

* Language names in locale language

* i8n -> index

* Allow for development/production operation

* Use Yahoo react-intl (as opposed to react-i18nify)

* Use default messages wih expansions

* Remove non-reused variable definitions

* Use FormattedMessage directly, opens up WebPack & Babel opportunities

* Add flat to flatten

* Extract default messages via babel

* Webpack to aggegrate i18n defaultMessage

* Re-add react-intl after merge

* Update proptype references (merge)

* Strip down external dictionary

* i18n for dapps

* Restore tests submodule

* Allow language changes to reflect

* Style updates
---
 js/.babelrc                                   |  15 +-
 js/package.json                               |   4 +
 js/src/i18n/de/index.js                       |  21 +++
 js/src/i18n/de/settings.js                    |  96 +++++++++++
 js/src/i18n/en/index.js                       |  21 +++
 js/src/i18n/en/settings.js                    |  63 +++++++
 js/src/i18n/index.js                          |  21 +++
 js/src/i18n/languages.js                      |  20 +++
 js/src/i18n/store.js                          |  62 +++++++
 js/src/ui/ContextProvider/contextProvider.js  |  16 +-
 js/src/ui/Form/Select/select.js               |   8 +-
 js/src/ui/LanguageSelector/index.js           |  17 ++
 .../ui/LanguageSelector/languageSelector.js   |  71 ++++++++
 js/src/ui/index.js                            |   6 +-
 js/src/views/Application/TabBar/tabBar.js     | 109 ++++--------
 js/src/views/Dapps/AddDapps/AddDapps.js       |  51 +++++-
 js/src/views/Dapps/dapps.js                   |  25 ++-
 .../views/Settings/Background/background.js   |  23 ++-
 js/src/views/Settings/Parity/parity.js        |  80 +++++----
 js/src/views/Settings/Proxy/proxy.js          |  35 +++-
 js/src/views/Settings/Views/defaults.js       |  28 +---
 js/src/views/Settings/Views/views.js          | 155 ++++++++++++++----
 js/src/views/Settings/settings.js             |  25 ++-
 js/webpack/app.js                             |   9 +
 24 files changed, 784 insertions(+), 197 deletions(-)
 create mode 100644 js/src/i18n/de/index.js
 create mode 100644 js/src/i18n/de/settings.js
 create mode 100644 js/src/i18n/en/index.js
 create mode 100644 js/src/i18n/en/settings.js
 create mode 100644 js/src/i18n/index.js
 create mode 100644 js/src/i18n/languages.js
 create mode 100644 js/src/i18n/store.js
 create mode 100644 js/src/ui/LanguageSelector/index.js
 create mode 100644 js/src/ui/LanguageSelector/languageSelector.js

diff --git a/js/.babelrc b/js/.babelrc
index 9f44b6bd2d..a4f2a2006f 100644
--- a/js/.babelrc
+++ b/js/.babelrc
@@ -13,18 +13,19 @@
   "retainLines": true,
   "env": {
     "production": {
-      "plugins": ["transform-react-remove-prop-types"]
+      "plugins": [
+        "transform-react-remove-prop-types"
+      ]
     },
     "development": {
-      "plugins": ["react-hot-loader/babel"]
+      "plugins": [
+        "react-hot-loader/babel",
+        ["react-intl", { "messagesDir": "./.build/i18n/" }]
+      ]
     },
     "test": {
       "plugins": [
-        [
-          "babel-plugin-webpack-alias", {
-            "config": "webpack/test.js"
-          }
-        ]
+        ["babel-plugin-webpack-alias", { "config": "webpack/test.js" }]
       ]
     }
   }
diff --git a/js/package.json b/js/package.json
index 9f8eabc2c1..525211517a 100644
--- a/js/package.json
+++ b/js/package.json
@@ -52,6 +52,7 @@
     "babel-eslint": "7.1.1",
     "babel-loader": "6.2.8",
     "babel-plugin-lodash": "3.2.10",
+    "babel-plugin-react-intl": "2.2.0",
     "babel-plugin-transform-class-properties": "6.18.0",
     "babel-plugin-transform-decorators-legacy": "1.3.4",
     "babel-plugin-transform-object-rest-spread": "6.20.2",
@@ -111,6 +112,7 @@
     "react-addons-perf": "15.4.1",
     "react-addons-test-utils": "15.4.1",
     "react-hot-loader": "3.0.0-beta.6",
+    "react-intl-aggregate-webpack-plugin": "0.0.1",
     "rucksack-css": "0.9.1",
     "sinon": "1.17.6",
     "sinon-as-promised": "4.0.2",
@@ -133,6 +135,7 @@
     "ethereumjs-tx": "1.1.4",
     "eventemitter3": "2.0.2",
     "file-saver": "1.3.3",
+    "flat": "2.0.1",
     "format-json": "1.0.3",
     "format-number": "2.0.1",
     "geopattern": "1.2.3",
@@ -155,6 +158,7 @@
     "react-copy-to-clipboard": "4.2.3",
     "react-dom": "15.4.1",
     "react-dropzone": "3.7.3",
+    "react-intl": "2.1.5",
     "react-redux": "4.4.6",
     "react-router": "3.0.0",
     "react-router-redux": "4.0.7",
diff --git a/js/src/i18n/de/index.js b/js/src/i18n/de/index.js
new file mode 100644
index 0000000000..d8c0f9b4b2
--- /dev/null
+++ b/js/src/i18n/de/index.js
@@ -0,0 +1,21 @@
+// Copyright 2015, 2016 Ethcore (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 settings from './settings';
+
+export default {
+  settings
+};
diff --git a/js/src/i18n/de/settings.js b/js/src/i18n/de/settings.js
new file mode 100644
index 0000000000..9142ff9c7d
--- /dev/null
+++ b/js/src/i18n/de/settings.js
@@ -0,0 +1,96 @@
+// Copyright 2015, 2016 Ethcore (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/>.
+
+export default {
+  label: 'Einstellungen',
+
+  background: {
+    label: 'Hintergrund',
+
+    overview_0: 'Dein Hintergrundmuster ist einzigartig und beruht auf deiner Parity-Installation. Es ändert sich immer dann, wenn du ein neues Signer-Token erstellst. So können dezentrale Applicationen keine Vertrauenswürdigkeit vortäuschen.',
+    overview_1: 'Such dir ein Muster aus und merke es dir. Dieses Muster wird dir von nun an immer angezeigt, es sei denn du löschst deinen Browser-Cache oder benutzt ein neues Signer-Token.',
+
+    button_more: 'weitere generieren'
+  },
+
+  parity: {
+    label: 'Parity',
+
+    overview_0: 'Diese Einstellungen verändern das Verhalten deines Parity-Knotens.',
+
+    languages: {
+      label: 'Anzeigesprache',
+      hint: 'Die Sprache, in der dir diese Obefläche angezeigt wird'
+    },
+
+    modes: {
+      label: 'Betriebsmodus',
+      hint: 'Der Synchronisations-Modus deines Parity-Knotens',
+
+      mode_active: 'Parity synchronisiert kontinuierlich die Blockchain',
+      mode_passive: 'Parity synchronisiert zu Beginn, schläft dann und wacht regelmäßig zum Synchronisieren auf',
+      mode_dark: 'Parity synchronisiert nur falls erforderlich, etwa wenn es aus der Ferne aufgerufen wird',
+      mode_offline: 'Parity synchronisiert nicht'
+    }
+  },
+
+  proxy: {
+    label: 'Proxy',
+
+    overview_0: 'Die Proxy-Einstellungen ermöglichen dir einen einfachen Zugriff über einprägsame Adressen, auf die Oberfläche mit all ihren dezentralen Anwendungen.',
+
+    details_0: 'Anstelle des Zugriffs über IP-Adresse und Port wirst du über die .parity-Subdomain auf die Parity-Oberfläche zugreifen können, indem du {homeProxy} besuchst. Dafür musst du folgenden Eintrag in den Proxy-Einstellungen deines Browsers hinzufügen:',
+    details_1: 'Hier findest du Anleitungen zum Anpassen der Proxy-Einstellungen in {windowsLink}, {macOSLink} oder {ubuntuLink}.'
+  },
+
+  views: {
+    label: 'Ansicht',
+
+    overview_0: 'Hier kannst du entscheiden, welche Teile der Parity-Oberfläche dir angezeigt werden sollen.',
+    overview_1: 'Benutzt du Parity ganz normal? Die Standardeinstellungen sind gleichermaßen für Einsteigende als auch für Fortgeschrittene gedacht.',
+    overview_2: 'Entwickelst du mit Parity? Füge zum Beispiel den Reiter "Contracts" zu deiner Ansicht hinzu.',
+    overview_3: 'Bist du Miner oder betreibst du einen großen Knoten? Füge den Reiter "Status" hinzu, um alle Information über den Betrieb deines Knotens im Blick zu halten.',
+
+    accounts: {
+      label: 'Konten',
+      description: 'Eine Liste aller Konten, die mit dieser Parity-Installation verbunden sind. Sende Transaktionen, empfange eingehende Beträge, verwalte deine Kontostände oder lade deine Konten auf.'
+    },
+    addresses: {
+      label: 'Adressbuch',
+      description: 'Eine Liste all deiner Kontakte und der Adressen, die von dieser Parity-Installation verwaltet werden. Überwache Konten und gelange mit nur einem Klick zu Details deiner Transaktionen.'
+    },
+    apps: {
+      label: 'Anwendungen',
+      description: 'Dezentrale Anwendungen, die mit dem Netzwerk interagieren. Füge Anwendungen hinzu, entferne oder öffne Anwendungen.'
+    },
+    contracts: {
+      label: 'Contracts',
+      description: 'Interagiere mit Smart Contracts im Netzwerk. Diese Umgebung ist auf Fortgeschrittene mit gutem Verständnis der Fuktionsweise von Smart Contracts zugeschnitten.'
+    },
+    status: {
+      label: 'Status',
+      description: 'Schau dir an, wie sich dein Parity-Knoten schlägt. Hier findest du zum Beispiel die Anzahl der aktuellen Verbindungen zum Netzwerk, Logs deiner laufenden Instanz und (sofern konfiguriert) Details zum Mining.'
+    },
+    signer: {
+      label: 'Signer',
+      description: 'In diesem sicheren Bereich kannst du Transaktionen, die von dir oder von dezentralen Anwendungen erstellt wurden, prüfen und dann genehmigen oder ablehnen.'
+    },
+    settings: {
+      label: 'Einstellungen',
+      description: 'Diese Seite. Pass die Parity-Oberfläche nach deinen Wünschen an.'
+    }
+  }
+};
diff --git a/js/src/i18n/en/index.js b/js/src/i18n/en/index.js
new file mode 100644
index 0000000000..d8c0f9b4b2
--- /dev/null
+++ b/js/src/i18n/en/index.js
@@ -0,0 +1,21 @@
+// Copyright 2015, 2016 Ethcore (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 settings from './settings';
+
+export default {
+  settings
+};
diff --git a/js/src/i18n/en/settings.js b/js/src/i18n/en/settings.js
new file mode 100644
index 0000000000..a0e7c7f1f6
--- /dev/null
+++ b/js/src/i18n/en/settings.js
@@ -0,0 +1,63 @@
+// Copyright 2015, 2016 Ethcore (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/>.
+
+export default {
+  label: 'settings',
+
+  background: {
+    label: 'background'
+  },
+
+  parity: {
+    label: 'parity'
+  },
+
+  proxy: {
+    label: 'proxy'
+  },
+
+  views: {
+    label: 'views',
+
+    accounts: {
+      label: 'Accounts'
+    },
+
+    addresses: {
+      label: 'Addressbook'
+    },
+
+    apps: {
+      label: 'Applications'
+    },
+
+    contracts: {
+      label: 'Contracts'
+    },
+
+    status: {
+      label: 'Status'
+    },
+
+    signer: {
+      label: 'Signer'
+    },
+
+    settings: {
+      label: 'Settings'
+    }
+  }
+};
diff --git a/js/src/i18n/index.js b/js/src/i18n/index.js
new file mode 100644
index 0000000000..4ed119c902
--- /dev/null
+++ b/js/src/i18n/index.js
@@ -0,0 +1,21 @@
+// Copyright 2015, 2016 Ethcore (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 LocaleStore from './store';
+
+export {
+  LocaleStore
+};
diff --git a/js/src/i18n/languages.js b/js/src/i18n/languages.js
new file mode 100644
index 0000000000..f4950e4013
--- /dev/null
+++ b/js/src/i18n/languages.js
@@ -0,0 +1,20 @@
+// Copyright 2015, 2016 Ethcore (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/>.
+
+export default {
+  de: 'Deutsch',
+  en: 'English'
+};
diff --git a/js/src/i18n/store.js b/js/src/i18n/store.js
new file mode 100644
index 0000000000..f171497e4a
--- /dev/null
+++ b/js/src/i18n/store.js
@@ -0,0 +1,62 @@
+// Copyright 2015, 2016 Ethcore (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 flatten from 'flat';
+import { action, observable, transaction } from 'mobx';
+import { addLocaleData } from 'react-intl';
+import de from 'react-intl/locale-data/de';
+import en from 'react-intl/locale-data/en';
+
+import languages from './languages';
+import deMessages from './de';
+import enMessages from './en';
+
+let instance = null;
+const isProduction = process.env.NODE_ENV === 'production';
+
+const DEFAULT = 'en';
+const LANGUAGES = flatten({ languages });
+const MESSAGES = {
+  de: Object.assign(flatten(deMessages), LANGUAGES),
+  en: Object.assign(flatten(enMessages), LANGUAGES)
+};
+const LOCALES = isProduction
+  ? ['en']
+  : ['en', 'de'];
+
+addLocaleData([...de, ...en]);
+
+export default class Store {
+  @observable locale = DEFAULT;
+  @observable locales = LOCALES;
+  @observable messages = MESSAGES[DEFAULT];
+  @observable isDevelopment = !isProduction;
+
+  @action setLocale (locale) {
+    transaction(() => {
+      this.locale = locale;
+      this.messages = MESSAGES[locale];
+    });
+  }
+
+  static get () {
+    if (!instance) {
+      instance = new Store();
+    }
+
+    return instance;
+  }
+}
diff --git a/js/src/ui/ContextProvider/contextProvider.js b/js/src/ui/ContextProvider/contextProvider.js
index 7af6d342e8..543730c403 100644
--- a/js/src/ui/ContextProvider/contextProvider.js
+++ b/js/src/ui/ContextProvider/contextProvider.js
@@ -14,8 +14,13 @@
 // You should have received a copy of the GNU General Public License
 // along with Parity.  If not, see <http://www.gnu.org/licenses/>.
 
-import { Component, PropTypes } from 'react';
+import React, { Component, PropTypes } from 'react';
+import { IntlProvider } from 'react-intl';
+import { observer } from 'mobx-react';
 
+import { LocaleStore } from '../../i18n';
+
+@observer
 export default class ContextProvider extends Component {
   static propTypes = {
     api: PropTypes.object.isRequired,
@@ -30,10 +35,17 @@ export default class ContextProvider extends Component {
     store: PropTypes.object
   }
 
+  localeStore = LocaleStore.get();
+
   render () {
     const { children } = this.props;
+    const { locale, messages } = this.localeStore;
 
-    return children;
+    return (
+      <IntlProvider locale={ locale } messages={ messages }>
+        { children }
+      </IntlProvider>
+    );
   }
 
   getChildContext () {
diff --git a/js/src/ui/Form/Select/select.js b/js/src/ui/Form/Select/select.js
index cb879e3f7d..b966f483c0 100644
--- a/js/src/ui/Form/Select/select.js
+++ b/js/src/ui/Form/Select/select.js
@@ -17,6 +17,8 @@
 import React, { Component, PropTypes } from 'react';
 import { SelectField } from 'material-ui';
 
+import { nodeOrStringProptype } from '~/util/proptypes';
+
 // TODO: duplicated in Input
 const UNDERLINE_DISABLED = {
   borderColor: 'rgba(255, 255, 255, 0.298039)' // 'transparent' // 'rgba(255, 255, 255, 0.298039)'
@@ -33,9 +35,9 @@ export default class Select extends Component {
     children: PropTypes.node,
     className: PropTypes.string,
     disabled: PropTypes.bool,
-    error: PropTypes.string,
-    hint: PropTypes.string,
-    label: PropTypes.string,
+    error: nodeOrStringProptype(),
+    hint: nodeOrStringProptype(),
+    label: nodeOrStringProptype(),
     onBlur: PropTypes.func,
     onChange: PropTypes.func,
     onKeyDown: PropTypes.func,
diff --git a/js/src/ui/LanguageSelector/index.js b/js/src/ui/LanguageSelector/index.js
new file mode 100644
index 0000000000..772167d14f
--- /dev/null
+++ b/js/src/ui/LanguageSelector/index.js
@@ -0,0 +1,17 @@
+// Copyright 2015, 2016 Ethcore (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/>.
+
+export default from './languageSelector';
diff --git a/js/src/ui/LanguageSelector/languageSelector.js b/js/src/ui/LanguageSelector/languageSelector.js
new file mode 100644
index 0000000000..db89495103
--- /dev/null
+++ b/js/src/ui/LanguageSelector/languageSelector.js
@@ -0,0 +1,71 @@
+// Copyright 2015, 2016 Ethcore (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 React, { Component } from 'react';
+import { FormattedMessage } from 'react-intl';
+import { MenuItem } from 'material-ui';
+import { observer } from 'mobx-react';
+
+import Select from '../Form/Select';
+import { LocaleStore } from '../../i18n';
+
+@observer
+export default class LanguageSelector extends Component {
+  store = LocaleStore.get();
+
+  render () {
+    if (!this.store.isDevelopment) {
+      return null;
+    }
+
+    return (
+      <Select
+        hint={
+          <FormattedMessage
+            id='settings.parity.languages.hint'
+            defaultMessage='the language this interface is displayed with' />
+        }
+        label={
+          <FormattedMessage
+            id='settings.parity.languages.label'
+            defaultMessage='UI language' />
+        }
+        value={ this.store.locale }
+        onChange={ this.onChange }>
+        { this.renderOptions() }
+      </Select>
+    );
+  }
+
+  renderOptions () {
+    return this.store.locales.map((locale) => {
+      const label = <FormattedMessage id={ `languages.${locale}` } />;
+
+      return (
+        <MenuItem
+          key={ locale }
+          value={ locale }
+          label={ label }>
+          { label }
+        </MenuItem>
+      );
+    });
+  }
+
+  onChange = (event, index, locale) => {
+    this.store.setLocale(locale);
+  }
+}
diff --git a/js/src/ui/index.js b/js/src/ui/index.js
index c5a965458e..7cf3e7ee57 100644
--- a/js/src/ui/index.js
+++ b/js/src/ui/index.js
@@ -34,6 +34,7 @@ import Form, { AddressSelect, FormWrap, TypedInput, Input, InputAddress, InputAd
 import GasPriceEditor from './GasPriceEditor';
 import IdentityIcon from './IdentityIcon';
 import IdentityName from './IdentityName';
+import LanguageSelector from './LanguageSelector';
 import Loading from './Loading';
 import MethodDecoding from './MethodDecoding';
 import Modal, { Busy as BusyStep, Completed as CompletedStep } from './Modal';
@@ -74,10 +75,10 @@ export {
   InputAddressSelect,
   InputChip,
   InputInline,
-  Loading,
-  Select,
   IdentityIcon,
   IdentityName,
+  LanguageSelector,
+  Loading,
   MethodDecoding,
   Modal,
   BusyStep,
@@ -87,6 +88,7 @@ export {
   ParityBackground,
   RadioButtons,
   ShortenedHash,
+  Select,
   SignerIcon,
   Tags,
   Tooltip,
diff --git a/js/src/views/Application/TabBar/tabBar.js b/js/src/views/Application/TabBar/tabBar.js
index 63f569f1ff..ad2bfb7790 100644
--- a/js/src/views/Application/TabBar/tabBar.js
+++ b/js/src/views/Application/TabBar/tabBar.js
@@ -15,6 +15,7 @@
 // along with Parity.  If not, see <http://www.gnu.org/licenses/>.
 
 import React, { Component, PropTypes } from 'react';
+import { FormattedMessage } from 'react-intl';
 import { connect } from 'react-redux';
 import { Link } from 'react-router';
 import { Toolbar, ToolbarGroup } from 'material-ui/Toolbar';
@@ -23,85 +24,57 @@ import { isEqual } from 'lodash';
 
 import { Badge, Tooltip } from '~/ui';
 
+import imagesEthcoreBlock from '~/../assets/images/parity-logo-white-no-text.svg';
+
 import styles from './tabBar.css';
-import imagesEthcoreBlock from '../../../../assets/images/parity-logo-white-no-text.svg';
 
 class Tab extends Component {
   static propTypes = {
-    view: PropTypes.object,
     children: PropTypes.node,
-    pendings: PropTypes.number
+    pendings: PropTypes.number,
+    view: PropTypes.object
   };
 
-  shouldComponentUpdate (nextProps) {
-    return (nextProps.view.id === 'signer' && nextProps.pendings !== this.props.pendings);
-  }
-
   render () {
     const { view, children } = this.props;
 
-    const label = this.getLabel(view);
-
     return (
       <MUITab
         icon={ view.icon }
-        label={ label }
-      >
+        label={
+          view.id === 'signer'
+            ? this.renderSignerLabel(view.id)
+            : this.renderLabel(view.id)
+        }>
         { children }
       </MUITab>
     );
   }
 
-  getLabel (view) {
-    const { label } = view;
-
-    if (view.id === 'signer') {
-      return this.renderSignerLabel(label);
-    }
-
-    if (view.id === 'status') {
-      return this.renderStatusLabel(label);
-    }
-
-    return this.renderLabel(label);
-  }
-
-  renderLabel (name, bubble) {
+  renderLabel (id, bubble) {
     return (
       <div className={ styles.label }>
-        { name }
+        <FormattedMessage
+          id={ `settings.views.${id}.label` } />
         { bubble }
       </div>
     );
   }
 
-  renderSignerLabel (label) {
+  renderSignerLabel (id) {
     const { pendings } = this.props;
+    let bubble;
 
     if (pendings) {
-      const bubble = (
+      bubble = (
         <Badge
           color='red'
           className={ styles.labelBubble }
           value={ pendings } />
       );
-
-      return this.renderLabel(label, bubble);
     }
 
-    return this.renderLabel(label);
-  }
-
-  renderStatusLabel (label) {
-    // const { isTest, netChain } = this.props;
-    // const bubble = (
-    //   <Badge
-    //     color={ isTest ? 'red' : 'default' }
-    //     className={ styles.labelBubble }
-    //     value={ isTest ? 'TEST' : netChain } />
-    //   );
-
-    return this.renderLabel(label, null);
+    return this.renderLabel(id, bubble);
   }
 }
 
@@ -111,28 +84,19 @@ class TabBar extends Component {
   };
 
   static propTypes = {
-    views: PropTypes.array.isRequired,
-    pending: PropTypes.array,
     isTest: PropTypes.bool,
-    netChain: PropTypes.string
+    netChain: PropTypes.string,
+    pending: PropTypes.array,
+    views: PropTypes.array.isRequired
   };
 
   static defaultProps = {
     pending: []
   };
 
-  shouldComponentUpdate (nextProps, nextState) {
-    const prevViews = this.props.views.map((v) => v.id).sort();
-    const nextViews = nextProps.views.map((v) => v.id).sort();
-
-    return (nextProps.pending.length !== this.props.pending.length) ||
-      (!isEqual(prevViews, nextViews));
-  }
-
   render () {
     return (
-      <Toolbar
-        className={ styles.toolbar }>
+      <Toolbar className={ styles.toolbar }>
         { this.renderLogo() }
         { this.renderTabs() }
         { this.renderLast() }
@@ -167,21 +131,20 @@ class TabBar extends Component {
       .map((view, index) => {
         const body = (view.id === 'accounts')
           ? (
-            <Tooltip className={ styles.tabbarTooltip } text='navigate between the different parts and views of the application, switching between an account view, token view and distributed application view' />
+            <Tooltip
+              className={ styles.tabbarTooltip }
+              text='navigate between the different parts and views of the application, switching between an account view, token view and distributed application view' />
           )
           : null;
 
         return (
           <Link
-            key={ view.id }
-            to={ view.route }
             activeClassName={ styles.tabactive }
-            className={ styles.tabLink }
-          >
+            className={ styles.tabLink }key={ view.id }
+            to={ view.route }>
             <Tab
-              view={ view }
               pendings={ pending.length }
-            >
+              view={ view }>
               { body }
             </Tab>
           </Link>
@@ -203,11 +166,10 @@ function mapStateToProps (initState) {
     .keys(views)
     .filter((id) => views[id].fixed || views[id].active);
 
-  let filteredViews = filteredViewIds
-    .map((id) => ({
-      ...views[id],
-      id
-    }));
+  let filteredViews = filteredViewIds.map((id) => ({
+    ...views[id],
+    id
+  }));
 
   return (state) => {
     const { views } = state.settings;
@@ -221,11 +183,10 @@ function mapStateToProps (initState) {
     }
 
     filteredViewIds = viewIds;
-    filteredViews = viewIds
-      .map((id) => ({
-        ...views[id],
-        id
-      }));
+    filteredViews = viewIds.map((id) => ({
+      ...views[id],
+      id
+    }));
 
     return { views: filteredViews };
   };
diff --git a/js/src/views/Dapps/AddDapps/AddDapps.js b/js/src/views/Dapps/AddDapps/AddDapps.js
index 71d03dc50b..d3876998af 100644
--- a/js/src/views/Dapps/AddDapps/AddDapps.js
+++ b/js/src/views/Dapps/AddDapps/AddDapps.js
@@ -15,6 +15,7 @@
 // along with Parity.  If not, see <http://www.gnu.org/licenses/>.
 
 import React, { Component, PropTypes } from 'react';
+import { FormattedMessage } from 'react-intl';
 import { observer } from 'mobx-react';
 import DoneIcon from 'material-ui/svg-icons/action/done';
 import { List, ListItem } from 'material-ui/List';
@@ -39,22 +40,56 @@ export default class AddDapps extends Component {
 
     return (
       <Modal
+        visible
         compact
-        title='visible applications'
+        title={
+          <FormattedMessage
+            id='dapps.add.label'
+            defaultMessage='visible applications' />
+        }
         actions={ [
           <Button
-            label={ 'Done' }
+            label={
+              <FormattedMessage
+                id='dapps.add.button.done'
+                defaultMessage='Done' />
+            }
             key='done'
             onClick={ store.closeModal }
             icon={ <DoneIcon /> }
           />
-        ] }
-        visible
-      >
+        ] }>
         <div className={ styles.warning } />
-        { this.renderList(store.sortedLocal, 'Applications locally available', 'All applications installed locally on the machine by the user for access by the Parity client.') }
-        { this.renderList(store.sortedBuiltin, 'Applications bundled with Parity', 'Experimental applications developed by the Parity team to show off dapp capabilities, integration, experimental features and to control certain network-wide client behaviour.') }
-        { this.renderList(store.sortedNetwork, 'Applications on the global network', 'These applications are not affiliated with Parity nor are they published by Parity. Each remain under the control of their respective authors. Please ensure that you understand the goals for each application before interacting.') }
+        {
+          this.renderList(store.sortedLocal,
+            <FormattedMessage
+              id='dapps.add.local.label'
+              defaultMessage='Applications locally available' />,
+            <FormattedMessage
+              id='dapps.add.local.desc'
+              defaultMessage='All applications installed locally on the machine by the user for access by the Parity client.' />
+          )
+        }
+        {
+          this.renderList(store.sortedBuiltin,
+            <FormattedMessage
+              id='dapps.add.builtin.label'
+              defaultMessage='Applications bundled with Parity' />,
+            <FormattedMessage
+              id='dapps.add.builtin.desc'
+              defaultMessage='Experimental applications developed by the Parity team to show off dapp capabilities, integration, experimental features and to control certain network-wide client behaviour.' />
+          )
+        }
+        {
+          this.renderList(store.sortedNetwork,
+            <FormattedMessage
+              id='dapps.add.network.label'
+              defaultMessage='Applications on the global network' />,
+            <FormattedMessage
+              id='dapps.add.network.desc'
+              defaultMessage='These applications are not affiliated with Parity nor are they published by Parity. Each remain under the control of their respective authors. Please ensure that you understand the goals for each application before interacting.' />
+          )
+        }
       </Modal>
     );
   }
diff --git a/js/src/views/Dapps/dapps.js b/js/src/views/Dapps/dapps.js
index b0b731b932..160bb44b03 100644
--- a/js/src/views/Dapps/dapps.js
+++ b/js/src/views/Dapps/dapps.js
@@ -15,6 +15,7 @@
 // along with Parity.  If not, see <http://www.gnu.org/licenses/>.
 
 import React, { Component, PropTypes } from 'react';
+import { FormattedMessage } from 'react-intl';
 import { Checkbox } from 'material-ui';
 import { observer } from 'mobx-react';
 
@@ -43,11 +44,19 @@ export default class Dapps extends Component {
       externalOverlay = (
         <div className={ styles.overlay }>
           <div className={ styles.body }>
-            <div>Applications made available on the network by 3rd-party authors are not affiliated with Parity nor are they published by Parity. Each remain under the control of their respective authors. Please ensure that you understand the goals for each before interacting.</div>
+            <div>
+              <FormattedMessage
+                id='dapps.external.warning'
+                defaultMessage='Applications made available on the network by 3rd-party authors are not affiliated with Parity nor are they published by Parity. Each remain under the control of their respective authors. Please ensure that you understand the goals for each before interacting.' />
+            </div>
             <div>
               <Checkbox
                 className={ styles.accept }
-                label='I understand that these applications are not affiliated with Parity'
+                label={
+                  <FormattedMessage
+                    id='dapps.external.accept'
+                    defaultMessage='I understand that these applications are not affiliated with Parity' />
+                }
                 checked={ false }
                 onCheck={ this.onClickAcceptExternal } />
             </div>
@@ -61,10 +70,18 @@ export default class Dapps extends Component {
         <AddDapps store={ this.store } />
         <Actionbar
           className={ styles.toolbar }
-          title='Decentralized Applications'
+          title={
+            <FormattedMessage
+              id='dapps.label'
+              defaultMessage='Decentralized Applications' />
+          }
           buttons={ [
             <FlatButton
-              label='edit'
+              label={
+                <FormattedMessage
+                  id='dapps.button.edit'
+                  defaultMessage='edit' />
+              }
               key='edit'
               icon={ <EyeIcon /> }
               onTouchTap={ this.store.openModal }
diff --git a/js/src/views/Settings/Background/background.js b/js/src/views/Settings/Background/background.js
index 0551a6145b..add58d820a 100644
--- a/js/src/views/Settings/Background/background.js
+++ b/js/src/views/Settings/Background/background.js
@@ -15,6 +15,7 @@
 // along with Parity.  If not, see <http://www.gnu.org/licenses/>.
 
 import React, { Component, PropTypes } from 'react';
+import { FormattedMessage } from 'react-intl';
 import { connect } from 'react-redux';
 import { bindActionCreators } from 'redux';
 import NavigationRefresh from 'material-ui/svg-icons/navigation/refresh';
@@ -55,15 +56,29 @@ class Background extends Component {
 
   render () {
     return (
-      <Container title='Background Pattern'>
+      <Container title={
+        <FormattedMessage id='settings.background.label' />
+      }>
         <div className={ layout.layout }>
           <div className={ layout.overview }>
-            <div>The background pattern you can see right now is unique to your Parity installation. It will change every time you create a new Signer token. This is so that decentralized applications cannot pretend to be trustworthy.</div>
-            <div>Pick a pattern you like and memorize it. This Pattern will always be shown from now on, unless you clear your browser cache or use a new Signer token.</div>
+            <div>
+              <FormattedMessage
+                id='settings.background.overview_0'
+                defaultMessage='The background pattern you can see right now is unique to your Parity installation. It will change every time you create a new Signer token. This is so that decentralized applications cannot pretend to be trustworthy.' />
+            </div>
+            <div>
+              <FormattedMessage
+                id='settings.background.overview_1'
+                defaultMessage='Pick a pattern you like and memorize it. This Pattern will always be shown from now on, unless you clear your browser cache or use a new Signer token.' />
+            </div>
             <div>
               <Button
                 icon={ <NavigationRefresh /> }
-                label='generate more'
+                label={
+                  <FormattedMessage
+                    id='settings.background.button_more'
+                    defaultMessage='generate more' />
+                }
                 onClick={ this.generateSeeds } />
             </div>
           </div>
diff --git a/js/src/views/Settings/Parity/parity.js b/js/src/views/Settings/Parity/parity.js
index 1535f6cf23..29fab8bfbf 100644
--- a/js/src/views/Settings/Parity/parity.js
+++ b/js/src/views/Settings/Parity/parity.js
@@ -15,19 +15,13 @@
 // along with Parity.  If not, see <http://www.gnu.org/licenses/>.
 
 import React, { Component, PropTypes } from 'react';
+import { FormattedMessage } from 'react-intl';
 import { MenuItem } from 'material-ui';
 
-import { Select, Container } from '~/ui';
+import { Select, Container, LanguageSelector } from '~/ui';
 
 import layout from '../layout.css';
 
-const MODES = {
-  'active': 'Parity continuously syncs the chain',
-  'passive': 'Parity syncs initially, then sleeps and wakes regularly to resync',
-  'dark': 'Parity syncs only when the RPC is active',
-  'offline': 'Parity doesn\'t sync'
-};
-
 export default class Parity extends Component {
   static contextTypes = {
     api: PropTypes.object.isRequired
@@ -43,12 +37,19 @@ export default class Parity extends Component {
 
   render () {
     return (
-      <Container title='Parity'>
+      <Container title={
+        <FormattedMessage id='settings.parity.label' />
+      }>
         <div className={ layout.layout }>
           <div className={ layout.overview }>
-            <div>Control the Parity node settings and mode of operation via this interface.</div>
+            <div>
+              <FormattedMessage
+                id='settings.parity.overview_0'
+                defaultMessage='Control the Parity node settings and mode of operation via this interface.' />
+            </div>
           </div>
           <div className={ layout.details }>
+            <LanguageSelector />
             { this.renderModes() }
           </div>
         </div>
@@ -57,30 +58,53 @@ export default class Parity extends Component {
   }
 
   renderModes () {
-    const modes = Object
-      .keys(MODES)
-      .map((mode) => {
-        const description = MODES[mode];
-
-        return (
-          <MenuItem
-            key={ mode }
-            value={ mode }
-            label={ description }>
-            { description }
-          </MenuItem>
-        );
-      });
-
     const { mode } = this.state;
 
+    const renderItem = (mode, label) => {
+      return (
+        <MenuItem
+          key={ mode }
+          value={ mode }
+          label={ label }>
+          { label }
+        </MenuItem>
+      );
+    };
+
     return (
       <Select
-        label='mode of operation'
-        hint='the syning mode for the Parity node'
+        label={
+          <FormattedMessage
+            id='settings.parity.modes.label'
+            defaultMessage='mode of operation' />
+        }
+        hint={
+          <FormattedMessage
+            id='settings.parity.modes.hint'
+            defaultMessage='the syning mode for the Parity node' />
+        }
         value={ mode }
         onChange={ this.onChangeMode }>
-        { modes }
+        {
+          renderItem('active', <FormattedMessage
+            id='settings.parity.modes.mode_active'
+            defaultMessage='Parity continuously syncs the chain' />)
+        }
+        {
+          renderItem('passive', <FormattedMessage
+            id='settings.parity.modes.mode_passive'
+            defaultMessage='Parity syncs initially, then sleeps and wakes regularly to resync' />)
+        }
+        {
+          renderItem('dark', <FormattedMessage
+            id='settings.parity.modes.mode_dark'
+            defaultMessage='Parity syncs only when the RPC is active' />)
+        }
+        {
+          renderItem('offline', <FormattedMessage
+            id='settings.parity.modes.mode_offline'
+            defaultMessage="Parity doesn't sync" />)
+        }
       </Select>
     );
   }
diff --git a/js/src/views/Settings/Proxy/proxy.js b/js/src/views/Settings/Proxy/proxy.js
index cc7fad3704..45aece13bd 100644
--- a/js/src/views/Settings/Proxy/proxy.js
+++ b/js/src/views/Settings/Proxy/proxy.js
@@ -15,6 +15,7 @@
 // along with Parity.  If not, see <http://www.gnu.org/licenses/>.
 
 import React, { Component, PropTypes } from 'react';
+import { FormattedMessage } from 'react-intl';
 
 import { Container } from '~/ui';
 
@@ -31,16 +32,40 @@ export default class Proxy extends Component {
     const proxyurl = `${dappsUrl}/proxy/proxy.pac`;
 
     return (
-      <Container title='Proxy'>
+      <Container title={
+        <FormattedMessage id='settings.proxy.label' />
+      }>
         <div className={ layout.layout }>
           <div className={ layout.overview }>
-            <div>The proxy setup allows you to access Parity and all associated decentralized applications via memorable addresses.</div>
+            <div>
+              <FormattedMessage
+                id='settings.proxy.overview_0'
+                defaultMessage='The proxy setup allows you to access Parity and all associated decentralized applications via memorable addresses.' />
+            </div>
           </div>
           <div className={ layout.details }>
             <div className={ styles.details }>
-              <div>Instead of accessing Parity via the IP address and port, you will be able to access it via the .parity subdomain, by visiting <span className={ layout.console }>http://home.parity/</span>. To setup subdomain-based routing, you need to add the relevant proxy entries to your browser,</div>
-              <div className={ layout.center }><a href={ proxyurl } target='_blank'>{ proxyurl }</a></div>
-              <div>To learn how to configure the proxy, instructions are provided for <a href='https://blogs.msdn.microsoft.com/ieinternals/2013/10/11/understanding-web-proxy-configuration/' target='_blank'>Windows</a>, <a href='https://support.apple.com/kb/PH18553?locale=en_US' target='_blank'>Max OS X</a> or <a href='http://xmodulo.com/how-to-set-up-proxy-auto-config-on-ubuntu-desktop.html' target='_blank'>Ubuntu</a>.</div>
+              <div>
+                <FormattedMessage
+                  id='settings.proxy.details_0'
+                  defaultMessage='Instead of accessing Parity via the IP address and port, you will be able to access it via the .parity subdomain, by visiting {homeProxy}. To setup subdomain-based routing, you need to add the relevant proxy entries to your browser,'
+                  values={ {
+                    homeProxy: <span className={ layout.console }>http://home.parity/</span>
+                  } } />
+              </div>
+              <div className={ layout.center }>
+                <a href={ proxyurl } target='_blank'>{ proxyurl }</a>
+              </div>
+              <div>
+                <FormattedMessage
+                  id='settings.proxy.details_1'
+                  defaultMessage='To learn how to configure the proxy, instructions are provided for {windowsLink}, {macOSLink} or {ubuntuLink}.'
+                  values={ {
+                    windowsLink: <a href='https://blogs.msdn.microsoft.com/ieinternals/2013/10/11/understanding-web-proxy-configuration/' target='_blank'><FormattedMessage id='details_windows' defaultMessage='Windows' /></a>,
+                    macOSLink: <a href='https://support.apple.com/kb/PH18553?locale=en_US' target='_blank'><FormattedMessage id='settings.proxy.details_macos' defaultMessage='macOS' /></a>,
+                    ubuntuLink: <a href='http://xmodulo.com/how-to-set-up-proxy-auto-config-on-ubuntu-desktop.html' target='_blank'><FormattedMessage id='settings.proxy.details_ubuntu' defaultMessage='Ubuntu' /></a>
+                  } } />
+              </div>
             </div>
           </div>
         </div>
diff --git a/js/src/views/Settings/Views/defaults.js b/js/src/views/Settings/Views/defaults.js
index dce593d2b8..9c7971ce51 100644
--- a/js/src/views/Settings/Views/defaults.js
+++ b/js/src/views/Settings/Views/defaults.js
@@ -28,66 +28,52 @@ const defaultViews = {
     active: true,
     fixed: true,
     icon: <ActionAccountBalanceWallet />,
-    label: 'Accounts',
     route: '/accounts',
-    value: 'account',
-    description: 'A list of all the accounts associated to and imported into this Parity instance. Send transactions, receive incoming values, manage your balances and fund your accounts.'
+    value: 'account'
   },
 
   addresses: {
     active: true,
     icon: <CommunicationContacts />,
-    label: 'Addressbook',
     route: '/addresses',
-    value: 'address',
-    description: 'A list of all contacts and address book entries that is managed by this Parity instance. Watch accounts and have the details available at the click of a button when transacting.'
+    value: 'address'
   },
 
   apps: {
     active: true,
     icon: <NavigationApps />,
-    label: 'Applications',
     route: '/apps',
-    value: 'app',
-    description: 'Distributed applications that interact with the underlying network. Add applications, manage you application portfolio and interact with application from around the network.'
+    value: 'app'
   },
 
   contracts: {
     active: false,
     icon: <ImageGridOn />,
-    label: 'Contracts',
     route: '/contracts',
-    value: 'contract',
-    description: 'Watch and interact with specific contracts that have been deployed on the network. This is a more technically-focused environment, specifically for advanced users that understand the inner working of certain contracts.'
+    value: 'contract'
   },
 
   status: {
     active: false,
     icon: <ActionTrackChanges />,
-    label: 'Status',
     route: '/status',
-    value: 'status',
-    description: 'See how the Parity node is performing in terms of connections to the network, logs from the actual running instance and details of mining (if enabled and configured).'
+    value: 'status'
   },
 
   signer: {
     active: true,
     fixed: true,
     icon: <ActionFingerprint />,
-    label: 'Signer',
     route: '/signer',
-    value: 'signer',
-    description: 'The secure transaction management area of the application where you can approve any outgoing transactions made from the application as well as those placed into the queue by distributed applications.'
+    value: 'signer'
   },
 
   settings: {
     active: true,
     fixed: true,
     icon: <ActionSettings />,
-    label: 'Settings',
     route: '/settings',
-    value: 'settings',
-    description: 'This view. Allows you to customize the application in term of options, operation and look and feel.'
+    value: 'settings'
   }
 };
 
diff --git a/js/src/views/Settings/Views/views.js b/js/src/views/Settings/Views/views.js
index 2611096649..1252396877 100644
--- a/js/src/views/Settings/Views/views.js
+++ b/js/src/views/Settings/Views/views.js
@@ -15,6 +15,7 @@
 // along with Parity.  If not, see <http://www.gnu.org/licenses/>.
 
 import React, { Component, PropTypes } from 'react';
+import { FormattedMessage } from 'react-intl';
 import { connect } from 'react-redux';
 import { bindActionCreators } from 'redux';
 import { Checkbox } from 'material-ui';
@@ -34,16 +35,96 @@ class Views extends Component {
 
   render () {
     return (
-      <Container title='Views'>
+      <Container title={
+        <FormattedMessage id='settings.views.label' />
+      }>
         <div className={ layout.layout }>
           <div className={ layout.overview }>
-            <div>Manage the available application views, using only the parts of the application that is applicable to you.</div>
-            <div>Are you an end-user? The defaults are setups for both beginner and advanced users alike.</div>
-            <div>Are you a developer? Add some features to manage contracts are interact with application deployments.</div>
-            <div>Are you a miner or run a large-scale node? Add the features to give you all the information needed to watch the node operation.</div>
+            <div>
+              <FormattedMessage
+                id='settings.views.overview_0'
+                defaultMessage='Manage the available application views, using only the parts of the application that is applicable to you.' />
+            </div>
+            <div>
+              <FormattedMessage
+                id='settings.views.overview_1'
+                defaultMessage='Are you an end-user? The defaults are setups for both beginner and advanced users alike.' />
+            </div>
+            <div>
+              <FormattedMessage
+                id='settings.views.overview_2'
+                defaultMessage='Are you a developer? Add some features to manage contracts are interact with application deployments.' />
+            </div>
+            <div>
+              <FormattedMessage
+                id='settings.views.overview_3'
+                defaultMessage='Are you a miner or run a large-scale node? Add the features to give you all the information needed to watch the node operation.' />
+            </div>
           </div>
           <div className={ layout.details }>
-            { this.renderViews() }
+            {
+              this.renderView('accounts',
+                <FormattedMessage
+                  id='settings.views.accounts.label' />,
+                <FormattedMessage
+                  id='settings.views.accounts.description'
+                  defaultMessage='A list of all the accounts associated to and imported into this Parity instance. Send transactions, receive incoming values, manage your balances and fund your accounts.' />
+              )
+            }
+            {
+              this.renderView('addresses',
+                <FormattedMessage
+                  id='settings.views.addresses.label' />,
+                <FormattedMessage
+                  id='settings.views.addresses.description'
+                  defaultMessage='A list of all contacts and address book entries that is managed by this Parity instance. Watch accounts and have the details available at the click of a button when transacting.' />
+              )
+            }
+            {
+              this.renderView('apps',
+                <FormattedMessage
+                  id='settings.views.apps.label' />,
+                <FormattedMessage
+                  id='settings.views.apps.description'
+                  defaultMessage='Distributed applications that interact with the underlying network. Add applications, manage you application portfolio and interact with application from around the network.' />
+              )
+            }
+            {
+              this.renderView('contracts',
+                <FormattedMessage
+                  id='settings.views.contracts.label' />,
+                <FormattedMessage
+                  id='settings.views.contracts.description'
+                  defaultMessage='Watch and interact with specific contracts that have been deployed on the network. This is a more technically-focused environment, specifically for advanced users that understand the inner working of certain contracts.' />
+              )
+            }
+            {
+              this.renderView('status',
+                <FormattedMessage
+                  id='settings.views.status.label' />,
+                <FormattedMessage
+                  id='settings.views.status.description'
+                  defaultMessage='See how the Parity node is performing in terms of connections to the network, logs from the actual running instance and details of mining (if enabled and configured).' />
+              )
+            }
+            {
+              this.renderView('signer',
+                <FormattedMessage
+                  id='settings.views.signer.label' />,
+                <FormattedMessage
+                  id='settings.views.signer.description'
+                  defaultMessage='The secure transaction management area of the application where you can approve any outgoing transactions made from the application as well as those placed into the queue by distributed applications.' />
+              )
+            }
+            {
+              this.renderView('settings',
+                <FormattedMessage
+                  id='settings.views.settings.label' />,
+                <FormattedMessage
+                  id='settings.views.settings.description'
+                  defaultMessage='This view. Allows you to customize the application in term of options, operation and look and feel.' />
+              )
+            }
           </div>
         </div>
       </Container>
@@ -51,37 +132,45 @@ class Views extends Component {
   }
 
   renderViews () {
-    const { settings, toggleView } = this.props;
+    const { settings } = this.props;
 
     return Object.keys(settings.views).map((id) => {
-      const toggle = () => toggleView(id);
-      const view = settings.views[id];
-      const label = (
-        <div className={ styles.header }>
-          <div className={ styles.labelicon }>
-            { view.icon }
-          </div>
-          <div className={ styles.label }>
-            { view.label }
-          </div>
-        </div>
-      );
-
-      return (
-        <div className={ styles.view } key={ id }>
-          <Checkbox
-            disabled={ view.fixed }
-            label={ label }
-            onCheck={ toggle }
-            checked={ view.active }
-            value={ view.active } />
-          <div className={ styles.info }>
-            { view.description }
-          </div>
-        </div>
-      );
+      const description = <FormattedMessage id={ `settings.views.${id}.description` } />;
+      const label = <FormattedMessage id={ `settings.views.${id}.label` } />;
+
+      this.renderView(id, label, description);
     });
   }
+
+  renderView = (id, label, description) => {
+    const { settings, toggleView } = this.props;
+
+    const toggle = () => toggleView(id);
+    const view = settings.views[id];
+
+    return (
+      <div className={ styles.view } key={ id }>
+        <Checkbox
+          disabled={ view.fixed }
+          label={
+            <div className={ styles.header }>
+              <div className={ styles.labelicon }>
+                { view.icon }
+              </div>
+              <div className={ styles.label }>
+                { label }
+              </div>
+            </div>
+          }
+          onCheck={ toggle }
+          checked={ view.active }
+          value={ view.active } />
+        <div className={ styles.info }>
+          { description }
+        </div>
+      </div>
+    );
+  }
 }
 
 function mapStateToProps (state) {
diff --git a/js/src/views/Settings/settings.js b/js/src/views/Settings/settings.js
index a6c455dad7..90bec3c62b 100644
--- a/js/src/views/Settings/settings.js
+++ b/js/src/views/Settings/settings.js
@@ -15,6 +15,7 @@
 // along with Parity.  If not, see <http://www.gnu.org/licenses/>.
 
 import React, { Component, PropTypes } from 'react';
+import { FormattedMessage } from 'react-intl';
 import { Tab, Tabs } from 'material-ui';
 import ActionSettingsEthernet from 'material-ui/svg-icons/action/settings-ethernet';
 import ImageBlurOn from 'material-ui/svg-icons/image/blur-on';
@@ -46,7 +47,11 @@ export default class Settings extends Component {
 
     return (
       <div>
-        <Actionbar title='settings' className={ styles.bar }>
+        <Actionbar
+          className={ styles.bar }
+          title={
+            <FormattedMessage id='settings.label' />
+          }>
           <Tabs className={ styles.tabs } value={ hash }>
             { this.renderTab(hash, 'views', <ImageRemoveRedEye />) }
             { this.renderTab(hash, 'background', <ImageBlurOn />) }
@@ -64,12 +69,20 @@ export default class Settings extends Component {
   renderTab (hash, section, icon) {
     return (
       <Tab
-        className={ hash === section ? styles.tabactive : styles.tab }
-        value={ section }
-        key={ section }
+        className={
+          hash === section
+            ? styles.tabactive
+            : styles.tab
+        }
         icon={ icon }
-        label={ <div className={ styles.menu }>{ section }</div> }
-        onActive={ this.onActivate(section) } />
+        key={ section }
+        label={
+          <div className={ styles.menu }>
+            <FormattedMessage id={ `settings.${section}.label` } />
+          </div>
+        }
+        onActive={ this.onActivate(section) }
+        value={ section } />
     );
   }
 
diff --git a/js/webpack/app.js b/js/webpack/app.js
index a7b086b96a..e63e919698 100644
--- a/js/webpack/app.js
+++ b/js/webpack/app.js
@@ -17,6 +17,7 @@
 
 const webpack = require('webpack');
 const path = require('path');
+const ReactIntlAggregatePlugin = require('react-intl-aggregate-webpack-plugin');
 const WebpackErrorNotificationPlugin = require('webpack-error-notification');
 const CopyWebpackPlugin = require('copy-webpack-plugin');
 const HtmlWebpackPlugin = require('html-webpack-plugin');
@@ -163,7 +164,15 @@ module.exports = {
     }));
 
     if (!isProd) {
+      const DEST_I18N = path.join(__dirname, '..', DEST, 'i18n');
+
       plugins.push(
+        new ReactIntlAggregatePlugin({
+          messagesPattern: DEST_I18N + '/src/**/*.json',
+          aggregateOutputDir: DEST_I18N + '/i18n/',
+          aggregateFilename: 'en'
+        }),
+
         new webpack.optimize.CommonsChunkPlugin({
           filename: 'commons.[hash:10].js',
           name: 'commons',
-- 
GitLab


From 929b6ee0f7165dfa77eb9e237d81d286bc5bcebe Mon Sep 17 00:00:00 2001
From: Jaco Greeff <jacogr@gmail.com>
Date: Sun, 11 Dec 2016 17:43:51 +0100
Subject: [PATCH 35/64] Allow editing of gasPrice & gas in Signer (#3777)

* Rework gas display (maintainable)

* Move GasPriceSelector to ui

* Allow opening of gas component (WIP)

* Merge

* Consistency

* Adjust for Signer display

* Set maximum height based on screen size

* Gas editor displays in-place

* Cleanups

* Merge

* Style fixes

* Fixup stash mishap (again)

* Add store test

* Allow edited values to refrect on the display

* Fix properties

* Adjust styling to show different rows

* git mv

* git mv

* Style fixes

* Style updates

* Pass gas & gasPrice with confirmation

* Fix build (case)

* Style fixes

* Basic GasPriceEditor smoketest

* manual move 1

* manual move 2

* manual move 1

* manual move 2

* NODE_ENV=test ace fix

* UI smoketests

* Style

* Format options via formatter

* Initial version

* Re-add even/odd class

* re-add gasLimit to embedded passing

* style

* Updated for passing gas & price to store

* Allow gas/price overrides when none available

* Fix slider value, pass as number
---
 js/src/api/rpc/signer/signer.js               |   4 +-
 .../modals/ExecuteContract/executeContract.js |   2 +-
 js/src/modals/Transfer/store.js               |   2 +-
 js/src/modals/Transfer/transfer.js            |   9 +-
 js/src/redux/providers/signerMiddleware.js    |   6 +-
 js/src/ui/Editor/mode-solidity.js             |   6 +
 .../GasPriceSelector/gasPriceSelector.js      | 556 ------------------
 js/src/ui/GasPriceEditor/gasPriceEditor.css   |  10 +-
 js/src/ui/GasPriceEditor/gasPriceEditor.js    |  52 +-
 .../ui/GasPriceEditor/gasPriceEditor.spec.js  |  45 ++
 js/src/ui/GasPriceEditor/store.js             |  80 ++-
 js/src/ui/GasPriceEditor/store.spec.js        | 197 +++++++
 .../GasPriceSelector/CustomBar/customBar.js   |  77 +++
 js/src/ui/GasPriceSelector/CustomBar/index.js |  17 +
 .../CustomCursor/customCursor.js              |  73 +++
 .../ui/GasPriceSelector/CustomCursor/index.js |  17 +
 .../CustomShape/customShape.js                |  52 ++
 .../ui/GasPriceSelector/CustomShape/index.js  |  17 +
 .../CustomTooltip/customTooltip.js            |  53 ++
 .../GasPriceSelector/CustomTooltip/index.js   |  17 +
 .../GasPriceSelector/gasPriceSelector.css     |   6 +-
 .../ui/GasPriceSelector/gasPriceSelector.js   | 341 +++++++++++
 .../GasPriceSelector/index.js                 |   0
 js/src/ui/GasPriceSelector/util.js            |  34 ++
 js/src/ui/index.js                            |   2 +
 js/src/views/ParityBar/parityBar.css          |   2 +-
 .../{AccountLink.css => accountLink.css}      |   0
 .../{AccountLink.js => accountLink.js}        |   2 +-
 .../components/Account/AccountLink/index.js   |   2 +-
 .../Account/{Account.css => account.css}      |   0
 .../Account/{Account.js => account.js}        |   2 +-
 .../views/Signer/components/Account/index.js  |   2 +-
 .../RequestPending/requestPending.js          |  48 +-
 .../Signer/components/SignRequest/index.js    |   2 +-
 .../{SignRequest.css => signRequest.css}      |   0
 .../{SignRequest.js => signRequest.js}        |   4 +-
 .../SignRequest/signRequest.spec.js           |  34 ++
 .../TransactionMainDetails/index.js           |   2 +-
 ...Details.css => transactionMainDetails.css} |  30 +-
 ...inDetails.js => transactionMainDetails.js} | 114 ++--
 .../components/TransactionPending/index.js    |   2 +-
 ...tionPending.css => transactionPending.css} |   6 +-
 ...actionPending.js => transactionPending.js} | 111 ++--
 .../TransactionPendingFormConfirm/index.js    |   2 +-
 ....css => transactionPendingFormConfirm.css} |   0
 ...rm.js => transactionPendingFormConfirm.js} |  85 +--
 .../TransactionPendingFormReject/index.js     |   2 +-
 ...t.css => transactionPendingFormReject.css} |   0
 ...ect.js => transactionPendingFormReject.js} |   2 +-
 .../TransactionPendingForm/index.js           |   2 +-
 ...ingForm.css => transactionPendingForm.css} |   0
 ...ndingForm.js => transactionPendingForm.js} |  18 +-
 .../Signer/components/TxHashLink/index.js     |   2 +-
 .../{TxHashLink.js => txHashLink.js}          |  13 +-
 .../Signer/containers/Embedded/embedded.css   |  18 +-
 .../Signer/containers/Embedded/embedded.js    |  33 +-
 .../Signer/containers/RequestsPage/index.js   |   2 +-
 .../{RequestsPage.css => requestsPage.css}    |   6 +
 .../{RequestsPage.js => requestsPage.js}      |  36 +-
 59 files changed, 1413 insertions(+), 846 deletions(-)
 delete mode 100644 js/src/ui/GasPriceEditor/GasPriceSelector/gasPriceSelector.js
 create mode 100644 js/src/ui/GasPriceEditor/gasPriceEditor.spec.js
 create mode 100644 js/src/ui/GasPriceEditor/store.spec.js
 create mode 100644 js/src/ui/GasPriceSelector/CustomBar/customBar.js
 create mode 100644 js/src/ui/GasPriceSelector/CustomBar/index.js
 create mode 100644 js/src/ui/GasPriceSelector/CustomCursor/customCursor.js
 create mode 100644 js/src/ui/GasPriceSelector/CustomCursor/index.js
 create mode 100644 js/src/ui/GasPriceSelector/CustomShape/customShape.js
 create mode 100644 js/src/ui/GasPriceSelector/CustomShape/index.js
 create mode 100644 js/src/ui/GasPriceSelector/CustomTooltip/customTooltip.js
 create mode 100644 js/src/ui/GasPriceSelector/CustomTooltip/index.js
 rename js/src/ui/{GasPriceEditor => }/GasPriceSelector/gasPriceSelector.css (92%)
 create mode 100644 js/src/ui/GasPriceSelector/gasPriceSelector.js
 rename js/src/ui/{GasPriceEditor => }/GasPriceSelector/index.js (100%)
 create mode 100644 js/src/ui/GasPriceSelector/util.js
 rename js/src/views/Signer/components/Account/AccountLink/{AccountLink.css => accountLink.css} (100%)
 rename js/src/views/Signer/components/Account/AccountLink/{AccountLink.js => accountLink.js} (97%)
 rename js/src/views/Signer/components/Account/{Account.css => account.css} (100%)
 rename js/src/views/Signer/components/Account/{Account.js => account.js} (98%)
 rename js/src/views/Signer/components/SignRequest/{SignRequest.css => signRequest.css} (100%)
 rename js/src/views/Signer/components/SignRequest/{SignRequest.js => signRequest.js} (97%)
 create mode 100644 js/src/views/Signer/components/SignRequest/signRequest.spec.js
 rename js/src/views/Signer/components/TransactionMainDetails/{TransactionMainDetails.css => transactionMainDetails.css} (95%)
 rename js/src/views/Signer/components/TransactionMainDetails/{TransactionMainDetails.js => transactionMainDetails.js} (65%)
 rename js/src/views/Signer/components/TransactionPending/{TransactionPending.css => transactionPending.css} (92%)
 rename js/src/views/Signer/components/TransactionPending/{TransactionPending.js => transactionPending.js} (57%)
 rename js/src/views/Signer/components/TransactionPendingForm/TransactionPendingFormConfirm/{TransactionPendingFormConfirm.css => transactionPendingFormConfirm.css} (100%)
 rename js/src/views/Signer/components/TransactionPendingForm/TransactionPendingFormConfirm/{TransactionPendingFormConfirm.js => transactionPendingFormConfirm.js} (71%)
 rename js/src/views/Signer/components/TransactionPendingForm/TransactionPendingFormReject/{TransactionPendingFormReject.css => transactionPendingFormReject.css} (100%)
 rename js/src/views/Signer/components/TransactionPendingForm/TransactionPendingFormReject/{TransactionPendingFormReject.js => transactionPendingFormReject.js} (96%)
 rename js/src/views/Signer/components/TransactionPendingForm/{TransactionPendingForm.css => transactionPendingForm.css} (100%)
 rename js/src/views/Signer/components/TransactionPendingForm/{TransactionPendingForm.js => transactionPendingForm.js} (88%)
 rename js/src/views/Signer/components/TxHashLink/{TxHashLink.js => txHashLink.js} (84%)
 rename js/src/views/Signer/containers/RequestsPage/{RequestsPage.css => requestsPage.css} (90%)
 rename js/src/views/Signer/containers/RequestsPage/{RequestsPage.js => requestsPage.js} (88%)

diff --git a/js/src/api/rpc/signer/signer.js b/js/src/api/rpc/signer/signer.js
index 126ce651ad..a24d8b9190 100644
--- a/js/src/api/rpc/signer/signer.js
+++ b/js/src/api/rpc/signer/signer.js
@@ -14,7 +14,7 @@
 // You should have received a copy of the GNU General Public License
 // along with Parity.  If not, see <http://www.gnu.org/licenses/>.
 
-import { inNumber16, inData } from '../../format/input';
+import { inData, inNumber16, inOptions } from '../../format/input';
 import { outSignerRequest } from '../../format/output';
 
 export default class Signer {
@@ -24,7 +24,7 @@ export default class Signer {
 
   confirmRequest (requestId, options, password) {
     return this._transport
-      .execute('signer_confirmRequest', inNumber16(requestId), options, password);
+      .execute('signer_confirmRequest', inNumber16(requestId), inOptions(options), password);
   }
 
   confirmRequestRaw (requestId, data) {
diff --git a/js/src/modals/ExecuteContract/executeContract.js b/js/src/modals/ExecuteContract/executeContract.js
index c3ac96490a..cdd816ee30 100644
--- a/js/src/modals/ExecuteContract/executeContract.js
+++ b/js/src/modals/ExecuteContract/executeContract.js
@@ -66,7 +66,7 @@ class ExecuteContract extends Component {
     onFromAddressChange: PropTypes.func.isRequired
   }
 
-  gasStore = new GasPriceEditor.Store(this.context.api, this.props.gasLimit);
+  gasStore = new GasPriceEditor.Store(this.context.api, { gasLimit: this.props.gasLimit });
 
   state = {
     amount: '0',
diff --git a/js/src/modals/Transfer/store.js b/js/src/modals/Transfer/store.js
index e08d7203d7..412cac60cc 100644
--- a/js/src/modals/Transfer/store.js
+++ b/js/src/modals/Transfer/store.js
@@ -112,7 +112,7 @@ export default class TransferStore {
     this.isWallet = account && account.wallet;
     this.newError = newError;
 
-    this.gasStore = new GasPriceStore(api, gasLimit);
+    this.gasStore = new GasPriceStore(api, { gasLimit });
 
     if (this.isWallet) {
       this.wallet = props.wallet;
diff --git a/js/src/modals/Transfer/transfer.js b/js/src/modals/Transfer/transfer.js
index 57dc569f2f..1ecc60edf3 100644
--- a/js/src/modals/Transfer/transfer.js
+++ b/js/src/modals/Transfer/transfer.js
@@ -80,8 +80,9 @@ class Transfer extends Component {
       <div className={ styles.hdraccount }>
         <div className={ styles.hdrimage }>
           <IdentityIcon
-            inline center
-            address={ account.address } />
+            address={ account.address }
+            center
+            inline />
         </div>
         <div className={ styles.hdrdetails }>
           <div className={ styles.hdrname }>
@@ -165,18 +166,18 @@ class Transfer extends Component {
         balance={ balance }
         extras={ extras }
         images={ images }
-        senders={ senders }
+        onChange={ this.store.onUpdateDetails }
         recipient={ recipient }
         recipientError={ recipientError }
         sender={ sender }
         senderError={ senderError }
+        senders={ senders }
         sendersBalances={ sendersBalances }
         tag={ tag }
         total={ total }
         totalError={ totalError }
         value={ value }
         valueError={ valueError }
-        onChange={ this.store.onUpdateDetails }
         wallet={ account.wallet && this.props.wallet }
       />
     );
diff --git a/js/src/redux/providers/signerMiddleware.js b/js/src/redux/providers/signerMiddleware.js
index 1a6cbb1292..c0c5d7613a 100644
--- a/js/src/redux/providers/signerMiddleware.js
+++ b/js/src/redux/providers/signerMiddleware.js
@@ -52,9 +52,9 @@ export default class SignerMiddleware {
   }
 
   onConfirmStart = (store, action) => {
-    const { id, password, wallet, payload } = action.payload;
+    const { gas, gasPrice, id, password, payload, wallet } = action.payload;
 
-    const handlePromise = promise => {
+    const handlePromise = (promise) => {
       promise
         .then((txHash) => {
           console.log('confirmRequest', id, txHash);
@@ -102,7 +102,7 @@ export default class SignerMiddleware {
       return;
     }
 
-    handlePromise(this._api.signer.confirmRequest(id, {}, password));
+    handlePromise(this._api.signer.confirmRequest(id, { gas, gasPrice }, password));
   }
 
   onRejectStart = (store, action) => {
diff --git a/js/src/ui/Editor/mode-solidity.js b/js/src/ui/Editor/mode-solidity.js
index f974c9e0f5..0d1b95c670 100644
--- a/js/src/ui/Editor/mode-solidity.js
+++ b/js/src/ui/Editor/mode-solidity.js
@@ -22,6 +22,12 @@
 /* eslint-disable */
 var ace = window.ace;
 
+if (process.env.NODE_ENV === 'test') {
+  if (!ace.define) {
+    ace.define = () => {};
+  }
+}
+
 ace.define("ace/mode/doc_comment_highlight_rules",["require","exports","module","ace/lib/oop","ace/mode/text_highlight_rules"], function(acequire, exports, module) {
 "use strict";
 
diff --git a/js/src/ui/GasPriceEditor/GasPriceSelector/gasPriceSelector.js b/js/src/ui/GasPriceEditor/GasPriceSelector/gasPriceSelector.js
deleted file mode 100644
index 893a501883..0000000000
--- a/js/src/ui/GasPriceEditor/GasPriceSelector/gasPriceSelector.js
+++ /dev/null
@@ -1,556 +0,0 @@
-// Copyright 2015, 2016 Ethcore (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 React, { Component, PropTypes } from 'react';
-
-import {
-  Bar, BarChart,
-  Rectangle,
-  Scatter, ScatterChart,
-  Tooltip,
-  XAxis, YAxis,
-  Dot,
-  ResponsiveContainer
-} from 'recharts';
-
-import Slider from 'material-ui/Slider';
-import BigNumber from 'bignumber.js';
-
-import styles from './gasPriceSelector.css';
-
-const COLORS = {
-  default: 'rgba(255, 99, 132, 0.2)',
-  selected: 'rgba(255, 99, 132, 0.5)',
-  hover: 'rgba(255, 99, 132, 0.15)',
-  grid: 'rgba(255, 99, 132, 0.5)',
-  line: 'rgb(255, 99, 132)',
-  intersection: '#fff'
-};
-
-const countModifier = (count) => {
-  const val = count.toNumber ? count.toNumber() : count;
-  return Math.log10(val + 1) + 0.1;
-};
-
-class CustomCursor extends Component {
-  static propTypes = {
-    x: PropTypes.number,
-    y: PropTypes.number,
-    width: PropTypes.number,
-    height: PropTypes.number,
-    onClick: PropTypes.func,
-    getIndex: PropTypes.func,
-    counts: PropTypes.array,
-    yDomain: PropTypes.array
-  }
-
-  render () {
-    const { x, y, width, height, getIndex, counts, yDomain } = this.props;
-
-    const index = getIndex();
-
-    if (index === -1) {
-      return null;
-    }
-
-    const count = countModifier(counts[index]);
-    const barHeight = (count / yDomain[1]) * (y + height);
-
-    return (
-      <g>
-        <Rectangle
-          x={ x }
-          y={ 0 }
-          width={ width }
-          height={ height + y }
-          fill='transparent'
-          onClick={ this.onClick }
-        />
-        <Rectangle
-          x={ x }
-          y={ y + (height - barHeight) }
-          width={ width }
-          height={ barHeight }
-          fill={ COLORS.hover }
-          onClick={ this.onClick }
-        />
-      </g>
-    );
-  }
-
-  onClick = () => {
-    const { onClick, getIndex } = this.props;
-    const index = getIndex();
-    onClick({ index });
-  }
-}
-
-class CustomBar extends Component {
-  static propTypes = {
-    selected: PropTypes.number,
-    x: PropTypes.number,
-    y: PropTypes.number,
-    width: PropTypes.number,
-    height: PropTypes.number,
-    index: PropTypes.number,
-    onClick: PropTypes.func
-  }
-
-  render () {
-    const { x, y, selected, index, width, height, onClick } = this.props;
-
-    const fill = selected === index
-      ? COLORS.selected
-      : COLORS.default;
-
-    const borderWidth = 0.5;
-    const borderColor = 'rgba(255, 255, 255, 0.5)';
-
-    return (
-      <g>
-        <Rectangle
-          x={ x - borderWidth }
-          y={ y }
-          width={ borderWidth }
-          height={ height }
-          fill={ borderColor }
-        />
-        <Rectangle
-          x={ x + width }
-          y={ y }
-          width={ borderWidth }
-          height={ height }
-          fill={ borderColor }
-        />
-        <Rectangle
-          x={ x - borderWidth }
-          y={ y - borderWidth }
-          width={ width + borderWidth * 2 }
-          height={ borderWidth }
-          fill={ borderColor }
-        />
-        <Rectangle
-          x={ x }
-          y={ y }
-          width={ width }
-          height={ height }
-          fill={ fill }
-          onClick={ onClick }
-        />
-      </g>
-    );
-  }
-}
-
-class CustomizedShape extends Component {
-  static propTypes = {
-    showValue: PropTypes.number.isRequired,
-    cx: PropTypes.number,
-    cy: PropTypes.number,
-    payload: PropTypes.object
-  }
-
-  render () {
-    const { cx, cy, showValue, payload } = this.props;
-
-    if (showValue !== payload.y) {
-      return null;
-    }
-
-    return (
-      <g>
-        <Dot
-          style={ { fill: 'white' } }
-          cx={ cx }
-          cy={ cy }
-          r={ 5 }
-        />
-        <Dot
-          style={ { fill: 'rgb(255, 99, 132)' } }
-          cx={ cx }
-          cy={ cy }
-          r={ 3 }
-        />
-      </g>
-    );
-  }
-}
-
-class CustomTooltip extends Component {
-  static propTypes = {
-    gasPriceHistogram: PropTypes.object.isRequired,
-    type: PropTypes.string,
-    payload: PropTypes.array,
-    label: PropTypes.number,
-    active: PropTypes.bool
-  }
-
-  render () {
-    const { active, label, gasPriceHistogram } = this.props;
-
-    if (!active) {
-      return null;
-    }
-
-    const index = label;
-
-    const count = gasPriceHistogram.counts[index];
-    const minGasPrice = gasPriceHistogram.bucketBounds[index];
-    const maxGasPrice = gasPriceHistogram.bucketBounds[index + 1];
-
-    return (
-      <div>
-        <p className='label'>
-          { count.toNumber() } transactions
-          with gas price set from
-          <span> { minGasPrice.toFormat(0) } </span>
-          to
-          <span> { maxGasPrice.toFormat(0) } </span>
-        </p>
-      </div>
-    );
-  }
-}
-
-const TOOL_STYLE = {
-  color: 'rgba(255,255,255,0.5)',
-  backgroundColor: 'rgba(0, 0, 0, 0.75)',
-  padding: '0 0.5em',
-  fontSize: '0.75em'
-};
-
-export default class GasPriceSelector extends Component {
-  static propTypes = {
-    gasPriceHistogram: PropTypes.object.isRequired,
-    onChange: PropTypes.func.isRequired,
-
-    gasPrice: PropTypes.oneOfType([
-      PropTypes.string,
-      PropTypes.object
-    ])
-  }
-
-  state = {
-    gasPrice: null,
-    sliderValue: 0.5,
-    selectedIndex: 0,
-
-    chartData: {
-      values: [],
-      xDomain: [],
-      yDomain: [],
-      N: 0
-    }
-  }
-
-  componentWillMount () {
-    this.computeCharts();
-    this.setGasPrice();
-  }
-
-  componentWillReceiveProps (nextProps) {
-    if (nextProps.gasPrice !== this.props.gasPrice) {
-      this.setGasPrice(nextProps);
-    }
-  }
-
-  componentWillUpdate (nextProps, nextState) {
-    if (Math.floor(nextState.sliderValue) !== Math.floor(this.state.sliderValue)) {
-      this.updateSelectedBarChart(nextState);
-    }
-  }
-
-  render () {
-    return (
-      <div>
-        { this.renderChart() }
-        { this.renderSlider() }
-      </div>
-    );
-  }
-
-  renderSlider () {
-    const { sliderValue } = this.state;
-
-    return (
-      <div className={ styles.columns }>
-        <Slider
-          min={ 0 }
-          max={ 1 }
-          value={ sliderValue }
-          onChange={ this.onEditGasPriceSlider }
-          style={ {
-            flex: 1,
-            padding: '0 0.3em'
-          } }
-          sliderStyle={ {
-            marginBottom: 12
-          } }
-        />
-      </div>
-    );
-  }
-
-  renderChart () {
-    const { gasPriceHistogram } = this.props;
-    const { chartData, sliderValue, selectedIndex } = this.state;
-
-    if (chartData.values.length === 0) {
-      return null;
-    }
-
-    const height = 300;
-    const countIndex = Math.max(0, Math.min(selectedIndex, gasPriceHistogram.counts.length - 1));
-    const selectedCount = countModifier(gasPriceHistogram.counts[countIndex]);
-
-    return (
-      <div className={ styles.columns }>
-        <div style={ { flex: 1, height } }>
-          <div className={ styles.chart }>
-            <ResponsiveContainer
-              height={ height }
-            >
-              <ScatterChart
-                margin={ { top: 0, right: 0, left: 0, bottom: 0 } }
-              >
-                <Scatter
-                  data={ [
-                    { x: sliderValue, y: 0 },
-                    { x: sliderValue, y: selectedCount },
-                    { x: sliderValue, y: chartData.yDomain[1] }
-                  ] }
-                  shape={ <CustomizedShape showValue={ selectedCount } /> }
-                  line
-                  isAnimationActive={ false }
-                />
-
-                <XAxis
-                  hide
-                  height={ 0 }
-                  dataKey='x'
-                  domain={ [0, 1] }
-                />
-                <YAxis
-                  hide
-                  width={ 0 }
-                  dataKey='y'
-                  domain={ chartData.yDomain }
-                />
-              </ScatterChart>
-            </ResponsiveContainer>
-          </div>
-
-          <div className={ styles.chart }>
-            <ResponsiveContainer
-              height={ height }
-            >
-              <BarChart
-                data={ chartData.values }
-                margin={ { top: 0, right: 0, left: 0, bottom: 0 } }
-                barCategoryGap={ 1 }
-                ref='barChart'
-              >
-                <Bar
-                  dataKey='value'
-                  stroke={ COLORS.line }
-                  onClick={ this.onClickGasPrice }
-                  shape={ <CustomBar selected={ selectedIndex } onClick={ this.onClickGasPrice } /> }
-                />
-
-                <Tooltip
-                  wrapperStyle={ TOOL_STYLE }
-                  cursor={ this.renderCustomCursor() }
-                  content={ <CustomTooltip gasPriceHistogram={ gasPriceHistogram } /> }
-                />
-
-                <XAxis
-                  hide
-                  dataKey='index'
-                  type='category'
-                  domain={ chartData.xDomain }
-                />
-                <YAxis
-                  hide
-                  type='number'
-                  domain={ chartData.yDomain }
-                />
-              </BarChart>
-            </ResponsiveContainer>
-          </div>
-        </div>
-      </div>
-    );
-  }
-
-  renderCustomCursor = () => {
-    const { gasPriceHistogram } = this.props;
-    const { chartData } = this.state;
-
-    return (
-      <CustomCursor
-        getIndex={ this.getBarHoverIndex }
-        onClick={ this.onClickGasPrice }
-        counts={ gasPriceHistogram.counts }
-        yDomain={ chartData.yDomain }
-      />
-    );
-  }
-
-  getBarHoverIndex = () => {
-    const { barChart } = this.refs;
-
-    if (!barChart || !barChart.state) {
-      return -1;
-    }
-
-    return barChart.state.activeTooltipIndex;
-  }
-
-  computeChartsData () {
-    const { gasPriceChartData } = this.state;
-    const { gasPriceHistogram } = this.props;
-
-    const values = gasPriceChartData
-      .map((value, index) => ({ value, index }));
-
-    const N = values.length - 1;
-    const maxGasCounts = countModifier(
-      gasPriceHistogram
-        .counts
-        .reduce((max, count) => count.greaterThan(max) ? count : max, 0)
-    );
-
-    const xDomain = [0, N];
-    const yDomain = [0, maxGasCounts * 1.1];
-
-    const chartData = {
-      values, N,
-      xDomain, yDomain
-    };
-
-    this.setState({ chartData }, () => {
-      this.updateSelectedBarChart();
-    });
-  }
-
-  computeCharts (props = this.props) {
-    const { gasPriceHistogram } = props;
-
-    const gasPriceChartData = gasPriceHistogram
-      .counts
-      .map(count => countModifier(count));
-
-    this.setState(
-      { gasPriceChartData },
-      () => this.computeChartsData()
-    );
-  }
-
-  updateSelectedBarChart (state = this.state) {
-  }
-
-  setGasPrice (props = this.props) {
-    const { gasPrice, gasPriceHistogram } = props;
-
-    // If no gas price yet...
-    if (!gasPrice) {
-      return this.setSliderValue(0.5);
-    }
-
-    const bnGasPrice = (typeof gasPrice === 'string')
-      ? new BigNumber(gasPrice)
-      : gasPrice;
-
-    // If gas price hasn't changed
-    if (this.state.gasPrice && bnGasPrice.equals(this.state.gasPrice)) {
-      return;
-    }
-
-    const gasPrices = gasPriceHistogram.bucketBounds;
-    const startIndex = gasPrices
-      .findIndex(price => price.greaterThan(bnGasPrice)) - 1;
-
-    // gasPrice Lower than the max in histogram
-    if (startIndex === -1) {
-      return this.setSliderValue(0, bnGasPrice);
-    }
-
-    // gasPrice Greater than the max in histogram
-    if (startIndex === -2) {
-      return this.setSliderValue(1, bnGasPrice);
-    }
-
-    const priceA = gasPrices[startIndex];
-    const priceB = gasPrices[startIndex + 1];
-
-    const sliderValueDec = bnGasPrice
-      .minus(priceA)
-      .dividedBy(priceB.minus(priceA))
-      .toNumber();
-
-    const sliderValue = (startIndex + sliderValueDec) / (gasPrices.length - 1);
-    this.setSliderValue(sliderValue, bnGasPrice);
-  }
-
-  setSliderValue (value, gasPrice = this.state.gasPrice) {
-    const { gasPriceHistogram } = this.props;
-
-    const N = gasPriceHistogram.bucketBounds.length - 1;
-
-    const sliderValue = Math.max(0, Math.min(value, 1));
-    const selectedIndex = Math.floor(sliderValue * N);
-
-    this.setState({ sliderValue, gasPrice, selectedIndex });
-  }
-
-  onBarChartMouseUp = (event) => {
-    console.log(event);
-  }
-
-  onClickGasPrice = (bar) => {
-    const { index } = bar;
-
-    const ratio = (index + 0.5) / (this.state.chartData.N + 1);
-
-    this.onEditGasPriceSlider(null, ratio);
-  }
-
-  onEditGasPriceSlider = (event, sliderValue) => {
-    const { gasPriceHistogram } = this.props;
-
-    const gasPrices = gasPriceHistogram.bucketBounds;
-    const N = gasPrices.length - 1;
-    const gasPriceAIdx = Math.floor(sliderValue * N);
-    const gasPriceBIdx = gasPriceAIdx + 1;
-
-    if (gasPriceBIdx === N + 1) {
-      const gasPrice = gasPrices[gasPriceAIdx].round();
-      this.props.onChange(event, gasPrice);
-      return;
-    }
-
-    const gasPriceA = gasPrices[gasPriceAIdx];
-    const gasPriceB = gasPrices[gasPriceBIdx];
-
-    const mult = Math.round((sliderValue % 1) * 100) / 100;
-    const gasPrice = gasPriceA
-      .plus(gasPriceB.minus(gasPriceA).times(mult))
-      .round();
-
-    this.setSliderValue(sliderValue, gasPrice);
-    this.props.onChange(event, gasPrice);
-  }
-}
diff --git a/js/src/ui/GasPriceEditor/gasPriceEditor.css b/js/src/ui/GasPriceEditor/gasPriceEditor.css
index cf1fff81c5..bcb99a63b1 100644
--- a/js/src/ui/GasPriceEditor/gasPriceEditor.css
+++ b/js/src/ui/GasPriceEditor/gasPriceEditor.css
@@ -15,16 +15,12 @@
 /* along with Parity.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-.columns {
+.container {
   display: flex;
   flex-wrap: wrap;
   position: relative;
 }
 
-.graphColumn {
-  flex: 65;
-}
-
 .editColumn {
   flex: 35;
   padding-left: 1em;
@@ -41,6 +37,10 @@
   opacity: 0.5;
 }
 
+.graphColumn {
+  flex: 65;
+}
+
 .row {
   display: flex;
   flex-wrap: wrap;
diff --git a/js/src/ui/GasPriceEditor/gasPriceEditor.js b/js/src/ui/GasPriceEditor/gasPriceEditor.js
index 8c94dfca72..423afc45b2 100644
--- a/js/src/ui/GasPriceEditor/gasPriceEditor.js
+++ b/js/src/ui/GasPriceEditor/gasPriceEditor.js
@@ -15,11 +15,11 @@
 // along with Parity.  If not, see <http://www.gnu.org/licenses/>.
 
 import BigNumber from 'bignumber.js';
-import React, { Component, PropTypes } from 'react';
 import { observer } from 'mobx-react';
+import React, { Component, PropTypes } from 'react';
 
 import Input from '../Form/Input';
-import GasPriceSelector from './GasPriceSelector';
+import GasPriceSelector from '../GasPriceSelector';
 import Store from './store';
 
 import styles from './gasPriceEditor.css';
@@ -31,62 +31,60 @@ export default class GasPriceEditor extends Component {
   };
 
   static propTypes = {
-    store: PropTypes.object.isRequired,
-    onChange: PropTypes.func
+    children: PropTypes.node,
+    onChange: PropTypes.func,
+    store: PropTypes.object.isRequired
   }
 
   static Store = Store;
 
   render () {
     const { api } = this.context;
-    const { store } = this.props;
-    const { estimated, priceDefault, price, gas, histogram, errorGas, errorPrice, errorTotal, totalValue } = store;
+    const { children, store } = this.props;
+    const { errorGas, errorPrice, errorTotal, estimated, gas, histogram, price, priceDefault, totalValue } = store;
 
     const eth = api.util.fromWei(totalValue).toFormat();
     const gasLabel = `gas (estimated: ${new BigNumber(estimated).toFormat()})`;
     const priceLabel = `price (current: ${new BigNumber(priceDefault).toFormat()})`;
 
     return (
-      <div className={ styles.columns }>
+      <div className={ styles.container }>
         <div className={ styles.graphColumn }>
           <GasPriceSelector
-            gasPriceHistogram={ histogram }
-            gasPrice={ price }
-            onChange={ this.onEditGasPrice } />
+            histogram={ histogram }
+            onChange={ this.onEditGasPrice }
+            price={ price } />
           <div className={ styles.gasPriceDesc }>
-            You can choose the gas price based on the
-            distribution of recent included transaction gas prices.
-            The lower the gas price is, the cheaper the transaction will
-            be. The higher the gas price is, the faster it should
-            get mined by the network.
+            You can choose the gas price based on the distribution of recent included transaction gas prices. The lower the gas price is, the cheaper the transaction will be. The higher the gas price is, the faster it should get mined by the network.
           </div>
         </div>
 
         <div className={ styles.editColumn }>
           <div className={ styles.row }>
             <Input
-              label={ gasLabel }
-              hint='the amount of gas to use for the transaction'
               error={ errorGas }
-              value={ gas }
-              onChange={ this.onEditGas } />
-
+              hint='the amount of gas to use for the transaction'
+              label={ gasLabel }
+              onChange={ this.onEditGas }
+              value={ gas } />
             <Input
-              label={ priceLabel }
-              hint='the price of gas to use for the transaction'
               error={ errorPrice }
-              value={ price }
-              onChange={ this.onEditGasPrice } />
+              hint='the price of gas to use for the transaction'
+              label={ priceLabel }
+              onChange={ this.onEditGasPrice }
+              value={ price } />
           </div>
-
           <div className={ styles.row }>
             <Input
               disabled
-              label='total transaction amount'
-              hint='the total amount of the transaction'
               error={ errorTotal }
+              hint='the total amount of the transaction'
+              label='total transaction amount'
               value={ `${eth} ETH` } />
           </div>
+          <div className={ styles.row }>
+            { children }
+          </div>
         </div>
       </div>
     );
diff --git a/js/src/ui/GasPriceEditor/gasPriceEditor.spec.js b/js/src/ui/GasPriceEditor/gasPriceEditor.spec.js
new file mode 100644
index 0000000000..4197bc876a
--- /dev/null
+++ b/js/src/ui/GasPriceEditor/gasPriceEditor.spec.js
@@ -0,0 +1,45 @@
+// Copyright 2015, 2016 Ethcore (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 BigNumber from 'bignumber.js';
+import { shallow } from 'enzyme';
+import React from 'react';
+import sinon from 'sinon';
+
+import GasPriceEditor from './';
+
+const api = {
+  util: {
+    fromWei: (value) => new BigNumber(value)
+  }
+};
+
+const store = {
+  estimated: '123',
+  priceDefault: '456',
+  totalValue: '789',
+  setGas: sinon.stub(),
+  setPrice: sinon.stub()
+};
+
+describe('ui/GasPriceEditor', () => {
+  it('renders', () => {
+    expect(shallow(
+      <GasPriceEditor store={ store } />,
+      { context: { api } }
+    )).to.be.ok;
+  });
+});
diff --git a/js/src/ui/GasPriceEditor/store.js b/js/src/ui/GasPriceEditor/store.js
index afa5e15b2c..4fc16b83c6 100644
--- a/js/src/ui/GasPriceEditor/store.js
+++ b/js/src/ui/GasPriceEditor/store.js
@@ -26,18 +26,22 @@ export default class GasPriceEditor {
   @observable errorPrice = null;
   @observable errorTotal = null;
   @observable estimated = DEFAULT_GAS;
+  @observable gas;
+  @observable gasLimit;
   @observable histogram = null;
-  @observable price = DEFAULT_GASPRICE;
-  @observable priceDefault = DEFAULT_GASPRICE;
-  @observable gas = DEFAULT_GAS;
-  @observable gasLimit = 0;
+  @observable isEditing = false;
+  @observable price;
+  @observable priceDefault;
   @observable weiValue = '0';
 
-  constructor (api, gasLimit, loadDefaults = true) {
+  constructor (api, { gas, gasLimit, gasPrice }) {
     this._api = api;
+
+    this.gas = gas;
     this.gasLimit = gasLimit;
+    this.price = gasPrice;
 
-    if (loadDefaults) {
+    if (api) {
       this.loadDefaults();
     }
   }
@@ -50,6 +54,10 @@ export default class GasPriceEditor {
     }
   }
 
+  @action setEditing = (isEditing) => {
+    this.isEditing = isEditing;
+  }
+
   @action setErrorTotal = (errorTotal) => {
     this.errorTotal = errorTotal;
   }
@@ -74,50 +82,72 @@ export default class GasPriceEditor {
     this.weiValue = weiValue;
   }
 
-  @action setHistogram = (gasHistogram) => {
-    this.histogram = gasHistogram;
-  }
-
-  @action setPrice = (price) => {
-    transaction(() => {
-      this.errorPrice = validatePositiveNumber(price).numberError;
-      this.price = price;
-    });
-  }
-
   @action setGas = (gas) => {
     transaction(() => {
       const { numberError } = validatePositiveNumber(gas);
-      const bn = new BigNumber(gas);
 
       this.gas = gas;
 
       if (numberError) {
         this.errorGas = numberError;
-      } else if (bn.gte(this.gasLimit)) {
-        this.errorGas = ERRORS.gasBlockLimit;
       } else {
-        this.errorGas = null;
+        const bn = new BigNumber(gas);
+
+        if (bn.gte(this.gasLimit)) {
+          this.errorGas = ERRORS.gasBlockLimit;
+        } else {
+          this.errorGas = null;
+        }
       }
     });
   }
 
+  @action setGasLimit = (gasLimit) => {
+    this.gasLimit = gasLimit;
+  }
+
+  @action setHistogram = (gasHistogram) => {
+    this.histogram = gasHistogram;
+  }
+
+  @action setPrice = (price) => {
+    transaction(() => {
+      this.errorPrice = validatePositiveNumber(price).numberError;
+      this.price = price;
+    });
+  }
+
   @action loadDefaults () {
     Promise
       .all([
         this._api.parity.gasPriceHistogram(),
         this._api.eth.gasPrice()
       ])
-      .then(([gasPriceHistogram, gasPrice]) => {
+      .then(([histogram, _price]) => {
         transaction(() => {
-          this.setPrice(gasPrice.toFixed(0));
-          this.setHistogram(gasPriceHistogram);
+          const price = _price.toFixed(0);
 
-          this.priceDefault = gasPrice.toFixed();
+          if (!this.price) {
+            this.setPrice(price);
+          }
+          this.setHistogram(histogram);
+
+          this.priceDefault = price;
         });
       })
       .catch((error) => {
         console.warn('getDefaults', error);
       });
   }
+
+  overrideTransaction = (transaction) => {
+    if (this.errorGas || this.errorPrice) {
+      return transaction;
+    }
+
+    return Object.assign({}, transaction, {
+      gas: new BigNumber(this.gas || DEFAULT_GAS),
+      gasPrice: new BigNumber(this.price || DEFAULT_GASPRICE)
+    });
+  }
 }
diff --git a/js/src/ui/GasPriceEditor/store.spec.js b/js/src/ui/GasPriceEditor/store.spec.js
new file mode 100644
index 0000000000..bbee1b8c47
--- /dev/null
+++ b/js/src/ui/GasPriceEditor/store.spec.js
@@ -0,0 +1,197 @@
+// Copyright 2015, 2016 Ethcore (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 BigNumber from 'bignumber.js';
+import sinon from 'sinon';
+
+import { DEFAULT_GAS, DEFAULT_GASPRICE, MAX_GAS_ESTIMATION } from '~/util/constants';
+import { ERRORS } from '~/util/validation';
+
+import GasPriceEditor from './gasPriceEditor';
+
+const { Store } = GasPriceEditor;
+
+const GASPRICE = new BigNumber(123456);
+const GASLIMIT = 100000;
+const HISTOGRAM = {
+  bucketBounds: [1, 2],
+  counts: [3, 4]
+};
+
+const api = {
+  eth: {
+    gasPrice: sinon.stub().resolves(GASPRICE)
+  },
+  parity: {
+    gasPriceHistogram: sinon.stub().resolves(HISTOGRAM)
+  }
+};
+
+describe('ui/GasPriceEditor/store', () => {
+  let store = null;
+
+  it('is available via GasPriceEditor.Store', () => {
+    expect(new Store(null, {})).to.be.ok;
+  });
+
+  describe('constructor (defaults)', () => {
+    beforeEach(() => {
+      store = new Store(api, { gasLimit: GASLIMIT });
+    });
+
+    it('retrieves the histogram and gasPrice', () => {
+      expect(api.eth.gasPrice).to.have.been.called;
+      expect(api.parity.gasPriceHistogram).to.have.been.called;
+    });
+
+    it('sets the gasLimit as passed', () => {
+      expect(store.gasLimit).to.equal(GASLIMIT);
+    });
+  });
+
+  describe('setters', () => {
+    beforeEach(() => {
+      store = new Store(null, { gasLimit: GASLIMIT });
+    });
+
+    describe('setEditing', () => {
+      it('sets the value', () => {
+        expect(store.isEditing).to.be.false;
+        store.setEditing(true);
+        expect(store.isEditing).to.be.true;
+      });
+    });
+
+    describe('setErrorTotal', () => {
+      it('sets the value', () => {
+        store.setErrorTotal('errorTotal');
+        expect(store.errorTotal).to.equal('errorTotal');
+      });
+    });
+
+    describe('setEstimated', () => {
+      it('sets the value', () => {
+        store.setEstimated('789');
+        expect(store.estimated).to.equal('789');
+      });
+
+      it('sets error when above exception max', () => {
+        store.setEstimated(MAX_GAS_ESTIMATION);
+        expect(store.errorEstimated).to.equal(ERRORS.gasException);
+      });
+
+      it('sets error when above gaslimit', () => {
+        store.setEstimated(GASLIMIT);
+        expect(store.errorEstimated).to.equal(ERRORS.gasBlockLimit);
+      });
+    });
+
+    describe('setEthValue', () => {
+      it('sets the value', () => {
+        store.setEthValue('123');
+        expect(store.weiValue).to.equal('123');
+      });
+    });
+
+    describe('setGas', () => {
+      it('sets the value', () => {
+        store.setGas('123');
+        expect(store.gas).to.equal('123');
+        expect(store.errorGas).to.be.null;
+      });
+
+      it('sets error on negative numbers', () => {
+        store.setGas(-123);
+        expect(store.errorGas).not.to.be.null;
+      });
+
+      it('sets error when above block limit', () => {
+        store.setGas(GASLIMIT);
+        expect(store.errorGas).to.equal(ERRORS.gasBlockLimit);
+      });
+    });
+
+    describe('setGasLimit', () => {
+      it('sets the value', () => {
+        store.setGasLimit('123');
+        expect(store.gasLimit).to.equal('123');
+      });
+    });
+
+    describe('setHistogram', () => {
+      it('sets the value', () => {
+        store.setHistogram(HISTOGRAM);
+        expect(store.histogram).to.deep.equal(HISTOGRAM);
+      });
+    });
+
+    describe('setPrice', () => {
+      it('sets the value', () => {
+        store.setPrice('123');
+        expect(store.price).to.equal('123');
+        expect(store.errorPrice).to.be.null;
+      });
+
+      it('sets error on negative numbers', () => {
+        store.setPrice(-123);
+        expect(store.errorPrice).not.to.be.null;
+      });
+    });
+  });
+
+  describe('computed', () => {
+    beforeEach(() => {
+      store = new Store(null, { gasLimit: GASLIMIT });
+    });
+
+    describe('totalValue', () => {
+      it('holds the total including eth, price & gas', () => {
+        store.setPrice('123');
+        store.setGas('123');
+        store.setEthValue('123');
+        expect(store.totalValue).to.deep.equal(new BigNumber(123 + 123 * 123));
+      });
+    });
+  });
+
+  describe('methods', () => {
+    beforeEach(() => {
+      store = new Store(null, { gasLimit: GASLIMIT });
+    });
+
+    describe('overrideTransaction', () => {
+      const TRANSACTION = { gas: '123', gasPrice: '456' };
+
+      it('overrides gas & gasPrice with values', () => {
+        store.setGas(DEFAULT_GAS);
+        const transaction = store.overrideTransaction(TRANSACTION);
+
+        expect(transaction.gas).to.deep.equal(new BigNumber(DEFAULT_GAS));
+        expect(transaction.gasPrice).to.deep.equal(new BigNumber(DEFAULT_GASPRICE));
+      });
+
+      it('does not override with invalid gas', () => {
+        store.setGas(-123);
+        expect(store.overrideTransaction(TRANSACTION)).to.deep.equal(TRANSACTION);
+      });
+
+      it('does not override with invalid price', () => {
+        store.setPrice(-123);
+        expect(store.overrideTransaction(TRANSACTION)).to.deep.equal(TRANSACTION);
+      });
+    });
+  });
+});
diff --git a/js/src/ui/GasPriceSelector/CustomBar/customBar.js b/js/src/ui/GasPriceSelector/CustomBar/customBar.js
new file mode 100644
index 0000000000..60f066f977
--- /dev/null
+++ b/js/src/ui/GasPriceSelector/CustomBar/customBar.js
@@ -0,0 +1,77 @@
+// Copyright 2015, 2016 Ethcore (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 React, { Component, PropTypes } from 'react';
+import { Rectangle } from 'recharts';
+
+import { COLORS } from '../util';
+
+export default class CustomBar extends Component {
+  static propTypes = {
+    selected: PropTypes.number,
+    x: PropTypes.number,
+    y: PropTypes.number,
+    width: PropTypes.number,
+    height: PropTypes.number,
+    index: PropTypes.number,
+    onClick: PropTypes.func
+  }
+
+  render () {
+    const { x, y, selected, index, width, height, onClick } = this.props;
+
+    const fill = selected === index
+      ? COLORS.selected
+      : COLORS.default;
+
+    const borderWidth = 0.5;
+    const borderColor = 'rgba(255, 255, 255, 0.5)';
+
+    return (
+      <g>
+        <Rectangle
+          x={ x - borderWidth }
+          y={ y }
+          width={ borderWidth }
+          height={ height }
+          fill={ borderColor }
+        />
+        <Rectangle
+          x={ x + width }
+          y={ y }
+          width={ borderWidth }
+          height={ height }
+          fill={ borderColor }
+        />
+        <Rectangle
+          x={ x - borderWidth }
+          y={ y - borderWidth }
+          width={ width + borderWidth * 2 }
+          height={ borderWidth }
+          fill={ borderColor }
+        />
+        <Rectangle
+          x={ x }
+          y={ y }
+          width={ width }
+          height={ height }
+          fill={ fill }
+          onClick={ onClick }
+        />
+      </g>
+    );
+  }
+}
diff --git a/js/src/ui/GasPriceSelector/CustomBar/index.js b/js/src/ui/GasPriceSelector/CustomBar/index.js
new file mode 100644
index 0000000000..fa4008e42e
--- /dev/null
+++ b/js/src/ui/GasPriceSelector/CustomBar/index.js
@@ -0,0 +1,17 @@
+// Copyright 2015, 2016 Ethcore (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/>.
+
+export default from './customBar';
diff --git a/js/src/ui/GasPriceSelector/CustomCursor/customCursor.js b/js/src/ui/GasPriceSelector/CustomCursor/customCursor.js
new file mode 100644
index 0000000000..8ce9a0e420
--- /dev/null
+++ b/js/src/ui/GasPriceSelector/CustomCursor/customCursor.js
@@ -0,0 +1,73 @@
+// Copyright 2015, 2016 Ethcore (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 React, { Component, PropTypes } from 'react';
+import { Rectangle } from 'recharts';
+
+import { COLORS, countModifier } from '../util';
+
+export default class CustomCursor extends Component {
+  static propTypes = {
+    x: PropTypes.number,
+    y: PropTypes.number,
+    width: PropTypes.number,
+    height: PropTypes.number,
+    onClick: PropTypes.func,
+    getIndex: PropTypes.func,
+    counts: PropTypes.object,
+    yDomain: PropTypes.array
+  }
+
+  render () {
+    const { x, y, width, height, getIndex, counts, yDomain } = this.props;
+
+    const index = getIndex();
+
+    if (index === -1) {
+      return null;
+    }
+
+    const count = countModifier(counts[index]);
+    const barHeight = (count / yDomain[1]) * (y + height);
+
+    return (
+      <g>
+        <Rectangle
+          x={ x }
+          y={ 0 }
+          width={ width }
+          height={ height + y }
+          fill='transparent'
+          onClick={ this.onClick }
+        />
+        <Rectangle
+          x={ x }
+          y={ y + (height - barHeight) }
+          width={ width }
+          height={ barHeight }
+          fill={ COLORS.hover }
+          onClick={ this.onClick }
+        />
+      </g>
+    );
+  }
+
+  onClick = () => {
+    const { onClick, getIndex } = this.props;
+    const index = getIndex();
+    onClick({ index });
+  }
+}
diff --git a/js/src/ui/GasPriceSelector/CustomCursor/index.js b/js/src/ui/GasPriceSelector/CustomCursor/index.js
new file mode 100644
index 0000000000..8129d97f03
--- /dev/null
+++ b/js/src/ui/GasPriceSelector/CustomCursor/index.js
@@ -0,0 +1,17 @@
+// Copyright 2015, 2016 Ethcore (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/>.
+
+export default from './customCursor';
diff --git a/js/src/ui/GasPriceSelector/CustomShape/customShape.js b/js/src/ui/GasPriceSelector/CustomShape/customShape.js
new file mode 100644
index 0000000000..1c721ab35e
--- /dev/null
+++ b/js/src/ui/GasPriceSelector/CustomShape/customShape.js
@@ -0,0 +1,52 @@
+// Copyright 2015, 2016 Ethcore (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 React, { Component, PropTypes } from 'react';
+import { Dot } from 'recharts';
+
+export default class CustomShape extends Component {
+  static propTypes = {
+    showValue: PropTypes.number.isRequired,
+    cx: PropTypes.number,
+    cy: PropTypes.number,
+    payload: PropTypes.object
+  }
+
+  render () {
+    const { cx, cy, showValue, payload } = this.props;
+
+    if (showValue !== payload.y) {
+      return null;
+    }
+
+    return (
+      <g>
+        <Dot
+          style={ { fill: 'white' } }
+          cx={ cx }
+          cy={ cy }
+          r={ 5 }
+        />
+        <Dot
+          style={ { fill: 'rgb(255, 99, 132)' } }
+          cx={ cx }
+          cy={ cy }
+          r={ 3 }
+        />
+      </g>
+    );
+  }
+}
diff --git a/js/src/ui/GasPriceSelector/CustomShape/index.js b/js/src/ui/GasPriceSelector/CustomShape/index.js
new file mode 100644
index 0000000000..663c6b91bf
--- /dev/null
+++ b/js/src/ui/GasPriceSelector/CustomShape/index.js
@@ -0,0 +1,17 @@
+// Copyright 2015, 2016 Ethcore (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/>.
+
+export default from './customShape';
diff --git a/js/src/ui/GasPriceSelector/CustomTooltip/customTooltip.js b/js/src/ui/GasPriceSelector/CustomTooltip/customTooltip.js
new file mode 100644
index 0000000000..4fd165cb03
--- /dev/null
+++ b/js/src/ui/GasPriceSelector/CustomTooltip/customTooltip.js
@@ -0,0 +1,53 @@
+// Copyright 2015, 2016 Ethcore (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 React, { Component, PropTypes } from 'react';
+
+export default class CustomTooltip extends Component {
+  static propTypes = {
+    active: PropTypes.bool,
+    histogram: PropTypes.object.isRequired,
+    label: PropTypes.number,
+    payload: PropTypes.array,
+    type: PropTypes.string
+  }
+
+  render () {
+    const { active, label, histogram } = this.props;
+
+    if (!active) {
+      return null;
+    }
+
+    const index = label;
+
+    const count = histogram.counts[index];
+    const minprice = histogram.bucketBounds[index];
+    const maxprice = histogram.bucketBounds[index + 1];
+
+    return (
+      <div>
+        <p className='label'>
+          { count.toNumber() } transactions
+          with gas price set from
+          <span> { minprice.toFormat(0) } </span>
+          to
+          <span> { maxprice.toFormat(0) } </span>
+        </p>
+      </div>
+    );
+  }
+}
diff --git a/js/src/ui/GasPriceSelector/CustomTooltip/index.js b/js/src/ui/GasPriceSelector/CustomTooltip/index.js
new file mode 100644
index 0000000000..a16f9d2f96
--- /dev/null
+++ b/js/src/ui/GasPriceSelector/CustomTooltip/index.js
@@ -0,0 +1,17 @@
+// Copyright 2015, 2016 Ethcore (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/>.
+
+export default from './customTooltip';
diff --git a/js/src/ui/GasPriceEditor/GasPriceSelector/gasPriceSelector.css b/js/src/ui/GasPriceSelector/gasPriceSelector.css
similarity index 92%
rename from js/src/ui/GasPriceEditor/GasPriceSelector/gasPriceSelector.css
rename to js/src/ui/GasPriceSelector/gasPriceSelector.css
index 247211c50e..ce5bd55e83 100644
--- a/js/src/ui/GasPriceEditor/GasPriceSelector/gasPriceSelector.css
+++ b/js/src/ui/GasPriceSelector/gasPriceSelector.css
@@ -20,8 +20,12 @@
   width: 100%;
 }
 
-.columns {
+.chartRow, .sliderRow {
   display: flex;
   flex-wrap: wrap;
   position: relative;
 }
+
+.chartRow {
+  margin-bottom: -24px;
+}
diff --git a/js/src/ui/GasPriceSelector/gasPriceSelector.js b/js/src/ui/GasPriceSelector/gasPriceSelector.js
new file mode 100644
index 0000000000..e37dc8b390
--- /dev/null
+++ b/js/src/ui/GasPriceSelector/gasPriceSelector.js
@@ -0,0 +1,341 @@
+// Copyright 2015, 2016 Ethcore (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 BigNumber from 'bignumber.js';
+import { Slider } from 'material-ui';
+import React, { Component, PropTypes } from 'react';
+import { Bar, BarChart, ResponsiveContainer, Scatter, ScatterChart, Tooltip, XAxis, YAxis } from 'recharts';
+
+import CustomBar from './CustomBar';
+import CustomCursor from './CustomCursor';
+import CustomShape from './CustomShape';
+import CustomTooltip from './CustomTooltip';
+
+import { COLORS, countModifier } from './util';
+
+import styles from './gasPriceSelector.css';
+
+const TOOL_STYLE = {
+  color: 'rgba(255,255,255,0.5)',
+  backgroundColor: 'rgba(0, 0, 0, 0.75)',
+  padding: '0 0.5em',
+  fontSize: '0.75em'
+};
+
+export default class GasPriceSelector extends Component {
+  static propTypes = {
+    histogram: PropTypes.object.isRequired,
+    onChange: PropTypes.func.isRequired,
+    price: PropTypes.oneOfType([
+      PropTypes.string,
+      PropTypes.object
+    ])
+  }
+
+  state = {
+    price: null,
+    sliderValue: 0.5,
+    selectedIndex: 0,
+
+    chartData: {
+      values: [],
+      xDomain: [],
+      yDomain: [],
+      N: 0
+    }
+  }
+
+  componentWillMount () {
+    this.computeCharts();
+    this.setprice();
+  }
+
+  componentWillReceiveProps (nextProps) {
+    if (nextProps.price !== this.props.price) {
+      this.setprice(nextProps);
+    }
+  }
+
+  componentWillUpdate (nextProps, nextState) {
+    if (Math.floor(nextState.sliderValue) !== Math.floor(this.state.sliderValue)) {
+      this.updateSelectedBarChart(nextState);
+    }
+  }
+
+  render () {
+    return (
+      <div>
+        { this.renderChart() }
+        { this.renderSlider() }
+      </div>
+    );
+  }
+
+  renderChart () {
+    const { histogram } = this.props;
+    const { chartData, sliderValue, selectedIndex } = this.state;
+
+    if (chartData.values.length === 0) {
+      return null;
+    }
+
+    const height = 196;
+    const countIndex = Math.max(0, Math.min(selectedIndex, histogram.counts.length - 1));
+    const selectedCount = countModifier(histogram.counts[countIndex]);
+
+    return (
+      <div className={ styles.chartRow }>
+        <div style={ { flex: 1, height } }>
+
+          <div className={ styles.chart }>
+            <ResponsiveContainer height={ height }>
+              <ScatterChart margin={ { top: 0, right: 0, left: 0, bottom: 0 } }>
+                <Scatter
+                  data={ [
+                    { x: sliderValue, y: 0 },
+                    { x: sliderValue, y: selectedCount },
+                    { x: sliderValue, y: chartData.yDomain[1] }
+                  ] }
+                  isAnimationActive={ false }
+                  line
+                  shape={ <CustomShape showValue={ selectedCount } /> } />
+                <XAxis
+                  dataKey='x'
+                  domain={ [0, 1] }
+                  hide
+                  height={ 0 } />
+                <YAxis
+                  dataKey='y'
+                  domain={ chartData.yDomain }
+                  hide
+                  width={ 0 } />
+              </ScatterChart>
+            </ResponsiveContainer>
+          </div>
+
+          <div className={ styles.chart }>
+            <ResponsiveContainer height={ height }>
+              <BarChart
+                barCategoryGap={ 1 }
+                data={ chartData.values }
+                margin={ { top: 0, right: 0, left: 0, bottom: 0 } }
+                ref='barChart'>
+                <Bar
+                  dataKey='value'
+                  onClick={ this.onClickprice }
+                  shape={ <CustomBar selected={ selectedIndex } onClick={ this.onClickprice } /> }stroke={ COLORS.line } />
+                <Tooltip
+                  content={ <CustomTooltip histogram={ histogram } /> }
+                  cursor={ this.renderCustomCursor() }
+                  wrapperStyle={ TOOL_STYLE } />
+                <XAxis
+                  dataKey='index'
+                  domain={ chartData.xDomain }
+                  hide
+                  type='category' />
+                <YAxis
+                  domain={ chartData.yDomain }
+                  hide
+                  type='number' />
+              </BarChart>
+            </ResponsiveContainer>
+          </div>
+        </div>
+      </div>
+    );
+  }
+
+  renderSlider () {
+    const { sliderValue } = this.state;
+
+    return (
+      <div className={ styles.sliderRow }>
+        <Slider
+          min={ 0 }
+          max={ 1 }
+          value={ sliderValue }
+          onChange={ this.onEditpriceSlider }
+          style={ {
+            flex: 1,
+            padding: '0 0.3em'
+          } }
+          sliderStyle={ {
+            marginBottom: 12
+          } }
+        />
+      </div>
+    );
+  }
+
+  renderCustomCursor = () => {
+    const { histogram } = this.props;
+    const { chartData } = this.state;
+
+    return (
+      <CustomCursor
+        counts={ histogram.counts }
+        getIndex={ this.getBarHoverIndex }
+        onClick={ this.onClickprice }
+        yDomain={ chartData.yDomain }
+      />
+    );
+  }
+
+  getBarHoverIndex = () => {
+    const { barChart } = this.refs;
+
+    if (!barChart || !barChart.state) {
+      return -1;
+    }
+
+    return barChart.state.activeTooltipIndex;
+  }
+
+  computeChartsData () {
+    const { priceChartData } = this.state;
+    const { histogram } = this.props;
+
+    const values = priceChartData
+      .map((value, index) => ({ value, index }));
+
+    const N = values.length - 1;
+    const maxGasCounts = countModifier(
+      histogram
+        .counts
+        .reduce((max, count) => count.greaterThan(max) ? count : max, 0)
+    );
+
+    const xDomain = [0, N];
+    const yDomain = [0, maxGasCounts * 1.1];
+
+    const chartData = {
+      values, N,
+      xDomain, yDomain
+    };
+
+    this.setState({ chartData }, () => {
+      this.updateSelectedBarChart();
+    });
+  }
+
+  computeCharts (props = this.props) {
+    const { histogram } = props;
+
+    const priceChartData = histogram
+      .counts
+      .map(count => countModifier(count));
+
+    this.setState(
+      { priceChartData },
+      () => this.computeChartsData()
+    );
+  }
+
+  updateSelectedBarChart (state = this.state) {
+  }
+
+  setprice (props = this.props) {
+    const { price, histogram } = props;
+
+    // If no gas price yet...
+    if (!price) {
+      return this.setSliderValue(0.5);
+    }
+
+    const bnprice = (typeof price === 'string')
+      ? new BigNumber(price)
+      : price;
+
+    // If gas price hasn't changed
+    if (this.state.price && bnprice.equals(this.state.price)) {
+      return;
+    }
+
+    const prices = histogram.bucketBounds;
+    const startIndex = prices
+      .findIndex(price => price.greaterThan(bnprice)) - 1;
+
+    // price Lower than the max in histogram
+    if (startIndex === -1) {
+      return this.setSliderValue(0, bnprice);
+    }
+
+    // price Greater than the max in histogram
+    if (startIndex === -2) {
+      return this.setSliderValue(1, bnprice);
+    }
+
+    const priceA = prices[startIndex];
+    const priceB = prices[startIndex + 1];
+
+    const sliderValueDec = bnprice
+      .minus(priceA)
+      .dividedBy(priceB.minus(priceA))
+      .toNumber();
+
+    const sliderValue = (startIndex + sliderValueDec) / (prices.length - 1);
+    this.setSliderValue(sliderValue, bnprice);
+  }
+
+  setSliderValue (value, price = this.state.price) {
+    const { histogram } = this.props;
+
+    const N = histogram.bucketBounds.length - 1;
+
+    const sliderValue = Math.max(0, Math.min(value, 1));
+    const selectedIndex = Math.floor(sliderValue * N);
+
+    this.setState({ sliderValue, price, selectedIndex });
+  }
+
+  onBarChartMouseUp = (event) => {
+    console.log(event);
+  }
+
+  onClickprice = (bar) => {
+    const { index } = bar;
+
+    const ratio = (index + 0.5) / (this.state.chartData.N + 1);
+
+    this.onEditpriceSlider(null, ratio);
+  }
+
+  onEditpriceSlider = (event, sliderValue) => {
+    const { histogram } = this.props;
+
+    const prices = histogram.bucketBounds;
+    const N = prices.length - 1;
+    const priceAIdx = Math.floor(sliderValue * N);
+    const priceBIdx = priceAIdx + 1;
+
+    if (priceBIdx === N + 1) {
+      const price = prices[priceAIdx].round();
+      this.props.onChange(event, price);
+      return;
+    }
+
+    const priceA = prices[priceAIdx];
+    const priceB = prices[priceBIdx];
+
+    const mult = Math.round((sliderValue % 1) * 100) / 100;
+    const price = priceA
+      .plus(priceB.minus(priceA).times(mult))
+      .round();
+
+    this.setSliderValue(sliderValue, price);
+    this.props.onChange(event, price.toFixed());
+  }
+}
diff --git a/js/src/ui/GasPriceEditor/GasPriceSelector/index.js b/js/src/ui/GasPriceSelector/index.js
similarity index 100%
rename from js/src/ui/GasPriceEditor/GasPriceSelector/index.js
rename to js/src/ui/GasPriceSelector/index.js
diff --git a/js/src/ui/GasPriceSelector/util.js b/js/src/ui/GasPriceSelector/util.js
new file mode 100644
index 0000000000..63c3e89b02
--- /dev/null
+++ b/js/src/ui/GasPriceSelector/util.js
@@ -0,0 +1,34 @@
+// Copyright 2015, 2016 Ethcore (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/>.
+
+const COLORS = {
+  default: 'rgba(255, 99, 132, 0.2)',
+  selected: 'rgba(255, 99, 132, 0.5)',
+  hover: 'rgba(255, 99, 132, 0.15)',
+  grid: 'rgba(255, 99, 132, 0.5)',
+  line: 'rgb(255, 99, 132)',
+  intersection: '#fff'
+};
+
+const countModifier = (count) => {
+  const val = count.toNumber ? count.toNumber() : count;
+  return Math.log10(val + 1) + 0.1;
+};
+
+export {
+  COLORS,
+  countModifier
+};
diff --git a/js/src/ui/index.js b/js/src/ui/index.js
index 7cf3e7ee57..6366854101 100644
--- a/js/src/ui/index.js
+++ b/js/src/ui/index.js
@@ -32,6 +32,7 @@ import Editor from './Editor';
 import Errors from './Errors';
 import Form, { AddressSelect, FormWrap, TypedInput, Input, InputAddress, InputAddressSelect, InputChip, InputInline, Select, RadioButtons } from './Form';
 import GasPriceEditor from './GasPriceEditor';
+import GasPriceSelector from './GasPriceSelector';
 import IdentityIcon from './IdentityIcon';
 import IdentityName from './IdentityName';
 import LanguageSelector from './LanguageSelector';
@@ -70,6 +71,7 @@ export {
   Form,
   FormWrap,
   GasPriceEditor,
+  GasPriceSelector,
   Input,
   InputAddress,
   InputAddressSelect,
diff --git a/js/src/views/ParityBar/parityBar.css b/js/src/views/ParityBar/parityBar.css
index dab1382389..d6fd3a538b 100644
--- a/js/src/views/ParityBar/parityBar.css
+++ b/js/src/views/ParityBar/parityBar.css
@@ -46,7 +46,7 @@
   border-radius: 4px 4px 0 0;
   display: flex;
   flex-direction: column;
-  max-height: 19em;
+  max-height: 50vh;
 }
 
 .expanded .content {
diff --git a/js/src/views/Signer/components/Account/AccountLink/AccountLink.css b/js/src/views/Signer/components/Account/AccountLink/accountLink.css
similarity index 100%
rename from js/src/views/Signer/components/Account/AccountLink/AccountLink.css
rename to js/src/views/Signer/components/Account/AccountLink/accountLink.css
diff --git a/js/src/views/Signer/components/Account/AccountLink/AccountLink.js b/js/src/views/Signer/components/Account/AccountLink/accountLink.js
similarity index 97%
rename from js/src/views/Signer/components/Account/AccountLink/AccountLink.js
rename to js/src/views/Signer/components/Account/AccountLink/accountLink.js
index f426754740..4a5578acfa 100644
--- a/js/src/views/Signer/components/Account/AccountLink/AccountLink.js
+++ b/js/src/views/Signer/components/Account/AccountLink/accountLink.js
@@ -17,7 +17,7 @@
 import React, { Component, PropTypes } from 'react';
 
 import { addressLink } from '~/3rdparty/etherscan/links';
-import styles from './AccountLink.css';
+import styles from './accountLink.css';
 
 export default class AccountLink extends Component {
   static propTypes = {
diff --git a/js/src/views/Signer/components/Account/AccountLink/index.js b/js/src/views/Signer/components/Account/AccountLink/index.js
index 90ae8634a1..6c50400f56 100644
--- a/js/src/views/Signer/components/Account/AccountLink/index.js
+++ b/js/src/views/Signer/components/Account/AccountLink/index.js
@@ -14,4 +14,4 @@
 // You should have received a copy of the GNU General Public License
 // along with Parity.  If not, see <http://www.gnu.org/licenses/>.
 
-export default from './AccountLink';
+export default from './accountLink';
diff --git a/js/src/views/Signer/components/Account/Account.css b/js/src/views/Signer/components/Account/account.css
similarity index 100%
rename from js/src/views/Signer/components/Account/Account.css
rename to js/src/views/Signer/components/Account/account.css
diff --git a/js/src/views/Signer/components/Account/Account.js b/js/src/views/Signer/components/Account/account.js
similarity index 98%
rename from js/src/views/Signer/components/Account/Account.js
rename to js/src/views/Signer/components/Account/account.js
index 05ca180c6e..79fe04d552 100644
--- a/js/src/views/Signer/components/Account/Account.js
+++ b/js/src/views/Signer/components/Account/account.js
@@ -19,7 +19,7 @@ import React, { Component, PropTypes } from 'react';
 import { IdentityIcon, IdentityName } from '~/ui';
 import AccountLink from './AccountLink';
 
-import styles from './Account.css';
+import styles from './account.css';
 
 export default class Account extends Component {
   static propTypes = {
diff --git a/js/src/views/Signer/components/Account/index.js b/js/src/views/Signer/components/Account/index.js
index c42a8a8103..55c215f7c9 100644
--- a/js/src/views/Signer/components/Account/index.js
+++ b/js/src/views/Signer/components/Account/index.js
@@ -14,4 +14,4 @@
 // You should have received a copy of the GNU General Public License
 // along with Parity.  If not, see <http://www.gnu.org/licenses/>.
 
-export default from './Account';
+export default from './account';
diff --git a/js/src/views/Signer/components/RequestPending/requestPending.js b/js/src/views/Signer/components/RequestPending/requestPending.js
index d50e5cde5b..67195888a1 100644
--- a/js/src/views/Signer/components/RequestPending/requestPending.js
+++ b/js/src/views/Signer/components/RequestPending/requestPending.js
@@ -21,21 +21,26 @@ import SignRequest from '../SignRequest';
 
 export default class RequestPending extends Component {
   static propTypes = {
+    className: PropTypes.string,
+    date: PropTypes.instanceOf(Date).isRequired,
+    gasLimit: PropTypes.object.isRequired,
     id: PropTypes.object.isRequired,
+    isSending: PropTypes.bool.isRequired,
+    isTest: PropTypes.bool.isRequired,
     onConfirm: PropTypes.func.isRequired,
     onReject: PropTypes.func.isRequired,
-    isSending: PropTypes.bool.isRequired,
-    date: PropTypes.instanceOf(Date).isRequired,
     payload: PropTypes.oneOfType([
-      PropTypes.shape({ signTransaction: PropTypes.object.isRequired }),
       PropTypes.shape({ sendTransaction: PropTypes.object.isRequired }),
-      PropTypes.shape({ sign: PropTypes.object.isRequired })
+      PropTypes.shape({ sign: PropTypes.object.isRequired }),
+      PropTypes.shape({ signTransaction: PropTypes.object.isRequired })
     ]).isRequired,
-    className: PropTypes.string,
-    isTest: PropTypes.bool.isRequired,
     store: PropTypes.object.isRequired
   };
 
+  static defaultProps = {
+    isSending: false
+  };
+
   onConfirm = data => {
     const { onConfirm, payload } = this.props;
 
@@ -44,24 +49,23 @@ export default class RequestPending extends Component {
   };
 
   render () {
-    const { payload, id, className, isSending, date, onReject, isTest, store } = this.props;
+    const { className, date, gasLimit, id, isSending, isTest, onReject, payload, store } = this.props;
 
     if (payload.sign) {
       const { sign } = payload;
 
       return (
         <SignRequest
-          className={ className }
-          onConfirm={ this.onConfirm }
-          onReject={ onReject }
-          isSending={ isSending }
-          isFinished={ false }
-          id={ id }
           address={ sign.address }
+          className={ className }
           hash={ sign.hash }
+          id={ id }
+          isFinished={ false }
+          isSending={ isSending }
           isTest={ isTest }
-          store={ store }
-          />
+          onConfirm={ this.onConfirm }
+          onReject={ onReject }
+          store={ store } />
       );
     }
 
@@ -70,19 +74,19 @@ export default class RequestPending extends Component {
       return (
         <TransactionPending
           className={ className }
-          onConfirm={ this.onConfirm }
-          onReject={ onReject }
-          isSending={ isSending }
-          id={ id }
-          transaction={ transaction }
           date={ date }
+          gasLimit={ gasLimit }
+          id={ id }
+          isSending={ isSending }
           isTest={ isTest }
+          onConfirm={ this.onConfirm }
+          onReject={ onReject }
           store={ store }
-          />
+          transaction={ transaction } />
       );
     }
 
-    // Unknown payload
+    console.error('RequestPending: Unknown payload', payload);
     return null;
   }
 }
diff --git a/js/src/views/Signer/components/SignRequest/index.js b/js/src/views/Signer/components/SignRequest/index.js
index 4aec1d19c9..0fe59540e2 100644
--- a/js/src/views/Signer/components/SignRequest/index.js
+++ b/js/src/views/Signer/components/SignRequest/index.js
@@ -14,4 +14,4 @@
 // You should have received a copy of the GNU General Public License
 // along with Parity.  If not, see <http://www.gnu.org/licenses/>.
 
-export default from './SignRequest';
+export default from './signRequest';
diff --git a/js/src/views/Signer/components/SignRequest/SignRequest.css b/js/src/views/Signer/components/SignRequest/signRequest.css
similarity index 100%
rename from js/src/views/Signer/components/SignRequest/SignRequest.css
rename to js/src/views/Signer/components/SignRequest/signRequest.css
diff --git a/js/src/views/Signer/components/SignRequest/SignRequest.js b/js/src/views/Signer/components/SignRequest/signRequest.js
similarity index 97%
rename from js/src/views/Signer/components/SignRequest/SignRequest.js
rename to js/src/views/Signer/components/SignRequest/signRequest.js
index ae4159c71d..91acddc345 100644
--- a/js/src/views/Signer/components/SignRequest/SignRequest.js
+++ b/js/src/views/Signer/components/SignRequest/signRequest.js
@@ -21,7 +21,7 @@ import Account from '../Account';
 import TransactionPendingForm from '../TransactionPendingForm';
 import TxHashLink from '../TxHashLink';
 
-import styles from './SignRequest.css';
+import styles from './signRequest.css';
 
 @observer
 export default class SignRequest extends Component {
@@ -49,7 +49,7 @@ export default class SignRequest extends Component {
     const { className } = this.props;
 
     return (
-      <div className={ `${styles.container} ${className || ''}` }>
+      <div className={ `${styles.container} ${className}` }>
         { this.renderDetails() }
         { this.renderActions() }
       </div>
diff --git a/js/src/views/Signer/components/SignRequest/signRequest.spec.js b/js/src/views/Signer/components/SignRequest/signRequest.spec.js
new file mode 100644
index 0000000000..53099bb9c7
--- /dev/null
+++ b/js/src/views/Signer/components/SignRequest/signRequest.spec.js
@@ -0,0 +1,34 @@
+// Copyright 2015, 2016 Ethcore (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 { shallow } from 'enzyme';
+import React from 'react';
+import sinon from 'sinon';
+
+import SignRequest from './';
+
+const store = {
+  balances: {},
+  fetchBalance: sinon.stub()
+};
+
+describe('views/Signer/components/SignRequest', () => {
+  it('renders', () => {
+    expect(shallow(
+      <SignRequest store={ store } />,
+    )).to.be.ok;
+  });
+});
diff --git a/js/src/views/Signer/components/TransactionMainDetails/index.js b/js/src/views/Signer/components/TransactionMainDetails/index.js
index f7b053acd3..73420d3339 100644
--- a/js/src/views/Signer/components/TransactionMainDetails/index.js
+++ b/js/src/views/Signer/components/TransactionMainDetails/index.js
@@ -14,4 +14,4 @@
 // You should have received a copy of the GNU General Public License
 // along with Parity.  If not, see <http://www.gnu.org/licenses/>.
 
-export default from './TransactionMainDetails';
+export default from './transactionMainDetails';
diff --git a/js/src/views/Signer/components/TransactionMainDetails/TransactionMainDetails.css b/js/src/views/Signer/components/TransactionMainDetails/transactionMainDetails.css
similarity index 95%
rename from js/src/views/Signer/components/TransactionMainDetails/TransactionMainDetails.css
rename to js/src/views/Signer/components/TransactionMainDetails/transactionMainDetails.css
index 92ed968d1a..2a42789ead 100644
--- a/js/src/views/Signer/components/TransactionMainDetails/TransactionMainDetails.css
+++ b/js/src/views/Signer/components/TransactionMainDetails/transactionMainDetails.css
@@ -17,20 +17,25 @@
 
 @import '../../_layout.css';
 
-.transaction {
-  flex: 1;
-  overflow: auto;
+.account {
+  text-align: center;
 }
 
-.transaction > * {
-  display: inline-block;
+.contractIcon {
+  background: #eee;
+  width: 50px !important;
+  height: 50px !important;
+  box-sizing: border-box;
+  border-radius: 50%;
+  padding: 13px;
 }
 
-.account {
-  text-align: center;
+.editButtonRow {
+  text-align: right;
 }
 
 .from {
+  display: inline-block;
   width: 40%;
   vertical-align: top;
 
@@ -47,6 +52,7 @@
 }
 
 .method {
+  display: inline-block;
   width: 60%;
   vertical-align: top;
   line-height: 1em;
@@ -66,11 +72,7 @@
   opacity: .5;
 }
 
-.contractIcon {
-  background: #eee;
-  width: 50px !important;
-  height: 50px !important;
-  box-sizing: border-box;
-  border-radius: 50%;
-  padding: 13px;
+.transaction {
+  flex: 1;
+  overflow: auto;
 }
diff --git a/js/src/views/Signer/components/TransactionMainDetails/TransactionMainDetails.js b/js/src/views/Signer/components/TransactionMainDetails/transactionMainDetails.js
similarity index 65%
rename from js/src/views/Signer/components/TransactionMainDetails/TransactionMainDetails.js
rename to js/src/views/Signer/components/TransactionMainDetails/transactionMainDetails.js
index 0a30991de3..1999cfe7f4 100644
--- a/js/src/views/Signer/components/TransactionMainDetails/TransactionMainDetails.js
+++ b/js/src/views/Signer/components/TransactionMainDetails/transactionMainDetails.js
@@ -14,52 +14,43 @@
 // You should have received a copy of the GNU General Public License
 // along with Parity.  If not, see <http://www.gnu.org/licenses/>.
 
+import MapsLocalGasStation from 'material-ui/svg-icons/maps/local-gas-station';
 import React, { Component, PropTypes } from 'react';
-
 import ReactTooltip from 'react-tooltip';
 
-import { MethodDecoding } from '~/ui';
+import { Button, MethodDecoding } from '~/ui';
 
 import * as tUtil from '../util/transaction';
 import Account from '../Account';
-import styles from './TransactionMainDetails.css';
+import styles from './transactionMainDetails.css';
 
 export default class TransactionMainDetails extends Component {
   static propTypes = {
-    id: PropTypes.object.isRequired,
+    children: PropTypes.node,
     from: PropTypes.string.isRequired,
-    fromBalance: PropTypes.object, // eth BigNumber, not required since it might take time to fetch
-    value: PropTypes.object.isRequired, // wei hex
-    totalValue: PropTypes.object.isRequired, // wei BigNumber
+    fromBalance: PropTypes.object,
+    gasStore: PropTypes.object,
+    id: PropTypes.object.isRequired,
     isTest: PropTypes.bool.isRequired,
+    totalValue: PropTypes.object.isRequired,
     transaction: PropTypes.object.isRequired,
-    children: PropTypes.node
+    value: PropTypes.object.isRequired
   };
 
   componentWillMount () {
-    const { value, totalValue } = this.props;
+    const { totalValue, value } = this.props;
 
     this.updateDisplayValues(value, totalValue);
   }
 
   componentWillReceiveProps (nextProps) {
-    const { value, totalValue } = nextProps;
+    const { totalValue, value } = nextProps;
 
     this.updateDisplayValues(value, totalValue);
   }
 
-  updateDisplayValues (value, totalValue) {
-    this.setState({
-      feeEth: tUtil.calcFeeInEth(totalValue, value),
-      valueDisplay: tUtil.getValueDisplay(value),
-      valueDisplayWei: tUtil.getValueDisplayWei(value),
-      totalValueDisplay: tUtil.getTotalValueDisplay(totalValue),
-      totalValueDisplayWei: tUtil.getTotalValueDisplayWei(totalValue)
-    });
-  }
-
   render () {
-    const { children, from, fromBalance, transaction, isTest } = this.props;
+    const { children, from, fromBalance, gasStore, isTest, transaction } = this.props;
 
     return (
       <div className={ styles.transaction }>
@@ -74,55 +65,92 @@ export default class TransactionMainDetails extends Component {
         <div className={ styles.method }>
           <MethodDecoding
             address={ from }
-            transaction={ transaction }
-            historic={ false } />
+            historic={ false }
+            transaction={
+              gasStore
+                ? gasStore.overrideTransaction(transaction)
+                : transaction
+            } />
+          { this.renderEditGas() }
         </div>
         { children }
       </div>
     );
   }
 
-  renderValue () {
+  renderEditGas () {
+    const { gasStore } = this.props;
+
+    if (!gasStore) {
+      return null;
+    }
+
+    return (
+      <div className={ styles.editButtonRow }>
+        <Button
+          icon={ <MapsLocalGasStation /> }
+          label='Edit gas/gasPrice'
+          onClick={ this.toggleGasEditor } />
+      </div>
+    );
+  }
+
+  renderTotalValue () {
     const { id } = this.props;
-    const { valueDisplay, valueDisplayWei } = this.state;
+    const { feeEth, totalValueDisplay, totalValueDisplayWei } = this.state;
+    const labelId = `totalValue${id}`;
 
     return (
       <div>
         <div
-          data-tip
-          data-for={ 'value' + id }
+          className={ styles.total }
           data-effect='solid'
-          >
-          <strong>{ valueDisplay } </strong>
-          <small>ETH</small>
+          data-for={ labelId }
+          data-place='bottom'
+          data-tip>
+          { totalValueDisplay } <small>ETH</small>
         </div>
-        <ReactTooltip id={ 'value' + id }>
-          The value of the transaction.<br />
-          <strong>{ valueDisplayWei }</strong> <small>WEI</small>
+        <ReactTooltip id={ labelId }>
+          The value of the transaction including the mining fee is <strong>{ totalValueDisplayWei }</strong> <small>WEI</small>. <br />
+          (This includes a mining fee of <strong>{ feeEth }</strong> <small>ETH</small>)
         </ReactTooltip>
       </div>
     );
   }
 
-  renderTotalValue () {
+  renderValue () {
     const { id } = this.props;
-    const { totalValueDisplay, totalValueDisplayWei, feeEth } = this.state;
+    const { valueDisplay, valueDisplayWei } = this.state;
+    const labelId = `value${id}`;
 
     return (
       <div>
         <div
-          data-tip
-          data-for={ 'totalValue' + id }
           data-effect='solid'
-          data-place='bottom'
-          className={ styles.total }>
-          { totalValueDisplay } <small>ETH</small>
+          data-for={ labelId }
+          data-tip>
+          <strong>{ valueDisplay } </strong>
+          <small>ETH</small>
         </div>
-        <ReactTooltip id={ 'totalValue' + id }>
-          The value of the transaction including the mining fee is <strong>{ totalValueDisplayWei }</strong> <small>WEI</small>. <br />
-          (This includes a mining fee of <strong>{ feeEth }</strong> <small>ETH</small>)
+        <ReactTooltip id={ labelId }>
+          The value of the transaction.<br />
+          <strong>{ valueDisplayWei }</strong> <small>WEI</small>
         </ReactTooltip>
       </div>
     );
   }
+
+  updateDisplayValues (value, totalValue) {
+    this.setState({
+      feeEth: tUtil.calcFeeInEth(totalValue, value),
+      totalValueDisplay: tUtil.getTotalValueDisplay(totalValue),
+      totalValueDisplayWei: tUtil.getTotalValueDisplayWei(totalValue),
+      valueDisplay: tUtil.getValueDisplay(value),
+      valueDisplayWei: tUtil.getValueDisplayWei(value)
+    });
+  }
+
+  toggleGasEditor = () => {
+    this.props.gasStore.setEditing(true);
+  }
 }
diff --git a/js/src/views/Signer/components/TransactionPending/index.js b/js/src/views/Signer/components/TransactionPending/index.js
index 1916d05713..3581c448c0 100644
--- a/js/src/views/Signer/components/TransactionPending/index.js
+++ b/js/src/views/Signer/components/TransactionPending/index.js
@@ -14,4 +14,4 @@
 // You should have received a copy of the GNU General Public License
 // along with Parity.  If not, see <http://www.gnu.org/licenses/>.
 
-export default from './TransactionPending';
+export default from './transactionPending';
diff --git a/js/src/views/Signer/components/TransactionPending/TransactionPending.css b/js/src/views/Signer/components/TransactionPending/transactionPending.css
similarity index 92%
rename from js/src/views/Signer/components/TransactionPending/TransactionPending.css
rename to js/src/views/Signer/components/TransactionPending/transactionPending.css
index 877066e575..dbda271353 100644
--- a/js/src/views/Signer/components/TransactionPending/TransactionPending.css
+++ b/js/src/views/Signer/components/TransactionPending/transactionPending.css
@@ -19,13 +19,9 @@
 
 .container {
   display: flex;
-  padding: 1em 0 1em;
+  padding: 1.5em 1em 1.5em 0;
 
   & > * {
     vertical-align: middle;
   }
 }
-
-.container+.container {
-  padding-top: 2em;
-}
diff --git a/js/src/views/Signer/components/TransactionPending/TransactionPending.js b/js/src/views/Signer/components/TransactionPending/transactionPending.js
similarity index 57%
rename from js/src/views/Signer/components/TransactionPending/TransactionPending.js
rename to js/src/views/Signer/components/TransactionPending/transactionPending.js
index ba3c308026..eea9491eed 100644
--- a/js/src/views/Signer/components/TransactionPending/TransactionPending.js
+++ b/js/src/views/Signer/components/TransactionPending/transactionPending.js
@@ -17,89 +17,130 @@
 import React, { Component, PropTypes } from 'react';
 import { observer } from 'mobx-react';
 
+import { Button, GasPriceEditor } from '~/ui';
+
 import TransactionMainDetails from '../TransactionMainDetails';
 import TransactionPendingForm from '../TransactionPendingForm';
 
-import styles from './TransactionPending.css';
+import styles from './transactionPending.css';
 
 import * as tUtil from '../util/transaction';
 
 @observer
 export default class TransactionPending extends Component {
+  static contextTypes = {
+    api: PropTypes.object.isRequired
+  };
+
   static propTypes = {
-    id: PropTypes.object.isRequired,
-    transaction: PropTypes.shape({
-      from: PropTypes.string.isRequired,
-      value: PropTypes.object.isRequired, // wei hex
-      gasPrice: PropTypes.object.isRequired, // wei hex
-      gas: PropTypes.object.isRequired, // hex
-      data: PropTypes.string, // hex
-      to: PropTypes.string // undefined if it's a contract
-    }).isRequired,
+    className: PropTypes.string,
     date: PropTypes.instanceOf(Date).isRequired,
+    gasLimit: PropTypes.object,
+    id: PropTypes.object.isRequired,
+    isSending: PropTypes.bool.isRequired,
+    isTest: PropTypes.bool.isRequired,
     nonce: PropTypes.number,
     onConfirm: PropTypes.func.isRequired,
     onReject: PropTypes.func.isRequired,
-    isSending: PropTypes.bool.isRequired,
-    className: PropTypes.string,
-    isTest: PropTypes.bool.isRequired,
-    store: PropTypes.object.isRequired
+    store: PropTypes.object.isRequired,
+    transaction: PropTypes.shape({
+      data: PropTypes.string,
+      from: PropTypes.string.isRequired,
+      gas: PropTypes.object.isRequired,
+      gasPrice: PropTypes.object.isRequired,
+      to: PropTypes.string,
+      value: PropTypes.object.isRequired
+    }).isRequired
   };
 
-  static defaultProps = {
-    isSending: false
-  };
+  gasStore = new GasPriceEditor.Store(this.context.api, {
+    gas: this.props.transaction.gas.toFixed(),
+    gasLimit: this.props.gasLimit,
+    gasPrice: this.props.transaction.gasPrice.toFixed()
+  });
 
   componentWillMount () {
-    const { transaction, store } = this.props;
-    const { gas, gasPrice, value, from, to } = transaction;
+    const { store, transaction } = this.props;
+    const { from, gas, gasPrice, to, value } = transaction;
 
     const fee = tUtil.getFee(gas, gasPrice); // BigNumber object
-    const totalValue = tUtil.getTotalValue(fee, value);
     const gasPriceEthmDisplay = tUtil.getEthmFromWeiDisplay(gasPrice);
     const gasToDisplay = tUtil.getGasDisplay(gas);
+    const totalValue = tUtil.getTotalValue(fee, value);
 
     this.setState({ gasPriceEthmDisplay, totalValue, gasToDisplay });
+    this.gasStore.setEthValue(value);
     store.fetchBalances([from, to]);
   }
 
   render () {
-    const { className, id, transaction, store, isTest } = this.props;
-    const { from, value } = transaction;
+    return this.gasStore.isEditing
+      ? this.renderGasEditor()
+      : this.renderTransaction();
+  }
+
+  renderTransaction () {
+    const { className, id, isSending, isTest, store, transaction } = this.props;
     const { totalValue } = this.state;
+    const { from, value } = transaction;
 
     const fromBalance = store.balances[from];
 
     return (
-      <div className={ `${styles.container} ${className || ''}` }>
+      <div className={ `${styles.container} ${className}` }>
         <TransactionMainDetails
-          id={ id }
-          value={ value }
+          className={ styles.transactionDetails }
           from={ from }
-          isTest={ isTest }
           fromBalance={ fromBalance }
-          className={ styles.transactionDetails }
+          gasStore={ this.gasStore }
+          id={ id }
+          isTest={ isTest }
+          totalValue={ totalValue }
           transaction={ transaction }
-          totalValue={ totalValue } />
+          value={ value } />
         <TransactionPendingForm
           address={ from }
-          isSending={ this.props.isSending }
+          isSending={ isSending }
           onConfirm={ this.onConfirm }
-          onReject={ this.onReject }
-        />
+          onReject={ this.onReject } />
       </div>
     );
   }
 
-  onConfirm = data => {
+  renderGasEditor () {
+    const { className } = this.props;
+
+    return (
+      <div className={ `${styles.container} ${className}` }>
+        <GasPriceEditor
+          store={ this.gasStore }>
+          <Button
+            label='view transaction'
+            onClick={ this.toggleGasEditor } />
+        </GasPriceEditor>
+      </div>
+    );
+  }
+
+  onConfirm = (data) => {
     const { id, transaction } = this.props;
-    const { gasPrice } = transaction;
     const { password, wallet } = data;
-
-    this.props.onConfirm({ id, password, wallet, gasPrice });
+    const { gas, gasPrice } = this.gasStore.overrideTransaction(transaction);
+
+    this.props.onConfirm({
+      gas,
+      gasPrice,
+      id,
+      password,
+      wallet
+    });
   }
 
   onReject = () => {
     this.props.onReject(this.props.id);
   }
+
+  toggleGasEditor = () => {
+    this.gasStore.setEditing(false);
+  }
 }
diff --git a/js/src/views/Signer/components/TransactionPendingForm/TransactionPendingFormConfirm/index.js b/js/src/views/Signer/components/TransactionPendingForm/TransactionPendingFormConfirm/index.js
index ad0f9fd1ff..254fb5971c 100644
--- a/js/src/views/Signer/components/TransactionPendingForm/TransactionPendingFormConfirm/index.js
+++ b/js/src/views/Signer/components/TransactionPendingForm/TransactionPendingFormConfirm/index.js
@@ -14,4 +14,4 @@
 // You should have received a copy of the GNU General Public License
 // along with Parity.  If not, see <http://www.gnu.org/licenses/>.
 
-export default from './TransactionPendingFormConfirm';
+export default from './transactionPendingFormConfirm';
diff --git a/js/src/views/Signer/components/TransactionPendingForm/TransactionPendingFormConfirm/TransactionPendingFormConfirm.css b/js/src/views/Signer/components/TransactionPendingForm/TransactionPendingFormConfirm/transactionPendingFormConfirm.css
similarity index 100%
rename from js/src/views/Signer/components/TransactionPendingForm/TransactionPendingFormConfirm/TransactionPendingFormConfirm.css
rename to js/src/views/Signer/components/TransactionPendingForm/TransactionPendingFormConfirm/transactionPendingFormConfirm.css
diff --git a/js/src/views/Signer/components/TransactionPendingForm/TransactionPendingFormConfirm/TransactionPendingFormConfirm.js b/js/src/views/Signer/components/TransactionPendingForm/TransactionPendingFormConfirm/transactionPendingFormConfirm.js
similarity index 71%
rename from js/src/views/Signer/components/TransactionPendingForm/TransactionPendingFormConfirm/TransactionPendingFormConfirm.js
rename to js/src/views/Signer/components/TransactionPendingForm/TransactionPendingFormConfirm/transactionPendingFormConfirm.js
index 7d2d660df4..f343c1f31e 100644
--- a/js/src/views/Signer/components/TransactionPendingForm/TransactionPendingFormConfirm/TransactionPendingFormConfirm.js
+++ b/js/src/views/Signer/components/TransactionPendingForm/TransactionPendingFormConfirm/transactionPendingFormConfirm.js
@@ -22,7 +22,7 @@ import ReactTooltip from 'react-tooltip';
 
 import { Form, Input, IdentityIcon } from '~/ui';
 
-import styles from './TransactionPendingFormConfirm.css';
+import styles from './transactionPendingFormConfirm.css';
 
 class TransactionPendingFormConfirm extends Component {
   static propTypes = {
@@ -35,14 +35,14 @@ class TransactionPendingFormConfirm extends Component {
   id = Math.random(); // for tooltip
 
   state = {
-    walletError: null,
+    password: '',
     wallet: null,
-    password: ''
+    walletError: null
   }
 
   render () {
     const { accounts, address, isSending } = this.props;
-    const { password, walletError, wallet } = this.state;
+    const { password, wallet, walletError } = this.state;
     const account = accounts[address] || {};
     const isExternal = !account.uuid;
 
@@ -51,37 +51,54 @@ class TransactionPendingFormConfirm extends Component {
       : null;
 
     const isWalletOk = !isExternal || (walletError === null && wallet !== null);
-    const keyInput = isExternal ? this.renderKeyInput() : null;
+    const keyInput = isExternal
+      ? this.renderKeyInput()
+      : null;
 
     return (
       <div className={ styles.confirmForm }>
         <Form>
           { keyInput }
           <Input
+            hint={
+              isExternal
+                ? 'decrypt the key'
+                : 'unlock the account'
+            }
+            label={
+              isExternal
+                ? 'Key Password'
+                : 'Account Password'
+            }
             onChange={ this.onModifyPassword }
             onKeyDown={ this.onKeyDown }
-            label={ isExternal ? 'Key Password' : 'Account Password' }
-            hint={ isExternal ? 'decrypt the key' : 'unlock the account' }
             type='password'
             value={ password } />
           <div className={ styles.passwordHint }>
             { passwordHint }
           </div>
           <div
-            data-tip
-            data-place='bottom'
-            data-for={ 'transactionConfirmForm' + this.id }
             data-effect='solid'
-          >
+            data-for={ `transactionConfirmForm${this.id}` }
+            data-place='bottom'
+            data-tip>
             <RaisedButton
-              onTouchTap={ this.onConfirm }
               className={ styles.confirmButton }
-              fullWidth
-              primary
               disabled={ isSending || !isWalletOk }
-              icon={ <IdentityIcon address={ address } button className={ styles.signerIcon } /> }
-              label={ isSending ? 'Confirming...' : 'Confirm Transaction' }
-            />
+              fullWidth
+              icon={
+                <IdentityIcon
+                  address={ address }
+                  button
+                  className={ styles.signerIcon } />
+              }
+              label={
+                isSending
+                  ? 'Confirming...'
+                  : 'Confirm Transaction'
+              }
+              onTouchTap={ this.onConfirm }
+              primary />
           </div>
           { this.renderTooltip() }
         </Form>
@@ -95,11 +112,10 @@ class TransactionPendingFormConfirm extends Component {
     return (
       <Input
         className={ styles.fileInput }
-        onChange={ this.onKeySelect }
         error={ walletError }
         label='Select Local Key'
-        type='file'
-        />
+        onChange={ this.onKeySelect }
+        type='file' />
     );
   }
 
@@ -109,34 +125,37 @@ class TransactionPendingFormConfirm extends Component {
     }
 
     return (
-      <ReactTooltip id={ 'transactionConfirmForm' + this.id }>
+      <ReactTooltip id={ `transactionConfirmForm${this.id}` }>
         Please provide a password for this account
       </ReactTooltip>
     );
   }
 
-  onKeySelect = evt => {
+  onKeySelect = (event) => {
     const fileReader = new FileReader();
-    fileReader.onload = e => {
+
+    fileReader.onload = (e) => {
       try {
         const wallet = JSON.parse(e.target.result);
+
         this.setState({
-          walletError: null,
-          wallet: wallet
+          wallet,
+          walletError: null
         });
-      } catch (e) {
+      } catch (error) {
         this.setState({
-          walletError: 'Given wallet file is invalid.',
-          wallet: null
+          wallet: null,
+          walletError: 'Given wallet file is invalid.'
         });
       }
     };
 
-    fileReader.readAsText(evt.target.files[0]);
+    fileReader.readAsText(event.target.files[0]);
   }
 
-  onModifyPassword = evt => {
-    const password = evt.target.value;
+  onModifyPassword = (event) => {
+    const password = event.target.value;
+
     this.setState({
       password
     });
@@ -150,8 +169,8 @@ class TransactionPendingFormConfirm extends Component {
     });
   }
 
-  onKeyDown = evt => {
-    if (evt.which !== 13) {
+  onKeyDown = (event) => {
+    if (event.which !== 13) {
       return;
     }
 
diff --git a/js/src/views/Signer/components/TransactionPendingForm/TransactionPendingFormReject/index.js b/js/src/views/Signer/components/TransactionPendingForm/TransactionPendingFormReject/index.js
index 3ac772104a..f8c37266f8 100644
--- a/js/src/views/Signer/components/TransactionPendingForm/TransactionPendingFormReject/index.js
+++ b/js/src/views/Signer/components/TransactionPendingForm/TransactionPendingFormReject/index.js
@@ -14,4 +14,4 @@
 // You should have received a copy of the GNU General Public License
 // along with Parity.  If not, see <http://www.gnu.org/licenses/>.
 
-export default from './TransactionPendingFormReject';
+export default from './transactionPendingFormReject';
diff --git a/js/src/views/Signer/components/TransactionPendingForm/TransactionPendingFormReject/TransactionPendingFormReject.css b/js/src/views/Signer/components/TransactionPendingForm/TransactionPendingFormReject/transactionPendingFormReject.css
similarity index 100%
rename from js/src/views/Signer/components/TransactionPendingForm/TransactionPendingFormReject/TransactionPendingFormReject.css
rename to js/src/views/Signer/components/TransactionPendingForm/TransactionPendingFormReject/transactionPendingFormReject.css
diff --git a/js/src/views/Signer/components/TransactionPendingForm/TransactionPendingFormReject/TransactionPendingFormReject.js b/js/src/views/Signer/components/TransactionPendingForm/TransactionPendingFormReject/transactionPendingFormReject.js
similarity index 96%
rename from js/src/views/Signer/components/TransactionPendingForm/TransactionPendingFormReject/TransactionPendingFormReject.js
rename to js/src/views/Signer/components/TransactionPendingForm/TransactionPendingFormReject/transactionPendingFormReject.js
index af06e79b43..890dd37502 100644
--- a/js/src/views/Signer/components/TransactionPendingForm/TransactionPendingFormReject/TransactionPendingFormReject.js
+++ b/js/src/views/Signer/components/TransactionPendingForm/TransactionPendingFormReject/transactionPendingFormReject.js
@@ -18,7 +18,7 @@ import React, { Component, PropTypes } from 'react';
 
 import RaisedButton from 'material-ui/RaisedButton';
 
-import styles from './TransactionPendingFormReject.css';
+import styles from './transactionPendingFormReject.css';
 
 export default class TransactionPendingFormReject extends Component {
 
diff --git a/js/src/views/Signer/components/TransactionPendingForm/index.js b/js/src/views/Signer/components/TransactionPendingForm/index.js
index 2fe1e90376..dfdcb41cea 100644
--- a/js/src/views/Signer/components/TransactionPendingForm/index.js
+++ b/js/src/views/Signer/components/TransactionPendingForm/index.js
@@ -14,4 +14,4 @@
 // You should have received a copy of the GNU General Public License
 // along with Parity.  If not, see <http://www.gnu.org/licenses/>.
 
-export default from './TransactionPendingForm';
+export default from './transactionPendingForm';
diff --git a/js/src/views/Signer/components/TransactionPendingForm/TransactionPendingForm.css b/js/src/views/Signer/components/TransactionPendingForm/transactionPendingForm.css
similarity index 100%
rename from js/src/views/Signer/components/TransactionPendingForm/TransactionPendingForm.css
rename to js/src/views/Signer/components/TransactionPendingForm/transactionPendingForm.css
diff --git a/js/src/views/Signer/components/TransactionPendingForm/TransactionPendingForm.js b/js/src/views/Signer/components/TransactionPendingForm/transactionPendingForm.js
similarity index 88%
rename from js/src/views/Signer/components/TransactionPendingForm/TransactionPendingForm.js
rename to js/src/views/Signer/components/TransactionPendingForm/transactionPendingForm.js
index 6f46cf5719..41d50f68e0 100644
--- a/js/src/views/Signer/components/TransactionPendingForm/TransactionPendingForm.js
+++ b/js/src/views/Signer/components/TransactionPendingForm/transactionPendingForm.js
@@ -20,10 +20,9 @@ import BackIcon from 'material-ui/svg-icons/navigation/arrow-back';
 
 import TransactionPendingFormConfirm from './TransactionPendingFormConfirm';
 import TransactionPendingFormReject from './TransactionPendingFormReject';
-import styles from './TransactionPendingForm.css';
+import styles from './transactionPendingForm.css';
 
 export default class TransactionPendingForm extends Component {
-
   static propTypes = {
     address: PropTypes.string.isRequired,
     isSending: PropTypes.bool.isRequired,
@@ -60,8 +59,8 @@ export default class TransactionPendingForm extends Component {
     return (
       <TransactionPendingFormConfirm
         address={ address }
-        onConfirm={ onConfirm }
-        isSending={ isSending } />
+        isSending={ isSending }
+        onConfirm={ onConfirm } />
     );
   }
 
@@ -72,14 +71,13 @@ export default class TransactionPendingForm extends Component {
     if (!isRejectOpen) {
       html = <span>reject transaction</span>;
     } else {
-      html = <span><BackIcon />I've changed my mind</span>;
+      html = <span><BackIcon />{ "I've changed my mind" }</span>;
     }
 
     return (
       <a
-        onClick={ this.onToggleReject }
         className={ styles.rejectToggle }
-      >
+        onClick={ this.onToggleReject }>
         { html }
       </a>
     );
@@ -87,7 +85,9 @@ export default class TransactionPendingForm extends Component {
 
   onToggleReject = () => {
     const { isRejectOpen } = this.state;
-    this.setState({ isRejectOpen: !isRejectOpen });
-  }
 
+    this.setState({
+      isRejectOpen: !isRejectOpen
+    });
+  }
 }
diff --git a/js/src/views/Signer/components/TxHashLink/index.js b/js/src/views/Signer/components/TxHashLink/index.js
index ef71992907..f831c9a61a 100644
--- a/js/src/views/Signer/components/TxHashLink/index.js
+++ b/js/src/views/Signer/components/TxHashLink/index.js
@@ -14,4 +14,4 @@
 // You should have received a copy of the GNU General Public License
 // along with Parity.  If not, see <http://www.gnu.org/licenses/>.
 
-export default from './TxHashLink';
+export default from './txHashLink';
diff --git a/js/src/views/Signer/components/TxHashLink/TxHashLink.js b/js/src/views/Signer/components/TxHashLink/txHashLink.js
similarity index 84%
rename from js/src/views/Signer/components/TxHashLink/TxHashLink.js
rename to js/src/views/Signer/components/TxHashLink/txHashLink.js
index bce30edede..cea3fe6025 100644
--- a/js/src/views/Signer/components/TxHashLink/TxHashLink.js
+++ b/js/src/views/Signer/components/TxHashLink/txHashLink.js
@@ -19,22 +19,21 @@ import React, { Component, PropTypes } from 'react';
 import { txLink } from '~/3rdparty/etherscan/links';
 
 export default class TxHashLink extends Component {
-
   static propTypes = {
-    txHash: PropTypes.string.isRequired,
-    isTest: PropTypes.bool.isRequired,
     children: PropTypes.node,
-    className: PropTypes.string
+    className: PropTypes.string,
+    isTest: PropTypes.bool.isRequired,
+    txHash: PropTypes.string.isRequired
   }
 
   render () {
-    const { children, txHash, className, isTest } = this.props;
+    const { children, className, isTest, txHash } = this.props;
 
     return (
       <a
+        className={ className }
         href={ txLink(txHash, isTest) }
-        target='_blank'
-        className={ className }>
+        target='_blank'>
         { children || txHash }
       </a>
     );
diff --git a/js/src/views/Signer/containers/Embedded/embedded.css b/js/src/views/Signer/containers/Embedded/embedded.css
index ffc6a209f3..fcd49a8514 100644
--- a/js/src/views/Signer/containers/Embedded/embedded.css
+++ b/js/src/views/Signer/containers/Embedded/embedded.css
@@ -17,16 +17,22 @@
 
 @import '../../_layout.css';
 
-.signer {
-  box-sizing: border-box;
-  padding: 0;
-  width: $embedWidth;
+.info {
+  padding: 1em 0;
 }
 
 .none {
   color: #aaa;
 }
 
-.info {
-  padding: 1em 0;
+.request {
+  &:nth-child(even) {
+    background: rgba(255, 255, 255, 0.04);
+  }
+}
+
+.signer {
+  box-sizing: border-box;
+  padding: 0;
+  width: $embedWidth;
 }
diff --git a/js/src/views/Signer/containers/Embedded/embedded.js b/js/src/views/Signer/containers/Embedded/embedded.js
index 4629a6522f..51452520b2 100644
--- a/js/src/views/Signer/containers/Embedded/embedded.js
+++ b/js/src/views/Signer/containers/Embedded/embedded.js
@@ -33,15 +33,16 @@ class Embedded extends Component {
   };
 
   static propTypes = {
-    signer: PropTypes.shape({
-      pending: PropTypes.array.isRequired,
-      finished: PropTypes.array.isRequired
-    }).isRequired,
     actions: PropTypes.shape({
       startConfirmRequest: PropTypes.func.isRequired,
       startRejectRequest: PropTypes.func.isRequired
     }).isRequired,
-    isTest: PropTypes.bool.isRequired
+    gasLimit: PropTypes.object.isRequired,
+    isTest: PropTypes.bool.isRequired,
+    signer: PropTypes.shape({
+      finished: PropTypes.array.isRequired,
+      pending: PropTypes.array.isRequired
+    }).isRequired
   };
 
   store = new Store(this.context.api);
@@ -78,20 +79,21 @@ class Embedded extends Component {
   }
 
   renderPending = (data) => {
-    const { actions, isTest } = this.props;
-    const { payload, id, isSending, date } = data;
+    const { actions, gasLimit, isTest } = this.props;
+    const { date, id, isSending, payload } = data;
 
     return (
       <RequestPending
         className={ styles.request }
+        date={ date }
+        gasLimit={ gasLimit }
+        id={ id }
+        isSending={ isSending }
+        isTest={ isTest }
+        key={ id }
         onConfirm={ actions.startConfirmRequest }
         onReject={ actions.startRejectRequest }
-        isSending={ isSending || false }
-        key={ id }
-        id={ id }
         payload={ payload }
-        date={ date }
-        isTest={ isTest }
         store={ this.store }
       />
     );
@@ -103,13 +105,14 @@ class Embedded extends Component {
 }
 
 function mapStateToProps (state) {
-  const { isTest } = state.nodeStatus;
+  const { gasLimit, isTest } = state.nodeStatus;
   const { actions, signer } = state;
 
   return {
     actions,
-    signer,
-    isTest
+    gasLimit,
+    isTest,
+    signer
   };
 }
 
diff --git a/js/src/views/Signer/containers/RequestsPage/index.js b/js/src/views/Signer/containers/RequestsPage/index.js
index cb3fdd1439..ee3b54f545 100644
--- a/js/src/views/Signer/containers/RequestsPage/index.js
+++ b/js/src/views/Signer/containers/RequestsPage/index.js
@@ -14,4 +14,4 @@
 // You should have received a copy of the GNU General Public License
 // along with Parity.  If not, see <http://www.gnu.org/licenses/>.
 
-export default from './RequestsPage';
+export default from './requestsPage';
diff --git a/js/src/views/Signer/containers/RequestsPage/RequestsPage.css b/js/src/views/Signer/containers/RequestsPage/requestsPage.css
similarity index 90%
rename from js/src/views/Signer/containers/RequestsPage/RequestsPage.css
rename to js/src/views/Signer/containers/RequestsPage/requestsPage.css
index 662c458174..f26f66e86d 100644
--- a/js/src/views/Signer/containers/RequestsPage/RequestsPage.css
+++ b/js/src/views/Signer/containers/RequestsPage/requestsPage.css
@@ -18,3 +18,9 @@
 .noRequestsMsg {
   color: #aaa;
 }
+
+.request {
+  &:nth-child(odd) {
+    background: rgba(255, 255, 255, 0.04);
+  }
+}
diff --git a/js/src/views/Signer/containers/RequestsPage/RequestsPage.js b/js/src/views/Signer/containers/RequestsPage/requestsPage.js
similarity index 88%
rename from js/src/views/Signer/containers/RequestsPage/RequestsPage.js
rename to js/src/views/Signer/containers/RequestsPage/requestsPage.js
index f3cd5a2671..db52b008e1 100644
--- a/js/src/views/Signer/containers/RequestsPage/RequestsPage.js
+++ b/js/src/views/Signer/containers/RequestsPage/requestsPage.js
@@ -26,7 +26,7 @@ import { Container, Page, TxList } from '~/ui';
 
 import RequestPending from '../../components/RequestPending';
 
-import styles from './RequestsPage.css';
+import styles from './requestsPage.css';
 
 @observer
 class RequestsPage extends Component {
@@ -35,15 +35,16 @@ class RequestsPage extends Component {
   };
 
   static propTypes = {
-    signer: PropTypes.shape({
-      pending: PropTypes.array.isRequired,
-      finished: PropTypes.array.isRequired
-    }).isRequired,
     actions: PropTypes.shape({
       startConfirmRequest: PropTypes.func.isRequired,
       startRejectRequest: PropTypes.func.isRequired
     }).isRequired,
-    isTest: PropTypes.bool.isRequired
+    gasLimit: PropTypes.object.isRequired,
+    isTest: PropTypes.bool.isRequired,
+    signer: PropTypes.shape({
+      pending: PropTypes.array.isRequired,
+      finished: PropTypes.array.isRequired
+    }).isRequired
   };
 
   store = new Store(this.context.api, true);
@@ -104,19 +105,21 @@ class RequestsPage extends Component {
   }
 
   renderPending = (data) => {
-    const { actions, isTest } = this.props;
-    const { payload, id, isSending, date } = data;
+    const { actions, gasLimit, isTest } = this.props;
+    const { date, id, isSending, payload } = data;
 
     return (
       <RequestPending
+        className={ styles.request }
+        date={ date }
+        gasLimit={ gasLimit }
+        id={ id }
+        isSending={ isSending }
+        isTest={ isTest }
+        key={ id }
         onConfirm={ actions.startConfirmRequest }
         onReject={ actions.startRejectRequest }
-        isSending={ isSending || false }
-        key={ id }
-        id={ id }
         payload={ payload }
-        date={ date }
-        isTest={ isTest }
         store={ this.store }
       />
     );
@@ -124,13 +127,14 @@ class RequestsPage extends Component {
 }
 
 function mapStateToProps (state) {
-  const { isTest } = state.nodeStatus;
+  const { gasLimit, isTest } = state.nodeStatus;
   const { actions, signer } = state;
 
   return {
     actions,
-    signer,
-    isTest
+    gasLimit,
+    isTest,
+    signer
   };
 }
 
-- 
GitLab


From 797d787a7bd53178e8b1bba1068b3603c3e7659d Mon Sep 17 00:00:00 2001
From: GitLab Build Bot <jaco+gitlab@ethcore.io>
Date: Sun, 11 Dec 2016 16:51:09 +0000
Subject: [PATCH 36/64] [ci skip] js-precompiled 20161211-164839

---
 Cargo.lock      | 2 +-
 js/package.json | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index fcf12f1f6a..2c492bc9ea 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1290,7 +1290,7 @@ dependencies = [
 [[package]]
 name = "parity-ui-precompiled"
 version = "1.4.0"
-source = "git+https://github.com/ethcore/js-precompiled.git#e1c4592ba60727af643c54941bf97f63cd9b5737"
+source = "git+https://github.com/ethcore/js-precompiled.git#6430c6ef5d00f3a411546021ae2915740abce561"
 dependencies = [
  "parity-dapps-glue 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
diff --git a/js/package.json b/js/package.json
index 525211517a..b4ea41a616 100644
--- a/js/package.json
+++ b/js/package.json
@@ -1,6 +1,6 @@
 {
   "name": "parity.js",
-  "version": "0.2.112",
+  "version": "0.2.113",
   "main": "release/index.js",
   "jsnext:main": "src/index.js",
   "author": "Parity Team <admin@parity.io>",
-- 
GitLab


From 17cc2be4b5c1a4fc4d8185f6e6afcfc4980a8636 Mon Sep 17 00:00:00 2001
From: Gav Wood <gavin@ethcore.io>
Date: Sun, 11 Dec 2016 19:30:54 +0100
Subject: [PATCH 37/64] Rename ethcore -> parity in license.

---
 build.rs                                             | 2 +-
 dapps/build.rs                                       | 2 +-
 dapps/js-glue/build.rs                               | 2 +-
 dapps/js-glue/src/codegen.rs                         | 2 +-
 dapps/js-glue/src/js.rs                              | 2 +-
 dapps/js-glue/src/lib.rs                             | 2 +-
 dapps/js-glue/src/lib.rs.in                          | 2 +-
 dapps/src/api/api.rs                                 | 2 +-
 dapps/src/api/mod.rs                                 | 2 +-
 dapps/src/api/response.rs                            | 2 +-
 dapps/src/api/types.rs                               | 2 +-
 dapps/src/api/types.rs.in                            | 2 +-
 dapps/src/apps/cache.rs                              | 2 +-
 dapps/src/apps/fetcher.rs                            | 2 +-
 dapps/src/apps/fs.rs                                 | 2 +-
 dapps/src/apps/manifest.rs                           | 2 +-
 dapps/src/apps/mod.rs                                | 2 +-
 dapps/src/endpoint.rs                                | 2 +-
 dapps/src/handlers/auth.rs                           | 2 +-
 dapps/src/handlers/content.rs                        | 2 +-
 dapps/src/handlers/echo.rs                           | 2 +-
 dapps/src/handlers/fetch.rs                          | 2 +-
 dapps/src/handlers/mod.rs                            | 2 +-
 dapps/src/handlers/redirect.rs                       | 2 +-
 dapps/src/lib.rs                                     | 2 +-
 dapps/src/page/builtin.rs                            | 2 +-
 dapps/src/page/handler.rs                            | 2 +-
 dapps/src/page/local.rs                              | 2 +-
 dapps/src/page/mod.rs                                | 2 +-
 dapps/src/proxypac.rs                                | 2 +-
 dapps/src/router/auth.rs                             | 2 +-
 dapps/src/router/host_validation.rs                  | 2 +-
 dapps/src/router/mod.rs                              | 2 +-
 dapps/src/rpc.rs                                     | 2 +-
 dapps/src/tests/api.rs                               | 2 +-
 dapps/src/tests/authorization.rs                     | 2 +-
 dapps/src/tests/fetch.rs                             | 2 +-
 dapps/src/tests/helpers.rs                           | 2 +-
 dapps/src/tests/mod.rs                               | 2 +-
 dapps/src/tests/redirection.rs                       | 2 +-
 dapps/src/tests/validation.rs                        | 2 +-
 dapps/src/url.rs                                     | 2 +-
 dapps/ui/src/lib.rs                                  | 2 +-
 db/build.rs                                          | 2 +-
 db/src/database.rs                                   | 2 +-
 db/src/lib.rs                                        | 2 +-
 db/src/lib.rs.in                                     | 2 +-
 db/src/traits.rs                                     | 2 +-
 devtools/src/http_client.rs                          | 2 +-
 devtools/src/lib.rs                                  | 2 +-
 devtools/src/random_path.rs                          | 2 +-
 devtools/src/stop_guard.rs                           | 2 +-
 devtools/src/test_socket.rs                          | 2 +-
 ethash/src/compute.rs                                | 2 +-
 ethash/src/lib.rs                                    | 2 +-
 ethcore/build.rs                                     | 2 +-
 ethcore/hash-fetch/src/client.rs                     | 2 +-
 ethcore/hash-fetch/src/lib.rs                        | 2 +-
 ethcore/hash-fetch/src/urlhint.rs                    | 2 +-
 ethcore/light/build.rs                               | 2 +-
 ethcore/light/src/net/error.rs                       | 2 +-
 ethcore/light/src/types/mod.rs                       | 2 +-
 ethcore/light/src/types/mod.rs.in                    | 2 +-
 ethcore/src/account_db.rs                            | 2 +-
 ethcore/src/account_provider/mod.rs                  | 2 +-
 ethcore/src/account_provider/stores.rs               | 2 +-
 ethcore/src/action_params.rs                         | 2 +-
 ethcore/src/basic_types.rs                           | 2 +-
 ethcore/src/blockchain/best_block.rs                 | 2 +-
 ethcore/src/blockchain/block_info.rs                 | 2 +-
 ethcore/src/blockchain/cache.rs                      | 2 +-
 ethcore/src/blockchain/config.rs                     | 2 +-
 ethcore/src/blockchain/extras.rs                     | 2 +-
 ethcore/src/blockchain/generator/block.rs            | 2 +-
 ethcore/src/blockchain/generator/bloom.rs            | 2 +-
 ethcore/src/blockchain/generator/complete.rs         | 2 +-
 ethcore/src/blockchain/generator/fork.rs             | 2 +-
 ethcore/src/blockchain/generator/generator.rs        | 2 +-
 ethcore/src/blockchain/generator/mod.rs              | 2 +-
 ethcore/src/blockchain/generator/transaction.rs      | 2 +-
 ethcore/src/blockchain/import_route.rs               | 2 +-
 ethcore/src/blockchain/mod.rs                        | 2 +-
 ethcore/src/blooms/bloom.rs                          | 2 +-
 ethcore/src/blooms/bloom_group.rs                    | 2 +-
 ethcore/src/blooms/group_position.rs                 | 2 +-
 ethcore/src/blooms/mod.rs                            | 2 +-
 ethcore/src/builtin.rs                               | 2 +-
 ethcore/src/cache_manager.rs                         | 2 +-
 ethcore/src/client/chain_notify.rs                   | 2 +-
 ethcore/src/client/config.rs                         | 2 +-
 ethcore/src/client/mod.rs                            | 2 +-
 ethcore/src/client/test_client.rs                    | 2 +-
 ethcore/src/client/traits.rs                         | 2 +-
 ethcore/src/db.rs                                    | 2 +-
 ethcore/src/engines/authority_round.rs               | 2 +-
 ethcore/src/engines/basic_authority.rs               | 2 +-
 ethcore/src/engines/instant_seal.rs                  | 2 +-
 ethcore/src/engines/null_engine.rs                   | 2 +-
 ethcore/src/env_info.rs                              | 2 +-
 ethcore/src/error.rs                                 | 2 +-
 ethcore/src/ethereum/denominations.rs                | 2 +-
 ethcore/src/ethereum/mod.rs                          | 2 +-
 ethcore/src/evm/benches/mod.rs                       | 2 +-
 ethcore/src/evm/evm.rs                               | 2 +-
 ethcore/src/evm/ext.rs                               | 2 +-
 ethcore/src/evm/factory.rs                           | 2 +-
 ethcore/src/evm/interpreter/informant.rs             | 2 +-
 ethcore/src/evm/interpreter/memory.rs                | 2 +-
 ethcore/src/evm/interpreter/shared_cache.rs          | 2 +-
 ethcore/src/evm/interpreter/stack.rs                 | 2 +-
 ethcore/src/evm/jit.rs                               | 2 +-
 ethcore/src/evm/mod.rs                               | 2 +-
 ethcore/src/evm/schedule.rs                          | 2 +-
 ethcore/src/externalities.rs                         | 2 +-
 ethcore/src/factory.rs                               | 2 +-
 ethcore/src/header.rs                                | 2 +-
 ethcore/src/json_tests/chain.rs                      | 2 +-
 ethcore/src/json_tests/eip150_state.rs               | 2 +-
 ethcore/src/json_tests/eip161_state.rs               | 2 +-
 ethcore/src/json_tests/executive.rs                  | 2 +-
 ethcore/src/json_tests/homestead_chain.rs            | 2 +-
 ethcore/src/json_tests/homestead_state.rs            | 2 +-
 ethcore/src/json_tests/mod.rs                        | 2 +-
 ethcore/src/json_tests/test_common.rs                | 2 +-
 ethcore/src/json_tests/transaction.rs                | 2 +-
 ethcore/src/json_tests/trie.rs                       | 2 +-
 ethcore/src/lib.rs                                   | 2 +-
 ethcore/src/migrations/blocks/mod.rs                 | 2 +-
 ethcore/src/migrations/blocks/v8.rs                  | 2 +-
 ethcore/src/migrations/extras/mod.rs                 | 2 +-
 ethcore/src/migrations/extras/v6.rs                  | 2 +-
 ethcore/src/migrations/mod.rs                        | 2 +-
 ethcore/src/migrations/state/mod.rs                  | 2 +-
 ethcore/src/migrations/state/v7.rs                   | 2 +-
 ethcore/src/migrations/v10.rs                        | 2 +-
 ethcore/src/migrations/v9.rs                         | 2 +-
 ethcore/src/miner/banning_queue.rs                   | 2 +-
 ethcore/src/miner/external.rs                        | 2 +-
 ethcore/src/miner/local_transactions.rs              | 2 +-
 ethcore/src/miner/mod.rs                             | 2 +-
 ethcore/src/miner/price_info.rs                      | 2 +-
 ethcore/src/miner/work_notify.rs                     | 2 +-
 ethcore/src/pod_account.rs                           | 2 +-
 ethcore/src/pod_state.rs                             | 2 +-
 ethcore/src/service.rs                               | 2 +-
 ethcore/src/snapshot/account.rs                      | 2 +-
 ethcore/src/snapshot/block.rs                        | 2 +-
 ethcore/src/snapshot/error.rs                        | 2 +-
 ethcore/src/snapshot/io.rs                           | 2 +-
 ethcore/src/snapshot/mod.rs                          | 2 +-
 ethcore/src/snapshot/service.rs                      | 2 +-
 ethcore/src/snapshot/snapshot_service_trait.rs       | 2 +-
 ethcore/src/snapshot/tests/blocks.rs                 | 2 +-
 ethcore/src/snapshot/tests/helpers.rs                | 2 +-
 ethcore/src/snapshot/tests/mod.rs                    | 2 +-
 ethcore/src/snapshot/tests/service.rs                | 2 +-
 ethcore/src/snapshot/tests/state.rs                  | 2 +-
 ethcore/src/snapshot/watcher.rs                      | 2 +-
 ethcore/src/spec/genesis.rs                          | 2 +-
 ethcore/src/spec/mod.rs                              | 2 +-
 ethcore/src/spec/seal.rs                             | 2 +-
 ethcore/src/spec/spec.rs                             | 2 +-
 ethcore/src/state/account.rs                         | 2 +-
 ethcore/src/state/substate.rs                        | 2 +-
 ethcore/src/state_db.rs                              | 2 +-
 ethcore/src/tests/client.rs                          | 2 +-
 ethcore/src/tests/helpers.rs                         | 2 +-
 ethcore/src/tests/mod.rs                             | 2 +-
 ethcore/src/tests/rpc.rs                             | 2 +-
 ethcore/src/trace/config.rs                          | 2 +-
 ethcore/src/trace/db.rs                              | 2 +-
 ethcore/src/trace/error.rs                           | 2 +-
 ethcore/src/trace/executive_tracer.rs                | 2 +-
 ethcore/src/trace/import.rs                          | 2 +-
 ethcore/src/trace/mod.rs                             | 2 +-
 ethcore/src/trace/noop_tracer.rs                     | 2 +-
 ethcore/src/types/account_diff.rs                    | 2 +-
 ethcore/src/types/block_import_error.rs              | 2 +-
 ethcore/src/types/block_status.rs                    | 2 +-
 ethcore/src/types/blockchain_info.rs                 | 2 +-
 ethcore/src/types/call_analytics.rs                  | 2 +-
 ethcore/src/types/executed.rs                        | 2 +-
 ethcore/src/types/filter.rs                          | 2 +-
 ethcore/src/types/ids.rs                             | 2 +-
 ethcore/src/types/log_entry.rs                       | 2 +-
 ethcore/src/types/mod.rs                             | 2 +-
 ethcore/src/types/mod.rs.in                          | 2 +-
 ethcore/src/types/mode.rs                            | 2 +-
 ethcore/src/types/pruning_info.rs                    | 2 +-
 ethcore/src/types/receipt.rs                         | 2 +-
 ethcore/src/types/restoration_status.rs              | 2 +-
 ethcore/src/types/snapshot_manifest.rs               | 2 +-
 ethcore/src/types/state_diff.rs                      | 2 +-
 ethcore/src/types/trace_filter.rs                    | 2 +-
 ethcore/src/types/trace_types/error.rs               | 2 +-
 ethcore/src/types/trace_types/flat.rs                | 2 +-
 ethcore/src/types/trace_types/localized.rs           | 2 +-
 ethcore/src/types/trace_types/mod.rs                 | 2 +-
 ethcore/src/types/transaction.rs                     | 2 +-
 ethcore/src/types/transaction_import.rs              | 2 +-
 ethcore/src/types/tree_route.rs                      | 2 +-
 ethcore/src/types/verification_queue_info.rs         | 2 +-
 ethcore/src/verification/canon_verifier.rs           | 2 +-
 ethcore/src/verification/mod.rs                      | 2 +-
 ethcore/src/verification/noop_verifier.rs            | 2 +-
 ethcore/src/verification/queue/kind.rs               | 2 +-
 ethcore/src/verification/verification.rs             | 2 +-
 ethcore/src/verification/verifier.rs                 | 2 +-
 ethcore/src/views/block.rs                           | 2 +-
 ethcore/src/views/body.rs                            | 2 +-
 ethcore/src/views/header.rs                          | 2 +-
 ethcore/src/views/mod.rs                             | 2 +-
 ethcore/src/views/transaction.rs                     | 2 +-
 ethcrypto/src/lib.rs                                 | 2 +-
 ethkey/src/bin/ethkey.rs                             | 2 +-
 ethkey/src/bin/main.rs                               | 2 +-
 ethkey/src/brain.rs                                  | 2 +-
 ethkey/src/error.rs                                  | 2 +-
 ethkey/src/keccak.rs                                 | 2 +-
 ethkey/src/keypair.rs                                | 2 +-
 ethkey/src/lib.rs                                    | 2 +-
 ethkey/src/prefix.rs                                 | 2 +-
 ethkey/src/random.rs                                 | 2 +-
 ethkey/src/signature.rs                              | 2 +-
 ethstore/build.rs                                    | 2 +-
 ethstore/src/account/cipher.rs                       | 2 +-
 ethstore/src/account/kdf.rs                          | 2 +-
 ethstore/src/account/mod.rs                          | 2 +-
 ethstore/src/account/safe_account.rs                 | 2 +-
 ethstore/src/account/version.rs                      | 2 +-
 ethstore/src/bin/ethstore.rs                         | 2 +-
 ethstore/src/bin/main.rs                             | 2 +-
 ethstore/src/dir/disk.rs                             | 2 +-
 ethstore/src/dir/geth.rs                             | 2 +-
 ethstore/src/dir/mod.rs                              | 2 +-
 ethstore/src/dir/parity.rs                           | 2 +-
 ethstore/src/error.rs                                | 2 +-
 ethstore/src/ethkey.rs                               | 2 +-
 ethstore/src/ethstore.rs                             | 2 +-
 ethstore/src/import.rs                               | 2 +-
 ethstore/src/json/cipher.rs                          | 2 +-
 ethstore/src/json/crypto.rs                          | 2 +-
 ethstore/src/json/error.rs                           | 2 +-
 ethstore/src/json/hash.rs                            | 2 +-
 ethstore/src/json/id.rs                              | 2 +-
 ethstore/src/json/kdf.rs                             | 2 +-
 ethstore/src/json/key_file.rs                        | 2 +-
 ethstore/src/json/mod.rs                             | 2 +-
 ethstore/src/json/version.rs                         | 2 +-
 ethstore/src/lib.rs                                  | 2 +-
 ethstore/src/random.rs                               | 2 +-
 ethstore/src/secret_store.rs                         | 2 +-
 ethstore/tests/api.rs                                | 2 +-
 ethstore/tests/cli.rs                                | 2 +-
 ethstore/tests/util/mod.rs                           | 2 +-
 ethstore/tests/util/transient_dir.rs                 | 2 +-
 evmbin/benches/mod.rs                                | 2 +-
 evmbin/src/ext.rs                                    | 2 +-
 evmbin/src/main.rs                                   | 2 +-
 evmjit/src/lib.rs                                    | 2 +-
 ipc/codegen/build.rs                                 | 2 +-
 ipc/codegen/src/lib.rs                               | 2 +-
 ipc/codegen/src/lib.rs.in                            | 2 +-
 ipc/hypervisor/build.rs                              | 2 +-
 ipc/hypervisor/src/lib.rs                            | 2 +-
 ipc/hypervisor/src/service.rs                        | 2 +-
 ipc/hypervisor/src/service.rs.in                     | 2 +-
 ipc/nano/src/lib.rs                                  | 2 +-
 ipc/rpc/src/interface.rs                             | 2 +-
 ipc/rpc/src/lib.rs                                   | 2 +-
 ipc/tests/binary.rs                                  | 2 +-
 ipc/tests/binary.rs.in                               | 2 +-
 ipc/tests/build.rs                                   | 2 +-
 ipc/tests/examples.rs                                | 2 +-
 ipc/tests/nested.rs                                  | 2 +-
 ipc/tests/nested.rs.in                               | 2 +-
 ipc/tests/over_nano.rs                               | 2 +-
 ipc/tests/run.rs                                     | 2 +-
 ipc/tests/service.rs                                 | 2 +-
 ipc/tests/service.rs.in                              | 2 +-
 ipc/tests/with_attrs.rs                              | 2 +-
 ipc/tests/with_attrs.rs.in                           | 2 +-
 js/build.rs                                          | 2 +-
 js/src/abi/abi.js                                    | 2 +-
 js/src/abi/decoder/bytesTaken.js                     | 2 +-
 js/src/abi/decoder/bytesTaken.spec.js                | 2 +-
 js/src/abi/decoder/decodeResult.js                   | 2 +-
 js/src/abi/decoder/decodeResult.spec.js              | 2 +-
 js/src/abi/decoder/decoder.js                        | 2 +-
 js/src/abi/decoder/index.js                          | 2 +-
 js/src/abi/encoder/encoder.js                        | 2 +-
 js/src/abi/encoder/index.js                          | 2 +-
 js/src/abi/encoder/mediate.js                        | 2 +-
 js/src/abi/encoder/mediate.spec.js                   | 2 +-
 js/src/abi/index.js                                  | 2 +-
 js/src/abi/spec/constructor.js                       | 2 +-
 js/src/abi/spec/constructor.spec.js                  | 2 +-
 js/src/abi/spec/function.js                          | 2 +-
 js/src/abi/spec/function.spec.js                     | 2 +-
 js/src/abi/spec/index.js                             | 2 +-
 js/src/abi/spec/interface.js                         | 2 +-
 js/src/abi/spec/interface.spec.js                    | 2 +-
 js/src/abi/spec/param.js                             | 2 +-
 js/src/abi/spec/param.spec.js                        | 2 +-
 js/src/abi/token/index.js                            | 2 +-
 js/src/abi/token/token.js                            | 2 +-
 js/src/abi/token/token.spec.js                       | 2 +-
 js/src/abi/util/address.js                           | 2 +-
 js/src/abi/util/address.spec.js                      | 2 +-
 js/src/abi/util/pad.js                               | 2 +-
 js/src/abi/util/pad.spec.js                          | 2 +-
 js/src/abi/util/signature.js                         | 2 +-
 js/src/abi/util/signature.spec.js                    | 2 +-
 js/src/abi/util/slice.js                             | 2 +-
 js/src/abi/util/slice.spec.js                        | 2 +-
 js/src/abi/util/sliceAs.js                           | 2 +-
 js/src/abi/util/sliceAs.spec.js                      | 2 +-
 js/src/abi/util/types.js                             | 2 +-
 js/src/abi/util/types.spec.js                        | 2 +-
 js/src/api/api.js                                    | 2 +-
 js/src/api/api.spec.js                               | 2 +-
 js/src/api/contract/index.js                         | 2 +-
 js/src/api/format/input.js                           | 2 +-
 js/src/api/format/input.spec.js                      | 2 +-
 js/src/api/format/output.js                          | 2 +-
 js/src/api/index.js                                  | 2 +-
 js/src/api/rpc/index.js                              | 2 +-
 js/src/api/subscriptions/eth.js                      | 2 +-
 js/src/api/subscriptions/eth.spec.js                 | 2 +-
 js/src/api/subscriptions/index.js                    | 2 +-
 js/src/api/subscriptions/logging.js                  | 2 +-
 js/src/api/subscriptions/logging.spec.js             | 2 +-
 js/src/api/subscriptions/manager.js                  | 2 +-
 js/src/api/subscriptions/manager.spec.js             | 2 +-
 js/src/api/subscriptions/personal.js                 | 2 +-
 js/src/api/subscriptions/personal.spec.js            | 2 +-
 js/src/api/subscriptions/signer.js                   | 2 +-
 js/src/api/transport/error.js                        | 2 +-
 js/src/api/transport/index.js                        | 2 +-
 js/src/api/transport/jsonRpcBase.js                  | 2 +-
 js/src/api/transport/jsonRpcBase.spec.js             | 2 +-
 js/src/api/util/decode.js                            | 2 +-
 js/src/api/util/decode.spec.js                       | 2 +-
 js/src/api/util/format.js                            | 2 +-
 js/src/api/util/format.spec.js                       | 2 +-
 js/src/api/util/index.js                             | 2 +-
 js/src/api/util/sha3.js                              | 2 +-
 js/src/api/util/sha3.spec.js                         | 2 +-
 js/src/api/util/types.js                             | 2 +-
 js/src/api/util/types.spec.js                        | 2 +-
 js/src/api/util/wei.js                               | 2 +-
 js/src/api/util/wei.spec.js                          | 2 +-
 js/src/contracts/abi/index.js                        | 2 +-
 js/src/contracts/badgereg.js                         | 2 +-
 js/src/contracts/code/index.js                       | 2 +-
 js/src/contracts/dappreg.js                          | 2 +-
 js/src/contracts/githubhint.js                       | 2 +-
 js/src/contracts/index.js                            | 2 +-
 js/src/contracts/registry.js                         | 2 +-
 js/src/contracts/signaturereg.js                     | 2 +-
 js/src/contracts/sms-verification.js                 | 2 +-
 js/src/contracts/tokenreg.js                         | 2 +-
 js/src/dapps/basiccoin.js                            | 2 +-
 js/src/dapps/basiccoin/parity.js                     | 2 +-
 js/src/dapps/basiccoin/services.js                   | 2 +-
 js/src/dapps/dappreg.js                              | 2 +-
 js/src/dapps/dappreg/modalStore.js                   | 2 +-
 js/src/dapps/dappreg/parity.js                       | 2 +-
 js/src/dapps/githubhint.js                           | 2 +-
 js/src/dapps/githubhint/parity.js                    | 2 +-
 js/src/dapps/githubhint/services.js                  | 2 +-
 js/src/dapps/index.js                                | 2 +-
 js/src/dapps/localtx.js                              | 2 +-
 js/src/dapps/localtx/parity.js                       | 2 +-
 js/src/dapps/registry.js                             | 2 +-
 js/src/dapps/registry/Container.js                   | 2 +-
 js/src/dapps/registry/actions.js                     | 2 +-
 js/src/dapps/registry/parity.js                      | 2 +-
 js/src/dapps/registry/reducers.js                    | 2 +-
 js/src/dapps/registry/store.js                       | 2 +-
 js/src/dapps/signaturereg.js                         | 2 +-
 js/src/dapps/signaturereg/format.js                  | 2 +-
 js/src/dapps/signaturereg/parity.js                  | 2 +-
 js/src/dapps/signaturereg/services.js                | 2 +-
 js/src/dapps/tokenreg.js                             | 2 +-
 js/src/dapps/tokenreg/Container.js                   | 2 +-
 js/src/dapps/tokenreg/constants.js                   | 2 +-
 js/src/dapps/tokenreg/parity.js                      | 2 +-
 js/src/dapps/tokenreg/reducers.js                    | 2 +-
 js/src/dapps/tokenreg/store.js                       | 2 +-
 js/src/dapps/tokenreg/utils.js                       | 2 +-
 js/src/environment/index.js                          | 2 +-
 js/src/environment/integration-tests/fake-backend.js | 2 +-
 js/src/environment/integration-tests/index.js        | 2 +-
 js/src/environment/perf-debug/index.js               | 2 +-
 js/src/environment/perf-debug/why-update.js          | 2 +-
 js/src/environment/tests/index.js                    | 2 +-
 js/src/environment/tests/test-utils.js               | 2 +-
 js/src/index.js                                      | 2 +-
 js/src/jsonrpc/generator/build-json.js               | 2 +-
 js/src/jsonrpc/generator/build-markdown.js           | 2 +-
 js/src/jsonrpc/index.js                              | 2 +-
 js/src/jsonrpc/index.spec.js                         | 2 +-
 js/src/jsonrpc/interfaces/db.js                      | 2 +-
 js/src/jsonrpc/interfaces/net.js                     | 2 +-
 js/src/jsonrpc/interfaces/personal.js                | 2 +-
 js/src/jsonrpc/interfaces/shh.js                     | 2 +-
 js/src/jsonrpc/interfaces/signer.js                  | 2 +-
 js/src/jsonrpc/interfaces/trace.js                   | 2 +-
 js/src/jsonrpc/interfaces/web3.js                    | 2 +-
 js/src/jsonrpc/types.js                              | 2 +-
 js/src/lib.rs                                        | 2 +-
 js/src/lib.rs.in                                     | 2 +-
 js/src/modals/AddAddress/index.js                    | 2 +-
 js/src/modals/AddContract/addContract.js             | 2 +-
 js/src/modals/AddContract/index.js                   | 2 +-
 js/src/modals/CreateAccount/index.js                 | 2 +-
 js/src/modals/CreateAccount/print.js                 | 2 +-
 js/src/modals/CreateWallet/createWallet.js           | 2 +-
 js/src/modals/CreateWallet/createWalletStore.js      | 2 +-
 js/src/modals/CreateWallet/index.js                  | 2 +-
 js/src/modals/DeleteAccount/deleteAccount.js         | 2 +-
 js/src/modals/DeleteAccount/index.js                 | 2 +-
 js/src/modals/DeployContract/index.js                | 2 +-
 js/src/modals/EditMeta/editMeta.js                   | 2 +-
 js/src/modals/EditMeta/index.js                      | 2 +-
 js/src/modals/ExecuteContract/index.js               | 2 +-
 js/src/modals/FirstRun/firstRun.js                   | 2 +-
 js/src/modals/FirstRun/index.js                      | 2 +-
 js/src/modals/LoadContract/index.js                  | 2 +-
 js/src/modals/LoadContract/loadContract.js           | 2 +-
 js/src/modals/PasswordManager/index.js               | 2 +-
 js/src/modals/SMSVerification/SMSVerification.js     | 2 +-
 js/src/modals/SMSVerification/index.js               | 2 +-
 js/src/modals/SMSVerification/store.js               | 2 +-
 js/src/modals/SaveContract/index.js                  | 2 +-
 js/src/modals/SaveContract/saveContract.js           | 2 +-
 js/src/modals/Shapeshift/index.js                    | 2 +-
 js/src/modals/Shapeshift/shapeshift.js               | 2 +-
 js/src/modals/Transfer/errors.js                     | 2 +-
 js/src/modals/Transfer/index.js                      | 2 +-
 js/src/modals/WalletSettings/index.js                | 2 +-
 js/src/modals/WalletSettings/walletSettingsStore.js  | 2 +-
 js/src/modals/index.js                               | 2 +-
 js/src/parity.js                                     | 2 +-
 js/src/redux/actions.js                              | 2 +-
 js/src/redux/index.js                                | 2 +-
 js/src/redux/middleware.js                           | 2 +-
 js/src/redux/providers/apiActions.js                 | 2 +-
 js/src/redux/providers/apiReducer.js                 | 2 +-
 js/src/redux/providers/balances.js                   | 2 +-
 js/src/redux/providers/balancesReducer.js            | 2 +-
 js/src/redux/providers/blockchainActions.js          | 2 +-
 js/src/redux/providers/blockchainReducer.js          | 2 +-
 js/src/redux/providers/compilerActions.js            | 2 +-
 js/src/redux/providers/compilerReducer.js            | 2 +-
 js/src/redux/providers/compilerWorker.js             | 2 +-
 js/src/redux/providers/imagesActions.js              | 2 +-
 js/src/redux/providers/imagesReducer.js              | 2 +-
 js/src/redux/providers/index.js                      | 2 +-
 js/src/redux/providers/personal.js                   | 2 +-
 js/src/redux/providers/personalActions.js            | 2 +-
 js/src/redux/providers/personalReducer.js            | 2 +-
 js/src/redux/providers/signer.js                     | 2 +-
 js/src/redux/providers/signerActions.js              | 2 +-
 js/src/redux/providers/signerReducer.js              | 2 +-
 js/src/redux/providers/snackbarActions.js            | 2 +-
 js/src/redux/providers/snackbarReducer.js            | 2 +-
 js/src/redux/providers/status.js                     | 2 +-
 js/src/redux/providers/statusActions.js              | 2 +-
 js/src/redux/providers/statusReducer.js              | 2 +-
 js/src/redux/providers/walletReducer.js              | 2 +-
 js/src/redux/reducers.js                             | 2 +-
 js/src/redux/store.js                                | 2 +-
 js/src/redux/util.js                                 | 2 +-
 js/src/secureApi.js                                  | 2 +-
 js/src/ui/Actionbar/actionbar.js                     | 2 +-
 js/src/ui/Actionbar/actionbar.spec.js                | 2 +-
 js/src/ui/Actionbar/index.js                         | 2 +-
 js/src/ui/Badge/badge.js                             | 2 +-
 js/src/ui/Badge/badge.spec.js                        | 2 +-
 js/src/ui/Badge/index.js                             | 2 +-
 js/src/ui/Balance/balance.js                         | 2 +-
 js/src/ui/Balance/index.js                           | 2 +-
 js/src/ui/BlockStatus/blockStatus.js                 | 2 +-
 js/src/ui/BlockStatus/index.js                       | 2 +-
 js/src/ui/Button/button.js                           | 2 +-
 js/src/ui/Button/button.spec.js                      | 2 +-
 js/src/ui/Button/index.js                            | 2 +-
 js/src/ui/Certifications/certifications.js           | 2 +-
 js/src/ui/Certifications/index.js                    | 2 +-
 js/src/ui/ConfirmDialog/confirmDialog.js             | 2 +-
 js/src/ui/ConfirmDialog/index.js                     | 2 +-
 js/src/ui/Container/container.js                     | 2 +-
 js/src/ui/Container/container.spec.js                | 2 +-
 js/src/ui/Container/index.js                         | 2 +-
 js/src/ui/CopyToClipboard/copyToClipboard.js         | 2 +-
 js/src/ui/CopyToClipboard/index.js                   | 2 +-
 js/src/ui/Editor/editor.js                           | 2 +-
 js/src/ui/Editor/index.js                            | 2 +-
 js/src/ui/Errors/actions.js                          | 2 +-
 js/src/ui/Errors/errors.js                           | 2 +-
 js/src/ui/Errors/index.js                            | 2 +-
 js/src/ui/Errors/middleware.js                       | 2 +-
 js/src/ui/Errors/reducers.js                         | 2 +-
 js/src/ui/Form/form.js                               | 2 +-
 js/src/ui/Form/index.js                              | 2 +-
 js/src/ui/GasPriceEditor/index.js                    | 2 +-
 js/src/ui/IdentityIcon/identityIcon.js               | 2 +-
 js/src/ui/IdentityIcon/index.js                      | 2 +-
 js/src/ui/IdentityName/identityName.js               | 2 +-
 js/src/ui/IdentityName/identityName.spec.js          | 2 +-
 js/src/ui/IdentityName/index.js                      | 2 +-
 js/src/ui/Loading/index.js                           | 2 +-
 js/src/ui/Loading/loading.js                         | 2 +-
 js/src/ui/MethodDecoding/index.js                    | 2 +-
 js/src/ui/Modal/index.js                             | 2 +-
 js/src/ui/Modal/modal.js                             | 2 +-
 js/src/ui/Page/index.js                              | 2 +-
 js/src/ui/Page/page.js                               | 2 +-
 js/src/ui/ParityBackground/index.js                  | 2 +-
 js/src/ui/ParityBackground/parityBackground.js       | 2 +-
 js/src/ui/ShortenedHash/index.js                     | 2 +-
 js/src/ui/ShortenedHash/shortenedHash.js             | 2 +-
 js/src/ui/SignerIcon/index.js                        | 2 +-
 js/src/ui/SignerIcon/signerIcon.js                   | 2 +-
 js/src/ui/Tags/index.js                              | 2 +-
 js/src/ui/Tags/tags.js                               | 2 +-
 js/src/ui/Theme/index.js                             | 2 +-
 js/src/ui/Theme/theme.js                             | 2 +-
 js/src/ui/Theme/theme.spec.js                        | 2 +-
 js/src/ui/Tooltips/actions.js                        | 2 +-
 js/src/ui/Tooltips/index.js                          | 2 +-
 js/src/ui/Tooltips/reducers.js                       | 2 +-
 js/src/ui/Tooltips/tooltips.js                       | 2 +-
 js/src/ui/TxHash/index.js                            | 2 +-
 js/src/ui/TxHash/txHash.js                           | 2 +-
 js/src/ui/TxList/index.js                            | 2 +-
 js/src/ui/TxList/store.js                            | 2 +-
 js/src/ui/TxList/store.spec.js                       | 2 +-
 js/src/ui/TxList/txList.js                           | 2 +-
 js/src/ui/TxList/txList.spec.js                      | 2 +-
 js/src/util/abi.js                                   | 2 +-
 js/src/util/constants.js                             | 2 +-
 js/src/util/notifications.js                         | 2 +-
 js/src/util/proptypes.js                             | 2 +-
 js/src/util/subscribe-to-event.js                    | 2 +-
 js/src/util/tx.js                                    | 2 +-
 js/src/util/validation.js                            | 2 +-
 js/src/util/wallet.js                                | 2 +-
 js/src/util/wallets.js                               | 2 +-
 js/src/util/web3.extensions.js                       | 2 +-
 js/src/views/Account/index.js                        | 2 +-
 js/src/views/Accounts/index.js                       | 2 +-
 js/src/views/Address/index.js                        | 2 +-
 js/src/views/Addresses/index.js                      | 2 +-
 js/src/views/Application/index.js                    | 2 +-
 js/src/views/Application/store.js                    | 2 +-
 js/src/views/Connection/connection.js                | 2 +-
 js/src/views/Connection/index.js                     | 2 +-
 js/src/views/Contract/index.js                       | 2 +-
 js/src/views/Contracts/index.js                      | 2 +-
 js/src/views/Dapp/dapp.js                            | 2 +-
 js/src/views/Dapp/index.js                           | 2 +-
 js/src/views/Dapps/dappsStore.js                     | 2 +-
 js/src/views/Dapps/index.js                          | 2 +-
 js/src/views/ParityBar/index.js                      | 2 +-
 js/src/views/ParityBar/parityBar.js                  | 2 +-
 js/src/views/Settings/actions.js                     | 2 +-
 js/src/views/Settings/index.js                       | 2 +-
 js/src/views/Settings/middleware.js                  | 2 +-
 js/src/views/Settings/reducers.js                    | 2 +-
 js/src/views/Signer/index.js                         | 2 +-
 js/src/views/Signer/signer.js                        | 2 +-
 js/src/views/Signer/store.js                         | 2 +-
 js/src/views/Status/index.js                         | 2 +-
 js/src/views/Status/status.js                        | 2 +-
 js/src/views/Wallet/index.js                         | 2 +-
 js/src/views/WriteContract/index.js                  | 2 +-
 js/src/views/index.js                                | 2 +-
 js/src/web3.js                                       | 2 +-
 js/test/babel.js                                     | 2 +-
 js/test/e2e/ethapi.js                                | 2 +-
 js/test/mocha.config.js                              | 2 +-
 js/test/mockRpc.js                                   | 2 +-
 js/test/types.js                                     | 2 +-
 js/webpack/build.server.js                           | 2 +-
 js/webpack/dev.server.js                             | 2 +-
 js/webpack/libraries.js                              | 2 +-
 js/webpack/test.js                                   | 2 +-
 js/webpack/vendor.js                                 | 2 +-
 json/build.rs                                        | 2 +-
 json/src/blockchain/account.rs                       | 2 +-
 json/src/blockchain/block.rs                         | 2 +-
 json/src/blockchain/blockchain.rs                    | 2 +-
 json/src/blockchain/header.rs                        | 2 +-
 json/src/blockchain/mod.rs                           | 2 +-
 json/src/blockchain/state.rs                         | 2 +-
 json/src/blockchain/test.rs                          | 2 +-
 json/src/blockchain/transaction.rs                   | 2 +-
 json/src/bytes.rs                                    | 2 +-
 json/src/hash.rs                                     | 2 +-
 json/src/lib.rs                                      | 2 +-
 json/src/lib.rs.in                                   | 2 +-
 json/src/misc/account_meta.rs                        | 2 +-
 json/src/misc/dapps_settings.rs                      | 2 +-
 json/src/misc/mod.rs                                 | 2 +-
 json/src/spec/account.rs                             | 2 +-
 json/src/spec/authority_round.rs                     | 2 +-
 json/src/spec/basic_authority.rs                     | 2 +-
 json/src/spec/builtin.rs                             | 2 +-
 json/src/spec/engine.rs                              | 2 +-
 json/src/spec/ethash.rs                              | 2 +-
 json/src/spec/genesis.rs                             | 2 +-
 json/src/spec/mod.rs                                 | 2 +-
 json/src/spec/params.rs                              | 2 +-
 json/src/spec/seal.rs                                | 2 +-
 json/src/spec/spec.rs                                | 2 +-
 json/src/spec/state.rs                               | 2 +-
 json/src/state/log.rs                                | 2 +-
 json/src/state/mod.rs                                | 2 +-
 json/src/state/state.rs                              | 2 +-
 json/src/state/test.rs                               | 2 +-
 json/src/state/transaction.rs                        | 2 +-
 json/src/transaction/mod.rs                          | 2 +-
 json/src/transaction/test.rs                         | 2 +-
 json/src/transaction/transaction.rs                  | 2 +-
 json/src/transaction/txtest.rs                       | 2 +-
 json/src/trie/input.rs                               | 2 +-
 json/src/trie/mod.rs                                 | 2 +-
 json/src/trie/test.rs                                | 2 +-
 json/src/trie/trie.rs                                | 2 +-
 json/src/uint.rs                                     | 2 +-
 json/src/vm/call.rs                                  | 2 +-
 json/src/vm/env.rs                                   | 2 +-
 json/src/vm/log.rs                                   | 2 +-
 json/src/vm/mod.rs                                   | 2 +-
 json/src/vm/test.rs                                  | 2 +-
 json/src/vm/transaction.rs                           | 2 +-
 json/src/vm/vm.rs                                    | 2 +-
 license_header                                       | 2 +-
 logger/src/lib.rs                                    | 2 +-
 parity/account.rs                                    | 2 +-
 parity/blockchain.rs                                 | 2 +-
 parity/boot.rs                                       | 2 +-
 parity/cache.rs                                      | 2 +-
 parity/cli/mod.rs                                    | 2 +-
 parity/cli/usage.rs                                  | 2 +-
 parity/configuration.rs                              | 2 +-
 parity/dapps.rs                                      | 2 +-
 parity/deprecated.rs                                 | 2 +-
 parity/dir.rs                                        | 2 +-
 parity/helpers.rs                                    | 2 +-
 parity/informant.rs                                  | 2 +-
 parity/io_handler.rs                                 | 2 +-
 parity/main.rs                                       | 2 +-
 parity/migration.rs                                  | 2 +-
 parity/modules.rs                                    | 2 +-
 parity/params.rs                                     | 2 +-
 parity/presale.rs                                    | 2 +-
 parity/rpc.rs                                        | 2 +-
 parity/rpc_apis.rs                                   | 2 +-
 parity/run.rs                                        | 2 +-
 parity/signer.rs                                     | 2 +-
 parity/snapshot.rs                                   | 2 +-
 parity/stratum.rs                                    | 2 +-
 parity/sync.rs                                       | 2 +-
 parity/upgrade.rs                                    | 2 +-
 parity/url.rs                                        | 2 +-
 rpc/build.rs                                         | 2 +-
 rpc/rpctest/src/main.rs                              | 2 +-
 rpc/src/lib.rs                                       | 2 +-
 rpc/src/v1/helpers/block_import.rs                   | 2 +-
 rpc/src/v1/helpers/dispatch.rs                       | 2 +-
 rpc/src/v1/helpers/mod.rs                            | 2 +-
 rpc/src/v1/helpers/network_settings.rs               | 2 +-
 rpc/src/v1/helpers/params.rs                         | 2 +-
 rpc/src/v1/helpers/poll_manager.rs                   | 2 +-
 rpc/src/v1/helpers/requests.rs                       | 2 +-
 rpc/src/v1/helpers/signer.rs                         | 2 +-
 rpc/src/v1/impls/eth_filter.rs                       | 2 +-
 rpc/src/v1/impls/mod.rs                              | 2 +-
 rpc/src/v1/impls/net.rs                              | 2 +-
 rpc/src/v1/impls/parity_accounts.rs                  | 2 +-
 rpc/src/v1/impls/parity_set.rs                       | 2 +-
 rpc/src/v1/impls/personal.rs                         | 2 +-
 rpc/src/v1/impls/rpc.rs                              | 2 +-
 rpc/src/v1/impls/signer.rs                           | 2 +-
 rpc/src/v1/impls/signing.rs                          | 2 +-
 rpc/src/v1/impls/signing_unsafe.rs                   | 2 +-
 rpc/src/v1/impls/traces.rs                           | 2 +-
 rpc/src/v1/impls/web3.rs                             | 2 +-
 rpc/src/v1/mod.rs                                    | 2 +-
 rpc/src/v1/traits/eth.rs                             | 2 +-
 rpc/src/v1/traits/eth_signing.rs                     | 2 +-
 rpc/src/v1/traits/mod.rs                             | 2 +-
 rpc/src/v1/traits/net.rs                             | 2 +-
 rpc/src/v1/traits/parity.rs                          | 2 +-
 rpc/src/v1/traits/parity_accounts.rs                 | 2 +-
 rpc/src/v1/traits/parity_set.rs                      | 2 +-
 rpc/src/v1/traits/parity_signing.rs                  | 2 +-
 rpc/src/v1/traits/personal.rs                        | 2 +-
 rpc/src/v1/traits/rpc.rs                             | 2 +-
 rpc/src/v1/traits/signer.rs                          | 2 +-
 rpc/src/v1/traits/traces.rs                          | 2 +-
 rpc/src/v1/traits/web3.rs                            | 2 +-
 rpc/src/v1/types/block_number.rs                     | 2 +-
 rpc/src/v1/types/bytes.rs                            | 2 +-
 rpc/src/v1/types/call_request.rs                     | 2 +-
 rpc/src/v1/types/dapp_id.rs                          | 2 +-
 rpc/src/v1/types/filter.rs                           | 2 +-
 rpc/src/v1/types/hash.rs                             | 2 +-
 rpc/src/v1/types/histogram.rs                        | 2 +-
 rpc/src/v1/types/index.rs                            | 2 +-
 rpc/src/v1/types/log.rs                              | 2 +-
 signer/build.rs                                      | 2 +-
 signer/src/authcode_store.rs                         | 2 +-
 signer/src/lib.rs                                    | 2 +-
 signer/src/tests/mod.rs                              | 2 +-
 signer/src/ws_server/mod.rs                          | 2 +-
 signer/src/ws_server/session.rs                      | 2 +-
 stratum/build.rs                                     | 2 +-
 stratum/src/lib.rs                                   | 2 +-
 stratum/src/traits.rs                                | 2 +-
 sync/build.rs                                        | 2 +-
 sync/src/api.rs                                      | 2 +-
 sync/src/block_sync.rs                               | 2 +-
 sync/src/blocks.rs                                   | 2 +-
 sync/src/lib.rs                                      | 2 +-
 sync/src/snapshot.rs                                 | 2 +-
 sync/src/sync_io.rs                                  | 2 +-
 sync/src/tests/chain.rs                              | 2 +-
 sync/src/tests/consensus.rs                          | 2 +-
 sync/src/tests/helpers.rs                            | 2 +-
 sync/src/tests/mod.rs                                | 2 +-
 sync/src/tests/rpc.rs                                | 2 +-
 sync/src/tests/snapshot.rs                           | 2 +-
 sync/src/transactions_stats.rs                       | 2 +-
 util/benches/bigint.rs                               | 2 +-
 util/benches/rlp.rs                                  | 2 +-
 util/benches/trie.rs                                 | 2 +-
 util/bigint/build.rs                                 | 2 +-
 util/bigint/src/hash.rs                              | 2 +-
 util/bigint/src/lib.rs                               | 2 +-
 util/bloom/src/lib.rs                                | 2 +-
 util/build.rs                                        | 2 +-
 util/fetch/src/client.rs                             | 2 +-
 util/fetch/src/fetch_file.rs                         | 2 +-
 util/fetch/src/lib.rs                                | 2 +-
 util/https-fetch/src/client.rs                       | 2 +-
 util/https-fetch/src/http.rs                         | 2 +-
 util/https-fetch/src/lib.rs                          | 2 +-
 util/https-fetch/src/tlsclient.rs                    | 2 +-
 util/https-fetch/src/url.rs                          | 2 +-
 util/io/src/lib.rs                                   | 2 +-
 util/io/src/panics.rs                                | 2 +-
 util/io/src/service.rs                               | 2 +-
 util/io/src/worker.rs                                | 2 +-
 util/network/src/error.rs                            | 2 +-
 util/network/src/ip_utils.rs                         | 2 +-
 util/network/src/lib.rs                              | 2 +-
 util/network/src/node_table.rs                       | 2 +-
 util/network/src/service.rs                          | 2 +-
 util/network/src/stats.rs                            | 2 +-
 util/network/src/tests.rs                            | 2 +-
 util/rlp/src/bytes.rs                                | 2 +-
 util/rlp/src/commonrlps.rs                           | 2 +-
 util/rlp/src/lib.rs                                  | 2 +-
 util/rlp/src/rlpcompression.rs                       | 2 +-
 util/rlp/src/rlperrors.rs                            | 2 +-
 util/rlp/src/rlpin.rs                                | 2 +-
 util/rlp/src/rlpstream.rs                            | 2 +-
 util/rlp/src/rlptraits.rs                            | 2 +-
 util/rlp/src/tests.rs                                | 2 +-
 util/rlp/src/untrusted_rlp.rs                        | 2 +-
 util/sha3/build.rs                                   | 2 +-
 util/sha3/src/lib.rs                                 | 2 +-
 util/src/bloom.rs                                    | 2 +-
 util/src/bytes.rs                                    | 2 +-
 util/src/cache.rs                                    | 2 +-
 util/src/common.rs                                   | 2 +-
 util/src/error.rs                                    | 2 +-
 util/src/from_json.rs                                | 2 +-
 util/src/hashdb.rs                                   | 2 +-
 util/src/journaldb/archivedb.rs                      | 2 +-
 util/src/journaldb/mod.rs                            | 2 +-
 util/src/journaldb/refcounteddb.rs                   | 2 +-
 util/src/journaldb/traits.rs                         | 2 +-
 util/src/kvdb.rs                                     | 2 +-
 util/src/lib.rs                                      | 2 +-
 util/src/log.rs                                      | 2 +-
 util/src/memorydb.rs                                 | 2 +-
 util/src/migration/mod.rs                            | 2 +-
 util/src/migration/tests.rs                          | 2 +-
 util/src/misc.rs                                     | 2 +-
 util/src/nibbleslice.rs                              | 2 +-
 util/src/nibblevec.rs                                | 2 +-
 util/src/overlaydb.rs                                | 2 +-
 util/src/path.rs                                     | 2 +-
 util/src/semantic_version.rs                         | 2 +-
 util/src/sha3.rs                                     | 2 +-
 util/src/snappy.rs                                   | 2 +-
 util/src/standard.rs                                 | 2 +-
 util/src/stats.rs                                    | 2 +-
 util/src/timer.rs                                    | 2 +-
 util/src/trie/fatdb.rs                               | 2 +-
 util/src/trie/fatdbmut.rs                            | 2 +-
 util/src/trie/journal.rs                             | 2 +-
 util/src/trie/mod.rs                                 | 2 +-
 util/src/trie/node.rs                                | 2 +-
 util/src/trie/recorder.rs                            | 2 +-
 util/src/trie/sectriedb.rs                           | 2 +-
 util/src/trie/sectriedbmut.rs                        | 2 +-
 util/src/trie/standardmap.rs                         | 2 +-
 util/src/trie/triedb.rs                              | 2 +-
 util/src/triehash.rs                                 | 2 +-
 util/src/vector.rs                                   | 2 +-
 util/table/src/lib.rs                                | 2 +-
 util/using_queue/src/lib.rs                          | 2 +-
 windows/ptray/ptray.cpp                              | 2 +-
 820 files changed, 820 insertions(+), 820 deletions(-)

diff --git a/build.rs b/build.rs
index 41b9a1b3ec..28cd9ef697 100644
--- a/build.rs
+++ b/build.rs
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/dapps/build.rs b/dapps/build.rs
index b178027ae5..d2a7919db0 100644
--- a/dapps/build.rs
+++ b/dapps/build.rs
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/dapps/js-glue/build.rs b/dapps/js-glue/build.rs
index 82f9901885..b81724774b 100644
--- a/dapps/js-glue/build.rs
+++ b/dapps/js-glue/build.rs
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/dapps/js-glue/src/codegen.rs b/dapps/js-glue/src/codegen.rs
index 1a6b6fc7eb..e51a8333df 100644
--- a/dapps/js-glue/src/codegen.rs
+++ b/dapps/js-glue/src/codegen.rs
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/dapps/js-glue/src/js.rs b/dapps/js-glue/src/js.rs
index 39c33689c8..31946fc58f 100644
--- a/dapps/js-glue/src/js.rs
+++ b/dapps/js-glue/src/js.rs
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/dapps/js-glue/src/lib.rs b/dapps/js-glue/src/lib.rs
index 28ac8d7120..70cba4e9ae 100644
--- a/dapps/js-glue/src/lib.rs
+++ b/dapps/js-glue/src/lib.rs
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/dapps/js-glue/src/lib.rs.in b/dapps/js-glue/src/lib.rs.in
index 07c57705f2..1abf6a3e6d 100644
--- a/dapps/js-glue/src/lib.rs.in
+++ b/dapps/js-glue/src/lib.rs.in
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/dapps/src/api/api.rs b/dapps/src/api/api.rs
index 90ab837f52..4403968988 100644
--- a/dapps/src/api/api.rs
+++ b/dapps/src/api/api.rs
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/dapps/src/api/mod.rs b/dapps/src/api/mod.rs
index 402e842572..fa0b1f01b6 100644
--- a/dapps/src/api/mod.rs
+++ b/dapps/src/api/mod.rs
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/dapps/src/api/response.rs b/dapps/src/api/response.rs
index 3e8f196ecd..bb1be24487 100644
--- a/dapps/src/api/response.rs
+++ b/dapps/src/api/response.rs
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/dapps/src/api/types.rs b/dapps/src/api/types.rs
index 64697123ba..a6815105f4 100644
--- a/dapps/src/api/types.rs
+++ b/dapps/src/api/types.rs
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/dapps/src/api/types.rs.in b/dapps/src/api/types.rs.in
index a95a0d446b..48fd00e39c 100644
--- a/dapps/src/api/types.rs.in
+++ b/dapps/src/api/types.rs.in
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/dapps/src/apps/cache.rs b/dapps/src/apps/cache.rs
index 9d1642fb08..3f531fe419 100644
--- a/dapps/src/apps/cache.rs
+++ b/dapps/src/apps/cache.rs
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/dapps/src/apps/fetcher.rs b/dapps/src/apps/fetcher.rs
index e7f36d1449..2430af0356 100644
--- a/dapps/src/apps/fetcher.rs
+++ b/dapps/src/apps/fetcher.rs
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/dapps/src/apps/fs.rs b/dapps/src/apps/fs.rs
index f0b4ddfa88..b7188b0b48 100644
--- a/dapps/src/apps/fs.rs
+++ b/dapps/src/apps/fs.rs
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/dapps/src/apps/manifest.rs b/dapps/src/apps/manifest.rs
index 6d9874b862..62571d71d7 100644
--- a/dapps/src/apps/manifest.rs
+++ b/dapps/src/apps/manifest.rs
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/dapps/src/apps/mod.rs b/dapps/src/apps/mod.rs
index 4c9270aa5f..3f3b1aabad 100644
--- a/dapps/src/apps/mod.rs
+++ b/dapps/src/apps/mod.rs
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/dapps/src/endpoint.rs b/dapps/src/endpoint.rs
index eea7a872fd..ccf7166449 100644
--- a/dapps/src/endpoint.rs
+++ b/dapps/src/endpoint.rs
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/dapps/src/handlers/auth.rs b/dapps/src/handlers/auth.rs
index 7f72f7cf8a..797fdf29f3 100644
--- a/dapps/src/handlers/auth.rs
+++ b/dapps/src/handlers/auth.rs
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/dapps/src/handlers/content.rs b/dapps/src/handlers/content.rs
index fde5fbcf0c..42bb2fc488 100644
--- a/dapps/src/handlers/content.rs
+++ b/dapps/src/handlers/content.rs
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/dapps/src/handlers/echo.rs b/dapps/src/handlers/echo.rs
index 165ceb1717..afe6799447 100644
--- a/dapps/src/handlers/echo.rs
+++ b/dapps/src/handlers/echo.rs
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/dapps/src/handlers/fetch.rs b/dapps/src/handlers/fetch.rs
index a34b58fa7a..6fb524293f 100644
--- a/dapps/src/handlers/fetch.rs
+++ b/dapps/src/handlers/fetch.rs
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/dapps/src/handlers/mod.rs b/dapps/src/handlers/mod.rs
index 1299a9c120..bb292ad4dd 100644
--- a/dapps/src/handlers/mod.rs
+++ b/dapps/src/handlers/mod.rs
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/dapps/src/handlers/redirect.rs b/dapps/src/handlers/redirect.rs
index e43d32e24f..d97f559b77 100644
--- a/dapps/src/handlers/redirect.rs
+++ b/dapps/src/handlers/redirect.rs
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/dapps/src/lib.rs b/dapps/src/lib.rs
index 9bb3be4a7c..c1ce5de193 100644
--- a/dapps/src/lib.rs
+++ b/dapps/src/lib.rs
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/dapps/src/page/builtin.rs b/dapps/src/page/builtin.rs
index 40c0e23a60..3fbfcff163 100644
--- a/dapps/src/page/builtin.rs
+++ b/dapps/src/page/builtin.rs
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/dapps/src/page/handler.rs b/dapps/src/page/handler.rs
index 1494a04c7e..382dfa5d1a 100644
--- a/dapps/src/page/handler.rs
+++ b/dapps/src/page/handler.rs
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/dapps/src/page/local.rs b/dapps/src/page/local.rs
index ec24cac369..77c91019db 100644
--- a/dapps/src/page/local.rs
+++ b/dapps/src/page/local.rs
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/dapps/src/page/mod.rs b/dapps/src/page/mod.rs
index 92c066df33..9619f1b10d 100644
--- a/dapps/src/page/mod.rs
+++ b/dapps/src/page/mod.rs
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/dapps/src/proxypac.rs b/dapps/src/proxypac.rs
index 88ecb6ab31..8ca87a1e29 100644
--- a/dapps/src/proxypac.rs
+++ b/dapps/src/proxypac.rs
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/dapps/src/router/auth.rs b/dapps/src/router/auth.rs
index a220e2ab06..e6b781f3d2 100644
--- a/dapps/src/router/auth.rs
+++ b/dapps/src/router/auth.rs
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/dapps/src/router/host_validation.rs b/dapps/src/router/host_validation.rs
index 802466efde..57634e07a8 100644
--- a/dapps/src/router/host_validation.rs
+++ b/dapps/src/router/host_validation.rs
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/dapps/src/router/mod.rs b/dapps/src/router/mod.rs
index c0a33f2eba..b444b1526f 100644
--- a/dapps/src/router/mod.rs
+++ b/dapps/src/router/mod.rs
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/dapps/src/rpc.rs b/dapps/src/rpc.rs
index c47777bee5..f7d988ce8d 100644
--- a/dapps/src/rpc.rs
+++ b/dapps/src/rpc.rs
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/dapps/src/tests/api.rs b/dapps/src/tests/api.rs
index ea4c08c60f..5edfa20f5f 100644
--- a/dapps/src/tests/api.rs
+++ b/dapps/src/tests/api.rs
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/dapps/src/tests/authorization.rs b/dapps/src/tests/authorization.rs
index 86fe4d2072..3c16f6296c 100644
--- a/dapps/src/tests/authorization.rs
+++ b/dapps/src/tests/authorization.rs
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/dapps/src/tests/fetch.rs b/dapps/src/tests/fetch.rs
index d50b2bddee..8540a407f6 100644
--- a/dapps/src/tests/fetch.rs
+++ b/dapps/src/tests/fetch.rs
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/dapps/src/tests/helpers.rs b/dapps/src/tests/helpers.rs
index 66bf0f8eba..13d7c69d2b 100644
--- a/dapps/src/tests/helpers.rs
+++ b/dapps/src/tests/helpers.rs
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/dapps/src/tests/mod.rs b/dapps/src/tests/mod.rs
index cc0e693c96..d936bf848d 100644
--- a/dapps/src/tests/mod.rs
+++ b/dapps/src/tests/mod.rs
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/dapps/src/tests/redirection.rs b/dapps/src/tests/redirection.rs
index b0a5ca9a2c..b676616a43 100644
--- a/dapps/src/tests/redirection.rs
+++ b/dapps/src/tests/redirection.rs
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/dapps/src/tests/validation.rs b/dapps/src/tests/validation.rs
index ae02a6c2cc..6124542c77 100644
--- a/dapps/src/tests/validation.rs
+++ b/dapps/src/tests/validation.rs
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/dapps/src/url.rs b/dapps/src/url.rs
index c9eb2f78fd..b8b8393cc6 100644
--- a/dapps/src/url.rs
+++ b/dapps/src/url.rs
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/dapps/ui/src/lib.rs b/dapps/ui/src/lib.rs
index 6a69a503df..286007451e 100644
--- a/dapps/ui/src/lib.rs
+++ b/dapps/ui/src/lib.rs
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/db/build.rs b/db/build.rs
index 239185d84e..a5e55eed50 100644
--- a/db/build.rs
+++ b/db/build.rs
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/db/src/database.rs b/db/src/database.rs
index e1774159b3..c172700349 100644
--- a/db/src/database.rs
+++ b/db/src/database.rs
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/db/src/lib.rs b/db/src/lib.rs
index 1daaf55c95..a46e34487e 100644
--- a/db/src/lib.rs
+++ b/db/src/lib.rs
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/db/src/lib.rs.in b/db/src/lib.rs.in
index 54fccb097d..31dbfd71ce 100644
--- a/db/src/lib.rs.in
+++ b/db/src/lib.rs.in
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/db/src/traits.rs b/db/src/traits.rs
index fe4cd5d440..ee4e502ac6 100644
--- a/db/src/traits.rs
+++ b/db/src/traits.rs
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/devtools/src/http_client.rs b/devtools/src/http_client.rs
index 2440a7cda8..bb3b896af5 100644
--- a/devtools/src/http_client.rs
+++ b/devtools/src/http_client.rs
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/devtools/src/lib.rs b/devtools/src/lib.rs
index 87457f7f32..25d27a9e7e 100644
--- a/devtools/src/lib.rs
+++ b/devtools/src/lib.rs
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/devtools/src/random_path.rs b/devtools/src/random_path.rs
index 9c6c261a27..ee8c39ad32 100644
--- a/devtools/src/random_path.rs
+++ b/devtools/src/random_path.rs
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/devtools/src/stop_guard.rs b/devtools/src/stop_guard.rs
index f1db597252..8745f70485 100644
--- a/devtools/src/stop_guard.rs
+++ b/devtools/src/stop_guard.rs
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/devtools/src/test_socket.rs b/devtools/src/test_socket.rs
index 0d38e66a5e..33bb862abd 100644
--- a/devtools/src/test_socket.rs
+++ b/devtools/src/test_socket.rs
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/ethash/src/compute.rs b/ethash/src/compute.rs
index 6fcf17cf1c..269c3d8639 100644
--- a/ethash/src/compute.rs
+++ b/ethash/src/compute.rs
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/ethash/src/lib.rs b/ethash/src/lib.rs
index a04e2486b4..06182bc50e 100644
--- a/ethash/src/lib.rs
+++ b/ethash/src/lib.rs
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/ethcore/build.rs b/ethcore/build.rs
index 5a3a3f0ba2..fc93b1035e 100644
--- a/ethcore/build.rs
+++ b/ethcore/build.rs
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/ethcore/hash-fetch/src/client.rs b/ethcore/hash-fetch/src/client.rs
index f5d19afa50..b72aa3bc98 100644
--- a/ethcore/hash-fetch/src/client.rs
+++ b/ethcore/hash-fetch/src/client.rs
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/ethcore/hash-fetch/src/lib.rs b/ethcore/hash-fetch/src/lib.rs
index ffb74b260e..d8d1123d28 100644
--- a/ethcore/hash-fetch/src/lib.rs
+++ b/ethcore/hash-fetch/src/lib.rs
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/ethcore/hash-fetch/src/urlhint.rs b/ethcore/hash-fetch/src/urlhint.rs
index 9cbd13b1e2..79575e8f32 100644
--- a/ethcore/hash-fetch/src/urlhint.rs
+++ b/ethcore/hash-fetch/src/urlhint.rs
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/ethcore/light/build.rs b/ethcore/light/build.rs
index 7d4e0064c4..2995d28ad9 100644
--- a/ethcore/light/build.rs
+++ b/ethcore/light/build.rs
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/ethcore/light/src/net/error.rs b/ethcore/light/src/net/error.rs
index 01a15928bf..42d038679d 100644
--- a/ethcore/light/src/net/error.rs
+++ b/ethcore/light/src/net/error.rs
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/ethcore/light/src/types/mod.rs b/ethcore/light/src/types/mod.rs
index d7f4735531..86d269766e 100644
--- a/ethcore/light/src/types/mod.rs
+++ b/ethcore/light/src/types/mod.rs
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/ethcore/light/src/types/mod.rs.in b/ethcore/light/src/types/mod.rs.in
index 2b7386b5b5..48ef2da90c 100644
--- a/ethcore/light/src/types/mod.rs.in
+++ b/ethcore/light/src/types/mod.rs.in
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/ethcore/src/account_db.rs b/ethcore/src/account_db.rs
index 63524a4421..a42399073a 100644
--- a/ethcore/src/account_db.rs
+++ b/ethcore/src/account_db.rs
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/ethcore/src/account_provider/mod.rs b/ethcore/src/account_provider/mod.rs
index 59fbda0458..1175f2d024 100644
--- a/ethcore/src/account_provider/mod.rs
+++ b/ethcore/src/account_provider/mod.rs
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/ethcore/src/account_provider/stores.rs b/ethcore/src/account_provider/stores.rs
index 8bf555d687..d7e96243c3 100644
--- a/ethcore/src/account_provider/stores.rs
+++ b/ethcore/src/account_provider/stores.rs
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/ethcore/src/action_params.rs b/ethcore/src/action_params.rs
index 8b863c6256..3d15c7392c 100644
--- a/ethcore/src/action_params.rs
+++ b/ethcore/src/action_params.rs
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/ethcore/src/basic_types.rs b/ethcore/src/basic_types.rs
index 79f009fd1c..b49a93c443 100644
--- a/ethcore/src/basic_types.rs
+++ b/ethcore/src/basic_types.rs
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/ethcore/src/blockchain/best_block.rs b/ethcore/src/blockchain/best_block.rs
index d5a6c06b2d..e748a9556c 100644
--- a/ethcore/src/blockchain/best_block.rs
+++ b/ethcore/src/blockchain/best_block.rs
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/ethcore/src/blockchain/block_info.rs b/ethcore/src/blockchain/block_info.rs
index fee0e825b1..fa8310c037 100644
--- a/ethcore/src/blockchain/block_info.rs
+++ b/ethcore/src/blockchain/block_info.rs
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/ethcore/src/blockchain/cache.rs b/ethcore/src/blockchain/cache.rs
index 819676ca57..88a0727a07 100644
--- a/ethcore/src/blockchain/cache.rs
+++ b/ethcore/src/blockchain/cache.rs
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/ethcore/src/blockchain/config.rs b/ethcore/src/blockchain/config.rs
index 324474958a..8075355730 100644
--- a/ethcore/src/blockchain/config.rs
+++ b/ethcore/src/blockchain/config.rs
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/ethcore/src/blockchain/extras.rs b/ethcore/src/blockchain/extras.rs
index 6dc7aef986..bf32258f9f 100644
--- a/ethcore/src/blockchain/extras.rs
+++ b/ethcore/src/blockchain/extras.rs
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/ethcore/src/blockchain/generator/block.rs b/ethcore/src/blockchain/generator/block.rs
index 6b8aa78f28..e2ad518187 100644
--- a/ethcore/src/blockchain/generator/block.rs
+++ b/ethcore/src/blockchain/generator/block.rs
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/ethcore/src/blockchain/generator/bloom.rs b/ethcore/src/blockchain/generator/bloom.rs
index f61c9d1ff6..21fa59f45e 100644
--- a/ethcore/src/blockchain/generator/bloom.rs
+++ b/ethcore/src/blockchain/generator/bloom.rs
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/ethcore/src/blockchain/generator/complete.rs b/ethcore/src/blockchain/generator/complete.rs
index 39bd587a0e..1d24b32c7e 100644
--- a/ethcore/src/blockchain/generator/complete.rs
+++ b/ethcore/src/blockchain/generator/complete.rs
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/ethcore/src/blockchain/generator/fork.rs b/ethcore/src/blockchain/generator/fork.rs
index f3a4eb2676..a6953d536e 100644
--- a/ethcore/src/blockchain/generator/fork.rs
+++ b/ethcore/src/blockchain/generator/fork.rs
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/ethcore/src/blockchain/generator/generator.rs b/ethcore/src/blockchain/generator/generator.rs
index ebe9e22c01..eb00f0dfbc 100644
--- a/ethcore/src/blockchain/generator/generator.rs
+++ b/ethcore/src/blockchain/generator/generator.rs
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/ethcore/src/blockchain/generator/mod.rs b/ethcore/src/blockchain/generator/mod.rs
index 683ab7dfb2..941c1d4704 100644
--- a/ethcore/src/blockchain/generator/mod.rs
+++ b/ethcore/src/blockchain/generator/mod.rs
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/ethcore/src/blockchain/generator/transaction.rs b/ethcore/src/blockchain/generator/transaction.rs
index aa1d3bdd3e..12cf549fe3 100644
--- a/ethcore/src/blockchain/generator/transaction.rs
+++ b/ethcore/src/blockchain/generator/transaction.rs
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/ethcore/src/blockchain/import_route.rs b/ethcore/src/blockchain/import_route.rs
index 02469bb903..8063416d92 100644
--- a/ethcore/src/blockchain/import_route.rs
+++ b/ethcore/src/blockchain/import_route.rs
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/ethcore/src/blockchain/mod.rs b/ethcore/src/blockchain/mod.rs
index 7b9ae0e600..44dea3055e 100644
--- a/ethcore/src/blockchain/mod.rs
+++ b/ethcore/src/blockchain/mod.rs
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/ethcore/src/blooms/bloom.rs b/ethcore/src/blooms/bloom.rs
index b535bcb218..ae6315aa0d 100644
--- a/ethcore/src/blooms/bloom.rs
+++ b/ethcore/src/blooms/bloom.rs
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/ethcore/src/blooms/bloom_group.rs b/ethcore/src/blooms/bloom_group.rs
index 9e3b53f18a..2dbc4e4550 100644
--- a/ethcore/src/blooms/bloom_group.rs
+++ b/ethcore/src/blooms/bloom_group.rs
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/ethcore/src/blooms/group_position.rs b/ethcore/src/blooms/group_position.rs
index 3a6cc8e839..9952d1508d 100644
--- a/ethcore/src/blooms/group_position.rs
+++ b/ethcore/src/blooms/group_position.rs
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/ethcore/src/blooms/mod.rs b/ethcore/src/blooms/mod.rs
index 9d8a71d71a..b962387faa 100644
--- a/ethcore/src/blooms/mod.rs
+++ b/ethcore/src/blooms/mod.rs
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/ethcore/src/builtin.rs b/ethcore/src/builtin.rs
index e8eb0ed68d..7c1bbb2c65 100644
--- a/ethcore/src/builtin.rs
+++ b/ethcore/src/builtin.rs
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/ethcore/src/cache_manager.rs b/ethcore/src/cache_manager.rs
index 6ad01b4533..afc77f683b 100644
--- a/ethcore/src/cache_manager.rs
+++ b/ethcore/src/cache_manager.rs
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/ethcore/src/client/chain_notify.rs b/ethcore/src/client/chain_notify.rs
index e0282d4603..d9ebac2992 100644
--- a/ethcore/src/client/chain_notify.rs
+++ b/ethcore/src/client/chain_notify.rs
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/ethcore/src/client/config.rs b/ethcore/src/client/config.rs
index 045b8ee05c..575d5ac319 100644
--- a/ethcore/src/client/config.rs
+++ b/ethcore/src/client/config.rs
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/ethcore/src/client/mod.rs b/ethcore/src/client/mod.rs
index 4e5554b01f..2b64ef6288 100644
--- a/ethcore/src/client/mod.rs
+++ b/ethcore/src/client/mod.rs
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/ethcore/src/client/test_client.rs b/ethcore/src/client/test_client.rs
index 2e08b22bf9..8442d723ba 100644
--- a/ethcore/src/client/test_client.rs
+++ b/ethcore/src/client/test_client.rs
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/ethcore/src/client/traits.rs b/ethcore/src/client/traits.rs
index ad21d2ba54..4b6609cf60 100644
--- a/ethcore/src/client/traits.rs
+++ b/ethcore/src/client/traits.rs
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/ethcore/src/db.rs b/ethcore/src/db.rs
index 92c0f1b399..16d538f4e0 100644
--- a/ethcore/src/db.rs
+++ b/ethcore/src/db.rs
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/ethcore/src/engines/authority_round.rs b/ethcore/src/engines/authority_round.rs
index 98190c1eaf..9f78d8cecf 100644
--- a/ethcore/src/engines/authority_round.rs
+++ b/ethcore/src/engines/authority_round.rs
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/ethcore/src/engines/basic_authority.rs b/ethcore/src/engines/basic_authority.rs
index 1070d3a3db..5676365daa 100644
--- a/ethcore/src/engines/basic_authority.rs
+++ b/ethcore/src/engines/basic_authority.rs
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/ethcore/src/engines/instant_seal.rs b/ethcore/src/engines/instant_seal.rs
index 83335fb03c..f15ccba815 100644
--- a/ethcore/src/engines/instant_seal.rs
+++ b/ethcore/src/engines/instant_seal.rs
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/ethcore/src/engines/null_engine.rs b/ethcore/src/engines/null_engine.rs
index bd5a4474ad..4272060a57 100644
--- a/ethcore/src/engines/null_engine.rs
+++ b/ethcore/src/engines/null_engine.rs
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/ethcore/src/env_info.rs b/ethcore/src/env_info.rs
index ddef716088..bdefeefceb 100644
--- a/ethcore/src/env_info.rs
+++ b/ethcore/src/env_info.rs
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/ethcore/src/error.rs b/ethcore/src/error.rs
index 261eab2688..4afbe25b88 100644
--- a/ethcore/src/error.rs
+++ b/ethcore/src/error.rs
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/ethcore/src/ethereum/denominations.rs b/ethcore/src/ethereum/denominations.rs
index a8ac2c44c3..6df11fd49c 100644
--- a/ethcore/src/ethereum/denominations.rs
+++ b/ethcore/src/ethereum/denominations.rs
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/ethcore/src/ethereum/mod.rs b/ethcore/src/ethereum/mod.rs
index 3916e5ccc7..3a20f1e433 100644
--- a/ethcore/src/ethereum/mod.rs
+++ b/ethcore/src/ethereum/mod.rs
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/ethcore/src/evm/benches/mod.rs b/ethcore/src/evm/benches/mod.rs
index cbed7d8813..de7f318c48 100644
--- a/ethcore/src/evm/benches/mod.rs
+++ b/ethcore/src/evm/benches/mod.rs
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/ethcore/src/evm/evm.rs b/ethcore/src/evm/evm.rs
index 8d22024801..3270b06e41 100644
--- a/ethcore/src/evm/evm.rs
+++ b/ethcore/src/evm/evm.rs
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/ethcore/src/evm/ext.rs b/ethcore/src/evm/ext.rs
index 1c340b5b19..38c2d9fedc 100644
--- a/ethcore/src/evm/ext.rs
+++ b/ethcore/src/evm/ext.rs
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/ethcore/src/evm/factory.rs b/ethcore/src/evm/factory.rs
index a3d94bde83..e84acb4a49 100644
--- a/ethcore/src/evm/factory.rs
+++ b/ethcore/src/evm/factory.rs
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/ethcore/src/evm/interpreter/informant.rs b/ethcore/src/evm/interpreter/informant.rs
index 200b015263..e16267174e 100644
--- a/ethcore/src/evm/interpreter/informant.rs
+++ b/ethcore/src/evm/interpreter/informant.rs
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/ethcore/src/evm/interpreter/memory.rs b/ethcore/src/evm/interpreter/memory.rs
index 8195a0da33..7a564ee6d5 100644
--- a/ethcore/src/evm/interpreter/memory.rs
+++ b/ethcore/src/evm/interpreter/memory.rs
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/ethcore/src/evm/interpreter/shared_cache.rs b/ethcore/src/evm/interpreter/shared_cache.rs
index cacc4dde39..25a64f1006 100644
--- a/ethcore/src/evm/interpreter/shared_cache.rs
+++ b/ethcore/src/evm/interpreter/shared_cache.rs
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/ethcore/src/evm/interpreter/stack.rs b/ethcore/src/evm/interpreter/stack.rs
index 0d7ef4dbb1..187d7db18b 100644
--- a/ethcore/src/evm/interpreter/stack.rs
+++ b/ethcore/src/evm/interpreter/stack.rs
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/ethcore/src/evm/jit.rs b/ethcore/src/evm/jit.rs
index 6fa617396d..a40c6eac3f 100644
--- a/ethcore/src/evm/jit.rs
+++ b/ethcore/src/evm/jit.rs
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/ethcore/src/evm/mod.rs b/ethcore/src/evm/mod.rs
index bfead60c10..36931220ca 100644
--- a/ethcore/src/evm/mod.rs
+++ b/ethcore/src/evm/mod.rs
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/ethcore/src/evm/schedule.rs b/ethcore/src/evm/schedule.rs
index 773708956e..d49c1afcd8 100644
--- a/ethcore/src/evm/schedule.rs
+++ b/ethcore/src/evm/schedule.rs
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/ethcore/src/externalities.rs b/ethcore/src/externalities.rs
index 3704ead679..7a8f60b79c 100644
--- a/ethcore/src/externalities.rs
+++ b/ethcore/src/externalities.rs
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/ethcore/src/factory.rs b/ethcore/src/factory.rs
index dec341820f..da22d56ee4 100644
--- a/ethcore/src/factory.rs
+++ b/ethcore/src/factory.rs
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/ethcore/src/header.rs b/ethcore/src/header.rs
index 228933570c..666ed3ec21 100644
--- a/ethcore/src/header.rs
+++ b/ethcore/src/header.rs
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/ethcore/src/json_tests/chain.rs b/ethcore/src/json_tests/chain.rs
index b50241199e..5d79aab56d 100644
--- a/ethcore/src/json_tests/chain.rs
+++ b/ethcore/src/json_tests/chain.rs
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/ethcore/src/json_tests/eip150_state.rs b/ethcore/src/json_tests/eip150_state.rs
index 9076286eb4..cda1b64b44 100644
--- a/ethcore/src/json_tests/eip150_state.rs
+++ b/ethcore/src/json_tests/eip150_state.rs
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/ethcore/src/json_tests/eip161_state.rs b/ethcore/src/json_tests/eip161_state.rs
index da7997fa10..10c863793c 100644
--- a/ethcore/src/json_tests/eip161_state.rs
+++ b/ethcore/src/json_tests/eip161_state.rs
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/ethcore/src/json_tests/executive.rs b/ethcore/src/json_tests/executive.rs
index 60321f971d..ffaf36d5ef 100644
--- a/ethcore/src/json_tests/executive.rs
+++ b/ethcore/src/json_tests/executive.rs
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/ethcore/src/json_tests/homestead_chain.rs b/ethcore/src/json_tests/homestead_chain.rs
index 37a9d0a21a..7a4fe21217 100644
--- a/ethcore/src/json_tests/homestead_chain.rs
+++ b/ethcore/src/json_tests/homestead_chain.rs
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/ethcore/src/json_tests/homestead_state.rs b/ethcore/src/json_tests/homestead_state.rs
index 0b611dad70..d824e2b0be 100644
--- a/ethcore/src/json_tests/homestead_state.rs
+++ b/ethcore/src/json_tests/homestead_state.rs
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/ethcore/src/json_tests/mod.rs b/ethcore/src/json_tests/mod.rs
index 13d3fb5bb1..833b402704 100644
--- a/ethcore/src/json_tests/mod.rs
+++ b/ethcore/src/json_tests/mod.rs
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/ethcore/src/json_tests/test_common.rs b/ethcore/src/json_tests/test_common.rs
index e77b3df93f..f794cfcb37 100644
--- a/ethcore/src/json_tests/test_common.rs
+++ b/ethcore/src/json_tests/test_common.rs
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/ethcore/src/json_tests/transaction.rs b/ethcore/src/json_tests/transaction.rs
index 12e82bca2a..7f87313431 100644
--- a/ethcore/src/json_tests/transaction.rs
+++ b/ethcore/src/json_tests/transaction.rs
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/ethcore/src/json_tests/trie.rs b/ethcore/src/json_tests/trie.rs
index 4090ec7622..065985b0ae 100644
--- a/ethcore/src/json_tests/trie.rs
+++ b/ethcore/src/json_tests/trie.rs
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/ethcore/src/lib.rs b/ethcore/src/lib.rs
index ca343b1a7b..244ab932fe 100644
--- a/ethcore/src/lib.rs
+++ b/ethcore/src/lib.rs
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/ethcore/src/migrations/blocks/mod.rs b/ethcore/src/migrations/blocks/mod.rs
index 7253208bbd..172e6df439 100644
--- a/ethcore/src/migrations/blocks/mod.rs
+++ b/ethcore/src/migrations/blocks/mod.rs
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/ethcore/src/migrations/blocks/v8.rs b/ethcore/src/migrations/blocks/v8.rs
index 21024f93d5..b58e66ea3a 100644
--- a/ethcore/src/migrations/blocks/v8.rs
+++ b/ethcore/src/migrations/blocks/v8.rs
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/ethcore/src/migrations/extras/mod.rs b/ethcore/src/migrations/extras/mod.rs
index 0635596ea3..d91691b560 100644
--- a/ethcore/src/migrations/extras/mod.rs
+++ b/ethcore/src/migrations/extras/mod.rs
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/ethcore/src/migrations/extras/v6.rs b/ethcore/src/migrations/extras/v6.rs
index 9b746b9d24..f80394dc75 100644
--- a/ethcore/src/migrations/extras/v6.rs
+++ b/ethcore/src/migrations/extras/v6.rs
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/ethcore/src/migrations/mod.rs b/ethcore/src/migrations/mod.rs
index 7ccafac743..32b7048e06 100644
--- a/ethcore/src/migrations/mod.rs
+++ b/ethcore/src/migrations/mod.rs
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/ethcore/src/migrations/state/mod.rs b/ethcore/src/migrations/state/mod.rs
index 9a6b9e086b..f48b4c2479 100644
--- a/ethcore/src/migrations/state/mod.rs
+++ b/ethcore/src/migrations/state/mod.rs
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/ethcore/src/migrations/state/v7.rs b/ethcore/src/migrations/state/v7.rs
index 49df041eb6..69178188b6 100644
--- a/ethcore/src/migrations/state/v7.rs
+++ b/ethcore/src/migrations/state/v7.rs
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/ethcore/src/migrations/v10.rs b/ethcore/src/migrations/v10.rs
index 77531eb083..3726d2e974 100644
--- a/ethcore/src/migrations/v10.rs
+++ b/ethcore/src/migrations/v10.rs
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/ethcore/src/migrations/v9.rs b/ethcore/src/migrations/v9.rs
index 83729dc552..b99de0f51b 100644
--- a/ethcore/src/migrations/v9.rs
+++ b/ethcore/src/migrations/v9.rs
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/ethcore/src/miner/banning_queue.rs b/ethcore/src/miner/banning_queue.rs
index 0fdea2ac3a..d8b038c156 100644
--- a/ethcore/src/miner/banning_queue.rs
+++ b/ethcore/src/miner/banning_queue.rs
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/ethcore/src/miner/external.rs b/ethcore/src/miner/external.rs
index c3fcf723fc..199e795fd4 100644
--- a/ethcore/src/miner/external.rs
+++ b/ethcore/src/miner/external.rs
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/ethcore/src/miner/local_transactions.rs b/ethcore/src/miner/local_transactions.rs
index c8afcc0d51..62cec7151f 100644
--- a/ethcore/src/miner/local_transactions.rs
+++ b/ethcore/src/miner/local_transactions.rs
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/ethcore/src/miner/mod.rs b/ethcore/src/miner/mod.rs
index 8c466581b8..814953c81a 100644
--- a/ethcore/src/miner/mod.rs
+++ b/ethcore/src/miner/mod.rs
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/ethcore/src/miner/price_info.rs b/ethcore/src/miner/price_info.rs
index 77bc1ce0f6..e1cf82f990 100644
--- a/ethcore/src/miner/price_info.rs
+++ b/ethcore/src/miner/price_info.rs
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/ethcore/src/miner/work_notify.rs b/ethcore/src/miner/work_notify.rs
index 557f02f316..1b2ce67b1a 100644
--- a/ethcore/src/miner/work_notify.rs
+++ b/ethcore/src/miner/work_notify.rs
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/ethcore/src/pod_account.rs b/ethcore/src/pod_account.rs
index 92a78cebd2..20a9a46d40 100644
--- a/ethcore/src/pod_account.rs
+++ b/ethcore/src/pod_account.rs
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/ethcore/src/pod_state.rs b/ethcore/src/pod_state.rs
index d9f44680ef..18045c5104 100644
--- a/ethcore/src/pod_state.rs
+++ b/ethcore/src/pod_state.rs
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/ethcore/src/service.rs b/ethcore/src/service.rs
index 36b5e71572..bf346e707c 100644
--- a/ethcore/src/service.rs
+++ b/ethcore/src/service.rs
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/ethcore/src/snapshot/account.rs b/ethcore/src/snapshot/account.rs
index 327979ce36..9d5385d92c 100644
--- a/ethcore/src/snapshot/account.rs
+++ b/ethcore/src/snapshot/account.rs
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/ethcore/src/snapshot/block.rs b/ethcore/src/snapshot/block.rs
index 4f7f912cab..94b7a4289d 100644
--- a/ethcore/src/snapshot/block.rs
+++ b/ethcore/src/snapshot/block.rs
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/ethcore/src/snapshot/error.rs b/ethcore/src/snapshot/error.rs
index cc84d8e489..46ef6f41b2 100644
--- a/ethcore/src/snapshot/error.rs
+++ b/ethcore/src/snapshot/error.rs
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/ethcore/src/snapshot/io.rs b/ethcore/src/snapshot/io.rs
index cd57b35d39..2d581d5718 100644
--- a/ethcore/src/snapshot/io.rs
+++ b/ethcore/src/snapshot/io.rs
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/ethcore/src/snapshot/mod.rs b/ethcore/src/snapshot/mod.rs
index 9b45f2687b..1e646effca 100644
--- a/ethcore/src/snapshot/mod.rs
+++ b/ethcore/src/snapshot/mod.rs
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/ethcore/src/snapshot/service.rs b/ethcore/src/snapshot/service.rs
index 05c4c1f9f7..b433108fd2 100644
--- a/ethcore/src/snapshot/service.rs
+++ b/ethcore/src/snapshot/service.rs
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/ethcore/src/snapshot/snapshot_service_trait.rs b/ethcore/src/snapshot/snapshot_service_trait.rs
index 42223f8784..aa2782a5a3 100644
--- a/ethcore/src/snapshot/snapshot_service_trait.rs
+++ b/ethcore/src/snapshot/snapshot_service_trait.rs
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/ethcore/src/snapshot/tests/blocks.rs b/ethcore/src/snapshot/tests/blocks.rs
index 3d9390d2ef..058d311e2b 100644
--- a/ethcore/src/snapshot/tests/blocks.rs
+++ b/ethcore/src/snapshot/tests/blocks.rs
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/ethcore/src/snapshot/tests/helpers.rs b/ethcore/src/snapshot/tests/helpers.rs
index c97f138d72..164f991213 100644
--- a/ethcore/src/snapshot/tests/helpers.rs
+++ b/ethcore/src/snapshot/tests/helpers.rs
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/ethcore/src/snapshot/tests/mod.rs b/ethcore/src/snapshot/tests/mod.rs
index d9c0abc73a..d63abec532 100644
--- a/ethcore/src/snapshot/tests/mod.rs
+++ b/ethcore/src/snapshot/tests/mod.rs
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/ethcore/src/snapshot/tests/service.rs b/ethcore/src/snapshot/tests/service.rs
index efdb12323d..b460d58063 100644
--- a/ethcore/src/snapshot/tests/service.rs
+++ b/ethcore/src/snapshot/tests/service.rs
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/ethcore/src/snapshot/tests/state.rs b/ethcore/src/snapshot/tests/state.rs
index 36c268f73d..380e9fb0db 100644
--- a/ethcore/src/snapshot/tests/state.rs
+++ b/ethcore/src/snapshot/tests/state.rs
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/ethcore/src/snapshot/watcher.rs b/ethcore/src/snapshot/watcher.rs
index ab4dde1343..2ee1860206 100644
--- a/ethcore/src/snapshot/watcher.rs
+++ b/ethcore/src/snapshot/watcher.rs
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/ethcore/src/spec/genesis.rs b/ethcore/src/spec/genesis.rs
index 380c48aba9..be3b7c808d 100644
--- a/ethcore/src/spec/genesis.rs
+++ b/ethcore/src/spec/genesis.rs
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/ethcore/src/spec/mod.rs b/ethcore/src/spec/mod.rs
index 356f3b2196..b7288c2687 100644
--- a/ethcore/src/spec/mod.rs
+++ b/ethcore/src/spec/mod.rs
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/ethcore/src/spec/seal.rs b/ethcore/src/spec/seal.rs
index f3e5dca956..eaf951189c 100644
--- a/ethcore/src/spec/seal.rs
+++ b/ethcore/src/spec/seal.rs
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/ethcore/src/spec/spec.rs b/ethcore/src/spec/spec.rs
index e14ea3949c..5d0cc83607 100644
--- a/ethcore/src/spec/spec.rs
+++ b/ethcore/src/spec/spec.rs
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/ethcore/src/state/account.rs b/ethcore/src/state/account.rs
index c3d812c46b..d778412c4b 100644
--- a/ethcore/src/state/account.rs
+++ b/ethcore/src/state/account.rs
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/ethcore/src/state/substate.rs b/ethcore/src/state/substate.rs
index c11f802a1c..0f1ac2ecd3 100644
--- a/ethcore/src/state/substate.rs
+++ b/ethcore/src/state/substate.rs
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/ethcore/src/state_db.rs b/ethcore/src/state_db.rs
index eafa4022eb..79c1a4a2c5 100644
--- a/ethcore/src/state_db.rs
+++ b/ethcore/src/state_db.rs
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/ethcore/src/tests/client.rs b/ethcore/src/tests/client.rs
index 0b688345d4..51c7086b6f 100644
--- a/ethcore/src/tests/client.rs
+++ b/ethcore/src/tests/client.rs
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/ethcore/src/tests/helpers.rs b/ethcore/src/tests/helpers.rs
index e952fe27a0..602217d883 100644
--- a/ethcore/src/tests/helpers.rs
+++ b/ethcore/src/tests/helpers.rs
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/ethcore/src/tests/mod.rs b/ethcore/src/tests/mod.rs
index 4157e486df..e9eb39c88a 100644
--- a/ethcore/src/tests/mod.rs
+++ b/ethcore/src/tests/mod.rs
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/ethcore/src/tests/rpc.rs b/ethcore/src/tests/rpc.rs
index 2da94b3d0b..9e4d3db7ba 100644
--- a/ethcore/src/tests/rpc.rs
+++ b/ethcore/src/tests/rpc.rs
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/ethcore/src/trace/config.rs b/ethcore/src/trace/config.rs
index 9dab7524d9..01b1c60e14 100644
--- a/ethcore/src/trace/config.rs
+++ b/ethcore/src/trace/config.rs
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/ethcore/src/trace/db.rs b/ethcore/src/trace/db.rs
index 174c9b386a..c55bd07486 100644
--- a/ethcore/src/trace/db.rs
+++ b/ethcore/src/trace/db.rs
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/ethcore/src/trace/error.rs b/ethcore/src/trace/error.rs
index 32c372f7e5..e8c1035948 100644
--- a/ethcore/src/trace/error.rs
+++ b/ethcore/src/trace/error.rs
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/ethcore/src/trace/executive_tracer.rs b/ethcore/src/trace/executive_tracer.rs
index bb18c61a84..f3cabf8329 100644
--- a/ethcore/src/trace/executive_tracer.rs
+++ b/ethcore/src/trace/executive_tracer.rs
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/ethcore/src/trace/import.rs b/ethcore/src/trace/import.rs
index 7da3e5fe27..2fea9429ee 100644
--- a/ethcore/src/trace/import.rs
+++ b/ethcore/src/trace/import.rs
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/ethcore/src/trace/mod.rs b/ethcore/src/trace/mod.rs
index da3bbc02be..d5c0d361f6 100644
--- a/ethcore/src/trace/mod.rs
+++ b/ethcore/src/trace/mod.rs
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/ethcore/src/trace/noop_tracer.rs b/ethcore/src/trace/noop_tracer.rs
index f126d85aa6..a1b9945500 100644
--- a/ethcore/src/trace/noop_tracer.rs
+++ b/ethcore/src/trace/noop_tracer.rs
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/ethcore/src/types/account_diff.rs b/ethcore/src/types/account_diff.rs
index e4766d7f1e..c8d5c9eecc 100644
--- a/ethcore/src/types/account_diff.rs
+++ b/ethcore/src/types/account_diff.rs
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/ethcore/src/types/block_import_error.rs b/ethcore/src/types/block_import_error.rs
index 355f29152f..e229db6d2a 100644
--- a/ethcore/src/types/block_import_error.rs
+++ b/ethcore/src/types/block_import_error.rs
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/ethcore/src/types/block_status.rs b/ethcore/src/types/block_status.rs
index 857daae101..d1c6c7d5bb 100644
--- a/ethcore/src/types/block_status.rs
+++ b/ethcore/src/types/block_status.rs
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/ethcore/src/types/blockchain_info.rs b/ethcore/src/types/blockchain_info.rs
index ff6aa8ddec..6757acf641 100644
--- a/ethcore/src/types/blockchain_info.rs
+++ b/ethcore/src/types/blockchain_info.rs
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/ethcore/src/types/call_analytics.rs b/ethcore/src/types/call_analytics.rs
index d38be0cc72..9da2d11aed 100644
--- a/ethcore/src/types/call_analytics.rs
+++ b/ethcore/src/types/call_analytics.rs
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/ethcore/src/types/executed.rs b/ethcore/src/types/executed.rs
index b4328b75d0..3ce8d26342 100644
--- a/ethcore/src/types/executed.rs
+++ b/ethcore/src/types/executed.rs
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/ethcore/src/types/filter.rs b/ethcore/src/types/filter.rs
index ecc997f715..8aecef43be 100644
--- a/ethcore/src/types/filter.rs
+++ b/ethcore/src/types/filter.rs
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/ethcore/src/types/ids.rs b/ethcore/src/types/ids.rs
index 2c3c777b4d..2828c47982 100644
--- a/ethcore/src/types/ids.rs
+++ b/ethcore/src/types/ids.rs
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/ethcore/src/types/log_entry.rs b/ethcore/src/types/log_entry.rs
index 0e5f7d5316..19531a9e96 100644
--- a/ethcore/src/types/log_entry.rs
+++ b/ethcore/src/types/log_entry.rs
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/ethcore/src/types/mod.rs b/ethcore/src/types/mod.rs
index d01829ea0b..959ff694a8 100644
--- a/ethcore/src/types/mod.rs
+++ b/ethcore/src/types/mod.rs
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/ethcore/src/types/mod.rs.in b/ethcore/src/types/mod.rs.in
index d462d3cb99..47a4b6a84a 100644
--- a/ethcore/src/types/mod.rs.in
+++ b/ethcore/src/types/mod.rs.in
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/ethcore/src/types/mode.rs b/ethcore/src/types/mode.rs
index dff75e1585..a1df3c76fb 100644
--- a/ethcore/src/types/mode.rs
+++ b/ethcore/src/types/mode.rs
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/ethcore/src/types/pruning_info.rs b/ethcore/src/types/pruning_info.rs
index 40564f488b..fd5689d2dd 100644
--- a/ethcore/src/types/pruning_info.rs
+++ b/ethcore/src/types/pruning_info.rs
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/ethcore/src/types/receipt.rs b/ethcore/src/types/receipt.rs
index deefeb3831..c15f039bc7 100644
--- a/ethcore/src/types/receipt.rs
+++ b/ethcore/src/types/receipt.rs
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/ethcore/src/types/restoration_status.rs b/ethcore/src/types/restoration_status.rs
index ddf4cf1db7..507659d5be 100644
--- a/ethcore/src/types/restoration_status.rs
+++ b/ethcore/src/types/restoration_status.rs
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/ethcore/src/types/snapshot_manifest.rs b/ethcore/src/types/snapshot_manifest.rs
index 859ec016f5..dac164b0b0 100644
--- a/ethcore/src/types/snapshot_manifest.rs
+++ b/ethcore/src/types/snapshot_manifest.rs
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/ethcore/src/types/state_diff.rs b/ethcore/src/types/state_diff.rs
index ee416d1d05..6b8242db6c 100644
--- a/ethcore/src/types/state_diff.rs
+++ b/ethcore/src/types/state_diff.rs
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/ethcore/src/types/trace_filter.rs b/ethcore/src/types/trace_filter.rs
index af9d7c3eef..5a7ed84291 100644
--- a/ethcore/src/types/trace_filter.rs
+++ b/ethcore/src/types/trace_filter.rs
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/ethcore/src/types/trace_types/error.rs b/ethcore/src/types/trace_types/error.rs
index 5b2510c81f..72b873fc9f 100644
--- a/ethcore/src/types/trace_types/error.rs
+++ b/ethcore/src/types/trace_types/error.rs
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/ethcore/src/types/trace_types/flat.rs b/ethcore/src/types/trace_types/flat.rs
index d0c7cbe9b8..8a949c210a 100644
--- a/ethcore/src/types/trace_types/flat.rs
+++ b/ethcore/src/types/trace_types/flat.rs
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/ethcore/src/types/trace_types/localized.rs b/ethcore/src/types/trace_types/localized.rs
index f276e9b259..57abea362d 100644
--- a/ethcore/src/types/trace_types/localized.rs
+++ b/ethcore/src/types/trace_types/localized.rs
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/ethcore/src/types/trace_types/mod.rs b/ethcore/src/types/trace_types/mod.rs
index f940263b20..df5c803bb1 100644
--- a/ethcore/src/types/trace_types/mod.rs
+++ b/ethcore/src/types/trace_types/mod.rs
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/ethcore/src/types/transaction.rs b/ethcore/src/types/transaction.rs
index 1c6ef92e3b..6388120c3f 100644
--- a/ethcore/src/types/transaction.rs
+++ b/ethcore/src/types/transaction.rs
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/ethcore/src/types/transaction_import.rs b/ethcore/src/types/transaction_import.rs
index e53313df7a..cfd3d52432 100644
--- a/ethcore/src/types/transaction_import.rs
+++ b/ethcore/src/types/transaction_import.rs
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/ethcore/src/types/tree_route.rs b/ethcore/src/types/tree_route.rs
index 5d08f56010..7a97cac032 100644
--- a/ethcore/src/types/tree_route.rs
+++ b/ethcore/src/types/tree_route.rs
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/ethcore/src/types/verification_queue_info.rs b/ethcore/src/types/verification_queue_info.rs
index 35954e7a94..3361155dfa 100644
--- a/ethcore/src/types/verification_queue_info.rs
+++ b/ethcore/src/types/verification_queue_info.rs
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/ethcore/src/verification/canon_verifier.rs b/ethcore/src/verification/canon_verifier.rs
index b5b01279ec..75b0943eab 100644
--- a/ethcore/src/verification/canon_verifier.rs
+++ b/ethcore/src/verification/canon_verifier.rs
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/ethcore/src/verification/mod.rs b/ethcore/src/verification/mod.rs
index 55663052b7..5dc28634c1 100644
--- a/ethcore/src/verification/mod.rs
+++ b/ethcore/src/verification/mod.rs
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/ethcore/src/verification/noop_verifier.rs b/ethcore/src/verification/noop_verifier.rs
index 7db688a859..83ca11efd8 100644
--- a/ethcore/src/verification/noop_verifier.rs
+++ b/ethcore/src/verification/noop_verifier.rs
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/ethcore/src/verification/queue/kind.rs b/ethcore/src/verification/queue/kind.rs
index 17b9974903..5d4bb74511 100644
--- a/ethcore/src/verification/queue/kind.rs
+++ b/ethcore/src/verification/queue/kind.rs
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/ethcore/src/verification/verification.rs b/ethcore/src/verification/verification.rs
index 7e42e8881b..661c40c96b 100644
--- a/ethcore/src/verification/verification.rs
+++ b/ethcore/src/verification/verification.rs
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/ethcore/src/verification/verifier.rs b/ethcore/src/verification/verifier.rs
index 05d488f95e..f3cea1a78f 100644
--- a/ethcore/src/verification/verifier.rs
+++ b/ethcore/src/verification/verifier.rs
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/ethcore/src/views/block.rs b/ethcore/src/views/block.rs
index 97cf26441c..ede5b19850 100644
--- a/ethcore/src/views/block.rs
+++ b/ethcore/src/views/block.rs
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/ethcore/src/views/body.rs b/ethcore/src/views/body.rs
index 989acd4656..c6168f6d8e 100644
--- a/ethcore/src/views/body.rs
+++ b/ethcore/src/views/body.rs
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/ethcore/src/views/header.rs b/ethcore/src/views/header.rs
index 6c3b14b15e..e20d7f7c9c 100644
--- a/ethcore/src/views/header.rs
+++ b/ethcore/src/views/header.rs
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/ethcore/src/views/mod.rs b/ethcore/src/views/mod.rs
index e8267e15a2..d827f8fb00 100644
--- a/ethcore/src/views/mod.rs
+++ b/ethcore/src/views/mod.rs
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/ethcore/src/views/transaction.rs b/ethcore/src/views/transaction.rs
index df861d9fdb..1256d98d51 100644
--- a/ethcore/src/views/transaction.rs
+++ b/ethcore/src/views/transaction.rs
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/ethcrypto/src/lib.rs b/ethcrypto/src/lib.rs
index c98d140278..4cb0863653 100644
--- a/ethcrypto/src/lib.rs
+++ b/ethcrypto/src/lib.rs
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/ethkey/src/bin/ethkey.rs b/ethkey/src/bin/ethkey.rs
index 778ae39c93..af301732bb 100644
--- a/ethkey/src/bin/ethkey.rs
+++ b/ethkey/src/bin/ethkey.rs
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/ethkey/src/bin/main.rs b/ethkey/src/bin/main.rs
index 7c7512a976..ac795b3352 100644
--- a/ethkey/src/bin/main.rs
+++ b/ethkey/src/bin/main.rs
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/ethkey/src/brain.rs b/ethkey/src/brain.rs
index dd8913c66f..2db460812b 100644
--- a/ethkey/src/brain.rs
+++ b/ethkey/src/brain.rs
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/ethkey/src/error.rs b/ethkey/src/error.rs
index 2597e88270..530ffe0f15 100644
--- a/ethkey/src/error.rs
+++ b/ethkey/src/error.rs
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/ethkey/src/keccak.rs b/ethkey/src/keccak.rs
index 18b31a8684..8e8e5fb8fe 100644
--- a/ethkey/src/keccak.rs
+++ b/ethkey/src/keccak.rs
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/ethkey/src/keypair.rs b/ethkey/src/keypair.rs
index fa7c1a85e0..2b9c1a204b 100644
--- a/ethkey/src/keypair.rs
+++ b/ethkey/src/keypair.rs
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/ethkey/src/lib.rs b/ethkey/src/lib.rs
index 1f345b2ff6..79faf0ef9a 100644
--- a/ethkey/src/lib.rs
+++ b/ethkey/src/lib.rs
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/ethkey/src/prefix.rs b/ethkey/src/prefix.rs
index ad5e02c4ab..59e64abdad 100644
--- a/ethkey/src/prefix.rs
+++ b/ethkey/src/prefix.rs
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/ethkey/src/random.rs b/ethkey/src/random.rs
index ea4cdaec66..8b0c98c647 100644
--- a/ethkey/src/random.rs
+++ b/ethkey/src/random.rs
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/ethkey/src/signature.rs b/ethkey/src/signature.rs
index e1afb3940a..97a2e07151 100644
--- a/ethkey/src/signature.rs
+++ b/ethkey/src/signature.rs
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/ethstore/build.rs b/ethstore/build.rs
index 65606cab93..d0aeb8837d 100644
--- a/ethstore/build.rs
+++ b/ethstore/build.rs
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/ethstore/src/account/cipher.rs b/ethstore/src/account/cipher.rs
index 1b9d49b26e..c6688252d0 100644
--- a/ethstore/src/account/cipher.rs
+++ b/ethstore/src/account/cipher.rs
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/ethstore/src/account/kdf.rs b/ethstore/src/account/kdf.rs
index 0cabce625e..3fa0a8f8a7 100644
--- a/ethstore/src/account/kdf.rs
+++ b/ethstore/src/account/kdf.rs
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/ethstore/src/account/mod.rs b/ethstore/src/account/mod.rs
index b4c3e1113d..9e3b927ed2 100644
--- a/ethstore/src/account/mod.rs
+++ b/ethstore/src/account/mod.rs
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/ethstore/src/account/safe_account.rs b/ethstore/src/account/safe_account.rs
index 336e72875f..133e6eeacc 100644
--- a/ethstore/src/account/safe_account.rs
+++ b/ethstore/src/account/safe_account.rs
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/ethstore/src/account/version.rs b/ethstore/src/account/version.rs
index 465ce4e1b8..a6a48bbe40 100644
--- a/ethstore/src/account/version.rs
+++ b/ethstore/src/account/version.rs
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/ethstore/src/bin/ethstore.rs b/ethstore/src/bin/ethstore.rs
index 9d499723b3..954be2aa95 100644
--- a/ethstore/src/bin/ethstore.rs
+++ b/ethstore/src/bin/ethstore.rs
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/ethstore/src/bin/main.rs b/ethstore/src/bin/main.rs
index eee1fa39cc..e33fc1c23f 100644
--- a/ethstore/src/bin/main.rs
+++ b/ethstore/src/bin/main.rs
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/ethstore/src/dir/disk.rs b/ethstore/src/dir/disk.rs
index c86123d1a4..80e95fb66e 100644
--- a/ethstore/src/dir/disk.rs
+++ b/ethstore/src/dir/disk.rs
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/ethstore/src/dir/geth.rs b/ethstore/src/dir/geth.rs
index f63ebbea2c..40c3d938ab 100644
--- a/ethstore/src/dir/geth.rs
+++ b/ethstore/src/dir/geth.rs
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/ethstore/src/dir/mod.rs b/ethstore/src/dir/mod.rs
index e29bd1ec4b..8f5a8a7ada 100644
--- a/ethstore/src/dir/mod.rs
+++ b/ethstore/src/dir/mod.rs
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/ethstore/src/dir/parity.rs b/ethstore/src/dir/parity.rs
index 7aa50c80bf..8c5e9c2d60 100644
--- a/ethstore/src/dir/parity.rs
+++ b/ethstore/src/dir/parity.rs
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/ethstore/src/error.rs b/ethstore/src/error.rs
index cee689b24e..8c77e7a7f7 100644
--- a/ethstore/src/error.rs
+++ b/ethstore/src/error.rs
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/ethstore/src/ethkey.rs b/ethstore/src/ethkey.rs
index 9d8858b79c..d635d34a03 100644
--- a/ethstore/src/ethkey.rs
+++ b/ethstore/src/ethkey.rs
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/ethstore/src/ethstore.rs b/ethstore/src/ethstore.rs
index 3747431fbf..ec1f826265 100644
--- a/ethstore/src/ethstore.rs
+++ b/ethstore/src/ethstore.rs
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/ethstore/src/import.rs b/ethstore/src/import.rs
index 63cc931114..b112bce75b 100644
--- a/ethstore/src/import.rs
+++ b/ethstore/src/import.rs
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/ethstore/src/json/cipher.rs b/ethstore/src/json/cipher.rs
index 1190244377..05628cdeda 100644
--- a/ethstore/src/json/cipher.rs
+++ b/ethstore/src/json/cipher.rs
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/ethstore/src/json/crypto.rs b/ethstore/src/json/crypto.rs
index 739a2fea91..99ef026b38 100644
--- a/ethstore/src/json/crypto.rs
+++ b/ethstore/src/json/crypto.rs
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/ethstore/src/json/error.rs b/ethstore/src/json/error.rs
index a3ea4d326f..fdec03c506 100644
--- a/ethstore/src/json/error.rs
+++ b/ethstore/src/json/error.rs
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/ethstore/src/json/hash.rs b/ethstore/src/json/hash.rs
index 25bf51130b..3496a034cc 100644
--- a/ethstore/src/json/hash.rs
+++ b/ethstore/src/json/hash.rs
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/ethstore/src/json/id.rs b/ethstore/src/json/id.rs
index 664716d95a..cf098c83f5 100644
--- a/ethstore/src/json/id.rs
+++ b/ethstore/src/json/id.rs
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/ethstore/src/json/kdf.rs b/ethstore/src/json/kdf.rs
index 676df1f95b..af751ad334 100644
--- a/ethstore/src/json/kdf.rs
+++ b/ethstore/src/json/kdf.rs
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/ethstore/src/json/key_file.rs b/ethstore/src/json/key_file.rs
index 093479b3ae..323086fa0f 100644
--- a/ethstore/src/json/key_file.rs
+++ b/ethstore/src/json/key_file.rs
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/ethstore/src/json/mod.rs b/ethstore/src/json/mod.rs
index 208d474df0..5a28a69328 100644
--- a/ethstore/src/json/mod.rs
+++ b/ethstore/src/json/mod.rs
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/ethstore/src/json/version.rs b/ethstore/src/json/version.rs
index f394f61c2e..be03795ed2 100644
--- a/ethstore/src/json/version.rs
+++ b/ethstore/src/json/version.rs
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/ethstore/src/lib.rs b/ethstore/src/lib.rs
index f8619ff192..a55ad207a2 100644
--- a/ethstore/src/lib.rs
+++ b/ethstore/src/lib.rs
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/ethstore/src/random.rs b/ethstore/src/random.rs
index 954ec500f9..6140f0fae2 100644
--- a/ethstore/src/random.rs
+++ b/ethstore/src/random.rs
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/ethstore/src/secret_store.rs b/ethstore/src/secret_store.rs
index bf0a4ec446..2b3afb2ea8 100644
--- a/ethstore/src/secret_store.rs
+++ b/ethstore/src/secret_store.rs
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/ethstore/tests/api.rs b/ethstore/tests/api.rs
index e1667607bd..0b3e3ca23c 100644
--- a/ethstore/tests/api.rs
+++ b/ethstore/tests/api.rs
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/ethstore/tests/cli.rs b/ethstore/tests/cli.rs
index d4ebdc4487..50fed6b27f 100644
--- a/ethstore/tests/cli.rs
+++ b/ethstore/tests/cli.rs
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/ethstore/tests/util/mod.rs b/ethstore/tests/util/mod.rs
index 73c47ee615..c1bad398d1 100644
--- a/ethstore/tests/util/mod.rs
+++ b/ethstore/tests/util/mod.rs
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/ethstore/tests/util/transient_dir.rs b/ethstore/tests/util/transient_dir.rs
index 23523e48c8..839e9722dd 100644
--- a/ethstore/tests/util/transient_dir.rs
+++ b/ethstore/tests/util/transient_dir.rs
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/evmbin/benches/mod.rs b/evmbin/benches/mod.rs
index 3013dca544..424ed48159 100644
--- a/evmbin/benches/mod.rs
+++ b/evmbin/benches/mod.rs
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/evmbin/src/ext.rs b/evmbin/src/ext.rs
index cac89d76ca..af0836ad06 100644
--- a/evmbin/src/ext.rs
+++ b/evmbin/src/ext.rs
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/evmbin/src/main.rs b/evmbin/src/main.rs
index aa9faa1dac..8a08bd1638 100644
--- a/evmbin/src/main.rs
+++ b/evmbin/src/main.rs
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/evmjit/src/lib.rs b/evmjit/src/lib.rs
index d916906b6b..16bb7ab0d5 100644
--- a/evmjit/src/lib.rs
+++ b/evmjit/src/lib.rs
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/ipc/codegen/build.rs b/ipc/codegen/build.rs
index 82f9901885..b81724774b 100644
--- a/ipc/codegen/build.rs
+++ b/ipc/codegen/build.rs
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/ipc/codegen/src/lib.rs b/ipc/codegen/src/lib.rs
index dc58c6a8a9..caa0228fc0 100644
--- a/ipc/codegen/src/lib.rs
+++ b/ipc/codegen/src/lib.rs
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/ipc/codegen/src/lib.rs.in b/ipc/codegen/src/lib.rs.in
index 169bd2a820..afd3f92c0a 100644
--- a/ipc/codegen/src/lib.rs.in
+++ b/ipc/codegen/src/lib.rs.in
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/ipc/hypervisor/build.rs b/ipc/hypervisor/build.rs
index 391ac648db..57f9297021 100644
--- a/ipc/hypervisor/build.rs
+++ b/ipc/hypervisor/build.rs
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/ipc/hypervisor/src/lib.rs b/ipc/hypervisor/src/lib.rs
index c7543ca91b..0900c74107 100644
--- a/ipc/hypervisor/src/lib.rs
+++ b/ipc/hypervisor/src/lib.rs
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/ipc/hypervisor/src/service.rs b/ipc/hypervisor/src/service.rs
index ffc83dc7c2..b19c581a02 100644
--- a/ipc/hypervisor/src/service.rs
+++ b/ipc/hypervisor/src/service.rs
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/ipc/hypervisor/src/service.rs.in b/ipc/hypervisor/src/service.rs.in
index e80a1ec30b..2f3a1ebac4 100644
--- a/ipc/hypervisor/src/service.rs.in
+++ b/ipc/hypervisor/src/service.rs.in
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/ipc/nano/src/lib.rs b/ipc/nano/src/lib.rs
index 1157e75d33..ce40183e98 100644
--- a/ipc/nano/src/lib.rs
+++ b/ipc/nano/src/lib.rs
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/ipc/rpc/src/interface.rs b/ipc/rpc/src/interface.rs
index a3c170c2be..5e2718a77b 100644
--- a/ipc/rpc/src/interface.rs
+++ b/ipc/rpc/src/interface.rs
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/ipc/rpc/src/lib.rs b/ipc/rpc/src/lib.rs
index a783203436..c17acff98b 100644
--- a/ipc/rpc/src/lib.rs
+++ b/ipc/rpc/src/lib.rs
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/ipc/tests/binary.rs b/ipc/tests/binary.rs
index c8d100c6ee..3d9d454e02 100644
--- a/ipc/tests/binary.rs
+++ b/ipc/tests/binary.rs
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/ipc/tests/binary.rs.in b/ipc/tests/binary.rs.in
index 1498a45e0c..34e33609fb 100644
--- a/ipc/tests/binary.rs.in
+++ b/ipc/tests/binary.rs.in
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/ipc/tests/build.rs b/ipc/tests/build.rs
index 688d139be2..a62815e721 100644
--- a/ipc/tests/build.rs
+++ b/ipc/tests/build.rs
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/ipc/tests/examples.rs b/ipc/tests/examples.rs
index a27c0637aa..b635b012c5 100644
--- a/ipc/tests/examples.rs
+++ b/ipc/tests/examples.rs
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/ipc/tests/nested.rs b/ipc/tests/nested.rs
index 6e6e3942fb..c8116c4e7f 100644
--- a/ipc/tests/nested.rs
+++ b/ipc/tests/nested.rs
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/ipc/tests/nested.rs.in b/ipc/tests/nested.rs.in
index df0c9bde39..a12371ecf8 100644
--- a/ipc/tests/nested.rs.in
+++ b/ipc/tests/nested.rs.in
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/ipc/tests/over_nano.rs b/ipc/tests/over_nano.rs
index bdeaec3d54..9dbf2454ec 100644
--- a/ipc/tests/over_nano.rs
+++ b/ipc/tests/over_nano.rs
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/ipc/tests/run.rs b/ipc/tests/run.rs
index 522f566cf9..369f8f4b19 100644
--- a/ipc/tests/run.rs
+++ b/ipc/tests/run.rs
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/ipc/tests/service.rs b/ipc/tests/service.rs
index 3d5159a9b7..8b8b27c146 100644
--- a/ipc/tests/service.rs
+++ b/ipc/tests/service.rs
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/ipc/tests/service.rs.in b/ipc/tests/service.rs.in
index cd9a5a6b29..9bfe93cb36 100644
--- a/ipc/tests/service.rs.in
+++ b/ipc/tests/service.rs.in
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/ipc/tests/with_attrs.rs b/ipc/tests/with_attrs.rs
index bda7343688..0a48f1cd97 100644
--- a/ipc/tests/with_attrs.rs
+++ b/ipc/tests/with_attrs.rs
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/ipc/tests/with_attrs.rs.in b/ipc/tests/with_attrs.rs.in
index f65627fce2..afaa4a138f 100644
--- a/ipc/tests/with_attrs.rs.in
+++ b/ipc/tests/with_attrs.rs.in
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/build.rs b/js/build.rs
index 82bf1ac93f..5708645120 100644
--- a/js/build.rs
+++ b/js/build.rs
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/abi/abi.js b/js/src/abi/abi.js
index cdf3b1f639..457f5e416d 100644
--- a/js/src/abi/abi.js
+++ b/js/src/abi/abi.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/abi/decoder/bytesTaken.js b/js/src/abi/decoder/bytesTaken.js
index 49b443d213..5a32ca5235 100644
--- a/js/src/abi/decoder/bytesTaken.js
+++ b/js/src/abi/decoder/bytesTaken.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/abi/decoder/bytesTaken.spec.js b/js/src/abi/decoder/bytesTaken.spec.js
index 65bb9e1b6f..a5e078d7e1 100644
--- a/js/src/abi/decoder/bytesTaken.spec.js
+++ b/js/src/abi/decoder/bytesTaken.spec.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/abi/decoder/decodeResult.js b/js/src/abi/decoder/decodeResult.js
index 8595642dfb..3fe455f616 100644
--- a/js/src/abi/decoder/decodeResult.js
+++ b/js/src/abi/decoder/decodeResult.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/abi/decoder/decodeResult.spec.js b/js/src/abi/decoder/decodeResult.spec.js
index 892836d07a..c30928d4dd 100644
--- a/js/src/abi/decoder/decodeResult.spec.js
+++ b/js/src/abi/decoder/decodeResult.spec.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/abi/decoder/decoder.js b/js/src/abi/decoder/decoder.js
index 0d21831222..c1cac60349 100644
--- a/js/src/abi/decoder/decoder.js
+++ b/js/src/abi/decoder/decoder.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/abi/decoder/index.js b/js/src/abi/decoder/index.js
index f9839c10d8..123acf28fc 100644
--- a/js/src/abi/decoder/index.js
+++ b/js/src/abi/decoder/index.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/abi/encoder/encoder.js b/js/src/abi/encoder/encoder.js
index bb3a17d264..8634b9511d 100644
--- a/js/src/abi/encoder/encoder.js
+++ b/js/src/abi/encoder/encoder.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/abi/encoder/index.js b/js/src/abi/encoder/index.js
index e19ff81e67..d98637f041 100644
--- a/js/src/abi/encoder/index.js
+++ b/js/src/abi/encoder/index.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/abi/encoder/mediate.js b/js/src/abi/encoder/mediate.js
index cb7fce6a75..b41f7b1df1 100644
--- a/js/src/abi/encoder/mediate.js
+++ b/js/src/abi/encoder/mediate.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/abi/encoder/mediate.spec.js b/js/src/abi/encoder/mediate.spec.js
index cfd0211f2f..89783607fd 100644
--- a/js/src/abi/encoder/mediate.spec.js
+++ b/js/src/abi/encoder/mediate.spec.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/abi/index.js b/js/src/abi/index.js
index f055a69133..a7658dbe60 100644
--- a/js/src/abi/index.js
+++ b/js/src/abi/index.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/abi/spec/constructor.js b/js/src/abi/spec/constructor.js
index 89ea99610e..a75e627f7e 100644
--- a/js/src/abi/spec/constructor.js
+++ b/js/src/abi/spec/constructor.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/abi/spec/constructor.spec.js b/js/src/abi/spec/constructor.spec.js
index e02f6cf71f..80f3efe902 100644
--- a/js/src/abi/spec/constructor.spec.js
+++ b/js/src/abi/spec/constructor.spec.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/abi/spec/function.js b/js/src/abi/spec/function.js
index 0c91a9b6f9..68a6ca3421 100644
--- a/js/src/abi/spec/function.js
+++ b/js/src/abi/spec/function.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/abi/spec/function.spec.js b/js/src/abi/spec/function.spec.js
index 1650bd3146..6ad755d70a 100644
--- a/js/src/abi/spec/function.spec.js
+++ b/js/src/abi/spec/function.spec.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/abi/spec/index.js b/js/src/abi/spec/index.js
index 89354d49b5..5855a888a1 100644
--- a/js/src/abi/spec/index.js
+++ b/js/src/abi/spec/index.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/abi/spec/interface.js b/js/src/abi/spec/interface.js
index 1ea32e9a9c..9116f5ca3d 100644
--- a/js/src/abi/spec/interface.js
+++ b/js/src/abi/spec/interface.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/abi/spec/interface.spec.js b/js/src/abi/spec/interface.spec.js
index ba5c38a28a..8dda460d87 100644
--- a/js/src/abi/spec/interface.spec.js
+++ b/js/src/abi/spec/interface.spec.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/abi/spec/param.js b/js/src/abi/spec/param.js
index 95c3b9d18f..88696ceedf 100644
--- a/js/src/abi/spec/param.js
+++ b/js/src/abi/spec/param.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/abi/spec/param.spec.js b/js/src/abi/spec/param.spec.js
index bd172e4a6c..9957df909f 100644
--- a/js/src/abi/spec/param.spec.js
+++ b/js/src/abi/spec/param.spec.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/abi/token/index.js b/js/src/abi/token/index.js
index 4b822b4bdf..50ef7b2275 100644
--- a/js/src/abi/token/index.js
+++ b/js/src/abi/token/index.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/abi/token/token.js b/js/src/abi/token/token.js
index 84c675ee63..1d8bc6c8ac 100644
--- a/js/src/abi/token/token.js
+++ b/js/src/abi/token/token.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/abi/token/token.spec.js b/js/src/abi/token/token.spec.js
index 2abaad6ac9..da4ba15ee4 100644
--- a/js/src/abi/token/token.spec.js
+++ b/js/src/abi/token/token.spec.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/abi/util/address.js b/js/src/abi/util/address.js
index f0e188f2c3..a961e70356 100644
--- a/js/src/abi/util/address.js
+++ b/js/src/abi/util/address.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/abi/util/address.spec.js b/js/src/abi/util/address.spec.js
index 9b0ec38cbb..6048d22949 100644
--- a/js/src/abi/util/address.spec.js
+++ b/js/src/abi/util/address.spec.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/abi/util/pad.js b/js/src/abi/util/pad.js
index 5a6751a4f6..ce87779742 100644
--- a/js/src/abi/util/pad.js
+++ b/js/src/abi/util/pad.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/abi/util/pad.spec.js b/js/src/abi/util/pad.spec.js
index 96c7336824..578083b6fd 100644
--- a/js/src/abi/util/pad.spec.js
+++ b/js/src/abi/util/pad.spec.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/abi/util/signature.js b/js/src/abi/util/signature.js
index 10aedf13f9..f192e576b4 100644
--- a/js/src/abi/util/signature.js
+++ b/js/src/abi/util/signature.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/abi/util/signature.spec.js b/js/src/abi/util/signature.spec.js
index 61664b8fca..144c1c7aa9 100644
--- a/js/src/abi/util/signature.spec.js
+++ b/js/src/abi/util/signature.spec.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/abi/util/slice.js b/js/src/abi/util/slice.js
index f4bdf38e28..00c9c1b35b 100644
--- a/js/src/abi/util/slice.js
+++ b/js/src/abi/util/slice.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/abi/util/slice.spec.js b/js/src/abi/util/slice.spec.js
index d653c69012..330e570c4e 100644
--- a/js/src/abi/util/slice.spec.js
+++ b/js/src/abi/util/slice.spec.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/abi/util/sliceAs.js b/js/src/abi/util/sliceAs.js
index 47c3e9758d..bec5ea87f6 100644
--- a/js/src/abi/util/sliceAs.js
+++ b/js/src/abi/util/sliceAs.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/abi/util/sliceAs.spec.js b/js/src/abi/util/sliceAs.spec.js
index af68860089..9ad4cf8318 100644
--- a/js/src/abi/util/sliceAs.spec.js
+++ b/js/src/abi/util/sliceAs.spec.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/abi/util/types.js b/js/src/abi/util/types.js
index 649f26db6c..d18357f5dc 100644
--- a/js/src/abi/util/types.js
+++ b/js/src/abi/util/types.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/abi/util/types.spec.js b/js/src/abi/util/types.spec.js
index 2e1a538a6a..3a82d7fa18 100644
--- a/js/src/abi/util/types.spec.js
+++ b/js/src/abi/util/types.spec.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/api/api.js b/js/src/api/api.js
index 75d4392d01..9e0ad11b84 100644
--- a/js/src/api/api.js
+++ b/js/src/api/api.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/api/api.spec.js b/js/src/api/api.spec.js
index 16831ea661..1cad5b5303 100644
--- a/js/src/api/api.spec.js
+++ b/js/src/api/api.spec.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/api/contract/index.js b/js/src/api/contract/index.js
index 18051a69f9..3ab8765b02 100644
--- a/js/src/api/contract/index.js
+++ b/js/src/api/contract/index.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/api/format/input.js b/js/src/api/format/input.js
index 16fbd4d2ec..4cbcbdce44 100644
--- a/js/src/api/format/input.js
+++ b/js/src/api/format/input.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/api/format/input.spec.js b/js/src/api/format/input.spec.js
index a22c8d1315..27d200b938 100644
--- a/js/src/api/format/input.spec.js
+++ b/js/src/api/format/input.spec.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/api/format/output.js b/js/src/api/format/output.js
index 1094cdb831..632ab6f28f 100644
--- a/js/src/api/format/output.js
+++ b/js/src/api/format/output.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/api/index.js b/js/src/api/index.js
index b03419eacc..49de886747 100644
--- a/js/src/api/index.js
+++ b/js/src/api/index.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/api/rpc/index.js b/js/src/api/rpc/index.js
index 7961da81ca..d70f305444 100644
--- a/js/src/api/rpc/index.js
+++ b/js/src/api/rpc/index.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/api/subscriptions/eth.js b/js/src/api/subscriptions/eth.js
index 28d9cc6ff9..f36d9dc73a 100644
--- a/js/src/api/subscriptions/eth.js
+++ b/js/src/api/subscriptions/eth.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/api/subscriptions/eth.spec.js b/js/src/api/subscriptions/eth.spec.js
index 24398483e4..87cc76d034 100644
--- a/js/src/api/subscriptions/eth.spec.js
+++ b/js/src/api/subscriptions/eth.spec.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/api/subscriptions/index.js b/js/src/api/subscriptions/index.js
index 3e627e62a1..b94b332614 100644
--- a/js/src/api/subscriptions/index.js
+++ b/js/src/api/subscriptions/index.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/api/subscriptions/logging.js b/js/src/api/subscriptions/logging.js
index b03558207f..e75710637c 100644
--- a/js/src/api/subscriptions/logging.js
+++ b/js/src/api/subscriptions/logging.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/api/subscriptions/logging.spec.js b/js/src/api/subscriptions/logging.spec.js
index 2a1cabb46c..4b28bf890f 100644
--- a/js/src/api/subscriptions/logging.spec.js
+++ b/js/src/api/subscriptions/logging.spec.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/api/subscriptions/manager.js b/js/src/api/subscriptions/manager.js
index 25e6e6129f..6485a665cd 100644
--- a/js/src/api/subscriptions/manager.js
+++ b/js/src/api/subscriptions/manager.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/api/subscriptions/manager.spec.js b/js/src/api/subscriptions/manager.spec.js
index 5e434efec4..5659448770 100644
--- a/js/src/api/subscriptions/manager.spec.js
+++ b/js/src/api/subscriptions/manager.spec.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/api/subscriptions/personal.js b/js/src/api/subscriptions/personal.js
index 82671184e0..e00169b6a3 100644
--- a/js/src/api/subscriptions/personal.js
+++ b/js/src/api/subscriptions/personal.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/api/subscriptions/personal.spec.js b/js/src/api/subscriptions/personal.spec.js
index d6fd2b2031..c7d8da2b9a 100644
--- a/js/src/api/subscriptions/personal.spec.js
+++ b/js/src/api/subscriptions/personal.spec.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/api/subscriptions/signer.js b/js/src/api/subscriptions/signer.js
index 4413fe432c..3fe32f4d65 100644
--- a/js/src/api/subscriptions/signer.js
+++ b/js/src/api/subscriptions/signer.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/api/transport/error.js b/js/src/api/transport/error.js
index 6cb0dac170..5fe9aac06a 100644
--- a/js/src/api/transport/error.js
+++ b/js/src/api/transport/error.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/api/transport/index.js b/js/src/api/transport/index.js
index 84fbac826a..41b809525d 100644
--- a/js/src/api/transport/index.js
+++ b/js/src/api/transport/index.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/api/transport/jsonRpcBase.js b/js/src/api/transport/jsonRpcBase.js
index dc2f9bc8e9..76f3809358 100644
--- a/js/src/api/transport/jsonRpcBase.js
+++ b/js/src/api/transport/jsonRpcBase.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/api/transport/jsonRpcBase.spec.js b/js/src/api/transport/jsonRpcBase.spec.js
index 78fc6549c2..a27bca019f 100644
--- a/js/src/api/transport/jsonRpcBase.spec.js
+++ b/js/src/api/transport/jsonRpcBase.spec.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/api/util/decode.js b/js/src/api/util/decode.js
index 2d6eee75ba..a6a2ddda4d 100644
--- a/js/src/api/util/decode.js
+++ b/js/src/api/util/decode.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/api/util/decode.spec.js b/js/src/api/util/decode.spec.js
index 70bc44bc57..4652c7c5b6 100644
--- a/js/src/api/util/decode.spec.js
+++ b/js/src/api/util/decode.spec.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/api/util/format.js b/js/src/api/util/format.js
index d8cf74a8f9..531dfc5499 100644
--- a/js/src/api/util/format.js
+++ b/js/src/api/util/format.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/api/util/format.spec.js b/js/src/api/util/format.spec.js
index c779d71efd..cfb07dee75 100644
--- a/js/src/api/util/format.spec.js
+++ b/js/src/api/util/format.spec.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/api/util/index.js b/js/src/api/util/index.js
index 2058cd011e..e33bb92734 100644
--- a/js/src/api/util/index.js
+++ b/js/src/api/util/index.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/api/util/sha3.js b/js/src/api/util/sha3.js
index fcbda091a2..93b01d8dd7 100644
--- a/js/src/api/util/sha3.js
+++ b/js/src/api/util/sha3.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/api/util/sha3.spec.js b/js/src/api/util/sha3.spec.js
index bede8bd600..20cd0e7d56 100644
--- a/js/src/api/util/sha3.spec.js
+++ b/js/src/api/util/sha3.spec.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/api/util/types.js b/js/src/api/util/types.js
index a34f30649f..6fe442e93d 100644
--- a/js/src/api/util/types.js
+++ b/js/src/api/util/types.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/api/util/types.spec.js b/js/src/api/util/types.spec.js
index 252876be39..df9bf2f1f5 100644
--- a/js/src/api/util/types.spec.js
+++ b/js/src/api/util/types.spec.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/api/util/wei.js b/js/src/api/util/wei.js
index d04e73921f..43cba76431 100644
--- a/js/src/api/util/wei.js
+++ b/js/src/api/util/wei.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/api/util/wei.spec.js b/js/src/api/util/wei.spec.js
index 8d0b1f09c7..b5ab91e72a 100644
--- a/js/src/api/util/wei.spec.js
+++ b/js/src/api/util/wei.spec.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/contracts/abi/index.js b/js/src/contracts/abi/index.js
index f15765b1aa..35f96b9247 100644
--- a/js/src/contracts/abi/index.js
+++ b/js/src/contracts/abi/index.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/contracts/badgereg.js b/js/src/contracts/badgereg.js
index 45760b277f..6cf3d8bc9c 100644
--- a/js/src/contracts/badgereg.js
+++ b/js/src/contracts/badgereg.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/contracts/code/index.js b/js/src/contracts/code/index.js
index ff6d218eb0..4ebc53d69f 100644
--- a/js/src/contracts/code/index.js
+++ b/js/src/contracts/code/index.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/contracts/dappreg.js b/js/src/contracts/dappreg.js
index ae982af568..b9ee157642 100644
--- a/js/src/contracts/dappreg.js
+++ b/js/src/contracts/dappreg.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/contracts/githubhint.js b/js/src/contracts/githubhint.js
index 47d7eca6e3..0ccaf01f61 100644
--- a/js/src/contracts/githubhint.js
+++ b/js/src/contracts/githubhint.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/contracts/index.js b/js/src/contracts/index.js
index 075837ce65..ccf6cf5f1c 100644
--- a/js/src/contracts/index.js
+++ b/js/src/contracts/index.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/contracts/registry.js b/js/src/contracts/registry.js
index 9354a59e56..04c562f504 100644
--- a/js/src/contracts/registry.js
+++ b/js/src/contracts/registry.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/contracts/signaturereg.js b/js/src/contracts/signaturereg.js
index 459f165b1d..905530cbf7 100644
--- a/js/src/contracts/signaturereg.js
+++ b/js/src/contracts/signaturereg.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/contracts/sms-verification.js b/js/src/contracts/sms-verification.js
index 34a6bad762..05b7ea35fa 100644
--- a/js/src/contracts/sms-verification.js
+++ b/js/src/contracts/sms-verification.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/contracts/tokenreg.js b/js/src/contracts/tokenreg.js
index 5e317880b3..6c2ce66fcf 100644
--- a/js/src/contracts/tokenreg.js
+++ b/js/src/contracts/tokenreg.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/dapps/basiccoin.js b/js/src/dapps/basiccoin.js
index eb3213c79a..6cbf2a4b26 100644
--- a/js/src/dapps/basiccoin.js
+++ b/js/src/dapps/basiccoin.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/dapps/basiccoin/parity.js b/js/src/dapps/basiccoin/parity.js
index f6d59f44d5..450ac31b1d 100644
--- a/js/src/dapps/basiccoin/parity.js
+++ b/js/src/dapps/basiccoin/parity.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/dapps/basiccoin/services.js b/js/src/dapps/basiccoin/services.js
index f76b7fb61f..f87259f309 100644
--- a/js/src/dapps/basiccoin/services.js
+++ b/js/src/dapps/basiccoin/services.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/dapps/dappreg.js b/js/src/dapps/dappreg.js
index 9bd96f1a75..7adfaf1b30 100644
--- a/js/src/dapps/dappreg.js
+++ b/js/src/dapps/dappreg.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/dapps/dappreg/modalStore.js b/js/src/dapps/dappreg/modalStore.js
index 374011fc3e..8d78c9ef9e 100644
--- a/js/src/dapps/dappreg/modalStore.js
+++ b/js/src/dapps/dappreg/modalStore.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/dapps/dappreg/parity.js b/js/src/dapps/dappreg/parity.js
index fe8de6e973..a4651214a2 100644
--- a/js/src/dapps/dappreg/parity.js
+++ b/js/src/dapps/dappreg/parity.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/dapps/githubhint.js b/js/src/dapps/githubhint.js
index ab807a44ba..ea7d7b5582 100644
--- a/js/src/dapps/githubhint.js
+++ b/js/src/dapps/githubhint.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/dapps/githubhint/parity.js b/js/src/dapps/githubhint/parity.js
index acee4dee06..df80b13b30 100644
--- a/js/src/dapps/githubhint/parity.js
+++ b/js/src/dapps/githubhint/parity.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/dapps/githubhint/services.js b/js/src/dapps/githubhint/services.js
index fc889b7f66..ed143968f6 100644
--- a/js/src/dapps/githubhint/services.js
+++ b/js/src/dapps/githubhint/services.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/dapps/index.js b/js/src/dapps/index.js
index 9cba697012..584fbb319b 100644
--- a/js/src/dapps/index.js
+++ b/js/src/dapps/index.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/dapps/localtx.js b/js/src/dapps/localtx.js
index 3e848ede9e..5525e1a9f0 100644
--- a/js/src/dapps/localtx.js
+++ b/js/src/dapps/localtx.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/dapps/localtx/parity.js b/js/src/dapps/localtx/parity.js
index acee4dee06..df80b13b30 100644
--- a/js/src/dapps/localtx/parity.js
+++ b/js/src/dapps/localtx/parity.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/dapps/registry.js b/js/src/dapps/registry.js
index d132da3d83..0b8a8be557 100644
--- a/js/src/dapps/registry.js
+++ b/js/src/dapps/registry.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/dapps/registry/Container.js b/js/src/dapps/registry/Container.js
index e379038faa..2de0411263 100644
--- a/js/src/dapps/registry/Container.js
+++ b/js/src/dapps/registry/Container.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/dapps/registry/actions.js b/js/src/dapps/registry/actions.js
index dd6652d76e..0526802b96 100644
--- a/js/src/dapps/registry/actions.js
+++ b/js/src/dapps/registry/actions.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/dapps/registry/parity.js b/js/src/dapps/registry/parity.js
index cf9819b60e..739e9d4f25 100644
--- a/js/src/dapps/registry/parity.js
+++ b/js/src/dapps/registry/parity.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/dapps/registry/reducers.js b/js/src/dapps/registry/reducers.js
index e0f620b708..06b8f024b4 100644
--- a/js/src/dapps/registry/reducers.js
+++ b/js/src/dapps/registry/reducers.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/dapps/registry/store.js b/js/src/dapps/registry/store.js
index 5fb7d4b6a4..94117fbf40 100644
--- a/js/src/dapps/registry/store.js
+++ b/js/src/dapps/registry/store.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/dapps/signaturereg.js b/js/src/dapps/signaturereg.js
index d0d0cd423e..dd60878150 100644
--- a/js/src/dapps/signaturereg.js
+++ b/js/src/dapps/signaturereg.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/dapps/signaturereg/format.js b/js/src/dapps/signaturereg/format.js
index 24b6428f48..6e28a61a45 100644
--- a/js/src/dapps/signaturereg/format.js
+++ b/js/src/dapps/signaturereg/format.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/dapps/signaturereg/parity.js b/js/src/dapps/signaturereg/parity.js
index f6d59f44d5..450ac31b1d 100644
--- a/js/src/dapps/signaturereg/parity.js
+++ b/js/src/dapps/signaturereg/parity.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/dapps/signaturereg/services.js b/js/src/dapps/signaturereg/services.js
index 82dba383b1..cd0fd59c76 100644
--- a/js/src/dapps/signaturereg/services.js
+++ b/js/src/dapps/signaturereg/services.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/dapps/tokenreg.js b/js/src/dapps/tokenreg.js
index 1bc76e1235..c359dd0721 100644
--- a/js/src/dapps/tokenreg.js
+++ b/js/src/dapps/tokenreg.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/dapps/tokenreg/Container.js b/js/src/dapps/tokenreg/Container.js
index 9a8d7c6365..00f726cf9d 100644
--- a/js/src/dapps/tokenreg/Container.js
+++ b/js/src/dapps/tokenreg/Container.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/dapps/tokenreg/constants.js b/js/src/dapps/tokenreg/constants.js
index e9e7bebcab..cc4d38fcb3 100644
--- a/js/src/dapps/tokenreg/constants.js
+++ b/js/src/dapps/tokenreg/constants.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/dapps/tokenreg/parity.js b/js/src/dapps/tokenreg/parity.js
index f6d59f44d5..450ac31b1d 100644
--- a/js/src/dapps/tokenreg/parity.js
+++ b/js/src/dapps/tokenreg/parity.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/dapps/tokenreg/reducers.js b/js/src/dapps/tokenreg/reducers.js
index cf533432fd..e2ea73e398 100644
--- a/js/src/dapps/tokenreg/reducers.js
+++ b/js/src/dapps/tokenreg/reducers.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/dapps/tokenreg/store.js b/js/src/dapps/tokenreg/store.js
index 5fb7d4b6a4..94117fbf40 100644
--- a/js/src/dapps/tokenreg/store.js
+++ b/js/src/dapps/tokenreg/store.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/dapps/tokenreg/utils.js b/js/src/dapps/tokenreg/utils.js
index f156b78dd7..6461998f3b 100644
--- a/js/src/dapps/tokenreg/utils.js
+++ b/js/src/dapps/tokenreg/utils.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/environment/index.js b/js/src/environment/index.js
index 9b95bb0dad..2768119820 100644
--- a/js/src/environment/index.js
+++ b/js/src/environment/index.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/environment/integration-tests/fake-backend.js b/js/src/environment/integration-tests/fake-backend.js
index 16fcae3adc..3c71edaaf1 100644
--- a/js/src/environment/integration-tests/fake-backend.js
+++ b/js/src/environment/integration-tests/fake-backend.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/environment/integration-tests/index.js b/js/src/environment/integration-tests/index.js
index d62acaa324..d8f503621c 100644
--- a/js/src/environment/integration-tests/index.js
+++ b/js/src/environment/integration-tests/index.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/environment/perf-debug/index.js b/js/src/environment/perf-debug/index.js
index 29f84f50fb..6c9d70e6e5 100644
--- a/js/src/environment/perf-debug/index.js
+++ b/js/src/environment/perf-debug/index.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/environment/perf-debug/why-update.js b/js/src/environment/perf-debug/why-update.js
index 35eef2edc3..602cf7bc03 100644
--- a/js/src/environment/perf-debug/why-update.js
+++ b/js/src/environment/perf-debug/why-update.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/environment/tests/index.js b/js/src/environment/tests/index.js
index 3e6241fb11..0261a77bdb 100644
--- a/js/src/environment/tests/index.js
+++ b/js/src/environment/tests/index.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/environment/tests/test-utils.js b/js/src/environment/tests/test-utils.js
index 785a6f3ad8..acf7ad7ab7 100644
--- a/js/src/environment/tests/test-utils.js
+++ b/js/src/environment/tests/test-utils.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/index.js b/js/src/index.js
index 46d6c9c749..b90f9c61a0 100644
--- a/js/src/index.js
+++ b/js/src/index.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/jsonrpc/generator/build-json.js b/js/src/jsonrpc/generator/build-json.js
index 362df7bf5f..ddbd41c254 100644
--- a/js/src/jsonrpc/generator/build-json.js
+++ b/js/src/jsonrpc/generator/build-json.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/jsonrpc/generator/build-markdown.js b/js/src/jsonrpc/generator/build-markdown.js
index 278138d545..101c8f3cf6 100644
--- a/js/src/jsonrpc/generator/build-markdown.js
+++ b/js/src/jsonrpc/generator/build-markdown.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/jsonrpc/index.js b/js/src/jsonrpc/index.js
index 9e96922790..2f234fea79 100644
--- a/js/src/jsonrpc/index.js
+++ b/js/src/jsonrpc/index.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/jsonrpc/index.spec.js b/js/src/jsonrpc/index.spec.js
index 0f12474774..443cbf8bf9 100644
--- a/js/src/jsonrpc/index.spec.js
+++ b/js/src/jsonrpc/index.spec.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/jsonrpc/interfaces/db.js b/js/src/jsonrpc/interfaces/db.js
index ab4d35b34a..557a731566 100644
--- a/js/src/jsonrpc/interfaces/db.js
+++ b/js/src/jsonrpc/interfaces/db.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/jsonrpc/interfaces/net.js b/js/src/jsonrpc/interfaces/net.js
index 9cc3bc0766..ee8cd9069e 100644
--- a/js/src/jsonrpc/interfaces/net.js
+++ b/js/src/jsonrpc/interfaces/net.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/jsonrpc/interfaces/personal.js b/js/src/jsonrpc/interfaces/personal.js
index eb7e5fc0f7..9450570840 100644
--- a/js/src/jsonrpc/interfaces/personal.js
+++ b/js/src/jsonrpc/interfaces/personal.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/jsonrpc/interfaces/shh.js b/js/src/jsonrpc/interfaces/shh.js
index e9f727dacc..b8d6ecfd1c 100644
--- a/js/src/jsonrpc/interfaces/shh.js
+++ b/js/src/jsonrpc/interfaces/shh.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/jsonrpc/interfaces/signer.js b/js/src/jsonrpc/interfaces/signer.js
index f50bb1115a..e4ffc1e038 100644
--- a/js/src/jsonrpc/interfaces/signer.js
+++ b/js/src/jsonrpc/interfaces/signer.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/jsonrpc/interfaces/trace.js b/js/src/jsonrpc/interfaces/trace.js
index efe45f34eb..38fa77d892 100644
--- a/js/src/jsonrpc/interfaces/trace.js
+++ b/js/src/jsonrpc/interfaces/trace.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/jsonrpc/interfaces/web3.js b/js/src/jsonrpc/interfaces/web3.js
index 783663716a..af35ee2187 100644
--- a/js/src/jsonrpc/interfaces/web3.js
+++ b/js/src/jsonrpc/interfaces/web3.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/jsonrpc/types.js b/js/src/jsonrpc/types.js
index 026e010ed9..86f528a344 100644
--- a/js/src/jsonrpc/types.js
+++ b/js/src/jsonrpc/types.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/lib.rs b/js/src/lib.rs
index 25d336fabe..996d8db509 100644
--- a/js/src/lib.rs
+++ b/js/src/lib.rs
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/lib.rs.in b/js/src/lib.rs.in
index b3f09556a2..ddbdec10bf 100644
--- a/js/src/lib.rs.in
+++ b/js/src/lib.rs.in
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/modals/AddAddress/index.js b/js/src/modals/AddAddress/index.js
index fb891f0fef..f873e3a9a8 100644
--- a/js/src/modals/AddAddress/index.js
+++ b/js/src/modals/AddAddress/index.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/modals/AddContract/addContract.js b/js/src/modals/AddContract/addContract.js
index b193980013..0d04438c35 100644
--- a/js/src/modals/AddContract/addContract.js
+++ b/js/src/modals/AddContract/addContract.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/modals/AddContract/index.js b/js/src/modals/AddContract/index.js
index 05f53efd5b..da84e291a8 100644
--- a/js/src/modals/AddContract/index.js
+++ b/js/src/modals/AddContract/index.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/modals/CreateAccount/index.js b/js/src/modals/CreateAccount/index.js
index f75cecaacf..a66124c9b5 100644
--- a/js/src/modals/CreateAccount/index.js
+++ b/js/src/modals/CreateAccount/index.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/modals/CreateAccount/print.js b/js/src/modals/CreateAccount/print.js
index 18cddeee94..1f92744d40 100644
--- a/js/src/modals/CreateAccount/print.js
+++ b/js/src/modals/CreateAccount/print.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/modals/CreateWallet/createWallet.js b/js/src/modals/CreateWallet/createWallet.js
index d99ef05b40..c19d3303cf 100644
--- a/js/src/modals/CreateWallet/createWallet.js
+++ b/js/src/modals/CreateWallet/createWallet.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/modals/CreateWallet/createWalletStore.js b/js/src/modals/CreateWallet/createWalletStore.js
index b28bfbd26c..2a3f08a6bb 100644
--- a/js/src/modals/CreateWallet/createWalletStore.js
+++ b/js/src/modals/CreateWallet/createWalletStore.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/modals/CreateWallet/index.js b/js/src/modals/CreateWallet/index.js
index 5779fb553f..6421a806a9 100644
--- a/js/src/modals/CreateWallet/index.js
+++ b/js/src/modals/CreateWallet/index.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/modals/DeleteAccount/deleteAccount.js b/js/src/modals/DeleteAccount/deleteAccount.js
index 77f52f1417..f5b988a8e5 100644
--- a/js/src/modals/DeleteAccount/deleteAccount.js
+++ b/js/src/modals/DeleteAccount/deleteAccount.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/modals/DeleteAccount/index.js b/js/src/modals/DeleteAccount/index.js
index 5738c27048..9140c1b37f 100644
--- a/js/src/modals/DeleteAccount/index.js
+++ b/js/src/modals/DeleteAccount/index.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/modals/DeployContract/index.js b/js/src/modals/DeployContract/index.js
index e982107ee3..26ca7dcf09 100644
--- a/js/src/modals/DeployContract/index.js
+++ b/js/src/modals/DeployContract/index.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/modals/EditMeta/editMeta.js b/js/src/modals/EditMeta/editMeta.js
index 8ab9233f1e..8a6d983651 100644
--- a/js/src/modals/EditMeta/editMeta.js
+++ b/js/src/modals/EditMeta/editMeta.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/modals/EditMeta/index.js b/js/src/modals/EditMeta/index.js
index 995b06b0ef..98e3de8b5a 100644
--- a/js/src/modals/EditMeta/index.js
+++ b/js/src/modals/EditMeta/index.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/modals/ExecuteContract/index.js b/js/src/modals/ExecuteContract/index.js
index 58ae3e8def..58868d32c8 100644
--- a/js/src/modals/ExecuteContract/index.js
+++ b/js/src/modals/ExecuteContract/index.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/modals/FirstRun/firstRun.js b/js/src/modals/FirstRun/firstRun.js
index ee1a97a6e0..a273d6e631 100644
--- a/js/src/modals/FirstRun/firstRun.js
+++ b/js/src/modals/FirstRun/firstRun.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/modals/FirstRun/index.js b/js/src/modals/FirstRun/index.js
index 4dea9ba514..c732f39dad 100644
--- a/js/src/modals/FirstRun/index.js
+++ b/js/src/modals/FirstRun/index.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/modals/LoadContract/index.js b/js/src/modals/LoadContract/index.js
index be5e62af5e..479eb2b520 100644
--- a/js/src/modals/LoadContract/index.js
+++ b/js/src/modals/LoadContract/index.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/modals/LoadContract/loadContract.js b/js/src/modals/LoadContract/loadContract.js
index a2d1bdba21..4b70e595d3 100644
--- a/js/src/modals/LoadContract/loadContract.js
+++ b/js/src/modals/LoadContract/loadContract.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/modals/PasswordManager/index.js b/js/src/modals/PasswordManager/index.js
index 9676de1631..8f5237ec2c 100644
--- a/js/src/modals/PasswordManager/index.js
+++ b/js/src/modals/PasswordManager/index.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/modals/SMSVerification/SMSVerification.js b/js/src/modals/SMSVerification/SMSVerification.js
index 86f027a524..f37c803300 100644
--- a/js/src/modals/SMSVerification/SMSVerification.js
+++ b/js/src/modals/SMSVerification/SMSVerification.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/modals/SMSVerification/index.js b/js/src/modals/SMSVerification/index.js
index d9b0990db8..e26958f8c3 100644
--- a/js/src/modals/SMSVerification/index.js
+++ b/js/src/modals/SMSVerification/index.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/modals/SMSVerification/store.js b/js/src/modals/SMSVerification/store.js
index 7a132aaf7a..f97e84adeb 100644
--- a/js/src/modals/SMSVerification/store.js
+++ b/js/src/modals/SMSVerification/store.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/modals/SaveContract/index.js b/js/src/modals/SaveContract/index.js
index 0793001605..115d21bb31 100644
--- a/js/src/modals/SaveContract/index.js
+++ b/js/src/modals/SaveContract/index.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/modals/SaveContract/saveContract.js b/js/src/modals/SaveContract/saveContract.js
index 5d78636328..276a225770 100644
--- a/js/src/modals/SaveContract/saveContract.js
+++ b/js/src/modals/SaveContract/saveContract.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/modals/Shapeshift/index.js b/js/src/modals/Shapeshift/index.js
index 5ebced4b84..6b251bde22 100644
--- a/js/src/modals/Shapeshift/index.js
+++ b/js/src/modals/Shapeshift/index.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/modals/Shapeshift/shapeshift.js b/js/src/modals/Shapeshift/shapeshift.js
index 9c5d696b05..fc76a89685 100644
--- a/js/src/modals/Shapeshift/shapeshift.js
+++ b/js/src/modals/Shapeshift/shapeshift.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/modals/Transfer/errors.js b/js/src/modals/Transfer/errors.js
index b06e91b5d6..12570dac5e 100644
--- a/js/src/modals/Transfer/errors.js
+++ b/js/src/modals/Transfer/errors.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/modals/Transfer/index.js b/js/src/modals/Transfer/index.js
index 24d36d7963..4a82b5b7d2 100644
--- a/js/src/modals/Transfer/index.js
+++ b/js/src/modals/Transfer/index.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/modals/WalletSettings/index.js b/js/src/modals/WalletSettings/index.js
index 9b15a5f3b8..9ef8eeafed 100644
--- a/js/src/modals/WalletSettings/index.js
+++ b/js/src/modals/WalletSettings/index.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/modals/WalletSettings/walletSettingsStore.js b/js/src/modals/WalletSettings/walletSettingsStore.js
index f4d5d2275e..6db4469c3d 100644
--- a/js/src/modals/WalletSettings/walletSettingsStore.js
+++ b/js/src/modals/WalletSettings/walletSettingsStore.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/modals/index.js b/js/src/modals/index.js
index 0f0844e402..d3574fdc72 100644
--- a/js/src/modals/index.js
+++ b/js/src/modals/index.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/parity.js b/js/src/parity.js
index 4e6184c6a7..f74bc2a0cb 100644
--- a/js/src/parity.js
+++ b/js/src/parity.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/redux/actions.js b/js/src/redux/actions.js
index 76b363796b..0be511bd37 100644
--- a/js/src/redux/actions.js
+++ b/js/src/redux/actions.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/redux/index.js b/js/src/redux/index.js
index a23f60659f..d02a22ace1 100644
--- a/js/src/redux/index.js
+++ b/js/src/redux/index.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/redux/middleware.js b/js/src/redux/middleware.js
index 14bc9b0a61..91e76c45d7 100644
--- a/js/src/redux/middleware.js
+++ b/js/src/redux/middleware.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/redux/providers/apiActions.js b/js/src/redux/providers/apiActions.js
index 88e1fa8481..9b6e569042 100644
--- a/js/src/redux/providers/apiActions.js
+++ b/js/src/redux/providers/apiActions.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/redux/providers/apiReducer.js b/js/src/redux/providers/apiReducer.js
index 2d4c96ecdb..294072f58b 100644
--- a/js/src/redux/providers/apiReducer.js
+++ b/js/src/redux/providers/apiReducer.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/redux/providers/balances.js b/js/src/redux/providers/balances.js
index bce1c60771..2f08c77520 100644
--- a/js/src/redux/providers/balances.js
+++ b/js/src/redux/providers/balances.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/redux/providers/balancesReducer.js b/js/src/redux/providers/balancesReducer.js
index 4b6950498b..52b9bcf1d7 100644
--- a/js/src/redux/providers/balancesReducer.js
+++ b/js/src/redux/providers/balancesReducer.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/redux/providers/blockchainActions.js b/js/src/redux/providers/blockchainActions.js
index 1dc1e076da..3b36a019fc 100644
--- a/js/src/redux/providers/blockchainActions.js
+++ b/js/src/redux/providers/blockchainActions.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/redux/providers/blockchainReducer.js b/js/src/redux/providers/blockchainReducer.js
index 30c7507f10..dbcc00b993 100644
--- a/js/src/redux/providers/blockchainReducer.js
+++ b/js/src/redux/providers/blockchainReducer.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/redux/providers/compilerActions.js b/js/src/redux/providers/compilerActions.js
index 2b764c58d3..c3b3a9bdd9 100644
--- a/js/src/redux/providers/compilerActions.js
+++ b/js/src/redux/providers/compilerActions.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/redux/providers/compilerReducer.js b/js/src/redux/providers/compilerReducer.js
index ea34f53199..7163ac7a5f 100644
--- a/js/src/redux/providers/compilerReducer.js
+++ b/js/src/redux/providers/compilerReducer.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/redux/providers/compilerWorker.js b/js/src/redux/providers/compilerWorker.js
index f624a4e5fe..60a07355ff 100644
--- a/js/src/redux/providers/compilerWorker.js
+++ b/js/src/redux/providers/compilerWorker.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/redux/providers/imagesActions.js b/js/src/redux/providers/imagesActions.js
index 8ef3c3b39f..73e7c69083 100644
--- a/js/src/redux/providers/imagesActions.js
+++ b/js/src/redux/providers/imagesActions.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/redux/providers/imagesReducer.js b/js/src/redux/providers/imagesReducer.js
index 8738f7b0ee..c3f04af44c 100644
--- a/js/src/redux/providers/imagesReducer.js
+++ b/js/src/redux/providers/imagesReducer.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/redux/providers/index.js b/js/src/redux/providers/index.js
index a90d8b62cf..6a000bdac5 100644
--- a/js/src/redux/providers/index.js
+++ b/js/src/redux/providers/index.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/redux/providers/personal.js b/js/src/redux/providers/personal.js
index 7629c4f469..5a19b1c7fd 100644
--- a/js/src/redux/providers/personal.js
+++ b/js/src/redux/providers/personal.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/redux/providers/personalActions.js b/js/src/redux/providers/personalActions.js
index 47056af2f6..b172aaf8df 100644
--- a/js/src/redux/providers/personalActions.js
+++ b/js/src/redux/providers/personalActions.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/redux/providers/personalReducer.js b/js/src/redux/providers/personalReducer.js
index 7473ed8e33..19ee421f08 100644
--- a/js/src/redux/providers/personalReducer.js
+++ b/js/src/redux/providers/personalReducer.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/redux/providers/signer.js b/js/src/redux/providers/signer.js
index 11b30c6b42..5a5edfb0b7 100644
--- a/js/src/redux/providers/signer.js
+++ b/js/src/redux/providers/signer.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/redux/providers/signerActions.js b/js/src/redux/providers/signerActions.js
index bd3c1022d4..5684e8a937 100644
--- a/js/src/redux/providers/signerActions.js
+++ b/js/src/redux/providers/signerActions.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/redux/providers/signerReducer.js b/js/src/redux/providers/signerReducer.js
index 42e7b5f46f..cc10b3fd16 100644
--- a/js/src/redux/providers/signerReducer.js
+++ b/js/src/redux/providers/signerReducer.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/redux/providers/snackbarActions.js b/js/src/redux/providers/snackbarActions.js
index 428958c4ca..0048854da3 100644
--- a/js/src/redux/providers/snackbarActions.js
+++ b/js/src/redux/providers/snackbarActions.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/redux/providers/snackbarReducer.js b/js/src/redux/providers/snackbarReducer.js
index 7a913f8ca8..2992eb0dfc 100644
--- a/js/src/redux/providers/snackbarReducer.js
+++ b/js/src/redux/providers/snackbarReducer.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/redux/providers/status.js b/js/src/redux/providers/status.js
index 1384797169..d7b360b149 100644
--- a/js/src/redux/providers/status.js
+++ b/js/src/redux/providers/status.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/redux/providers/statusActions.js b/js/src/redux/providers/statusActions.js
index 1c175c29dc..ede16f7dd5 100644
--- a/js/src/redux/providers/statusActions.js
+++ b/js/src/redux/providers/statusActions.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/redux/providers/statusReducer.js b/js/src/redux/providers/statusReducer.js
index 279a9da428..413ff3319c 100644
--- a/js/src/redux/providers/statusReducer.js
+++ b/js/src/redux/providers/statusReducer.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/redux/providers/walletReducer.js b/js/src/redux/providers/walletReducer.js
index af6e190bc5..7cbd7adb81 100644
--- a/js/src/redux/providers/walletReducer.js
+++ b/js/src/redux/providers/walletReducer.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/redux/reducers.js b/js/src/redux/reducers.js
index 642dfe403d..aac1ea779a 100644
--- a/js/src/redux/reducers.js
+++ b/js/src/redux/reducers.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/redux/store.js b/js/src/redux/store.js
index 1d62f9ea5a..dc043e242a 100644
--- a/js/src/redux/store.js
+++ b/js/src/redux/store.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/redux/util.js b/js/src/redux/util.js
index 37cb4f0a38..0467ca5f1e 100644
--- a/js/src/redux/util.js
+++ b/js/src/redux/util.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/secureApi.js b/js/src/secureApi.js
index 8243420b5f..80e76720b3 100644
--- a/js/src/secureApi.js
+++ b/js/src/secureApi.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/ui/Actionbar/actionbar.js b/js/src/ui/Actionbar/actionbar.js
index f744f5c573..0141016aba 100644
--- a/js/src/ui/Actionbar/actionbar.js
+++ b/js/src/ui/Actionbar/actionbar.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/ui/Actionbar/actionbar.spec.js b/js/src/ui/Actionbar/actionbar.spec.js
index 818eb0f80a..72df85cb2b 100644
--- a/js/src/ui/Actionbar/actionbar.spec.js
+++ b/js/src/ui/Actionbar/actionbar.spec.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/ui/Actionbar/index.js b/js/src/ui/Actionbar/index.js
index 5955440799..37d1dbd0b6 100644
--- a/js/src/ui/Actionbar/index.js
+++ b/js/src/ui/Actionbar/index.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/ui/Badge/badge.js b/js/src/ui/Badge/badge.js
index 1ffd4d83ca..c4553fb2ec 100644
--- a/js/src/ui/Badge/badge.js
+++ b/js/src/ui/Badge/badge.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/ui/Badge/badge.spec.js b/js/src/ui/Badge/badge.spec.js
index 8074a8688e..02f3c6983b 100644
--- a/js/src/ui/Badge/badge.spec.js
+++ b/js/src/ui/Badge/badge.spec.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/ui/Badge/index.js b/js/src/ui/Badge/index.js
index 8dc0c9ef0f..7fb3df2139 100644
--- a/js/src/ui/Badge/index.js
+++ b/js/src/ui/Badge/index.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/ui/Balance/balance.js b/js/src/ui/Balance/balance.js
index bc98968ea1..e4dced8821 100644
--- a/js/src/ui/Balance/balance.js
+++ b/js/src/ui/Balance/balance.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/ui/Balance/index.js b/js/src/ui/Balance/index.js
index 24ed7c44e1..e5064e21de 100644
--- a/js/src/ui/Balance/index.js
+++ b/js/src/ui/Balance/index.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/ui/BlockStatus/blockStatus.js b/js/src/ui/BlockStatus/blockStatus.js
index 8abd5d656a..df6f44a8c6 100644
--- a/js/src/ui/BlockStatus/blockStatus.js
+++ b/js/src/ui/BlockStatus/blockStatus.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/ui/BlockStatus/index.js b/js/src/ui/BlockStatus/index.js
index af5761fad3..f9cb92f957 100644
--- a/js/src/ui/BlockStatus/index.js
+++ b/js/src/ui/BlockStatus/index.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/ui/Button/button.js b/js/src/ui/Button/button.js
index 6ae113fd47..d0a358bad6 100644
--- a/js/src/ui/Button/button.js
+++ b/js/src/ui/Button/button.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/ui/Button/button.spec.js b/js/src/ui/Button/button.spec.js
index 9ae4ecdfc2..101bb19acb 100644
--- a/js/src/ui/Button/button.spec.js
+++ b/js/src/ui/Button/button.spec.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/ui/Button/index.js b/js/src/ui/Button/index.js
index f69a65e3d5..95f33d38c4 100644
--- a/js/src/ui/Button/index.js
+++ b/js/src/ui/Button/index.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/ui/Certifications/certifications.js b/js/src/ui/Certifications/certifications.js
index 871b14e9c7..edf8be10a4 100644
--- a/js/src/ui/Certifications/certifications.js
+++ b/js/src/ui/Certifications/certifications.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/ui/Certifications/index.js b/js/src/ui/Certifications/index.js
index 02719ee317..8335104c0d 100644
--- a/js/src/ui/Certifications/index.js
+++ b/js/src/ui/Certifications/index.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/ui/ConfirmDialog/confirmDialog.js b/js/src/ui/ConfirmDialog/confirmDialog.js
index f1b8c6902c..103c1562d9 100644
--- a/js/src/ui/ConfirmDialog/confirmDialog.js
+++ b/js/src/ui/ConfirmDialog/confirmDialog.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/ui/ConfirmDialog/index.js b/js/src/ui/ConfirmDialog/index.js
index ea4074149d..d88a0ac60a 100644
--- a/js/src/ui/ConfirmDialog/index.js
+++ b/js/src/ui/ConfirmDialog/index.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/ui/Container/container.js b/js/src/ui/Container/container.js
index 8d30a39637..51a6a5daa2 100644
--- a/js/src/ui/Container/container.js
+++ b/js/src/ui/Container/container.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/ui/Container/container.spec.js b/js/src/ui/Container/container.spec.js
index 9bbc9d20f6..5e627999f3 100644
--- a/js/src/ui/Container/container.spec.js
+++ b/js/src/ui/Container/container.spec.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/ui/Container/index.js b/js/src/ui/Container/index.js
index 12d4155aa2..0632441143 100644
--- a/js/src/ui/Container/index.js
+++ b/js/src/ui/Container/index.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/ui/CopyToClipboard/copyToClipboard.js b/js/src/ui/CopyToClipboard/copyToClipboard.js
index b7041658c1..2afd59dde5 100644
--- a/js/src/ui/CopyToClipboard/copyToClipboard.js
+++ b/js/src/ui/CopyToClipboard/copyToClipboard.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/ui/CopyToClipboard/index.js b/js/src/ui/CopyToClipboard/index.js
index 6391b478b6..523098ec0c 100644
--- a/js/src/ui/CopyToClipboard/index.js
+++ b/js/src/ui/CopyToClipboard/index.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/ui/Editor/editor.js b/js/src/ui/Editor/editor.js
index d611276a31..55747a3dbe 100644
--- a/js/src/ui/Editor/editor.js
+++ b/js/src/ui/Editor/editor.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/ui/Editor/index.js b/js/src/ui/Editor/index.js
index 2f49dbc950..00b62a7a05 100644
--- a/js/src/ui/Editor/index.js
+++ b/js/src/ui/Editor/index.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/ui/Errors/actions.js b/js/src/ui/Errors/actions.js
index de401ccaa6..c482c9ce47 100644
--- a/js/src/ui/Errors/actions.js
+++ b/js/src/ui/Errors/actions.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/ui/Errors/errors.js b/js/src/ui/Errors/errors.js
index 1e94f4f1d0..b49dd0f4d9 100644
--- a/js/src/ui/Errors/errors.js
+++ b/js/src/ui/Errors/errors.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/ui/Errors/index.js b/js/src/ui/Errors/index.js
index 608f22a1df..1d63ca6244 100644
--- a/js/src/ui/Errors/index.js
+++ b/js/src/ui/Errors/index.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/ui/Errors/middleware.js b/js/src/ui/Errors/middleware.js
index da660b49ea..1afe55c912 100644
--- a/js/src/ui/Errors/middleware.js
+++ b/js/src/ui/Errors/middleware.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/ui/Errors/reducers.js b/js/src/ui/Errors/reducers.js
index ed4fcba34f..e076905fc7 100644
--- a/js/src/ui/Errors/reducers.js
+++ b/js/src/ui/Errors/reducers.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/ui/Form/form.js b/js/src/ui/Form/form.js
index c3cf2588ba..3d3c7438a4 100644
--- a/js/src/ui/Form/form.js
+++ b/js/src/ui/Form/form.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/ui/Form/index.js b/js/src/ui/Form/index.js
index 113f3424a2..0f5e8d0568 100644
--- a/js/src/ui/Form/index.js
+++ b/js/src/ui/Form/index.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/ui/GasPriceEditor/index.js b/js/src/ui/GasPriceEditor/index.js
index 956f6ffd21..eea046b519 100644
--- a/js/src/ui/GasPriceEditor/index.js
+++ b/js/src/ui/GasPriceEditor/index.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/ui/IdentityIcon/identityIcon.js b/js/src/ui/IdentityIcon/identityIcon.js
index fa8d35e612..466ffa9b56 100644
--- a/js/src/ui/IdentityIcon/identityIcon.js
+++ b/js/src/ui/IdentityIcon/identityIcon.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/ui/IdentityIcon/index.js b/js/src/ui/IdentityIcon/index.js
index 76c107bfb7..90e9c1909b 100644
--- a/js/src/ui/IdentityIcon/index.js
+++ b/js/src/ui/IdentityIcon/index.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/ui/IdentityName/identityName.js b/js/src/ui/IdentityName/identityName.js
index 9da886ba0e..0ad9075d61 100644
--- a/js/src/ui/IdentityName/identityName.js
+++ b/js/src/ui/IdentityName/identityName.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/ui/IdentityName/identityName.spec.js b/js/src/ui/IdentityName/identityName.spec.js
index 554a5be0a1..31bf3ee5f4 100644
--- a/js/src/ui/IdentityName/identityName.spec.js
+++ b/js/src/ui/IdentityName/identityName.spec.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/ui/IdentityName/index.js b/js/src/ui/IdentityName/index.js
index 3774b0e527..15e1e5463e 100644
--- a/js/src/ui/IdentityName/index.js
+++ b/js/src/ui/IdentityName/index.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/ui/Loading/index.js b/js/src/ui/Loading/index.js
index 0468cab37d..55611075bb 100644
--- a/js/src/ui/Loading/index.js
+++ b/js/src/ui/Loading/index.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/ui/Loading/loading.js b/js/src/ui/Loading/loading.js
index bdcc98df67..507c84bf9e 100644
--- a/js/src/ui/Loading/loading.js
+++ b/js/src/ui/Loading/loading.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/ui/MethodDecoding/index.js b/js/src/ui/MethodDecoding/index.js
index 1606857eda..d4f99314c0 100644
--- a/js/src/ui/MethodDecoding/index.js
+++ b/js/src/ui/MethodDecoding/index.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/ui/Modal/index.js b/js/src/ui/Modal/index.js
index 232d94eb22..55e5cfc056 100644
--- a/js/src/ui/Modal/index.js
+++ b/js/src/ui/Modal/index.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/ui/Modal/modal.js b/js/src/ui/Modal/modal.js
index 5226841402..fd8e67aada 100644
--- a/js/src/ui/Modal/modal.js
+++ b/js/src/ui/Modal/modal.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/ui/Page/index.js b/js/src/ui/Page/index.js
index 0ddc533d40..49b37e02ed 100644
--- a/js/src/ui/Page/index.js
+++ b/js/src/ui/Page/index.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/ui/Page/page.js b/js/src/ui/Page/page.js
index 9646358b38..e8bb6fe03a 100644
--- a/js/src/ui/Page/page.js
+++ b/js/src/ui/Page/page.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/ui/ParityBackground/index.js b/js/src/ui/ParityBackground/index.js
index 4c766ac3c1..f497053dee 100644
--- a/js/src/ui/ParityBackground/index.js
+++ b/js/src/ui/ParityBackground/index.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/ui/ParityBackground/parityBackground.js b/js/src/ui/ParityBackground/parityBackground.js
index 5198195c07..4bbfd47724 100644
--- a/js/src/ui/ParityBackground/parityBackground.js
+++ b/js/src/ui/ParityBackground/parityBackground.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/ui/ShortenedHash/index.js b/js/src/ui/ShortenedHash/index.js
index 4c93143866..495d1928c6 100644
--- a/js/src/ui/ShortenedHash/index.js
+++ b/js/src/ui/ShortenedHash/index.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/ui/ShortenedHash/shortenedHash.js b/js/src/ui/ShortenedHash/shortenedHash.js
index e3d5c3b143..7008304f8c 100644
--- a/js/src/ui/ShortenedHash/shortenedHash.js
+++ b/js/src/ui/ShortenedHash/shortenedHash.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/ui/SignerIcon/index.js b/js/src/ui/SignerIcon/index.js
index 0a871e6b28..e1123e0d7a 100644
--- a/js/src/ui/SignerIcon/index.js
+++ b/js/src/ui/SignerIcon/index.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/ui/SignerIcon/signerIcon.js b/js/src/ui/SignerIcon/signerIcon.js
index 6d7cd45e8a..ca1ca43fa2 100644
--- a/js/src/ui/SignerIcon/signerIcon.js
+++ b/js/src/ui/SignerIcon/signerIcon.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/ui/Tags/index.js b/js/src/ui/Tags/index.js
index 71cd496242..bbcb28bab3 100644
--- a/js/src/ui/Tags/index.js
+++ b/js/src/ui/Tags/index.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/ui/Tags/tags.js b/js/src/ui/Tags/tags.js
index b520506490..a0db6fc6a9 100644
--- a/js/src/ui/Tags/tags.js
+++ b/js/src/ui/Tags/tags.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/ui/Theme/index.js b/js/src/ui/Theme/index.js
index ba15b212bf..cbf312df54 100644
--- a/js/src/ui/Theme/index.js
+++ b/js/src/ui/Theme/index.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/ui/Theme/theme.js b/js/src/ui/Theme/theme.js
index 7b891d7212..323413d31b 100644
--- a/js/src/ui/Theme/theme.js
+++ b/js/src/ui/Theme/theme.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/ui/Theme/theme.spec.js b/js/src/ui/Theme/theme.spec.js
index 9d2aa1bd8a..6e0387ae3b 100644
--- a/js/src/ui/Theme/theme.spec.js
+++ b/js/src/ui/Theme/theme.spec.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/ui/Tooltips/actions.js b/js/src/ui/Tooltips/actions.js
index fba250fd7f..8f97ae3f8c 100644
--- a/js/src/ui/Tooltips/actions.js
+++ b/js/src/ui/Tooltips/actions.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/ui/Tooltips/index.js b/js/src/ui/Tooltips/index.js
index 6edea3a321..e6590884df 100644
--- a/js/src/ui/Tooltips/index.js
+++ b/js/src/ui/Tooltips/index.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/ui/Tooltips/reducers.js b/js/src/ui/Tooltips/reducers.js
index 4a1d2619b5..cc0ebf926f 100644
--- a/js/src/ui/Tooltips/reducers.js
+++ b/js/src/ui/Tooltips/reducers.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/ui/Tooltips/tooltips.js b/js/src/ui/Tooltips/tooltips.js
index 9a565c26dd..1fdc154868 100644
--- a/js/src/ui/Tooltips/tooltips.js
+++ b/js/src/ui/Tooltips/tooltips.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/ui/TxHash/index.js b/js/src/ui/TxHash/index.js
index eddcbfcbf9..b52429f1f3 100644
--- a/js/src/ui/TxHash/index.js
+++ b/js/src/ui/TxHash/index.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/ui/TxHash/txHash.js b/js/src/ui/TxHash/txHash.js
index 715568fd9a..fcbe374e1b 100644
--- a/js/src/ui/TxHash/txHash.js
+++ b/js/src/ui/TxHash/txHash.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/ui/TxList/index.js b/js/src/ui/TxList/index.js
index 820d4b3aae..a0ded6a430 100644
--- a/js/src/ui/TxList/index.js
+++ b/js/src/ui/TxList/index.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/ui/TxList/store.js b/js/src/ui/TxList/store.js
index 09cdd22263..a12c810d5a 100644
--- a/js/src/ui/TxList/store.js
+++ b/js/src/ui/TxList/store.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/ui/TxList/store.spec.js b/js/src/ui/TxList/store.spec.js
index 8e4eb848e7..89503b4a61 100644
--- a/js/src/ui/TxList/store.spec.js
+++ b/js/src/ui/TxList/store.spec.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/ui/TxList/txList.js b/js/src/ui/TxList/txList.js
index 45face696c..b99335a4fe 100644
--- a/js/src/ui/TxList/txList.js
+++ b/js/src/ui/TxList/txList.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/ui/TxList/txList.spec.js b/js/src/ui/TxList/txList.spec.js
index 3f773980fe..88012888cc 100644
--- a/js/src/ui/TxList/txList.spec.js
+++ b/js/src/ui/TxList/txList.spec.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/util/abi.js b/js/src/util/abi.js
index e7947233bf..b20ed33721 100644
--- a/js/src/util/abi.js
+++ b/js/src/util/abi.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/util/constants.js b/js/src/util/constants.js
index d0664d25e3..4e2a073f18 100644
--- a/js/src/util/constants.js
+++ b/js/src/util/constants.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/util/notifications.js b/js/src/util/notifications.js
index 4794482343..488ac2dafb 100644
--- a/js/src/util/notifications.js
+++ b/js/src/util/notifications.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/util/proptypes.js b/js/src/util/proptypes.js
index f322c629c2..1f993768ec 100644
--- a/js/src/util/proptypes.js
+++ b/js/src/util/proptypes.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/util/subscribe-to-event.js b/js/src/util/subscribe-to-event.js
index 3313404c59..36d1f6d555 100644
--- a/js/src/util/subscribe-to-event.js
+++ b/js/src/util/subscribe-to-event.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/util/tx.js b/js/src/util/tx.js
index b688d06fef..591931ff34 100644
--- a/js/src/util/tx.js
+++ b/js/src/util/tx.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/util/validation.js b/js/src/util/validation.js
index 3d312a2f42..75802ed5fe 100644
--- a/js/src/util/validation.js
+++ b/js/src/util/validation.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/util/wallet.js b/js/src/util/wallet.js
index 123f9f5925..b6240ff014 100644
--- a/js/src/util/wallet.js
+++ b/js/src/util/wallet.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/util/wallets.js b/js/src/util/wallets.js
index 1f0bc67358..3732840d8b 100644
--- a/js/src/util/wallets.js
+++ b/js/src/util/wallets.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/util/web3.extensions.js b/js/src/util/web3.extensions.js
index acae683bd1..f48aa6c252 100644
--- a/js/src/util/web3.extensions.js
+++ b/js/src/util/web3.extensions.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/views/Account/index.js b/js/src/views/Account/index.js
index 55c215f7c9..75c7cc4014 100644
--- a/js/src/views/Account/index.js
+++ b/js/src/views/Account/index.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/views/Accounts/index.js b/js/src/views/Accounts/index.js
index e9be1d5573..c1e7c91a0a 100644
--- a/js/src/views/Accounts/index.js
+++ b/js/src/views/Accounts/index.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/views/Address/index.js b/js/src/views/Address/index.js
index f97d5b1aed..3a1c9a5f7b 100644
--- a/js/src/views/Address/index.js
+++ b/js/src/views/Address/index.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/views/Addresses/index.js b/js/src/views/Addresses/index.js
index 97e107c00a..a0a5e1a406 100644
--- a/js/src/views/Addresses/index.js
+++ b/js/src/views/Addresses/index.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/views/Application/index.js b/js/src/views/Application/index.js
index 236578226a..a3198ef88c 100644
--- a/js/src/views/Application/index.js
+++ b/js/src/views/Application/index.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/views/Application/store.js b/js/src/views/Application/store.js
index 4ea0faf3dc..bb42721cde 100644
--- a/js/src/views/Application/store.js
+++ b/js/src/views/Application/store.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/views/Connection/connection.js b/js/src/views/Connection/connection.js
index ad0e0c1400..8cc2378d97 100644
--- a/js/src/views/Connection/connection.js
+++ b/js/src/views/Connection/connection.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/views/Connection/index.js b/js/src/views/Connection/index.js
index f33fc42fe6..560555d7ca 100644
--- a/js/src/views/Connection/index.js
+++ b/js/src/views/Connection/index.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/views/Contract/index.js b/js/src/views/Contract/index.js
index 18051a69f9..3ab8765b02 100644
--- a/js/src/views/Contract/index.js
+++ b/js/src/views/Contract/index.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/views/Contracts/index.js b/js/src/views/Contracts/index.js
index 075837ce65..ccf6cf5f1c 100644
--- a/js/src/views/Contracts/index.js
+++ b/js/src/views/Contracts/index.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/views/Dapp/dapp.js b/js/src/views/Dapp/dapp.js
index 3e92189148..16a8429641 100644
--- a/js/src/views/Dapp/dapp.js
+++ b/js/src/views/Dapp/dapp.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/views/Dapp/index.js b/js/src/views/Dapp/index.js
index 6fbb5df273..f32a03d0e3 100644
--- a/js/src/views/Dapp/index.js
+++ b/js/src/views/Dapp/index.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/views/Dapps/dappsStore.js b/js/src/views/Dapps/dappsStore.js
index c1790863c7..1841f4c7c7 100644
--- a/js/src/views/Dapps/dappsStore.js
+++ b/js/src/views/Dapps/dappsStore.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/views/Dapps/index.js b/js/src/views/Dapps/index.js
index 38a33260f5..81cbe79d4c 100644
--- a/js/src/views/Dapps/index.js
+++ b/js/src/views/Dapps/index.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/views/ParityBar/index.js b/js/src/views/ParityBar/index.js
index 98cdb67466..48420712ff 100644
--- a/js/src/views/ParityBar/index.js
+++ b/js/src/views/ParityBar/index.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/views/ParityBar/parityBar.js b/js/src/views/ParityBar/parityBar.js
index 14b71aa10d..2f7c529578 100644
--- a/js/src/views/ParityBar/parityBar.js
+++ b/js/src/views/ParityBar/parityBar.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/views/Settings/actions.js b/js/src/views/Settings/actions.js
index d01ddb24f8..9add6dec39 100644
--- a/js/src/views/Settings/actions.js
+++ b/js/src/views/Settings/actions.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/views/Settings/index.js b/js/src/views/Settings/index.js
index 4c5414f71b..878a874526 100644
--- a/js/src/views/Settings/index.js
+++ b/js/src/views/Settings/index.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/views/Settings/middleware.js b/js/src/views/Settings/middleware.js
index ddadad92b8..9ee674d765 100644
--- a/js/src/views/Settings/middleware.js
+++ b/js/src/views/Settings/middleware.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/views/Settings/reducers.js b/js/src/views/Settings/reducers.js
index af26121998..1050e9a532 100644
--- a/js/src/views/Settings/reducers.js
+++ b/js/src/views/Settings/reducers.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/views/Signer/index.js b/js/src/views/Signer/index.js
index ff804fe5b6..37d3c74896 100644
--- a/js/src/views/Signer/index.js
+++ b/js/src/views/Signer/index.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/views/Signer/signer.js b/js/src/views/Signer/signer.js
index f0b4baed72..8e131248b4 100644
--- a/js/src/views/Signer/signer.js
+++ b/js/src/views/Signer/signer.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/views/Signer/store.js b/js/src/views/Signer/store.js
index bcc85a4312..3e16a6e014 100644
--- a/js/src/views/Signer/store.js
+++ b/js/src/views/Signer/store.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/views/Status/index.js b/js/src/views/Status/index.js
index 44079b2248..f966050e93 100644
--- a/js/src/views/Status/index.js
+++ b/js/src/views/Status/index.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/views/Status/status.js b/js/src/views/Status/status.js
index 805c968509..34a42c2962 100644
--- a/js/src/views/Status/status.js
+++ b/js/src/views/Status/status.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/views/Wallet/index.js b/js/src/views/Wallet/index.js
index cebd98d9dc..b81bd8d2b8 100644
--- a/js/src/views/Wallet/index.js
+++ b/js/src/views/Wallet/index.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/views/WriteContract/index.js b/js/src/views/WriteContract/index.js
index cb4bf811bd..c3b7437e90 100644
--- a/js/src/views/WriteContract/index.js
+++ b/js/src/views/WriteContract/index.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/views/index.js b/js/src/views/index.js
index 18d320c63d..2f99ff951d 100644
--- a/js/src/views/index.js
+++ b/js/src/views/index.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/web3.js b/js/src/web3.js
index 15dc4747cf..db5328e183 100644
--- a/js/src/web3.js
+++ b/js/src/web3.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/test/babel.js b/js/test/babel.js
index fc37b94bfd..e294428329 100644
--- a/js/test/babel.js
+++ b/js/test/babel.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/test/e2e/ethapi.js b/js/test/e2e/ethapi.js
index 1fa3da7974..b4830abc69 100644
--- a/js/test/e2e/ethapi.js
+++ b/js/test/e2e/ethapi.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/test/mocha.config.js b/js/test/mocha.config.js
index 36c91c76e9..e90c91ebff 100644
--- a/js/test/mocha.config.js
+++ b/js/test/mocha.config.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/test/mockRpc.js b/js/test/mockRpc.js
index 147c64af04..13f752f8ea 100644
--- a/js/test/mockRpc.js
+++ b/js/test/mockRpc.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/test/types.js b/js/test/types.js
index 73b0aa14e8..d926220a19 100644
--- a/js/test/types.js
+++ b/js/test/types.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/webpack/build.server.js b/js/webpack/build.server.js
index c1e803f560..e52e626562 100644
--- a/js/webpack/build.server.js
+++ b/js/webpack/build.server.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/webpack/dev.server.js b/js/webpack/dev.server.js
index aed7464b48..9e8bd1524a 100644
--- a/js/webpack/dev.server.js
+++ b/js/webpack/dev.server.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/webpack/libraries.js b/js/webpack/libraries.js
index d1a2b49154..923d799dcc 100644
--- a/js/webpack/libraries.js
+++ b/js/webpack/libraries.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/webpack/test.js b/js/webpack/test.js
index a0340b46bc..f118131fd2 100644
--- a/js/webpack/test.js
+++ b/js/webpack/test.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/webpack/vendor.js b/js/webpack/vendor.js
index 535edd9706..7f1114144d 100644
--- a/js/webpack/vendor.js
+++ b/js/webpack/vendor.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/json/build.rs b/json/build.rs
index 8be54476e8..dfb6dfa02f 100644
--- a/json/build.rs
+++ b/json/build.rs
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/json/src/blockchain/account.rs b/json/src/blockchain/account.rs
index 649cd170f4..68a7060a0d 100644
--- a/json/src/blockchain/account.rs
+++ b/json/src/blockchain/account.rs
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/json/src/blockchain/block.rs b/json/src/blockchain/block.rs
index 03522a2c91..d8b6183dbd 100644
--- a/json/src/blockchain/block.rs
+++ b/json/src/blockchain/block.rs
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/json/src/blockchain/blockchain.rs b/json/src/blockchain/blockchain.rs
index 3899f23e89..8a0de88010 100644
--- a/json/src/blockchain/blockchain.rs
+++ b/json/src/blockchain/blockchain.rs
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/json/src/blockchain/header.rs b/json/src/blockchain/header.rs
index ece6d6359b..7fc75266dc 100644
--- a/json/src/blockchain/header.rs
+++ b/json/src/blockchain/header.rs
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/json/src/blockchain/mod.rs b/json/src/blockchain/mod.rs
index 727469ea22..60a215849d 100644
--- a/json/src/blockchain/mod.rs
+++ b/json/src/blockchain/mod.rs
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/json/src/blockchain/state.rs b/json/src/blockchain/state.rs
index 5aa4b09a32..47480fbb11 100644
--- a/json/src/blockchain/state.rs
+++ b/json/src/blockchain/state.rs
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/json/src/blockchain/test.rs b/json/src/blockchain/test.rs
index 301d921df9..110eb362a4 100644
--- a/json/src/blockchain/test.rs
+++ b/json/src/blockchain/test.rs
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/json/src/blockchain/transaction.rs b/json/src/blockchain/transaction.rs
index 5d04748f55..d2385978b6 100644
--- a/json/src/blockchain/transaction.rs
+++ b/json/src/blockchain/transaction.rs
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/json/src/bytes.rs b/json/src/bytes.rs
index c162d08ce3..54feb43c1c 100644
--- a/json/src/bytes.rs
+++ b/json/src/bytes.rs
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/json/src/hash.rs b/json/src/hash.rs
index 14d90ee019..9aad331159 100644
--- a/json/src/hash.rs
+++ b/json/src/hash.rs
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/json/src/lib.rs b/json/src/lib.rs
index b94e1fa55e..9c67ab3d1b 100644
--- a/json/src/lib.rs
+++ b/json/src/lib.rs
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/json/src/lib.rs.in b/json/src/lib.rs.in
index 4754eeee90..eca4b6db22 100644
--- a/json/src/lib.rs.in
+++ b/json/src/lib.rs.in
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/json/src/misc/account_meta.rs b/json/src/misc/account_meta.rs
index a347a8cf61..2d1a90ec31 100644
--- a/json/src/misc/account_meta.rs
+++ b/json/src/misc/account_meta.rs
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/json/src/misc/dapps_settings.rs b/json/src/misc/dapps_settings.rs
index 893e7e93ee..74a12a3317 100644
--- a/json/src/misc/dapps_settings.rs
+++ b/json/src/misc/dapps_settings.rs
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/json/src/misc/mod.rs b/json/src/misc/mod.rs
index baab83d083..b64afcc31a 100644
--- a/json/src/misc/mod.rs
+++ b/json/src/misc/mod.rs
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/json/src/spec/account.rs b/json/src/spec/account.rs
index 90ca8a6580..b3e0ecbae5 100644
--- a/json/src/spec/account.rs
+++ b/json/src/spec/account.rs
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/json/src/spec/authority_round.rs b/json/src/spec/authority_round.rs
index bae17bb248..d2cedb5513 100644
--- a/json/src/spec/authority_round.rs
+++ b/json/src/spec/authority_round.rs
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/json/src/spec/basic_authority.rs b/json/src/spec/basic_authority.rs
index b8b7b4a4d7..0e388f1eb4 100644
--- a/json/src/spec/basic_authority.rs
+++ b/json/src/spec/basic_authority.rs
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/json/src/spec/builtin.rs b/json/src/spec/builtin.rs
index d56c4a4c73..e311175ff2 100644
--- a/json/src/spec/builtin.rs
+++ b/json/src/spec/builtin.rs
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/json/src/spec/engine.rs b/json/src/spec/engine.rs
index 850eb25022..d36327e701 100644
--- a/json/src/spec/engine.rs
+++ b/json/src/spec/engine.rs
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/json/src/spec/ethash.rs b/json/src/spec/ethash.rs
index 752d6853e6..229ed77a37 100644
--- a/json/src/spec/ethash.rs
+++ b/json/src/spec/ethash.rs
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/json/src/spec/genesis.rs b/json/src/spec/genesis.rs
index 272e7bcc22..c732a1293c 100644
--- a/json/src/spec/genesis.rs
+++ b/json/src/spec/genesis.rs
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/json/src/spec/mod.rs b/json/src/spec/mod.rs
index f9de30170e..19b9974d94 100644
--- a/json/src/spec/mod.rs
+++ b/json/src/spec/mod.rs
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/json/src/spec/params.rs b/json/src/spec/params.rs
index aa634221d9..8826863198 100644
--- a/json/src/spec/params.rs
+++ b/json/src/spec/params.rs
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/json/src/spec/seal.rs b/json/src/spec/seal.rs
index 0daea1ba47..eba75840ab 100644
--- a/json/src/spec/seal.rs
+++ b/json/src/spec/seal.rs
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/json/src/spec/spec.rs b/json/src/spec/spec.rs
index 544407cb8d..22d6b36d8c 100644
--- a/json/src/spec/spec.rs
+++ b/json/src/spec/spec.rs
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/json/src/spec/state.rs b/json/src/spec/state.rs
index bde3d6dd82..cff03db544 100644
--- a/json/src/spec/state.rs
+++ b/json/src/spec/state.rs
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/json/src/state/log.rs b/json/src/state/log.rs
index 5fb3e469bd..873de80084 100644
--- a/json/src/state/log.rs
+++ b/json/src/state/log.rs
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/json/src/state/mod.rs b/json/src/state/mod.rs
index e0bced6ef9..2b06271dec 100644
--- a/json/src/state/mod.rs
+++ b/json/src/state/mod.rs
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/json/src/state/state.rs b/json/src/state/state.rs
index 3ddca43c7c..4bdd424cd6 100644
--- a/json/src/state/state.rs
+++ b/json/src/state/state.rs
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/json/src/state/test.rs b/json/src/state/test.rs
index 0d28232ef5..53c3eb1131 100644
--- a/json/src/state/test.rs
+++ b/json/src/state/test.rs
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/json/src/state/transaction.rs b/json/src/state/transaction.rs
index 62b8577d4d..722e9afa33 100644
--- a/json/src/state/transaction.rs
+++ b/json/src/state/transaction.rs
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/json/src/transaction/mod.rs b/json/src/transaction/mod.rs
index cec6734b32..b3bf34be32 100644
--- a/json/src/transaction/mod.rs
+++ b/json/src/transaction/mod.rs
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/json/src/transaction/test.rs b/json/src/transaction/test.rs
index 1ea54ff04f..bf925a8f06 100644
--- a/json/src/transaction/test.rs
+++ b/json/src/transaction/test.rs
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/json/src/transaction/transaction.rs b/json/src/transaction/transaction.rs
index 8898f723e7..a670eea7df 100644
--- a/json/src/transaction/transaction.rs
+++ b/json/src/transaction/transaction.rs
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/json/src/transaction/txtest.rs b/json/src/transaction/txtest.rs
index 059203453b..b3d535b8b0 100644
--- a/json/src/transaction/txtest.rs
+++ b/json/src/transaction/txtest.rs
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/json/src/trie/input.rs b/json/src/trie/input.rs
index 326f42dba1..b8cf3c26eb 100644
--- a/json/src/trie/input.rs
+++ b/json/src/trie/input.rs
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/json/src/trie/mod.rs b/json/src/trie/mod.rs
index 1c5d300674..28705d363b 100644
--- a/json/src/trie/mod.rs
+++ b/json/src/trie/mod.rs
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/json/src/trie/test.rs b/json/src/trie/test.rs
index 19becd5ee6..9d4d6bff9a 100644
--- a/json/src/trie/test.rs
+++ b/json/src/trie/test.rs
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/json/src/trie/trie.rs b/json/src/trie/trie.rs
index c044985913..1eebe0d286 100644
--- a/json/src/trie/trie.rs
+++ b/json/src/trie/trie.rs
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/json/src/uint.rs b/json/src/uint.rs
index 17493203fa..f444da3268 100644
--- a/json/src/uint.rs
+++ b/json/src/uint.rs
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/json/src/vm/call.rs b/json/src/vm/call.rs
index ad226048e1..598bb9e92d 100644
--- a/json/src/vm/call.rs
+++ b/json/src/vm/call.rs
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/json/src/vm/env.rs b/json/src/vm/env.rs
index 95365c0a8f..93a4e70b4b 100644
--- a/json/src/vm/env.rs
+++ b/json/src/vm/env.rs
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/json/src/vm/log.rs b/json/src/vm/log.rs
index b29325738a..e8d02f5e3d 100644
--- a/json/src/vm/log.rs
+++ b/json/src/vm/log.rs
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/json/src/vm/mod.rs b/json/src/vm/mod.rs
index ecc0d05a49..5e7ff8348b 100644
--- a/json/src/vm/mod.rs
+++ b/json/src/vm/mod.rs
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/json/src/vm/test.rs b/json/src/vm/test.rs
index e348826e1f..e7e5254923 100644
--- a/json/src/vm/test.rs
+++ b/json/src/vm/test.rs
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/json/src/vm/transaction.rs b/json/src/vm/transaction.rs
index d2ee8b89b6..c0c61afaf8 100644
--- a/json/src/vm/transaction.rs
+++ b/json/src/vm/transaction.rs
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/json/src/vm/vm.rs b/json/src/vm/vm.rs
index b0a7c2a4bc..b29430fda1 100644
--- a/json/src/vm/vm.rs
+++ b/json/src/vm/vm.rs
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/license_header b/license_header
index d4ebdc4487..50fed6b27f 100644
--- a/license_header
+++ b/license_header
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/logger/src/lib.rs b/logger/src/lib.rs
index 1e1555c7c6..0c0689b16d 100644
--- a/logger/src/lib.rs
+++ b/logger/src/lib.rs
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/parity/account.rs b/parity/account.rs
index ae7e1f62b3..e790eb5969 100644
--- a/parity/account.rs
+++ b/parity/account.rs
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/parity/blockchain.rs b/parity/blockchain.rs
index a9d81e5c31..10fe1d32e2 100644
--- a/parity/blockchain.rs
+++ b/parity/blockchain.rs
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/parity/boot.rs b/parity/boot.rs
index d930085db3..30349284d3 100644
--- a/parity/boot.rs
+++ b/parity/boot.rs
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/parity/cache.rs b/parity/cache.rs
index d2fc30d6ed..b8b324f67a 100644
--- a/parity/cache.rs
+++ b/parity/cache.rs
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/parity/cli/mod.rs b/parity/cli/mod.rs
index 707f4159d8..39e4d58678 100644
--- a/parity/cli/mod.rs
+++ b/parity/cli/mod.rs
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/parity/cli/usage.rs b/parity/cli/usage.rs
index 6dcbd64534..cd94e0299a 100644
--- a/parity/cli/usage.rs
+++ b/parity/cli/usage.rs
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/parity/configuration.rs b/parity/configuration.rs
index 84287719e7..59333c8831 100644
--- a/parity/configuration.rs
+++ b/parity/configuration.rs
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/parity/dapps.rs b/parity/dapps.rs
index ec6fd88463..4eed929cad 100644
--- a/parity/dapps.rs
+++ b/parity/dapps.rs
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/parity/deprecated.rs b/parity/deprecated.rs
index b9a8001012..d509c174a6 100644
--- a/parity/deprecated.rs
+++ b/parity/deprecated.rs
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/parity/dir.rs b/parity/dir.rs
index b9c02efd69..0a49cd528f 100644
--- a/parity/dir.rs
+++ b/parity/dir.rs
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/parity/helpers.rs b/parity/helpers.rs
index 60a04bc458..d1b1e40271 100644
--- a/parity/helpers.rs
+++ b/parity/helpers.rs
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/parity/informant.rs b/parity/informant.rs
index 1caeb1b7c7..1991146ea2 100644
--- a/parity/informant.rs
+++ b/parity/informant.rs
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/parity/io_handler.rs b/parity/io_handler.rs
index 0f1704049b..e7af9da39b 100644
--- a/parity/io_handler.rs
+++ b/parity/io_handler.rs
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/parity/main.rs b/parity/main.rs
index 17f5ed74ba..8c1f88e1e8 100644
--- a/parity/main.rs
+++ b/parity/main.rs
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/parity/migration.rs b/parity/migration.rs
index 58e3b5ea99..8a6f4435a8 100644
--- a/parity/migration.rs
+++ b/parity/migration.rs
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/parity/modules.rs b/parity/modules.rs
index 5d1d66cd76..bf2eeb0fb0 100644
--- a/parity/modules.rs
+++ b/parity/modules.rs
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/parity/params.rs b/parity/params.rs
index 25ddc8814a..81db4165d3 100644
--- a/parity/params.rs
+++ b/parity/params.rs
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/parity/presale.rs b/parity/presale.rs
index 0988324285..7754e7e186 100644
--- a/parity/presale.rs
+++ b/parity/presale.rs
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/parity/rpc.rs b/parity/rpc.rs
index 52a5bcc0f0..2551b0736e 100644
--- a/parity/rpc.rs
+++ b/parity/rpc.rs
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/parity/rpc_apis.rs b/parity/rpc_apis.rs
index 2d375fddee..8748c860d4 100644
--- a/parity/rpc_apis.rs
+++ b/parity/rpc_apis.rs
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/parity/run.rs b/parity/run.rs
index 8128b3a905..e59df7039e 100644
--- a/parity/run.rs
+++ b/parity/run.rs
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/parity/signer.rs b/parity/signer.rs
index 6905fbb3cf..d247453f1e 100644
--- a/parity/signer.rs
+++ b/parity/signer.rs
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/parity/snapshot.rs b/parity/snapshot.rs
index 804047596a..2963e9b84d 100644
--- a/parity/snapshot.rs
+++ b/parity/snapshot.rs
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/parity/stratum.rs b/parity/stratum.rs
index 32c7b8a504..1e510ed449 100644
--- a/parity/stratum.rs
+++ b/parity/stratum.rs
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/parity/sync.rs b/parity/sync.rs
index 17f183c80e..cfc489a45a 100644
--- a/parity/sync.rs
+++ b/parity/sync.rs
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/parity/upgrade.rs b/parity/upgrade.rs
index 7e5b73622e..401f6a722a 100644
--- a/parity/upgrade.rs
+++ b/parity/upgrade.rs
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/parity/url.rs b/parity/url.rs
index fca7c6620b..285b024c6d 100644
--- a/parity/url.rs
+++ b/parity/url.rs
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/rpc/build.rs b/rpc/build.rs
index 1d1a9c19df..0474e86059 100644
--- a/rpc/build.rs
+++ b/rpc/build.rs
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/rpc/rpctest/src/main.rs b/rpc/rpctest/src/main.rs
index dd4a9a3552..2e4bf7d4d2 100644
--- a/rpc/rpctest/src/main.rs
+++ b/rpc/rpctest/src/main.rs
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/rpc/src/lib.rs b/rpc/src/lib.rs
index e02a185099..bbd4a51646 100644
--- a/rpc/src/lib.rs
+++ b/rpc/src/lib.rs
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/rpc/src/v1/helpers/block_import.rs b/rpc/src/v1/helpers/block_import.rs
index 4bb2920ed4..5e78b2d9d8 100644
--- a/rpc/src/v1/helpers/block_import.rs
+++ b/rpc/src/v1/helpers/block_import.rs
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/rpc/src/v1/helpers/dispatch.rs b/rpc/src/v1/helpers/dispatch.rs
index a66bc816de..93e99646be 100644
--- a/rpc/src/v1/helpers/dispatch.rs
+++ b/rpc/src/v1/helpers/dispatch.rs
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/rpc/src/v1/helpers/mod.rs b/rpc/src/v1/helpers/mod.rs
index d5f64dde9f..3c6d1a739d 100644
--- a/rpc/src/v1/helpers/mod.rs
+++ b/rpc/src/v1/helpers/mod.rs
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/rpc/src/v1/helpers/network_settings.rs b/rpc/src/v1/helpers/network_settings.rs
index 9847e97575..934092ec5c 100644
--- a/rpc/src/v1/helpers/network_settings.rs
+++ b/rpc/src/v1/helpers/network_settings.rs
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/rpc/src/v1/helpers/params.rs b/rpc/src/v1/helpers/params.rs
index f56c500fc5..b533c1b89f 100644
--- a/rpc/src/v1/helpers/params.rs
+++ b/rpc/src/v1/helpers/params.rs
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/rpc/src/v1/helpers/poll_manager.rs b/rpc/src/v1/helpers/poll_manager.rs
index bc35188305..c695eae8c8 100644
--- a/rpc/src/v1/helpers/poll_manager.rs
+++ b/rpc/src/v1/helpers/poll_manager.rs
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/rpc/src/v1/helpers/requests.rs b/rpc/src/v1/helpers/requests.rs
index 7c5e89b873..7249e4c4a9 100644
--- a/rpc/src/v1/helpers/requests.rs
+++ b/rpc/src/v1/helpers/requests.rs
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/rpc/src/v1/helpers/signer.rs b/rpc/src/v1/helpers/signer.rs
index 11f8e3376f..e208602a50 100644
--- a/rpc/src/v1/helpers/signer.rs
+++ b/rpc/src/v1/helpers/signer.rs
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/rpc/src/v1/impls/eth_filter.rs b/rpc/src/v1/impls/eth_filter.rs
index 695ff52515..42e82a291a 100644
--- a/rpc/src/v1/impls/eth_filter.rs
+++ b/rpc/src/v1/impls/eth_filter.rs
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/rpc/src/v1/impls/mod.rs b/rpc/src/v1/impls/mod.rs
index e4083ca958..485b2cae57 100644
--- a/rpc/src/v1/impls/mod.rs
+++ b/rpc/src/v1/impls/mod.rs
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/rpc/src/v1/impls/net.rs b/rpc/src/v1/impls/net.rs
index f0e836fb7e..3855bd8d4b 100644
--- a/rpc/src/v1/impls/net.rs
+++ b/rpc/src/v1/impls/net.rs
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/rpc/src/v1/impls/parity_accounts.rs b/rpc/src/v1/impls/parity_accounts.rs
index 188e2290e8..bf53c72731 100644
--- a/rpc/src/v1/impls/parity_accounts.rs
+++ b/rpc/src/v1/impls/parity_accounts.rs
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/rpc/src/v1/impls/parity_set.rs b/rpc/src/v1/impls/parity_set.rs
index 92de99a1ff..b63adaa670 100644
--- a/rpc/src/v1/impls/parity_set.rs
+++ b/rpc/src/v1/impls/parity_set.rs
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/rpc/src/v1/impls/personal.rs b/rpc/src/v1/impls/personal.rs
index 1515e3fa1e..cc4a40d4a5 100644
--- a/rpc/src/v1/impls/personal.rs
+++ b/rpc/src/v1/impls/personal.rs
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/rpc/src/v1/impls/rpc.rs b/rpc/src/v1/impls/rpc.rs
index 7f92c1ed9a..6e62bb17c5 100644
--- a/rpc/src/v1/impls/rpc.rs
+++ b/rpc/src/v1/impls/rpc.rs
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/rpc/src/v1/impls/signer.rs b/rpc/src/v1/impls/signer.rs
index f13a3d0378..6e09a5ec81 100644
--- a/rpc/src/v1/impls/signer.rs
+++ b/rpc/src/v1/impls/signer.rs
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/rpc/src/v1/impls/signing.rs b/rpc/src/v1/impls/signing.rs
index 262e04dfb5..4ee44bb263 100644
--- a/rpc/src/v1/impls/signing.rs
+++ b/rpc/src/v1/impls/signing.rs
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/rpc/src/v1/impls/signing_unsafe.rs b/rpc/src/v1/impls/signing_unsafe.rs
index 46ffe6dedb..992bb85b0b 100644
--- a/rpc/src/v1/impls/signing_unsafe.rs
+++ b/rpc/src/v1/impls/signing_unsafe.rs
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/rpc/src/v1/impls/traces.rs b/rpc/src/v1/impls/traces.rs
index 0b287ce299..2fd912284d 100644
--- a/rpc/src/v1/impls/traces.rs
+++ b/rpc/src/v1/impls/traces.rs
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/rpc/src/v1/impls/web3.rs b/rpc/src/v1/impls/web3.rs
index 2e8f990067..d81f628b61 100644
--- a/rpc/src/v1/impls/web3.rs
+++ b/rpc/src/v1/impls/web3.rs
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/rpc/src/v1/mod.rs b/rpc/src/v1/mod.rs
index 966a87f262..2942d81ed0 100644
--- a/rpc/src/v1/mod.rs
+++ b/rpc/src/v1/mod.rs
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/rpc/src/v1/traits/eth.rs b/rpc/src/v1/traits/eth.rs
index 64a87c1759..14ee8ca62d 100644
--- a/rpc/src/v1/traits/eth.rs
+++ b/rpc/src/v1/traits/eth.rs
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/rpc/src/v1/traits/eth_signing.rs b/rpc/src/v1/traits/eth_signing.rs
index 09f8c5e031..4f8dc5b1ba 100644
--- a/rpc/src/v1/traits/eth_signing.rs
+++ b/rpc/src/v1/traits/eth_signing.rs
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/rpc/src/v1/traits/mod.rs b/rpc/src/v1/traits/mod.rs
index 86b55b7c09..ba84d32e4a 100644
--- a/rpc/src/v1/traits/mod.rs
+++ b/rpc/src/v1/traits/mod.rs
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/rpc/src/v1/traits/net.rs b/rpc/src/v1/traits/net.rs
index 36bd8be703..a342708265 100644
--- a/rpc/src/v1/traits/net.rs
+++ b/rpc/src/v1/traits/net.rs
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/rpc/src/v1/traits/parity.rs b/rpc/src/v1/traits/parity.rs
index 18440b6549..ba65141683 100644
--- a/rpc/src/v1/traits/parity.rs
+++ b/rpc/src/v1/traits/parity.rs
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/rpc/src/v1/traits/parity_accounts.rs b/rpc/src/v1/traits/parity_accounts.rs
index 6cfe1bf7bc..e4393c1493 100644
--- a/rpc/src/v1/traits/parity_accounts.rs
+++ b/rpc/src/v1/traits/parity_accounts.rs
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/rpc/src/v1/traits/parity_set.rs b/rpc/src/v1/traits/parity_set.rs
index c40abd01f4..486f7fb424 100644
--- a/rpc/src/v1/traits/parity_set.rs
+++ b/rpc/src/v1/traits/parity_set.rs
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/rpc/src/v1/traits/parity_signing.rs b/rpc/src/v1/traits/parity_signing.rs
index d97b9882be..5eb5ff8b30 100644
--- a/rpc/src/v1/traits/parity_signing.rs
+++ b/rpc/src/v1/traits/parity_signing.rs
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/rpc/src/v1/traits/personal.rs b/rpc/src/v1/traits/personal.rs
index 6ba0f28f9d..edb1a9d79b 100644
--- a/rpc/src/v1/traits/personal.rs
+++ b/rpc/src/v1/traits/personal.rs
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/rpc/src/v1/traits/rpc.rs b/rpc/src/v1/traits/rpc.rs
index 2109442a71..a03d67b55c 100644
--- a/rpc/src/v1/traits/rpc.rs
+++ b/rpc/src/v1/traits/rpc.rs
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/rpc/src/v1/traits/signer.rs b/rpc/src/v1/traits/signer.rs
index eafa520d44..5a18fe2932 100644
--- a/rpc/src/v1/traits/signer.rs
+++ b/rpc/src/v1/traits/signer.rs
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/rpc/src/v1/traits/traces.rs b/rpc/src/v1/traits/traces.rs
index 64d16c5b42..0440b4dff4 100644
--- a/rpc/src/v1/traits/traces.rs
+++ b/rpc/src/v1/traits/traces.rs
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/rpc/src/v1/traits/web3.rs b/rpc/src/v1/traits/web3.rs
index fc1f50b9b3..efe26e3075 100644
--- a/rpc/src/v1/traits/web3.rs
+++ b/rpc/src/v1/traits/web3.rs
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/rpc/src/v1/types/block_number.rs b/rpc/src/v1/types/block_number.rs
index 0a2b2f3057..00ee1f22bb 100644
--- a/rpc/src/v1/types/block_number.rs
+++ b/rpc/src/v1/types/block_number.rs
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/rpc/src/v1/types/bytes.rs b/rpc/src/v1/types/bytes.rs
index 57ff9f22e0..d9a3468364 100644
--- a/rpc/src/v1/types/bytes.rs
+++ b/rpc/src/v1/types/bytes.rs
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/rpc/src/v1/types/call_request.rs b/rpc/src/v1/types/call_request.rs
index 015811273c..f457359c5b 100644
--- a/rpc/src/v1/types/call_request.rs
+++ b/rpc/src/v1/types/call_request.rs
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/rpc/src/v1/types/dapp_id.rs b/rpc/src/v1/types/dapp_id.rs
index 04aa80e3ad..fbd016e8a0 100644
--- a/rpc/src/v1/types/dapp_id.rs
+++ b/rpc/src/v1/types/dapp_id.rs
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/rpc/src/v1/types/filter.rs b/rpc/src/v1/types/filter.rs
index 5254b1602d..6ef57b7a7e 100644
--- a/rpc/src/v1/types/filter.rs
+++ b/rpc/src/v1/types/filter.rs
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/rpc/src/v1/types/hash.rs b/rpc/src/v1/types/hash.rs
index 3db0cf124b..cc4532e7ce 100644
--- a/rpc/src/v1/types/hash.rs
+++ b/rpc/src/v1/types/hash.rs
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/rpc/src/v1/types/histogram.rs b/rpc/src/v1/types/histogram.rs
index f7bb5525af..9a1043e0e8 100644
--- a/rpc/src/v1/types/histogram.rs
+++ b/rpc/src/v1/types/histogram.rs
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/rpc/src/v1/types/index.rs b/rpc/src/v1/types/index.rs
index d7b17aea21..65bd681c28 100644
--- a/rpc/src/v1/types/index.rs
+++ b/rpc/src/v1/types/index.rs
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/rpc/src/v1/types/log.rs b/rpc/src/v1/types/log.rs
index b945de6eae..f5e7faca50 100644
--- a/rpc/src/v1/types/log.rs
+++ b/rpc/src/v1/types/log.rs
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/signer/build.rs b/signer/build.rs
index 41b9a1b3ec..28cd9ef697 100644
--- a/signer/build.rs
+++ b/signer/build.rs
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/signer/src/authcode_store.rs b/signer/src/authcode_store.rs
index 55c0fcb153..3752923fa2 100644
--- a/signer/src/authcode_store.rs
+++ b/signer/src/authcode_store.rs
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/signer/src/lib.rs b/signer/src/lib.rs
index f05d8c6253..3d73b0668f 100644
--- a/signer/src/lib.rs
+++ b/signer/src/lib.rs
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/signer/src/tests/mod.rs b/signer/src/tests/mod.rs
index e80b5778d1..043b0f693f 100644
--- a/signer/src/tests/mod.rs
+++ b/signer/src/tests/mod.rs
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/signer/src/ws_server/mod.rs b/signer/src/ws_server/mod.rs
index 697fbd4c7a..2617150368 100644
--- a/signer/src/ws_server/mod.rs
+++ b/signer/src/ws_server/mod.rs
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/signer/src/ws_server/session.rs b/signer/src/ws_server/session.rs
index deb791b54e..77699fa93e 100644
--- a/signer/src/ws_server/session.rs
+++ b/signer/src/ws_server/session.rs
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/stratum/build.rs b/stratum/build.rs
index 61fa5098f8..692af322e9 100644
--- a/stratum/build.rs
+++ b/stratum/build.rs
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/stratum/src/lib.rs b/stratum/src/lib.rs
index 45d8a36397..7a5761aae6 100644
--- a/stratum/src/lib.rs
+++ b/stratum/src/lib.rs
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/stratum/src/traits.rs b/stratum/src/traits.rs
index 5e93a94849..98a6ba7636 100644
--- a/stratum/src/traits.rs
+++ b/stratum/src/traits.rs
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/sync/build.rs b/sync/build.rs
index 1e08ae652a..f41135a672 100644
--- a/sync/build.rs
+++ b/sync/build.rs
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/sync/src/api.rs b/sync/src/api.rs
index 7c531bf7c8..b4a45c74d7 100644
--- a/sync/src/api.rs
+++ b/sync/src/api.rs
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/sync/src/block_sync.rs b/sync/src/block_sync.rs
index 79c7a65a95..c2ff124579 100644
--- a/sync/src/block_sync.rs
+++ b/sync/src/block_sync.rs
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/sync/src/blocks.rs b/sync/src/blocks.rs
index bcb9973dca..686b492189 100644
--- a/sync/src/blocks.rs
+++ b/sync/src/blocks.rs
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/sync/src/lib.rs b/sync/src/lib.rs
index fa57a3e164..0ff3bfe669 100644
--- a/sync/src/lib.rs
+++ b/sync/src/lib.rs
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/sync/src/snapshot.rs b/sync/src/snapshot.rs
index 9f42621059..7ec87bf01d 100644
--- a/sync/src/snapshot.rs
+++ b/sync/src/snapshot.rs
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/sync/src/sync_io.rs b/sync/src/sync_io.rs
index e9e2d3396f..34ee6d7f57 100644
--- a/sync/src/sync_io.rs
+++ b/sync/src/sync_io.rs
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/sync/src/tests/chain.rs b/sync/src/tests/chain.rs
index 02b9063faf..3d0c17fff1 100644
--- a/sync/src/tests/chain.rs
+++ b/sync/src/tests/chain.rs
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/sync/src/tests/consensus.rs b/sync/src/tests/consensus.rs
index 00a036a544..b96997d1e4 100644
--- a/sync/src/tests/consensus.rs
+++ b/sync/src/tests/consensus.rs
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/sync/src/tests/helpers.rs b/sync/src/tests/helpers.rs
index d2eed9374d..af9118431e 100644
--- a/sync/src/tests/helpers.rs
+++ b/sync/src/tests/helpers.rs
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/sync/src/tests/mod.rs b/sync/src/tests/mod.rs
index ef1ca4bab5..3b23075181 100644
--- a/sync/src/tests/mod.rs
+++ b/sync/src/tests/mod.rs
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/sync/src/tests/rpc.rs b/sync/src/tests/rpc.rs
index f600130c1f..e5b2722b6f 100644
--- a/sync/src/tests/rpc.rs
+++ b/sync/src/tests/rpc.rs
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/sync/src/tests/snapshot.rs b/sync/src/tests/snapshot.rs
index 283d59ee3a..96a801669d 100644
--- a/sync/src/tests/snapshot.rs
+++ b/sync/src/tests/snapshot.rs
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/sync/src/transactions_stats.rs b/sync/src/transactions_stats.rs
index 8c5eb6dda6..d5b78610d3 100644
--- a/sync/src/transactions_stats.rs
+++ b/sync/src/transactions_stats.rs
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/util/benches/bigint.rs b/util/benches/bigint.rs
index 00a565e20e..5f35f52ae7 100644
--- a/util/benches/bigint.rs
+++ b/util/benches/bigint.rs
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/util/benches/rlp.rs b/util/benches/rlp.rs
index 23ae4d8294..d446f22cfa 100644
--- a/util/benches/rlp.rs
+++ b/util/benches/rlp.rs
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/util/benches/trie.rs b/util/benches/trie.rs
index 9251390323..0364a39ee4 100644
--- a/util/benches/trie.rs
+++ b/util/benches/trie.rs
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/util/bigint/build.rs b/util/bigint/build.rs
index 2488232291..2c945a24c1 100644
--- a/util/bigint/build.rs
+++ b/util/bigint/build.rs
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/util/bigint/src/hash.rs b/util/bigint/src/hash.rs
index 20cdbae03c..29274fc524 100644
--- a/util/bigint/src/hash.rs
+++ b/util/bigint/src/hash.rs
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/util/bigint/src/lib.rs b/util/bigint/src/lib.rs
index 0df69256ce..30b47a24cb 100644
--- a/util/bigint/src/lib.rs
+++ b/util/bigint/src/lib.rs
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/util/bloom/src/lib.rs b/util/bloom/src/lib.rs
index d5451f7218..6388ce037b 100644
--- a/util/bloom/src/lib.rs
+++ b/util/bloom/src/lib.rs
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/util/build.rs b/util/build.rs
index 1ec89f704d..da28015e23 100644
--- a/util/build.rs
+++ b/util/build.rs
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/util/fetch/src/client.rs b/util/fetch/src/client.rs
index bb8842a5b2..7ee5442526 100644
--- a/util/fetch/src/client.rs
+++ b/util/fetch/src/client.rs
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/util/fetch/src/fetch_file.rs b/util/fetch/src/fetch_file.rs
index 4801cc9696..84b2270eb0 100644
--- a/util/fetch/src/fetch_file.rs
+++ b/util/fetch/src/fetch_file.rs
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/util/fetch/src/lib.rs b/util/fetch/src/lib.rs
index 8ec9e0ddd9..bd117a6d24 100644
--- a/util/fetch/src/lib.rs
+++ b/util/fetch/src/lib.rs
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/util/https-fetch/src/client.rs b/util/https-fetch/src/client.rs
index 19f2f3e16c..e167ce31b9 100644
--- a/util/https-fetch/src/client.rs
+++ b/util/https-fetch/src/client.rs
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/util/https-fetch/src/http.rs b/util/https-fetch/src/http.rs
index f21e2d4060..cf743b546c 100644
--- a/util/https-fetch/src/http.rs
+++ b/util/https-fetch/src/http.rs
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/util/https-fetch/src/lib.rs b/util/https-fetch/src/lib.rs
index edd1186d05..d941129a82 100644
--- a/util/https-fetch/src/lib.rs
+++ b/util/https-fetch/src/lib.rs
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/util/https-fetch/src/tlsclient.rs b/util/https-fetch/src/tlsclient.rs
index dd6f50bba5..5ac19ad152 100644
--- a/util/https-fetch/src/tlsclient.rs
+++ b/util/https-fetch/src/tlsclient.rs
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/util/https-fetch/src/url.rs b/util/https-fetch/src/url.rs
index 3931d94681..d5df0788fa 100644
--- a/util/https-fetch/src/url.rs
+++ b/util/https-fetch/src/url.rs
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/util/io/src/lib.rs b/util/io/src/lib.rs
index 99282d9d8f..fa01cef43f 100644
--- a/util/io/src/lib.rs
+++ b/util/io/src/lib.rs
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/util/io/src/panics.rs b/util/io/src/panics.rs
index f67e925a7d..06371c04ce 100644
--- a/util/io/src/panics.rs
+++ b/util/io/src/panics.rs
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/util/io/src/service.rs b/util/io/src/service.rs
index 6086acadd4..d9650a94af 100644
--- a/util/io/src/service.rs
+++ b/util/io/src/service.rs
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/util/io/src/worker.rs b/util/io/src/worker.rs
index a946fff567..4d55dda41f 100644
--- a/util/io/src/worker.rs
+++ b/util/io/src/worker.rs
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/util/network/src/error.rs b/util/network/src/error.rs
index a1c4d70a16..2500d587cc 100644
--- a/util/network/src/error.rs
+++ b/util/network/src/error.rs
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/util/network/src/ip_utils.rs b/util/network/src/ip_utils.rs
index 7ccf75200a..ef154a1c12 100644
--- a/util/network/src/ip_utils.rs
+++ b/util/network/src/ip_utils.rs
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/util/network/src/lib.rs b/util/network/src/lib.rs
index f21cb498d9..5a06f5a22a 100644
--- a/util/network/src/lib.rs
+++ b/util/network/src/lib.rs
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/util/network/src/node_table.rs b/util/network/src/node_table.rs
index ab7d17fa95..3474ce962f 100644
--- a/util/network/src/node_table.rs
+++ b/util/network/src/node_table.rs
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/util/network/src/service.rs b/util/network/src/service.rs
index 3fe6ae04a8..766b877509 100644
--- a/util/network/src/service.rs
+++ b/util/network/src/service.rs
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/util/network/src/stats.rs b/util/network/src/stats.rs
index cc3b845daf..b7a9cb1779 100644
--- a/util/network/src/stats.rs
+++ b/util/network/src/stats.rs
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/util/network/src/tests.rs b/util/network/src/tests.rs
index 467dbcbd83..67f99d1577 100644
--- a/util/network/src/tests.rs
+++ b/util/network/src/tests.rs
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/util/rlp/src/bytes.rs b/util/rlp/src/bytes.rs
index 07ac108d63..a83e7ff94e 100644
--- a/util/rlp/src/bytes.rs
+++ b/util/rlp/src/bytes.rs
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/util/rlp/src/commonrlps.rs b/util/rlp/src/commonrlps.rs
index 2391172455..34c358826d 100644
--- a/util/rlp/src/commonrlps.rs
+++ b/util/rlp/src/commonrlps.rs
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/util/rlp/src/lib.rs b/util/rlp/src/lib.rs
index da5e816b55..6a454460e2 100644
--- a/util/rlp/src/lib.rs
+++ b/util/rlp/src/lib.rs
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/util/rlp/src/rlpcompression.rs b/util/rlp/src/rlpcompression.rs
index 3113d8b837..7f879a1e25 100644
--- a/util/rlp/src/rlpcompression.rs
+++ b/util/rlp/src/rlpcompression.rs
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/util/rlp/src/rlperrors.rs b/util/rlp/src/rlperrors.rs
index dc60afc9a8..e636c893c0 100644
--- a/util/rlp/src/rlperrors.rs
+++ b/util/rlp/src/rlperrors.rs
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/util/rlp/src/rlpin.rs b/util/rlp/src/rlpin.rs
index a096cdbe85..ca1aaad794 100644
--- a/util/rlp/src/rlpin.rs
+++ b/util/rlp/src/rlpin.rs
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/util/rlp/src/rlpstream.rs b/util/rlp/src/rlpstream.rs
index ec85e8ee50..b0e435ee00 100644
--- a/util/rlp/src/rlpstream.rs
+++ b/util/rlp/src/rlpstream.rs
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/util/rlp/src/rlptraits.rs b/util/rlp/src/rlptraits.rs
index 0f3fb35d77..dc6e62917e 100644
--- a/util/rlp/src/rlptraits.rs
+++ b/util/rlp/src/rlptraits.rs
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/util/rlp/src/tests.rs b/util/rlp/src/tests.rs
index 1d98e4972c..83ad38a6ee 100644
--- a/util/rlp/src/tests.rs
+++ b/util/rlp/src/tests.rs
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/util/rlp/src/untrusted_rlp.rs b/util/rlp/src/untrusted_rlp.rs
index 8f954e3e67..5bb9690468 100644
--- a/util/rlp/src/untrusted_rlp.rs
+++ b/util/rlp/src/untrusted_rlp.rs
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/util/sha3/build.rs b/util/sha3/build.rs
index bbe16d720e..863be7424e 100644
--- a/util/sha3/build.rs
+++ b/util/sha3/build.rs
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/util/sha3/src/lib.rs b/util/sha3/src/lib.rs
index cd1d2125e3..79400ac85d 100644
--- a/util/sha3/src/lib.rs
+++ b/util/sha3/src/lib.rs
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/util/src/bloom.rs b/util/src/bloom.rs
index 71c4091b44..5aa50c263d 100644
--- a/util/src/bloom.rs
+++ b/util/src/bloom.rs
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/util/src/bytes.rs b/util/src/bytes.rs
index 80b44c0e73..fd0f42c0b1 100644
--- a/util/src/bytes.rs
+++ b/util/src/bytes.rs
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/util/src/cache.rs b/util/src/cache.rs
index 2b2c50c8b5..77227d6ed2 100644
--- a/util/src/cache.rs
+++ b/util/src/cache.rs
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/util/src/common.rs b/util/src/common.rs
index 681b0baef2..c457948dd0 100644
--- a/util/src/common.rs
+++ b/util/src/common.rs
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/util/src/error.rs b/util/src/error.rs
index 1c8180e889..fc9513e988 100644
--- a/util/src/error.rs
+++ b/util/src/error.rs
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/util/src/from_json.rs b/util/src/from_json.rs
index a598ed9613..ebd1ce6934 100644
--- a/util/src/from_json.rs
+++ b/util/src/from_json.rs
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/util/src/hashdb.rs b/util/src/hashdb.rs
index 092d40d8a2..2110977d9a 100644
--- a/util/src/hashdb.rs
+++ b/util/src/hashdb.rs
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/util/src/journaldb/archivedb.rs b/util/src/journaldb/archivedb.rs
index fb087d7b22..accc28ffde 100644
--- a/util/src/journaldb/archivedb.rs
+++ b/util/src/journaldb/archivedb.rs
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/util/src/journaldb/mod.rs b/util/src/journaldb/mod.rs
index 5f6b8f5f92..673a77bbc3 100644
--- a/util/src/journaldb/mod.rs
+++ b/util/src/journaldb/mod.rs
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/util/src/journaldb/refcounteddb.rs b/util/src/journaldb/refcounteddb.rs
index 82261965c7..e8a4e342da 100644
--- a/util/src/journaldb/refcounteddb.rs
+++ b/util/src/journaldb/refcounteddb.rs
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/util/src/journaldb/traits.rs b/util/src/journaldb/traits.rs
index 7acf20519d..90063cd918 100644
--- a/util/src/journaldb/traits.rs
+++ b/util/src/journaldb/traits.rs
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/util/src/kvdb.rs b/util/src/kvdb.rs
index de3b033ec4..916ee44ae6 100644
--- a/util/src/kvdb.rs
+++ b/util/src/kvdb.rs
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/util/src/lib.rs b/util/src/lib.rs
index 2b4ac0fed0..e37214879f 100644
--- a/util/src/lib.rs
+++ b/util/src/lib.rs
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/util/src/log.rs b/util/src/log.rs
index 97f3e347f5..59114b596c 100644
--- a/util/src/log.rs
+++ b/util/src/log.rs
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/util/src/memorydb.rs b/util/src/memorydb.rs
index 20dd3a41fa..67f25922d2 100644
--- a/util/src/memorydb.rs
+++ b/util/src/memorydb.rs
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/util/src/migration/mod.rs b/util/src/migration/mod.rs
index a2005f4569..af1eda1924 100644
--- a/util/src/migration/mod.rs
+++ b/util/src/migration/mod.rs
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/util/src/migration/tests.rs b/util/src/migration/tests.rs
index 57a5a9e32e..49804976be 100644
--- a/util/src/migration/tests.rs
+++ b/util/src/migration/tests.rs
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/util/src/misc.rs b/util/src/misc.rs
index b0452e85e7..b5a3577559 100644
--- a/util/src/misc.rs
+++ b/util/src/misc.rs
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/util/src/nibbleslice.rs b/util/src/nibbleslice.rs
index 7daec55ca4..15096bbd50 100644
--- a/util/src/nibbleslice.rs
+++ b/util/src/nibbleslice.rs
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/util/src/nibblevec.rs b/util/src/nibblevec.rs
index 15bd60cb01..75925f52b8 100644
--- a/util/src/nibblevec.rs
+++ b/util/src/nibblevec.rs
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/util/src/overlaydb.rs b/util/src/overlaydb.rs
index 009ef151ed..aef68a5eb8 100644
--- a/util/src/overlaydb.rs
+++ b/util/src/overlaydb.rs
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/util/src/path.rs b/util/src/path.rs
index 8a91a31785..4cb0b413d6 100644
--- a/util/src/path.rs
+++ b/util/src/path.rs
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/util/src/semantic_version.rs b/util/src/semantic_version.rs
index b550cd8291..e90aa3b17a 100644
--- a/util/src/semantic_version.rs
+++ b/util/src/semantic_version.rs
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/util/src/sha3.rs b/util/src/sha3.rs
index f309545269..7bec5e3db0 100644
--- a/util/src/sha3.rs
+++ b/util/src/sha3.rs
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/util/src/snappy.rs b/util/src/snappy.rs
index 6919fb1ad8..e1318d837b 100644
--- a/util/src/snappy.rs
+++ b/util/src/snappy.rs
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/util/src/standard.rs b/util/src/standard.rs
index 3d6c93e1ab..cc82db6e81 100644
--- a/util/src/standard.rs
+++ b/util/src/standard.rs
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/util/src/stats.rs b/util/src/stats.rs
index 2a950ff4fb..9069be0227 100644
--- a/util/src/stats.rs
+++ b/util/src/stats.rs
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/util/src/timer.rs b/util/src/timer.rs
index 5d95ff7de6..29ea9f82f6 100644
--- a/util/src/timer.rs
+++ b/util/src/timer.rs
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/util/src/trie/fatdb.rs b/util/src/trie/fatdb.rs
index ca3f4ca79d..7f350828b3 100644
--- a/util/src/trie/fatdb.rs
+++ b/util/src/trie/fatdb.rs
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/util/src/trie/fatdbmut.rs b/util/src/trie/fatdbmut.rs
index c81c62f715..25f0849d02 100644
--- a/util/src/trie/fatdbmut.rs
+++ b/util/src/trie/fatdbmut.rs
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/util/src/trie/journal.rs b/util/src/trie/journal.rs
index 55aed70acf..c863dd8a48 100644
--- a/util/src/trie/journal.rs
+++ b/util/src/trie/journal.rs
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/util/src/trie/mod.rs b/util/src/trie/mod.rs
index d857732de8..7245e2d5d1 100644
--- a/util/src/trie/mod.rs
+++ b/util/src/trie/mod.rs
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/util/src/trie/node.rs b/util/src/trie/node.rs
index e1f71fdc0d..e21fc8b3f1 100644
--- a/util/src/trie/node.rs
+++ b/util/src/trie/node.rs
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/util/src/trie/recorder.rs b/util/src/trie/recorder.rs
index 3930dd5433..7f98c20e53 100644
--- a/util/src/trie/recorder.rs
+++ b/util/src/trie/recorder.rs
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/util/src/trie/sectriedb.rs b/util/src/trie/sectriedb.rs
index 0861f53f35..4df12cde3c 100644
--- a/util/src/trie/sectriedb.rs
+++ b/util/src/trie/sectriedb.rs
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/util/src/trie/sectriedbmut.rs b/util/src/trie/sectriedbmut.rs
index 16cc376fed..6e020b8896 100644
--- a/util/src/trie/sectriedbmut.rs
+++ b/util/src/trie/sectriedbmut.rs
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/util/src/trie/standardmap.rs b/util/src/trie/standardmap.rs
index 28e4c76f74..917831865c 100644
--- a/util/src/trie/standardmap.rs
+++ b/util/src/trie/standardmap.rs
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/util/src/trie/triedb.rs b/util/src/trie/triedb.rs
index ecd8bddedd..ac1503529f 100644
--- a/util/src/trie/triedb.rs
+++ b/util/src/trie/triedb.rs
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/util/src/triehash.rs b/util/src/triehash.rs
index c8ab5bb08e..4d9134d3ac 100644
--- a/util/src/triehash.rs
+++ b/util/src/triehash.rs
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/util/src/vector.rs b/util/src/vector.rs
index 0fccac5862..7a59718bfe 100644
--- a/util/src/vector.rs
+++ b/util/src/vector.rs
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/util/table/src/lib.rs b/util/table/src/lib.rs
index f65c1e1712..d0da8a07cd 100644
--- a/util/table/src/lib.rs
+++ b/util/table/src/lib.rs
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/util/using_queue/src/lib.rs b/util/using_queue/src/lib.rs
index 24dae94b94..d414d4b142 100644
--- a/util/using_queue/src/lib.rs
+++ b/util/using_queue/src/lib.rs
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/windows/ptray/ptray.cpp b/windows/ptray/ptray.cpp
index 8c50df2c1e..bd467f92f8 100644
--- a/windows/ptray/ptray.cpp
+++ b/windows/ptray/ptray.cpp
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
-- 
GitLab


From 58b72c521d1fffec591d7f55fd25f74c3397cf4c Mon Sep 17 00:00:00 2001
From: Gav Wood <gavin@ethcore.io>
Date: Sun, 11 Dec 2016 19:31:31 +0100
Subject: [PATCH 38/64] Rename ethcore -> parity in licenses.

---
 ethcore/light/src/client.rs                                   | 2 +-
 ethcore/light/src/lib.rs                                      | 2 +-
 ethcore/light/src/net/buffer_flow.rs                          | 2 +-
 ethcore/light/src/net/context.rs                              | 2 +-
 ethcore/light/src/net/mod.rs                                  | 2 +-
 ethcore/light/src/net/status.rs                               | 2 +-
 ethcore/light/src/net/tests/mod.rs                            | 2 +-
 ethcore/light/src/provider.rs                                 | 2 +-
 ethcore/light/src/types/les_request.rs                        | 2 +-
 ethcore/src/block.rs                                          | 2 +-
 ethcore/src/blockchain/blockchain.rs                          | 2 +-
 ethcore/src/client/client.rs                                  | 2 +-
 ethcore/src/engines/mod.rs                                    | 2 +-
 ethcore/src/ethereum/ethash.rs                                | 2 +-
 ethcore/src/evm/instructions.rs                               | 2 +-
 ethcore/src/evm/interpreter/gasometer.rs                      | 2 +-
 ethcore/src/evm/interpreter/mod.rs                            | 2 +-
 ethcore/src/evm/tests.rs                                      | 2 +-
 ethcore/src/executive.rs                                      | 2 +-
 ethcore/src/json_tests/state.rs                               | 2 +-
 ethcore/src/miner/miner.rs                                    | 2 +-
 ethcore/src/miner/transaction_queue.rs                        | 2 +-
 ethcore/src/state/mod.rs                                      | 2 +-
 ethcore/src/types/trace_types/filter.rs                       | 2 +-
 ethcore/src/types/trace_types/trace.rs                        | 2 +-
 ethcore/src/verification/queue/mod.rs                         | 2 +-
 ipc/codegen/src/codegen.rs                                    | 2 +-
 ipc/codegen/src/serialization.rs                              | 2 +-
 ipc/rpc/src/binary.rs                                         | 2 +-
 js/npm/parity/test/smoke.spec.js                              | 2 +-
 js/npm/test/mocha.config.js                                   | 2 +-
 js/src/abi/decoder/decoder.spec.js                            | 2 +-
 js/src/abi/encoder/encoder.spec.js                            | 2 +-
 js/src/abi/spec/event/decodedLog.js                           | 2 +-
 js/src/abi/spec/event/decodedLog.spec.js                      | 2 +-
 js/src/abi/spec/event/decodedLogParam.js                      | 2 +-
 js/src/abi/spec/event/decodedLogParam.spec.js                 | 2 +-
 js/src/abi/spec/event/event.js                                | 2 +-
 js/src/abi/spec/event/event.spec.js                           | 2 +-
 js/src/abi/spec/event/eventParam.js                           | 2 +-
 js/src/abi/spec/event/eventParam.spec.js                      | 2 +-
 js/src/abi/spec/event/index.js                                | 2 +-
 js/src/abi/spec/paramType/format.js                           | 2 +-
 js/src/abi/spec/paramType/format.spec.js                      | 2 +-
 js/src/abi/spec/paramType/index.js                            | 2 +-
 js/src/abi/spec/paramType/paramType.js                        | 2 +-
 js/src/abi/spec/paramType/paramType.spec.js                   | 2 +-
 js/src/abi/spec/paramType/types.js                            | 2 +-
 js/src/api/contract/contract.js                               | 2 +-
 js/src/api/contract/contract.spec.js                          | 2 +-
 js/src/api/format/output.spec.js                              | 2 +-
 js/src/api/rpc/db/db.js                                       | 2 +-
 js/src/api/rpc/db/db.spec.js                                  | 2 +-
 js/src/api/rpc/db/index.js                                    | 2 +-
 js/src/api/rpc/eth/eth.e2e.js                                 | 2 +-
 js/src/api/rpc/eth/eth.js                                     | 2 +-
 js/src/api/rpc/eth/eth.spec.js                                | 2 +-
 js/src/api/rpc/eth/index.js                                   | 2 +-
 js/src/api/rpc/net/index.js                                   | 2 +-
 js/src/api/rpc/net/net.e2e.js                                 | 2 +-
 js/src/api/rpc/net/net.js                                     | 2 +-
 js/src/api/rpc/net/net.spec.js                                | 2 +-
 js/src/api/rpc/parity/index.js                                | 2 +-
 js/src/api/rpc/parity/parity.e2e.js                           | 2 +-
 js/src/api/rpc/parity/parity.js                               | 2 +-
 js/src/api/rpc/parity/parity.spec.js                          | 2 +-
 js/src/api/rpc/personal/index.js                              | 2 +-
 js/src/api/rpc/personal/personal.e2e.js                       | 2 +-
 js/src/api/rpc/personal/personal.js                           | 2 +-
 js/src/api/rpc/personal/personal.spec.js                      | 2 +-
 js/src/api/rpc/shh/index.js                                   | 2 +-
 js/src/api/rpc/shh/shh.js                                     | 2 +-
 js/src/api/rpc/signer/index.js                                | 2 +-
 js/src/api/rpc/signer/signer.js                               | 2 +-
 js/src/api/rpc/trace/index.js                                 | 2 +-
 js/src/api/rpc/trace/trace.e2e.js                             | 2 +-
 js/src/api/rpc/trace/trace.js                                 | 2 +-
 js/src/api/rpc/trace/trace.spec.js                            | 2 +-
 js/src/api/rpc/web3/index.js                                  | 2 +-
 js/src/api/rpc/web3/web3.e2e.js                               | 2 +-
 js/src/api/rpc/web3/web3.js                                   | 2 +-
 js/src/api/rpc/web3/web3.spec.js                              | 2 +-
 js/src/api/transport/http/http.e2e.js                         | 2 +-
 js/src/api/transport/http/http.js                             | 2 +-
 js/src/api/transport/http/http.spec.js                        | 2 +-
 js/src/api/transport/http/index.js                            | 2 +-
 js/src/api/transport/ws/index.js                              | 2 +-
 js/src/api/transport/ws/ws.e2e.js                             | 2 +-
 js/src/api/transport/ws/ws.js                                 | 2 +-
 js/src/api/transport/ws/ws.spec.js                            | 2 +-
 js/src/contracts/code/wallet.js                               | 2 +-
 js/src/contracts/contracts.js                                 | 2 +-
 js/src/dapps/basiccoin/AddressSelect/addressSelect.js         | 2 +-
 js/src/dapps/basiccoin/AddressSelect/index.js                 | 2 +-
 js/src/dapps/basiccoin/Application/Header/header.js           | 2 +-
 js/src/dapps/basiccoin/Application/Header/index.js            | 2 +-
 js/src/dapps/basiccoin/Application/Loading/index.js           | 2 +-
 js/src/dapps/basiccoin/Application/Loading/loading.js         | 2 +-
 js/src/dapps/basiccoin/Application/application.js             | 2 +-
 js/src/dapps/basiccoin/Application/index.js                   | 2 +-
 js/src/dapps/basiccoin/Application/pages.js                   | 2 +-
 js/src/dapps/basiccoin/Container/container.js                 | 2 +-
 js/src/dapps/basiccoin/Container/index.js                     | 2 +-
 js/src/dapps/basiccoin/Deploy/Deployment/deployment.js        | 2 +-
 js/src/dapps/basiccoin/Deploy/Deployment/index.js             | 2 +-
 js/src/dapps/basiccoin/Deploy/Event/event.js                  | 2 +-
 js/src/dapps/basiccoin/Deploy/Event/index.js                  | 2 +-
 js/src/dapps/basiccoin/Deploy/Events/events.js                | 2 +-
 js/src/dapps/basiccoin/Deploy/Events/index.js                 | 2 +-
 js/src/dapps/basiccoin/Deploy/deploy.js                       | 2 +-
 js/src/dapps/basiccoin/Deploy/index.js                        | 2 +-
 js/src/dapps/basiccoin/IdentityIcon/identityIcon.js           | 2 +-
 js/src/dapps/basiccoin/IdentityIcon/index.js                  | 2 +-
 js/src/dapps/basiccoin/Overview/Owner/index.js                | 2 +-
 js/src/dapps/basiccoin/Overview/Owner/owner.js                | 2 +-
 js/src/dapps/basiccoin/Overview/Token/index.js                | 2 +-
 js/src/dapps/basiccoin/Overview/Token/token.js                | 2 +-
 js/src/dapps/basiccoin/Overview/index.js                      | 2 +-
 js/src/dapps/basiccoin/Overview/overview.js                   | 2 +-
 js/src/dapps/basiccoin/Transfer/Event/event.js                | 2 +-
 js/src/dapps/basiccoin/Transfer/Event/index.js                | 2 +-
 js/src/dapps/basiccoin/Transfer/Events/events.js              | 2 +-
 js/src/dapps/basiccoin/Transfer/Events/index.js               | 2 +-
 js/src/dapps/basiccoin/Transfer/Send/index.js                 | 2 +-
 js/src/dapps/basiccoin/Transfer/Send/send.js                  | 2 +-
 js/src/dapps/basiccoin/Transfer/index.js                      | 2 +-
 js/src/dapps/basiccoin/Transfer/transfer.js                   | 2 +-
 js/src/dapps/dappreg/Application/application.js               | 2 +-
 js/src/dapps/dappreg/Application/index.js                     | 2 +-
 js/src/dapps/dappreg/Button/button.js                         | 2 +-
 js/src/dapps/dappreg/Button/index.js                          | 2 +-
 js/src/dapps/dappreg/ButtonBar/buttonBar.js                   | 2 +-
 js/src/dapps/dappreg/ButtonBar/index.js                       | 2 +-
 js/src/dapps/dappreg/Dapp/dapp.js                             | 2 +-
 js/src/dapps/dappreg/Dapp/index.js                            | 2 +-
 js/src/dapps/dappreg/Input/index.js                           | 2 +-
 js/src/dapps/dappreg/Input/input.js                           | 2 +-
 js/src/dapps/dappreg/Modal/index.js                           | 2 +-
 js/src/dapps/dappreg/Modal/modal.js                           | 2 +-
 js/src/dapps/dappreg/ModalDelete/index.js                     | 2 +-
 js/src/dapps/dappreg/ModalDelete/modalDelete.js               | 2 +-
 js/src/dapps/dappreg/ModalRegister/index.js                   | 2 +-
 js/src/dapps/dappreg/ModalRegister/modalRegister.js           | 2 +-
 js/src/dapps/dappreg/ModalUpdate/index.js                     | 2 +-
 js/src/dapps/dappreg/ModalUpdate/modalUpdate.js               | 2 +-
 js/src/dapps/dappreg/SelectAccount/index.js                   | 2 +-
 js/src/dapps/dappreg/SelectAccount/selectAccount.js           | 2 +-
 js/src/dapps/dappreg/SelectDapp/index.js                      | 2 +-
 js/src/dapps/dappreg/SelectDapp/selectDapp.js                 | 2 +-
 js/src/dapps/dappreg/Warning/index.js                         | 2 +-
 js/src/dapps/dappreg/Warning/warning.js                       | 2 +-
 js/src/dapps/dappreg/dappsStore.js                            | 2 +-
 js/src/dapps/githubhint/Application/application.js            | 2 +-
 js/src/dapps/githubhint/Application/index.js                  | 2 +-
 js/src/dapps/githubhint/Button/button.js                      | 2 +-
 js/src/dapps/githubhint/Button/index.js                       | 2 +-
 js/src/dapps/githubhint/Events/events.js                      | 2 +-
 js/src/dapps/githubhint/Events/index.js                       | 2 +-
 js/src/dapps/githubhint/IdentityIcon/identityIcon.js          | 2 +-
 js/src/dapps/githubhint/IdentityIcon/index.js                 | 2 +-
 js/src/dapps/githubhint/Loading/index.js                      | 2 +-
 js/src/dapps/githubhint/Loading/loading.js                    | 2 +-
 js/src/dapps/localtx/Application/application.js               | 2 +-
 js/src/dapps/localtx/Application/application.spec.js          | 2 +-
 js/src/dapps/localtx/Application/index.js                     | 2 +-
 js/src/dapps/localtx/Transaction/index.js                     | 2 +-
 js/src/dapps/localtx/Transaction/transaction.js               | 2 +-
 js/src/dapps/localtx/Transaction/transaction.spec.js          | 2 +-
 js/src/dapps/registry/Accounts/accounts.js                    | 2 +-
 js/src/dapps/registry/Accounts/actions.js                     | 2 +-
 js/src/dapps/registry/Accounts/index.js                       | 2 +-
 js/src/dapps/registry/Application/application.js              | 2 +-
 js/src/dapps/registry/Application/index.js                    | 2 +-
 js/src/dapps/registry/Events/actions.js                       | 2 +-
 js/src/dapps/registry/Events/events.js                        | 2 +-
 js/src/dapps/registry/Events/index.js                         | 2 +-
 js/src/dapps/registry/Events/reducers.js                      | 2 +-
 js/src/dapps/registry/IdentityIcon/identityIcon.js            | 2 +-
 js/src/dapps/registry/IdentityIcon/index.js                   | 2 +-
 js/src/dapps/registry/Lookup/actions.js                       | 2 +-
 js/src/dapps/registry/Lookup/index.js                         | 2 +-
 js/src/dapps/registry/Lookup/lookup.js                        | 2 +-
 js/src/dapps/registry/Lookup/reducers.js                      | 2 +-
 js/src/dapps/registry/Names/actions.js                        | 2 +-
 js/src/dapps/registry/Names/index.js                          | 2 +-
 js/src/dapps/registry/Names/names.js                          | 2 +-
 js/src/dapps/registry/Names/reducers.js                       | 2 +-
 js/src/dapps/registry/Records/records.js                      | 2 +-
 js/src/dapps/registry/addresses/accounts-reducer.js           | 2 +-
 js/src/dapps/registry/addresses/actions.js                    | 2 +-
 js/src/dapps/registry/addresses/contacts-reducer.js           | 2 +-
 js/src/dapps/registry/ui/address.js                           | 2 +-
 js/src/dapps/registry/ui/hash.js                              | 2 +-
 js/src/dapps/registry/ui/image.js                             | 2 +-
 js/src/dapps/registry/ui/record-type-select.js                | 2 +-
 js/src/dapps/signaturereg/Application/application.js          | 2 +-
 js/src/dapps/signaturereg/Application/index.js                | 2 +-
 js/src/dapps/signaturereg/Button/button.js                    | 2 +-
 js/src/dapps/signaturereg/Button/index.js                     | 2 +-
 js/src/dapps/signaturereg/Events/events.js                    | 2 +-
 js/src/dapps/signaturereg/Events/index.js                     | 2 +-
 js/src/dapps/signaturereg/Header/header.js                    | 2 +-
 js/src/dapps/signaturereg/Header/index.js                     | 2 +-
 js/src/dapps/signaturereg/IdentityIcon/identityIcon.js        | 2 +-
 js/src/dapps/signaturereg/IdentityIcon/index.js               | 2 +-
 js/src/dapps/signaturereg/Import/import.js                    | 2 +-
 js/src/dapps/signaturereg/Import/index.js                     | 2 +-
 js/src/dapps/signaturereg/Loading/index.js                    | 2 +-
 js/src/dapps/signaturereg/Loading/loading.js                  | 2 +-
 .../tokenreg/Accounts/AccountSelector/account-selector.js     | 2 +-
 js/src/dapps/tokenreg/Accounts/AccountSelector/container.js   | 2 +-
 js/src/dapps/tokenreg/Accounts/AccountSelector/index.js       | 2 +-
 js/src/dapps/tokenreg/Accounts/actions.js                     | 2 +-
 js/src/dapps/tokenreg/Accounts/reducer.js                     | 2 +-
 js/src/dapps/tokenreg/Actions/Query/index.js                  | 2 +-
 js/src/dapps/tokenreg/Actions/Query/query.js                  | 2 +-
 js/src/dapps/tokenreg/Actions/Register/index.js               | 2 +-
 js/src/dapps/tokenreg/Actions/Register/register.js            | 2 +-
 js/src/dapps/tokenreg/Actions/actions.js                      | 2 +-
 js/src/dapps/tokenreg/Actions/component.js                    | 2 +-
 js/src/dapps/tokenreg/Actions/container.js                    | 2 +-
 js/src/dapps/tokenreg/Actions/index.js                        | 2 +-
 js/src/dapps/tokenreg/Actions/reducer.js                      | 2 +-
 js/src/dapps/tokenreg/Application/application.js              | 2 +-
 js/src/dapps/tokenreg/Application/index.js                    | 2 +-
 js/src/dapps/tokenreg/Chip/chip.js                            | 2 +-
 js/src/dapps/tokenreg/Chip/index.js                           | 2 +-
 js/src/dapps/tokenreg/IdentityIcon/identityIcon.js            | 2 +-
 js/src/dapps/tokenreg/IdentityIcon/index.js                   | 2 +-
 js/src/dapps/tokenreg/Inputs/Text/container.js                | 2 +-
 js/src/dapps/tokenreg/Inputs/Text/index.js                    | 2 +-
 js/src/dapps/tokenreg/Inputs/Text/input-text.js               | 2 +-
 js/src/dapps/tokenreg/Inputs/validation.js                    | 2 +-
 js/src/dapps/tokenreg/Loading/index.js                        | 2 +-
 js/src/dapps/tokenreg/Loading/loading.js                      | 2 +-
 js/src/dapps/tokenreg/Status/actions.js                       | 2 +-
 js/src/dapps/tokenreg/Status/index.js                         | 2 +-
 js/src/dapps/tokenreg/Status/reducer.js                       | 2 +-
 js/src/dapps/tokenreg/Status/status.js                        | 2 +-
 js/src/dapps/tokenreg/Tokens/Token/add-meta.js                | 2 +-
 js/src/dapps/tokenreg/Tokens/Token/index.js                   | 2 +-
 js/src/dapps/tokenreg/Tokens/Token/token.js                   | 2 +-
 js/src/dapps/tokenreg/Tokens/Token/tokenContainer.js          | 2 +-
 js/src/dapps/tokenreg/Tokens/actions.js                       | 2 +-
 js/src/dapps/tokenreg/Tokens/container.js                     | 2 +-
 js/src/dapps/tokenreg/Tokens/index.js                         | 2 +-
 js/src/dapps/tokenreg/Tokens/reducer.js                       | 2 +-
 js/src/dapps/tokenreg/Tokens/tokens.js                        | 2 +-
 js/src/i18n/de/index.js                                       | 2 +-
 js/src/i18n/de/settings.js                                    | 2 +-
 js/src/i18n/en/index.js                                       | 2 +-
 js/src/i18n/en/settings.js                                    | 2 +-
 js/src/i18n/index.js                                          | 2 +-
 js/src/i18n/languages.js                                      | 2 +-
 js/src/i18n/store.js                                          | 2 +-
 js/src/jsonrpc/interfaces/eth.js                              | 2 +-
 js/src/jsonrpc/interfaces/parity.js                           | 2 +-
 js/src/library.etherscan.js                                   | 2 +-
 js/src/library.parity.js                                      | 2 +-
 js/src/library.shapeshift.js                                  | 2 +-
 js/src/main.js                                                | 2 +-
 js/src/modals/AddAddress/addAddress.js                        | 2 +-
 js/src/modals/CreateAccount/AccountDetails/accountDetails.js  | 2 +-
 js/src/modals/CreateAccount/AccountDetails/index.js           | 2 +-
 .../CreateAccount/AccountDetailsGeth/accountDetailsGeth.js    | 2 +-
 js/src/modals/CreateAccount/AccountDetailsGeth/index.js       | 2 +-
 js/src/modals/CreateAccount/CreationType/creationType.js      | 2 +-
 js/src/modals/CreateAccount/CreationType/index.js             | 2 +-
 js/src/modals/CreateAccount/NewAccount/index.js               | 2 +-
 js/src/modals/CreateAccount/NewAccount/newAccount.js          | 2 +-
 js/src/modals/CreateAccount/NewGeth/index.js                  | 2 +-
 js/src/modals/CreateAccount/NewGeth/newGeth.js                | 2 +-
 js/src/modals/CreateAccount/NewImport/index.js                | 2 +-
 js/src/modals/CreateAccount/NewImport/newImport.js            | 2 +-
 js/src/modals/CreateAccount/RawKey/index.js                   | 2 +-
 js/src/modals/CreateAccount/RawKey/rawKey.js                  | 2 +-
 js/src/modals/CreateAccount/RecoveryPhrase/index.js           | 2 +-
 js/src/modals/CreateAccount/RecoveryPhrase/recoveryPhrase.js  | 2 +-
 js/src/modals/CreateAccount/createAccount.js                  | 2 +-
 js/src/modals/CreateWallet/WalletDetails/index.js             | 2 +-
 js/src/modals/CreateWallet/WalletDetails/walletDetails.js     | 2 +-
 js/src/modals/CreateWallet/WalletInfo/index.js                | 2 +-
 js/src/modals/CreateWallet/WalletInfo/walletInfo.js           | 2 +-
 js/src/modals/CreateWallet/WalletType/index.js                | 2 +-
 js/src/modals/CreateWallet/WalletType/walletType.js           | 2 +-
 js/src/modals/DeployContract/DetailsStep/detailsStep.js       | 2 +-
 js/src/modals/DeployContract/DetailsStep/index.js             | 2 +-
 js/src/modals/DeployContract/ErrorStep/errorStep.js           | 2 +-
 js/src/modals/DeployContract/ErrorStep/index.js               | 2 +-
 js/src/modals/DeployContract/ParametersStep/index.js          | 2 +-
 js/src/modals/DeployContract/ParametersStep/parametersStep.js | 4 ++--
 js/src/modals/DeployContract/deployContract.js                | 2 +-
 js/src/modals/ExecuteContract/DetailsStep/detailsStep.js      | 2 +-
 js/src/modals/ExecuteContract/DetailsStep/index.js            | 2 +-
 js/src/modals/ExecuteContract/executeContract.js              | 2 +-
 js/src/modals/FirstRun/Completed/completed.js                 | 2 +-
 js/src/modals/FirstRun/Completed/index.js                     | 2 +-
 js/src/modals/FirstRun/TnC/index.js                           | 2 +-
 js/src/modals/FirstRun/TnC/tnc.js                             | 2 +-
 js/src/modals/FirstRun/Welcome/index.js                       | 2 +-
 js/src/modals/FirstRun/Welcome/welcome.js                     | 2 +-
 js/src/modals/PasswordManager/passwordManager.js              | 2 +-
 js/src/modals/SMSVerification/Done/done.js                    | 2 +-
 js/src/modals/SMSVerification/Done/index.js                   | 2 +-
 js/src/modals/SMSVerification/GatherData/gatherData.js        | 2 +-
 js/src/modals/SMSVerification/GatherData/index.js             | 2 +-
 js/src/modals/SMSVerification/QueryCode/index.js              | 2 +-
 js/src/modals/SMSVerification/QueryCode/queryCode.js          | 2 +-
 js/src/modals/SMSVerification/SendConfirmation/index.js       | 2 +-
 .../SMSVerification/SendConfirmation/sendConfirmation.js      | 2 +-
 js/src/modals/SMSVerification/SendRequest/index.js            | 2 +-
 js/src/modals/SMSVerification/SendRequest/sendRequest.js      | 2 +-
 .../Shapeshift/AwaitingDepositStep/awaitingDepositStep.js     | 2 +-
 js/src/modals/Shapeshift/AwaitingDepositStep/index.js         | 2 +-
 .../Shapeshift/AwaitingExchangeStep/awaitingExchangeStep.js   | 2 +-
 js/src/modals/Shapeshift/AwaitingExchangeStep/index.js        | 2 +-
 js/src/modals/Shapeshift/CompletedStep/completedStep.js       | 2 +-
 js/src/modals/Shapeshift/CompletedStep/index.js               | 2 +-
 js/src/modals/Shapeshift/ErrorStep/errorStep.js               | 2 +-
 js/src/modals/Shapeshift/ErrorStep/index.js                   | 2 +-
 js/src/modals/Shapeshift/OptionsStep/index.js                 | 2 +-
 js/src/modals/Shapeshift/OptionsStep/optionsStep.js           | 2 +-
 js/src/modals/Shapeshift/Price/index.js                       | 2 +-
 js/src/modals/Shapeshift/Price/price.js                       | 2 +-
 js/src/modals/Shapeshift/Value/index.js                       | 2 +-
 js/src/modals/Shapeshift/Value/value.js                       | 2 +-
 js/src/modals/Transfer/Details/details.js                     | 2 +-
 js/src/modals/Transfer/Details/index.js                       | 2 +-
 js/src/modals/Transfer/Extras/extras.js                       | 2 +-
 js/src/modals/Transfer/Extras/index.js                        | 2 +-
 js/src/modals/Transfer/store.js                               | 2 +-
 js/src/modals/Transfer/transfer.js                            | 2 +-
 js/src/modals/WalletSettings/walletSettings.js                | 2 +-
 js/src/redux/providers/balancesActions.js                     | 2 +-
 js/src/redux/providers/certifications/actions.js              | 2 +-
 js/src/redux/providers/certifications/middleware.js           | 2 +-
 js/src/redux/providers/certifications/reducer.js              | 2 +-
 js/src/redux/providers/signerMiddleware.js                    | 2 +-
 js/src/redux/providers/walletActions.js                       | 2 +-
 js/src/ui/Actionbar/Export/export.js                          | 2 +-
 js/src/ui/Actionbar/Export/index.js                           | 2 +-
 js/src/ui/Actionbar/Import/import.js                          | 2 +-
 js/src/ui/Actionbar/Import/index.js                           | 2 +-
 js/src/ui/Actionbar/Search/index.js                           | 2 +-
 js/src/ui/Actionbar/Search/search.js                          | 2 +-
 js/src/ui/Actionbar/Sort/index.js                             | 2 +-
 js/src/ui/Actionbar/Sort/sort.js                              | 2 +-
 js/src/ui/Actionbar/Sort/sortStore.js                         | 2 +-
 js/src/ui/Container/Title/index.js                            | 2 +-
 js/src/ui/Container/Title/title.js                            | 2 +-
 js/src/ui/Container/Title/title.spec.js                       | 2 +-
 js/src/ui/ContextProvider/contextProvider.js                  | 2 +-
 js/src/ui/Editor/mode-solidity.js                             | 2 +-
 js/src/ui/Form/AddressSelect/addressSelect.js                 | 2 +-
 js/src/ui/Form/AddressSelect/index.js                         | 2 +-
 js/src/ui/Form/AutoComplete/autocomplete.js                   | 2 +-
 js/src/ui/Form/AutoComplete/index.js                          | 2 +-
 js/src/ui/Form/FormWrap/formWrap.js                           | 2 +-
 js/src/ui/Form/FormWrap/index.js                              | 2 +-
 js/src/ui/Form/Input/index.js                                 | 2 +-
 js/src/ui/Form/Input/input.js                                 | 2 +-
 js/src/ui/Form/InputAddress/index.js                          | 2 +-
 js/src/ui/Form/InputAddress/inputAddress.js                   | 2 +-
 js/src/ui/Form/InputAddressSelect/index.js                    | 2 +-
 js/src/ui/Form/InputAddressSelect/inputAddressSelect.js       | 2 +-
 js/src/ui/Form/InputChip/index.js                             | 2 +-
 js/src/ui/Form/InputChip/inputChip.js                         | 2 +-
 js/src/ui/Form/InputInline/index.js                           | 2 +-
 js/src/ui/Form/InputInline/inputInline.js                     | 2 +-
 js/src/ui/Form/RadioButtons/index.js                          | 2 +-
 js/src/ui/Form/RadioButtons/radioButtons.js                   | 2 +-
 js/src/ui/Form/Select/index.js                                | 2 +-
 js/src/ui/Form/Select/select.js                               | 2 +-
 js/src/ui/Form/TypedInput/index.js                            | 2 +-
 js/src/ui/Form/TypedInput/typedInput.js                       | 2 +-
 js/src/ui/GasPriceEditor/gasPriceEditor.js                    | 2 +-
 js/src/ui/GasPriceEditor/gasPriceEditor.spec.js               | 2 +-
 js/src/ui/GasPriceEditor/store.js                             | 2 +-
 js/src/ui/GasPriceEditor/store.spec.js                        | 2 +-
 js/src/ui/GasPriceSelector/CustomBar/customBar.js             | 2 +-
 js/src/ui/GasPriceSelector/CustomBar/index.js                 | 2 +-
 js/src/ui/GasPriceSelector/CustomCursor/customCursor.js       | 2 +-
 js/src/ui/GasPriceSelector/CustomCursor/index.js              | 2 +-
 js/src/ui/GasPriceSelector/CustomShape/customShape.js         | 2 +-
 js/src/ui/GasPriceSelector/CustomShape/index.js               | 2 +-
 js/src/ui/GasPriceSelector/CustomTooltip/customTooltip.js     | 2 +-
 js/src/ui/GasPriceSelector/CustomTooltip/index.js             | 2 +-
 js/src/ui/GasPriceSelector/gasPriceSelector.js                | 2 +-
 js/src/ui/GasPriceSelector/index.js                           | 2 +-
 js/src/ui/GasPriceSelector/util.js                            | 2 +-
 js/src/ui/LanguageSelector/index.js                           | 2 +-
 js/src/ui/LanguageSelector/languageSelector.js                | 2 +-
 js/src/ui/MethodDecoding/methodDecoding.js                    | 2 +-
 js/src/ui/Modal/Busy/busy.js                                  | 2 +-
 js/src/ui/Modal/Busy/index.js                                 | 2 +-
 js/src/ui/Modal/Completed/completed.js                        | 2 +-
 js/src/ui/Modal/Completed/index.js                            | 2 +-
 js/src/ui/Modal/Title/index.js                                | 2 +-
 js/src/ui/Modal/Title/title.js                                | 2 +-
 js/src/ui/Tooltips/Tooltip/index.js                           | 2 +-
 js/src/ui/Tooltips/Tooltip/tooltip.js                         | 2 +-
 js/src/ui/TxList/TxRow/index.js                               | 2 +-
 js/src/ui/TxList/TxRow/txRow.js                               | 2 +-
 js/src/ui/TxList/TxRow/txRow.spec.js                          | 2 +-
 js/src/ui/index.js                                            | 2 +-
 js/src/views/Account/Header/header.js                         | 2 +-
 js/src/views/Account/Header/index.js                          | 2 +-
 js/src/views/Account/Transactions/index.js                    | 2 +-
 js/src/views/Account/Transactions/transactions.js             | 2 +-
 js/src/views/Account/account.js                               | 2 +-
 js/src/views/Accounts/List/index.js                           | 2 +-
 js/src/views/Accounts/List/list.js                            | 2 +-
 js/src/views/Accounts/Summary/index.js                        | 2 +-
 js/src/views/Accounts/Summary/summary.js                      | 2 +-
 js/src/views/Accounts/accounts.js                             | 2 +-
 js/src/views/Address/Delete/delete.js                         | 2 +-
 js/src/views/Address/Delete/index.js                          | 2 +-
 js/src/views/Address/address.js                               | 2 +-
 js/src/views/Addresses/addresses.js                           | 2 +-
 js/src/views/Application/Container/container.js               | 2 +-
 js/src/views/Application/Container/index.js                   | 2 +-
 js/src/views/Application/DappContainer/dappContainer.js       | 2 +-
 js/src/views/Application/DappContainer/index.js               | 2 +-
 js/src/views/Application/FrameError/frameError.js             | 2 +-
 js/src/views/Application/FrameError/index.js                  | 2 +-
 js/src/views/Application/Snackbar/index.js                    | 2 +-
 js/src/views/Application/Snackbar/snackbar.js                 | 2 +-
 js/src/views/Application/Status/index.js                      | 2 +-
 js/src/views/Application/Status/status.js                     | 2 +-
 js/src/views/Application/TabBar/index.js                      | 2 +-
 js/src/views/Application/TabBar/tabBar.js                     | 2 +-
 js/src/views/Application/application.js                       | 2 +-
 js/src/views/Contract/Events/Event/event.js                   | 2 +-
 js/src/views/Contract/Events/Event/index.js                   | 2 +-
 js/src/views/Contract/Events/events.js                        | 2 +-
 js/src/views/Contract/Events/index.js                         | 2 +-
 js/src/views/Contract/Queries/index.js                        | 2 +-
 js/src/views/Contract/Queries/inputQuery.js                   | 2 +-
 js/src/views/Contract/Queries/queries.js                      | 2 +-
 js/src/views/Contract/contract.js                             | 2 +-
 js/src/views/Contracts/Summary/index.js                       | 2 +-
 js/src/views/Contracts/Summary/summary.js                     | 2 +-
 js/src/views/Contracts/contracts.js                           | 2 +-
 js/src/views/Dapps/AddDapps/AddDapps.js                       | 2 +-
 js/src/views/Dapps/AddDapps/index.js                          | 2 +-
 js/src/views/Dapps/Summary/index.js                           | 2 +-
 js/src/views/Dapps/Summary/summary.js                         | 2 +-
 js/src/views/Dapps/dapps.js                                   | 2 +-
 js/src/views/Settings/Background/background.js                | 2 +-
 js/src/views/Settings/Background/index.js                     | 2 +-
 js/src/views/Settings/Parity/index.js                         | 2 +-
 js/src/views/Settings/Parity/parity.js                        | 2 +-
 js/src/views/Settings/Proxy/index.js                          | 2 +-
 js/src/views/Settings/Proxy/proxy.js                          | 2 +-
 js/src/views/Settings/Views/defaults.js                       | 2 +-
 js/src/views/Settings/Views/index.js                          | 2 +-
 js/src/views/Settings/Views/views.js                          | 2 +-
 js/src/views/Settings/settings.js                             | 2 +-
 .../Signer/components/Account/AccountLink/accountLink.js      | 2 +-
 js/src/views/Signer/components/Account/AccountLink/index.js   | 2 +-
 js/src/views/Signer/components/Account/account.js             | 2 +-
 js/src/views/Signer/components/Account/index.js               | 2 +-
 js/src/views/Signer/components/RequestPending/index.js        | 2 +-
 .../views/Signer/components/RequestPending/requestPending.js  | 2 +-
 js/src/views/Signer/components/SignRequest/index.js           | 2 +-
 js/src/views/Signer/components/SignRequest/signRequest.js     | 2 +-
 .../views/Signer/components/SignRequest/signRequest.spec.js   | 2 +-
 .../views/Signer/components/TransactionMainDetails/index.js   | 2 +-
 .../TransactionMainDetails/transactionMainDetails.js          | 2 +-
 js/src/views/Signer/components/TransactionPending/index.js    | 2 +-
 .../components/TransactionPending/transactionPending.js       | 2 +-
 .../TransactionPendingFormConfirm/index.js                    | 2 +-
 .../transactionPendingFormConfirm.js                          | 2 +-
 .../TransactionPendingFormReject/index.js                     | 2 +-
 .../transactionPendingFormReject.js                           | 2 +-
 .../views/Signer/components/TransactionPendingForm/index.js   | 2 +-
 .../TransactionPendingForm/transactionPendingForm.js          | 2 +-
 js/src/views/Signer/components/TxHashLink/index.js            | 2 +-
 js/src/views/Signer/components/TxHashLink/txHashLink.js       | 2 +-
 js/src/views/Signer/components/util/logger.js                 | 2 +-
 js/src/views/Signer/components/util/react.js                  | 2 +-
 js/src/views/Signer/components/util/transaction.js            | 2 +-
 js/src/views/Signer/components/util/transaction.spec.js       | 2 +-
 js/src/views/Signer/components/util/util.js                   | 2 +-
 js/src/views/Signer/containers/Embedded/embedded.js           | 2 +-
 js/src/views/Signer/containers/Embedded/index.js              | 2 +-
 js/src/views/Signer/containers/RequestsPage/index.js          | 2 +-
 js/src/views/Signer/containers/RequestsPage/requestsPage.js   | 2 +-
 js/src/views/Signer/utils/extension.js                        | 2 +-
 js/src/views/Signer/utils/utils.js                            | 2 +-
 js/src/views/Status/actions/app.js                            | 2 +-
 js/src/views/Status/actions/clipboard.js                      | 2 +-
 js/src/views/Status/actions/debug.js                          | 2 +-
 js/src/views/Status/actions/localstorage.js                   | 2 +-
 js/src/views/Status/actions/logger.js                         | 2 +-
 js/src/views/Status/actions/mining.js                         | 2 +-
 js/src/views/Status/actions/modify-mining.js                  | 2 +-
 js/src/views/Status/actions/rpc.js                            | 2 +-
 js/src/views/Status/actions/status.js                         | 2 +-
 js/src/views/Status/components/AutoComplete/AutoComplete.js   | 2 +-
 .../views/Status/components/AutoComplete/AutoComplete.spec.js | 2 +-
 js/src/views/Status/components/AutoComplete/index.js          | 2 +-
 js/src/views/Status/components/Box/Box.js                     | 2 +-
 js/src/views/Status/components/Box/Box.spec.js                | 2 +-
 js/src/views/Status/components/Box/index.js                   | 2 +-
 js/src/views/Status/components/Call/Call.js                   | 2 +-
 js/src/views/Status/components/Call/Call.spec.js              | 2 +-
 js/src/views/Status/components/Call/index.js                  | 2 +-
 js/src/views/Status/components/Calls/Calls.js                 | 2 +-
 js/src/views/Status/components/Calls/Calls.spec.js            | 2 +-
 js/src/views/Status/components/Calls/index.js                 | 2 +-
 js/src/views/Status/components/CallsToolbar/CallsToolbar.js   | 2 +-
 .../views/Status/components/CallsToolbar/CallsToolbar.spec.js | 2 +-
 js/src/views/Status/components/CallsToolbar/index.js          | 2 +-
 js/src/views/Status/components/Debug/debug.js                 | 2 +-
 js/src/views/Status/components/Debug/index.js                 | 2 +-
 js/src/views/Status/components/EditableValue/EditableValue.js | 2 +-
 js/src/views/Status/components/EditableValue/index.js         | 2 +-
 js/src/views/Status/components/JsonEditor/JsonEditor.js       | 2 +-
 js/src/views/Status/components/JsonEditor/index.js            | 2 +-
 js/src/views/Status/components/Markdown/Markdown.js           | 2 +-
 js/src/views/Status/components/Markdown/index.js              | 2 +-
 .../views/Status/components/MiningSettings/decodeExtraData.js | 2 +-
 .../Status/components/MiningSettings/decodeExtraData.spec.js  | 2 +-
 js/src/views/Status/components/MiningSettings/index.js        | 2 +-
 .../views/Status/components/MiningSettings/miningSettings.js  | 2 +-
 .../Status/components/MiningSettings/numberFromString.js      | 2 +-
 .../Status/components/MiningSettings/numberFromString.spec.js | 2 +-
 js/src/views/Status/components/Response/Response.js           | 2 +-
 js/src/views/Status/components/Response/Response.spec.js      | 2 +-
 js/src/views/Status/components/Response/index.js              | 2 +-
 js/src/views/Status/components/RpcCalls/RpcCalls.js           | 2 +-
 js/src/views/Status/components/RpcCalls/index.js              | 2 +-
 js/src/views/Status/components/RpcDocs/RpcDocs.js             | 2 +-
 js/src/views/Status/components/RpcDocs/index.js               | 2 +-
 js/src/views/Status/components/RpcNav/RpcNav.js               | 2 +-
 js/src/views/Status/components/RpcNav/index.js                | 2 +-
 .../Status/components/ScrollTopButton/ScrollTopButton.js      | 2 +-
 js/src/views/Status/components/ScrollTopButton/index.js       | 2 +-
 js/src/views/Status/components/ScrollTopButton/util.js        | 2 +-
 js/src/views/Status/components/Status/index.js                | 2 +-
 js/src/views/Status/components/Status/status.js               | 2 +-
 js/src/views/Status/constants/index.js                        | 2 +-
 js/src/views/Status/containers/RpcPage/RpcPage.js             | 2 +-
 js/src/views/Status/containers/RpcPage/index.js               | 2 +-
 js/src/views/Status/containers/StatusPage/index.js            | 2 +-
 js/src/views/Status/containers/StatusPage/statusPage.js       | 2 +-
 js/src/views/Status/middleware/index.js                       | 2 +-
 js/src/views/Status/middleware/localstorage.js                | 2 +-
 js/src/views/Status/middleware/localstorage.spec.js           | 2 +-
 js/src/views/Status/reducers/debug.js                         | 2 +-
 js/src/views/Status/reducers/index.js                         | 2 +-
 js/src/views/Status/reducers/logger.js                        | 2 +-
 js/src/views/Status/reducers/mining.js                        | 2 +-
 js/src/views/Status/reducers/rpc.js                           | 2 +-
 js/src/views/Status/reducers/settings.js                      | 2 +-
 js/src/views/Status/reducers/status.js                        | 2 +-
 js/src/views/Status/util/error.js                             | 2 +-
 js/src/views/Status/util/error.spec.js                        | 2 +-
 js/src/views/Status/util/index.js                             | 2 +-
 js/src/views/Status/util/index.spec.js                        | 2 +-
 js/src/views/Status/util/react.js                             | 2 +-
 js/src/views/Status/util/rpc-md.js                            | 2 +-
 js/src/views/Wallet/Confirmations/confirmations.js            | 2 +-
 js/src/views/Wallet/Confirmations/index.js                    | 2 +-
 js/src/views/Wallet/Details/details.js                        | 2 +-
 js/src/views/Wallet/Details/index.js                          | 2 +-
 js/src/views/Wallet/Transactions/index.js                     | 2 +-
 js/src/views/Wallet/Transactions/transactions.js              | 2 +-
 js/src/views/Wallet/wallet.js                                 | 2 +-
 js/src/views/WriteContract/writeContract.js                   | 2 +-
 js/src/views/WriteContract/writeContractStore.js              | 2 +-
 js/test/npmParity.js                                          | 2 +-
 js/webpack/app.js                                             | 2 +-
 js/webpack/npm.js                                             | 2 +-
 js/webpack/shared.js                                          | 2 +-
 parity/user_defaults.rs                                       | 2 +-
 rpc/src/v1/helpers/auto_args.rs                               | 2 +-
 rpc/src/v1/helpers/errors.rs                                  | 2 +-
 rpc/src/v1/helpers/signing_queue.rs                           | 2 +-
 rpc/src/v1/impls/eth.rs                                       | 2 +-
 rpc/src/v1/impls/parity.rs                                    | 2 +-
 rpc/src/v1/tests/helpers/fetch.rs                             | 2 +-
 rpc/src/v1/tests/helpers/miner_service.rs                     | 2 +-
 rpc/src/v1/tests/helpers/mod.rs                               | 2 +-
 rpc/src/v1/tests/helpers/snapshot_service.rs                  | 2 +-
 rpc/src/v1/tests/helpers/sync_provider.rs                     | 2 +-
 rpc/src/v1/tests/mocked/eth.rs                                | 2 +-
 rpc/src/v1/tests/mocked/manage_network.rs                     | 2 +-
 rpc/src/v1/tests/mocked/mod.rs                                | 2 +-
 rpc/src/v1/tests/mocked/net.rs                                | 2 +-
 rpc/src/v1/tests/mocked/parity.rs                             | 2 +-
 rpc/src/v1/tests/mocked/parity_accounts.rs                    | 2 +-
 rpc/src/v1/tests/mocked/parity_set.rs                         | 2 +-
 rpc/src/v1/tests/mocked/personal.rs                           | 2 +-
 rpc/src/v1/tests/mocked/rpc.rs                                | 2 +-
 rpc/src/v1/tests/mocked/signer.rs                             | 2 +-
 rpc/src/v1/tests/mocked/signing.rs                            | 2 +-
 rpc/src/v1/tests/mocked/web3.rs                               | 2 +-
 rpc/src/v1/types/block.rs                                     | 2 +-
 rpc/src/v1/types/confirmations.rs                             | 2 +-
 rpc/src/v1/types/mod.rs                                       | 2 +-
 rpc/src/v1/types/mod.rs.in                                    | 2 +-
 rpc/src/v1/types/receipt.rs                                   | 2 +-
 rpc/src/v1/types/rpc_settings.rs                              | 2 +-
 rpc/src/v1/types/sync.rs                                      | 2 +-
 rpc/src/v1/types/trace.rs                                     | 2 +-
 rpc/src/v1/types/trace_filter.rs                              | 2 +-
 rpc/src/v1/types/transaction.rs                               | 2 +-
 rpc/src/v1/types/transaction_request.rs                       | 2 +-
 rpc/src/v1/types/uint.rs                                      | 2 +-
 rpc/src/v1/types/work.rs                                      | 2 +-
 sync/src/chain.rs                                             | 2 +-
 util/bigint/src/uint.rs                                       | 2 +-
 util/network/src/connection.rs                                | 2 +-
 util/network/src/discovery.rs                                 | 2 +-
 util/network/src/handshake.rs                                 | 2 +-
 util/network/src/host.rs                                      | 2 +-
 util/network/src/session.rs                                   | 2 +-
 util/src/journaldb/earlymergedb.rs                            | 2 +-
 util/src/journaldb/overlayrecentdb.rs                         | 2 +-
 util/src/trie/triedbmut.rs                                    | 2 +-
 622 files changed, 623 insertions(+), 623 deletions(-)

diff --git a/ethcore/light/src/client.rs b/ethcore/light/src/client.rs
index fcfff81e6f..73e85b31c2 100644
--- a/ethcore/light/src/client.rs
+++ b/ethcore/light/src/client.rs
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/ethcore/light/src/lib.rs b/ethcore/light/src/lib.rs
index f9008ac7c3..d59066b82e 100644
--- a/ethcore/light/src/lib.rs
+++ b/ethcore/light/src/lib.rs
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/ethcore/light/src/net/buffer_flow.rs b/ethcore/light/src/net/buffer_flow.rs
index 2371c6ea4c..61866f6860 100644
--- a/ethcore/light/src/net/buffer_flow.rs
+++ b/ethcore/light/src/net/buffer_flow.rs
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/ethcore/light/src/net/context.rs b/ethcore/light/src/net/context.rs
index 96c2178956..e58bca7f3b 100644
--- a/ethcore/light/src/net/context.rs
+++ b/ethcore/light/src/net/context.rs
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/ethcore/light/src/net/mod.rs b/ethcore/light/src/net/mod.rs
index e5bf0cb2b8..491e1d0ac7 100644
--- a/ethcore/light/src/net/mod.rs
+++ b/ethcore/light/src/net/mod.rs
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/ethcore/light/src/net/status.rs b/ethcore/light/src/net/status.rs
index 59981b88d5..90b8640cd7 100644
--- a/ethcore/light/src/net/status.rs
+++ b/ethcore/light/src/net/status.rs
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/ethcore/light/src/net/tests/mod.rs b/ethcore/light/src/net/tests/mod.rs
index 7c0928cdd9..24ce4250ae 100644
--- a/ethcore/light/src/net/tests/mod.rs
+++ b/ethcore/light/src/net/tests/mod.rs
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/ethcore/light/src/provider.rs b/ethcore/light/src/provider.rs
index ed2f49f5d5..d820ee6d0c 100644
--- a/ethcore/light/src/provider.rs
+++ b/ethcore/light/src/provider.rs
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/ethcore/light/src/types/les_request.rs b/ethcore/light/src/types/les_request.rs
index 2c7bfb380f..864f2d4f8f 100644
--- a/ethcore/light/src/types/les_request.rs
+++ b/ethcore/light/src/types/les_request.rs
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/ethcore/src/block.rs b/ethcore/src/block.rs
index d37920c3ed..743167a759 100644
--- a/ethcore/src/block.rs
+++ b/ethcore/src/block.rs
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/ethcore/src/blockchain/blockchain.rs b/ethcore/src/blockchain/blockchain.rs
index c69cf3336a..47f3a38c41 100644
--- a/ethcore/src/blockchain/blockchain.rs
+++ b/ethcore/src/blockchain/blockchain.rs
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/ethcore/src/client/client.rs b/ethcore/src/client/client.rs
index f14a47bdcd..fb8b5a9f2d 100644
--- a/ethcore/src/client/client.rs
+++ b/ethcore/src/client/client.rs
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/ethcore/src/engines/mod.rs b/ethcore/src/engines/mod.rs
index 1aab5f8f4a..5e5c5530f5 100644
--- a/ethcore/src/engines/mod.rs
+++ b/ethcore/src/engines/mod.rs
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/ethcore/src/ethereum/ethash.rs b/ethcore/src/ethereum/ethash.rs
index ae768e5d30..97508027b5 100644
--- a/ethcore/src/ethereum/ethash.rs
+++ b/ethcore/src/ethereum/ethash.rs
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/ethcore/src/evm/instructions.rs b/ethcore/src/evm/instructions.rs
index e609bf542e..b2a3ae5fb7 100644
--- a/ethcore/src/evm/instructions.rs
+++ b/ethcore/src/evm/instructions.rs
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/ethcore/src/evm/interpreter/gasometer.rs b/ethcore/src/evm/interpreter/gasometer.rs
index 886120880c..28a2ee9b42 100644
--- a/ethcore/src/evm/interpreter/gasometer.rs
+++ b/ethcore/src/evm/interpreter/gasometer.rs
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/ethcore/src/evm/interpreter/mod.rs b/ethcore/src/evm/interpreter/mod.rs
index bb9791abe1..7b31ec28db 100644
--- a/ethcore/src/evm/interpreter/mod.rs
+++ b/ethcore/src/evm/interpreter/mod.rs
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/ethcore/src/evm/tests.rs b/ethcore/src/evm/tests.rs
index 6cfc9a43eb..36a767265c 100644
--- a/ethcore/src/evm/tests.rs
+++ b/ethcore/src/evm/tests.rs
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/ethcore/src/executive.rs b/ethcore/src/executive.rs
index 1dfd987c16..a6c66b0679 100644
--- a/ethcore/src/executive.rs
+++ b/ethcore/src/executive.rs
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/ethcore/src/json_tests/state.rs b/ethcore/src/json_tests/state.rs
index bf84d50ee8..53cff80b04 100644
--- a/ethcore/src/json_tests/state.rs
+++ b/ethcore/src/json_tests/state.rs
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/ethcore/src/miner/miner.rs b/ethcore/src/miner/miner.rs
index 83a96837f5..a6a63ccaf0 100644
--- a/ethcore/src/miner/miner.rs
+++ b/ethcore/src/miner/miner.rs
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/ethcore/src/miner/transaction_queue.rs b/ethcore/src/miner/transaction_queue.rs
index b4cc93a9cf..28b39c7e6c 100644
--- a/ethcore/src/miner/transaction_queue.rs
+++ b/ethcore/src/miner/transaction_queue.rs
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/ethcore/src/state/mod.rs b/ethcore/src/state/mod.rs
index 8a52b62ff5..76bb716454 100644
--- a/ethcore/src/state/mod.rs
+++ b/ethcore/src/state/mod.rs
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/ethcore/src/types/trace_types/filter.rs b/ethcore/src/types/trace_types/filter.rs
index 1c1be54e73..b12112acdc 100644
--- a/ethcore/src/types/trace_types/filter.rs
+++ b/ethcore/src/types/trace_types/filter.rs
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/ethcore/src/types/trace_types/trace.rs b/ethcore/src/types/trace_types/trace.rs
index 2571805a62..7f5149905c 100644
--- a/ethcore/src/types/trace_types/trace.rs
+++ b/ethcore/src/types/trace_types/trace.rs
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/ethcore/src/verification/queue/mod.rs b/ethcore/src/verification/queue/mod.rs
index adc93484c2..d268b1cff0 100644
--- a/ethcore/src/verification/queue/mod.rs
+++ b/ethcore/src/verification/queue/mod.rs
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/ipc/codegen/src/codegen.rs b/ipc/codegen/src/codegen.rs
index 9caa436bc5..27eb8fb0bc 100644
--- a/ipc/codegen/src/codegen.rs
+++ b/ipc/codegen/src/codegen.rs
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/ipc/codegen/src/serialization.rs b/ipc/codegen/src/serialization.rs
index c7adf1011c..c7d2880105 100644
--- a/ipc/codegen/src/serialization.rs
+++ b/ipc/codegen/src/serialization.rs
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/ipc/rpc/src/binary.rs b/ipc/rpc/src/binary.rs
index e974626d0e..3c7060260f 100644
--- a/ipc/rpc/src/binary.rs
+++ b/ipc/rpc/src/binary.rs
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/npm/parity/test/smoke.spec.js b/js/npm/parity/test/smoke.spec.js
index 9920b10d2b..56ae4210bb 100644
--- a/js/npm/parity/test/smoke.spec.js
+++ b/js/npm/parity/test/smoke.spec.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/npm/test/mocha.config.js b/js/npm/test/mocha.config.js
index 2b871f5181..9de832978f 100644
--- a/js/npm/test/mocha.config.js
+++ b/js/npm/test/mocha.config.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/abi/decoder/decoder.spec.js b/js/src/abi/decoder/decoder.spec.js
index eeaf716c89..cb8f69173d 100644
--- a/js/src/abi/decoder/decoder.spec.js
+++ b/js/src/abi/decoder/decoder.spec.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/abi/encoder/encoder.spec.js b/js/src/abi/encoder/encoder.spec.js
index 008861602d..27592fb544 100644
--- a/js/src/abi/encoder/encoder.spec.js
+++ b/js/src/abi/encoder/encoder.spec.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/abi/spec/event/decodedLog.js b/js/src/abi/spec/event/decodedLog.js
index 3993b527b5..735ff09721 100644
--- a/js/src/abi/spec/event/decodedLog.js
+++ b/js/src/abi/spec/event/decodedLog.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/abi/spec/event/decodedLog.spec.js b/js/src/abi/spec/event/decodedLog.spec.js
index e6ed1a0229..d90560d28d 100644
--- a/js/src/abi/spec/event/decodedLog.spec.js
+++ b/js/src/abi/spec/event/decodedLog.spec.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/abi/spec/event/decodedLogParam.js b/js/src/abi/spec/event/decodedLogParam.js
index ed456fcce8..6740f85f62 100644
--- a/js/src/abi/spec/event/decodedLogParam.js
+++ b/js/src/abi/spec/event/decodedLogParam.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/abi/spec/event/decodedLogParam.spec.js b/js/src/abi/spec/event/decodedLogParam.spec.js
index a031282ad8..8e824258a5 100644
--- a/js/src/abi/spec/event/decodedLogParam.spec.js
+++ b/js/src/abi/spec/event/decodedLogParam.spec.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/abi/spec/event/event.js b/js/src/abi/spec/event/event.js
index f64fe0498b..a17de1e642 100644
--- a/js/src/abi/spec/event/event.js
+++ b/js/src/abi/spec/event/event.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/abi/spec/event/event.spec.js b/js/src/abi/spec/event/event.spec.js
index f7252a9d2d..4f27e15253 100644
--- a/js/src/abi/spec/event/event.spec.js
+++ b/js/src/abi/spec/event/event.spec.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/abi/spec/event/eventParam.js b/js/src/abi/spec/event/eventParam.js
index d8a3b585d8..d991dd55a6 100644
--- a/js/src/abi/spec/event/eventParam.js
+++ b/js/src/abi/spec/event/eventParam.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/abi/spec/event/eventParam.spec.js b/js/src/abi/spec/event/eventParam.spec.js
index 6858e98001..e285707f2e 100644
--- a/js/src/abi/spec/event/eventParam.spec.js
+++ b/js/src/abi/spec/event/eventParam.spec.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/abi/spec/event/index.js b/js/src/abi/spec/event/index.js
index 0925882d3e..a6d44701a7 100644
--- a/js/src/abi/spec/event/index.js
+++ b/js/src/abi/spec/event/index.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/abi/spec/paramType/format.js b/js/src/abi/spec/paramType/format.js
index 459eb15f43..7bac85cf44 100644
--- a/js/src/abi/spec/paramType/format.js
+++ b/js/src/abi/spec/paramType/format.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/abi/spec/paramType/format.spec.js b/js/src/abi/spec/paramType/format.spec.js
index 90e5229d5b..c2825a2432 100644
--- a/js/src/abi/spec/paramType/format.spec.js
+++ b/js/src/abi/spec/paramType/format.spec.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/abi/spec/paramType/index.js b/js/src/abi/spec/paramType/index.js
index 23bb83f067..eb1756b60b 100644
--- a/js/src/abi/spec/paramType/index.js
+++ b/js/src/abi/spec/paramType/index.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/abi/spec/paramType/paramType.js b/js/src/abi/spec/paramType/paramType.js
index 99a2915d65..d5bd0010ff 100644
--- a/js/src/abi/spec/paramType/paramType.js
+++ b/js/src/abi/spec/paramType/paramType.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/abi/spec/paramType/paramType.spec.js b/js/src/abi/spec/paramType/paramType.spec.js
index e8d8c32540..05b41a42b6 100644
--- a/js/src/abi/spec/paramType/paramType.spec.js
+++ b/js/src/abi/spec/paramType/paramType.spec.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/abi/spec/paramType/types.js b/js/src/abi/spec/paramType/types.js
index d789a6ed80..768552befe 100644
--- a/js/src/abi/spec/paramType/types.js
+++ b/js/src/abi/spec/paramType/types.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/api/contract/contract.js b/js/src/api/contract/contract.js
index bfe7cabc41..95dcf2e72c 100644
--- a/js/src/api/contract/contract.js
+++ b/js/src/api/contract/contract.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/api/contract/contract.spec.js b/js/src/api/contract/contract.spec.js
index 970dd606d9..87a7cf5586 100644
--- a/js/src/api/contract/contract.spec.js
+++ b/js/src/api/contract/contract.spec.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/api/format/output.spec.js b/js/src/api/format/output.spec.js
index aac433d701..b440476106 100644
--- a/js/src/api/format/output.spec.js
+++ b/js/src/api/format/output.spec.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/api/rpc/db/db.js b/js/src/api/rpc/db/db.js
index 9b20316006..ba8f3a049d 100644
--- a/js/src/api/rpc/db/db.js
+++ b/js/src/api/rpc/db/db.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/api/rpc/db/db.spec.js b/js/src/api/rpc/db/db.spec.js
index 4a11fc416d..afeab3c49e 100644
--- a/js/src/api/rpc/db/db.spec.js
+++ b/js/src/api/rpc/db/db.spec.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/api/rpc/db/index.js b/js/src/api/rpc/db/index.js
index cd7c2b0b84..4a0be931c4 100644
--- a/js/src/api/rpc/db/index.js
+++ b/js/src/api/rpc/db/index.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/api/rpc/eth/eth.e2e.js b/js/src/api/rpc/eth/eth.e2e.js
index 973ea1c517..b385b64717 100644
--- a/js/src/api/rpc/eth/eth.e2e.js
+++ b/js/src/api/rpc/eth/eth.e2e.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/api/rpc/eth/eth.js b/js/src/api/rpc/eth/eth.js
index 8148f93859..b435ea1ba3 100644
--- a/js/src/api/rpc/eth/eth.js
+++ b/js/src/api/rpc/eth/eth.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/api/rpc/eth/eth.spec.js b/js/src/api/rpc/eth/eth.spec.js
index 85d22f4bd3..f01e35c51b 100644
--- a/js/src/api/rpc/eth/eth.spec.js
+++ b/js/src/api/rpc/eth/eth.spec.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/api/rpc/eth/index.js b/js/src/api/rpc/eth/index.js
index 0d0e8c5570..4f8450b5fc 100644
--- a/js/src/api/rpc/eth/index.js
+++ b/js/src/api/rpc/eth/index.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/api/rpc/net/index.js b/js/src/api/rpc/net/index.js
index 0739111e6a..ee2ab2d415 100644
--- a/js/src/api/rpc/net/index.js
+++ b/js/src/api/rpc/net/index.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/api/rpc/net/net.e2e.js b/js/src/api/rpc/net/net.e2e.js
index 51d84f7a10..9cb6635d95 100644
--- a/js/src/api/rpc/net/net.e2e.js
+++ b/js/src/api/rpc/net/net.e2e.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/api/rpc/net/net.js b/js/src/api/rpc/net/net.js
index 96e99dc51f..924e52669c 100644
--- a/js/src/api/rpc/net/net.js
+++ b/js/src/api/rpc/net/net.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/api/rpc/net/net.spec.js b/js/src/api/rpc/net/net.spec.js
index 4903a0cde4..154e08f5c5 100644
--- a/js/src/api/rpc/net/net.spec.js
+++ b/js/src/api/rpc/net/net.spec.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/api/rpc/parity/index.js b/js/src/api/rpc/parity/index.js
index 38f08f7255..c76208e927 100644
--- a/js/src/api/rpc/parity/index.js
+++ b/js/src/api/rpc/parity/index.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/api/rpc/parity/parity.e2e.js b/js/src/api/rpc/parity/parity.e2e.js
index 91e01ab6a4..22082cde03 100644
--- a/js/src/api/rpc/parity/parity.e2e.js
+++ b/js/src/api/rpc/parity/parity.e2e.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/api/rpc/parity/parity.js b/js/src/api/rpc/parity/parity.js
index 7dd5b7eb3f..2c1d04d935 100644
--- a/js/src/api/rpc/parity/parity.js
+++ b/js/src/api/rpc/parity/parity.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/api/rpc/parity/parity.spec.js b/js/src/api/rpc/parity/parity.spec.js
index 557314e5cd..d0d97cd0b7 100644
--- a/js/src/api/rpc/parity/parity.spec.js
+++ b/js/src/api/rpc/parity/parity.spec.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/api/rpc/personal/index.js b/js/src/api/rpc/personal/index.js
index a9ed260f25..5bd5f7e5b5 100644
--- a/js/src/api/rpc/personal/index.js
+++ b/js/src/api/rpc/personal/index.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/api/rpc/personal/personal.e2e.js b/js/src/api/rpc/personal/personal.e2e.js
index f7fe42c54b..fd1bd08b1a 100644
--- a/js/src/api/rpc/personal/personal.e2e.js
+++ b/js/src/api/rpc/personal/personal.e2e.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/api/rpc/personal/personal.js b/js/src/api/rpc/personal/personal.js
index db9a71d237..61022bdb46 100644
--- a/js/src/api/rpc/personal/personal.js
+++ b/js/src/api/rpc/personal/personal.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/api/rpc/personal/personal.spec.js b/js/src/api/rpc/personal/personal.spec.js
index 70c8cf4c2a..b7673672dc 100644
--- a/js/src/api/rpc/personal/personal.spec.js
+++ b/js/src/api/rpc/personal/personal.spec.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/api/rpc/shh/index.js b/js/src/api/rpc/shh/index.js
index 7b323aeed6..e637987b29 100644
--- a/js/src/api/rpc/shh/index.js
+++ b/js/src/api/rpc/shh/index.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/api/rpc/shh/shh.js b/js/src/api/rpc/shh/shh.js
index ad545cac59..106b321b8b 100644
--- a/js/src/api/rpc/shh/shh.js
+++ b/js/src/api/rpc/shh/shh.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/api/rpc/signer/index.js b/js/src/api/rpc/signer/index.js
index 6426bdc067..3653313a7d 100644
--- a/js/src/api/rpc/signer/index.js
+++ b/js/src/api/rpc/signer/index.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/api/rpc/signer/signer.js b/js/src/api/rpc/signer/signer.js
index a24d8b9190..403da6c0ad 100644
--- a/js/src/api/rpc/signer/signer.js
+++ b/js/src/api/rpc/signer/signer.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/api/rpc/trace/index.js b/js/src/api/rpc/trace/index.js
index a140877093..2518eebd1d 100644
--- a/js/src/api/rpc/trace/index.js
+++ b/js/src/api/rpc/trace/index.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/api/rpc/trace/trace.e2e.js b/js/src/api/rpc/trace/trace.e2e.js
index 88c0988f63..262d708f81 100644
--- a/js/src/api/rpc/trace/trace.e2e.js
+++ b/js/src/api/rpc/trace/trace.e2e.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/api/rpc/trace/trace.js b/js/src/api/rpc/trace/trace.js
index 5c693c0b5f..4926153ad6 100644
--- a/js/src/api/rpc/trace/trace.js
+++ b/js/src/api/rpc/trace/trace.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/api/rpc/trace/trace.spec.js b/js/src/api/rpc/trace/trace.spec.js
index f36e5537c7..6d0610c842 100644
--- a/js/src/api/rpc/trace/trace.spec.js
+++ b/js/src/api/rpc/trace/trace.spec.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/api/rpc/web3/index.js b/js/src/api/rpc/web3/index.js
index d0bb22941d..23ed549d5c 100644
--- a/js/src/api/rpc/web3/index.js
+++ b/js/src/api/rpc/web3/index.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/api/rpc/web3/web3.e2e.js b/js/src/api/rpc/web3/web3.e2e.js
index 15cc1934fb..7040d5307a 100644
--- a/js/src/api/rpc/web3/web3.e2e.js
+++ b/js/src/api/rpc/web3/web3.e2e.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/api/rpc/web3/web3.js b/js/src/api/rpc/web3/web3.js
index eb52a8bb72..838ec6c4c0 100644
--- a/js/src/api/rpc/web3/web3.js
+++ b/js/src/api/rpc/web3/web3.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/api/rpc/web3/web3.spec.js b/js/src/api/rpc/web3/web3.spec.js
index b933e805b9..071feb8518 100644
--- a/js/src/api/rpc/web3/web3.spec.js
+++ b/js/src/api/rpc/web3/web3.spec.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/api/transport/http/http.e2e.js b/js/src/api/transport/http/http.e2e.js
index 8f0aa48adc..3a8a417272 100644
--- a/js/src/api/transport/http/http.e2e.js
+++ b/js/src/api/transport/http/http.e2e.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/api/transport/http/http.js b/js/src/api/transport/http/http.js
index 591b9a6277..17d428e75e 100644
--- a/js/src/api/transport/http/http.js
+++ b/js/src/api/transport/http/http.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/api/transport/http/http.spec.js b/js/src/api/transport/http/http.spec.js
index 718a7e66b6..d67f113078 100644
--- a/js/src/api/transport/http/http.spec.js
+++ b/js/src/api/transport/http/http.spec.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/api/transport/http/index.js b/js/src/api/transport/http/index.js
index 5ce7a652ea..b73500a61e 100644
--- a/js/src/api/transport/http/index.js
+++ b/js/src/api/transport/http/index.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/api/transport/ws/index.js b/js/src/api/transport/ws/index.js
index 7b6e359346..ea1bd191b1 100644
--- a/js/src/api/transport/ws/index.js
+++ b/js/src/api/transport/ws/index.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/api/transport/ws/ws.e2e.js b/js/src/api/transport/ws/ws.e2e.js
index 19e4ab8eb4..3ad7eb7081 100644
--- a/js/src/api/transport/ws/ws.e2e.js
+++ b/js/src/api/transport/ws/ws.e2e.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/api/transport/ws/ws.js b/js/src/api/transport/ws/ws.js
index 53600b6d3a..2de5003094 100644
--- a/js/src/api/transport/ws/ws.js
+++ b/js/src/api/transport/ws/ws.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/api/transport/ws/ws.spec.js b/js/src/api/transport/ws/ws.spec.js
index c417e89110..9303803bf4 100644
--- a/js/src/api/transport/ws/ws.spec.js
+++ b/js/src/api/transport/ws/ws.spec.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/contracts/code/wallet.js b/js/src/contracts/code/wallet.js
index 92bcf8795b..8e7c5f19ad 100644
--- a/js/src/contracts/code/wallet.js
+++ b/js/src/contracts/code/wallet.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/contracts/contracts.js b/js/src/contracts/contracts.js
index a8020b8256..8cab3252d2 100644
--- a/js/src/contracts/contracts.js
+++ b/js/src/contracts/contracts.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/dapps/basiccoin/AddressSelect/addressSelect.js b/js/src/dapps/basiccoin/AddressSelect/addressSelect.js
index 529e7753d9..d29d078fea 100644
--- a/js/src/dapps/basiccoin/AddressSelect/addressSelect.js
+++ b/js/src/dapps/basiccoin/AddressSelect/addressSelect.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/dapps/basiccoin/AddressSelect/index.js b/js/src/dapps/basiccoin/AddressSelect/index.js
index 58059cd2e1..3caaa526d7 100644
--- a/js/src/dapps/basiccoin/AddressSelect/index.js
+++ b/js/src/dapps/basiccoin/AddressSelect/index.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/dapps/basiccoin/Application/Header/header.js b/js/src/dapps/basiccoin/Application/Header/header.js
index 90fa909ef0..31674bd0fa 100644
--- a/js/src/dapps/basiccoin/Application/Header/header.js
+++ b/js/src/dapps/basiccoin/Application/Header/header.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/dapps/basiccoin/Application/Header/index.js b/js/src/dapps/basiccoin/Application/Header/index.js
index 4a51219067..ba1f0b63c9 100644
--- a/js/src/dapps/basiccoin/Application/Header/index.js
+++ b/js/src/dapps/basiccoin/Application/Header/index.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/dapps/basiccoin/Application/Loading/index.js b/js/src/dapps/basiccoin/Application/Loading/index.js
index 0468cab37d..55611075bb 100644
--- a/js/src/dapps/basiccoin/Application/Loading/index.js
+++ b/js/src/dapps/basiccoin/Application/Loading/index.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/dapps/basiccoin/Application/Loading/loading.js b/js/src/dapps/basiccoin/Application/Loading/loading.js
index e698a0e80b..b0202b633d 100644
--- a/js/src/dapps/basiccoin/Application/Loading/loading.js
+++ b/js/src/dapps/basiccoin/Application/Loading/loading.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/dapps/basiccoin/Application/application.js b/js/src/dapps/basiccoin/Application/application.js
index a05ab6436c..2863258da1 100644
--- a/js/src/dapps/basiccoin/Application/application.js
+++ b/js/src/dapps/basiccoin/Application/application.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/dapps/basiccoin/Application/index.js b/js/src/dapps/basiccoin/Application/index.js
index 236578226a..a3198ef88c 100644
--- a/js/src/dapps/basiccoin/Application/index.js
+++ b/js/src/dapps/basiccoin/Application/index.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/dapps/basiccoin/Application/pages.js b/js/src/dapps/basiccoin/Application/pages.js
index 5ab422ee4a..49210fc5f5 100644
--- a/js/src/dapps/basiccoin/Application/pages.js
+++ b/js/src/dapps/basiccoin/Application/pages.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/dapps/basiccoin/Container/container.js b/js/src/dapps/basiccoin/Container/container.js
index 82805e71b5..afab04f7d2 100644
--- a/js/src/dapps/basiccoin/Container/container.js
+++ b/js/src/dapps/basiccoin/Container/container.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/dapps/basiccoin/Container/index.js b/js/src/dapps/basiccoin/Container/index.js
index 87fbc567ef..5ad8416618 100644
--- a/js/src/dapps/basiccoin/Container/index.js
+++ b/js/src/dapps/basiccoin/Container/index.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/dapps/basiccoin/Deploy/Deployment/deployment.js b/js/src/dapps/basiccoin/Deploy/Deployment/deployment.js
index be08d616d9..33beb4a947 100644
--- a/js/src/dapps/basiccoin/Deploy/Deployment/deployment.js
+++ b/js/src/dapps/basiccoin/Deploy/Deployment/deployment.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/dapps/basiccoin/Deploy/Deployment/index.js b/js/src/dapps/basiccoin/Deploy/Deployment/index.js
index 927cff5691..89ca9681b1 100644
--- a/js/src/dapps/basiccoin/Deploy/Deployment/index.js
+++ b/js/src/dapps/basiccoin/Deploy/Deployment/index.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/dapps/basiccoin/Deploy/Event/event.js b/js/src/dapps/basiccoin/Deploy/Event/event.js
index b32795f7e4..56b14bf237 100644
--- a/js/src/dapps/basiccoin/Deploy/Event/event.js
+++ b/js/src/dapps/basiccoin/Deploy/Event/event.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/dapps/basiccoin/Deploy/Event/index.js b/js/src/dapps/basiccoin/Deploy/Event/index.js
index 0925882d3e..a6d44701a7 100644
--- a/js/src/dapps/basiccoin/Deploy/Event/index.js
+++ b/js/src/dapps/basiccoin/Deploy/Event/index.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/dapps/basiccoin/Deploy/Events/events.js b/js/src/dapps/basiccoin/Deploy/Events/events.js
index 4b51afb59b..915f110ccf 100644
--- a/js/src/dapps/basiccoin/Deploy/Events/events.js
+++ b/js/src/dapps/basiccoin/Deploy/Events/events.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/dapps/basiccoin/Deploy/Events/index.js b/js/src/dapps/basiccoin/Deploy/Events/index.js
index 88ad6d407c..d2c722d816 100644
--- a/js/src/dapps/basiccoin/Deploy/Events/index.js
+++ b/js/src/dapps/basiccoin/Deploy/Events/index.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/dapps/basiccoin/Deploy/deploy.js b/js/src/dapps/basiccoin/Deploy/deploy.js
index 34c7eed8a3..539a8e8ca6 100644
--- a/js/src/dapps/basiccoin/Deploy/deploy.js
+++ b/js/src/dapps/basiccoin/Deploy/deploy.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/dapps/basiccoin/Deploy/index.js b/js/src/dapps/basiccoin/Deploy/index.js
index 53b4dbcfe5..6935d12663 100644
--- a/js/src/dapps/basiccoin/Deploy/index.js
+++ b/js/src/dapps/basiccoin/Deploy/index.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/dapps/basiccoin/IdentityIcon/identityIcon.js b/js/src/dapps/basiccoin/IdentityIcon/identityIcon.js
index ee1374f7ec..b22f62923f 100644
--- a/js/src/dapps/basiccoin/IdentityIcon/identityIcon.js
+++ b/js/src/dapps/basiccoin/IdentityIcon/identityIcon.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/dapps/basiccoin/IdentityIcon/index.js b/js/src/dapps/basiccoin/IdentityIcon/index.js
index 76c107bfb7..90e9c1909b 100644
--- a/js/src/dapps/basiccoin/IdentityIcon/index.js
+++ b/js/src/dapps/basiccoin/IdentityIcon/index.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/dapps/basiccoin/Overview/Owner/index.js b/js/src/dapps/basiccoin/Overview/Owner/index.js
index 4f38b38b9c..b497b66383 100644
--- a/js/src/dapps/basiccoin/Overview/Owner/index.js
+++ b/js/src/dapps/basiccoin/Overview/Owner/index.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/dapps/basiccoin/Overview/Owner/owner.js b/js/src/dapps/basiccoin/Overview/Owner/owner.js
index a86a275445..35bac6160c 100644
--- a/js/src/dapps/basiccoin/Overview/Owner/owner.js
+++ b/js/src/dapps/basiccoin/Overview/Owner/owner.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/dapps/basiccoin/Overview/Token/index.js b/js/src/dapps/basiccoin/Overview/Token/index.js
index 4b822b4bdf..50ef7b2275 100644
--- a/js/src/dapps/basiccoin/Overview/Token/index.js
+++ b/js/src/dapps/basiccoin/Overview/Token/index.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/dapps/basiccoin/Overview/Token/token.js b/js/src/dapps/basiccoin/Overview/Token/token.js
index b0d4a965a6..8d2921ae59 100644
--- a/js/src/dapps/basiccoin/Overview/Token/token.js
+++ b/js/src/dapps/basiccoin/Overview/Token/token.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/dapps/basiccoin/Overview/index.js b/js/src/dapps/basiccoin/Overview/index.js
index d61fb3fb44..2e87466018 100644
--- a/js/src/dapps/basiccoin/Overview/index.js
+++ b/js/src/dapps/basiccoin/Overview/index.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/dapps/basiccoin/Overview/overview.js b/js/src/dapps/basiccoin/Overview/overview.js
index 46831d782f..ecbf4e412d 100644
--- a/js/src/dapps/basiccoin/Overview/overview.js
+++ b/js/src/dapps/basiccoin/Overview/overview.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/dapps/basiccoin/Transfer/Event/event.js b/js/src/dapps/basiccoin/Transfer/Event/event.js
index 190035b1d4..54fe69c349 100644
--- a/js/src/dapps/basiccoin/Transfer/Event/event.js
+++ b/js/src/dapps/basiccoin/Transfer/Event/event.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/dapps/basiccoin/Transfer/Event/index.js b/js/src/dapps/basiccoin/Transfer/Event/index.js
index 0925882d3e..a6d44701a7 100644
--- a/js/src/dapps/basiccoin/Transfer/Event/index.js
+++ b/js/src/dapps/basiccoin/Transfer/Event/index.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/dapps/basiccoin/Transfer/Events/events.js b/js/src/dapps/basiccoin/Transfer/Events/events.js
index 101c77f73a..0bdca084f9 100644
--- a/js/src/dapps/basiccoin/Transfer/Events/events.js
+++ b/js/src/dapps/basiccoin/Transfer/Events/events.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/dapps/basiccoin/Transfer/Events/index.js b/js/src/dapps/basiccoin/Transfer/Events/index.js
index 88ad6d407c..d2c722d816 100644
--- a/js/src/dapps/basiccoin/Transfer/Events/index.js
+++ b/js/src/dapps/basiccoin/Transfer/Events/index.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/dapps/basiccoin/Transfer/Send/index.js b/js/src/dapps/basiccoin/Transfer/Send/index.js
index ad3107789e..5e373a846b 100644
--- a/js/src/dapps/basiccoin/Transfer/Send/index.js
+++ b/js/src/dapps/basiccoin/Transfer/Send/index.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/dapps/basiccoin/Transfer/Send/send.js b/js/src/dapps/basiccoin/Transfer/Send/send.js
index f10807b2ef..daec42ac7d 100644
--- a/js/src/dapps/basiccoin/Transfer/Send/send.js
+++ b/js/src/dapps/basiccoin/Transfer/Send/send.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/dapps/basiccoin/Transfer/index.js b/js/src/dapps/basiccoin/Transfer/index.js
index 24d36d7963..4a82b5b7d2 100644
--- a/js/src/dapps/basiccoin/Transfer/index.js
+++ b/js/src/dapps/basiccoin/Transfer/index.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/dapps/basiccoin/Transfer/transfer.js b/js/src/dapps/basiccoin/Transfer/transfer.js
index 842d4b7bcf..58a317a84b 100644
--- a/js/src/dapps/basiccoin/Transfer/transfer.js
+++ b/js/src/dapps/basiccoin/Transfer/transfer.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/dapps/dappreg/Application/application.js b/js/src/dapps/dappreg/Application/application.js
index b5e4d5a972..1722f39885 100644
--- a/js/src/dapps/dappreg/Application/application.js
+++ b/js/src/dapps/dappreg/Application/application.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/dapps/dappreg/Application/index.js b/js/src/dapps/dappreg/Application/index.js
index 236578226a..a3198ef88c 100644
--- a/js/src/dapps/dappreg/Application/index.js
+++ b/js/src/dapps/dappreg/Application/index.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/dapps/dappreg/Button/button.js b/js/src/dapps/dappreg/Button/button.js
index 1f3b67b4cd..f37a9fa471 100644
--- a/js/src/dapps/dappreg/Button/button.js
+++ b/js/src/dapps/dappreg/Button/button.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/dapps/dappreg/Button/index.js b/js/src/dapps/dappreg/Button/index.js
index f69a65e3d5..95f33d38c4 100644
--- a/js/src/dapps/dappreg/Button/index.js
+++ b/js/src/dapps/dappreg/Button/index.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/dapps/dappreg/ButtonBar/buttonBar.js b/js/src/dapps/dappreg/ButtonBar/buttonBar.js
index 074c527d08..f885acb0fd 100644
--- a/js/src/dapps/dappreg/ButtonBar/buttonBar.js
+++ b/js/src/dapps/dappreg/ButtonBar/buttonBar.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/dapps/dappreg/ButtonBar/index.js b/js/src/dapps/dappreg/ButtonBar/index.js
index d48f63208f..aef56ea6e8 100644
--- a/js/src/dapps/dappreg/ButtonBar/index.js
+++ b/js/src/dapps/dappreg/ButtonBar/index.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/dapps/dappreg/Dapp/dapp.js b/js/src/dapps/dappreg/Dapp/dapp.js
index 2e07f6ba05..0b2d4551d1 100644
--- a/js/src/dapps/dappreg/Dapp/dapp.js
+++ b/js/src/dapps/dappreg/Dapp/dapp.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/dapps/dappreg/Dapp/index.js b/js/src/dapps/dappreg/Dapp/index.js
index 6fbb5df273..f32a03d0e3 100644
--- a/js/src/dapps/dappreg/Dapp/index.js
+++ b/js/src/dapps/dappreg/Dapp/index.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/dapps/dappreg/Input/index.js b/js/src/dapps/dappreg/Input/index.js
index 3d9d9293e5..4a4d166742 100644
--- a/js/src/dapps/dappreg/Input/index.js
+++ b/js/src/dapps/dappreg/Input/index.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/dapps/dappreg/Input/input.js b/js/src/dapps/dappreg/Input/input.js
index 72e046afb0..ed52835d53 100644
--- a/js/src/dapps/dappreg/Input/input.js
+++ b/js/src/dapps/dappreg/Input/input.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/dapps/dappreg/Modal/index.js b/js/src/dapps/dappreg/Modal/index.js
index 1e75d9fd89..f1fcd68484 100644
--- a/js/src/dapps/dappreg/Modal/index.js
+++ b/js/src/dapps/dappreg/Modal/index.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/dapps/dappreg/Modal/modal.js b/js/src/dapps/dappreg/Modal/modal.js
index 7701695d71..1456e23c65 100644
--- a/js/src/dapps/dappreg/Modal/modal.js
+++ b/js/src/dapps/dappreg/Modal/modal.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/dapps/dappreg/ModalDelete/index.js b/js/src/dapps/dappreg/ModalDelete/index.js
index bb321ce2c3..99cf1bd97a 100644
--- a/js/src/dapps/dappreg/ModalDelete/index.js
+++ b/js/src/dapps/dappreg/ModalDelete/index.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/dapps/dappreg/ModalDelete/modalDelete.js b/js/src/dapps/dappreg/ModalDelete/modalDelete.js
index 3a3a8ee525..5513b7fe30 100644
--- a/js/src/dapps/dappreg/ModalDelete/modalDelete.js
+++ b/js/src/dapps/dappreg/ModalDelete/modalDelete.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/dapps/dappreg/ModalRegister/index.js b/js/src/dapps/dappreg/ModalRegister/index.js
index aae13fd7d4..7b6eaf852e 100644
--- a/js/src/dapps/dappreg/ModalRegister/index.js
+++ b/js/src/dapps/dappreg/ModalRegister/index.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/dapps/dappreg/ModalRegister/modalRegister.js b/js/src/dapps/dappreg/ModalRegister/modalRegister.js
index 53d1806e1d..a16514ed8b 100644
--- a/js/src/dapps/dappreg/ModalRegister/modalRegister.js
+++ b/js/src/dapps/dappreg/ModalRegister/modalRegister.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/dapps/dappreg/ModalUpdate/index.js b/js/src/dapps/dappreg/ModalUpdate/index.js
index 8533843ffe..624ed4adc8 100644
--- a/js/src/dapps/dappreg/ModalUpdate/index.js
+++ b/js/src/dapps/dappreg/ModalUpdate/index.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/dapps/dappreg/ModalUpdate/modalUpdate.js b/js/src/dapps/dappreg/ModalUpdate/modalUpdate.js
index 591fb59fdd..ba57738028 100644
--- a/js/src/dapps/dappreg/ModalUpdate/modalUpdate.js
+++ b/js/src/dapps/dappreg/ModalUpdate/modalUpdate.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/dapps/dappreg/SelectAccount/index.js b/js/src/dapps/dappreg/SelectAccount/index.js
index f8c684ee25..5d7e05bd92 100644
--- a/js/src/dapps/dappreg/SelectAccount/index.js
+++ b/js/src/dapps/dappreg/SelectAccount/index.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/dapps/dappreg/SelectAccount/selectAccount.js b/js/src/dapps/dappreg/SelectAccount/selectAccount.js
index 0269a4370e..f06064ffec 100644
--- a/js/src/dapps/dappreg/SelectAccount/selectAccount.js
+++ b/js/src/dapps/dappreg/SelectAccount/selectAccount.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/dapps/dappreg/SelectDapp/index.js b/js/src/dapps/dappreg/SelectDapp/index.js
index 0ab133b574..b41a4abcc1 100644
--- a/js/src/dapps/dappreg/SelectDapp/index.js
+++ b/js/src/dapps/dappreg/SelectDapp/index.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/dapps/dappreg/SelectDapp/selectDapp.js b/js/src/dapps/dappreg/SelectDapp/selectDapp.js
index 8c0e846f37..61e1d16bef 100644
--- a/js/src/dapps/dappreg/SelectDapp/selectDapp.js
+++ b/js/src/dapps/dappreg/SelectDapp/selectDapp.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/dapps/dappreg/Warning/index.js b/js/src/dapps/dappreg/Warning/index.js
index 6097861be8..9b67b7d8ac 100644
--- a/js/src/dapps/dappreg/Warning/index.js
+++ b/js/src/dapps/dappreg/Warning/index.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/dapps/dappreg/Warning/warning.js b/js/src/dapps/dappreg/Warning/warning.js
index 966c5d3e6d..cdf6a129cf 100644
--- a/js/src/dapps/dappreg/Warning/warning.js
+++ b/js/src/dapps/dappreg/Warning/warning.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/dapps/dappreg/dappsStore.js b/js/src/dapps/dappreg/dappsStore.js
index 382f5cdc4a..94913a2eb1 100644
--- a/js/src/dapps/dappreg/dappsStore.js
+++ b/js/src/dapps/dappreg/dappsStore.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/dapps/githubhint/Application/application.js b/js/src/dapps/githubhint/Application/application.js
index 1690bf1c4e..630a36a684 100644
--- a/js/src/dapps/githubhint/Application/application.js
+++ b/js/src/dapps/githubhint/Application/application.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/dapps/githubhint/Application/index.js b/js/src/dapps/githubhint/Application/index.js
index 236578226a..a3198ef88c 100644
--- a/js/src/dapps/githubhint/Application/index.js
+++ b/js/src/dapps/githubhint/Application/index.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/dapps/githubhint/Button/button.js b/js/src/dapps/githubhint/Button/button.js
index 42fca1af7d..e98963cb89 100644
--- a/js/src/dapps/githubhint/Button/button.js
+++ b/js/src/dapps/githubhint/Button/button.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/dapps/githubhint/Button/index.js b/js/src/dapps/githubhint/Button/index.js
index f69a65e3d5..95f33d38c4 100644
--- a/js/src/dapps/githubhint/Button/index.js
+++ b/js/src/dapps/githubhint/Button/index.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/dapps/githubhint/Events/events.js b/js/src/dapps/githubhint/Events/events.js
index ba74ceaea7..c9991acd57 100644
--- a/js/src/dapps/githubhint/Events/events.js
+++ b/js/src/dapps/githubhint/Events/events.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/dapps/githubhint/Events/index.js b/js/src/dapps/githubhint/Events/index.js
index 88ad6d407c..d2c722d816 100644
--- a/js/src/dapps/githubhint/Events/index.js
+++ b/js/src/dapps/githubhint/Events/index.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/dapps/githubhint/IdentityIcon/identityIcon.js b/js/src/dapps/githubhint/IdentityIcon/identityIcon.js
index 0bc86731d4..60012bc5d0 100644
--- a/js/src/dapps/githubhint/IdentityIcon/identityIcon.js
+++ b/js/src/dapps/githubhint/IdentityIcon/identityIcon.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/dapps/githubhint/IdentityIcon/index.js b/js/src/dapps/githubhint/IdentityIcon/index.js
index 76c107bfb7..90e9c1909b 100644
--- a/js/src/dapps/githubhint/IdentityIcon/index.js
+++ b/js/src/dapps/githubhint/IdentityIcon/index.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/dapps/githubhint/Loading/index.js b/js/src/dapps/githubhint/Loading/index.js
index 0468cab37d..55611075bb 100644
--- a/js/src/dapps/githubhint/Loading/index.js
+++ b/js/src/dapps/githubhint/Loading/index.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/dapps/githubhint/Loading/loading.js b/js/src/dapps/githubhint/Loading/loading.js
index b884597d76..c058b583ee 100644
--- a/js/src/dapps/githubhint/Loading/loading.js
+++ b/js/src/dapps/githubhint/Loading/loading.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/dapps/localtx/Application/application.js b/js/src/dapps/localtx/Application/application.js
index da435b57d7..33c5d0558c 100644
--- a/js/src/dapps/localtx/Application/application.js
+++ b/js/src/dapps/localtx/Application/application.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/dapps/localtx/Application/application.spec.js b/js/src/dapps/localtx/Application/application.spec.js
index 3ffee343dd..f8b19e6905 100644
--- a/js/src/dapps/localtx/Application/application.spec.js
+++ b/js/src/dapps/localtx/Application/application.spec.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/dapps/localtx/Application/index.js b/js/src/dapps/localtx/Application/index.js
index 236578226a..a3198ef88c 100644
--- a/js/src/dapps/localtx/Application/index.js
+++ b/js/src/dapps/localtx/Application/index.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/dapps/localtx/Transaction/index.js b/js/src/dapps/localtx/Transaction/index.js
index 56854f4126..7259964b7f 100644
--- a/js/src/dapps/localtx/Transaction/index.js
+++ b/js/src/dapps/localtx/Transaction/index.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/dapps/localtx/Transaction/transaction.js b/js/src/dapps/localtx/Transaction/transaction.js
index 17a45ecd60..fab5bf152e 100644
--- a/js/src/dapps/localtx/Transaction/transaction.js
+++ b/js/src/dapps/localtx/Transaction/transaction.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/dapps/localtx/Transaction/transaction.spec.js b/js/src/dapps/localtx/Transaction/transaction.spec.js
index 04f2f8de84..70fb4a08bb 100644
--- a/js/src/dapps/localtx/Transaction/transaction.spec.js
+++ b/js/src/dapps/localtx/Transaction/transaction.spec.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/dapps/registry/Accounts/accounts.js b/js/src/dapps/registry/Accounts/accounts.js
index e8d8c2bd20..076a8bfa44 100644
--- a/js/src/dapps/registry/Accounts/accounts.js
+++ b/js/src/dapps/registry/Accounts/accounts.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/dapps/registry/Accounts/actions.js b/js/src/dapps/registry/Accounts/actions.js
index 4f2bd3c707..2abaddd488 100644
--- a/js/src/dapps/registry/Accounts/actions.js
+++ b/js/src/dapps/registry/Accounts/actions.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/dapps/registry/Accounts/index.js b/js/src/dapps/registry/Accounts/index.js
index e9be1d5573..c1e7c91a0a 100644
--- a/js/src/dapps/registry/Accounts/index.js
+++ b/js/src/dapps/registry/Accounts/index.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/dapps/registry/Application/application.js b/js/src/dapps/registry/Application/application.js
index 45290937ea..0d1f7e50a4 100644
--- a/js/src/dapps/registry/Application/application.js
+++ b/js/src/dapps/registry/Application/application.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/dapps/registry/Application/index.js b/js/src/dapps/registry/Application/index.js
index 236578226a..a3198ef88c 100644
--- a/js/src/dapps/registry/Application/index.js
+++ b/js/src/dapps/registry/Application/index.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/dapps/registry/Events/actions.js b/js/src/dapps/registry/Events/actions.js
index e12c98c4f6..aa48947e80 100644
--- a/js/src/dapps/registry/Events/actions.js
+++ b/js/src/dapps/registry/Events/actions.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/dapps/registry/Events/events.js b/js/src/dapps/registry/Events/events.js
index cb433068fe..77a985def2 100644
--- a/js/src/dapps/registry/Events/events.js
+++ b/js/src/dapps/registry/Events/events.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/dapps/registry/Events/index.js b/js/src/dapps/registry/Events/index.js
index 15d43c375c..d058c814da 100644
--- a/js/src/dapps/registry/Events/index.js
+++ b/js/src/dapps/registry/Events/index.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/dapps/registry/Events/reducers.js b/js/src/dapps/registry/Events/reducers.js
index 6ff0011d34..8bca205ac3 100644
--- a/js/src/dapps/registry/Events/reducers.js
+++ b/js/src/dapps/registry/Events/reducers.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/dapps/registry/IdentityIcon/identityIcon.js b/js/src/dapps/registry/IdentityIcon/identityIcon.js
index e4baf27057..873c2eb88d 100644
--- a/js/src/dapps/registry/IdentityIcon/identityIcon.js
+++ b/js/src/dapps/registry/IdentityIcon/identityIcon.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/dapps/registry/IdentityIcon/index.js b/js/src/dapps/registry/IdentityIcon/index.js
index 76c107bfb7..90e9c1909b 100644
--- a/js/src/dapps/registry/IdentityIcon/index.js
+++ b/js/src/dapps/registry/IdentityIcon/index.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/dapps/registry/Lookup/actions.js b/js/src/dapps/registry/Lookup/actions.js
index a7df875854..7cd1ee57a1 100644
--- a/js/src/dapps/registry/Lookup/actions.js
+++ b/js/src/dapps/registry/Lookup/actions.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/dapps/registry/Lookup/index.js b/js/src/dapps/registry/Lookup/index.js
index f4ade7c001..5e278c07eb 100644
--- a/js/src/dapps/registry/Lookup/index.js
+++ b/js/src/dapps/registry/Lookup/index.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/dapps/registry/Lookup/lookup.js b/js/src/dapps/registry/Lookup/lookup.js
index b8b6207cc2..a743219f2c 100644
--- a/js/src/dapps/registry/Lookup/lookup.js
+++ b/js/src/dapps/registry/Lookup/lookup.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/dapps/registry/Lookup/reducers.js b/js/src/dapps/registry/Lookup/reducers.js
index f96e784bdb..d6807c7136 100644
--- a/js/src/dapps/registry/Lookup/reducers.js
+++ b/js/src/dapps/registry/Lookup/reducers.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/dapps/registry/Names/actions.js b/js/src/dapps/registry/Names/actions.js
index 4881453313..f6ffec729a 100644
--- a/js/src/dapps/registry/Names/actions.js
+++ b/js/src/dapps/registry/Names/actions.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/dapps/registry/Names/index.js b/js/src/dapps/registry/Names/index.js
index 26195de884..9bfa8232a7 100644
--- a/js/src/dapps/registry/Names/index.js
+++ b/js/src/dapps/registry/Names/index.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/dapps/registry/Names/names.js b/js/src/dapps/registry/Names/names.js
index 369d9690ce..c0c4badf0d 100644
--- a/js/src/dapps/registry/Names/names.js
+++ b/js/src/dapps/registry/Names/names.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/dapps/registry/Names/reducers.js b/js/src/dapps/registry/Names/reducers.js
index fcd2ce48ec..2b43c8b3e5 100644
--- a/js/src/dapps/registry/Names/reducers.js
+++ b/js/src/dapps/registry/Names/reducers.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/dapps/registry/Records/records.js b/js/src/dapps/registry/Records/records.js
index 4837290a32..085a701524 100644
--- a/js/src/dapps/registry/Records/records.js
+++ b/js/src/dapps/registry/Records/records.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/dapps/registry/addresses/accounts-reducer.js b/js/src/dapps/registry/addresses/accounts-reducer.js
index 20981877d6..926536be02 100644
--- a/js/src/dapps/registry/addresses/accounts-reducer.js
+++ b/js/src/dapps/registry/addresses/accounts-reducer.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/dapps/registry/addresses/actions.js b/js/src/dapps/registry/addresses/actions.js
index 0593661735..d53df1c7f5 100644
--- a/js/src/dapps/registry/addresses/actions.js
+++ b/js/src/dapps/registry/addresses/actions.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/dapps/registry/addresses/contacts-reducer.js b/js/src/dapps/registry/addresses/contacts-reducer.js
index 6b0572e549..401302520f 100644
--- a/js/src/dapps/registry/addresses/contacts-reducer.js
+++ b/js/src/dapps/registry/addresses/contacts-reducer.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/dapps/registry/ui/address.js b/js/src/dapps/registry/ui/address.js
index f0b9d65da0..f19894b482 100644
--- a/js/src/dapps/registry/ui/address.js
+++ b/js/src/dapps/registry/ui/address.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/dapps/registry/ui/hash.js b/js/src/dapps/registry/ui/hash.js
index 4035a9bbe2..7a586b2563 100644
--- a/js/src/dapps/registry/ui/hash.js
+++ b/js/src/dapps/registry/ui/hash.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/dapps/registry/ui/image.js b/js/src/dapps/registry/ui/image.js
index e0101e1f20..c66e341280 100644
--- a/js/src/dapps/registry/ui/image.js
+++ b/js/src/dapps/registry/ui/image.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/dapps/registry/ui/record-type-select.js b/js/src/dapps/registry/ui/record-type-select.js
index 2cfbdf5406..e146dbf7d0 100644
--- a/js/src/dapps/registry/ui/record-type-select.js
+++ b/js/src/dapps/registry/ui/record-type-select.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/dapps/signaturereg/Application/application.js b/js/src/dapps/signaturereg/Application/application.js
index 3878af4cfb..afddbfcaf9 100644
--- a/js/src/dapps/signaturereg/Application/application.js
+++ b/js/src/dapps/signaturereg/Application/application.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/dapps/signaturereg/Application/index.js b/js/src/dapps/signaturereg/Application/index.js
index 236578226a..a3198ef88c 100644
--- a/js/src/dapps/signaturereg/Application/index.js
+++ b/js/src/dapps/signaturereg/Application/index.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/dapps/signaturereg/Button/button.js b/js/src/dapps/signaturereg/Button/button.js
index 9cbbcf478e..238ef4f882 100644
--- a/js/src/dapps/signaturereg/Button/button.js
+++ b/js/src/dapps/signaturereg/Button/button.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/dapps/signaturereg/Button/index.js b/js/src/dapps/signaturereg/Button/index.js
index f69a65e3d5..95f33d38c4 100644
--- a/js/src/dapps/signaturereg/Button/index.js
+++ b/js/src/dapps/signaturereg/Button/index.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/dapps/signaturereg/Events/events.js b/js/src/dapps/signaturereg/Events/events.js
index 302b512504..067b3ead60 100644
--- a/js/src/dapps/signaturereg/Events/events.js
+++ b/js/src/dapps/signaturereg/Events/events.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/dapps/signaturereg/Events/index.js b/js/src/dapps/signaturereg/Events/index.js
index 88ad6d407c..d2c722d816 100644
--- a/js/src/dapps/signaturereg/Events/index.js
+++ b/js/src/dapps/signaturereg/Events/index.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/dapps/signaturereg/Header/header.js b/js/src/dapps/signaturereg/Header/header.js
index 8dd7cd578a..8704473388 100644
--- a/js/src/dapps/signaturereg/Header/header.js
+++ b/js/src/dapps/signaturereg/Header/header.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/dapps/signaturereg/Header/index.js b/js/src/dapps/signaturereg/Header/index.js
index 37b5835f05..c73d890cce 100644
--- a/js/src/dapps/signaturereg/Header/index.js
+++ b/js/src/dapps/signaturereg/Header/index.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/dapps/signaturereg/IdentityIcon/identityIcon.js b/js/src/dapps/signaturereg/IdentityIcon/identityIcon.js
index 0bc86731d4..60012bc5d0 100644
--- a/js/src/dapps/signaturereg/IdentityIcon/identityIcon.js
+++ b/js/src/dapps/signaturereg/IdentityIcon/identityIcon.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/dapps/signaturereg/IdentityIcon/index.js b/js/src/dapps/signaturereg/IdentityIcon/index.js
index 76c107bfb7..90e9c1909b 100644
--- a/js/src/dapps/signaturereg/IdentityIcon/index.js
+++ b/js/src/dapps/signaturereg/IdentityIcon/index.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/dapps/signaturereg/Import/import.js b/js/src/dapps/signaturereg/Import/import.js
index 55f7d93341..1281bfc930 100644
--- a/js/src/dapps/signaturereg/Import/import.js
+++ b/js/src/dapps/signaturereg/Import/import.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/dapps/signaturereg/Import/index.js b/js/src/dapps/signaturereg/Import/index.js
index d2f352cf3d..f6a1b16e19 100644
--- a/js/src/dapps/signaturereg/Import/index.js
+++ b/js/src/dapps/signaturereg/Import/index.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/dapps/signaturereg/Loading/index.js b/js/src/dapps/signaturereg/Loading/index.js
index 0468cab37d..55611075bb 100644
--- a/js/src/dapps/signaturereg/Loading/index.js
+++ b/js/src/dapps/signaturereg/Loading/index.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/dapps/signaturereg/Loading/loading.js b/js/src/dapps/signaturereg/Loading/loading.js
index b884597d76..c058b583ee 100644
--- a/js/src/dapps/signaturereg/Loading/loading.js
+++ b/js/src/dapps/signaturereg/Loading/loading.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/dapps/tokenreg/Accounts/AccountSelector/account-selector.js b/js/src/dapps/tokenreg/Accounts/AccountSelector/account-selector.js
index 4d29a6692a..5cb84f5a9a 100644
--- a/js/src/dapps/tokenreg/Accounts/AccountSelector/account-selector.js
+++ b/js/src/dapps/tokenreg/Accounts/AccountSelector/account-selector.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/dapps/tokenreg/Accounts/AccountSelector/container.js b/js/src/dapps/tokenreg/Accounts/AccountSelector/container.js
index 6438d1dff7..6cd0dcc3a8 100644
--- a/js/src/dapps/tokenreg/Accounts/AccountSelector/container.js
+++ b/js/src/dapps/tokenreg/Accounts/AccountSelector/container.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/dapps/tokenreg/Accounts/AccountSelector/index.js b/js/src/dapps/tokenreg/Accounts/AccountSelector/index.js
index 87fbc567ef..5ad8416618 100644
--- a/js/src/dapps/tokenreg/Accounts/AccountSelector/index.js
+++ b/js/src/dapps/tokenreg/Accounts/AccountSelector/index.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/dapps/tokenreg/Accounts/actions.js b/js/src/dapps/tokenreg/Accounts/actions.js
index 5f92280bee..85e4aacebc 100644
--- a/js/src/dapps/tokenreg/Accounts/actions.js
+++ b/js/src/dapps/tokenreg/Accounts/actions.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/dapps/tokenreg/Accounts/reducer.js b/js/src/dapps/tokenreg/Accounts/reducer.js
index 091df4c8a6..899a03b53f 100644
--- a/js/src/dapps/tokenreg/Accounts/reducer.js
+++ b/js/src/dapps/tokenreg/Accounts/reducer.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/dapps/tokenreg/Actions/Query/index.js b/js/src/dapps/tokenreg/Actions/Query/index.js
index 83bc6a337c..0273a5f8e0 100644
--- a/js/src/dapps/tokenreg/Actions/Query/index.js
+++ b/js/src/dapps/tokenreg/Actions/Query/index.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/dapps/tokenreg/Actions/Query/query.js b/js/src/dapps/tokenreg/Actions/Query/query.js
index 5a3c7d5f67..fd680769c7 100644
--- a/js/src/dapps/tokenreg/Actions/Query/query.js
+++ b/js/src/dapps/tokenreg/Actions/Query/query.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/dapps/tokenreg/Actions/Register/index.js b/js/src/dapps/tokenreg/Actions/Register/index.js
index 3099d1f42f..ff135192e7 100644
--- a/js/src/dapps/tokenreg/Actions/Register/index.js
+++ b/js/src/dapps/tokenreg/Actions/Register/index.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/dapps/tokenreg/Actions/Register/register.js b/js/src/dapps/tokenreg/Actions/Register/register.js
index a008ce84fc..54df411c71 100644
--- a/js/src/dapps/tokenreg/Actions/Register/register.js
+++ b/js/src/dapps/tokenreg/Actions/Register/register.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/dapps/tokenreg/Actions/actions.js b/js/src/dapps/tokenreg/Actions/actions.js
index df5b41e6bd..5c1faf985b 100644
--- a/js/src/dapps/tokenreg/Actions/actions.js
+++ b/js/src/dapps/tokenreg/Actions/actions.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/dapps/tokenreg/Actions/component.js b/js/src/dapps/tokenreg/Actions/component.js
index 43acc27aba..c79f2563a8 100644
--- a/js/src/dapps/tokenreg/Actions/component.js
+++ b/js/src/dapps/tokenreg/Actions/component.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/dapps/tokenreg/Actions/container.js b/js/src/dapps/tokenreg/Actions/container.js
index 1d3d8fe311..2a4800a671 100644
--- a/js/src/dapps/tokenreg/Actions/container.js
+++ b/js/src/dapps/tokenreg/Actions/container.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/dapps/tokenreg/Actions/index.js b/js/src/dapps/tokenreg/Actions/index.js
index 9007217b71..a442bf3c53 100644
--- a/js/src/dapps/tokenreg/Actions/index.js
+++ b/js/src/dapps/tokenreg/Actions/index.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/dapps/tokenreg/Actions/reducer.js b/js/src/dapps/tokenreg/Actions/reducer.js
index 7b7f8341a3..1768cbe6fa 100644
--- a/js/src/dapps/tokenreg/Actions/reducer.js
+++ b/js/src/dapps/tokenreg/Actions/reducer.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/dapps/tokenreg/Application/application.js b/js/src/dapps/tokenreg/Application/application.js
index 6a94f5c9c5..0ac7840231 100644
--- a/js/src/dapps/tokenreg/Application/application.js
+++ b/js/src/dapps/tokenreg/Application/application.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/dapps/tokenreg/Application/index.js b/js/src/dapps/tokenreg/Application/index.js
index 236578226a..a3198ef88c 100644
--- a/js/src/dapps/tokenreg/Application/index.js
+++ b/js/src/dapps/tokenreg/Application/index.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/dapps/tokenreg/Chip/chip.js b/js/src/dapps/tokenreg/Chip/chip.js
index ad98860259..f26f9a0c6a 100644
--- a/js/src/dapps/tokenreg/Chip/chip.js
+++ b/js/src/dapps/tokenreg/Chip/chip.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/dapps/tokenreg/Chip/index.js b/js/src/dapps/tokenreg/Chip/index.js
index 6e1ea80fba..98f3fc5ae8 100644
--- a/js/src/dapps/tokenreg/Chip/index.js
+++ b/js/src/dapps/tokenreg/Chip/index.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/dapps/tokenreg/IdentityIcon/identityIcon.js b/js/src/dapps/tokenreg/IdentityIcon/identityIcon.js
index 51f48d46ab..76dfb00793 100644
--- a/js/src/dapps/tokenreg/IdentityIcon/identityIcon.js
+++ b/js/src/dapps/tokenreg/IdentityIcon/identityIcon.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/dapps/tokenreg/IdentityIcon/index.js b/js/src/dapps/tokenreg/IdentityIcon/index.js
index 76c107bfb7..90e9c1909b 100644
--- a/js/src/dapps/tokenreg/IdentityIcon/index.js
+++ b/js/src/dapps/tokenreg/IdentityIcon/index.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/dapps/tokenreg/Inputs/Text/container.js b/js/src/dapps/tokenreg/Inputs/Text/container.js
index 450a2b56e5..fe8ae4c263 100644
--- a/js/src/dapps/tokenreg/Inputs/Text/container.js
+++ b/js/src/dapps/tokenreg/Inputs/Text/container.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/dapps/tokenreg/Inputs/Text/index.js b/js/src/dapps/tokenreg/Inputs/Text/index.js
index 87fbc567ef..5ad8416618 100644
--- a/js/src/dapps/tokenreg/Inputs/Text/index.js
+++ b/js/src/dapps/tokenreg/Inputs/Text/index.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/dapps/tokenreg/Inputs/Text/input-text.js b/js/src/dapps/tokenreg/Inputs/Text/input-text.js
index 289c8c37f3..9a8ceca3d2 100644
--- a/js/src/dapps/tokenreg/Inputs/Text/input-text.js
+++ b/js/src/dapps/tokenreg/Inputs/Text/input-text.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/dapps/tokenreg/Inputs/validation.js b/js/src/dapps/tokenreg/Inputs/validation.js
index fd394b4ec4..3b14bd0a4b 100644
--- a/js/src/dapps/tokenreg/Inputs/validation.js
+++ b/js/src/dapps/tokenreg/Inputs/validation.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/dapps/tokenreg/Loading/index.js b/js/src/dapps/tokenreg/Loading/index.js
index 0468cab37d..55611075bb 100644
--- a/js/src/dapps/tokenreg/Loading/index.js
+++ b/js/src/dapps/tokenreg/Loading/index.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/dapps/tokenreg/Loading/loading.js b/js/src/dapps/tokenreg/Loading/loading.js
index bdcc98df67..507c84bf9e 100644
--- a/js/src/dapps/tokenreg/Loading/loading.js
+++ b/js/src/dapps/tokenreg/Loading/loading.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/dapps/tokenreg/Status/actions.js b/js/src/dapps/tokenreg/Status/actions.js
index 76fae17e54..057a44e658 100644
--- a/js/src/dapps/tokenreg/Status/actions.js
+++ b/js/src/dapps/tokenreg/Status/actions.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/dapps/tokenreg/Status/index.js b/js/src/dapps/tokenreg/Status/index.js
index 44079b2248..f966050e93 100644
--- a/js/src/dapps/tokenreg/Status/index.js
+++ b/js/src/dapps/tokenreg/Status/index.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/dapps/tokenreg/Status/reducer.js b/js/src/dapps/tokenreg/Status/reducer.js
index aee16fbe78..ae41e6a0be 100644
--- a/js/src/dapps/tokenreg/Status/reducer.js
+++ b/js/src/dapps/tokenreg/Status/reducer.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/dapps/tokenreg/Status/status.js b/js/src/dapps/tokenreg/Status/status.js
index 4ca47a6eae..64ebba3b6f 100644
--- a/js/src/dapps/tokenreg/Status/status.js
+++ b/js/src/dapps/tokenreg/Status/status.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/dapps/tokenreg/Tokens/Token/add-meta.js b/js/src/dapps/tokenreg/Tokens/Token/add-meta.js
index 09e65954d2..60be410e9b 100644
--- a/js/src/dapps/tokenreg/Tokens/Token/add-meta.js
+++ b/js/src/dapps/tokenreg/Tokens/Token/add-meta.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/dapps/tokenreg/Tokens/Token/index.js b/js/src/dapps/tokenreg/Tokens/Token/index.js
index 30ad8896f7..40e8626af0 100644
--- a/js/src/dapps/tokenreg/Tokens/Token/index.js
+++ b/js/src/dapps/tokenreg/Tokens/Token/index.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/dapps/tokenreg/Tokens/Token/token.js b/js/src/dapps/tokenreg/Tokens/Token/token.js
index be14cec84b..831be4a0d9 100644
--- a/js/src/dapps/tokenreg/Tokens/Token/token.js
+++ b/js/src/dapps/tokenreg/Tokens/Token/token.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/dapps/tokenreg/Tokens/Token/tokenContainer.js b/js/src/dapps/tokenreg/Tokens/Token/tokenContainer.js
index 7351da524d..84eb14270c 100644
--- a/js/src/dapps/tokenreg/Tokens/Token/tokenContainer.js
+++ b/js/src/dapps/tokenreg/Tokens/Token/tokenContainer.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/dapps/tokenreg/Tokens/actions.js b/js/src/dapps/tokenreg/Tokens/actions.js
index 65ed24cd42..8ec37fd172 100644
--- a/js/src/dapps/tokenreg/Tokens/actions.js
+++ b/js/src/dapps/tokenreg/Tokens/actions.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/dapps/tokenreg/Tokens/container.js b/js/src/dapps/tokenreg/Tokens/container.js
index 33b2de6590..84f9c18d3f 100644
--- a/js/src/dapps/tokenreg/Tokens/container.js
+++ b/js/src/dapps/tokenreg/Tokens/container.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/dapps/tokenreg/Tokens/index.js b/js/src/dapps/tokenreg/Tokens/index.js
index 87fbc567ef..5ad8416618 100644
--- a/js/src/dapps/tokenreg/Tokens/index.js
+++ b/js/src/dapps/tokenreg/Tokens/index.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/dapps/tokenreg/Tokens/reducer.js b/js/src/dapps/tokenreg/Tokens/reducer.js
index 21952105c4..10ca67b95a 100644
--- a/js/src/dapps/tokenreg/Tokens/reducer.js
+++ b/js/src/dapps/tokenreg/Tokens/reducer.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/dapps/tokenreg/Tokens/tokens.js b/js/src/dapps/tokenreg/Tokens/tokens.js
index 48bc88a74b..e31c1675c9 100644
--- a/js/src/dapps/tokenreg/Tokens/tokens.js
+++ b/js/src/dapps/tokenreg/Tokens/tokens.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/i18n/de/index.js b/js/src/i18n/de/index.js
index d8c0f9b4b2..d95ebd48df 100644
--- a/js/src/i18n/de/index.js
+++ b/js/src/i18n/de/index.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/i18n/de/settings.js b/js/src/i18n/de/settings.js
index 9142ff9c7d..76e106fc79 100644
--- a/js/src/i18n/de/settings.js
+++ b/js/src/i18n/de/settings.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/i18n/en/index.js b/js/src/i18n/en/index.js
index d8c0f9b4b2..d95ebd48df 100644
--- a/js/src/i18n/en/index.js
+++ b/js/src/i18n/en/index.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/i18n/en/settings.js b/js/src/i18n/en/settings.js
index a0e7c7f1f6..ddd4aa84bd 100644
--- a/js/src/i18n/en/settings.js
+++ b/js/src/i18n/en/settings.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/i18n/index.js b/js/src/i18n/index.js
index 4ed119c902..8fe1c9d37f 100644
--- a/js/src/i18n/index.js
+++ b/js/src/i18n/index.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/i18n/languages.js b/js/src/i18n/languages.js
index f4950e4013..55e9e8e0fe 100644
--- a/js/src/i18n/languages.js
+++ b/js/src/i18n/languages.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/i18n/store.js b/js/src/i18n/store.js
index f171497e4a..773c596ef2 100644
--- a/js/src/i18n/store.js
+++ b/js/src/i18n/store.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/jsonrpc/interfaces/eth.js b/js/src/jsonrpc/interfaces/eth.js
index d5ff471fbe..3a136ab7ef 100644
--- a/js/src/jsonrpc/interfaces/eth.js
+++ b/js/src/jsonrpc/interfaces/eth.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/jsonrpc/interfaces/parity.js b/js/src/jsonrpc/interfaces/parity.js
index 76886af351..bab9ad6e32 100644
--- a/js/src/jsonrpc/interfaces/parity.js
+++ b/js/src/jsonrpc/interfaces/parity.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/library.etherscan.js b/js/src/library.etherscan.js
index 59cb861d3e..e37ab63587 100644
--- a/js/src/library.etherscan.js
+++ b/js/src/library.etherscan.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/library.parity.js b/js/src/library.parity.js
index 2b526c28eb..d95a64b891 100644
--- a/js/src/library.parity.js
+++ b/js/src/library.parity.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/library.shapeshift.js b/js/src/library.shapeshift.js
index 3f24f216bf..e5b1b407b6 100644
--- a/js/src/library.shapeshift.js
+++ b/js/src/library.shapeshift.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/main.js b/js/src/main.js
index f61e3d5635..52d8b09767 100644
--- a/js/src/main.js
+++ b/js/src/main.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/modals/AddAddress/addAddress.js b/js/src/modals/AddAddress/addAddress.js
index a72158cc71..1772232909 100644
--- a/js/src/modals/AddAddress/addAddress.js
+++ b/js/src/modals/AddAddress/addAddress.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/modals/CreateAccount/AccountDetails/accountDetails.js b/js/src/modals/CreateAccount/AccountDetails/accountDetails.js
index f869e3ec55..2ff143b642 100644
--- a/js/src/modals/CreateAccount/AccountDetails/accountDetails.js
+++ b/js/src/modals/CreateAccount/AccountDetails/accountDetails.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/modals/CreateAccount/AccountDetails/index.js b/js/src/modals/CreateAccount/AccountDetails/index.js
index c1911d8d8e..bebc17eee6 100644
--- a/js/src/modals/CreateAccount/AccountDetails/index.js
+++ b/js/src/modals/CreateAccount/AccountDetails/index.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/modals/CreateAccount/AccountDetailsGeth/accountDetailsGeth.js b/js/src/modals/CreateAccount/AccountDetailsGeth/accountDetailsGeth.js
index d0f4ac2ff5..4d9cde568b 100644
--- a/js/src/modals/CreateAccount/AccountDetailsGeth/accountDetailsGeth.js
+++ b/js/src/modals/CreateAccount/AccountDetailsGeth/accountDetailsGeth.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/modals/CreateAccount/AccountDetailsGeth/index.js b/js/src/modals/CreateAccount/AccountDetailsGeth/index.js
index 97d2ce159d..6e5a20b034 100644
--- a/js/src/modals/CreateAccount/AccountDetailsGeth/index.js
+++ b/js/src/modals/CreateAccount/AccountDetailsGeth/index.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/modals/CreateAccount/CreationType/creationType.js b/js/src/modals/CreateAccount/CreationType/creationType.js
index fe982a2979..3c91c97016 100644
--- a/js/src/modals/CreateAccount/CreationType/creationType.js
+++ b/js/src/modals/CreateAccount/CreationType/creationType.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/modals/CreateAccount/CreationType/index.js b/js/src/modals/CreateAccount/CreationType/index.js
index cd00277c4f..86133172b8 100644
--- a/js/src/modals/CreateAccount/CreationType/index.js
+++ b/js/src/modals/CreateAccount/CreationType/index.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/modals/CreateAccount/NewAccount/index.js b/js/src/modals/CreateAccount/NewAccount/index.js
index f030a32d96..5d2a3e6868 100644
--- a/js/src/modals/CreateAccount/NewAccount/index.js
+++ b/js/src/modals/CreateAccount/NewAccount/index.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/modals/CreateAccount/NewAccount/newAccount.js b/js/src/modals/CreateAccount/NewAccount/newAccount.js
index bbbf6fed31..267ed56bc3 100644
--- a/js/src/modals/CreateAccount/NewAccount/newAccount.js
+++ b/js/src/modals/CreateAccount/NewAccount/newAccount.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/modals/CreateAccount/NewGeth/index.js b/js/src/modals/CreateAccount/NewGeth/index.js
index 5801eb9700..55764c9562 100644
--- a/js/src/modals/CreateAccount/NewGeth/index.js
+++ b/js/src/modals/CreateAccount/NewGeth/index.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/modals/CreateAccount/NewGeth/newGeth.js b/js/src/modals/CreateAccount/NewGeth/newGeth.js
index 2159277c57..2690759833 100644
--- a/js/src/modals/CreateAccount/NewGeth/newGeth.js
+++ b/js/src/modals/CreateAccount/NewGeth/newGeth.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/modals/CreateAccount/NewImport/index.js b/js/src/modals/CreateAccount/NewImport/index.js
index 0b260f4267..ff0eefc623 100644
--- a/js/src/modals/CreateAccount/NewImport/index.js
+++ b/js/src/modals/CreateAccount/NewImport/index.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/modals/CreateAccount/NewImport/newImport.js b/js/src/modals/CreateAccount/NewImport/newImport.js
index e8d0bb8d6a..84ec5b425d 100644
--- a/js/src/modals/CreateAccount/NewImport/newImport.js
+++ b/js/src/modals/CreateAccount/NewImport/newImport.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/modals/CreateAccount/RawKey/index.js b/js/src/modals/CreateAccount/RawKey/index.js
index 6e372f475c..d52b448018 100644
--- a/js/src/modals/CreateAccount/RawKey/index.js
+++ b/js/src/modals/CreateAccount/RawKey/index.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/modals/CreateAccount/RawKey/rawKey.js b/js/src/modals/CreateAccount/RawKey/rawKey.js
index fed028bf9d..c0cb846176 100644
--- a/js/src/modals/CreateAccount/RawKey/rawKey.js
+++ b/js/src/modals/CreateAccount/RawKey/rawKey.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/modals/CreateAccount/RecoveryPhrase/index.js b/js/src/modals/CreateAccount/RecoveryPhrase/index.js
index b88a8580e8..d56f99dd63 100644
--- a/js/src/modals/CreateAccount/RecoveryPhrase/index.js
+++ b/js/src/modals/CreateAccount/RecoveryPhrase/index.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/modals/CreateAccount/RecoveryPhrase/recoveryPhrase.js b/js/src/modals/CreateAccount/RecoveryPhrase/recoveryPhrase.js
index 4088fac530..2736256f19 100644
--- a/js/src/modals/CreateAccount/RecoveryPhrase/recoveryPhrase.js
+++ b/js/src/modals/CreateAccount/RecoveryPhrase/recoveryPhrase.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/modals/CreateAccount/createAccount.js b/js/src/modals/CreateAccount/createAccount.js
index d8413cee79..d7ec8487bd 100644
--- a/js/src/modals/CreateAccount/createAccount.js
+++ b/js/src/modals/CreateAccount/createAccount.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/modals/CreateWallet/WalletDetails/index.js b/js/src/modals/CreateWallet/WalletDetails/index.js
index 2663855118..1170852f2f 100644
--- a/js/src/modals/CreateWallet/WalletDetails/index.js
+++ b/js/src/modals/CreateWallet/WalletDetails/index.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/modals/CreateWallet/WalletDetails/walletDetails.js b/js/src/modals/CreateWallet/WalletDetails/walletDetails.js
index 314425dcf3..867f130cfc 100644
--- a/js/src/modals/CreateWallet/WalletDetails/walletDetails.js
+++ b/js/src/modals/CreateWallet/WalletDetails/walletDetails.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/modals/CreateWallet/WalletInfo/index.js b/js/src/modals/CreateWallet/WalletInfo/index.js
index 975e7bd59c..cc921634fb 100644
--- a/js/src/modals/CreateWallet/WalletInfo/index.js
+++ b/js/src/modals/CreateWallet/WalletInfo/index.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/modals/CreateWallet/WalletInfo/walletInfo.js b/js/src/modals/CreateWallet/WalletInfo/walletInfo.js
index cc5c969648..4f5ef93d52 100644
--- a/js/src/modals/CreateWallet/WalletInfo/walletInfo.js
+++ b/js/src/modals/CreateWallet/WalletInfo/walletInfo.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/modals/CreateWallet/WalletType/index.js b/js/src/modals/CreateWallet/WalletType/index.js
index 525e354950..f9321ab893 100644
--- a/js/src/modals/CreateWallet/WalletType/index.js
+++ b/js/src/modals/CreateWallet/WalletType/index.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/modals/CreateWallet/WalletType/walletType.js b/js/src/modals/CreateWallet/WalletType/walletType.js
index 93dd818f17..4b03f9eb7d 100644
--- a/js/src/modals/CreateWallet/WalletType/walletType.js
+++ b/js/src/modals/CreateWallet/WalletType/walletType.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/modals/DeployContract/DetailsStep/detailsStep.js b/js/src/modals/DeployContract/DetailsStep/detailsStep.js
index 51c5d3cfb2..d2fa869a7a 100644
--- a/js/src/modals/DeployContract/DetailsStep/detailsStep.js
+++ b/js/src/modals/DeployContract/DetailsStep/detailsStep.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/modals/DeployContract/DetailsStep/index.js b/js/src/modals/DeployContract/DetailsStep/index.js
index 5519ee8ea7..d1993c9061 100644
--- a/js/src/modals/DeployContract/DetailsStep/index.js
+++ b/js/src/modals/DeployContract/DetailsStep/index.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/modals/DeployContract/ErrorStep/errorStep.js b/js/src/modals/DeployContract/ErrorStep/errorStep.js
index 3d97ab598d..468d5672ad 100644
--- a/js/src/modals/DeployContract/ErrorStep/errorStep.js
+++ b/js/src/modals/DeployContract/ErrorStep/errorStep.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/modals/DeployContract/ErrorStep/index.js b/js/src/modals/DeployContract/ErrorStep/index.js
index 93379cab9b..5de8b27b1c 100644
--- a/js/src/modals/DeployContract/ErrorStep/index.js
+++ b/js/src/modals/DeployContract/ErrorStep/index.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/modals/DeployContract/ParametersStep/index.js b/js/src/modals/DeployContract/ParametersStep/index.js
index 77545b4065..77989948ef 100644
--- a/js/src/modals/DeployContract/ParametersStep/index.js
+++ b/js/src/modals/DeployContract/ParametersStep/index.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/modals/DeployContract/ParametersStep/parametersStep.js b/js/src/modals/DeployContract/ParametersStep/parametersStep.js
index 4ab5df6936..c4004cdf09 100644
--- a/js/src/modals/DeployContract/ParametersStep/parametersStep.js
+++ b/js/src/modals/DeployContract/ParametersStep/parametersStep.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
@@ -13,7 +13,7 @@
 
 // You should have received a copy of the GNU General Public License
 // along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/modals/DeployContract/deployContract.js b/js/src/modals/DeployContract/deployContract.js
index 21325f7869..aaf5d36aad 100644
--- a/js/src/modals/DeployContract/deployContract.js
+++ b/js/src/modals/DeployContract/deployContract.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/modals/ExecuteContract/DetailsStep/detailsStep.js b/js/src/modals/ExecuteContract/DetailsStep/detailsStep.js
index fde7fa1b27..ae3c92e48f 100644
--- a/js/src/modals/ExecuteContract/DetailsStep/detailsStep.js
+++ b/js/src/modals/ExecuteContract/DetailsStep/detailsStep.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/modals/ExecuteContract/DetailsStep/index.js b/js/src/modals/ExecuteContract/DetailsStep/index.js
index 5519ee8ea7..d1993c9061 100644
--- a/js/src/modals/ExecuteContract/DetailsStep/index.js
+++ b/js/src/modals/ExecuteContract/DetailsStep/index.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/modals/ExecuteContract/executeContract.js b/js/src/modals/ExecuteContract/executeContract.js
index cdd816ee30..afcc826b7f 100644
--- a/js/src/modals/ExecuteContract/executeContract.js
+++ b/js/src/modals/ExecuteContract/executeContract.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/modals/FirstRun/Completed/completed.js b/js/src/modals/FirstRun/Completed/completed.js
index 43724f0341..3e0ca10d56 100644
--- a/js/src/modals/FirstRun/Completed/completed.js
+++ b/js/src/modals/FirstRun/Completed/completed.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/modals/FirstRun/Completed/index.js b/js/src/modals/FirstRun/Completed/index.js
index 3e79033d81..229229cede 100644
--- a/js/src/modals/FirstRun/Completed/index.js
+++ b/js/src/modals/FirstRun/Completed/index.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/modals/FirstRun/TnC/index.js b/js/src/modals/FirstRun/TnC/index.js
index 251bfa6f9f..a26ffecf9d 100644
--- a/js/src/modals/FirstRun/TnC/index.js
+++ b/js/src/modals/FirstRun/TnC/index.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/modals/FirstRun/TnC/tnc.js b/js/src/modals/FirstRun/TnC/tnc.js
index 648ae765a8..96892828b0 100644
--- a/js/src/modals/FirstRun/TnC/tnc.js
+++ b/js/src/modals/FirstRun/TnC/tnc.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/modals/FirstRun/Welcome/index.js b/js/src/modals/FirstRun/Welcome/index.js
index 241e26fc21..f5277ceb01 100644
--- a/js/src/modals/FirstRun/Welcome/index.js
+++ b/js/src/modals/FirstRun/Welcome/index.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/modals/FirstRun/Welcome/welcome.js b/js/src/modals/FirstRun/Welcome/welcome.js
index c3d9215c28..853ad99fe8 100644
--- a/js/src/modals/FirstRun/Welcome/welcome.js
+++ b/js/src/modals/FirstRun/Welcome/welcome.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/modals/PasswordManager/passwordManager.js b/js/src/modals/PasswordManager/passwordManager.js
index 96ff38c600..8121e14d26 100644
--- a/js/src/modals/PasswordManager/passwordManager.js
+++ b/js/src/modals/PasswordManager/passwordManager.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/modals/SMSVerification/Done/done.js b/js/src/modals/SMSVerification/Done/done.js
index f3f6fa515e..b9d277ec23 100644
--- a/js/src/modals/SMSVerification/Done/done.js
+++ b/js/src/modals/SMSVerification/Done/done.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/modals/SMSVerification/Done/index.js b/js/src/modals/SMSVerification/Done/index.js
index 549306dbd2..c1d69e26ec 100644
--- a/js/src/modals/SMSVerification/Done/index.js
+++ b/js/src/modals/SMSVerification/Done/index.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/modals/SMSVerification/GatherData/gatherData.js b/js/src/modals/SMSVerification/GatherData/gatherData.js
index f5f09578ec..289374846f 100644
--- a/js/src/modals/SMSVerification/GatherData/gatherData.js
+++ b/js/src/modals/SMSVerification/GatherData/gatherData.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/modals/SMSVerification/GatherData/index.js b/js/src/modals/SMSVerification/GatherData/index.js
index 1c03d34001..9687a672d7 100644
--- a/js/src/modals/SMSVerification/GatherData/index.js
+++ b/js/src/modals/SMSVerification/GatherData/index.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/modals/SMSVerification/QueryCode/index.js b/js/src/modals/SMSVerification/QueryCode/index.js
index 539c340f06..9645d3db1e 100644
--- a/js/src/modals/SMSVerification/QueryCode/index.js
+++ b/js/src/modals/SMSVerification/QueryCode/index.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/modals/SMSVerification/QueryCode/queryCode.js b/js/src/modals/SMSVerification/QueryCode/queryCode.js
index 03b2283678..bd0cd9d616 100644
--- a/js/src/modals/SMSVerification/QueryCode/queryCode.js
+++ b/js/src/modals/SMSVerification/QueryCode/queryCode.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/modals/SMSVerification/SendConfirmation/index.js b/js/src/modals/SMSVerification/SendConfirmation/index.js
index 498a8572e8..92aa40c61c 100644
--- a/js/src/modals/SMSVerification/SendConfirmation/index.js
+++ b/js/src/modals/SMSVerification/SendConfirmation/index.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/modals/SMSVerification/SendConfirmation/sendConfirmation.js b/js/src/modals/SMSVerification/SendConfirmation/sendConfirmation.js
index a0cc136895..72ffe58285 100644
--- a/js/src/modals/SMSVerification/SendConfirmation/sendConfirmation.js
+++ b/js/src/modals/SMSVerification/SendConfirmation/sendConfirmation.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/modals/SMSVerification/SendRequest/index.js b/js/src/modals/SMSVerification/SendRequest/index.js
index 1a8bfaf732..ab7d00d592 100644
--- a/js/src/modals/SMSVerification/SendRequest/index.js
+++ b/js/src/modals/SMSVerification/SendRequest/index.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/modals/SMSVerification/SendRequest/sendRequest.js b/js/src/modals/SMSVerification/SendRequest/sendRequest.js
index 933de92651..369c4bded9 100644
--- a/js/src/modals/SMSVerification/SendRequest/sendRequest.js
+++ b/js/src/modals/SMSVerification/SendRequest/sendRequest.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/modals/Shapeshift/AwaitingDepositStep/awaitingDepositStep.js b/js/src/modals/Shapeshift/AwaitingDepositStep/awaitingDepositStep.js
index 73d1de300c..8dfd29f331 100644
--- a/js/src/modals/Shapeshift/AwaitingDepositStep/awaitingDepositStep.js
+++ b/js/src/modals/Shapeshift/AwaitingDepositStep/awaitingDepositStep.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/modals/Shapeshift/AwaitingDepositStep/index.js b/js/src/modals/Shapeshift/AwaitingDepositStep/index.js
index e888b6b815..0c9eb1b732 100644
--- a/js/src/modals/Shapeshift/AwaitingDepositStep/index.js
+++ b/js/src/modals/Shapeshift/AwaitingDepositStep/index.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/modals/Shapeshift/AwaitingExchangeStep/awaitingExchangeStep.js b/js/src/modals/Shapeshift/AwaitingExchangeStep/awaitingExchangeStep.js
index 17845526a8..d3e0ce93c8 100644
--- a/js/src/modals/Shapeshift/AwaitingExchangeStep/awaitingExchangeStep.js
+++ b/js/src/modals/Shapeshift/AwaitingExchangeStep/awaitingExchangeStep.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/modals/Shapeshift/AwaitingExchangeStep/index.js b/js/src/modals/Shapeshift/AwaitingExchangeStep/index.js
index 215fea893b..a6daefbc56 100644
--- a/js/src/modals/Shapeshift/AwaitingExchangeStep/index.js
+++ b/js/src/modals/Shapeshift/AwaitingExchangeStep/index.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/modals/Shapeshift/CompletedStep/completedStep.js b/js/src/modals/Shapeshift/CompletedStep/completedStep.js
index d20a2e7b88..2b5a6b162f 100644
--- a/js/src/modals/Shapeshift/CompletedStep/completedStep.js
+++ b/js/src/modals/Shapeshift/CompletedStep/completedStep.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/modals/Shapeshift/CompletedStep/index.js b/js/src/modals/Shapeshift/CompletedStep/index.js
index 64e1d61993..ce90188a93 100644
--- a/js/src/modals/Shapeshift/CompletedStep/index.js
+++ b/js/src/modals/Shapeshift/CompletedStep/index.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/modals/Shapeshift/ErrorStep/errorStep.js b/js/src/modals/Shapeshift/ErrorStep/errorStep.js
index 52be49bbcb..0924943999 100644
--- a/js/src/modals/Shapeshift/ErrorStep/errorStep.js
+++ b/js/src/modals/Shapeshift/ErrorStep/errorStep.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/modals/Shapeshift/ErrorStep/index.js b/js/src/modals/Shapeshift/ErrorStep/index.js
index 93379cab9b..5de8b27b1c 100644
--- a/js/src/modals/Shapeshift/ErrorStep/index.js
+++ b/js/src/modals/Shapeshift/ErrorStep/index.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/modals/Shapeshift/OptionsStep/index.js b/js/src/modals/Shapeshift/OptionsStep/index.js
index 18b819c67e..694b55c668 100644
--- a/js/src/modals/Shapeshift/OptionsStep/index.js
+++ b/js/src/modals/Shapeshift/OptionsStep/index.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/modals/Shapeshift/OptionsStep/optionsStep.js b/js/src/modals/Shapeshift/OptionsStep/optionsStep.js
index fc4dabfc0f..4314d2b5cc 100644
--- a/js/src/modals/Shapeshift/OptionsStep/optionsStep.js
+++ b/js/src/modals/Shapeshift/OptionsStep/optionsStep.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/modals/Shapeshift/Price/index.js b/js/src/modals/Shapeshift/Price/index.js
index 920094acfe..2869dbbc7f 100644
--- a/js/src/modals/Shapeshift/Price/index.js
+++ b/js/src/modals/Shapeshift/Price/index.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/modals/Shapeshift/Price/price.js b/js/src/modals/Shapeshift/Price/price.js
index 557d4fa68c..206587448f 100644
--- a/js/src/modals/Shapeshift/Price/price.js
+++ b/js/src/modals/Shapeshift/Price/price.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/modals/Shapeshift/Value/index.js b/js/src/modals/Shapeshift/Value/index.js
index 588b4c4219..76a2eaacba 100644
--- a/js/src/modals/Shapeshift/Value/index.js
+++ b/js/src/modals/Shapeshift/Value/index.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/modals/Shapeshift/Value/value.js b/js/src/modals/Shapeshift/Value/value.js
index e3c3050fb3..1d2f63daf3 100644
--- a/js/src/modals/Shapeshift/Value/value.js
+++ b/js/src/modals/Shapeshift/Value/value.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/modals/Transfer/Details/details.js b/js/src/modals/Transfer/Details/details.js
index 20ac06f858..d8ddb0b250 100644
--- a/js/src/modals/Transfer/Details/details.js
+++ b/js/src/modals/Transfer/Details/details.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/modals/Transfer/Details/index.js b/js/src/modals/Transfer/Details/index.js
index d0bf396b69..175c989669 100644
--- a/js/src/modals/Transfer/Details/index.js
+++ b/js/src/modals/Transfer/Details/index.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/modals/Transfer/Extras/extras.js b/js/src/modals/Transfer/Extras/extras.js
index def5a22c6e..e60fd122e1 100644
--- a/js/src/modals/Transfer/Extras/extras.js
+++ b/js/src/modals/Transfer/Extras/extras.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/modals/Transfer/Extras/index.js b/js/src/modals/Transfer/Extras/index.js
index 0b4d22a2eb..751466c85a 100644
--- a/js/src/modals/Transfer/Extras/index.js
+++ b/js/src/modals/Transfer/Extras/index.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/modals/Transfer/store.js b/js/src/modals/Transfer/store.js
index 412cac60cc..679e03609c 100644
--- a/js/src/modals/Transfer/store.js
+++ b/js/src/modals/Transfer/store.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/modals/Transfer/transfer.js b/js/src/modals/Transfer/transfer.js
index 1ecc60edf3..19c337e5a8 100644
--- a/js/src/modals/Transfer/transfer.js
+++ b/js/src/modals/Transfer/transfer.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/modals/WalletSettings/walletSettings.js b/js/src/modals/WalletSettings/walletSettings.js
index 1b2b2cc1a9..00b5d3d127 100644
--- a/js/src/modals/WalletSettings/walletSettings.js
+++ b/js/src/modals/WalletSettings/walletSettings.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/redux/providers/balancesActions.js b/js/src/redux/providers/balancesActions.js
index f8cfb2c1e3..36e3fbb7c3 100644
--- a/js/src/redux/providers/balancesActions.js
+++ b/js/src/redux/providers/balancesActions.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/redux/providers/certifications/actions.js b/js/src/redux/providers/certifications/actions.js
index c84f7db553..03bb93fe93 100644
--- a/js/src/redux/providers/certifications/actions.js
+++ b/js/src/redux/providers/certifications/actions.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/redux/providers/certifications/middleware.js b/js/src/redux/providers/certifications/middleware.js
index a5406051fb..500fe39b39 100644
--- a/js/src/redux/providers/certifications/middleware.js
+++ b/js/src/redux/providers/certifications/middleware.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/redux/providers/certifications/reducer.js b/js/src/redux/providers/certifications/reducer.js
index 87b0dfd331..f9195b1dfa 100644
--- a/js/src/redux/providers/certifications/reducer.js
+++ b/js/src/redux/providers/certifications/reducer.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/redux/providers/signerMiddleware.js b/js/src/redux/providers/signerMiddleware.js
index c0c5d7613a..018e01e59a 100644
--- a/js/src/redux/providers/signerMiddleware.js
+++ b/js/src/redux/providers/signerMiddleware.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/redux/providers/walletActions.js b/js/src/redux/providers/walletActions.js
index 4a8a3f82aa..6bae2b3b50 100644
--- a/js/src/redux/providers/walletActions.js
+++ b/js/src/redux/providers/walletActions.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/ui/Actionbar/Export/export.js b/js/src/ui/Actionbar/Export/export.js
index a8cf826ae1..d3cb4bd17a 100644
--- a/js/src/ui/Actionbar/Export/export.js
+++ b/js/src/ui/Actionbar/Export/export.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/ui/Actionbar/Export/index.js b/js/src/ui/Actionbar/Export/index.js
index f4ac7092ed..89cc3d0669 100644
--- a/js/src/ui/Actionbar/Export/index.js
+++ b/js/src/ui/Actionbar/Export/index.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/ui/Actionbar/Import/import.js b/js/src/ui/Actionbar/Import/import.js
index 091153c958..fcf51a53ea 100644
--- a/js/src/ui/Actionbar/Import/import.js
+++ b/js/src/ui/Actionbar/Import/import.js
@@ -1,4 +1,4 @@
-  // Copyright 2015, 2016 Ethcore (UK) Ltd.
+  // Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/ui/Actionbar/Import/index.js b/js/src/ui/Actionbar/Import/index.js
index d2f352cf3d..f6a1b16e19 100644
--- a/js/src/ui/Actionbar/Import/index.js
+++ b/js/src/ui/Actionbar/Import/index.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/ui/Actionbar/Search/index.js b/js/src/ui/Actionbar/Search/index.js
index f51d38a6fa..f06425e4f4 100644
--- a/js/src/ui/Actionbar/Search/index.js
+++ b/js/src/ui/Actionbar/Search/index.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/ui/Actionbar/Search/search.js b/js/src/ui/Actionbar/Search/search.js
index 9385cb593a..30d8117bd9 100644
--- a/js/src/ui/Actionbar/Search/search.js
+++ b/js/src/ui/Actionbar/Search/search.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/ui/Actionbar/Sort/index.js b/js/src/ui/Actionbar/Sort/index.js
index 82855931c7..a4a02e01d9 100644
--- a/js/src/ui/Actionbar/Sort/index.js
+++ b/js/src/ui/Actionbar/Sort/index.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/ui/Actionbar/Sort/sort.js b/js/src/ui/Actionbar/Sort/sort.js
index 545775eadb..eb0c672fb1 100644
--- a/js/src/ui/Actionbar/Sort/sort.js
+++ b/js/src/ui/Actionbar/Sort/sort.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/ui/Actionbar/Sort/sortStore.js b/js/src/ui/Actionbar/Sort/sortStore.js
index 2bcbd3753c..84084c4b72 100644
--- a/js/src/ui/Actionbar/Sort/sortStore.js
+++ b/js/src/ui/Actionbar/Sort/sortStore.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/ui/Container/Title/index.js b/js/src/ui/Container/Title/index.js
index 8ddd686835..35486c1cb2 100644
--- a/js/src/ui/Container/Title/index.js
+++ b/js/src/ui/Container/Title/index.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/ui/Container/Title/title.js b/js/src/ui/Container/Title/title.js
index 1506ecaf60..de25b818cd 100644
--- a/js/src/ui/Container/Title/title.js
+++ b/js/src/ui/Container/Title/title.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/ui/Container/Title/title.spec.js b/js/src/ui/Container/Title/title.spec.js
index a65e221a66..2d5335c145 100644
--- a/js/src/ui/Container/Title/title.spec.js
+++ b/js/src/ui/Container/Title/title.spec.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/ui/ContextProvider/contextProvider.js b/js/src/ui/ContextProvider/contextProvider.js
index 543730c403..c38bda143d 100644
--- a/js/src/ui/ContextProvider/contextProvider.js
+++ b/js/src/ui/ContextProvider/contextProvider.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/ui/Editor/mode-solidity.js b/js/src/ui/Editor/mode-solidity.js
index 0d1b95c670..5a74ecb112 100644
--- a/js/src/ui/Editor/mode-solidity.js
+++ b/js/src/ui/Editor/mode-solidity.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/ui/Form/AddressSelect/addressSelect.js b/js/src/ui/Form/AddressSelect/addressSelect.js
index 0cd92c5c8b..3fb15cd863 100644
--- a/js/src/ui/Form/AddressSelect/addressSelect.js
+++ b/js/src/ui/Form/AddressSelect/addressSelect.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/ui/Form/AddressSelect/index.js b/js/src/ui/Form/AddressSelect/index.js
index 58059cd2e1..3caaa526d7 100644
--- a/js/src/ui/Form/AddressSelect/index.js
+++ b/js/src/ui/Form/AddressSelect/index.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/ui/Form/AutoComplete/autocomplete.js b/js/src/ui/Form/AutoComplete/autocomplete.js
index d11ae7cc52..c98019009f 100644
--- a/js/src/ui/Form/AutoComplete/autocomplete.js
+++ b/js/src/ui/Form/AutoComplete/autocomplete.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/ui/Form/AutoComplete/index.js b/js/src/ui/Form/AutoComplete/index.js
index 509a99444f..3e3e0afb2e 100644
--- a/js/src/ui/Form/AutoComplete/index.js
+++ b/js/src/ui/Form/AutoComplete/index.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/ui/Form/FormWrap/formWrap.js b/js/src/ui/Form/FormWrap/formWrap.js
index ba3f0a9573..9982a8ed7a 100644
--- a/js/src/ui/Form/FormWrap/formWrap.js
+++ b/js/src/ui/Form/FormWrap/formWrap.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/ui/Form/FormWrap/index.js b/js/src/ui/Form/FormWrap/index.js
index 97c1b0181d..a73e22f3d0 100644
--- a/js/src/ui/Form/FormWrap/index.js
+++ b/js/src/ui/Form/FormWrap/index.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/ui/Form/Input/index.js b/js/src/ui/Form/Input/index.js
index 3d9d9293e5..4a4d166742 100644
--- a/js/src/ui/Form/Input/index.js
+++ b/js/src/ui/Form/Input/index.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/ui/Form/Input/input.js b/js/src/ui/Form/Input/input.js
index f25ce207cd..b11400d049 100644
--- a/js/src/ui/Form/Input/input.js
+++ b/js/src/ui/Form/Input/input.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/ui/Form/InputAddress/index.js b/js/src/ui/Form/InputAddress/index.js
index b0bb94c948..64d6cd7224 100644
--- a/js/src/ui/Form/InputAddress/index.js
+++ b/js/src/ui/Form/InputAddress/index.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/ui/Form/InputAddress/inputAddress.js b/js/src/ui/Form/InputAddress/inputAddress.js
index f403cf3114..1f062382ae 100644
--- a/js/src/ui/Form/InputAddress/inputAddress.js
+++ b/js/src/ui/Form/InputAddress/inputAddress.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/ui/Form/InputAddressSelect/index.js b/js/src/ui/Form/InputAddressSelect/index.js
index 19493b1cea..4eda78ce57 100644
--- a/js/src/ui/Form/InputAddressSelect/index.js
+++ b/js/src/ui/Form/InputAddressSelect/index.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/ui/Form/InputAddressSelect/inputAddressSelect.js b/js/src/ui/Form/InputAddressSelect/inputAddressSelect.js
index b7bfbf3758..59fb814587 100644
--- a/js/src/ui/Form/InputAddressSelect/inputAddressSelect.js
+++ b/js/src/ui/Form/InputAddressSelect/inputAddressSelect.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/ui/Form/InputChip/index.js b/js/src/ui/Form/InputChip/index.js
index 74bf603fe2..fe91770398 100644
--- a/js/src/ui/Form/InputChip/index.js
+++ b/js/src/ui/Form/InputChip/index.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/ui/Form/InputChip/inputChip.js b/js/src/ui/Form/InputChip/inputChip.js
index 1b06c01d7e..09a00778ac 100644
--- a/js/src/ui/Form/InputChip/inputChip.js
+++ b/js/src/ui/Form/InputChip/inputChip.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/ui/Form/InputInline/index.js b/js/src/ui/Form/InputInline/index.js
index e2a1886beb..44e2c7563c 100644
--- a/js/src/ui/Form/InputInline/index.js
+++ b/js/src/ui/Form/InputInline/index.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/ui/Form/InputInline/inputInline.js b/js/src/ui/Form/InputInline/inputInline.js
index 92a54e2a38..02b93a90fd 100644
--- a/js/src/ui/Form/InputInline/inputInline.js
+++ b/js/src/ui/Form/InputInline/inputInline.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/ui/Form/RadioButtons/index.js b/js/src/ui/Form/RadioButtons/index.js
index c708eb7285..44097481be 100644
--- a/js/src/ui/Form/RadioButtons/index.js
+++ b/js/src/ui/Form/RadioButtons/index.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/ui/Form/RadioButtons/radioButtons.js b/js/src/ui/Form/RadioButtons/radioButtons.js
index b417857e0c..d9489c6aa7 100644
--- a/js/src/ui/Form/RadioButtons/radioButtons.js
+++ b/js/src/ui/Form/RadioButtons/radioButtons.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/ui/Form/Select/index.js b/js/src/ui/Form/Select/index.js
index 471dad14af..fb1c1e4c0c 100644
--- a/js/src/ui/Form/Select/index.js
+++ b/js/src/ui/Form/Select/index.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/ui/Form/Select/select.js b/js/src/ui/Form/Select/select.js
index b966f483c0..c6dae8b613 100644
--- a/js/src/ui/Form/Select/select.js
+++ b/js/src/ui/Form/Select/select.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/ui/Form/TypedInput/index.js b/js/src/ui/Form/TypedInput/index.js
index 9c12bf7eba..8b73aa1b65 100644
--- a/js/src/ui/Form/TypedInput/index.js
+++ b/js/src/ui/Form/TypedInput/index.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/ui/Form/TypedInput/typedInput.js b/js/src/ui/Form/TypedInput/typedInput.js
index a540329994..6383e62bc9 100644
--- a/js/src/ui/Form/TypedInput/typedInput.js
+++ b/js/src/ui/Form/TypedInput/typedInput.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/ui/GasPriceEditor/gasPriceEditor.js b/js/src/ui/GasPriceEditor/gasPriceEditor.js
index 423afc45b2..e98707410d 100644
--- a/js/src/ui/GasPriceEditor/gasPriceEditor.js
+++ b/js/src/ui/GasPriceEditor/gasPriceEditor.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/ui/GasPriceEditor/gasPriceEditor.spec.js b/js/src/ui/GasPriceEditor/gasPriceEditor.spec.js
index 4197bc876a..336ec5c7ec 100644
--- a/js/src/ui/GasPriceEditor/gasPriceEditor.spec.js
+++ b/js/src/ui/GasPriceEditor/gasPriceEditor.spec.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/ui/GasPriceEditor/store.js b/js/src/ui/GasPriceEditor/store.js
index 4fc16b83c6..22867fdd09 100644
--- a/js/src/ui/GasPriceEditor/store.js
+++ b/js/src/ui/GasPriceEditor/store.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/ui/GasPriceEditor/store.spec.js b/js/src/ui/GasPriceEditor/store.spec.js
index bbee1b8c47..889eee4db3 100644
--- a/js/src/ui/GasPriceEditor/store.spec.js
+++ b/js/src/ui/GasPriceEditor/store.spec.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/ui/GasPriceSelector/CustomBar/customBar.js b/js/src/ui/GasPriceSelector/CustomBar/customBar.js
index 60f066f977..2d53ee8744 100644
--- a/js/src/ui/GasPriceSelector/CustomBar/customBar.js
+++ b/js/src/ui/GasPriceSelector/CustomBar/customBar.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/ui/GasPriceSelector/CustomBar/index.js b/js/src/ui/GasPriceSelector/CustomBar/index.js
index fa4008e42e..ccf57e5c62 100644
--- a/js/src/ui/GasPriceSelector/CustomBar/index.js
+++ b/js/src/ui/GasPriceSelector/CustomBar/index.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/ui/GasPriceSelector/CustomCursor/customCursor.js b/js/src/ui/GasPriceSelector/CustomCursor/customCursor.js
index 8ce9a0e420..48f22f38ab 100644
--- a/js/src/ui/GasPriceSelector/CustomCursor/customCursor.js
+++ b/js/src/ui/GasPriceSelector/CustomCursor/customCursor.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/ui/GasPriceSelector/CustomCursor/index.js b/js/src/ui/GasPriceSelector/CustomCursor/index.js
index 8129d97f03..3c435fe37c 100644
--- a/js/src/ui/GasPriceSelector/CustomCursor/index.js
+++ b/js/src/ui/GasPriceSelector/CustomCursor/index.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/ui/GasPriceSelector/CustomShape/customShape.js b/js/src/ui/GasPriceSelector/CustomShape/customShape.js
index 1c721ab35e..2d62e6cd9c 100644
--- a/js/src/ui/GasPriceSelector/CustomShape/customShape.js
+++ b/js/src/ui/GasPriceSelector/CustomShape/customShape.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/ui/GasPriceSelector/CustomShape/index.js b/js/src/ui/GasPriceSelector/CustomShape/index.js
index 663c6b91bf..fc1ed7a32b 100644
--- a/js/src/ui/GasPriceSelector/CustomShape/index.js
+++ b/js/src/ui/GasPriceSelector/CustomShape/index.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/ui/GasPriceSelector/CustomTooltip/customTooltip.js b/js/src/ui/GasPriceSelector/CustomTooltip/customTooltip.js
index 4fd165cb03..db0e216d38 100644
--- a/js/src/ui/GasPriceSelector/CustomTooltip/customTooltip.js
+++ b/js/src/ui/GasPriceSelector/CustomTooltip/customTooltip.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/ui/GasPriceSelector/CustomTooltip/index.js b/js/src/ui/GasPriceSelector/CustomTooltip/index.js
index a16f9d2f96..567f6765fb 100644
--- a/js/src/ui/GasPriceSelector/CustomTooltip/index.js
+++ b/js/src/ui/GasPriceSelector/CustomTooltip/index.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/ui/GasPriceSelector/gasPriceSelector.js b/js/src/ui/GasPriceSelector/gasPriceSelector.js
index e37dc8b390..c7173ed331 100644
--- a/js/src/ui/GasPriceSelector/gasPriceSelector.js
+++ b/js/src/ui/GasPriceSelector/gasPriceSelector.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/ui/GasPriceSelector/index.js b/js/src/ui/GasPriceSelector/index.js
index 9580758671..ab77734472 100644
--- a/js/src/ui/GasPriceSelector/index.js
+++ b/js/src/ui/GasPriceSelector/index.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/ui/GasPriceSelector/util.js b/js/src/ui/GasPriceSelector/util.js
index 63c3e89b02..a3d2233c1b 100644
--- a/js/src/ui/GasPriceSelector/util.js
+++ b/js/src/ui/GasPriceSelector/util.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/ui/LanguageSelector/index.js b/js/src/ui/LanguageSelector/index.js
index 772167d14f..4f541eb265 100644
--- a/js/src/ui/LanguageSelector/index.js
+++ b/js/src/ui/LanguageSelector/index.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/ui/LanguageSelector/languageSelector.js b/js/src/ui/LanguageSelector/languageSelector.js
index db89495103..f1c018f8ed 100644
--- a/js/src/ui/LanguageSelector/languageSelector.js
+++ b/js/src/ui/LanguageSelector/languageSelector.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/ui/MethodDecoding/methodDecoding.js b/js/src/ui/MethodDecoding/methodDecoding.js
index efb22b67b5..e02355ffb5 100644
--- a/js/src/ui/MethodDecoding/methodDecoding.js
+++ b/js/src/ui/MethodDecoding/methodDecoding.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/ui/Modal/Busy/busy.js b/js/src/ui/Modal/Busy/busy.js
index 6898d3e1fa..5bbf8b010f 100644
--- a/js/src/ui/Modal/Busy/busy.js
+++ b/js/src/ui/Modal/Busy/busy.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/ui/Modal/Busy/index.js b/js/src/ui/Modal/Busy/index.js
index 27c097eeae..40a618b3bb 100644
--- a/js/src/ui/Modal/Busy/index.js
+++ b/js/src/ui/Modal/Busy/index.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/ui/Modal/Completed/completed.js b/js/src/ui/Modal/Completed/completed.js
index de61956213..09352d4351 100644
--- a/js/src/ui/Modal/Completed/completed.js
+++ b/js/src/ui/Modal/Completed/completed.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/ui/Modal/Completed/index.js b/js/src/ui/Modal/Completed/index.js
index 3e79033d81..229229cede 100644
--- a/js/src/ui/Modal/Completed/index.js
+++ b/js/src/ui/Modal/Completed/index.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/ui/Modal/Title/index.js b/js/src/ui/Modal/Title/index.js
index 8ddd686835..35486c1cb2 100644
--- a/js/src/ui/Modal/Title/index.js
+++ b/js/src/ui/Modal/Title/index.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/ui/Modal/Title/title.js b/js/src/ui/Modal/Title/title.js
index b483af061e..14308ee0b4 100644
--- a/js/src/ui/Modal/Title/title.js
+++ b/js/src/ui/Modal/Title/title.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/ui/Tooltips/Tooltip/index.js b/js/src/ui/Tooltips/Tooltip/index.js
index f24757da21..e0a7d3000c 100644
--- a/js/src/ui/Tooltips/Tooltip/index.js
+++ b/js/src/ui/Tooltips/Tooltip/index.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/ui/Tooltips/Tooltip/tooltip.js b/js/src/ui/Tooltips/Tooltip/tooltip.js
index a36d124f3c..b7431050a1 100644
--- a/js/src/ui/Tooltips/Tooltip/tooltip.js
+++ b/js/src/ui/Tooltips/Tooltip/tooltip.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/ui/TxList/TxRow/index.js b/js/src/ui/TxList/TxRow/index.js
index 90243cd5f9..f3c75ac7e9 100644
--- a/js/src/ui/TxList/TxRow/index.js
+++ b/js/src/ui/TxList/TxRow/index.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/ui/TxList/TxRow/txRow.js b/js/src/ui/TxList/TxRow/txRow.js
index 98e948a388..35a386df06 100644
--- a/js/src/ui/TxList/TxRow/txRow.js
+++ b/js/src/ui/TxList/TxRow/txRow.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/ui/TxList/TxRow/txRow.spec.js b/js/src/ui/TxList/TxRow/txRow.spec.js
index 64baa2fe7e..ddee9024ca 100644
--- a/js/src/ui/TxList/TxRow/txRow.spec.js
+++ b/js/src/ui/TxList/TxRow/txRow.spec.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/ui/index.js b/js/src/ui/index.js
index 6366854101..e1ebb16a6c 100644
--- a/js/src/ui/index.js
+++ b/js/src/ui/index.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/views/Account/Header/header.js b/js/src/views/Account/Header/header.js
index 7df87bd9c4..b2e0a9c287 100644
--- a/js/src/views/Account/Header/header.js
+++ b/js/src/views/Account/Header/header.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/views/Account/Header/index.js b/js/src/views/Account/Header/index.js
index 4a51219067..ba1f0b63c9 100644
--- a/js/src/views/Account/Header/index.js
+++ b/js/src/views/Account/Header/index.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/views/Account/Transactions/index.js b/js/src/views/Account/Transactions/index.js
index f74dcd5e8b..61c6a8aad1 100644
--- a/js/src/views/Account/Transactions/index.js
+++ b/js/src/views/Account/Transactions/index.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/views/Account/Transactions/transactions.js b/js/src/views/Account/Transactions/transactions.js
index 2e98208b6c..b8b28208f5 100644
--- a/js/src/views/Account/Transactions/transactions.js
+++ b/js/src/views/Account/Transactions/transactions.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/views/Account/account.js b/js/src/views/Account/account.js
index 840de05b90..9e4c561661 100644
--- a/js/src/views/Account/account.js
+++ b/js/src/views/Account/account.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/views/Accounts/List/index.js b/js/src/views/Accounts/List/index.js
index 11950acfa4..5ec2cb3228 100644
--- a/js/src/views/Accounts/List/index.js
+++ b/js/src/views/Accounts/List/index.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/views/Accounts/List/list.js b/js/src/views/Accounts/List/list.js
index 4d54b640f6..f08c9fdb02 100644
--- a/js/src/views/Accounts/List/list.js
+++ b/js/src/views/Accounts/List/list.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/views/Accounts/Summary/index.js b/js/src/views/Accounts/Summary/index.js
index 7cc23b215d..980ecff9a8 100644
--- a/js/src/views/Accounts/Summary/index.js
+++ b/js/src/views/Accounts/Summary/index.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/views/Accounts/Summary/summary.js b/js/src/views/Accounts/Summary/summary.js
index a19b9a9de7..98d4642fd6 100644
--- a/js/src/views/Accounts/Summary/summary.js
+++ b/js/src/views/Accounts/Summary/summary.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/views/Accounts/accounts.js b/js/src/views/Accounts/accounts.js
index a844ae9899..70b6f770a4 100644
--- a/js/src/views/Accounts/accounts.js
+++ b/js/src/views/Accounts/accounts.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/views/Address/Delete/delete.js b/js/src/views/Address/Delete/delete.js
index 2d19f21413..beaf42867c 100644
--- a/js/src/views/Address/Delete/delete.js
+++ b/js/src/views/Address/Delete/delete.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/views/Address/Delete/index.js b/js/src/views/Address/Delete/index.js
index 8d2a51500c..9ce1b6a1da 100644
--- a/js/src/views/Address/Delete/index.js
+++ b/js/src/views/Address/Delete/index.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/views/Address/address.js b/js/src/views/Address/address.js
index 9c39203baf..8798e82623 100644
--- a/js/src/views/Address/address.js
+++ b/js/src/views/Address/address.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/views/Addresses/addresses.js b/js/src/views/Addresses/addresses.js
index 609f029c75..faa6a1a327 100644
--- a/js/src/views/Addresses/addresses.js
+++ b/js/src/views/Addresses/addresses.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/views/Application/Container/container.js b/js/src/views/Application/Container/container.js
index 592e5a3400..c5cd529a50 100644
--- a/js/src/views/Application/Container/container.js
+++ b/js/src/views/Application/Container/container.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/views/Application/Container/index.js b/js/src/views/Application/Container/index.js
index 87fbc567ef..5ad8416618 100644
--- a/js/src/views/Application/Container/index.js
+++ b/js/src/views/Application/Container/index.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/views/Application/DappContainer/dappContainer.js b/js/src/views/Application/DappContainer/dappContainer.js
index 13ecde190b..8c5baa6848 100644
--- a/js/src/views/Application/DappContainer/dappContainer.js
+++ b/js/src/views/Application/DappContainer/dappContainer.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/views/Application/DappContainer/index.js b/js/src/views/Application/DappContainer/index.js
index 21837d4b1a..ec666b8157 100644
--- a/js/src/views/Application/DappContainer/index.js
+++ b/js/src/views/Application/DappContainer/index.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/views/Application/FrameError/frameError.js b/js/src/views/Application/FrameError/frameError.js
index 35d2493b0f..fed9b4df0c 100644
--- a/js/src/views/Application/FrameError/frameError.js
+++ b/js/src/views/Application/FrameError/frameError.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/views/Application/FrameError/index.js b/js/src/views/Application/FrameError/index.js
index e4358d46d4..9ee2947e00 100644
--- a/js/src/views/Application/FrameError/index.js
+++ b/js/src/views/Application/FrameError/index.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/views/Application/Snackbar/index.js b/js/src/views/Application/Snackbar/index.js
index 0da39f2369..35c7df9973 100644
--- a/js/src/views/Application/Snackbar/index.js
+++ b/js/src/views/Application/Snackbar/index.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/views/Application/Snackbar/snackbar.js b/js/src/views/Application/Snackbar/snackbar.js
index f7232069a4..5f105db140 100644
--- a/js/src/views/Application/Snackbar/snackbar.js
+++ b/js/src/views/Application/Snackbar/snackbar.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/views/Application/Status/index.js b/js/src/views/Application/Status/index.js
index 44079b2248..f966050e93 100644
--- a/js/src/views/Application/Status/index.js
+++ b/js/src/views/Application/Status/index.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/views/Application/Status/status.js b/js/src/views/Application/Status/status.js
index bb48ce6f80..8d77248388 100644
--- a/js/src/views/Application/Status/status.js
+++ b/js/src/views/Application/Status/status.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/views/Application/TabBar/index.js b/js/src/views/Application/TabBar/index.js
index d1a5eacbe5..5af9fe77c3 100644
--- a/js/src/views/Application/TabBar/index.js
+++ b/js/src/views/Application/TabBar/index.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/views/Application/TabBar/tabBar.js b/js/src/views/Application/TabBar/tabBar.js
index ad2bfb7790..81be1d294e 100644
--- a/js/src/views/Application/TabBar/tabBar.js
+++ b/js/src/views/Application/TabBar/tabBar.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/views/Application/application.js b/js/src/views/Application/application.js
index d954849701..c536f10dfe 100644
--- a/js/src/views/Application/application.js
+++ b/js/src/views/Application/application.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/views/Contract/Events/Event/event.js b/js/src/views/Contract/Events/Event/event.js
index 1ed114d07d..f5ca349108 100644
--- a/js/src/views/Contract/Events/Event/event.js
+++ b/js/src/views/Contract/Events/Event/event.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/views/Contract/Events/Event/index.js b/js/src/views/Contract/Events/Event/index.js
index 0925882d3e..a6d44701a7 100644
--- a/js/src/views/Contract/Events/Event/index.js
+++ b/js/src/views/Contract/Events/Event/index.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/views/Contract/Events/events.js b/js/src/views/Contract/Events/events.js
index c29e624bff..dba05dfd9f 100644
--- a/js/src/views/Contract/Events/events.js
+++ b/js/src/views/Contract/Events/events.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/views/Contract/Events/index.js b/js/src/views/Contract/Events/index.js
index 88ad6d407c..d2c722d816 100644
--- a/js/src/views/Contract/Events/index.js
+++ b/js/src/views/Contract/Events/index.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/views/Contract/Queries/index.js b/js/src/views/Contract/Queries/index.js
index 7a0dd9290e..65e731587f 100644
--- a/js/src/views/Contract/Queries/index.js
+++ b/js/src/views/Contract/Queries/index.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/views/Contract/Queries/inputQuery.js b/js/src/views/Contract/Queries/inputQuery.js
index 4ebdc62dbf..9d3cf279d4 100644
--- a/js/src/views/Contract/Queries/inputQuery.js
+++ b/js/src/views/Contract/Queries/inputQuery.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/views/Contract/Queries/queries.js b/js/src/views/Contract/Queries/queries.js
index 1bfd2fa5f2..fff7adb6bb 100644
--- a/js/src/views/Contract/Queries/queries.js
+++ b/js/src/views/Contract/Queries/queries.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/views/Contract/contract.js b/js/src/views/Contract/contract.js
index e501e4fe50..38447911fd 100644
--- a/js/src/views/Contract/contract.js
+++ b/js/src/views/Contract/contract.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/views/Contracts/Summary/index.js b/js/src/views/Contracts/Summary/index.js
index 7cc23b215d..980ecff9a8 100644
--- a/js/src/views/Contracts/Summary/index.js
+++ b/js/src/views/Contracts/Summary/index.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/views/Contracts/Summary/summary.js b/js/src/views/Contracts/Summary/summary.js
index 5b34a6b51a..36e88f0393 100644
--- a/js/src/views/Contracts/Summary/summary.js
+++ b/js/src/views/Contracts/Summary/summary.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/views/Contracts/contracts.js b/js/src/views/Contracts/contracts.js
index 1e15c3947a..cc292275ac 100644
--- a/js/src/views/Contracts/contracts.js
+++ b/js/src/views/Contracts/contracts.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/views/Dapps/AddDapps/AddDapps.js b/js/src/views/Dapps/AddDapps/AddDapps.js
index d3876998af..cc2b605528 100644
--- a/js/src/views/Dapps/AddDapps/AddDapps.js
+++ b/js/src/views/Dapps/AddDapps/AddDapps.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/views/Dapps/AddDapps/index.js b/js/src/views/Dapps/AddDapps/index.js
index 6014c73152..209e1e54c2 100644
--- a/js/src/views/Dapps/AddDapps/index.js
+++ b/js/src/views/Dapps/AddDapps/index.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/views/Dapps/Summary/index.js b/js/src/views/Dapps/Summary/index.js
index 7cc23b215d..980ecff9a8 100644
--- a/js/src/views/Dapps/Summary/index.js
+++ b/js/src/views/Dapps/Summary/index.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/views/Dapps/Summary/summary.js b/js/src/views/Dapps/Summary/summary.js
index 76045ff701..154ce15b17 100644
--- a/js/src/views/Dapps/Summary/summary.js
+++ b/js/src/views/Dapps/Summary/summary.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/views/Dapps/dapps.js b/js/src/views/Dapps/dapps.js
index 160bb44b03..07bdcd7583 100644
--- a/js/src/views/Dapps/dapps.js
+++ b/js/src/views/Dapps/dapps.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/views/Settings/Background/background.js b/js/src/views/Settings/Background/background.js
index add58d820a..ada8f4e602 100644
--- a/js/src/views/Settings/Background/background.js
+++ b/js/src/views/Settings/Background/background.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/views/Settings/Background/index.js b/js/src/views/Settings/Background/index.js
index ffd3111f74..5211138b78 100644
--- a/js/src/views/Settings/Background/index.js
+++ b/js/src/views/Settings/Background/index.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/views/Settings/Parity/index.js b/js/src/views/Settings/Parity/index.js
index 38f08f7255..c76208e927 100644
--- a/js/src/views/Settings/Parity/index.js
+++ b/js/src/views/Settings/Parity/index.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/views/Settings/Parity/parity.js b/js/src/views/Settings/Parity/parity.js
index 29fab8bfbf..978ef296f3 100644
--- a/js/src/views/Settings/Parity/parity.js
+++ b/js/src/views/Settings/Parity/parity.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/views/Settings/Proxy/index.js b/js/src/views/Settings/Proxy/index.js
index 5d65ef1537..94aae9c577 100644
--- a/js/src/views/Settings/Proxy/index.js
+++ b/js/src/views/Settings/Proxy/index.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/views/Settings/Proxy/proxy.js b/js/src/views/Settings/Proxy/proxy.js
index 45aece13bd..dba95d4580 100644
--- a/js/src/views/Settings/Proxy/proxy.js
+++ b/js/src/views/Settings/Proxy/proxy.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/views/Settings/Views/defaults.js b/js/src/views/Settings/Views/defaults.js
index 9c7971ce51..bdd6ae29c5 100644
--- a/js/src/views/Settings/Views/defaults.js
+++ b/js/src/views/Settings/Views/defaults.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/views/Settings/Views/index.js b/js/src/views/Settings/Views/index.js
index cc189d4cac..e4ba26c56a 100644
--- a/js/src/views/Settings/Views/index.js
+++ b/js/src/views/Settings/Views/index.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/views/Settings/Views/views.js b/js/src/views/Settings/Views/views.js
index 1252396877..85b8118760 100644
--- a/js/src/views/Settings/Views/views.js
+++ b/js/src/views/Settings/Views/views.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/views/Settings/settings.js b/js/src/views/Settings/settings.js
index 90bec3c62b..dbf0043e45 100644
--- a/js/src/views/Settings/settings.js
+++ b/js/src/views/Settings/settings.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/views/Signer/components/Account/AccountLink/accountLink.js b/js/src/views/Signer/components/Account/AccountLink/accountLink.js
index 4a5578acfa..c4bc362c11 100644
--- a/js/src/views/Signer/components/Account/AccountLink/accountLink.js
+++ b/js/src/views/Signer/components/Account/AccountLink/accountLink.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/views/Signer/components/Account/AccountLink/index.js b/js/src/views/Signer/components/Account/AccountLink/index.js
index 6c50400f56..7828ec9291 100644
--- a/js/src/views/Signer/components/Account/AccountLink/index.js
+++ b/js/src/views/Signer/components/Account/AccountLink/index.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/views/Signer/components/Account/account.js b/js/src/views/Signer/components/Account/account.js
index 79fe04d552..dbe950b750 100644
--- a/js/src/views/Signer/components/Account/account.js
+++ b/js/src/views/Signer/components/Account/account.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/views/Signer/components/Account/index.js b/js/src/views/Signer/components/Account/index.js
index 55c215f7c9..75c7cc4014 100644
--- a/js/src/views/Signer/components/Account/index.js
+++ b/js/src/views/Signer/components/Account/index.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/views/Signer/components/RequestPending/index.js b/js/src/views/Signer/components/RequestPending/index.js
index d4b048781d..a7830885bd 100644
--- a/js/src/views/Signer/components/RequestPending/index.js
+++ b/js/src/views/Signer/components/RequestPending/index.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/views/Signer/components/RequestPending/requestPending.js b/js/src/views/Signer/components/RequestPending/requestPending.js
index 67195888a1..84783a6141 100644
--- a/js/src/views/Signer/components/RequestPending/requestPending.js
+++ b/js/src/views/Signer/components/RequestPending/requestPending.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/views/Signer/components/SignRequest/index.js b/js/src/views/Signer/components/SignRequest/index.js
index 0fe59540e2..8485f61096 100644
--- a/js/src/views/Signer/components/SignRequest/index.js
+++ b/js/src/views/Signer/components/SignRequest/index.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/views/Signer/components/SignRequest/signRequest.js b/js/src/views/Signer/components/SignRequest/signRequest.js
index 91acddc345..783e5b9f64 100644
--- a/js/src/views/Signer/components/SignRequest/signRequest.js
+++ b/js/src/views/Signer/components/SignRequest/signRequest.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/views/Signer/components/SignRequest/signRequest.spec.js b/js/src/views/Signer/components/SignRequest/signRequest.spec.js
index 53099bb9c7..f7d761e58e 100644
--- a/js/src/views/Signer/components/SignRequest/signRequest.spec.js
+++ b/js/src/views/Signer/components/SignRequest/signRequest.spec.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/views/Signer/components/TransactionMainDetails/index.js b/js/src/views/Signer/components/TransactionMainDetails/index.js
index 73420d3339..2c4ec0e77a 100644
--- a/js/src/views/Signer/components/TransactionMainDetails/index.js
+++ b/js/src/views/Signer/components/TransactionMainDetails/index.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/views/Signer/components/TransactionMainDetails/transactionMainDetails.js b/js/src/views/Signer/components/TransactionMainDetails/transactionMainDetails.js
index 1999cfe7f4..319c5ae982 100644
--- a/js/src/views/Signer/components/TransactionMainDetails/transactionMainDetails.js
+++ b/js/src/views/Signer/components/TransactionMainDetails/transactionMainDetails.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/views/Signer/components/TransactionPending/index.js b/js/src/views/Signer/components/TransactionPending/index.js
index 3581c448c0..3524dffb4e 100644
--- a/js/src/views/Signer/components/TransactionPending/index.js
+++ b/js/src/views/Signer/components/TransactionPending/index.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/views/Signer/components/TransactionPending/transactionPending.js b/js/src/views/Signer/components/TransactionPending/transactionPending.js
index eea9491eed..dc07de99ab 100644
--- a/js/src/views/Signer/components/TransactionPending/transactionPending.js
+++ b/js/src/views/Signer/components/TransactionPending/transactionPending.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/views/Signer/components/TransactionPendingForm/TransactionPendingFormConfirm/index.js b/js/src/views/Signer/components/TransactionPendingForm/TransactionPendingFormConfirm/index.js
index 254fb5971c..733e1ebc0f 100644
--- a/js/src/views/Signer/components/TransactionPendingForm/TransactionPendingFormConfirm/index.js
+++ b/js/src/views/Signer/components/TransactionPendingForm/TransactionPendingFormConfirm/index.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/views/Signer/components/TransactionPendingForm/TransactionPendingFormConfirm/transactionPendingFormConfirm.js b/js/src/views/Signer/components/TransactionPendingForm/TransactionPendingFormConfirm/transactionPendingFormConfirm.js
index f343c1f31e..360125d9f3 100644
--- a/js/src/views/Signer/components/TransactionPendingForm/TransactionPendingFormConfirm/transactionPendingFormConfirm.js
+++ b/js/src/views/Signer/components/TransactionPendingForm/TransactionPendingFormConfirm/transactionPendingFormConfirm.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/views/Signer/components/TransactionPendingForm/TransactionPendingFormReject/index.js b/js/src/views/Signer/components/TransactionPendingForm/TransactionPendingFormReject/index.js
index f8c37266f8..82c9aa359d 100644
--- a/js/src/views/Signer/components/TransactionPendingForm/TransactionPendingFormReject/index.js
+++ b/js/src/views/Signer/components/TransactionPendingForm/TransactionPendingFormReject/index.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/views/Signer/components/TransactionPendingForm/TransactionPendingFormReject/transactionPendingFormReject.js b/js/src/views/Signer/components/TransactionPendingForm/TransactionPendingFormReject/transactionPendingFormReject.js
index 890dd37502..def8aae080 100644
--- a/js/src/views/Signer/components/TransactionPendingForm/TransactionPendingFormReject/transactionPendingFormReject.js
+++ b/js/src/views/Signer/components/TransactionPendingForm/TransactionPendingFormReject/transactionPendingFormReject.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/views/Signer/components/TransactionPendingForm/index.js b/js/src/views/Signer/components/TransactionPendingForm/index.js
index dfdcb41cea..2b58e21489 100644
--- a/js/src/views/Signer/components/TransactionPendingForm/index.js
+++ b/js/src/views/Signer/components/TransactionPendingForm/index.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/views/Signer/components/TransactionPendingForm/transactionPendingForm.js b/js/src/views/Signer/components/TransactionPendingForm/transactionPendingForm.js
index 41d50f68e0..f6e92761fe 100644
--- a/js/src/views/Signer/components/TransactionPendingForm/transactionPendingForm.js
+++ b/js/src/views/Signer/components/TransactionPendingForm/transactionPendingForm.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/views/Signer/components/TxHashLink/index.js b/js/src/views/Signer/components/TxHashLink/index.js
index f831c9a61a..43a7a7c55f 100644
--- a/js/src/views/Signer/components/TxHashLink/index.js
+++ b/js/src/views/Signer/components/TxHashLink/index.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/views/Signer/components/TxHashLink/txHashLink.js b/js/src/views/Signer/components/TxHashLink/txHashLink.js
index cea3fe6025..be92828c1e 100644
--- a/js/src/views/Signer/components/TxHashLink/txHashLink.js
+++ b/js/src/views/Signer/components/TxHashLink/txHashLink.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/views/Signer/components/util/logger.js b/js/src/views/Signer/components/util/logger.js
index 671d4de846..4f721fd6c1 100644
--- a/js/src/views/Signer/components/util/logger.js
+++ b/js/src/views/Signer/components/util/logger.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/views/Signer/components/util/react.js b/js/src/views/Signer/components/util/react.js
index 095f6e6b0d..6cf7298eae 100644
--- a/js/src/views/Signer/components/util/react.js
+++ b/js/src/views/Signer/components/util/react.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/views/Signer/components/util/transaction.js b/js/src/views/Signer/components/util/transaction.js
index 25800e8066..49e0c36548 100644
--- a/js/src/views/Signer/components/util/transaction.js
+++ b/js/src/views/Signer/components/util/transaction.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/views/Signer/components/util/transaction.spec.js b/js/src/views/Signer/components/util/transaction.spec.js
index a2022fe2e9..294c3140c1 100644
--- a/js/src/views/Signer/components/util/transaction.spec.js
+++ b/js/src/views/Signer/components/util/transaction.spec.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/views/Signer/components/util/util.js b/js/src/views/Signer/components/util/util.js
index 095a78d602..865a678ae0 100644
--- a/js/src/views/Signer/components/util/util.js
+++ b/js/src/views/Signer/components/util/util.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/views/Signer/containers/Embedded/embedded.js b/js/src/views/Signer/containers/Embedded/embedded.js
index 51452520b2..3fa450473f 100644
--- a/js/src/views/Signer/containers/Embedded/embedded.js
+++ b/js/src/views/Signer/containers/Embedded/embedded.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/views/Signer/containers/Embedded/index.js b/js/src/views/Signer/containers/Embedded/index.js
index ef42659387..21dd497783 100644
--- a/js/src/views/Signer/containers/Embedded/index.js
+++ b/js/src/views/Signer/containers/Embedded/index.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/views/Signer/containers/RequestsPage/index.js b/js/src/views/Signer/containers/RequestsPage/index.js
index ee3b54f545..212fef2310 100644
--- a/js/src/views/Signer/containers/RequestsPage/index.js
+++ b/js/src/views/Signer/containers/RequestsPage/index.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/views/Signer/containers/RequestsPage/requestsPage.js b/js/src/views/Signer/containers/RequestsPage/requestsPage.js
index db52b008e1..8f2da6208d 100644
--- a/js/src/views/Signer/containers/RequestsPage/requestsPage.js
+++ b/js/src/views/Signer/containers/RequestsPage/requestsPage.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/views/Signer/utils/extension.js b/js/src/views/Signer/utils/extension.js
index a99a72d63d..b00e9c4a46 100644
--- a/js/src/views/Signer/utils/extension.js
+++ b/js/src/views/Signer/utils/extension.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/views/Signer/utils/utils.js b/js/src/views/Signer/utils/utils.js
index 8c231275c8..c315eff27a 100644
--- a/js/src/views/Signer/utils/utils.js
+++ b/js/src/views/Signer/utils/utils.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/views/Status/actions/app.js b/js/src/views/Status/actions/app.js
index d236dd8463..84441be96b 100644
--- a/js/src/views/Status/actions/app.js
+++ b/js/src/views/Status/actions/app.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/views/Status/actions/clipboard.js b/js/src/views/Status/actions/clipboard.js
index 68dc8b8f8a..7275bd1704 100644
--- a/js/src/views/Status/actions/clipboard.js
+++ b/js/src/views/Status/actions/clipboard.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/views/Status/actions/debug.js b/js/src/views/Status/actions/debug.js
index 3cd0c0a43a..26a3b6215d 100644
--- a/js/src/views/Status/actions/debug.js
+++ b/js/src/views/Status/actions/debug.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/views/Status/actions/localstorage.js b/js/src/views/Status/actions/localstorage.js
index 2bf2d28411..0ed6fd3bca 100644
--- a/js/src/views/Status/actions/localstorage.js
+++ b/js/src/views/Status/actions/localstorage.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/views/Status/actions/logger.js b/js/src/views/Status/actions/logger.js
index 5fc327c03f..6758a0743f 100644
--- a/js/src/views/Status/actions/logger.js
+++ b/js/src/views/Status/actions/logger.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/views/Status/actions/mining.js b/js/src/views/Status/actions/mining.js
index e485442026..8d27dfb686 100644
--- a/js/src/views/Status/actions/mining.js
+++ b/js/src/views/Status/actions/mining.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/views/Status/actions/modify-mining.js b/js/src/views/Status/actions/modify-mining.js
index ff959c9f5c..13c0fffd2e 100644
--- a/js/src/views/Status/actions/modify-mining.js
+++ b/js/src/views/Status/actions/modify-mining.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/views/Status/actions/rpc.js b/js/src/views/Status/actions/rpc.js
index 761a77f3d2..a296b731fa 100644
--- a/js/src/views/Status/actions/rpc.js
+++ b/js/src/views/Status/actions/rpc.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/views/Status/actions/status.js b/js/src/views/Status/actions/status.js
index 8980e34c49..e765d9f98e 100644
--- a/js/src/views/Status/actions/status.js
+++ b/js/src/views/Status/actions/status.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/views/Status/components/AutoComplete/AutoComplete.js b/js/src/views/Status/components/AutoComplete/AutoComplete.js
index c16dbd2763..6cf9f6d02d 100644
--- a/js/src/views/Status/components/AutoComplete/AutoComplete.js
+++ b/js/src/views/Status/components/AutoComplete/AutoComplete.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/views/Status/components/AutoComplete/AutoComplete.spec.js b/js/src/views/Status/components/AutoComplete/AutoComplete.spec.js
index 6bc04574e5..386f1da49e 100644
--- a/js/src/views/Status/components/AutoComplete/AutoComplete.spec.js
+++ b/js/src/views/Status/components/AutoComplete/AutoComplete.spec.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/views/Status/components/AutoComplete/index.js b/js/src/views/Status/components/AutoComplete/index.js
index 201b6646e8..5566a319d8 100644
--- a/js/src/views/Status/components/AutoComplete/index.js
+++ b/js/src/views/Status/components/AutoComplete/index.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/views/Status/components/Box/Box.js b/js/src/views/Status/components/Box/Box.js
index c950c0d659..e6e5bf1cbf 100644
--- a/js/src/views/Status/components/Box/Box.js
+++ b/js/src/views/Status/components/Box/Box.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/views/Status/components/Box/Box.spec.js b/js/src/views/Status/components/Box/Box.spec.js
index 5b6301dc9a..93dd8fdec8 100644
--- a/js/src/views/Status/components/Box/Box.spec.js
+++ b/js/src/views/Status/components/Box/Box.spec.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/views/Status/components/Box/index.js b/js/src/views/Status/components/Box/index.js
index e27e297245..aac0639e18 100644
--- a/js/src/views/Status/components/Box/index.js
+++ b/js/src/views/Status/components/Box/index.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/views/Status/components/Call/Call.js b/js/src/views/Status/components/Call/Call.js
index 31d20aa423..13f9cee552 100644
--- a/js/src/views/Status/components/Call/Call.js
+++ b/js/src/views/Status/components/Call/Call.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/views/Status/components/Call/Call.spec.js b/js/src/views/Status/components/Call/Call.spec.js
index 70caca49fa..ec0d1cc1a6 100644
--- a/js/src/views/Status/components/Call/Call.spec.js
+++ b/js/src/views/Status/components/Call/Call.spec.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/views/Status/components/Call/index.js b/js/src/views/Status/components/Call/index.js
index 3556a61948..822f6a1625 100644
--- a/js/src/views/Status/components/Call/index.js
+++ b/js/src/views/Status/components/Call/index.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/views/Status/components/Calls/Calls.js b/js/src/views/Status/components/Calls/Calls.js
index 1115ec6323..f1956dcf19 100644
--- a/js/src/views/Status/components/Calls/Calls.js
+++ b/js/src/views/Status/components/Calls/Calls.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/views/Status/components/Calls/Calls.spec.js b/js/src/views/Status/components/Calls/Calls.spec.js
index e1e4ac8c90..4526539602 100644
--- a/js/src/views/Status/components/Calls/Calls.spec.js
+++ b/js/src/views/Status/components/Calls/Calls.spec.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/views/Status/components/Calls/index.js b/js/src/views/Status/components/Calls/index.js
index 8508479128..9605271f6e 100644
--- a/js/src/views/Status/components/Calls/index.js
+++ b/js/src/views/Status/components/Calls/index.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/views/Status/components/CallsToolbar/CallsToolbar.js b/js/src/views/Status/components/CallsToolbar/CallsToolbar.js
index a91518ba29..77e7ab4ba0 100644
--- a/js/src/views/Status/components/CallsToolbar/CallsToolbar.js
+++ b/js/src/views/Status/components/CallsToolbar/CallsToolbar.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/views/Status/components/CallsToolbar/CallsToolbar.spec.js b/js/src/views/Status/components/CallsToolbar/CallsToolbar.spec.js
index 6f7a40dfea..354b1e999f 100644
--- a/js/src/views/Status/components/CallsToolbar/CallsToolbar.spec.js
+++ b/js/src/views/Status/components/CallsToolbar/CallsToolbar.spec.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/views/Status/components/CallsToolbar/index.js b/js/src/views/Status/components/CallsToolbar/index.js
index f8162611e4..48a9a92e7c 100644
--- a/js/src/views/Status/components/CallsToolbar/index.js
+++ b/js/src/views/Status/components/CallsToolbar/index.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/views/Status/components/Debug/debug.js b/js/src/views/Status/components/Debug/debug.js
index 438d208f9a..2ea268c7c7 100644
--- a/js/src/views/Status/components/Debug/debug.js
+++ b/js/src/views/Status/components/Debug/debug.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/views/Status/components/Debug/index.js b/js/src/views/Status/components/Debug/index.js
index c6b522c46c..b9d48617b0 100644
--- a/js/src/views/Status/components/Debug/index.js
+++ b/js/src/views/Status/components/Debug/index.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/views/Status/components/EditableValue/EditableValue.js b/js/src/views/Status/components/EditableValue/EditableValue.js
index d78ec7d3bd..85591c5093 100644
--- a/js/src/views/Status/components/EditableValue/EditableValue.js
+++ b/js/src/views/Status/components/EditableValue/EditableValue.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/views/Status/components/EditableValue/index.js b/js/src/views/Status/components/EditableValue/index.js
index bf91564d76..bd4c4e0c15 100644
--- a/js/src/views/Status/components/EditableValue/index.js
+++ b/js/src/views/Status/components/EditableValue/index.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/views/Status/components/JsonEditor/JsonEditor.js b/js/src/views/Status/components/JsonEditor/JsonEditor.js
index e9086f1b52..50e62c698b 100644
--- a/js/src/views/Status/components/JsonEditor/JsonEditor.js
+++ b/js/src/views/Status/components/JsonEditor/JsonEditor.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/views/Status/components/JsonEditor/index.js b/js/src/views/Status/components/JsonEditor/index.js
index db5b75fcae..e7e36200ca 100644
--- a/js/src/views/Status/components/JsonEditor/index.js
+++ b/js/src/views/Status/components/JsonEditor/index.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/views/Status/components/Markdown/Markdown.js b/js/src/views/Status/components/Markdown/Markdown.js
index 155d3d7e35..3f4aae23c8 100644
--- a/js/src/views/Status/components/Markdown/Markdown.js
+++ b/js/src/views/Status/components/Markdown/Markdown.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/views/Status/components/Markdown/index.js b/js/src/views/Status/components/Markdown/index.js
index 569558ede8..6a3026b9ec 100644
--- a/js/src/views/Status/components/Markdown/index.js
+++ b/js/src/views/Status/components/Markdown/index.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/views/Status/components/MiningSettings/decodeExtraData.js b/js/src/views/Status/components/MiningSettings/decodeExtraData.js
index 7fd07921e7..20c36f2b72 100644
--- a/js/src/views/Status/components/MiningSettings/decodeExtraData.js
+++ b/js/src/views/Status/components/MiningSettings/decodeExtraData.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/views/Status/components/MiningSettings/decodeExtraData.spec.js b/js/src/views/Status/components/MiningSettings/decodeExtraData.spec.js
index b2f93240cc..b204ba2cd2 100644
--- a/js/src/views/Status/components/MiningSettings/decodeExtraData.spec.js
+++ b/js/src/views/Status/components/MiningSettings/decodeExtraData.spec.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/views/Status/components/MiningSettings/index.js b/js/src/views/Status/components/MiningSettings/index.js
index 7853e0d33c..7cab96ed02 100644
--- a/js/src/views/Status/components/MiningSettings/index.js
+++ b/js/src/views/Status/components/MiningSettings/index.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/views/Status/components/MiningSettings/miningSettings.js b/js/src/views/Status/components/MiningSettings/miningSettings.js
index 52cab63b91..b65eed9299 100644
--- a/js/src/views/Status/components/MiningSettings/miningSettings.js
+++ b/js/src/views/Status/components/MiningSettings/miningSettings.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/views/Status/components/MiningSettings/numberFromString.js b/js/src/views/Status/components/MiningSettings/numberFromString.js
index 6867345ab2..22ea46a91f 100644
--- a/js/src/views/Status/components/MiningSettings/numberFromString.js
+++ b/js/src/views/Status/components/MiningSettings/numberFromString.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/views/Status/components/MiningSettings/numberFromString.spec.js b/js/src/views/Status/components/MiningSettings/numberFromString.spec.js
index 7efa514c34..3a99677c44 100644
--- a/js/src/views/Status/components/MiningSettings/numberFromString.spec.js
+++ b/js/src/views/Status/components/MiningSettings/numberFromString.spec.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/views/Status/components/Response/Response.js b/js/src/views/Status/components/Response/Response.js
index 4ee664ad20..0d57844071 100644
--- a/js/src/views/Status/components/Response/Response.js
+++ b/js/src/views/Status/components/Response/Response.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/views/Status/components/Response/Response.spec.js b/js/src/views/Status/components/Response/Response.spec.js
index 0617721c2d..31def44363 100644
--- a/js/src/views/Status/components/Response/Response.spec.js
+++ b/js/src/views/Status/components/Response/Response.spec.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/views/Status/components/Response/index.js b/js/src/views/Status/components/Response/index.js
index f1d89d75a5..39513e0c2f 100644
--- a/js/src/views/Status/components/Response/index.js
+++ b/js/src/views/Status/components/Response/index.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/views/Status/components/RpcCalls/RpcCalls.js b/js/src/views/Status/components/RpcCalls/RpcCalls.js
index 1b3f8b87bf..ab57370eb7 100644
--- a/js/src/views/Status/components/RpcCalls/RpcCalls.js
+++ b/js/src/views/Status/components/RpcCalls/RpcCalls.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/views/Status/components/RpcCalls/index.js b/js/src/views/Status/components/RpcCalls/index.js
index 1c55eea716..a174e28d90 100644
--- a/js/src/views/Status/components/RpcCalls/index.js
+++ b/js/src/views/Status/components/RpcCalls/index.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/views/Status/components/RpcDocs/RpcDocs.js b/js/src/views/Status/components/RpcDocs/RpcDocs.js
index 3ecd93362a..4eec912905 100644
--- a/js/src/views/Status/components/RpcDocs/RpcDocs.js
+++ b/js/src/views/Status/components/RpcDocs/RpcDocs.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/views/Status/components/RpcDocs/index.js b/js/src/views/Status/components/RpcDocs/index.js
index f1a9be5c09..af5fb64dd7 100644
--- a/js/src/views/Status/components/RpcDocs/index.js
+++ b/js/src/views/Status/components/RpcDocs/index.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/views/Status/components/RpcNav/RpcNav.js b/js/src/views/Status/components/RpcNav/RpcNav.js
index b4cf2a6efc..33ef0ebc40 100644
--- a/js/src/views/Status/components/RpcNav/RpcNav.js
+++ b/js/src/views/Status/components/RpcNav/RpcNav.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/views/Status/components/RpcNav/index.js b/js/src/views/Status/components/RpcNav/index.js
index 8e2b2aa40a..49a4db9c17 100644
--- a/js/src/views/Status/components/RpcNav/index.js
+++ b/js/src/views/Status/components/RpcNav/index.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/views/Status/components/ScrollTopButton/ScrollTopButton.js b/js/src/views/Status/components/ScrollTopButton/ScrollTopButton.js
index e7097d66d6..3857a65b10 100644
--- a/js/src/views/Status/components/ScrollTopButton/ScrollTopButton.js
+++ b/js/src/views/Status/components/ScrollTopButton/ScrollTopButton.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/views/Status/components/ScrollTopButton/index.js b/js/src/views/Status/components/ScrollTopButton/index.js
index 835969920d..12cf9de56a 100644
--- a/js/src/views/Status/components/ScrollTopButton/index.js
+++ b/js/src/views/Status/components/ScrollTopButton/index.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/views/Status/components/ScrollTopButton/util.js b/js/src/views/Status/components/ScrollTopButton/util.js
index 647bcfc43c..78100c74cd 100644
--- a/js/src/views/Status/components/ScrollTopButton/util.js
+++ b/js/src/views/Status/components/ScrollTopButton/util.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/views/Status/components/Status/index.js b/js/src/views/Status/components/Status/index.js
index 44079b2248..f966050e93 100644
--- a/js/src/views/Status/components/Status/index.js
+++ b/js/src/views/Status/components/Status/index.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/views/Status/components/Status/status.js b/js/src/views/Status/components/Status/status.js
index 891ec66324..a8b54f7e8d 100644
--- a/js/src/views/Status/components/Status/status.js
+++ b/js/src/views/Status/components/Status/status.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/views/Status/constants/index.js b/js/src/views/Status/constants/index.js
index 26850209ae..42c1c0d141 100644
--- a/js/src/views/Status/constants/index.js
+++ b/js/src/views/Status/constants/index.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/views/Status/containers/RpcPage/RpcPage.js b/js/src/views/Status/containers/RpcPage/RpcPage.js
index 93ff99692a..1dda2fcb02 100644
--- a/js/src/views/Status/containers/RpcPage/RpcPage.js
+++ b/js/src/views/Status/containers/RpcPage/RpcPage.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/views/Status/containers/RpcPage/index.js b/js/src/views/Status/containers/RpcPage/index.js
index f94cbe2b32..c0c3a9f8e5 100644
--- a/js/src/views/Status/containers/RpcPage/index.js
+++ b/js/src/views/Status/containers/RpcPage/index.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/views/Status/containers/StatusPage/index.js b/js/src/views/Status/containers/StatusPage/index.js
index 0e141a16db..6b0392fc2f 100644
--- a/js/src/views/Status/containers/StatusPage/index.js
+++ b/js/src/views/Status/containers/StatusPage/index.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/views/Status/containers/StatusPage/statusPage.js b/js/src/views/Status/containers/StatusPage/statusPage.js
index 286e2c20ec..8389afa66c 100644
--- a/js/src/views/Status/containers/StatusPage/statusPage.js
+++ b/js/src/views/Status/containers/StatusPage/statusPage.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/views/Status/middleware/index.js b/js/src/views/Status/middleware/index.js
index 169004a08f..fe95537f9c 100644
--- a/js/src/views/Status/middleware/index.js
+++ b/js/src/views/Status/middleware/index.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/views/Status/middleware/localstorage.js b/js/src/views/Status/middleware/localstorage.js
index a431fdd0a9..e0b103a33a 100644
--- a/js/src/views/Status/middleware/localstorage.js
+++ b/js/src/views/Status/middleware/localstorage.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/views/Status/middleware/localstorage.spec.js b/js/src/views/Status/middleware/localstorage.spec.js
index e1d6ed7eed..82010063da 100644
--- a/js/src/views/Status/middleware/localstorage.spec.js
+++ b/js/src/views/Status/middleware/localstorage.spec.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/views/Status/reducers/debug.js b/js/src/views/Status/reducers/debug.js
index 314470d3d6..07af4943e5 100644
--- a/js/src/views/Status/reducers/debug.js
+++ b/js/src/views/Status/reducers/debug.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/views/Status/reducers/index.js b/js/src/views/Status/reducers/index.js
index 3f6225ee03..adc5d6f8c3 100644
--- a/js/src/views/Status/reducers/index.js
+++ b/js/src/views/Status/reducers/index.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/views/Status/reducers/logger.js b/js/src/views/Status/reducers/logger.js
index 62085feacb..97166449c6 100644
--- a/js/src/views/Status/reducers/logger.js
+++ b/js/src/views/Status/reducers/logger.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/views/Status/reducers/mining.js b/js/src/views/Status/reducers/mining.js
index 3fe780bbdf..8761c3c3bd 100644
--- a/js/src/views/Status/reducers/mining.js
+++ b/js/src/views/Status/reducers/mining.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/views/Status/reducers/rpc.js b/js/src/views/Status/reducers/rpc.js
index e2676260b5..a581a38608 100644
--- a/js/src/views/Status/reducers/rpc.js
+++ b/js/src/views/Status/reducers/rpc.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/views/Status/reducers/settings.js b/js/src/views/Status/reducers/settings.js
index ae6582b02f..545bd26122 100644
--- a/js/src/views/Status/reducers/settings.js
+++ b/js/src/views/Status/reducers/settings.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/views/Status/reducers/status.js b/js/src/views/Status/reducers/status.js
index f6fec9ce28..065f415965 100644
--- a/js/src/views/Status/reducers/status.js
+++ b/js/src/views/Status/reducers/status.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/views/Status/util/error.js b/js/src/views/Status/util/error.js
index 8b680204e7..82d4c08367 100644
--- a/js/src/views/Status/util/error.js
+++ b/js/src/views/Status/util/error.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/views/Status/util/error.spec.js b/js/src/views/Status/util/error.spec.js
index 7512a47bc3..50f1d532dc 100644
--- a/js/src/views/Status/util/error.spec.js
+++ b/js/src/views/Status/util/error.spec.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/views/Status/util/index.js b/js/src/views/Status/util/index.js
index 9194cfd944..98923fee88 100644
--- a/js/src/views/Status/util/index.js
+++ b/js/src/views/Status/util/index.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/views/Status/util/index.spec.js b/js/src/views/Status/util/index.spec.js
index 39d17322a2..89c8fe9524 100644
--- a/js/src/views/Status/util/index.spec.js
+++ b/js/src/views/Status/util/index.spec.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/views/Status/util/react.js b/js/src/views/Status/util/react.js
index 095f6e6b0d..6cf7298eae 100644
--- a/js/src/views/Status/util/react.js
+++ b/js/src/views/Status/util/react.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/views/Status/util/rpc-md.js b/js/src/views/Status/util/rpc-md.js
index 5c0a3f793b..ad40c576b5 100644
--- a/js/src/views/Status/util/rpc-md.js
+++ b/js/src/views/Status/util/rpc-md.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/views/Wallet/Confirmations/confirmations.js b/js/src/views/Wallet/Confirmations/confirmations.js
index 8ac340cbb4..1c70a94e2d 100644
--- a/js/src/views/Wallet/Confirmations/confirmations.js
+++ b/js/src/views/Wallet/Confirmations/confirmations.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/views/Wallet/Confirmations/index.js b/js/src/views/Wallet/Confirmations/index.js
index 00cea94a6e..199d1256bf 100644
--- a/js/src/views/Wallet/Confirmations/index.js
+++ b/js/src/views/Wallet/Confirmations/index.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/views/Wallet/Details/details.js b/js/src/views/Wallet/Details/details.js
index fb08bbde2e..25141915ae 100644
--- a/js/src/views/Wallet/Details/details.js
+++ b/js/src/views/Wallet/Details/details.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/views/Wallet/Details/index.js b/js/src/views/Wallet/Details/index.js
index d0bf396b69..175c989669 100644
--- a/js/src/views/Wallet/Details/index.js
+++ b/js/src/views/Wallet/Details/index.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/views/Wallet/Transactions/index.js b/js/src/views/Wallet/Transactions/index.js
index f74dcd5e8b..61c6a8aad1 100644
--- a/js/src/views/Wallet/Transactions/index.js
+++ b/js/src/views/Wallet/Transactions/index.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/views/Wallet/Transactions/transactions.js b/js/src/views/Wallet/Transactions/transactions.js
index 58952bd9e3..aff1623a45 100644
--- a/js/src/views/Wallet/Transactions/transactions.js
+++ b/js/src/views/Wallet/Transactions/transactions.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/views/Wallet/wallet.js b/js/src/views/Wallet/wallet.js
index 1a5fbeecd0..b33772c48b 100644
--- a/js/src/views/Wallet/wallet.js
+++ b/js/src/views/Wallet/wallet.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/views/WriteContract/writeContract.js b/js/src/views/WriteContract/writeContract.js
index 7b0902c1f7..31c4dd2445 100644
--- a/js/src/views/WriteContract/writeContract.js
+++ b/js/src/views/WriteContract/writeContract.js
@@ -1,4 +1,4 @@
-  // Copyright 2015, 2016 Ethcore (UK) Ltd.
+  // Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/src/views/WriteContract/writeContractStore.js b/js/src/views/WriteContract/writeContractStore.js
index 7ea9577524..dd1985466f 100644
--- a/js/src/views/WriteContract/writeContractStore.js
+++ b/js/src/views/WriteContract/writeContractStore.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/test/npmParity.js b/js/test/npmParity.js
index 6e125e9e29..a7486de2ff 100644
--- a/js/test/npmParity.js
+++ b/js/test/npmParity.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/webpack/app.js b/js/webpack/app.js
index e63e919698..cf38ec99ca 100644
--- a/js/webpack/app.js
+++ b/js/webpack/app.js
@@ -1,5 +1,5 @@
 
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/webpack/npm.js b/js/webpack/npm.js
index a1bbaeda9b..a5f4b383f0 100644
--- a/js/webpack/npm.js
+++ b/js/webpack/npm.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/js/webpack/shared.js b/js/webpack/shared.js
index 3c593fd87e..ec011242ea 100644
--- a/js/webpack/shared.js
+++ b/js/webpack/shared.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/parity/user_defaults.rs b/parity/user_defaults.rs
index 652abfea10..20c6244bb4 100644
--- a/parity/user_defaults.rs
+++ b/parity/user_defaults.rs
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/rpc/src/v1/helpers/auto_args.rs b/rpc/src/v1/helpers/auto_args.rs
index ce1e6854ad..9c4e1d74aa 100644
--- a/rpc/src/v1/helpers/auto_args.rs
+++ b/rpc/src/v1/helpers/auto_args.rs
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/rpc/src/v1/helpers/errors.rs b/rpc/src/v1/helpers/errors.rs
index 673987084d..68f99795ab 100644
--- a/rpc/src/v1/helpers/errors.rs
+++ b/rpc/src/v1/helpers/errors.rs
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/rpc/src/v1/helpers/signing_queue.rs b/rpc/src/v1/helpers/signing_queue.rs
index 144e672c1b..03489bad73 100644
--- a/rpc/src/v1/helpers/signing_queue.rs
+++ b/rpc/src/v1/helpers/signing_queue.rs
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/rpc/src/v1/impls/eth.rs b/rpc/src/v1/impls/eth.rs
index d68d59e59d..97134951c1 100644
--- a/rpc/src/v1/impls/eth.rs
+++ b/rpc/src/v1/impls/eth.rs
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/rpc/src/v1/impls/parity.rs b/rpc/src/v1/impls/parity.rs
index 74f467e5ed..1f995749a1 100644
--- a/rpc/src/v1/impls/parity.rs
+++ b/rpc/src/v1/impls/parity.rs
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/rpc/src/v1/tests/helpers/fetch.rs b/rpc/src/v1/tests/helpers/fetch.rs
index 98d888a105..bdf9ea65b4 100644
--- a/rpc/src/v1/tests/helpers/fetch.rs
+++ b/rpc/src/v1/tests/helpers/fetch.rs
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/rpc/src/v1/tests/helpers/miner_service.rs b/rpc/src/v1/tests/helpers/miner_service.rs
index 39fba8406e..132e2a5e06 100644
--- a/rpc/src/v1/tests/helpers/miner_service.rs
+++ b/rpc/src/v1/tests/helpers/miner_service.rs
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/rpc/src/v1/tests/helpers/mod.rs b/rpc/src/v1/tests/helpers/mod.rs
index 321a9717e4..ce0f40271e 100644
--- a/rpc/src/v1/tests/helpers/mod.rs
+++ b/rpc/src/v1/tests/helpers/mod.rs
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/rpc/src/v1/tests/helpers/snapshot_service.rs b/rpc/src/v1/tests/helpers/snapshot_service.rs
index b78aa374d6..9edc164a8b 100644
--- a/rpc/src/v1/tests/helpers/snapshot_service.rs
+++ b/rpc/src/v1/tests/helpers/snapshot_service.rs
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/rpc/src/v1/tests/helpers/sync_provider.rs b/rpc/src/v1/tests/helpers/sync_provider.rs
index 8800d926a8..039ca4c3d6 100644
--- a/rpc/src/v1/tests/helpers/sync_provider.rs
+++ b/rpc/src/v1/tests/helpers/sync_provider.rs
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/rpc/src/v1/tests/mocked/eth.rs b/rpc/src/v1/tests/mocked/eth.rs
index 7a7a1f682c..f84f4d53ee 100644
--- a/rpc/src/v1/tests/mocked/eth.rs
+++ b/rpc/src/v1/tests/mocked/eth.rs
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/rpc/src/v1/tests/mocked/manage_network.rs b/rpc/src/v1/tests/mocked/manage_network.rs
index 2a1cfb6d4c..03bae523a6 100644
--- a/rpc/src/v1/tests/mocked/manage_network.rs
+++ b/rpc/src/v1/tests/mocked/manage_network.rs
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/rpc/src/v1/tests/mocked/mod.rs b/rpc/src/v1/tests/mocked/mod.rs
index a7d7156b4b..0ba0fc95c9 100644
--- a/rpc/src/v1/tests/mocked/mod.rs
+++ b/rpc/src/v1/tests/mocked/mod.rs
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/rpc/src/v1/tests/mocked/net.rs b/rpc/src/v1/tests/mocked/net.rs
index 37ef84fca9..1c4a4c1ac8 100644
--- a/rpc/src/v1/tests/mocked/net.rs
+++ b/rpc/src/v1/tests/mocked/net.rs
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/rpc/src/v1/tests/mocked/parity.rs b/rpc/src/v1/tests/mocked/parity.rs
index 9b4daaccd7..01bc37ad3a 100644
--- a/rpc/src/v1/tests/mocked/parity.rs
+++ b/rpc/src/v1/tests/mocked/parity.rs
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/rpc/src/v1/tests/mocked/parity_accounts.rs b/rpc/src/v1/tests/mocked/parity_accounts.rs
index 8b42500e6c..a30b6c43c1 100644
--- a/rpc/src/v1/tests/mocked/parity_accounts.rs
+++ b/rpc/src/v1/tests/mocked/parity_accounts.rs
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/rpc/src/v1/tests/mocked/parity_set.rs b/rpc/src/v1/tests/mocked/parity_set.rs
index 55f1556930..d05c127708 100644
--- a/rpc/src/v1/tests/mocked/parity_set.rs
+++ b/rpc/src/v1/tests/mocked/parity_set.rs
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/rpc/src/v1/tests/mocked/personal.rs b/rpc/src/v1/tests/mocked/personal.rs
index ea4973ee49..c2984240f5 100644
--- a/rpc/src/v1/tests/mocked/personal.rs
+++ b/rpc/src/v1/tests/mocked/personal.rs
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/rpc/src/v1/tests/mocked/rpc.rs b/rpc/src/v1/tests/mocked/rpc.rs
index 44406f4e3a..52ba788595 100644
--- a/rpc/src/v1/tests/mocked/rpc.rs
+++ b/rpc/src/v1/tests/mocked/rpc.rs
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/rpc/src/v1/tests/mocked/signer.rs b/rpc/src/v1/tests/mocked/signer.rs
index c87abb7eb2..3537717d4a 100644
--- a/rpc/src/v1/tests/mocked/signer.rs
+++ b/rpc/src/v1/tests/mocked/signer.rs
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/rpc/src/v1/tests/mocked/signing.rs b/rpc/src/v1/tests/mocked/signing.rs
index 31a7004431..526360f0fe 100644
--- a/rpc/src/v1/tests/mocked/signing.rs
+++ b/rpc/src/v1/tests/mocked/signing.rs
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/rpc/src/v1/tests/mocked/web3.rs b/rpc/src/v1/tests/mocked/web3.rs
index c3bd79110c..c7ad42426a 100644
--- a/rpc/src/v1/tests/mocked/web3.rs
+++ b/rpc/src/v1/tests/mocked/web3.rs
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/rpc/src/v1/types/block.rs b/rpc/src/v1/types/block.rs
index 5aab6ced83..6dd441ee82 100644
--- a/rpc/src/v1/types/block.rs
+++ b/rpc/src/v1/types/block.rs
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/rpc/src/v1/types/confirmations.rs b/rpc/src/v1/types/confirmations.rs
index f690184227..fd81bf6e72 100644
--- a/rpc/src/v1/types/confirmations.rs
+++ b/rpc/src/v1/types/confirmations.rs
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/rpc/src/v1/types/mod.rs b/rpc/src/v1/types/mod.rs
index c1bc344079..984e38bcd9 100644
--- a/rpc/src/v1/types/mod.rs
+++ b/rpc/src/v1/types/mod.rs
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/rpc/src/v1/types/mod.rs.in b/rpc/src/v1/types/mod.rs.in
index 364fa53d38..c5509bd575 100644
--- a/rpc/src/v1/types/mod.rs.in
+++ b/rpc/src/v1/types/mod.rs.in
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/rpc/src/v1/types/receipt.rs b/rpc/src/v1/types/receipt.rs
index 24170a14cc..1b98b10862 100644
--- a/rpc/src/v1/types/receipt.rs
+++ b/rpc/src/v1/types/receipt.rs
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/rpc/src/v1/types/rpc_settings.rs b/rpc/src/v1/types/rpc_settings.rs
index de8f90410e..87ca245b6e 100644
--- a/rpc/src/v1/types/rpc_settings.rs
+++ b/rpc/src/v1/types/rpc_settings.rs
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/rpc/src/v1/types/sync.rs b/rpc/src/v1/types/sync.rs
index 6f8938be95..3e40ecb857 100644
--- a/rpc/src/v1/types/sync.rs
+++ b/rpc/src/v1/types/sync.rs
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/rpc/src/v1/types/trace.rs b/rpc/src/v1/types/trace.rs
index ace76827c0..5ba166010b 100644
--- a/rpc/src/v1/types/trace.rs
+++ b/rpc/src/v1/types/trace.rs
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/rpc/src/v1/types/trace_filter.rs b/rpc/src/v1/types/trace_filter.rs
index 2517b15850..b9a4c49518 100644
--- a/rpc/src/v1/types/trace_filter.rs
+++ b/rpc/src/v1/types/trace_filter.rs
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/rpc/src/v1/types/transaction.rs b/rpc/src/v1/types/transaction.rs
index 933a4a482b..31374e9120 100644
--- a/rpc/src/v1/types/transaction.rs
+++ b/rpc/src/v1/types/transaction.rs
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/rpc/src/v1/types/transaction_request.rs b/rpc/src/v1/types/transaction_request.rs
index a4f8e63875..258346d562 100644
--- a/rpc/src/v1/types/transaction_request.rs
+++ b/rpc/src/v1/types/transaction_request.rs
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/rpc/src/v1/types/uint.rs b/rpc/src/v1/types/uint.rs
index 245348709c..2dc9093c11 100644
--- a/rpc/src/v1/types/uint.rs
+++ b/rpc/src/v1/types/uint.rs
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/rpc/src/v1/types/work.rs b/rpc/src/v1/types/work.rs
index 0817eb24aa..559edac597 100644
--- a/rpc/src/v1/types/work.rs
+++ b/rpc/src/v1/types/work.rs
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/sync/src/chain.rs b/sync/src/chain.rs
index c6e123b3f8..7b9257c6cc 100644
--- a/sync/src/chain.rs
+++ b/sync/src/chain.rs
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/util/bigint/src/uint.rs b/util/bigint/src/uint.rs
index c0b6e09873..e2c06b664e 100644
--- a/util/bigint/src/uint.rs
+++ b/util/bigint/src/uint.rs
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/util/network/src/connection.rs b/util/network/src/connection.rs
index ea0763b093..0a43d18c17 100644
--- a/util/network/src/connection.rs
+++ b/util/network/src/connection.rs
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/util/network/src/discovery.rs b/util/network/src/discovery.rs
index 996578af5c..a6adf8d1da 100644
--- a/util/network/src/discovery.rs
+++ b/util/network/src/discovery.rs
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/util/network/src/handshake.rs b/util/network/src/handshake.rs
index 0eeda3b546..7364b06e71 100644
--- a/util/network/src/handshake.rs
+++ b/util/network/src/handshake.rs
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/util/network/src/host.rs b/util/network/src/host.rs
index 975fb87b87..2bdeab93e0 100644
--- a/util/network/src/host.rs
+++ b/util/network/src/host.rs
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/util/network/src/session.rs b/util/network/src/session.rs
index 3aab05d9a2..d19d330c9d 100644
--- a/util/network/src/session.rs
+++ b/util/network/src/session.rs
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/util/src/journaldb/earlymergedb.rs b/util/src/journaldb/earlymergedb.rs
index 60263a2cd5..26d1576cea 100644
--- a/util/src/journaldb/earlymergedb.rs
+++ b/util/src/journaldb/earlymergedb.rs
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/util/src/journaldb/overlayrecentdb.rs b/util/src/journaldb/overlayrecentdb.rs
index 34f942a0bd..a80fedc795 100644
--- a/util/src/journaldb/overlayrecentdb.rs
+++ b/util/src/journaldb/overlayrecentdb.rs
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
diff --git a/util/src/trie/triedbmut.rs b/util/src/trie/triedbmut.rs
index f5940dd7ba..63720b7b4a 100644
--- a/util/src/trie/triedbmut.rs
+++ b/util/src/trie/triedbmut.rs
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
-- 
GitLab


From 94f5501c617ff8f975743d5b8538a0c4f775a70c Mon Sep 17 00:00:00 2001
From: Gav Wood <gavin@ethcore.io>
Date: Sun, 11 Dec 2016 19:43:58 +0100
Subject: [PATCH 39/64] authors & homepage => Parity

---
 Cargo.toml                    | 2 +-
 dapps/Cargo.toml              | 2 +-
 dapps/js-glue/Cargo.toml      | 2 +-
 dapps/ui/Cargo.toml           | 4 ++--
 db/Cargo.toml                 | 4 ++--
 devtools/Cargo.toml           | 4 ++--
 ethash/Cargo.toml             | 2 +-
 ethcore/Cargo.toml            | 4 ++--
 ethcore/hash-fetch/Cargo.toml | 4 ++--
 ethcore/light/Cargo.toml      | 4 ++--
 ethcrypto/Cargo.toml          | 2 +-
 ethkey/Cargo.toml             | 2 +-
 ethstore/Cargo.toml           | 2 +-
 evmbin/Cargo.toml             | 2 +-
 evmjit/Cargo.toml             | 2 +-
 ipc/codegen/Cargo.toml        | 2 +-
 ipc/hypervisor/Cargo.toml     | 2 +-
 ipc/nano/Cargo.toml           | 2 +-
 ipc/rpc/Cargo.toml            | 2 +-
 ipc/tests/Cargo.toml          | 2 +-
 js/Cargo.precompiled.toml     | 2 +-
 js/Cargo.toml                 | 2 +-
 json/Cargo.toml               | 2 +-
 logger/Cargo.toml             | 2 +-
 rpc/Cargo.toml                | 2 +-
 rpc/rpctest/Cargo.toml        | 2 +-
 signer/Cargo.toml             | 4 ++--
 stratum/Cargo.toml            | 2 +-
 sync/Cargo.toml               | 2 +-
 util/Cargo.toml               | 4 ++--
 util/bigint/Cargo.toml        | 4 ++--
 util/bloom/Cargo.toml         | 2 +-
 util/fetch/Cargo.toml         | 4 ++--
 util/https-fetch/Cargo.toml   | 4 ++--
 util/io/Cargo.toml            | 4 ++--
 util/network/Cargo.toml       | 4 ++--
 util/rlp/Cargo.toml           | 2 +-
 util/sha3/Cargo.toml          | 4 ++--
 util/table/Cargo.toml         | 2 +-
 util/using_queue/Cargo.toml   | 2 +-
 40 files changed, 54 insertions(+), 54 deletions(-)

diff --git a/Cargo.toml b/Cargo.toml
index c3a44e1cc0..bce959f61b 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -3,7 +3,7 @@ description = "Ethcore client."
 name = "parity"
 version = "1.5.0"
 license = "GPL-3.0"
-authors = ["Ethcore <admin@ethcore.io>"]
+authors = ["Parity Technologies <admin@parity.io>"]
 build = "build.rs"
 
 [build-dependencies]
diff --git a/dapps/Cargo.toml b/dapps/Cargo.toml
index bbab8420e1..93c82790a5 100644
--- a/dapps/Cargo.toml
+++ b/dapps/Cargo.toml
@@ -3,7 +3,7 @@ description = "Parity Dapps crate"
 name = "ethcore-dapps"
 version = "1.5.0"
 license = "GPL-3.0"
-authors = ["Ethcore <admin@ethcore.io"]
+authors = ["Parity Technologies <admin@parity.io>"]
 build = "build.rs"
 
 [lib]
diff --git a/dapps/js-glue/Cargo.toml b/dapps/js-glue/Cargo.toml
index 827c67ef5c..8832624a82 100644
--- a/dapps/js-glue/Cargo.toml
+++ b/dapps/js-glue/Cargo.toml
@@ -3,7 +3,7 @@ description = "Base Package for all Parity built-in dapps"
 name = "parity-dapps-glue"
 version = "1.5.0"
 license = "GPL-3.0"
-authors = ["Ethcore <admin@ethcore.io"]
+authors = ["Parity Technologies <admin@parity.io>"]
 build = "build.rs"
 
 [build-dependencies]
diff --git a/dapps/ui/Cargo.toml b/dapps/ui/Cargo.toml
index de8207b883..e835bd820a 100644
--- a/dapps/ui/Cargo.toml
+++ b/dapps/ui/Cargo.toml
@@ -1,10 +1,10 @@
 [package]
 description = "Ethcore Parity UI"
-homepage = "http://ethcore.io"
+homepage = "http://parity.io"
 license = "GPL-3.0"
 name = "parity-ui"
 version = "1.5.0"
-authors = ["Ethcore <admin@ethcore.io>"]
+authors = ["Parity Technologies <admin@parity.io>"]
 
 [build-dependencies]
 rustc_version = "0.1"
diff --git a/db/Cargo.toml b/db/Cargo.toml
index 9642ed8829..30bfda90a5 100644
--- a/db/Cargo.toml
+++ b/db/Cargo.toml
@@ -1,10 +1,10 @@
 [package]
 description = "Ethcore Database"
-homepage = "http://ethcore.io"
+homepage = "http://parity.io"
 license = "GPL-3.0"
 name = "ethcore-db"
 version = "1.5.0"
-authors = ["Ethcore <admin@ethcore.io>"]
+authors = ["Parity Technologies <admin@parity.io>"]
 build = "build.rs"
 
 [build-dependencies]
diff --git a/devtools/Cargo.toml b/devtools/Cargo.toml
index 3b648c450c..163bd7baf4 100644
--- a/devtools/Cargo.toml
+++ b/devtools/Cargo.toml
@@ -1,10 +1,10 @@
 [package]
 description = "Ethcore development/test/build tools"
-homepage = "http://ethcore.io"
+homepage = "http://parity.io"
 license = "GPL-3.0"
 name = "ethcore-devtools"
 version = "1.5.0"
-authors = ["Ethcore <admin@ethcore.io>"]
+authors = ["Parity Technologies <admin@parity.io>"]
 
 [dependencies]
 rand = "0.3"
diff --git a/ethash/Cargo.toml b/ethash/Cargo.toml
index bf1ba990e2..98ba22f5bf 100644
--- a/ethash/Cargo.toml
+++ b/ethash/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 name = "ethash"
 version = "1.5.0"
-authors = ["arkpar <arkadiy@ethcore.io"]
+authors = ["Parity Technologies <admin@parity.io>"]
 
 [lib]
 
diff --git a/ethcore/Cargo.toml b/ethcore/Cargo.toml
index bd87c422fd..40d767ab08 100644
--- a/ethcore/Cargo.toml
+++ b/ethcore/Cargo.toml
@@ -1,10 +1,10 @@
 [package]
 description = "Ethcore library"
-homepage = "http://ethcore.io"
+homepage = "http://parity.io"
 license = "GPL-3.0"
 name = "ethcore"
 version = "1.5.0"
-authors = ["Ethcore <admin@ethcore.io>"]
+authors = ["Parity Technologies <admin@parity.io>"]
 build = "build.rs"
 
 [build-dependencies]
diff --git a/ethcore/hash-fetch/Cargo.toml b/ethcore/hash-fetch/Cargo.toml
index 4fb724c085..3d1a572402 100644
--- a/ethcore/hash-fetch/Cargo.toml
+++ b/ethcore/hash-fetch/Cargo.toml
@@ -1,10 +1,10 @@
 [package]
 description = "Fetching hash-addressed content."
-homepage = "https://ethcore.io"
+homepage = "http://parity.io"
 license = "GPL-3.0"
 name = "ethcore-hash-fetch"
 version = "1.5.0"
-authors = ["Ethcore <admin@ethcore.io>"]
+authors = ["Parity Technologies <admin@parity.io>"]
 
 [dependencies]
 log = "0.3"
diff --git a/ethcore/light/Cargo.toml b/ethcore/light/Cargo.toml
index c89bbc74f3..37d7034d2b 100644
--- a/ethcore/light/Cargo.toml
+++ b/ethcore/light/Cargo.toml
@@ -1,10 +1,10 @@
 [package]
 description = "Parity LES primitives"
-homepage = "https://ethcore.io"
+homepage = "http://parity.io"
 license = "GPL-3.0"
 name = "ethcore-light"
 version = "1.5.0"
-authors = ["Ethcore <admin@ethcore.io>"]
+authors = ["Parity Technologies <admin@parity.io>"]
 build = "build.rs"
 
 [build-dependencies]
diff --git a/ethcrypto/Cargo.toml b/ethcrypto/Cargo.toml
index 5c638b555c..16d91988a3 100644
--- a/ethcrypto/Cargo.toml
+++ b/ethcrypto/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 name = "ethcrypto"
 version = "0.1.0"
-authors = ["debris <marek.kotewicz@gmail.com>"]
+authors = ["Parity Technologies <admin@parity.io>"]
 
 [dependencies]
 rust-crypto = "0.2.36"
diff --git a/ethkey/Cargo.toml b/ethkey/Cargo.toml
index 319a38b20a..d9d1c7efa7 100644
--- a/ethkey/Cargo.toml
+++ b/ethkey/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 name = "ethkey"
 version = "0.2.0"
-authors = ["Ethcore <admin@ethcore.io>"]
+authors = ["Parity Technologies <admin@parity.io>"]
 
 [dependencies]
 rand = "0.3.14"
diff --git a/ethstore/Cargo.toml b/ethstore/Cargo.toml
index 03347cbd75..f47d9171f5 100644
--- a/ethstore/Cargo.toml
+++ b/ethstore/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 name = "ethstore"
 version = "0.1.0"
-authors = ["debris <marek.kotewicz@gmail.com>"]
+authors = ["Parity Technologies <admin@parity.io>"]
 build = "build.rs"
 
 [dependencies]
diff --git a/evmbin/Cargo.toml b/evmbin/Cargo.toml
index 479e7e7ecb..ad2d69d572 100644
--- a/evmbin/Cargo.toml
+++ b/evmbin/Cargo.toml
@@ -2,7 +2,7 @@
 name = "evm"
 description = "Parity's EVM implementation"
 version = "0.1.0"
-authors = ["Ethcore <admin@ethcore.io>"]
+authors = ["Parity Technologies <admin@parity.io>"]
 
 [lib]
 name = "evm"
diff --git a/evmjit/Cargo.toml b/evmjit/Cargo.toml
index 12c57a769c..a849b93238 100644
--- a/evmjit/Cargo.toml
+++ b/evmjit/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 name = "evmjit"
 version = "1.5.0"
-authors = ["debris <marek.kotewicz@gmail.com>"]
+authors = ["Parity Technologies <admin@parity.io>"]
 
 [lib]
 crate-type = ["dylib"]
diff --git a/ipc/codegen/Cargo.toml b/ipc/codegen/Cargo.toml
index 2867609d6a..5717453efa 100644
--- a/ipc/codegen/Cargo.toml
+++ b/ipc/codegen/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 name = "ethcore-ipc-codegen"
 version = "1.5.0"
-authors = ["Nikolay Volf"]
+authors = ["Parity Technologies <admin@parity.io>"]
 license = "GPL-3.0"
 description = "Macros to auto-generate implementations for ipc call"
 build = "build.rs"
diff --git a/ipc/hypervisor/Cargo.toml b/ipc/hypervisor/Cargo.toml
index d730b9bcfc..abce5a3ec1 100644
--- a/ipc/hypervisor/Cargo.toml
+++ b/ipc/hypervisor/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 name = "ethcore-ipc-hypervisor"
 version = "1.2.0"
-authors = ["Nikolay Volf <nikolay@ethcore.io>"]
+authors = ["Parity Technologies <admin@parity.io>"]
 license = "GPL-3.0"
 build = "build.rs"
 
diff --git a/ipc/nano/Cargo.toml b/ipc/nano/Cargo.toml
index 32171bbf4f..7d559dbabc 100644
--- a/ipc/nano/Cargo.toml
+++ b/ipc/nano/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 name = "ethcore-ipc-nano"
 version = "1.5.0"
-authors = ["Nikolay Volf <nikolay@ethcore.io>"]
+authors = ["Parity Technologies <admin@parity.io>"]
 license = "GPL-3.0"
 
 [features]
diff --git a/ipc/rpc/Cargo.toml b/ipc/rpc/Cargo.toml
index 1aecb32928..312433be12 100644
--- a/ipc/rpc/Cargo.toml
+++ b/ipc/rpc/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 name = "ethcore-ipc"
 version = "1.5.0"
-authors = ["Nikolay Volf <nikvolf@gmail.com>"]
+authors = ["Parity Technologies <admin@parity.io>"]
 license = "GPL-3.0"
 
 [features]
diff --git a/ipc/tests/Cargo.toml b/ipc/tests/Cargo.toml
index 23bde87e22..1f7723a4fc 100644
--- a/ipc/tests/Cargo.toml
+++ b/ipc/tests/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 name = "ethcore-ipc-tests"
 version = "0.1.0"
-authors = ["Nikolay Volf"]
+authors = ["Parity Technologies <admin@parity.io>"]
 build = "build.rs"
 
 [lib]
diff --git a/js/Cargo.precompiled.toml b/js/Cargo.precompiled.toml
index b8175e4f7a..5de6520370 100644
--- a/js/Cargo.precompiled.toml
+++ b/js/Cargo.precompiled.toml
@@ -3,7 +3,7 @@ description = "Parity built-in dapps."
 name = "parity-ui-precompiled"
 version = "1.4.0"
 license = "GPL-3.0"
-authors = ["Ethcore <admin@ethcore.io>"]
+authors = ["Parity Technologies <admin@parity.io>"]
 build = "build.rs"
 
 [features]
diff --git a/js/Cargo.toml b/js/Cargo.toml
index e52bfec9e2..231f5fa24e 100644
--- a/js/Cargo.toml
+++ b/js/Cargo.toml
@@ -3,7 +3,7 @@ description = "Parity built-in dapps."
 name = "parity-ui-dev"
 version = "1.4.0"
 license = "GPL-3.0"
-authors = ["Ethcore <admin@ethcore.io>"]
+authors = ["Parity Technologies <admin@parity.io>"]
 build = "build.rs"
 
 [features]
diff --git a/json/Cargo.toml b/json/Cargo.toml
index 67303cc7e9..747be8f7d5 100644
--- a/json/Cargo.toml
+++ b/json/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 name = "ethjson"
 version = "0.1.0"
-authors = ["debris <marek.kotewicz@gmail.com>"]
+authors = ["Parity Technologies <admin@parity.io>"]
 build = "build.rs"
 
 [dependencies]
diff --git a/logger/Cargo.toml b/logger/Cargo.toml
index 590eb0b2da..a22c748fba 100644
--- a/logger/Cargo.toml
+++ b/logger/Cargo.toml
@@ -3,7 +3,7 @@ description = "Ethcore client."
 name = "ethcore-logger"
 version = "1.5.0"
 license = "GPL-3.0"
-authors = ["Ethcore <admin@ethcore.io>"]
+authors = ["Parity Technologies <admin@parity.io>"]
 
 [dependencies]
 log = "0.3"
diff --git a/rpc/Cargo.toml b/rpc/Cargo.toml
index dcdf683250..5d974e59ff 100644
--- a/rpc/Cargo.toml
+++ b/rpc/Cargo.toml
@@ -3,7 +3,7 @@ description = "Ethcore jsonrpc"
 name = "ethcore-rpc"
 version = "1.5.0"
 license = "GPL-3.0"
-authors = ["Ethcore <admin@ethcore.io"]
+authors = ["Parity Technologies <admin@parity.io>"]
 build = "build.rs"
 
 [lib]
diff --git a/rpc/rpctest/Cargo.toml b/rpc/rpctest/Cargo.toml
index 19c7feb7c6..461746001f 100644
--- a/rpc/rpctest/Cargo.toml
+++ b/rpc/rpctest/Cargo.toml
@@ -3,7 +3,7 @@ description = "Rpc test client."
 name = "rpctest"
 version = "1.5.0"
 license = "GPL-3.0"
-authors = ["Ethcore <admin@ethcore.io>"]
+authors = ["Parity Technologies <admin@parity.io>"]
 
 [dependencies]
 ctrlc = { git = "https://github.com/ethcore/rust-ctrlc.git" }
diff --git a/signer/Cargo.toml b/signer/Cargo.toml
index 78fda12be9..abf5d7755b 100644
--- a/signer/Cargo.toml
+++ b/signer/Cargo.toml
@@ -1,10 +1,10 @@
 [package]
 description = "Ethcore Trusted Signer"
-homepage = "http://ethcore.io"
+homepage = "http://parity.io"
 license = "GPL-3.0"
 name = "ethcore-signer"
 version = "1.5.0"
-authors = ["Ethcore <admin@ethcore.io>"]
+authors = ["Parity Technologies <admin@parity.io>"]
 build = "build.rs"
 
 [build-dependencies]
diff --git a/stratum/Cargo.toml b/stratum/Cargo.toml
index 609f4ee9bb..2a79ecd13a 100644
--- a/stratum/Cargo.toml
+++ b/stratum/Cargo.toml
@@ -3,7 +3,7 @@ description = "Ethcore stratum lib"
 name = "ethcore-stratum"
 version = "1.5.0"
 license = "GPL-3.0"
-authors = ["Ethcore <admin@ethcore.io>"]
+authors = ["Parity Technologies <admin@parity.io>"]
 build = "build.rs"
 
 [build-dependencies]
diff --git a/sync/Cargo.toml b/sync/Cargo.toml
index f4166bbe5f..40c07e9112 100644
--- a/sync/Cargo.toml
+++ b/sync/Cargo.toml
@@ -3,7 +3,7 @@ description = "Ethcore blockchain sync"
 name = "ethsync"
 version = "1.5.0"
 license = "GPL-3.0"
-authors = ["Ethcore <admin@ethcore.io"]
+authors = ["Parity Technologies <admin@parity.io>"]
 build = "build.rs"
 
 [lib]
diff --git a/util/Cargo.toml b/util/Cargo.toml
index 1a439ebf83..594024f3f1 100644
--- a/util/Cargo.toml
+++ b/util/Cargo.toml
@@ -1,10 +1,10 @@
 [package]
 description = "Ethcore utility library"
-homepage = "http://ethcore.io"
+homepage = "http://parity.io"
 license = "GPL-3.0"
 name = "ethcore-util"
 version = "1.5.0"
-authors = ["Ethcore <admin@ethcore.io>"]
+authors = ["Parity Technologies <admin@parity.io>"]
 build = "build.rs"
 
 [dependencies]
diff --git a/util/bigint/Cargo.toml b/util/bigint/Cargo.toml
index 3b6b852cb9..2b8d8313dc 100644
--- a/util/bigint/Cargo.toml
+++ b/util/bigint/Cargo.toml
@@ -1,11 +1,11 @@
 [package]
 description = "Large fixed-size integers and hash function outputs"
-homepage = "http://ethcore.io"
+homepage = "http://parity.io"
 repository = "https://github.com/ethcore/parity"
 license = "GPL-3.0"
 name = "ethcore-bigint"
 version = "0.1.2"
-authors = ["Ethcore <admin@ethcore.io>"]
+authors = ["Parity Technologies <admin@parity.io>"]
 build = "build.rs"
 
 [build-dependencies]
diff --git a/util/bloom/Cargo.toml b/util/bloom/Cargo.toml
index c1d6f76387..99464879fa 100644
--- a/util/bloom/Cargo.toml
+++ b/util/bloom/Cargo.toml
@@ -1,7 +1,7 @@
 [project]
 name = "ethcore-bloom-journal"
 version = "0.1.0"
-authors = ["Ethcore<admin@ethcore.io>"]
+authors = ["Parity Technologies <admin@parity.io>"]
 description = "Journaling bloom filter"
 license = "GPL3"
 
diff --git a/util/fetch/Cargo.toml b/util/fetch/Cargo.toml
index 663d167bf4..b179add5b4 100644
--- a/util/fetch/Cargo.toml
+++ b/util/fetch/Cargo.toml
@@ -1,10 +1,10 @@
 [package]
 description = "HTTP/HTTPS fetching library"
-homepage = "http://ethcore.io"
+homepage = "http://parity.io"
 license = "GPL-3.0"
 name = "fetch"
 version = "0.1.0"
-authors = ["Ethcore <admin@ethcore.io>"]
+authors = ["Parity Technologies <admin@parity.io>"]
 
 [dependencies]
 log = "0.3"
diff --git a/util/https-fetch/Cargo.toml b/util/https-fetch/Cargo.toml
index b40cf89435..e0149c3517 100644
--- a/util/https-fetch/Cargo.toml
+++ b/util/https-fetch/Cargo.toml
@@ -1,10 +1,10 @@
 [package]
 description = "HTTPS fetching library"
-homepage = "http://ethcore.io"
+homepage = "http://parity.io"
 license = "GPL-3.0"
 name = "https-fetch"
 version = "0.1.0"
-authors = ["Ethcore <admin@ethcore.io>"]
+authors = ["Parity Technologies <admin@parity.io>"]
 
 [dependencies]
 log = "0.3"
diff --git a/util/io/Cargo.toml b/util/io/Cargo.toml
index 0a7adaf565..ce20830f10 100644
--- a/util/io/Cargo.toml
+++ b/util/io/Cargo.toml
@@ -1,10 +1,10 @@
 [package]
 description = "Ethcore IO library"
-homepage = "http://ethcore.io"
+homepage = "http://parity.io"
 license = "GPL-3.0"
 name = "ethcore-io"
 version = "1.5.0"
-authors = ["Ethcore <admin@ethcore.io>"]
+authors = ["Parity Technologies <admin@parity.io>"]
 
 [dependencies]
 mio = { git = "https://github.com/ethcore/mio" }
diff --git a/util/network/Cargo.toml b/util/network/Cargo.toml
index 37ff825b0d..c60705d0d3 100644
--- a/util/network/Cargo.toml
+++ b/util/network/Cargo.toml
@@ -1,10 +1,10 @@
 [package]
 description = "Ethcore network library"
-homepage = "http://ethcore.io"
+homepage = "http://parity.io"
 license = "GPL-3.0"
 name = "ethcore-network"
 version = "1.5.0"
-authors = ["Ethcore <admin@ethcore.io>"]
+authors = ["Parity Technologies <admin@parity.io>"]
 
 [dependencies]
 log = "0.3"
diff --git a/util/rlp/Cargo.toml b/util/rlp/Cargo.toml
index 7095ddb046..ae6b4accd8 100644
--- a/util/rlp/Cargo.toml
+++ b/util/rlp/Cargo.toml
@@ -3,7 +3,7 @@ description = "Recursive-length prefix encoding, decoding, and compression"
 license = "GPL-3.0"
 name = "rlp"
 version = "0.1.0"
-authors = ["Ethcore <admin@ethcore.io>"]
+authors = ["Parity Technologies <admin@parity.io>"]
 
 [dependencies]
 elastic-array = { git = "https://github.com/ethcore/elastic-array" }
diff --git a/util/sha3/Cargo.toml b/util/sha3/Cargo.toml
index ac423b22fd..8f8d6d1608 100644
--- a/util/sha3/Cargo.toml
+++ b/util/sha3/Cargo.toml
@@ -1,10 +1,10 @@
 [package]
 description = "Rust bindings for tinykeccak C library"
-homepage = "http://ethcore.io"
+homepage = "http://parity.io"
 license = "GPL-3.0"
 name = "sha3"
 version = "0.1.0"
-authors = ["Ethcore <admin@ethcore.io>"]
+authors = ["Parity Technologies <admin@parity.io>"]
 build = "build.rs"
 
 [build-dependencies]
diff --git a/util/table/Cargo.toml b/util/table/Cargo.toml
index 57d47a8e96..f2faca184d 100644
--- a/util/table/Cargo.toml
+++ b/util/table/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "table"
 version = "0.1.0"
-authors = ["debris <marek.kotewicz@gmail.com>"]
+authors = ["Parity Technologies <admin@parity.io>"]
 
 [dependencies]
diff --git a/util/using_queue/Cargo.toml b/util/using_queue/Cargo.toml
index 0708cbd003..4030d0d8df 100644
--- a/util/using_queue/Cargo.toml
+++ b/util/using_queue/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "using_queue"
 version = "0.1.0"
-authors = ["debris <marek.kotewicz@gmail.com>"]
+authors = ["Parity Technologies <admin@parity.io>"]
 
 [dependencies]
-- 
GitLab


From 282178e1fa59804b0871e77ecdf01d19e9d193c2 Mon Sep 17 00:00:00 2001
From: GitLab Build Bot <jaco+gitlab@ethcore.io>
Date: Sun, 11 Dec 2016 19:06:28 +0000
Subject: [PATCH 40/64] [ci skip] js-precompiled 20161211-190404

---
 Cargo.lock      | 2 +-
 js/package.json | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 2c492bc9ea..95a5571ed1 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1290,7 +1290,7 @@ dependencies = [
 [[package]]
 name = "parity-ui-precompiled"
 version = "1.4.0"
-source = "git+https://github.com/ethcore/js-precompiled.git#6430c6ef5d00f3a411546021ae2915740abce561"
+source = "git+https://github.com/ethcore/js-precompiled.git#2397280818ec4e4502b379f788f2eecdbc63abb4"
 dependencies = [
  "parity-dapps-glue 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
diff --git a/js/package.json b/js/package.json
index b4ea41a616..1e0ea8b685 100644
--- a/js/package.json
+++ b/js/package.json
@@ -1,6 +1,6 @@
 {
   "name": "parity.js",
-  "version": "0.2.113",
+  "version": "0.2.114",
   "main": "release/index.js",
   "jsnext:main": "src/index.js",
   "author": "Parity Team <admin@parity.io>",
-- 
GitLab


From f4134cf634d2923c6decda8570aafebed85a15cc Mon Sep 17 00:00:00 2001
From: GitLab Build Bot <jaco+gitlab@ethcore.io>
Date: Sun, 11 Dec 2016 19:39:15 +0000
Subject: [PATCH 41/64] [ci skip] js-precompiled 20161211-193650

---
 Cargo.lock      | 2 +-
 js/package.json | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 95a5571ed1..e14857b032 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1290,7 +1290,7 @@ dependencies = [
 [[package]]
 name = "parity-ui-precompiled"
 version = "1.4.0"
-source = "git+https://github.com/ethcore/js-precompiled.git#2397280818ec4e4502b379f788f2eecdbc63abb4"
+source = "git+https://github.com/ethcore/js-precompiled.git#343c9172fd4378d19046e48b69a0c590a79622ee"
 dependencies = [
  "parity-dapps-glue 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
diff --git a/js/package.json b/js/package.json
index 1e0ea8b685..39b0cf3636 100644
--- a/js/package.json
+++ b/js/package.json
@@ -1,6 +1,6 @@
 {
   "name": "parity.js",
-  "version": "0.2.114",
+  "version": "0.2.115",
   "main": "release/index.js",
   "jsnext:main": "src/index.js",
   "author": "Parity Team <admin@parity.io>",
-- 
GitLab


From 4dbfcf231d54d58920e3af9f9eb0d704e34fb8b1 Mon Sep 17 00:00:00 2001
From: Nicolas Gotchac <ngotchac@gmail.com>
Date: Sun, 11 Dec 2016 21:03:40 +0100
Subject: [PATCH 42/64] Cache fetched Dapps (#3804)

* Have a singleton DappsFetcher so we don't realod them at each page load

* Better dapps Fetcher : event based listener
  Update on meta change

* Remove dapps fetcher => all in singleton dapps store + utils

* Modify header to Parity
---
 js/src/contracts/dappreg.js             |   6 +-
 js/src/redux/providers/signerReducer.js |   2 +-
 js/src/util/dapps.js                    | 208 ++++++++++++++++
 js/src/views/Dapp/dapp.js               |   2 +-
 js/src/views/Dapps/dapps.js             |   2 +-
 js/src/views/Dapps/dappsStore.js        | 300 +++++++++++-------------
 6 files changed, 352 insertions(+), 168 deletions(-)
 create mode 100644 js/src/util/dapps.js

diff --git a/js/src/contracts/dappreg.js b/js/src/contracts/dappreg.js
index b9ee157642..d82c76a5a1 100644
--- a/js/src/contracts/dappreg.js
+++ b/js/src/contracts/dappreg.js
@@ -22,8 +22,12 @@ export default class DappReg {
     this.getInstance();
   }
 
+  getContract () {
+    return this._registry.getContract('dappreg');
+  }
+
   getInstance () {
-    return this._registry.getContractInstance('dappreg');
+    return this.getContract().then((contract) => contract.instance);
   }
 
   count () {
diff --git a/js/src/redux/providers/signerReducer.js b/js/src/redux/providers/signerReducer.js
index cc10b3fd16..c6d55f140f 100644
--- a/js/src/redux/providers/signerReducer.js
+++ b/js/src/redux/providers/signerReducer.js
@@ -62,7 +62,7 @@ export default handleActions({
   signerSuccessConfirmRequest (state, action) {
     const { id, txHash } = action.payload;
     const confirmed = Object.assign(
-      state.pending.find(p => p.id === id),
+      state.pending.find(p => p.id === id) || { id },
       { result: txHash, status: 'confirmed' }
     );
 
diff --git a/js/src/util/dapps.js b/js/src/util/dapps.js
new file mode 100644
index 0000000000..89f17274eb
--- /dev/null
+++ b/js/src/util/dapps.js
@@ -0,0 +1,208 @@
+// 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 BigNumber from 'bignumber.js';
+import { pick, range, uniq } from 'lodash';
+
+import Contracts from '~/contracts';
+import { hashToImageUrl } from '~/redux/util';
+import { bytesToHex } from '~/api/util/format';
+
+import builtinApps from '~/views/Dapps/builtin.json';
+
+function getHost (api) {
+  const host = process.env.DAPPS_URL ||
+    (
+      process.env.NODE_ENV === 'production'
+      ? api.dappsUrl
+      : ''
+    );
+
+  if (host === '/') {
+    return '';
+  }
+
+  return host;
+}
+
+export function subscribeToChanges (api, dappReg, callback) {
+  return dappReg
+    .getContract()
+    .then((dappRegContract) => {
+      const dappRegInstance = dappRegContract.instance;
+
+      const signatures = ['MetaChanged', 'OwnerChanged', 'Registered']
+        .map((event) => dappRegInstance[event].signature);
+
+      return api.eth
+        .newFilter({
+          fromBlock: '0',
+          toBlock: 'latest',
+          address: dappRegInstance.address,
+          topics: [ signatures ]
+        })
+      .then((filterId) => {
+        return api
+          .subscribe('eth_blockNumber', () => {
+            if (filterId > -1) {
+              api.eth
+                .getFilterChanges(filterId)
+                .then((logs) => {
+                  return dappRegContract.parseEventLogs(logs);
+                })
+                .then((events) => {
+                  if (events.length === 0) {
+                    return [];
+                  }
+
+                  // Return uniq IDs which changed meta-data
+                  const ids = uniq(events.map((event) => bytesToHex(event.params.id.value)));
+                  callback(ids);
+                });
+            }
+          })
+          .then((blockSubId) => {
+            return {
+              block: blockSubId,
+              filter: filterId
+            };
+          });
+      });
+    });
+}
+
+export function fetchBuiltinApps () {
+  const { dappReg } = Contracts.get();
+
+  return Promise
+    .all(builtinApps.map((app) => dappReg.getImage(app.id)))
+    .then((imageIds) => {
+      return builtinApps.map((app, index) => {
+        app.type = 'builtin';
+        app.image = hashToImageUrl(imageIds[index]);
+        return app;
+      });
+    })
+    .catch((error) => {
+      console.warn('DappsStore:fetchBuiltinApps', error);
+    });
+}
+
+export function fetchLocalApps (api) {
+  return fetch(`${getHost(api)}/api/apps`)
+    .then((response) => {
+      return response.ok
+        ? response.json()
+        : [];
+    })
+    .then((apps) => {
+      return apps
+        .map((app) => {
+          app.type = 'local';
+          app.visible = true;
+          return app;
+        })
+        .filter((app) => app.id && !['ui'].includes(app.id));
+    })
+    .catch((error) => {
+      console.warn('DappsStore:fetchLocal', error);
+    });
+}
+
+export function fetchRegistryAppIds () {
+  const { dappReg } = Contracts.get();
+
+  return dappReg
+    .count()
+    .then((count) => {
+      const promises = range(0, count.toNumber()).map((index) => dappReg.at(index));
+      return Promise.all(promises);
+    })
+    .then((appsInfo) => {
+      const appIds = appsInfo
+        .map(([appId, owner]) => bytesToHex(appId))
+        .filter((appId) => {
+          return (new BigNumber(appId)).gt(0) && !builtinApps.find((app) => app.id === appId);
+        });
+
+      return appIds;
+    })
+    .catch((error) => {
+      console.warn('DappsStore:fetchRegistryAppIds', error);
+    });
+}
+
+export function fetchRegistryApp (api, dappReg, appId) {
+  return Promise
+    .all([
+      dappReg.getImage(appId),
+      dappReg.getContent(appId),
+      dappReg.getManifest(appId)
+    ])
+    .then(([ imageId, contentId, manifestId ]) => {
+      const app = {
+        id: appId,
+        image: hashToImageUrl(imageId),
+        contentHash: bytesToHex(contentId).substr(2),
+        manifestHash: bytesToHex(manifestId).substr(2),
+        type: 'network',
+        visible: true
+      };
+
+      return fetchManifest(api, app.manifestHash)
+        .then((manifest) => {
+          if (manifest) {
+            app.manifestHash = null;
+
+            // Add usefull manifest fields to app
+            Object.assign(app, pick(manifest, ['author', 'description', 'name', 'version']));
+          }
+
+          return app;
+        });
+    })
+    .then((app) => {
+      // Keep dapps that has a Manifest File and an Id
+      const dapp = (app.manifestHash || !app.id) ? null : app;
+      return dapp;
+    })
+    .catch((error) => {
+      console.warn('DappsStore:fetchRegistryApp', error);
+    });
+}
+
+export function fetchManifest (api, manifestHash) {
+  if (/^(0x)?0+/.test(manifestHash)) {
+    return Promise.resolve(null);
+  }
+
+  return fetch(
+      `${getHost(api)}/api/content/${manifestHash}/`,
+      { redirect: 'follow', mode: 'cors' }
+    )
+    .then((response) => {
+      return response.ok
+        ? response.json()
+        : null;
+    })
+    .then((manifest) => {
+      return manifest;
+    })
+    .catch((error) => {
+      console.warn('DappsStore:fetchManifest', error);
+      return null;
+    });
+}
diff --git a/js/src/views/Dapp/dapp.js b/js/src/views/Dapp/dapp.js
index 16a8429641..87245ca728 100644
--- a/js/src/views/Dapp/dapp.js
+++ b/js/src/views/Dapp/dapp.js
@@ -31,7 +31,7 @@ export default class Dapp extends Component {
     params: PropTypes.object
   };
 
-  store = new DappsStore(this.context.api);
+  store = DappsStore.get(this.context.api);
 
   render () {
     const { dappsUrl } = this.context.api;
diff --git a/js/src/views/Dapps/dapps.js b/js/src/views/Dapps/dapps.js
index 07bdcd7583..9760382c28 100644
--- a/js/src/views/Dapps/dapps.js
+++ b/js/src/views/Dapps/dapps.js
@@ -36,7 +36,7 @@ export default class Dapps extends Component {
     api: PropTypes.object.isRequired
   }
 
-  store = new DappsStore(this.context.api);
+  store = DappsStore.get(this.context.api);
 
   render () {
     let externalOverlay = null;
diff --git a/js/src/views/Dapps/dappsStore.js b/js/src/views/Dapps/dappsStore.js
index 1841f4c7c7..e167331a47 100644
--- a/js/src/views/Dapps/dappsStore.js
+++ b/js/src/views/Dapps/dappsStore.js
@@ -14,17 +14,21 @@
 // You should have received a copy of the GNU General Public License
 // along with Parity.  If not, see <http://www.gnu.org/licenses/>.
 
-import BigNumber from 'bignumber.js';
 import { action, computed, observable, transaction } from 'mobx';
 import store from 'store';
 
 import Contracts from '~/contracts';
-import { hashToImageUrl } from '~/redux/util';
-
-import builtinApps from './builtin.json';
+import {
+  fetchBuiltinApps, fetchLocalApps,
+  fetchRegistryAppIds, fetchRegistryApp,
+  subscribeToChanges
+} from '~/util/dapps';
 
 const LS_KEY_DISPLAY = 'displayApps';
 const LS_KEY_EXTERNAL_ACCEPT = 'acceptExternal';
+const BUILTIN_APPS_KEY = 'BUILTIN_APPS_KEY';
+
+let instance = null;
 
 export default class DappsStore {
   @observable apps = [];
@@ -32,23 +36,138 @@ export default class DappsStore {
   @observable modalOpen = false;
   @observable externalOverlayVisible = true;
 
+  _api = null;
+  _subscriptions = {};
+
+  _cachedApps = {};
   _manifests = {};
+  _registryAppsIds = null;
 
   constructor (api) {
     this._api = api;
 
     this.loadExternalOverlay();
-    this.readDisplayApps();
+    this.loadApps();
+    this.subscribeToChanges();
+  }
+
+  loadApps () {
+    const { dappReg } = Contracts.get();
 
     Promise
       .all([
-        this._fetchBuiltinApps(),
-        this._fetchLocalApps(),
-        this._fetchRegistryApps()
+        this.fetchBuiltinApps().then((apps) => this.addApps(apps)),
+        this.fetchLocalApps().then((apps) => this.addApps(apps)),
+        this.fetchRegistryApps(dappReg).then((apps) => this.addApps(apps))
       ])
       .then(this.writeDisplayApps);
   }
 
+  static get (api) {
+    if (!instance) {
+      instance = new DappsStore(api);
+    } else {
+      instance.loadApps();
+    }
+
+    return instance;
+  }
+
+  subscribeToChanges () {
+    const { dappReg } = Contracts.get();
+
+    // Unsubscribe from previous subscriptions, if any
+    if (this._subscriptions.block) {
+      this._api.unsubscribe(this._subscriptions.block);
+    }
+
+    if (this._subscriptions.filter) {
+      this._api.eth.uninstallFilter(this._subscriptions.filter);
+    }
+
+    // Subscribe to dapps reg changes
+    subscribeToChanges(this._api, dappReg, (appIds) => {
+      const updates = appIds.map((appId) => {
+        return this.fetchRegistryApp(dappReg, appId, true);
+      });
+
+      Promise
+        .all(updates)
+        .then((apps) => {
+          this.addApps(apps);
+        });
+    }).then((subscriptions) => {
+      this._subscriptions = subscriptions;
+    });
+  }
+
+  fetchBuiltinApps (force = false) {
+    if (!force && this._cachedApps[BUILTIN_APPS_KEY] !== undefined) {
+      return Promise.resolve(this._cachedApps[BUILTIN_APPS_KEY]);
+    }
+
+    this._cachedApps[BUILTIN_APPS_KEY] = fetchBuiltinApps()
+      .then((apps) => {
+        this._cachedApps[BUILTIN_APPS_KEY] = apps;
+        return apps;
+      });
+
+    return Promise.resolve(this._cachedApps[BUILTIN_APPS_KEY]);
+  }
+
+  fetchLocalApps () {
+    return fetchLocalApps(this._api);
+  }
+
+  fetchRegistryAppIds (force = false) {
+    if (!force && this._registryAppsIds) {
+      return Promise.resolve(this._registryAppsIds);
+    }
+
+    this._registryAppsIds = fetchRegistryAppIds()
+      .then((appIds) => {
+        this._registryAppsIds = appIds;
+        return this._registryAppsIds;
+      });
+
+    return Promise.resolve(this._registryAppsIds);
+  }
+
+  fetchRegistryApp (dappReg, appId, force = false) {
+    if (!force && this._cachedApps[appId] !== undefined) {
+      return Promise.resolve(this._cachedApps[appId]);
+    }
+
+    this._cachedApps[appId] = fetchRegistryApp(this._api, dappReg, appId)
+      .then((dapp) => {
+        this._cachedApps[appId] = dapp;
+        return dapp;
+      });
+
+    return Promise.resolve(this._cachedApps[appId]);
+  }
+
+  fetchRegistryApps (dappReg) {
+    return this
+      .fetchRegistryAppIds()
+      .then((appIds) => {
+        const promises = appIds.map((appId) => {
+          // Fetch the Dapp and display it ASAP
+          return this
+            .fetchRegistryApp(dappReg, appId)
+            .then((app) => {
+              if (app) {
+                this.addApps([ app ]);
+              }
+
+              return app;
+            });
+        });
+
+        return Promise.all(promises);
+      });
+  }
+
   @computed get sortedBuiltin () {
     return this.apps.filter((app) => app.type === 'builtin');
   }
@@ -112,9 +231,17 @@ export default class DappsStore {
     store.set(LS_KEY_DISPLAY, this.displayApps);
   }
 
-  @action addApps = (apps) => {
+  @action addApps = (_apps) => {
     transaction(() => {
+      const apps = _apps.filter((app) => app);
+
+      // Get new apps IDs if available
+      const newAppsIds = apps
+        .map((app) => app.id)
+        .filter((id) => id);
+
       this.apps = this.apps
+        .filter((app) => !app.id || !newAppsIds.includes(app.id))
         .concat(apps || [])
         .sort((a, b) => a.name.localeCompare(b.name));
 
@@ -128,159 +255,4 @@ export default class DappsStore {
       this.displayApps = Object.assign({}, this.displayApps, visibility);
     });
   }
-
-  _getHost (api) {
-    const host = process.env.DAPPS_URL || (process.env.NODE_ENV === 'production'
-      ? this._api.dappsUrl
-      : '');
-
-    if (host === '/') {
-      return '';
-    }
-
-    return host;
-  }
-
-  _fetchBuiltinApps () {
-    const { dappReg } = Contracts.get();
-
-    return Promise
-      .all(builtinApps.map((app) => dappReg.getImage(app.id)))
-      .then((imageIds) => {
-        this.addApps(
-          builtinApps.map((app, index) => {
-            app.type = 'builtin';
-            app.image = hashToImageUrl(imageIds[index]);
-            return app;
-          })
-        );
-      })
-      .catch((error) => {
-        console.warn('DappsStore:fetchBuiltinApps', error);
-      });
-  }
-
-  _fetchLocalApps () {
-    return fetch(`${this._getHost()}/api/apps`)
-      .then((response) => {
-        return response.ok
-          ? response.json()
-          : [];
-      })
-      .then((apps) => {
-        return apps
-          .map((app) => {
-            app.type = 'local';
-            app.visible = true;
-            return app;
-          })
-          .filter((app) => app.id && !['ui'].includes(app.id));
-      })
-      .then(this.addApps)
-      .catch((error) => {
-        console.warn('DappsStore:fetchLocal', error);
-      });
-  }
-
-  _fetchRegistryApps () {
-    const { dappReg } = Contracts.get();
-
-    return dappReg
-      .count()
-      .then((_count) => {
-        const count = _count.toNumber();
-        const promises = [];
-
-        for (let index = 0; index < count; index++) {
-          promises.push(dappReg.at(index));
-        }
-
-        return Promise.all(promises);
-      })
-      .then((appsInfo) => {
-        const appIds = appsInfo
-          .map(([appId, owner]) => this._api.util.bytesToHex(appId))
-          .filter((appId) => {
-            return (new BigNumber(appId)).gt(0) && !builtinApps.find((app) => app.id === appId);
-          });
-
-        return Promise
-          .all([
-            Promise.all(appIds.map((appId) => dappReg.getImage(appId))),
-            Promise.all(appIds.map((appId) => dappReg.getContent(appId))),
-            Promise.all(appIds.map((appId) => dappReg.getManifest(appId)))
-          ])
-          .then(([imageIds, contentIds, manifestIds]) => {
-            return appIds.map((appId, index) => {
-              const app = {
-                id: appId,
-                image: hashToImageUrl(imageIds[index]),
-                contentHash: this._api.util.bytesToHex(contentIds[index]).substr(2),
-                manifestHash: this._api.util.bytesToHex(manifestIds[index]).substr(2),
-                type: 'network',
-                visible: true
-              };
-
-              return app;
-            });
-          });
-      })
-      .then((apps) => {
-        return Promise
-          .all(apps.map((app) => this._fetchManifest(app.manifestHash)))
-          .then((manifests) => {
-            return apps.map((app, index) => {
-              const manifest = manifests[index];
-
-              if (manifest) {
-                app.manifestHash = null;
-                Object.keys(manifest)
-                  .filter((key) => ['author', 'description', 'name', 'version'].includes(key))
-                  .forEach((key) => {
-                    app[key] = manifest[key];
-                  });
-              }
-
-              return app;
-            });
-          })
-          .then((apps) => {
-            return apps.filter((app) => {
-              return !app.manifestHash && app.id;
-            });
-          });
-      })
-      .then(this.addApps)
-      .catch((error) => {
-        console.warn('DappsStore:fetchRegistry', error);
-      });
-  }
-
-  _fetchManifest (manifestHash) {
-    if (/^(0x)?0+/.test(manifestHash)) {
-      return Promise.resolve(null);
-    }
-
-    if (this._manifests[manifestHash]) {
-      return Promise.resolve(this._manifests[manifestHash]);
-    }
-
-    return fetch(`${this._getHost()}/api/content/${manifestHash}/`, { redirect: 'follow', mode: 'cors' })
-      .then((response) => {
-        return response.ok
-          ? response.json()
-          : null;
-      })
-      .then((manifest) => {
-        if (manifest) {
-          this._manifests[manifestHash] = manifest;
-        }
-
-        return manifest;
-      })
-      .catch((error) => {
-        console.warn('DappsStore:fetchManifest', error);
-        return null;
-      });
-  }
 }
-- 
GitLab


From 4c3dea2a0bc826da1269c2a2bb9fbdc70762157c Mon Sep 17 00:00:00 2001
From: Nicolas Gotchac <ngotchac@gmail.com>
Date: Sun, 11 Dec 2016 21:03:48 +0100
Subject: [PATCH 43/64] Fix React-Router in i18n locale change (#3815)

* Routes in routes config => no more react router error message

* Add LocalStorage for Locale Selection

* Ethcore to Parity LTD
---
 js/src/i18n/store.js |  14 +++++
 js/src/main.js       |  69 ++-----------------------
 js/src/routes.js     | 119 +++++++++++++++++++++++++++++++++++++++++++
 3 files changed, 136 insertions(+), 66 deletions(-)
 create mode 100644 js/src/routes.js

diff --git a/js/src/i18n/store.js b/js/src/i18n/store.js
index 773c596ef2..497e55c72a 100644
--- a/js/src/i18n/store.js
+++ b/js/src/i18n/store.js
@@ -19,11 +19,14 @@ import { action, observable, transaction } from 'mobx';
 import { addLocaleData } from 'react-intl';
 import de from 'react-intl/locale-data/de';
 import en from 'react-intl/locale-data/en';
+import store from 'store';
 
 import languages from './languages';
 import deMessages from './de';
 import enMessages from './en';
 
+const LS_STORE_KEY = '_parity::locale';
+
 let instance = null;
 const isProduction = process.env.NODE_ENV === 'production';
 
@@ -45,10 +48,21 @@ export default class Store {
   @observable messages = MESSAGES[DEFAULT];
   @observable isDevelopment = !isProduction;
 
+  constructor () {
+    const savedLocale = store.get(LS_STORE_KEY);
+
+    this.locale = (savedLocale && LOCALES.includes(savedLocale))
+      ? savedLocale
+      : DEFAULT;
+    this.messages = MESSAGES[this.locale];
+  }
+
   @action setLocale (locale) {
     transaction(() => {
       this.locale = locale;
       this.messages = MESSAGES[locale];
+
+      store.set(LS_STORE_KEY, locale);
     });
   }
 
diff --git a/js/src/main.js b/js/src/main.js
index 52d8b09767..1b2b66a940 100644
--- a/js/src/main.js
+++ b/js/src/main.js
@@ -15,10 +15,9 @@
 // along with Parity.  If not, see <http://www.gnu.org/licenses/>.
 
 import React, { Component, PropTypes } from 'react';
-import { Redirect, Router, Route, IndexRoute } from 'react-router';
-
-import { Accounts, Account, Addresses, Address, Application, Contract, Contracts, WriteContract, Wallet, Dapp, Dapps, Settings, SettingsBackground, SettingsParity, SettingsProxy, SettingsViews, Signer, Status } from '~/views';
+import { Router } from 'react-router';
 
+import routes from './routes';
 import styles from './reset.css';
 
 export default class MainApplication extends Component {
@@ -26,73 +25,11 @@ export default class MainApplication extends Component {
     routerHistory: PropTypes.any.isRequired
   };
 
-  handleDeprecatedRoute = (nextState, replace) => {
-    const { address } = nextState.params;
-    const redirectMap = {
-      account: 'accounts',
-      address: 'addresses',
-      contract: 'contracts'
-    };
-
-    const oldRoute = nextState.routes[0].path;
-    const newRoute = Object.keys(redirectMap).reduce((newRoute, key) => {
-      return newRoute.replace(new RegExp(`^/${key}`), '/' + redirectMap[key]);
-    }, oldRoute);
-
-    console.warn(`Route "${oldRoute}" is deprecated. Please use "${newRoute}"`);
-    replace(newRoute.replace(':address', address));
-  }
-
   render () {
     const { routerHistory } = this.props;
 
     return (
-      <Router className={ styles.reset } history={ routerHistory }>
-        <Redirect from='/' to='/accounts' />
-        <Redirect from='/auth' to='/accounts' query={ {} } />
-        <Redirect from='/settings' to='/settings/views' />
-
-        { /** Backward Compatible links */ }
-        <Route path='/account/:address' onEnter={ this.handleDeprecatedRoute } />
-        <Route path='/address/:address' onEnter={ this.handleDeprecatedRoute } />
-        <Route path='/contract/:address' onEnter={ this.handleDeprecatedRoute } />
-
-        <Route path='/' component={ Application }>
-          <Route path='accounts'>
-            <IndexRoute component={ Accounts } />
-            <Route path=':address' component={ Account } />
-            <Route path='/wallet/:address' component={ Wallet } />
-          </Route>
-
-          <Route path='addresses'>
-            <IndexRoute component={ Addresses } />
-            <Route path=':address' component={ Address } />
-          </Route>
-
-          <Route path='apps' component={ Dapps } />
-          <Route path='app/:id' component={ Dapp } />
-
-          <Route path='contracts'>
-            <IndexRoute component={ Contracts } />
-            <Route path='develop' component={ WriteContract } />
-            <Route path=':address' component={ Contract } />
-          </Route>
-
-          <Route path='settings' component={ Settings }>
-            <Route path='background' component={ SettingsBackground } />
-            <Route path='proxy' component={ SettingsProxy } />
-            <Route path='views' component={ SettingsViews } />
-            <Route path='parity' component={ SettingsParity } />
-          </Route>
-
-          <Route path='signer' component={ Signer } />
-
-          <Route path='status'>
-            <IndexRoute component={ Status } />
-            <Route path=':subpage' component={ Status } />
-          </Route>
-        </Route>
-      </Router>
+      <Router className={ styles.reset } history={ routerHistory } routes={ routes } />
     );
   }
 }
diff --git a/js/src/routes.js b/js/src/routes.js
new file mode 100644
index 0000000000..82296852b7
--- /dev/null
+++ b/js/src/routes.js
@@ -0,0 +1,119 @@
+// 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 {
+  Accounts, Account, Addresses, Address, Application,
+  Contract, Contracts, WriteContract, Wallet, Dapp, Dapps,
+  Settings, SettingsBackground, SettingsParity, SettingsProxy,
+  SettingsViews, Signer, Status
+} from '~/views';
+
+function handleDeprecatedRoute (nextState, replace) {
+  const { address } = nextState.params;
+  const redirectMap = {
+    account: 'accounts',
+    address: 'addresses',
+    contract: 'contracts'
+  };
+
+  const oldRoute = nextState.routes[0].path;
+  const newRoute = Object.keys(redirectMap).reduce((newRoute, key) => {
+    return newRoute.replace(new RegExp(`^/${key}`), '/' + redirectMap[key]);
+  }, oldRoute);
+
+  console.warn(`Route "${oldRoute}" is deprecated. Please use "${newRoute}"`);
+  replace(newRoute.replace(':address', address));
+}
+
+function redirectTo (path) {
+  return (nextState, replace) => {
+    replace(path);
+  };
+}
+
+const accountsRoutes = [
+  { path: ':address', component: Account },
+  { path: '/wallet/:address', component: Wallet }
+];
+
+const addressesRoutes = [
+  { path: ':address', component: Address }
+];
+
+const contractsRoutes = [
+  { path: 'develop', component: WriteContract },
+  { path: ':address', component: Contract }
+];
+
+const settingsRoutes = [
+  { path: 'background', component: SettingsBackground },
+  { path: 'proxy', component: SettingsProxy },
+  { path: 'views', component: SettingsViews },
+  { path: 'parity', component: SettingsParity }
+];
+
+const statusRoutes = [
+  { path: ':subpage', component: Status }
+];
+
+const routes = [
+  // Backward Compatible routes
+  { path: '/account/:address', onEnter: handleDeprecatedRoute },
+  { path: '/address/:address', onEnter: handleDeprecatedRoute },
+  { path: '/contract/:address', onEnter: handleDeprecatedRoute },
+
+  { path: '/', onEnter: redirectTo('/accounts') },
+  { path: '/auth', onEnter: redirectTo('/accounts') },
+  { path: '/settings', onEnter: redirectTo('/settings/views') },
+
+  {
+    path: '/',
+    component: Application,
+    childRoutes: [
+      {
+        path: 'accounts',
+        indexRoute: { component: Accounts },
+        childRoutes: accountsRoutes
+      },
+      {
+        path: 'addresses',
+        indexRoute: { component: Addresses },
+        childRoutes: addressesRoutes
+      },
+      {
+        path: 'contracts',
+        indexRoute: { component: Contracts },
+        childRoutes: contractsRoutes
+      },
+      {
+        path: 'status',
+        indexRoute: { component: Status },
+        childRoutes: statusRoutes
+      },
+      {
+        path: 'settings',
+        component: Settings,
+        childRoutes: settingsRoutes
+      },
+
+      { path: 'apps', component: Dapps },
+      { path: 'app/:id', component: Dapp },
+      { path: 'signer', component: Signer }
+    ]
+  }
+];
+
+export default routes;
-- 
GitLab


From 83d9bc189b6febc532cdbb5894fbcc08aa7f9ba7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tomasz=20Drwi=C4=99ga?= <tomasz@ethcore.io>
Date: Sun, 11 Dec 2016 21:08:15 +0100
Subject: [PATCH 44/64] Fixing test

---
 ethcore/light/src/net/tests/mod.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ethcore/light/src/net/tests/mod.rs b/ethcore/light/src/net/tests/mod.rs
index 0b3226f0d1..46e47bb3cf 100644
--- a/ethcore/light/src/net/tests/mod.rs
+++ b/ethcore/light/src/net/tests/mod.rs
@@ -69,7 +69,7 @@ impl IoContext for Expect {
 		Some(super::MAX_PROTOCOL_VERSION)
 	}
 
-	fn persistent_peer_id(&self, _peer: &PeerId) -> Option<NodeId> {
+	fn persistent_peer_id(&self, _peer: PeerId) -> Option<NodeId> {
 		None
 	}
 }
-- 
GitLab


From 2de64bb5e49219a1052d0b19e80b4f160b51b550 Mon Sep 17 00:00:00 2001
From: GitLab Build Bot <jaco+gitlab@ethcore.io>
Date: Sun, 11 Dec 2016 20:24:36 +0000
Subject: [PATCH 45/64] [ci skip] js-precompiled 20161211-202217

---
 Cargo.lock      | 2 +-
 js/package.json | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index e14857b032..0da2d3b52a 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1290,7 +1290,7 @@ dependencies = [
 [[package]]
 name = "parity-ui-precompiled"
 version = "1.4.0"
-source = "git+https://github.com/ethcore/js-precompiled.git#343c9172fd4378d19046e48b69a0c590a79622ee"
+source = "git+https://github.com/ethcore/js-precompiled.git#76b1f17e5a446de76493530d1d9d330e08d6ceac"
 dependencies = [
  "parity-dapps-glue 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
diff --git a/js/package.json b/js/package.json
index 39b0cf3636..692bc5707d 100644
--- a/js/package.json
+++ b/js/package.json
@@ -1,6 +1,6 @@
 {
   "name": "parity.js",
-  "version": "0.2.115",
+  "version": "0.2.116",
   "main": "release/index.js",
   "jsnext:main": "src/index.js",
   "author": "Parity Team <admin@parity.io>",
-- 
GitLab


From 22ac80d98fa711d42b57346fe8aa88061dd58960 Mon Sep 17 00:00:00 2001
From: Jaco Greeff <jacogr@gmail.com>
Date: Mon, 12 Dec 2016 00:38:38 +0100
Subject: [PATCH 46/64] Add store for AddAddress (#3819)

* WIP

* Updated tests

* Final round of fixes

* Header update
---
 js/src/modals/AddAddress/addAddress.js      | 158 ++++++++++----------
 js/src/modals/AddAddress/addAddress.spec.js |  32 ++++
 js/src/modals/AddAddress/store.js           |  87 +++++++++++
 js/src/modals/AddAddress/store.spec.js      | 128 ++++++++++++++++
 js/src/modals/AddAddress/store.test.js      |  28 ++++
 js/src/ui/Form/Input/input.js               |  55 ++++---
 js/src/ui/Form/InputAddress/inputAddress.js |  45 +++---
 js/src/ui/Modal/modal.js                    |  21 ++-
 js/test/mocha.config.js                     |   4 +-
 9 files changed, 423 insertions(+), 135 deletions(-)
 create mode 100644 js/src/modals/AddAddress/addAddress.spec.js
 create mode 100644 js/src/modals/AddAddress/store.js
 create mode 100644 js/src/modals/AddAddress/store.spec.js
 create mode 100644 js/src/modals/AddAddress/store.test.js

diff --git a/js/src/modals/AddAddress/addAddress.js b/js/src/modals/AddAddress/addAddress.js
index 1772232909..437b876639 100644
--- a/js/src/modals/AddAddress/addAddress.js
+++ b/js/src/modals/AddAddress/addAddress.js
@@ -14,31 +14,29 @@
 // You should have received a copy of the GNU General Public License
 // along with Parity.  If not, see <http://www.gnu.org/licenses/>.
 
-import React, { Component, PropTypes } from 'react';
 import ContentAdd from 'material-ui/svg-icons/content/add';
 import ContentClear from 'material-ui/svg-icons/content/clear';
+import { observer } from 'mobx-react';
+import React, { Component, PropTypes } from 'react';
+import { FormattedMessage } from 'react-intl';
+
+import { Button, Form, Input, InputAddress, Modal } from '~/ui';
 
-import { Button, Modal, Form, Input, InputAddress } from '~/ui';
-import { ERRORS, validateAddress, validateName } from '~/util/validation';
+import Store from './store';
 
+@observer
 export default class AddAddress extends Component {
   static contextTypes = {
     api: PropTypes.object.isRequired
   }
 
   static propTypes = {
-    contacts: PropTypes.object.isRequired,
     address: PropTypes.string,
-    onClose: PropTypes.func
+    contacts: PropTypes.object.isRequired,
+    onClose: PropTypes.func.isRequired
   };
 
-  state = {
-    address: '',
-    addressError: ERRORS.invalidAddress,
-    name: '',
-    nameError: ERRORS.invalidName,
-    description: ''
-  };
+  store = new Store(this.context.api, this.props.contacts);
 
   componentWillMount () {
     if (this.props.address) {
@@ -49,109 +47,113 @@ export default class AddAddress extends Component {
   render () {
     return (
       <Modal
-        visible
         actions={ this.renderDialogActions() }
-        title='add saved address'>
+        title={
+          <FormattedMessage
+            id='addAddress.label'
+            defaultMessage='add saved address' />
+        }
+        visible>
         { this.renderFields() }
       </Modal>
     );
   }
 
   renderDialogActions () {
-    const { addressError, nameError } = this.state;
-    const hasError = !!(addressError || nameError);
+    const { hasError } = this.store;
 
     return ([
       <Button
         icon={ <ContentClear /> }
-        label='Cancel'
-        onClick={ this.onClose } />,
+        label={
+          <FormattedMessage
+            id='addAddress.button.close'
+            defaultMessage='Cancel' />
+        }
+        onClick={ this.onClose }
+        ref='closeButton' />,
       <Button
-        icon={ <ContentAdd /> }
-        label='Save Address'
         disabled={ hasError }
-        onClick={ this.onAdd } />
+        icon={ <ContentAdd /> }
+        label={
+          <FormattedMessage
+            id='addAddress.button.add'
+            defaultMessage='Save Address' />
+        }
+        onClick={ this.onAdd }
+        ref='addButton' />
     ]);
   }
 
   renderFields () {
-    const { address, addressError, description, name, nameError } = this.state;
+    const { address, addressError, description, name, nameError } = this.store;
 
     return (
       <Form>
         <InputAddress
-          label='network address'
-          hint='the network address for the entry'
-          error={ addressError }
-          value={ address }
-          disabled={ !!this.props.address }
           allowCopy={ false }
-          onChange={ this.onEditAddress } />
+          disabled={ !!this.props.address }
+          error={ addressError }
+          hint={
+            <FormattedMessage
+              id='addAddress.input.address.hint'
+              defaultMessage='the network address for the entry' />
+          }
+          label={
+            <FormattedMessage
+              id='addAddress.input.address.label'
+              defaultMessage='network address' />
+          }
+          onChange={ this.onEditAddress }
+          ref='inputAddress'
+          value={ address } />
         <Input
-          label='address name'
-          hint='a descriptive name for the entry'
           error={ nameError }
-          value={ name }
-          onChange={ this.onEditName } />
+          hint={
+            <FormattedMessage
+              id='addAddress.input.name.hint'
+              defaultMessage='a descriptive name for the entry' />
+          }
+          label={
+            <FormattedMessage
+              id='addAddress.input.name.label'
+              defaultMessage='address name' />
+          }
+          onChange={ this.onEditName }
+          ref='inputName'
+          value={ name } />
         <Input
-          multiLine
-          rows={ 1 }
-          label='(optional) address description'
-          hint='an expanded description for the entry'
-          value={ description }
-          onChange={ this.onEditDescription } />
+          hint={
+            <FormattedMessage
+              id='addAddress.input.description.hint'
+              defaultMessage='an expanded description for the entry' />
+          }
+          label={
+            <FormattedMessage
+              id='addAddress.input.description.label'
+              defaultMessage='(optional) address description' />
+          }
+          onChange={ this.onEditDescription }
+          ref='inputDescription'
+          value={ description } />
       </Form>
     );
   }
 
-  onEditAddress = (event, _address) => {
-    const { contacts } = this.props;
-    let { address, addressError } = validateAddress(_address);
-
-    if (!addressError) {
-      const contact = contacts[address];
-
-      if (contact) {
-        addressError = ERRORS.duplicateAddress;
-      }
-    }
-
-    this.setState({
-      address,
-      addressError
-    });
+  onEditAddress = (event, address) => {
+    this.store.setAddress(address);
   }
 
   onEditDescription = (event, description) => {
-    this.setState({
-      description
-    });
+    this.store.setDescription(description);
   }
 
-  onEditName = (event, _name) => {
-    const { name, nameError } = validateName(_name);
-
-    this.setState({
-      name,
-      nameError
-    });
+  onEditName = (event, name) => {
+    this.store.setName(name);
   }
 
   onAdd = () => {
-    const { api } = this.context;
-    const { address, name, description } = this.state;
-
-    Promise.all([
-      api.parity.setAccountName(address, name),
-      api.parity.setAccountMeta(address, {
-        description,
-        timestamp: Date.now(),
-        deleted: false
-      })
-    ]).catch((error) => {
-      console.error('onAdd', error);
-    });
-
+    this.store.add();
     this.props.onClose();
   }
 
diff --git a/js/src/modals/AddAddress/addAddress.spec.js b/js/src/modals/AddAddress/addAddress.spec.js
new file mode 100644
index 0000000000..e03abd9d6f
--- /dev/null
+++ b/js/src/modals/AddAddress/addAddress.spec.js
@@ -0,0 +1,32 @@
+// 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 { shallow } from 'enzyme';
+import React from 'react';
+
+import AddAddress from './';
+
+describe('modals/AddAddress', () => {
+  describe('rendering', () => {
+    it('renders defaults', () => {
+      expect(
+        shallow(
+          <AddAddress />
+        )
+      ).to.be.ok;
+    });
+  });
+});
diff --git a/js/src/modals/AddAddress/store.js b/js/src/modals/AddAddress/store.js
new file mode 100644
index 0000000000..fd248a361d
--- /dev/null
+++ b/js/src/modals/AddAddress/store.js
@@ -0,0 +1,87 @@
+// 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 { action, computed, transaction, observable } from 'mobx';
+
+import { ERRORS, validateAddress, validateName } from '~/util/validation';
+
+export default class Store {
+  @observable address = '';
+  @observable addressError = ERRORS.invalidAddress;
+  @observable createError = null;
+  @observable description = '';
+  @observable name = '';
+  @observable nameError = ERRORS.invalidName;
+
+  constructor (api, contacts) {
+    this._api = api;
+    this._contacts = contacts;
+  }
+
+  @computed get hasError () {
+    return !!(this.addressError || this.nameError);
+  }
+
+  @action setAddress = (_address) => {
+    let { address, addressError } = validateAddress(_address);
+
+    if (!addressError) {
+      const contact = this._contacts[address];
+
+      if (contact) {
+        addressError = ERRORS.duplicateAddress;
+      }
+    }
+
+    transaction(() => {
+      this.address = address;
+      this.addressError = addressError;
+    });
+  }
+
+  @action setCreateError = (error) => {
+    this.createError = error;
+  }
+
+  @action setDescription = (description) => {
+    this.description = description;
+  }
+
+  @action setName = (_name) => {
+    const { name, nameError } = validateName(_name);
+
+    transaction(() => {
+      this.name = name;
+      this.nameError = nameError;
+    });
+  }
+
+  add () {
+    return Promise
+      .all([
+        this._api.parity.setAccountName(this.address, this.name),
+        this._api.parity.setAccountMeta(this.address, {
+          description: this.description,
+          timestamp: Date.now(),
+          deleted: false
+        })
+      ])
+      .catch((error) => {
+        console.warn('Store:add', error);
+        this.setCreateError(error);
+      });
+  }
+}
diff --git a/js/src/modals/AddAddress/store.spec.js b/js/src/modals/AddAddress/store.spec.js
new file mode 100644
index 0000000000..c730fa32f3
--- /dev/null
+++ b/js/src/modals/AddAddress/store.spec.js
@@ -0,0 +1,128 @@
+// 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 sinon from 'sinon';
+
+import Store from './store';
+
+import { TEST_ADDR_A, TEST_ADDR_B, TEST_CONTACTS } from './store.test.js';
+
+describe('modals/AddAddress/store', () => {
+  let store;
+
+  describe('@action', () => {
+    beforeEach(() => {
+      store = new Store(null, TEST_CONTACTS);
+    });
+
+    describe('setAddress', () => {
+      it('successfully sets non-existent addresses', () => {
+        store.setAddress(TEST_ADDR_B);
+
+        expect(store.addressError).to.be.null;
+        expect(store.address).to.equal(TEST_ADDR_B);
+      });
+
+      it('fails on invalid addresses', () => {
+        store.setAddress('0xinvalid');
+
+        expect(store.addressError).not.to.be.null;
+      });
+
+      it('fails when an address is already added', () => {
+        store.setAddress(TEST_ADDR_A);
+
+        expect(store.addressError).not.to.be.null;
+      });
+    });
+
+    describe('setName', () => {
+      it('sucessfully sets valid names', () => {
+        const name = 'Test Name';
+
+        store.setName(name);
+
+        expect(store.nameError).to.be.null;
+        expect(store.name).to.equal(name);
+      });
+
+      it('fails when name is invalid', () => {
+        store.setName(null);
+
+        expect(store.nameError).not.to.be.null;
+      });
+    });
+  });
+
+  describe('@computed', () => {
+    beforeEach(() => {
+      store = new Store(null, TEST_CONTACTS);
+    });
+
+    describe('hasError', () => {
+      beforeEach(() => {
+        store.setAddress(TEST_ADDR_B);
+        store.setName('Test Name');
+      });
+
+      it('returns false proper inputs', () => {
+        expect(store.hasError).to.be.false;
+      });
+
+      it('returns true with addressError', () => {
+        store.setAddress(TEST_ADDR_A);
+
+        expect(store.addressError).not.to.be.null;
+        expect(store.hasError).to.be.true;
+      });
+
+      it('returns true with nameError', () => {
+        store.setName(null);
+
+        expect(store.nameError).not.to.be.null;
+        expect(store.hasError).to.be.true;
+      });
+    });
+  });
+
+  describe('methods', () => {
+    let api;
+
+    beforeEach(() => {
+      api = {
+        parity: {
+          setAccountMeta: sinon.stub().resolves(true),
+          setAccountName: sinon.stub().resolves(true)
+        }
+      };
+      store = new Store(api, {});
+    });
+
+    describe('add', () => {
+      it('calls setAccountMeta', () => {
+        store.add();
+
+        expect(api.parity.setAccountMeta).to.have.been.called;
+      });
+
+      it('calls setAccountName', () => {
+        store.add();
+
+        expect(api.parity.setAccountName).to.have.been.called;
+      });
+    });
+  });
+});
diff --git a/js/src/modals/AddAddress/store.test.js b/js/src/modals/AddAddress/store.test.js
new file mode 100644
index 0000000000..1d497a328f
--- /dev/null
+++ b/js/src/modals/AddAddress/store.test.js
@@ -0,0 +1,28 @@
+// 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/>.
+
+const TEST_ADDR_A = '0x63Cf90D3f0410092FC0fca41846f596223979195';
+const TEST_ADDR_B = '0x00A40dEfa9933e82244bE542Fa7F8748eCCdd457';
+
+const TEST_CONTACTS = {
+  [TEST_ADDR_A]: { name: 'test', meta: {} }
+};
+
+export {
+  TEST_ADDR_A,
+  TEST_ADDR_B,
+  TEST_CONTACTS
+};
diff --git a/js/src/ui/Form/Input/input.js b/js/src/ui/Form/Input/input.js
index b11400d049..8351de2e60 100644
--- a/js/src/ui/Form/Input/input.js
+++ b/js/src/ui/Form/Input/input.js
@@ -18,6 +18,8 @@ import React, { Component, PropTypes } from 'react';
 import { TextField } from 'material-ui';
 import { noop } from 'lodash';
 
+import { nodeOrStringProptype } from '~/util/proptypes';
+
 import CopyToClipboard from '../../CopyToClipboard';
 
 import styles from './input.css';
@@ -41,18 +43,21 @@ const NAME_ID = ' ';
 
 export default class Input extends Component {
   static propTypes = {
-    children: PropTypes.node,
-    className: PropTypes.string,
-    disabled: PropTypes.bool,
-    readOnly: PropTypes.bool,
     allowCopy: PropTypes.oneOfType([
       PropTypes.string,
       PropTypes.bool
     ]),
-    floatCopy: PropTypes.bool,
+    children: PropTypes.node,
+    className: PropTypes.string,
+    disabled: PropTypes.bool,
     error: PropTypes.string,
-    hint: PropTypes.string,
-    label: PropTypes.string,
+    readOnly: PropTypes.bool,
+    floatCopy: PropTypes.bool,
+    hint: nodeOrStringProptype(),
+    hideUnderline: PropTypes.bool,
+    label: nodeOrStringProptype(),
+    max: PropTypes.any,
+    min: PropTypes.any,
     multiLine: PropTypes.bool,
     onBlur: PropTypes.func,
     onChange: PropTypes.func,
@@ -61,26 +66,26 @@ export default class Input extends Component {
     rows: PropTypes.number,
     type: PropTypes.string,
     submitOnBlur: PropTypes.bool,
-    hideUnderline: PropTypes.bool,
+    style: PropTypes.object,
     value: PropTypes.oneOfType([
-      PropTypes.number, PropTypes.string
-    ]),
-    min: PropTypes.any,
-    max: PropTypes.any,
-    style: PropTypes.object
+      PropTypes.number,
+      PropTypes.string
+    ])
   };
 
   static defaultProps = {
-    submitOnBlur: true,
-    readOnly: false,
     allowCopy: false,
     hideUnderline: false,
     floatCopy: false,
+    readOnly: false,
+    submitOnBlur: true,
     style: {}
   }
 
   state = {
-    value: typeof this.props.value === 'undefined' ? '' : this.props.value
+    value: typeof this.props.value === 'undefined'
+      ? ''
+      : this.props.value
   }
 
   componentWillReceiveProps (newProps) {
@@ -114,38 +119,29 @@ export default class Input extends Component {
           autoComplete='off'
           className={ className }
           errorText={ error }
-
           floatingLabelFixed
           floatingLabelText={ label }
-
+          fullWidth
           hintText={ hint }
           id={ NAME_ID }
           inputStyle={ inputStyle }
-          fullWidth
-
           max={ max }
           min={ min }
-
           multiLine={ multiLine }
           name={ NAME_ID }
-
           onBlur={ this.onBlur }
           onChange={ this.onChange }
           onKeyDown={ this.onKeyDown }
           onPaste={ this.onPaste }
-
           readOnly={ readOnly }
           rows={ rows }
           style={ textFieldStyle }
           type={ type || 'text' }
-
           underlineDisabledStyle={ UNDERLINE_DISABLED }
           underlineStyle={ readOnly ? UNDERLINE_READONLY : UNDERLINE_NORMAL }
           underlineFocusStyle={ readOnly ? { display: 'none' } : null }
           underlineShow={ !hideUnderline }
-
-          value={ value }
-        >
+          value={ value }>
           { children }
         </TextField>
       </div>
@@ -159,11 +155,14 @@ export default class Input extends Component {
     if (!allowCopy) {
       return null;
     }
+
     const text = typeof allowCopy === 'string'
       ? allowCopy
       : value;
 
-    const style = hideUnderline ? {} : { position: 'relative', top: '2px' };
+    const style = hideUnderline
+      ? {}
+      : { position: 'relative', top: '2px' };
 
     return (
       <div className={ styles.copy } style={ style }>
diff --git a/js/src/ui/Form/InputAddress/inputAddress.js b/js/src/ui/Form/InputAddress/inputAddress.js
index 1f062382ae..e2a0707d54 100644
--- a/js/src/ui/Form/InputAddress/inputAddress.js
+++ b/js/src/ui/Form/InputAddress/inputAddress.js
@@ -18,28 +18,30 @@ import React, { Component, PropTypes } from 'react';
 import { connect } from 'react-redux';
 import { bindActionCreators } from 'redux';
 
-import Input from '../Input';
-import IdentityIcon from '../../IdentityIcon';
 import util from '~/api/util';
+import { nodeOrStringProptype } from '~/util/proptypes';
+
+import IdentityIcon from '../../IdentityIcon';
+import Input from '../Input';
 
 import styles from './inputAddress.css';
 
 class InputAddress extends Component {
   static propTypes = {
+    accountsInfo: PropTypes.object,
+    allowCopy: PropTypes.bool,
     className: PropTypes.string,
     disabled: PropTypes.bool,
     error: PropTypes.string,
-    label: PropTypes.string,
-    hint: PropTypes.string,
-    value: PropTypes.string,
-    accountsInfo: PropTypes.object,
-    tokens: PropTypes.object,
-    text: PropTypes.bool,
+    hideUnderline: PropTypes.bool,
+    hint: nodeOrStringProptype(),
+    label: nodeOrStringProptype(),
     onChange: PropTypes.func,
     onSubmit: PropTypes.func,
-    hideUnderline: PropTypes.bool,
-    allowCopy: PropTypes.bool,
-    small: PropTypes.bool
+    small: PropTypes.bool,
+    text: PropTypes.bool,
+    tokens: PropTypes.object,
+    value: PropTypes.string
   };
 
   static defaultProps = {
@@ -49,8 +51,8 @@ class InputAddress extends Component {
   };
 
   render () {
-    const { className, disabled, error, label, hint, value, text } = this.props;
-    const { small, allowCopy, hideUnderline, onSubmit, accountsInfo, tokens } = this.props;
+    const { className, disabled, error, hint, label, text, value } = this.props;
+    const { accountsInfo, allowCopy, hideUnderline, onSubmit, small, tokens } = this.props;
 
     const account = accountsInfo[value] || tokens[value];
 
@@ -68,17 +70,20 @@ class InputAddress extends Component {
     return (
       <div className={ containerClasses.join(' ') }>
         <Input
+          allowCopy={ allowCopy && (disabled ? value : false) }
           className={ classes.join(' ') }
           disabled={ disabled }
-          label={ label }
-          hint={ hint }
           error={ error }
-          value={ text && account ? account.name : value }
+          hideUnderline={ hideUnderline }
+          hint={ hint }
+          label={ label }
           onChange={ this.handleInputChange }
           onSubmit={ onSubmit }
-          allowCopy={ allowCopy && (disabled ? value : false) }
-          hideUnderline={ hideUnderline }
-        />
+          value={
+            text && account
+              ? account.name
+              : value
+          } />
         { icon }
       </div>
     );
@@ -128,8 +133,8 @@ class InputAddress extends Component {
 }
 
 function mapStateToProps (state) {
-  const { accountsInfo } = state.personal;
   const { tokens } = state.balances;
+  const { accountsInfo } = state.personal;
 
   return {
     accountsInfo,
diff --git a/js/src/ui/Modal/modal.js b/js/src/ui/Modal/modal.js
index fd8e67aada..f72c3ffb1b 100644
--- a/js/src/ui/Modal/modal.js
+++ b/js/src/ui/Modal/modal.js
@@ -42,11 +42,11 @@ class Modal extends Component {
     className: PropTypes.string,
     compact: PropTypes.bool,
     current: PropTypes.number,
-    waiting: PropTypes.array,
+    settings: PropTypes.object.isRequired,
     steps: PropTypes.array,
     title: nodeOrStringProptype(),
     visible: PropTypes.bool.isRequired,
-    settings: PropTypes.object.isRequired
+    waiting: PropTypes.array
   }
 
   render () {
@@ -55,23 +55,23 @@ class Modal extends Component {
     const contentStyle = muiTheme.parity.getBackgroundStyle(null, settings.backgroundSeed);
     const header = (
       <Title
-        current={ current }
         busy={ busy }
-        waiting={ waiting }
+        current={ current }
         steps={ steps }
-        title={ title } />
+        title={ title }
+        waiting={ waiting } />
     );
     const classes = `${styles.dialog} ${className}`;
 
     return (
       <Dialog
-        className={ classes }
         actions={ actions }
+        actionsContainerClassName={ styles.actions }
         actionsContainerStyle={ ACTIONS_STYLE }
         autoDetectWindowHeight={ false }
         autoScrollBodyContent
-        actionsContainerClassName={ styles.actions }
         bodyClassName={ styles.body }
+        className={ classes }
         contentClassName={ styles.content }
         contentStyle={ contentStyle }
         modal
@@ -82,7 +82,12 @@ class Modal extends Component {
         style={ DIALOG_STYLE }
         title={ header }
         titleStyle={ TITLE_STYLE }>
-        <Container light compact={ compact } style={ { transition: 'none' } }>
+        <Container
+          compact={ compact }
+          light
+          style={
+            { transition: 'none' }
+          }>
           { children }
         </Container>
       </Dialog>
diff --git a/js/test/mocha.config.js b/js/test/mocha.config.js
index e90c91ebff..3201cd4ac3 100644
--- a/js/test/mocha.config.js
+++ b/js/test/mocha.config.js
@@ -15,11 +15,13 @@
 // along with Parity.  If not, see <http://www.gnu.org/licenses/>.
 
 import 'isomorphic-fetch';
+import 'mock-local-storage';
 
 import es6Promise from 'es6-promise';
 es6Promise.polyfill();
 
-import 'mock-local-storage';
+import injectTapEventPlugin from 'react-tap-event-plugin';
+injectTapEventPlugin();
 
 import chai from 'chai';
 import chaiAsPromised from 'chai-as-promised';
-- 
GitLab


From 0cb16ae5895b5457a4d43881c22f4a35a0a5939c Mon Sep 17 00:00:00 2001
From: Nicolas Gotchac <ngotchac@gmail.com>
Date: Mon, 12 Dec 2016 00:38:47 +0100
Subject: [PATCH 47/64] Add store for MethodDecoding (#3821)

* Add Loader to Transactions

* Add Method Decoding Store (better fetching of methods)

* Load locally stored ABI in MethodDecodingStore

* Fixes UI glitches along the way

* Linting

* Add method decoding from User Contracts
---
 js/src/redux/providers/personalActions.js     |   5 +
 js/src/ui/Form/AddressSelect/addressSelect.js |  56 +++--
 js/src/ui/Form/AutoComplete/autocomplete.css  |  24 ++
 js/src/ui/Form/AutoComplete/autocomplete.js   |  22 +-
 js/src/ui/MethodDecoding/methodDecoding.js    | 136 +++--------
 .../ui/MethodDecoding/methodDecodingStore.js  | 216 ++++++++++++++++++
 .../Account/Transactions/transactions.js      |  27 ++-
 js/src/views/WriteContract/writeContract.css  |   4 +
 8 files changed, 359 insertions(+), 131 deletions(-)
 create mode 100644 js/src/ui/Form/AutoComplete/autocomplete.css
 create mode 100644 js/src/ui/MethodDecoding/methodDecodingStore.js

diff --git a/js/src/redux/providers/personalActions.js b/js/src/redux/providers/personalActions.js
index b172aaf8df..7ca7c3374e 100644
--- a/js/src/redux/providers/personalActions.js
+++ b/js/src/redux/providers/personalActions.js
@@ -19,6 +19,8 @@ import { isEqual } from 'lodash';
 import { fetchBalances } from './balancesActions';
 import { attachWallets } from './walletActions';
 
+import MethodDecodingStore from '~/ui/MethodDecoding/methodDecodingStore';
+
 export function personalAccountsInfo (accountsInfo) {
   const accounts = {};
   const contacts = {};
@@ -41,6 +43,9 @@ export function personalAccountsInfo (accountsInfo) {
       }
     });
 
+  // Load user contracts for Method Decoding
+  MethodDecodingStore.loadContracts(contracts);
+
   return (dispatch) => {
     const data = {
       accountsInfo,
diff --git a/js/src/ui/Form/AddressSelect/addressSelect.js b/js/src/ui/Form/AddressSelect/addressSelect.js
index 3fb15cd863..c443ecaa2f 100644
--- a/js/src/ui/Form/AddressSelect/addressSelect.js
+++ b/js/src/ui/Form/AddressSelect/addressSelect.js
@@ -16,6 +16,7 @@
 
 import React, { Component, PropTypes } from 'react';
 import { MenuItem } from 'material-ui';
+import { isEqual, pick } from 'lodash';
 
 import AutoComplete from '../AutoComplete';
 import IdentityIcon from '../../IdentityIcon';
@@ -31,19 +32,20 @@ export default class AddressSelect extends Component {
   }
 
   static propTypes = {
-    disabled: PropTypes.bool,
+    onChange: PropTypes.func.isRequired,
+
     accounts: PropTypes.object,
+    allowInput: PropTypes.bool,
+    balances: PropTypes.object,
     contacts: PropTypes.object,
     contracts: PropTypes.object,
-    wallets: PropTypes.object,
-    label: PropTypes.string,
-    hint: PropTypes.string,
+    disabled: PropTypes.bool,
     error: PropTypes.string,
-    value: PropTypes.string,
+    hint: PropTypes.string,
+    label: PropTypes.string,
     tokens: PropTypes.object,
-    onChange: PropTypes.func.isRequired,
-    allowInput: PropTypes.bool,
-    balances: PropTypes.object
+    value: PropTypes.string,
+    wallets: PropTypes.object
   }
 
   state = {
@@ -53,6 +55,9 @@ export default class AddressSelect extends Component {
     value: ''
   }
 
+  // Cache autocomplete items
+  items = {}
+
   entriesFromProps (props = this.props) {
     const { accounts = {}, contacts = {}, contracts = {}, wallets = {} } = props;
 
@@ -76,6 +81,15 @@ export default class AddressSelect extends Component {
     return { autocompleteEntries, entries };
   }
 
+  shouldComponentUpdate (nextProps, nextState) {
+    const keys = [ 'error', 'value' ];
+
+    const prevValues = pick(this.props, keys);
+    const nextValues = pick(nextProps, keys);
+
+    return !isEqual(prevValues, nextValues);
+  }
+
   componentWillMount () {
     const { value } = this.props;
     const { entries, autocompleteEntries } = this.entriesFromProps();
@@ -143,14 +157,21 @@ export default class AddressSelect extends Component {
   renderItem = (entry) => {
     const { address, name } = entry;
 
-    return {
-      text: name && name.toUpperCase() || address,
-      value: this.renderMenuItem(address),
-      address
-    };
+    const _balance = this.getBalance(address);
+    const balance = _balance ? _balance.toNumber() : _balance;
+
+    if (!this.items[address] || this.items[address].balance !== balance) {
+      this.items[address] = {
+        text: name && name.toUpperCase() || address,
+        value: this.renderMenuItem(address),
+        address, balance
+      };
+    }
+
+    return this.items[address];
   }
 
-  renderBalance (address) {
+  getBalance (address) {
     const { balances = {} } = this.props;
     const balance = balances[address];
 
@@ -164,7 +185,12 @@ export default class AddressSelect extends Component {
       return null;
     }
 
-    const value = fromWei(ethToken.value);
+    return ethToken.value;
+  }
+
+  renderBalance (address) {
+    const balance = this.getBalance(address);
+    const value = fromWei(balance);
 
     return (
       <div className={ styles.balance }>
diff --git a/js/src/ui/Form/AutoComplete/autocomplete.css b/js/src/ui/Form/AutoComplete/autocomplete.css
new file mode 100644
index 0000000000..9fad53edbb
--- /dev/null
+++ b/js/src/ui/Form/AutoComplete/autocomplete.css
@@ -0,0 +1,24 @@
+/* Copyright 2015, 2016 Ethcore (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/>.
+*/
+
+.item {
+  &:last-child {
+    &.divider {
+      display: none;
+    }
+  }
+}
diff --git a/js/src/ui/Form/AutoComplete/autocomplete.js b/js/src/ui/Form/AutoComplete/autocomplete.js
index c98019009f..3ebd597723 100644
--- a/js/src/ui/Form/AutoComplete/autocomplete.js
+++ b/js/src/ui/Form/AutoComplete/autocomplete.js
@@ -21,13 +21,18 @@ import { PopoverAnimationVertical } from 'material-ui/Popover';
 
 import { isEqual } from 'lodash';
 
+import styles from './autocomplete.css';
+
 // Hack to prevent "Unknown prop `disableFocusRipple` on <hr> tag" error
 class Divider extends Component {
   static muiName = MUIDivider.muiName;
 
   render () {
     return (
-      <div style={ { margin: '0.25em 0' } }>
+      <div
+        style={ { margin: '0.25em 0' } }
+        className={ [styles.item, styles.divider].join(' ') }
+      >
         <MUIDivider style={ { height: 2 } } />
       </div>
     );
@@ -143,11 +148,16 @@ export default class AutoComplete extends Component {
 
       if (renderItem && typeof renderItem === 'function') {
         item = renderItem(entry);
+
+        // Add the item class to the entry
+        const classNames = [ styles.item ].concat(item.value.props.className);
+        item.value = React.cloneElement(item.value, { className: classNames.join(' ') });
       } else {
         item = {
           text: entry,
           value: (
             <MenuItem
+              className={ styles.item }
               primaryText={ entry }
             />
           )
@@ -160,6 +170,7 @@ export default class AutoComplete extends Component {
       }
 
       item.divider = currentDivider;
+      item.entry = entry;
 
       return item;
     }).filter((item) => item !== undefined);
@@ -215,13 +226,8 @@ export default class AutoComplete extends Component {
       return;
     }
 
-    const { entries } = this.props;
-
-    const entriesArray = (entries instanceof Array)
-      ? entries
-      : Object.values(entries);
-
-    const entry = entriesArray[idx];
+    const { dataSource } = this.state;
+    const { entry } = dataSource[idx];
 
     this.handleOnChange(entry);
     this.setState({ entry, open: false });
diff --git a/js/src/ui/MethodDecoding/methodDecoding.js b/js/src/ui/MethodDecoding/methodDecoding.js
index e02355ffb5..fcf7f75132 100644
--- a/js/src/ui/MethodDecoding/methodDecoding.js
+++ b/js/src/ui/MethodDecoding/methodDecoding.js
@@ -17,16 +17,14 @@
 import BigNumber from 'bignumber.js';
 import React, { Component, PropTypes } from 'react';
 import { connect } from 'react-redux';
-import { bindActionCreators } from 'redux';
 import CircularProgress from 'material-ui/CircularProgress';
 
-import Contracts from '~/contracts';
 import { Input, InputAddress } from '../Form';
+import MethodDecodingStore from './methodDecodingStore';
 
 import styles from './methodDecoding.css';
 
 const ASCII_INPUT = /^[a-z0-9\s,?;.:/!()-_@'"#]+$/i;
-const CONTRACT_CREATE = '0x60606040';
 const TOKEN_METHODS = {
   '0xa9059cbb': 'transfer(to,value)'
 };
@@ -38,19 +36,17 @@ class MethodDecoding extends Component {
 
   static propTypes = {
     address: PropTypes.string.isRequired,
-    tokens: PropTypes.object,
+    token: PropTypes.object,
     transaction: PropTypes.object,
     historic: PropTypes.bool
   }
 
   state = {
     contractAddress: null,
-    method: null,
     methodName: null,
     methodInputs: null,
     methodParams: null,
     methodSignature: null,
-    token: null,
     isContract: false,
     isDeploy: false,
     isReceived: false,
@@ -59,14 +55,29 @@ class MethodDecoding extends Component {
     inputType: 'auto'
   }
 
-  componentWillMount () {
-    const lookupResult = this.lookup();
+  methodDecodingStore = MethodDecodingStore.get(this.context.api);
 
-    if (typeof lookupResult === 'object' && typeof lookupResult.then === 'function') {
-      lookupResult.then(() => this.setState({ isLoading: false }));
-    } else {
-      this.setState({ isLoading: false });
-    }
+  componentWillMount () {
+    const { address, transaction } = this.props;
+
+    this
+      .methodDecodingStore
+      .lookup(address, transaction)
+      .then((lookup) => {
+        const newState = {
+          methodName: lookup.name,
+          methodInputs: lookup.inputs,
+          methodParams: lookup.params,
+          methodSignature: lookup.signature,
+
+          isContract: lookup.contract,
+          isDeploy: lookup.deploy,
+          isLoading: false,
+          isReceived: lookup.received
+        };
+
+        this.setState(newState);
+      });
   }
 
   render () {
@@ -116,7 +127,8 @@ class MethodDecoding extends Component {
   }
 
   renderAction () {
-    const { methodName, methodInputs, methodSignature, token, isDeploy, isReceived, isContract } = this.state;
+    const { token } = this.props;
+    const { methodName, methodInputs, methodSignature, isDeploy, isReceived, isContract } = this.state;
 
     if (isDeploy) {
       return this.renderDeploy();
@@ -378,7 +390,7 @@ class MethodDecoding extends Component {
   }
 
   renderTokenValue (value) {
-    const { token } = this.state;
+    const { token } = this.props;
 
     return (
       <span className={ styles.tokenValue }>
@@ -436,96 +448,18 @@ class MethodDecoding extends Component {
     });
   }
 
-  lookup () {
-    const { transaction } = this.props;
-
-    if (!transaction) {
-      return;
-    }
-
-    const { api } = this.context;
-    const { address, tokens } = this.props;
-
-    const isReceived = transaction.to === address;
-    const contractAddress = isReceived ? transaction.from : transaction.to;
-    const input = transaction.input || transaction.data;
-
-    const token = (tokens || {})[contractAddress];
-    this.setState({ token, isReceived, contractAddress });
-
-    if (!input || input === '0x') {
-      return;
-    }
-
-    const { signature, paramdata } = api.util.decodeCallData(input);
-    this.setState({ methodSignature: signature, methodParams: paramdata });
-
-    if (!signature || signature === CONTRACT_CREATE || transaction.creates) {
-      this.setState({ isDeploy: true });
-      return;
-    }
-
-    if (contractAddress === '0x') {
-      return;
-    }
-
-    return api.eth
-      .getCode(contractAddress || transaction.creates)
-      .then((bytecode) => {
-        const isContract = bytecode && /^(0x)?([0]*[1-9a-f]+[0]*)+$/.test(bytecode);
-
-        this.setState({ isContract });
-
-        if (!isContract) {
-          return;
-        }
-
-        return Contracts.get()
-          .signatureReg
-          .lookup(signature)
-          .then((method) => {
-            let methodInputs = null;
-            let methodName = null;
-
-            if (method && method.length) {
-              const { methodParams } = this.state;
-              const abi = api.util.methodToAbi(method);
-
-              methodName = abi.name;
-              methodInputs = api.util
-                .decodeMethodInput(abi, methodParams)
-                .map((value, index) => {
-                  const type = abi.inputs[index].type;
-
-                  return { type, value };
-                });
-            }
-
-            this.setState({
-              method,
-              methodName,
-              methodInputs,
-              bytecode
-            });
-          });
-      })
-      .catch((error) => {
-        console.warn('lookup', error);
-      });
-  }
 }
 
-function mapStateToProps (state) {
-  const { tokens } = state.balances;
+function mapStateToProps (initState, initProps) {
+  const { tokens } = initState.balances;
+  const { address } = initProps;
 
-  return { tokens };
-}
+  const token = (tokens || {})[address];
 
-function mapDispatchToProps (dispatch) {
-  return bindActionCreators({}, dispatch);
+  return () => {
+    return { token };
+  };
 }
-
 export default connect(
-  mapStateToProps,
-  mapDispatchToProps
+  mapStateToProps
 )(MethodDecoding);
diff --git a/js/src/ui/MethodDecoding/methodDecodingStore.js b/js/src/ui/MethodDecoding/methodDecodingStore.js
new file mode 100644
index 0000000000..24433e5410
--- /dev/null
+++ b/js/src/ui/MethodDecoding/methodDecodingStore.js
@@ -0,0 +1,216 @@
+// Copyright 2015, 2016 Ethcore (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 Contracts from '~/contracts';
+import Abi from '~/abi';
+import * as abis from '~/contracts/abi';
+
+const CONTRACT_CREATE = '0x60606040';
+
+let instance = null;
+
+export default class MethodDecodingStore {
+
+  api = null;
+
+  _isContract = {};
+  _methods = {};
+
+  constructor (api, contracts = {}) {
+    this.api = api;
+
+    // Load the signatures from the local ABIs
+    Object.keys(abis).forEach((abiKey) => {
+      this.loadFromAbi(abis[abiKey]);
+    });
+
+    this.addContracts(contracts);
+  }
+
+  addContracts (contracts = {}) {
+    // Load the User defined contracts
+    Object.values(contracts).forEach((contract) => {
+      if (!contract || !contract.meta || !contract.meta.abi) {
+        return;
+      }
+      this.loadFromAbi(contract.meta.abi);
+    });
+  }
+
+  loadFromAbi (_abi) {
+    const abi = new Abi(_abi);
+    abi
+      .functions
+      .map((f) => ({ sign: f.signature, abi: f.abi }))
+      .forEach((mapping) => {
+        const sign = (/^0x/.test(mapping.sign) ? '' : '0x') + mapping.sign;
+        this._methods[sign] = mapping.abi;
+      });
+  }
+
+  static get (api, contracts = {}) {
+    if (!instance) {
+      instance = new MethodDecodingStore(api, contracts);
+    }
+
+    // Set API if not set yet
+    if (!instance.api) {
+      instance.api = api;
+    }
+
+    return instance;
+  }
+
+  static loadContracts (contracts = {}) {
+    if (!instance) {
+      // Just create the instance with null API
+      MethodDecodingStore.get(null, contracts);
+    } else {
+      instance.addContracts(contracts);
+    }
+  }
+
+  /**
+   * Looks up a transaction in the context of the given
+   * address
+   *
+   * @param  {String} address      The address contract
+   * @param  {Object} transaction  The transaction to lookup
+   * @return {Promise}             The result of the lookup. Resolves with:
+   *      {
+   *        contract: Boolean,
+   *        deploy: Boolean,
+   *        inputs: Array,
+   *        name: String,
+   *        params: Array,
+   *        received: Boolean,
+   *        signature: String
+   *      }
+   */
+  lookup (address, transaction) {
+    const result = {};
+
+    if (!transaction) {
+      return Promise.resolve(result);
+    }
+
+    const isReceived = transaction.to === address;
+    const contractAddress = isReceived ? transaction.from : transaction.to;
+    const input = transaction.input || transaction.data;
+
+    result.received = isReceived;
+
+    // No input, should be a ETH transfer
+    if (!input || input === '0x') {
+      return Promise.resolve(result);
+    }
+
+    const { signature, paramdata } = this.api.util.decodeCallData(input);
+    result.signature = signature;
+    result.params = paramdata;
+
+    // Contract deployment
+    if (!signature || signature === CONTRACT_CREATE || transaction.creates) {
+      return Promise.resolve({ ...result, deploy: true });
+    }
+
+    return this
+      .isContract(contractAddress || transaction.creates)
+      .then((isContract) => {
+        result.contract = isContract;
+
+        if (!isContract) {
+          return result;
+        }
+
+        return this
+          .fetchMethodAbi(signature)
+          .then((abi) => {
+            let methodName = null;
+            let methodInputs = null;
+
+            if (abi) {
+              methodName = abi.name;
+              methodInputs = this.api.util
+                .decodeMethodInput(abi, paramdata)
+                .map((value, index) => {
+                  const type = abi.inputs[index].type;
+                  return { type, value };
+                });
+            }
+
+            return {
+              ...result,
+              name: methodName,
+              inputs: methodInputs
+            };
+          });
+      })
+      .catch((error) => {
+        console.warn('lookup', error);
+      });
+  }
+
+  fetchMethodAbi (signature) {
+    if (this._methods[signature] !== undefined) {
+      return Promise.resolve(this._methods[signature]);
+    }
+
+    this._methods[signature] = Contracts.get()
+      .signatureReg
+      .lookup(signature)
+      .then((method) => {
+        let abi = null;
+
+        if (method && method.length) {
+          abi = this.api.util.methodToAbi(method);
+        }
+
+        this._methods[signature] = abi;
+        return this._methods[signature];
+      });
+
+    return Promise.resolve(this._methods[signature]);
+  }
+
+  /**
+   * Checks (and caches) if the given address is a
+   * Contract or not, from its fetched bytecode
+   */
+  isContract (contractAddress) {
+    // If zero address, it isn't a contract
+    if (/^(0x)?0*$/.test(contractAddress)) {
+      return Promise.resolve(false);
+    }
+
+    if (this._isContract[contractAddress]) {
+      return Promise.resolve(this._isContract[contractAddress]);
+    }
+
+    this._isContract[contractAddress] = this.api.eth
+      .getCode(contractAddress)
+      .then((bytecode) => {
+        // Is a contract if the address contains *valid* bytecode
+        const _isContract = bytecode && /^(0x)?([0]*[1-9a-f]+[0]*)+$/.test(bytecode);
+
+        this._isContract[contractAddress] = _isContract;
+        return this._isContract[contractAddress];
+      });
+
+    return Promise.resolve(this._isContract[contractAddress]);
+  }
+
+}
diff --git a/js/src/views/Account/Transactions/transactions.js b/js/src/views/Account/Transactions/transactions.js
index b8b28208f5..eb11e8def4 100644
--- a/js/src/views/Account/Transactions/transactions.js
+++ b/js/src/views/Account/Transactions/transactions.js
@@ -19,7 +19,7 @@ import { connect } from 'react-redux';
 import { bindActionCreators } from 'redux';
 
 import etherscan from '~/3rdparty/etherscan';
-import { Container, TxList } from '~/ui';
+import { Container, TxList, Loading } from '~/ui';
 
 import styles from './transactions.css';
 
@@ -60,19 +60,32 @@ class Transactions extends Component {
   }
 
   render () {
-    const { address } = this.props;
-    const { hashes } = this.state;
-
     return (
       <Container title='transactions'>
-        <TxList
-          address={ address }
-          hashes={ hashes } />
+        { this.renderTransactionList() }
         { this.renderEtherscanFooter() }
       </Container>
     );
   }
 
+  renderTransactionList () {
+    const { address } = this.props;
+    const { hashes, loading } = this.state;
+
+    if (loading) {
+      return (
+        <Loading />
+      );
+    }
+
+    return (
+      <TxList
+        address={ address }
+        hashes={ hashes }
+      />
+    );
+  }
+
   renderEtherscanFooter () {
     const { traceMode } = this.props;
 
diff --git a/js/src/views/WriteContract/writeContract.css b/js/src/views/WriteContract/writeContract.css
index ca47e7332c..2502c40603 100644
--- a/js/src/views/WriteContract/writeContract.css
+++ b/js/src/views/WriteContract/writeContract.css
@@ -32,6 +32,10 @@
   flex: 1;
   flex-direction: row;
 
+  // Fallback for browsers not supporting `calc`
+  min-height: 90vh;
+  min-height: calc(100vh - 8em);
+
   > * {
     margin: 0;
 
-- 
GitLab


From 29af24519d20b14e43df894b5731eb20b20f8ce2 Mon Sep 17 00:00:00 2001
From: GitLab Build Bot <jaco+gitlab@ethcore.io>
Date: Sun, 11 Dec 2016 23:48:03 +0000
Subject: [PATCH 48/64] [ci skip] js-precompiled 20161211-234535

---
 Cargo.lock      | 2 +-
 js/package.json | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 0da2d3b52a..3bd3723264 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1290,7 +1290,7 @@ dependencies = [
 [[package]]
 name = "parity-ui-precompiled"
 version = "1.4.0"
-source = "git+https://github.com/ethcore/js-precompiled.git#76b1f17e5a446de76493530d1d9d330e08d6ceac"
+source = "git+https://github.com/ethcore/js-precompiled.git#ee7a831d2b268b0992b6942fbd4811f4fa8118ea"
 dependencies = [
  "parity-dapps-glue 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
diff --git a/js/package.json b/js/package.json
index 692bc5707d..c3e576dc98 100644
--- a/js/package.json
+++ b/js/package.json
@@ -1,6 +1,6 @@
 {
   "name": "parity.js",
-  "version": "0.2.116",
+  "version": "0.2.117",
   "main": "release/index.js",
   "jsnext:main": "src/index.js",
   "author": "Parity Team <admin@parity.io>",
-- 
GitLab


From f1096619a5419eea047e7918581499b50eac1bce Mon Sep 17 00:00:00 2001
From: GitLab Build Bot <jaco+gitlab@ethcore.io>
Date: Mon, 12 Dec 2016 03:43:28 +0000
Subject: [PATCH 49/64] [ci skip] js-precompiled 20161212-034026

---
 Cargo.lock      | 2 +-
 js/package.json | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 3bd3723264..0a084b644c 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1290,7 +1290,7 @@ dependencies = [
 [[package]]
 name = "parity-ui-precompiled"
 version = "1.4.0"
-source = "git+https://github.com/ethcore/js-precompiled.git#ee7a831d2b268b0992b6942fbd4811f4fa8118ea"
+source = "git+https://github.com/ethcore/js-precompiled.git#2ee29643a048cca9fc0c7cde0b8409101dc73802"
 dependencies = [
  "parity-dapps-glue 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
diff --git a/js/package.json b/js/package.json
index c3e576dc98..8a3b60c36d 100644
--- a/js/package.json
+++ b/js/package.json
@@ -1,6 +1,6 @@
 {
   "name": "parity.js",
-  "version": "0.2.117",
+  "version": "0.2.118",
   "main": "release/index.js",
   "jsnext:main": "src/index.js",
   "author": "Parity Team <admin@parity.io>",
-- 
GitLab


From 1db46473272a70265ff5259f3b77ab8499c0d069 Mon Sep 17 00:00:00 2001
From: GitLab Build Bot <jaco+gitlab@ethcore.io>
Date: Mon, 12 Dec 2016 05:26:15 +0000
Subject: [PATCH 50/64] [ci skip] js-precompiled 20161212-052342

---
 Cargo.lock      | 2 +-
 js/package.json | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 0a084b644c..eb86cd47be 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1290,7 +1290,7 @@ dependencies = [
 [[package]]
 name = "parity-ui-precompiled"
 version = "1.4.0"
-source = "git+https://github.com/ethcore/js-precompiled.git#2ee29643a048cca9fc0c7cde0b8409101dc73802"
+source = "git+https://github.com/ethcore/js-precompiled.git#eb9d978ed5ad1c514b37e89c716f80b3c8d613b5"
 dependencies = [
  "parity-dapps-glue 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
diff --git a/js/package.json b/js/package.json
index 8a3b60c36d..95b15bb836 100644
--- a/js/package.json
+++ b/js/package.json
@@ -1,6 +1,6 @@
 {
   "name": "parity.js",
-  "version": "0.2.118",
+  "version": "0.2.119",
   "main": "release/index.js",
   "jsnext:main": "src/index.js",
   "author": "Parity Team <admin@parity.io>",
-- 
GitLab


From 2c4c6ba4e4f89b787b7bbe2aa38c36dbe54e23ac Mon Sep 17 00:00:00 2001
From: Jaco Greeff <jaco@ethcore.io>
Date: Mon, 12 Dec 2016 10:12:12 +0100
Subject: [PATCH 51/64] Basic smoketest

---
 js/src/ui/Form/TypedInput/typedInput.spec.js | 47 ++++++++++++++++++++
 1 file changed, 47 insertions(+)
 create mode 100644 js/src/ui/Form/TypedInput/typedInput.spec.js

diff --git a/js/src/ui/Form/TypedInput/typedInput.spec.js b/js/src/ui/Form/TypedInput/typedInput.spec.js
new file mode 100644
index 0000000000..c86c94237a
--- /dev/null
+++ b/js/src/ui/Form/TypedInput/typedInput.spec.js
@@ -0,0 +1,47 @@
+// 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 { mount } from 'enzyme';
+import React from 'react';
+import sinon from 'sinon';
+
+import { ContextProvider, muiTheme } from '~/ui';
+import { ABI_TYPES } from '~/util/abi';
+
+import TypedInput from './';
+
+let component;
+let onChange;
+
+function render (props) {
+  onChange = sinon.stub();
+  component = mount(
+    <ContextProvider api={ {} } muiTheme={ muiTheme } store={ {} }>
+      <TypedInput
+        { ...props }
+        onChange={ onChange } />
+    </ContextProvider>
+  );
+
+  console.log(component.debug());
+  return component;
+}
+
+describe.only('ui/Form/TypedInput', () => {
+  it('renders defaults', () => {
+    expect(render({ param: { type: ABI_TYPES.BOOL } })).to.be.ok;
+  });
+});
-- 
GitLab


From 28be8d6f6c799fb5b756f1d362562ff488714d1d Mon Sep 17 00:00:00 2001
From: Jaco Greeff <jaco@ethcore.io>
Date: Mon, 12 Dec 2016 10:55:20 +0100
Subject: [PATCH 52/64] Test for bool TypedInput

---
 js/src/ui/Form/Select/select.js              | 14 +++++-----
 js/src/ui/Form/TypedInput/typedInput.js      | 17 +++++++-----
 js/src/ui/Form/TypedInput/typedInput.spec.js | 29 ++++++++++++++++++--
 3 files changed, 43 insertions(+), 17 deletions(-)

diff --git a/js/src/ui/Form/Select/select.js b/js/src/ui/Form/Select/select.js
index c6dae8b613..f79cae58ca 100644
--- a/js/src/ui/Form/Select/select.js
+++ b/js/src/ui/Form/Select/select.js
@@ -46,26 +46,26 @@ export default class Select extends Component {
   }
 
   render () {
-    const { disabled, error, label, hint, value, children, className, onBlur, onChange, onKeyDown } = this.props;
+    const { children, className, disabled, error, hint, label, onBlur, onChange, onKeyDown, value } = this.props;
 
     return (
       <SelectField
-        className={ className }
         autoComplete='off'
+        className={ className }
         disabled={ disabled }
         errorText={ error }
         floatingLabelFixed
         floatingLabelText={ label }
         fullWidth
         hintText={ hint }
-        name={ NAME_ID }
         id={ NAME_ID }
-        underlineDisabledStyle={ UNDERLINE_DISABLED }
-        underlineStyle={ UNDERLINE_NORMAL }
-        value={ value }
+        name={ NAME_ID }
         onBlur={ onBlur }
         onChange={ onChange }
-        onKeyDown={ onKeyDown }>
+        onKeyDown={ onKeyDown }
+        underlineDisabledStyle={ UNDERLINE_DISABLED }
+        underlineStyle={ UNDERLINE_NORMAL }
+        value={ value }>
         { children }
       </SelectField>
     );
diff --git a/js/src/ui/Form/TypedInput/typedInput.js b/js/src/ui/Form/TypedInput/typedInput.js
index 6383e62bc9..3d21dd6d78 100644
--- a/js/src/ui/Form/TypedInput/typedInput.js
+++ b/js/src/ui/Form/TypedInput/typedInput.js
@@ -289,9 +289,8 @@ export default class TypedInput extends Component {
       return (
         <MenuItem
           key={ bool }
-          value={ bool }
           label={ bool }
-        >
+          value={ bool }>
           { bool }
         </MenuItem>
       );
@@ -299,19 +298,23 @@ export default class TypedInput extends Component {
 
     return (
       <Select
-        label={ label }
-        hint={ hint }
-        value={ value ? 'true' : 'false' }
         error={ error }
+        hint={ hint }
+        label={ label }
         onChange={ this.onChangeBool }
-      >
+        value={
+          value
+            ? 'true'
+            : 'false'
+        }>
         { boolitems }
       </Select>
     );
   }
 
   onChangeBool = (event, _index, value) => {
-    this.props.onChange(value === 'true');
+    // NOTE: event.target.value added for enzyme simulated event testing
+    this.props.onChange((value || event.target.value) === 'true');
   }
 
   onEthTypeChange = () => {
diff --git a/js/src/ui/Form/TypedInput/typedInput.spec.js b/js/src/ui/Form/TypedInput/typedInput.spec.js
index c86c94237a..151c881049 100644
--- a/js/src/ui/Form/TypedInput/typedInput.spec.js
+++ b/js/src/ui/Form/TypedInput/typedInput.spec.js
@@ -36,12 +36,35 @@ function render (props) {
     </ContextProvider>
   );
 
-  console.log(component.debug());
   return component;
 }
 
 describe.only('ui/Form/TypedInput', () => {
-  it('renders defaults', () => {
-    expect(render({ param: { type: ABI_TYPES.BOOL } })).to.be.ok;
+  describe('bool selection', () => {
+    beforeEach(() => {
+      render({ param: { type: ABI_TYPES.BOOL } });
+    });
+
+    it('renders', () => {
+      expect(component).to.be.ok;
+    });
+
+    it('calls onChange when value changes', () => {
+      component.find('DropDownMenu').simulate('change', { target: { value: 'true' } });
+
+      expect(onChange).to.have.been.called;
+    });
+
+    it("calls onChange(true) when value changes to 'true'", () => {
+      component.find('DropDownMenu').simulate('change', { target: { value: 'true' } });
+
+      expect(onChange).to.have.been.calledWith(true);
+    });
+
+    it("calls onChange(false) when value changes to 'false'", () => {
+      component.find('DropDownMenu').simulate('change', { target: { value: 'false' } });
+
+      expect(onChange).to.have.been.calledWith(false);
+    });
   });
 });
-- 
GitLab


From c43944584df38ea5ea8187d6b3b86ccbdde64620 Mon Sep 17 00:00:00 2001
From: Jannis R <mail@jannisr.de>
Date: Mon, 12 Dec 2016 12:33:58 +0100
Subject: [PATCH 53/64] fix import

---
 js/src/modals/Verification/store.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/js/src/modals/Verification/store.js b/js/src/modals/Verification/store.js
index 4508289a67..dcbfbf698e 100644
--- a/js/src/modals/Verification/store.js
+++ b/js/src/modals/Verification/store.js
@@ -19,7 +19,7 @@ import { sha3 } from '~/api/util/sha3';
 import Contract from '~/api/contract';
 import Contracts from '~/contracts';
 
-import { checkIfVerified, checkIfRequested, awaitPuzzle } from '~/contracts/sms-verification';
+import { checkIfVerified, checkIfRequested, awaitPuzzle } from '~/contracts/verification';
 import { checkIfTxFailed, waitForConfirmations } from '~/util/tx';
 
 export const LOADING = 'fetching-contract';
-- 
GitLab


From 23234fb1aa80c115efac84e1a4c7a6947b54411c Mon Sep 17 00:00:00 2001
From: Jaco Greeff <jaco@ethcore.io>
Date: Mon, 12 Dec 2016 12:48:16 +0100
Subject: [PATCH 54/64] Allow operation in test mode

---
 js/src/api/util/identity.js | 31 ++++++++++++++++++++++++++-----
 1 file changed, 26 insertions(+), 5 deletions(-)

diff --git a/js/src/api/util/identity.js b/js/src/api/util/identity.js
index 6a25590e3d..e4a95891fb 100644
--- a/js/src/api/util/identity.js
+++ b/js/src/api/util/identity.js
@@ -1,9 +1,30 @@
+// 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 blockies from 'blockies';
 
+// jsdom doesn't have all the browser features, blockies fail
+const TEST_ENV = process.env.NODE_ENV === 'test';
+
 export function createIdentityImg (address, scale = 8) {
-  return blockies({
-    seed: (address || '').toLowerCase(),
-    size: 8,
-    scale
-  }).toDataURL();
+  return TEST_ENV
+    ? ''
+    : blockies({
+      seed: (address || '').toLowerCase(),
+      size: 8,
+      scale
+    }).toDataURL();
 }
-- 
GitLab


From 29674a0e65a6ee28774b5f0adc6b29d48b01dc1d Mon Sep 17 00:00:00 2001
From: Jaco Greeff <jaco@ethcore.io>
Date: Mon, 12 Dec 2016 12:48:32 +0100
Subject: [PATCH 55/64] Small testability fixes

---
 js/src/ui/IdentityIcon/identityIcon.js | 22 ++++++++++++++--------
 1 file changed, 14 insertions(+), 8 deletions(-)

diff --git a/js/src/ui/IdentityIcon/identityIcon.js b/js/src/ui/IdentityIcon/identityIcon.js
index 466ffa9b56..55fc34afa1 100644
--- a/js/src/ui/IdentityIcon/identityIcon.js
+++ b/js/src/ui/IdentityIcon/identityIcon.js
@@ -19,6 +19,8 @@ import { connect } from 'react-redux';
 import { bindActionCreators } from 'redux';
 import ContractIcon from 'material-ui/svg-icons/action/code';
 
+import { createIdentityImg } from '~/api/util/identity';
+
 import styles from './identityIcon.css';
 
 class IdentityIcon extends Component {
@@ -29,12 +31,12 @@ class IdentityIcon extends Component {
   static propTypes = {
     address: PropTypes.string,
     button: PropTypes.bool,
-    className: PropTypes.string,
     center: PropTypes.bool,
-    padded: PropTypes.bool,
+    className: PropTypes.string,
     inline: PropTypes.bool,
-    tiny: PropTypes.bool,
-    images: PropTypes.object.isRequired
+    images: PropTypes.object.isRequired,
+    padded: PropTypes.bool,
+    tiny: PropTypes.bool
   }
 
   state = {
@@ -75,7 +77,7 @@ class IdentityIcon extends Component {
     }
 
     this.setState({
-      iconsrc: api.util.createIdentityImg(_address, scale)
+      iconsrc: createIdentityImg(_address, scale)
     });
   }
 
@@ -105,16 +107,20 @@ class IdentityIcon extends Component {
       return (
         <ContractIcon
           className={ classes }
-          style={ { width: size, height: size, background: '#eee' } } />
+          style={ {
+            width: size,
+            height: size,
+            background: '#eee'
+          } } />
       );
     }
 
     return (
       <img
         className={ classes }
-        src={ iconsrc }
+        height={ size }
         width={ size }
-        height={ size } />
+        src={ iconsrc } />
     );
   }
 }
-- 
GitLab


From c5c4e5e901e5aef9175ccb98ee0469330aef18d2 Mon Sep 17 00:00:00 2001
From: Jaco Greeff <jaco@ethcore.io>
Date: Mon, 12 Dec 2016 12:48:43 +0100
Subject: [PATCH 56/64] Updated

---
 js/src/ui/Form/TypedInput/typedInput.spec.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/js/src/ui/Form/TypedInput/typedInput.spec.js b/js/src/ui/Form/TypedInput/typedInput.spec.js
index 151c881049..e27c7482a4 100644
--- a/js/src/ui/Form/TypedInput/typedInput.spec.js
+++ b/js/src/ui/Form/TypedInput/typedInput.spec.js
@@ -39,7 +39,7 @@ function render (props) {
   return component;
 }
 
-describe.only('ui/Form/TypedInput', () => {
+describe('ui/Form/TypedInput', () => {
   describe('bool selection', () => {
     beforeEach(() => {
       render({ param: { type: ABI_TYPES.BOOL } });
-- 
GitLab


From 563c8c75f94420d1d365738576fa63c81e901cab Mon Sep 17 00:00:00 2001
From: Jaco Greeff <jaco@ethcore.io>
Date: Mon, 12 Dec 2016 12:49:04 +0100
Subject: [PATCH 57/64] Tests for DetailsStep (only bool dropdown)

---
 .../DetailsStep/detailsStep.js                | 18 ++--
 .../DetailsStep/detailsStep.spec.js           | 83 +++++++++++++++++++
 2 files changed, 92 insertions(+), 9 deletions(-)
 create mode 100644 js/src/modals/ExecuteContract/DetailsStep/detailsStep.spec.js

diff --git a/js/src/modals/ExecuteContract/DetailsStep/detailsStep.js b/js/src/modals/ExecuteContract/DetailsStep/detailsStep.js
index ae3c92e48f..0e54e9ef48 100644
--- a/js/src/modals/ExecuteContract/DetailsStep/detailsStep.js
+++ b/js/src/modals/ExecuteContract/DetailsStep/detailsStep.js
@@ -58,23 +58,23 @@ export default class DetailsStep extends Component {
       <Form>
         { this.renderWarning() }
         <AddressSelect
-          label='from account'
-          hint='the account to transact with'
-          value={ fromAddress }
-          error={ fromAddressError }
           accounts={ accounts }
           balances={ balances }
-          onChange={ onFromAddressChange } />
+          error={ fromAddressError }
+          hint='the account to transact with'
+          label='from account'
+          onChange={ onFromAddressChange }
+          value={ fromAddress } />
         { this.renderFunctionSelect() }
         { this.renderParameters() }
         <div className={ styles.columns }>
           <div>
             <Input
-              label='transaction value (in ETH)'
-              hint='the amount to send to with the transaction'
-              value={ amount }
               error={ amountError }
-              onSubmit={ onAmountChange } />
+              hint='the amount to send to with the transaction'
+              label='transaction value (in ETH)'
+              onSubmit={ onAmountChange }
+              value={ amount } />
           </div>
           <div>
             <Checkbox
diff --git a/js/src/modals/ExecuteContract/DetailsStep/detailsStep.spec.js b/js/src/modals/ExecuteContract/DetailsStep/detailsStep.spec.js
new file mode 100644
index 0000000000..fb80bdce64
--- /dev/null
+++ b/js/src/modals/ExecuteContract/DetailsStep/detailsStep.spec.js
@@ -0,0 +1,83 @@
+// 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 { mount } from 'enzyme';
+import React from 'react';
+import sinon from 'sinon';
+
+import { ContextProvider, muiTheme } from '~/ui';
+
+import DetailsStep from './';
+
+import { CONTRACT } from '../executeContract.test.js';
+
+let component;
+let onAmountChange;
+let onClose;
+let onFromAddressChange;
+let onFuncChange;
+let onGasEditClick;
+let onValueChange;
+
+function render (props) {
+  onAmountChange = sinon.stub();
+  onClose = sinon.stub();
+  onFromAddressChange = sinon.stub();
+  onFuncChange = sinon.stub();
+  onGasEditClick = sinon.stub();
+  onValueChange = sinon.stub();
+
+  component = mount(
+    <ContextProvider api={ {} } muiTheme={ muiTheme } store={ {} }>
+      <DetailsStep
+        { ...props }
+        contract={ CONTRACT }
+        onAmountChange={ onAmountChange }
+        onClose={ onClose }
+        onFromAddressChange={ onFromAddressChange }
+        onFuncChange={ onFuncChange }
+        onGasEditClick={ onGasEditClick }
+        onValueChange={ onValueChange } />
+    </ContextProvider>
+  );
+
+  return component;
+}
+
+describe('modals/ExecuteContract/DetailsStep', () => {
+  it('renders', () => {
+    expect(render({ accounts: {}, values: [ true ], valuesError: [ null ] })).to.be.ok;
+  });
+
+  describe('parameter values', () => {
+    beforeEach(() => {
+      render({
+        accounts: {},
+        func: CONTRACT.functions[0],
+        values: [ false ],
+        valuesError: [ null ]
+      });
+    });
+
+    describe('bool parameters', () => {
+      it('toggles from false to true', () => {
+        component.find('DropDownMenu').last().simulate('change', { target: { value: 'true' } });
+
+        expect(onValueChange).to.have.been.calledWith(null, 0, true);
+      });
+    });
+  });
+});
-- 
GitLab


From 3a7e30ec5cda466d5df4f642781f9e4ae4b7bd93 Mon Sep 17 00:00:00 2001
From: Jaco Greeff <jaco@ethcore.io>
Date: Mon, 12 Dec 2016 12:49:40 +0100
Subject: [PATCH 58/64] Fix issue with bool type dropdown

---
 .../modals/ExecuteContract/executeContract.js | 20 +++---
 .../ExecuteContract/executeContract.spec.js   | 69 +++++++++++++++++++
 .../ExecuteContract/executeContract.test.js   | 64 +++++++++++++++++
 3 files changed, 141 insertions(+), 12 deletions(-)
 create mode 100644 js/src/modals/ExecuteContract/executeContract.spec.js
 create mode 100644 js/src/modals/ExecuteContract/executeContract.test.js

diff --git a/js/src/modals/ExecuteContract/executeContract.js b/js/src/modals/ExecuteContract/executeContract.js
index afcc826b7f..74f36df341 100644
--- a/js/src/modals/ExecuteContract/executeContract.js
+++ b/js/src/modals/ExecuteContract/executeContract.js
@@ -25,6 +25,7 @@ import ContentClear from 'material-ui/svg-icons/content/clear';
 import NavigationArrowBack from 'material-ui/svg-icons/navigation/arrow-back';
 import NavigationArrowForward from 'material-ui/svg-icons/navigation/arrow-forward';
 
+import { toWei } from '~/api/util/wei';
 import { BusyStep, Button, CompletedStep, GasPriceEditor, IdentityIcon, Modal, TxHash } from '~/ui';
 import { MAX_GAS_ESTIMATION } from '~/util/constants';
 import { validateAddress, validateUint } from '~/util/validation';
@@ -56,12 +57,12 @@ class ExecuteContract extends Component {
   }
 
   static propTypes = {
-    isTest: PropTypes.bool,
-    fromAddress: PropTypes.string,
     accounts: PropTypes.object,
     balances: PropTypes.object,
-    contract: PropTypes.object,
+    contract: PropTypes.object.isRequired,
+    fromAddress: PropTypes.string,
     gasLimit: PropTypes.object.isRequired,
+    isTest: PropTypes.bool,
     onClose: PropTypes.func.isRequired,
     onFromAddressChange: PropTypes.func.isRequired
   }
@@ -77,11 +78,11 @@ class ExecuteContract extends Component {
     funcError: null,
     gasEdit: false,
     rejected: false,
-    step: STEP_DETAILS,
     sending: false,
+    step: STEP_DETAILS,
+    txhash: null,
     values: [],
-    valuesError: [],
-    txhash: null
+    valuesError: []
   }
 
   componentDidMount () {
@@ -255,10 +256,6 @@ class ExecuteContract extends Component {
         valueError = validateAddress(_value).addressError;
         break;
 
-      case 'bool':
-        value = _value === 'true';
-        break;
-
       case 'uint':
         valueError = validateUint(_value).valueError;
         break;
@@ -278,13 +275,12 @@ class ExecuteContract extends Component {
   }
 
   estimateGas = (_fromAddress) => {
-    const { api } = this.context;
     const { fromAddress } = this.props;
     const { amount, func, values } = this.state;
     const options = {
       gas: MAX_GAS_ESTIMATION,
       from: _fromAddress || fromAddress,
-      value: api.util.toWei(amount || 0)
+      value: toWei(amount || 0)
     };
 
     if (!func) {
diff --git a/js/src/modals/ExecuteContract/executeContract.spec.js b/js/src/modals/ExecuteContract/executeContract.spec.js
new file mode 100644
index 0000000000..6a8cc692df
--- /dev/null
+++ b/js/src/modals/ExecuteContract/executeContract.spec.js
@@ -0,0 +1,69 @@
+// 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 { shallow } from 'enzyme';
+import React from 'react';
+import sinon from 'sinon';
+
+import ExecuteContract from './';
+
+import { CONTRACT, STORE } from './executeContract.test.js';
+
+let component;
+let onClose;
+let onFromAddressChange;
+
+function render (props) {
+  onClose = sinon.stub();
+  onFromAddressChange = sinon.stub();
+
+  component = shallow(
+    <ExecuteContract
+      { ...props }
+      contract={ CONTRACT }
+      onClose={ onClose }
+      onFromAddressChange={ onFromAddressChange } />,
+      { context: { api: {}, store: STORE } }
+  ).find('ExecuteContract').shallow();
+
+  return component;
+}
+
+describe('modals/ExecuteContract/DetailsStep', () => {
+  it('renders', () => {
+    expect(render({ accounts: {} })).to.be.ok;
+  });
+
+  describe('instance functions', () => {
+    beforeEach(() => {
+      render({
+        accounts: {}
+      });
+    });
+
+    describe('onValueChange', () => {
+      it('toggles boolean from false to true', () => {
+        component.setState({
+          func: CONTRACT.functions[0],
+          values: [false]
+        });
+        component.instance().onValueChange(null, 0, true);
+
+        expect(component.state().values).to.deep.equal([true]);
+      });
+    });
+  });
+});
diff --git a/js/src/modals/ExecuteContract/executeContract.test.js b/js/src/modals/ExecuteContract/executeContract.test.js
new file mode 100644
index 0000000000..212aba2c8b
--- /dev/null
+++ b/js/src/modals/ExecuteContract/executeContract.test.js
@@ -0,0 +1,64 @@
+// 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 BigNumber from 'bignumber.js';
+import sinon from 'sinon';
+
+const CONTRACT = {
+  functions: [
+    {
+      name: 'test_a',
+      signature: 'test_a',
+      estimateGas: sinon.stub().resolves(new BigNumber(123)),
+      inputs: [
+        {
+          name: 'test_bool',
+          kind: {
+            type: 'bool'
+          }
+        }
+      ],
+      abi: {
+        inputs: [
+          {
+            name: 'test_bool',
+            type: 'bool'
+          }
+        ]
+      }
+    }
+  ]
+};
+
+const STORE = {
+  dispatch: sinon.stub(),
+  subscribe: sinon.stub(),
+  getState: () => {
+    return {
+      balances: {
+        balances: {}
+      },
+      nodeStatus: {
+        gasLimit: new BigNumber(123)
+      }
+    };
+  }
+};
+
+export {
+  CONTRACT,
+  STORE
+};
-- 
GitLab


From d2a34acdfdc142ed35002e0db80018529f24c0ac Mon Sep 17 00:00:00 2001
From: GitLab Build Bot <jaco+gitlab@ethcore.io>
Date: Mon, 12 Dec 2016 14:37:25 +0000
Subject: [PATCH 59/64] [ci skip] js-precompiled 20161212-143454

---
 Cargo.lock      | 2 +-
 js/package.json | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index eb86cd47be..316978f204 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1290,7 +1290,7 @@ dependencies = [
 [[package]]
 name = "parity-ui-precompiled"
 version = "1.4.0"
-source = "git+https://github.com/ethcore/js-precompiled.git#eb9d978ed5ad1c514b37e89c716f80b3c8d613b5"
+source = "git+https://github.com/ethcore/js-precompiled.git#b29e2a151561ae41aa27af3b226522844ae8aae2"
 dependencies = [
  "parity-dapps-glue 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
diff --git a/js/package.json b/js/package.json
index 95b15bb836..5cbdd6bf32 100644
--- a/js/package.json
+++ b/js/package.json
@@ -1,6 +1,6 @@
 {
   "name": "parity.js",
-  "version": "0.2.119",
+  "version": "0.2.120",
   "main": "release/index.js",
   "jsnext:main": "src/index.js",
   "author": "Parity Team <admin@parity.io>",
-- 
GitLab


From e61d14d7f7658d331b41c3d123a7a79556c4088f Mon Sep 17 00:00:00 2001
From: Igor Artamonov <igor@artamonov.ru>
Date: Mon, 12 Dec 2016 19:50:32 +0000
Subject: [PATCH 60/64] reuse Morden for Classic Testnet

---
 ethcore/res/ethereum/classic-morden.json | 58 ------------------------
 ethcore/res/ethereum/morden.json         | 15 +++---
 ethcore/res/ethereum/tests               |  2 +-
 ethcore/src/ethereum/mod.rs              |  3 --
 parity/cli/usage.txt                     |  2 +-
 parity/params.rs                         |  8 +---
 6 files changed, 13 insertions(+), 75 deletions(-)
 delete mode 100644 ethcore/res/ethereum/classic-morden.json

diff --git a/ethcore/res/ethereum/classic-morden.json b/ethcore/res/ethereum/classic-morden.json
deleted file mode 100644
index bc0bf4c02d..0000000000
--- a/ethcore/res/ethereum/classic-morden.json
+++ /dev/null
@@ -1,58 +0,0 @@
-{
-	"name": "Ethereum Classic Morden Testnet",
-	"forkName": "classic",
-	"engine": {
-		"Ethash": {
-			"params": {
-				"gasLimitBoundDivisor": "0x0400",
-				"minimumDifficulty": "0x020000",
-				"difficultyBoundDivisor": "0x0800",
-				"durationLimit": "0x0d",
-				"blockReward": "0x4563918244F40000",
-				"registrar": "0x52dff57a8a1532e6afb3dc07e2af58bb9eb05b3d",
-				"homesteadTransition": 494000,
-				"eip150Transition": 1783000,
-				"eip155Transition": 1915000,
-				"eip160Transition": 1915000,
-				"ecip1010PauseTransition": 1915000,
-				"ecip1010ContinueTransition": 3415000,
-
-				"eip161abcTransition": "0x7fffffffffffffff",
-				"eip161dTransition": "0x7fffffffffffffff"
-			}
-		}
-	},
-	"params": {
-		"accountStartNonce": "0x0100000",
-		"maximumExtraDataSize": "0x20",
-		"minGasLimit": "0x1388",
-		"networkID" : "0x2",
-		"forkBlock": "0x1b34d8",
-		"forkCanonHash": "0xf376243aeff1f256d970714c3de9fd78fa4e63cf63e32a51fe1169e375d98145"
-	},
-	"genesis": {
-		"seal": {
-			"ethereum": {
-				"nonce": "0x00006d6f7264656e",
-				"mixHash": "0x00000000000000000000000000000000000000647572616c65787365646c6578"
-			}
-		},
-		"difficulty": "0x20000",
-		"author": "0x0000000000000000000000000000000000000000",
-		"timestamp": "0x00",
-		"parentHash": "0x0000000000000000000000000000000000000000000000000000000000000000",
-		"extraData": "0x",
-		"gasLimit": "0x2fefd8"
-	},
-	"nodes": [
-		"enode://e731347db0521f3476e6bbbb83375dcd7133a1601425ebd15fd10f3835fd4c304fba6282087ca5a0deeafadf0aa0d4fd56c3323331901c1f38bd181c283e3e35@128.199.55.137:30303",
-		"enode://ceb5c0f85eb994dbe9693bf46d99b03f6b838d17cc74e68d5eb003171ff39e5f120b17f965b267c319303f94d80b9d994b77062fb1486d76ce95d9f3d8fe1cb4@46.101.122.141:30303"
-	],
-	"accounts": {
-		"0000000000000000000000000000000000000001": { "balance": "1", "nonce": "1048576", "builtin": { "name": "ecrecover", "pricing": { "linear": { "base": 3000, "word": 0 } } } },
-		"0000000000000000000000000000000000000002": { "balance": "1", "nonce": "1048576", "builtin": { "name": "sha256", "pricing": { "linear": { "base": 60, "word": 12 } } } },
-		"0000000000000000000000000000000000000003": { "balance": "1", "nonce": "1048576", "builtin": { "name": "ripemd160", "pricing": { "linear": { "base": 600, "word": 120 } } } },
-		"0000000000000000000000000000000000000004": { "balance": "1", "nonce": "1048576", "builtin": { "name": "identity", "pricing": { "linear": { "base": 15, "word": 3 } } } },
-		"102e61f5d8f9bc71d0ad4a084df4e65e05ce0e1c": { "balance": "1606938044258990275541962092341162602522202993782792835301376", "nonce": "1048576" }
-	}
-}
diff --git a/ethcore/res/ethereum/morden.json b/ethcore/res/ethereum/morden.json
index 6e725e8bfc..d24e0ec0c9 100644
--- a/ethcore/res/ethereum/morden.json
+++ b/ethcore/res/ethereum/morden.json
@@ -9,12 +9,15 @@
 				"durationLimit": "0x0d",
 				"blockReward": "0x4563918244F40000",
 				"registrar": "0x52dff57a8a1532e6afb3dc07e2af58bb9eb05b3d",
-				"homesteadTransition": "0x789b0",
-				"eip150Transition": "0x1b34d8",
-				"eip155Transition": 1885000,
-				"eip160Transition": 1885000,
-				"eip161abcTransition": 1885000,
-				"eip161dTransition": 1885000
+				"homesteadTransition": 494000,
+				"eip150Transition": 1783000,
+				"eip155Transition": 1915000,
+				"eip160Transition": 1915000,
+				"ecip1010PauseTransition": 1915000,
+				"ecip1010ContinueTransition": 3415000,
+
+				"eip161abcTransition": "0x7fffffffffffffff",
+				"eip161dTransition": "0x7fffffffffffffff"
 			}
 		}
 	},
diff --git a/ethcore/res/ethereum/tests b/ethcore/res/ethereum/tests
index e8f4624b7f..9028c4801f 160000
--- a/ethcore/res/ethereum/tests
+++ b/ethcore/res/ethereum/tests
@@ -1 +1 @@
-Subproject commit e8f4624b7f1a15c63674eecf577c7ab76c3b16be
+Subproject commit 9028c4801fd39fbb71a9796979182549a24e81c8
diff --git a/ethcore/src/ethereum/mod.rs b/ethcore/src/ethereum/mod.rs
index 4dd0d2b73c..3916e5ccc7 100644
--- a/ethcore/src/ethereum/mod.rs
+++ b/ethcore/src/ethereum/mod.rs
@@ -42,9 +42,6 @@ pub fn new_frontier() -> Spec { load(include_bytes!("../../res/ethereum/frontier
 /// Create a new Frontier mainnet chain spec without the DAO hardfork.
 pub fn new_classic() -> Spec { load(include_bytes!("../../res/ethereum/classic.json")) }
 
-/// Create a new Morden chain spec configured for Thereum Classic
-pub fn new_classic_morden() -> Spec { load(include_bytes!("../../res/ethereum/classic-morden.json")) }
-
 /// Create a new Frontier mainnet chain spec without the DAO hardfork.
 pub fn new_expanse() -> Spec { load(include_bytes!("../../res/ethereum/expanse.json")) }
 
diff --git a/parity/cli/usage.txt b/parity/cli/usage.txt
index 0a5b854dca..1e99c76fe0 100644
--- a/parity/cli/usage.txt
+++ b/parity/cli/usage.txt
@@ -33,7 +33,7 @@ Operating Options:
   --chain CHAIN            Specify the blockchain type. CHAIN may be either a
                            JSON chain specification file or olympic, frontier,
                            homestead, mainnet, morden, ropsten, classic, expanse,
-                           testnet, classic-morden or dev (default: {flag_chain}).
+                           testnet or dev (default: {flag_chain}).
   -d --db-path PATH        Specify the database & configuration directory path
                            (default: {flag_db_path}).
   --keys-path PATH         Specify the path for JSON key files to be found
diff --git a/parity/params.rs b/parity/params.rs
index d8c3db2bc0..99ceac67b0 100644
--- a/parity/params.rs
+++ b/parity/params.rs
@@ -31,7 +31,6 @@ pub enum SpecType {
 	Ropsten,
 	Olympic,
 	Classic,
-	ClassicTestnet,
 	Expanse,
 	Dev,
 	Custom(String),
@@ -50,8 +49,7 @@ impl str::FromStr for SpecType {
 		let spec = match s {
 			"frontier" | "homestead" | "mainnet" => SpecType::Mainnet,
 			"frontier-dogmatic" | "homestead-dogmatic" | "classic" => SpecType::Classic,
-			"classic-testnet" | "classic-morden" => SpecType::ClassicTestnet,
-			"morden" | "testnet" => SpecType::Testnet,
+			"morden" | "testnet" | "classic-testnet" => SpecType::Testnet,
 			"ropsten" => SpecType::Ropsten,
 			"olympic" => SpecType::Olympic,
 			"expanse" => SpecType::Expanse,
@@ -70,7 +68,6 @@ impl SpecType {
 			SpecType::Ropsten => Ok(ethereum::new_ropsten()),
 			SpecType::Olympic => Ok(ethereum::new_olympic()),
 			SpecType::Classic => Ok(ethereum::new_classic()),
-			SpecType::ClassicTestnet => Ok(ethereum::new_classic_morden()),
 			SpecType::Expanse => Ok(ethereum::new_expanse()),
 			SpecType::Dev => Ok(Spec::new_instant()),
 			SpecType::Custom(ref filename) => {
@@ -292,8 +289,7 @@ mod tests {
 		assert_eq!(SpecType::Ropsten, "ropsten".parse().unwrap());
 		assert_eq!(SpecType::Olympic, "olympic".parse().unwrap());
 		assert_eq!(SpecType::Classic, "classic".parse().unwrap());
-		assert_eq!(SpecType::ClassicTestnet, "classic-testnet".parse().unwrap());
-		assert_eq!(SpecType::ClassicTestnet, "classic-morden".parse().unwrap());
+		assert_eq!(SpecType::Testnet, "classic-testnet".parse().unwrap());
 	}
 
 	#[test]
-- 
GitLab


From 1114ad3ca701ebb13100c34be81ac73bbaafad09 Mon Sep 17 00:00:00 2001
From: GitLab Build Bot <jaco+gitlab@ethcore.io>
Date: Tue, 13 Dec 2016 05:15:44 +0000
Subject: [PATCH 61/64] [ci skip] js-precompiled 20161213-051314

---
 Cargo.lock      | 2 +-
 js/package.json | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 316978f204..9095934c4f 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1290,7 +1290,7 @@ dependencies = [
 [[package]]
 name = "parity-ui-precompiled"
 version = "1.4.0"
-source = "git+https://github.com/ethcore/js-precompiled.git#b29e2a151561ae41aa27af3b226522844ae8aae2"
+source = "git+https://github.com/ethcore/js-precompiled.git#a8f4db707c521f71f093b62e3173b98144569c4e"
 dependencies = [
  "parity-dapps-glue 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
diff --git a/js/package.json b/js/package.json
index 5cbdd6bf32..36cd9ad5af 100644
--- a/js/package.json
+++ b/js/package.json
@@ -1,6 +1,6 @@
 {
   "name": "parity.js",
-  "version": "0.2.120",
+  "version": "0.2.121",
   "main": "release/index.js",
   "jsnext:main": "src/index.js",
   "author": "Parity Team <admin@parity.io>",
-- 
GitLab


From f47be5084370e5ee1f64621fb605c7f0559e20a5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tomasz=20Drwi=C4=99ga?= <tomasz@ethcore.io>
Date: Tue, 13 Dec 2016 14:27:27 +0100
Subject: [PATCH 62/64] Using jsonrpc-macros

---
 Cargo.lock                           |  33 ++-
 rpc/Cargo.toml                       |   1 +
 rpc/src/lib.rs                       |   2 +
 rpc/src/v1/helpers/auto_args.rs      | 310 ---------------------------
 rpc/src/v1/helpers/mod.rs            |   4 -
 rpc/src/v1/helpers/params.rs         |  46 ----
 rpc/src/v1/impls/eth.rs              |   2 +-
 rpc/src/v1/impls/parity.rs           |   2 +-
 rpc/src/v1/impls/parity_set.rs       |   2 +-
 rpc/src/v1/impls/signing.rs          |   2 +-
 rpc/src/v1/impls/signing_unsafe.rs   |   2 +-
 rpc/src/v1/impls/traces.rs           |  20 +-
 rpc/src/v1/traits/eth.rs             |   2 +-
 rpc/src/v1/traits/eth_signing.rs     |   3 +-
 rpc/src/v1/traits/net.rs             |   4 +-
 rpc/src/v1/traits/parity.rs          |   6 +-
 rpc/src/v1/traits/parity_accounts.rs |   3 +-
 rpc/src/v1/traits/parity_set.rs      |   2 +-
 rpc/src/v1/traits/parity_signing.rs  |   2 +-
 rpc/src/v1/traits/personal.rs        |   1 -
 rpc/src/v1/traits/rpc.rs             |   8 +-
 rpc/src/v1/traits/signer.rs          |   2 -
 rpc/src/v1/traits/traces.rs          |   3 +-
 rpc/src/v1/traits/web3.rs            |   2 -
 24 files changed, 59 insertions(+), 405 deletions(-)
 delete mode 100644 rpc/src/v1/helpers/auto_args.rs
 delete mode 100644 rpc/src/v1/helpers/params.rs

diff --git a/Cargo.lock b/Cargo.lock
index 9095934c4f..6bd3257bef 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -530,6 +530,7 @@ dependencies = [
  "jsonrpc-core 4.0.0 (git+https://github.com/ethcore/jsonrpc.git)",
  "jsonrpc-http-server 6.1.1 (git+https://github.com/ethcore/jsonrpc.git)",
  "jsonrpc-ipc-server 0.2.4 (git+https://github.com/ethcore/jsonrpc.git)",
+ "jsonrpc-macros 0.1.0 (git+https://github.com/ethcore/jsonrpc.git)",
  "log 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)",
  "rlp 0.1.0",
  "rustc-serialize 0.3.19 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -860,10 +861,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 [[package]]
 name = "jsonrpc-core"
 version = "4.0.0"
-source = "git+https://github.com/ethcore/jsonrpc.git#1500da1b9613a0a17fc0109d825f3ccc60199a53"
+source = "git+https://github.com/ethcore/jsonrpc.git#33262d626a294a00c20435dec331058ba65e224a"
 dependencies = [
  "log 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)",
- "parking_lot 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)",
+ "parking_lot 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)",
  "serde 0.8.4 (registry+https://github.com/rust-lang/crates.io-index)",
  "serde_codegen 0.8.4 (registry+https://github.com/rust-lang/crates.io-index)",
  "serde_json 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -872,7 +873,7 @@ dependencies = [
 [[package]]
 name = "jsonrpc-http-server"
 version = "6.1.1"
-source = "git+https://github.com/ethcore/jsonrpc.git#1500da1b9613a0a17fc0109d825f3ccc60199a53"
+source = "git+https://github.com/ethcore/jsonrpc.git#33262d626a294a00c20435dec331058ba65e224a"
 dependencies = [
  "hyper 0.10.0-a.0 (git+https://github.com/ethcore/hyper)",
  "jsonrpc-core 4.0.0 (git+https://github.com/ethcore/jsonrpc.git)",
@@ -883,7 +884,7 @@ dependencies = [
 [[package]]
 name = "jsonrpc-ipc-server"
 version = "0.2.4"
-source = "git+https://github.com/ethcore/jsonrpc.git#1500da1b9613a0a17fc0109d825f3ccc60199a53"
+source = "git+https://github.com/ethcore/jsonrpc.git#33262d626a294a00c20435dec331058ba65e224a"
 dependencies = [
  "bytes 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "env_logger 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -895,10 +896,19 @@ dependencies = [
  "slab 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
+[[package]]
+name = "jsonrpc-macros"
+version = "0.1.0"
+source = "git+https://github.com/ethcore/jsonrpc.git#33262d626a294a00c20435dec331058ba65e224a"
+dependencies = [
+ "jsonrpc-core 4.0.0 (git+https://github.com/ethcore/jsonrpc.git)",
+ "serde 0.8.4 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
 [[package]]
 name = "jsonrpc-tcp-server"
 version = "0.1.0"
-source = "git+https://github.com/ethcore/jsonrpc.git#1500da1b9613a0a17fc0109d825f3ccc60199a53"
+source = "git+https://github.com/ethcore/jsonrpc.git#33262d626a294a00c20435dec331058ba65e224a"
 dependencies = [
  "bytes 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "env_logger 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -1295,17 +1305,6 @@ dependencies = [
  "parity-dapps-glue 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
-[[package]]
-name = "parking_lot"
-version = "0.2.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "kernel32-sys 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "libc 0.2.16 (registry+https://github.com/rust-lang/crates.io-index)",
- "smallvec 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)",
- "winapi 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
 [[package]]
 name = "parking_lot"
 version = "0.3.5"
@@ -2065,6 +2064,7 @@ dependencies = [
 "checksum jsonrpc-core 4.0.0 (git+https://github.com/ethcore/jsonrpc.git)" = "<none>"
 "checksum jsonrpc-http-server 6.1.1 (git+https://github.com/ethcore/jsonrpc.git)" = "<none>"
 "checksum jsonrpc-ipc-server 0.2.4 (git+https://github.com/ethcore/jsonrpc.git)" = "<none>"
+"checksum jsonrpc-macros 0.1.0 (git+https://github.com/ethcore/jsonrpc.git)" = "<none>"
 "checksum jsonrpc-tcp-server 0.1.0 (git+https://github.com/ethcore/jsonrpc.git)" = "<none>"
 "checksum kernel32-sys 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "7507624b29483431c0ba2d82aece8ca6cdba9382bff4ddd0f7490560c056098d"
 "checksum language-tags 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "a91d884b6667cd606bb5a69aa0c99ba811a115fc68915e7056ec08a46e93199a"
@@ -2107,7 +2107,6 @@ dependencies = [
 "checksum owning_ref 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "8d91377085359426407a287ab16884a0111ba473aa6844ff01d4ec20ce3d75e7"
 "checksum parity-dapps-glue 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "98378dec0a185da2b7180308752f0bad73aaa949c3e0a3b0528d0e067945f7ab"
 "checksum parity-ui-precompiled 1.4.0 (git+https://github.com/ethcore/js-precompiled.git)" = "<none>"
-"checksum parking_lot 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)" = "968f685642555d2f7e202c48b8b11de80569e9bfea817f7f12d7c61aac62d4e6"
 "checksum parking_lot 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)" = "dbc5847584161f273e69edc63c1a86254a22f570a0b5dd87aa6f9773f6f7d125"
 "checksum parking_lot_core 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "fb1b97670a2ffadce7c397fb80a3d687c4f3060140b885621ef1653d0e5d5068"
 "checksum phf 0.7.14 (registry+https://github.com/rust-lang/crates.io-index)" = "447d9d45f2e0b4a9b532e808365abf18fc211be6ca217202fcd45236ef12f026"
diff --git a/rpc/Cargo.toml b/rpc/Cargo.toml
index 5d974e59ff..d766af674c 100644
--- a/rpc/Cargo.toml
+++ b/rpc/Cargo.toml
@@ -15,6 +15,7 @@ serde_json = "0.8"
 jsonrpc-core = { git = "https://github.com/ethcore/jsonrpc.git" }
 jsonrpc-http-server = { git = "https://github.com/ethcore/jsonrpc.git" }
 jsonrpc-ipc-server = { git = "https://github.com/ethcore/jsonrpc.git" }
+jsonrpc-macros = { git = "https://github.com/ethcore/jsonrpc.git" }
 ethcore-io = { path = "../util/io" }
 ethcore-util = { path = "../util" }
 ethcore = { path = "../ethcore" }
diff --git a/rpc/src/lib.rs b/rpc/src/lib.rs
index bbd4a51646..7f105b0d04 100644
--- a/rpc/src/lib.rs
+++ b/rpc/src/lib.rs
@@ -24,6 +24,8 @@ extern crate serde;
 extern crate serde_json;
 extern crate jsonrpc_core;
 extern crate jsonrpc_http_server;
+#[macro_use]
+extern crate jsonrpc_macros;
 
 extern crate ethcore_io as io;
 extern crate ethcore;
diff --git a/rpc/src/v1/helpers/auto_args.rs b/rpc/src/v1/helpers/auto_args.rs
deleted file mode 100644
index 9c4e1d74aa..0000000000
--- a/rpc/src/v1/helpers/auto_args.rs
+++ /dev/null
@@ -1,310 +0,0 @@
-// 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/>.
-
-//! Automatically serialize and deserialize parameters around a strongly-typed function.
-
-// because we reuse the type names as idents in the macros as a dirty hack to
-// work around `concat_idents!` being unstable.
-#![allow(non_snake_case)]
-
-use super::errors;
-
-use jsonrpc_core::{Error, Params, Value, from_params, to_value};
-use serde::{Serialize, Deserialize};
-
-/// Auto-generates an RPC trait from trait definition.
-///
-/// This just copies out all the methods, docs, and adds another
-/// function `to_delegate` which will automatically wrap each strongly-typed
-/// function in a wrapper which handles parameter and output type serialization.
-///
-/// RPC functions may come in a couple forms: async and synchronous.
-/// These are parsed with the custom `#[rpc]` attribute, which must follow
-/// documentation.
-///
-/// ## The #[rpc] attribute
-///
-/// Valid forms:
-///  - `#[rpc(name = "name_here")]` (a synchronous rpc function which should be bound to the given name)
-///  - `#[rpc(async, name = "name_here")]` (an async rpc function which should be bound to the given name)
-///
-/// Synchronous function format:
-/// `fn foo(&self, Param1, Param2, Param3) -> Out`.
-///
-/// Asynchronous RPC functions must come in this form:
-/// `fn foo(&self, Param1, Param2, Param3, Ready<Out>);
-///
-/// Anything else will be rejected by the code generator.
-macro_rules! build_rpc_trait {
-	// entry-point. todo: make another for traits w/ bounds.
-	(
-		$(#[$t_attr: meta])*
-		pub trait $name: ident {
-			$(
-				$( #[doc=$m_doc:expr] )*
-				#[ rpc( $($t:tt)* ) ]
-				fn $m_name: ident ( $($p: tt)* ) $( -> Result<$out: ty, Error> )* ;
-			)*
-		}
-	) => {
-		$(#[$t_attr])*
-		pub trait $name: Sized + Send + Sync + 'static {
-			$(
-				$(#[doc=$m_doc])*
-				fn $m_name ( $($p)* ) $( -> Result<$out, Error> )* ;
-			)*
-
-			/// Transform this into an `IoDelegate`, automatically wrapping
-			/// the parameters.
-			fn to_delegate(self) -> ::jsonrpc_core::IoDelegate<Self> {
-				let mut del = ::jsonrpc_core::IoDelegate::new(self.into());
-				$(
-					build_rpc_trait!(WRAP del =>
-						( $($t)* )
-						fn $m_name ( $($p)* ) $( -> Result<$out, Error> )*
-					);
-				)*
-				del
-			}
-		}
-	};
-
-	( WRAP $del: expr =>
-		(name = $name: expr)
-		fn $method: ident (&self $(, $param: ty)*) -> Result<$out: ty, Error>
-	) => {
-		$del.add_method($name, move |base, params| {
-			(Self::$method as fn(&_ $(, $param)*) -> Result<$out, Error>).wrap_rpc(base, params)
-		})
-	};
-
-	( WRAP $del: expr =>
-		(async, name = $name: expr)
-		fn $method: ident (&self, Ready<$out: ty> $(, $param: ty)*)
-	) => {
-		$del.add_async_method($name, move |base, params, ready| {
-			(Self::$method as fn(&_, Ready<$out> $(, $param)*)).wrap_rpc(base, params, ready)
-		})
-	};
-}
-
-/// A wrapper type without an implementation of `Deserialize`
-/// which allows a special implementation of `Wrap` for functions
-/// that take a trailing default parameter.
-pub struct Trailing<T: Default + Deserialize>(pub T);
-
-/// A wrapper type for `jsonrpc_core`'s weakly-typed `Ready` struct.
-pub struct Ready<T: Serialize> {
-	inner: ::jsonrpc_core::Ready,
-	_marker: ::std::marker::PhantomData<T>,
-}
-
-impl<T: Serialize> From<::jsonrpc_core::Ready> for Ready<T> {
-	fn from(ready: ::jsonrpc_core::Ready) -> Self {
-		Ready { inner: ready, _marker: ::std::marker::PhantomData }
-	}
-}
-
-impl<T: Serialize> Ready<T> {
-	/// Respond withthe asynchronous result.
-	pub fn ready(self, result: Result<T, Error>) {
-		self.inner.ready(result.map(to_value))
-	}
-}
-
-/// Wrapper trait for synchronous RPC functions.
-pub trait Wrap<B: Send + Sync + 'static> {
-	fn wrap_rpc(&self, base: &B, params: Params) -> Result<Value, Error>;
-}
-
-/// Wrapper trait for asynchronous RPC functions.
-pub trait WrapAsync<B: Send + Sync + 'static> {
-	fn wrap_rpc(&self, base: &B, params: Params, ready: ::jsonrpc_core::Ready);
-}
-
-// special impl for no parameters.
-impl<B, OUT> Wrap<B> for fn(&B) -> Result<OUT, Error>
-	where B: Send + Sync + 'static, OUT: Serialize
-{
-	fn wrap_rpc(&self, base: &B, params: Params) -> Result<Value, Error> {
-		::v1::helpers::params::expect_no_params(params)
-			.and_then(|()| (self)(base))
-			.map(to_value)
-	}
-}
-
-impl<B, OUT> WrapAsync<B> for fn(&B, Ready<OUT>)
-	where B: Send + Sync + 'static, OUT: Serialize
-{
-	fn wrap_rpc(&self, base: &B, params: Params, ready: ::jsonrpc_core::Ready) {
-		match ::v1::helpers::params::expect_no_params(params) {
-			Ok(()) => (self)(base, ready.into()),
-			Err(e) => ready.ready(Err(e)),
-		}
-	}
-}
-
-// creates a wrapper implementation which deserializes the parameters,
-// calls the function with concrete type, and serializes the output.
-macro_rules! wrap {
-	($($x: ident),+) => {
-
-		// synchronous implementation
-		impl <
-			BASE: Send + Sync + 'static,
-			OUT: Serialize,
-			$($x: Deserialize,)+
-		> Wrap<BASE> for fn(&BASE, $($x,)+) -> Result<OUT, Error> {
-			fn wrap_rpc(&self, base: &BASE, params: Params) -> Result<Value, Error> {
-				from_params::<($($x,)+)>(params).and_then(|($($x,)+)| {
-					(self)(base, $($x,)+)
-				}).map(to_value)
-			}
-		}
-
-		// asynchronous implementation
-		impl <
-			BASE: Send + Sync + 'static,
-			OUT: Serialize,
-			$($x: Deserialize,)+
-		> WrapAsync<BASE> for fn(&BASE, Ready<OUT>, $($x,)+ ) {
-			fn wrap_rpc(&self, base: &BASE, params: Params, ready: ::jsonrpc_core::Ready) {
-				match from_params::<($($x,)+)>(params) {
-					Ok(($($x,)+)) => (self)(base, ready.into(), $($x,)+),
-					Err(e) => ready.ready(Err(e)),
-				}
-			}
-		}
-	}
-}
-
-// special impl for no parameters other than block parameter.
-impl<B, OUT, T> Wrap<B> for fn(&B, Trailing<T>) -> Result<OUT, Error>
-	where B: Send + Sync + 'static, OUT: Serialize, T: Default + Deserialize
-{
-	fn wrap_rpc(&self, base: &B, params: Params) -> Result<Value, Error> {
-		let len = match params {
-			Params::Array(ref v) => v.len(),
-			Params::None => 0,
-			_ => return Err(errors::invalid_params("not an array", "")),
-		};
-
-		let (id,) = match len {
-			0 => (T::default(),),
-			1 => try!(from_params::<(T,)>(params)),
-			_ => return Err(Error::invalid_params()),
-		};
-
-		(self)(base, Trailing(id)).map(to_value)
-	}
-}
-
-impl<B, OUT, T> WrapAsync<B> for fn(&B, Ready<OUT>, Trailing<T>)
-	where B: Send + Sync + 'static, OUT: Serialize, T: Default + Deserialize
-{
-	fn wrap_rpc(&self, base: &B, params: Params, ready: ::jsonrpc_core::Ready) {
-		let len = match params {
-			Params::Array(ref v) => v.len(),
-			Params::None => 0,
-			_ => return ready.ready(Err(errors::invalid_params("not an array", ""))),
-		};
-
-		let id = match len {
-			0 => Ok((T::default(),)),
-			1 => from_params::<(T,)>(params),
-			_ => Err(Error::invalid_params()),
-		};
-
-		match id {
-			Ok((id,)) => (self)(base, ready.into(), Trailing(id)),
-			Err(e) => ready.ready(Err(e)),
-		}
-	}
-}
-
-// similar to `wrap!`, but handles a single default trailing parameter
-// accepts an additional argument indicating the number of non-trailing parameters.
-macro_rules! wrap_with_trailing {
-	($num: expr, $($x: ident),+) => {
-		// synchronous implementation
-		impl <
-			BASE: Send + Sync + 'static,
-			OUT: Serialize,
-			$($x: Deserialize,)+
-			TRAILING: Default + Deserialize,
-		> Wrap<BASE> for fn(&BASE, $($x,)+ Trailing<TRAILING>) -> Result<OUT, Error> {
-			fn wrap_rpc(&self, base: &BASE, params: Params) -> Result<Value, Error> {
-				let len = match params {
-					Params::Array(ref v) => v.len(),
-					Params::None => 0,
-					_ => return Err(errors::invalid_params("not an array", "")),
-				};
-
-				let params = match len - $num {
-					0 => from_params::<($($x,)+)>(params)
-						.map(|($($x,)+)| ($($x,)+ TRAILING::default())),
-					1 => from_params::<($($x,)+ TRAILING)>(params)
-						.map(|($($x,)+ id)| ($($x,)+ id)),
-					_ => Err(Error::invalid_params()),
-				};
-
-				let ($($x,)+ id) = try!(params);
-				(self)(base, $($x,)+ Trailing(id)).map(to_value)
-			}
-		}
-
-		// asynchronous implementation
-		impl <
-			BASE: Send + Sync + 'static,
-			OUT: Serialize,
-			$($x: Deserialize,)+
-			TRAILING: Default + Deserialize,
-		> WrapAsync<BASE> for fn(&BASE, Ready<OUT>, $($x,)+ Trailing<TRAILING>) {
-			fn wrap_rpc(&self, base: &BASE, params: Params, ready: ::jsonrpc_core::Ready) {
-				let len = match params {
-					Params::Array(ref v) => v.len(),
-					Params::None => 0,
-					_ => return ready.ready(Err(errors::invalid_params("not an array", ""))),
-				};
-
-				let params = match len - $num {
-					0 => from_params::<($($x,)+)>(params)
-						.map(|($($x,)+)| ($($x,)+ TRAILING::default())),
-					1 => from_params::<($($x,)+ TRAILING)>(params)
-						.map(|($($x,)+ id)| ($($x,)+ id)),
-					_ => Err(Error::invalid_params()),
-				};
-
-				match params {
-					Ok(($($x,)+ id)) => (self)(base, ready.into(), $($x,)+ Trailing(id)),
-					Err(e) => ready.ready(Err(e))
-				}
-			}
-		}
-	}
-}
-
-wrap!(A, B, C, D, E);
-wrap!(A, B, C, D);
-wrap!(A, B, C);
-wrap!(A, B);
-wrap!(A);
-
-wrap_with_trailing!(5, A, B, C, D, E);
-wrap_with_trailing!(4, A, B, C, D);
-wrap_with_trailing!(3, A, B, C);
-wrap_with_trailing!(2, A, B);
-wrap_with_trailing!(1, A);
\ No newline at end of file
diff --git a/rpc/src/v1/helpers/mod.rs b/rpc/src/v1/helpers/mod.rs
index 3c6d1a739d..20ca49ec68 100644
--- a/rpc/src/v1/helpers/mod.rs
+++ b/rpc/src/v1/helpers/mod.rs
@@ -14,14 +14,10 @@
 // You should have received a copy of the GNU General Public License
 // along with Parity.  If not, see <http://www.gnu.org/licenses/>.
 
-#[macro_use]
-pub mod auto_args;
-
 #[macro_use]
 pub mod errors;
 
 pub mod dispatch;
-pub mod params;
 pub mod block_import;
 
 mod poll_manager;
diff --git a/rpc/src/v1/helpers/params.rs b/rpc/src/v1/helpers/params.rs
deleted file mode 100644
index b533c1b89f..0000000000
--- a/rpc/src/v1/helpers/params.rs
+++ /dev/null
@@ -1,46 +0,0 @@
-// 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/>.
-
-//! Parameters parsing helpers
-
-use serde;
-use jsonrpc_core::{Error, Params, from_params};
-use v1::types::BlockNumber;
-use v1::helpers::errors;
-
-pub fn expect_no_params(params: Params) -> Result<(), Error> {
-	match params {
-		Params::None => Ok(()),
-		p => Err(errors::invalid_params("No parameters were expected", p)),
-	}
-}
-
-/// Returns number of different parameters in given `Params` object.
-pub fn params_len(params: &Params) -> usize {
-	match params {
-		&Params::Array(ref vec) => vec.len(),
-		_ => 0,
-	}
-}
-
-/// Deserialize request parameters with optional third parameter `BlockNumber` defaulting to `BlockNumber::Latest`.
-pub fn from_params_default_third<F1, F2>(params: Params) -> Result<(F1, F2, BlockNumber, ), Error> where F1: serde::de::Deserialize, F2: serde::de::Deserialize {
-	match params_len(&params) {
-		2 => from_params::<(F1, F2, )>(params).map(|(f1, f2)| (f1, f2, BlockNumber::Latest)),
-		_ => from_params::<(F1, F2, BlockNumber)>(params)
-	}
-}
-
diff --git a/rpc/src/v1/impls/eth.rs b/rpc/src/v1/impls/eth.rs
index 97134951c1..1364af0331 100644
--- a/rpc/src/v1/impls/eth.rs
+++ b/rpc/src/v1/impls/eth.rs
@@ -27,6 +27,7 @@ use time::get_time;
 use ethsync::{SyncProvider};
 use ethcore::miner::{MinerService, ExternalMinerService};
 use jsonrpc_core::*;
+use jsonrpc_macros::Trailing;
 use util::{H256, Address, FixedHash, U256, H64, Uint};
 use util::sha3::*;
 use util::{FromHex, Mutex};
@@ -51,7 +52,6 @@ use v1::types::{
 use v1::helpers::{CallRequest as CRequest, errors, limit_logs};
 use v1::helpers::dispatch::{dispatch_transaction, default_gas_price};
 use v1::helpers::block_import::is_major_importing;
-use v1::helpers::auto_args::Trailing;
 
 const EXTRA_INFO_PROOF: &'static str = "Object exists in in blockchain (fetched earlier), extra_info is always available if object exists; qed";
 
diff --git a/rpc/src/v1/impls/parity.rs b/rpc/src/v1/impls/parity.rs
index 1f995749a1..2c6a498a1f 100644
--- a/rpc/src/v1/impls/parity.rs
+++ b/rpc/src/v1/impls/parity.rs
@@ -32,6 +32,7 @@ use ethcore::mode::Mode;
 use ethcore::account_provider::AccountProvider;
 
 use jsonrpc_core::Error;
+use jsonrpc_macros::Trailing;
 use v1::traits::Parity;
 use v1::types::{
 	Bytes, U256, H160, H256, H512,
@@ -41,7 +42,6 @@ use v1::types::{
 };
 use v1::helpers::{errors, SigningQueue, SignerService, NetworkSettings};
 use v1::helpers::dispatch::DEFAULT_MAC;
-use v1::helpers::auto_args::Trailing;
 
 /// Parity implementation.
 pub struct ParityClient<C, M, S: ?Sized> where
diff --git a/rpc/src/v1/impls/parity_set.rs b/rpc/src/v1/impls/parity_set.rs
index b63adaa670..6371a46eac 100644
--- a/rpc/src/v1/impls/parity_set.rs
+++ b/rpc/src/v1/impls/parity_set.rs
@@ -26,7 +26,7 @@ use fetch::{Client as FetchClient, Fetch};
 use util::{Mutex, sha3};
 
 use jsonrpc_core::Error;
-use v1::helpers::auto_args::Ready;
+use jsonrpc_macros::Ready;
 use v1::helpers::errors;
 use v1::traits::ParitySet;
 use v1::types::{Bytes, H160, H256, U256};
diff --git a/rpc/src/v1/impls/signing.rs b/rpc/src/v1/impls/signing.rs
index 5fc6558da2..c65e308168 100644
--- a/rpc/src/v1/impls/signing.rs
+++ b/rpc/src/v1/impls/signing.rs
@@ -25,7 +25,7 @@ use ethcore::miner::MinerService;
 use ethcore::client::MiningBlockChainClient;
 
 use jsonrpc_core::Error;
-use v1::helpers::auto_args::Ready;
+use jsonrpc_macros::Ready;
 use v1::helpers::{
 	errors, dispatch,
 	SigningQueue, ConfirmationPromise, ConfirmationResult, ConfirmationPayload, SignerService
diff --git a/rpc/src/v1/impls/signing_unsafe.rs b/rpc/src/v1/impls/signing_unsafe.rs
index 2b3b81d576..17dbdcb55d 100644
--- a/rpc/src/v1/impls/signing_unsafe.rs
+++ b/rpc/src/v1/impls/signing_unsafe.rs
@@ -24,7 +24,7 @@ use ethcore::miner::MinerService;
 use ethcore::client::MiningBlockChainClient;
 
 use jsonrpc_core::Error;
-use v1::helpers::auto_args::Ready;
+use jsonrpc_macros::Ready;
 use v1::helpers::errors;
 use v1::helpers::dispatch;
 use v1::traits::{EthSigning, ParitySigning};
diff --git a/rpc/src/v1/impls/traces.rs b/rpc/src/v1/impls/traces.rs
index 2fd912284d..6b37e40cc2 100644
--- a/rpc/src/v1/impls/traces.rs
+++ b/rpc/src/v1/impls/traces.rs
@@ -18,13 +18,15 @@
 
 use std::sync::{Weak, Arc};
 use jsonrpc_core::*;
+use serde;
+
 use rlp::{UntrustedRlp, View};
 use ethcore::client::{BlockChainClient, CallAnalytics, TransactionId, TraceId};
 use ethcore::miner::MinerService;
 use ethcore::transaction::{Transaction as EthTransaction, SignedTransaction, Action};
+
 use v1::traits::Traces;
 use v1::helpers::{errors, CallRequest as CRequest};
-use v1::helpers::params::from_params_default_third;
 use v1::types::{TraceFilter, LocalizedTrace, BlockNumber, Index, CallRequest, Bytes, TraceResults, H256};
 
 fn to_call_analytics(flags: Vec<String>) -> CallAnalytics {
@@ -35,6 +37,22 @@ fn to_call_analytics(flags: Vec<String>) -> CallAnalytics {
 	}
 }
 
+/// Returns number of different parameters in given `Params` object.
+fn params_len(params: &Params) -> usize {
+	match params {
+		&Params::Array(ref vec) => vec.len(),
+		_ => 0,
+	}
+}
+
+/// Deserialize request parameters with optional third parameter `BlockNumber` defaulting to `BlockNumber::Latest`.
+fn from_params_default_third<F1, F2>(params: Params) -> Result<(F1, F2, BlockNumber, ), Error> where F1: serde::de::Deserialize, F2: serde::de::Deserialize {
+	match params_len(&params) {
+		2 => from_params::<(F1, F2, )>(params).map(|(f1, f2)| (f1, f2, BlockNumber::Latest)),
+		_ => from_params::<(F1, F2, BlockNumber)>(params)
+	}
+}
+
 /// Traces api implementation.
 pub struct TracesClient<C, M> where C: BlockChainClient, M: MinerService {
 	client: Weak<C>,
diff --git a/rpc/src/v1/traits/eth.rs b/rpc/src/v1/traits/eth.rs
index 14ee8ca62d..2d52b7c700 100644
--- a/rpc/src/v1/traits/eth.rs
+++ b/rpc/src/v1/traits/eth.rs
@@ -21,7 +21,7 @@ use v1::types::{RichBlock, BlockNumber, Bytes, CallRequest, Filter, FilterChange
 use v1::types::{Log, Receipt, SyncStatus, Transaction, Work};
 use v1::types::{H64, H160, H256, U256};
 
-use v1::helpers::auto_args::{Trailing, Wrap};
+use jsonrpc_macros::Trailing;
 
 build_rpc_trait! {
 	/// Eth rpc interface.
diff --git a/rpc/src/v1/traits/eth_signing.rs b/rpc/src/v1/traits/eth_signing.rs
index aa306f3f09..4428833393 100644
--- a/rpc/src/v1/traits/eth_signing.rs
+++ b/rpc/src/v1/traits/eth_signing.rs
@@ -16,7 +16,8 @@
 
 //! Eth rpc interface.
 
-use v1::helpers::auto_args::{WrapAsync, Ready};
+use jsonrpc_macros::Ready;
+
 use v1::types::{Bytes, H160, H256, H520, TransactionRequest, RichRawTransaction};
 
 build_rpc_trait! {
diff --git a/rpc/src/v1/traits/net.rs b/rpc/src/v1/traits/net.rs
index a342708265..ebe93472ee 100644
--- a/rpc/src/v1/traits/net.rs
+++ b/rpc/src/v1/traits/net.rs
@@ -17,8 +17,6 @@
 //! Net rpc interface.
 use jsonrpc_core::Error;
 
-use v1::helpers::auto_args::Wrap;
-
 build_rpc_trait! {
 	/// Net rpc interface.
 	pub trait Net {
@@ -35,4 +33,4 @@ build_rpc_trait! {
 		#[rpc(name = "net_listening")]
 		fn is_listening(&self) -> Result<bool, Error>;
 	}
-}
\ No newline at end of file
+}
diff --git a/rpc/src/v1/traits/parity.rs b/rpc/src/v1/traits/parity.rs
index ba65141683..fecc05667a 100644
--- a/rpc/src/v1/traits/parity.rs
+++ b/rpc/src/v1/traits/parity.rs
@@ -15,10 +15,12 @@
 // along with Parity.  If not, see <http://www.gnu.org/licenses/>.
 
 //! Parity-specific rpc interface.
-use jsonrpc_core::Error;
 
 use std::collections::BTreeMap;
-use v1::helpers::auto_args::{Wrap, Trailing};
+
+use jsonrpc_core::Error;
+use jsonrpc_macros::Trailing;
+
 use v1::types::{
 	H160, H256, H512, U256, Bytes,
 	Peers, Transaction, RpcSettings, Histogram,
diff --git a/rpc/src/v1/traits/parity_accounts.rs b/rpc/src/v1/traits/parity_accounts.rs
index e4393c1493..d21a8459ee 100644
--- a/rpc/src/v1/traits/parity_accounts.rs
+++ b/rpc/src/v1/traits/parity_accounts.rs
@@ -16,9 +16,8 @@
 
 //! Parity Accounts-related rpc interface.
 use std::collections::BTreeMap;
-use jsonrpc_core::{Value, Error};
 
-use v1::helpers::auto_args::Wrap;
+use jsonrpc_core::{Value, Error};
 use v1::types::{H160, H256, DappId};
 
 build_rpc_trait! {
diff --git a/rpc/src/v1/traits/parity_set.rs b/rpc/src/v1/traits/parity_set.rs
index 486f7fb424..6ae3610c81 100644
--- a/rpc/src/v1/traits/parity_set.rs
+++ b/rpc/src/v1/traits/parity_set.rs
@@ -17,8 +17,8 @@
 //! Parity-specific rpc interface for operations altering the settings.
 
 use jsonrpc_core::Error;
+use jsonrpc_macros::Ready;
 
-use v1::helpers::auto_args::{Wrap, WrapAsync, Ready};
 use v1::types::{Bytes, H160, H256, U256};
 
 build_rpc_trait! {
diff --git a/rpc/src/v1/traits/parity_signing.rs b/rpc/src/v1/traits/parity_signing.rs
index 5eb5ff8b30..a6fdbe2cde 100644
--- a/rpc/src/v1/traits/parity_signing.rs
+++ b/rpc/src/v1/traits/parity_signing.rs
@@ -16,8 +16,8 @@
 
 //! ParitySigning rpc interface.
 use jsonrpc_core::Error;
+use jsonrpc_macros::Ready;
 
-use v1::helpers::auto_args::{Wrap, WrapAsync, Ready};
 use v1::types::{U256, H160, H256, Bytes, ConfirmationResponse, TransactionRequest, Either};
 
 build_rpc_trait! {
diff --git a/rpc/src/v1/traits/personal.rs b/rpc/src/v1/traits/personal.rs
index edb1a9d79b..a7cc996ea2 100644
--- a/rpc/src/v1/traits/personal.rs
+++ b/rpc/src/v1/traits/personal.rs
@@ -17,7 +17,6 @@
 //! Personal rpc interface.
 use jsonrpc_core::Error;
 
-use v1::helpers::auto_args::Wrap;
 use v1::types::{U128, H160, H256, TransactionRequest};
 
 build_rpc_trait! {
diff --git a/rpc/src/v1/traits/rpc.rs b/rpc/src/v1/traits/rpc.rs
index a03d67b55c..9b44b560f6 100644
--- a/rpc/src/v1/traits/rpc.rs
+++ b/rpc/src/v1/traits/rpc.rs
@@ -16,12 +16,10 @@
 
 //! RPC interface.
 
-use jsonrpc_core::Error;
-
-use v1::helpers::auto_args::Wrap;
-
 use std::collections::BTreeMap;
 
+use jsonrpc_core::Error;
+
 build_rpc_trait! {
 	/// RPC Interface.
 	pub trait Rpc {
@@ -33,4 +31,4 @@ build_rpc_trait! {
 		#[rpc(name = "rpc_modules")]
 		fn rpc_modules(&self) -> Result<BTreeMap<String, String>, Error>;
 	}
-}
\ No newline at end of file
+}
diff --git a/rpc/src/v1/traits/signer.rs b/rpc/src/v1/traits/signer.rs
index 5a18fe2932..19861b9228 100644
--- a/rpc/src/v1/traits/signer.rs
+++ b/rpc/src/v1/traits/signer.rs
@@ -17,10 +17,8 @@
 //! Parity Signer-related rpc interface.
 use jsonrpc_core::Error;
 
-use v1::helpers::auto_args::Wrap;
 use v1::types::{U256, Bytes, TransactionModification, ConfirmationRequest, ConfirmationResponse};
 
-
 build_rpc_trait! {
 	/// Signer extension for confirmations rpc interface.
 	pub trait Signer {
diff --git a/rpc/src/v1/traits/traces.rs b/rpc/src/v1/traits/traces.rs
index 0440b4dff4..36561216f3 100644
--- a/rpc/src/v1/traits/traces.rs
+++ b/rpc/src/v1/traits/traces.rs
@@ -15,8 +15,9 @@
 // along with Parity.  If not, see <http://www.gnu.org/licenses/>.
 
 //! Traces specific rpc interface.
+
 use std::sync::Arc;
-use jsonrpc_core::*;
+use jsonrpc_core::{Params, Value, Error, IoDelegate};
 
 /// Traces specific rpc interface.
 pub trait Traces: Sized + Send + Sync + 'static {
diff --git a/rpc/src/v1/traits/web3.rs b/rpc/src/v1/traits/web3.rs
index efe26e3075..c2f5f55e1b 100644
--- a/rpc/src/v1/traits/web3.rs
+++ b/rpc/src/v1/traits/web3.rs
@@ -17,10 +17,8 @@
 //! Web3 rpc interface.
 use jsonrpc_core::Error;
 
-use v1::helpers::auto_args::Wrap;
 use v1::types::{H256, Bytes};
 
-
 build_rpc_trait! {
 	/// Web3 rpc interface.
 	pub trait Web3 {
-- 
GitLab


From 65d62ccf04d29e03465779937be6b2dc6f5acfc1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tomasz=20Drwi=C4=99ga?= <tomasz@ethcore.io>
Date: Tue, 13 Dec 2016 14:59:19 +0100
Subject: [PATCH 63/64] Altering the order [ci:skip]

---
 rpc/src/lib.rs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/rpc/src/lib.rs b/rpc/src/lib.rs
index 7f105b0d04..c5af5d727d 100644
--- a/rpc/src/lib.rs
+++ b/rpc/src/lib.rs
@@ -24,8 +24,6 @@ extern crate serde;
 extern crate serde_json;
 extern crate jsonrpc_core;
 extern crate jsonrpc_http_server;
-#[macro_use]
-extern crate jsonrpc_macros;
 
 extern crate ethcore_io as io;
 extern crate ethcore;
@@ -44,6 +42,8 @@ extern crate fetch;
 extern crate log;
 #[macro_use]
 extern crate ethcore_util as util;
+#[macro_use]
+extern crate jsonrpc_macros;
 
 #[cfg(test)]
 extern crate ethjson;
-- 
GitLab


From 1a9a142a69aa18c38afb878090386dc54b623189 Mon Sep 17 00:00:00 2001
From: GitLab Build Bot <jaco+gitlab@ethcore.io>
Date: Tue, 13 Dec 2016 17:19:48 +0000
Subject: [PATCH 64/64] [ci skip] js-precompiled 20161213-171715

---
 Cargo.lock      | 2 +-
 js/package.json | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 6bd3257bef..e76a6749bf 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1300,7 +1300,7 @@ dependencies = [
 [[package]]
 name = "parity-ui-precompiled"
 version = "1.4.0"
-source = "git+https://github.com/ethcore/js-precompiled.git#a8f4db707c521f71f093b62e3173b98144569c4e"
+source = "git+https://github.com/ethcore/js-precompiled.git#175003ae159b126302fd1a90dd875dc86d7adba0"
 dependencies = [
  "parity-dapps-glue 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
diff --git a/js/package.json b/js/package.json
index 36cd9ad5af..8581c9cb69 100644
--- a/js/package.json
+++ b/js/package.json
@@ -1,6 +1,6 @@
 {
   "name": "parity.js",
-  "version": "0.2.121",
+  "version": "0.2.122",
   "main": "release/index.js",
   "jsnext:main": "src/index.js",
   "author": "Parity Team <admin@parity.io>",
-- 
GitLab