Merge branch 'master' into les-impl

2016-11-09 18:06:12 +01:00 · 2016-11-09 18:06:12 +01:00 · 60a8728121
commit 60a8728121
parent 6c23d53f04 4712b882e5
41 changed files with 1484 additions and 383 deletions
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@ -23,12 +23,12 @@ linux-stable:
  script:
    - cargo build --release $CARGOFLAGS
    - strip target/release/parity
-    - md5sum target/release/parity >> parity.md5
+    - md5sum target/release/parity > parity.md5
    - sh scripts/deb-build.sh amd64
    - cp target/release/parity deb/usr/bin/parity
    - export VER=$(grep -m 1 version Cargo.toml | awk '{print $3}' | tr -d '"' | tr -d "\n")
    - dpkg-deb -b deb "parity_"$VER"_amd64.deb"
-    - md5sum "parity_"$VER"_amd64.deb" >> "parity_"$VER"_amd64.deb.md5"
+    - md5sum "parity_"$VER"_amd64.deb" > "parity_"$VER"_amd64.deb.md5"
    - aws configure set aws_access_key_id $s3_key
    - aws configure set aws_secret_access_key $s3_secret
    - aws s3api put-object --bucket builds-parity --key $CI_BUILD_REF_NAME/x86_64-unknown-linux-gnu/parity --body target/release/parity
@ -42,36 +42,6 @@ linux-stable:
    paths:
    - target/release/parity
    name: "stable-x86_64-unknown-linux-gnu_parity"
-linux-stable-14.04:
-  stage: build
-  image: ethcore/rust-14.04:latest
-  only:
-    - beta
-    - tags
-    - stable
-    - triggers
-  script:
-    - cargo build --release $CARGOFLAGS
-    - strip target/release/parity
-    - md5sum target/release/parity >> parity.md5
-    - sh scripts/deb-build.sh amd64
-    - cp target/release/parity deb/usr/bin/parity
-    - export VER=$(grep -m 1 version Cargo.toml | awk '{print $3}' | tr -d '"' | tr -d "\n")
-    - dpkg-deb -b deb "parity_"$VER"_amd64.deb"
-    - md5sum "parity_"$VER"_amd64.deb" >> "parity_"$VER"_amd64.deb.md5"
-    - aws configure set aws_access_key_id $s3_key
-    - aws configure set aws_secret_access_key $s3_secret
-    - aws s3api put-object --bucket builds-parity --key $CI_BUILD_REF_NAME/x86_64-unknown-ubuntu_14_04-gnu/parity --body target/release/parity
-    - aws s3api put-object --bucket builds-parity --key $CI_BUILD_REF_NAME/x86_64-unknown-ubuntu_14_04-gnu/parity.md5 --body parity.md5
-    - aws s3api put-object --bucket builds-parity --key $CI_BUILD_REF_NAME/x86_64-unknown-ubuntu_14_04-gnu/"parity_"$VER"_amd64.deb" --body "parity_"$VER"_amd64.deb"
-    - aws s3api put-object --bucket builds-parity --key $CI_BUILD_REF_NAME/x86_64-unknown-ubuntu_14_04-gnu/"parity_"$VER"_amd64.deb.md5" --body "parity_"$VER"_amd64.deb.md5"
-  tags:
-    - rust
-    - rust-14.04
-  artifacts:
-    paths:
-    - target/release/parity
-    name: "stable-x86_64-unknown-ubuntu_14_04-gnu_parity"
 linux-beta:
  stage: build
  image: ethcore/rust:beta
@ -123,7 +93,7 @@ linux-centos:
    - export CC="gcc"
    - cargo build --release $CARGOFLAGS
    - strip target/release/parity
-    - md5sum target/release/parity >> parity.md5
+    - md5sum target/release/parity > parity.md5
    - aws configure set aws_access_key_id $s3_key
    - aws configure set aws_secret_access_key $s3_secret
    - aws s3api put-object --bucket builds-parity --key $CI_BUILD_REF_NAME/x86_64-unknown-centos-gnu/parity --body target/release/parity
@ -148,12 +118,12 @@ linux-i686:
    - export HOST_CXX=g++
    - cargo build --target i686-unknown-linux-gnu --release $CARGOFLAGS
    - strip target/i686-unknown-linux-gnu/release/parity
-    - md5sum target/i686-unknown-linux-gnu/release/parity >> parity.md5
+    - md5sum target/i686-unknown-linux-gnu/release/parity > parity.md5
    - sh scripts/deb-build.sh i386
    - cp target/i686-unknown-linux-gnu/release/parity deb/usr/bin/parity
    - export VER=$(grep -m 1 version Cargo.toml | awk '{print $3}' | tr -d '"' | tr -d "\n")
    - dpkg-deb -b deb "parity_"$VER"_i386.deb"
-    - md5sum "parity_"$VER"_i386.deb" >> "parity_"$VER"_i386.deb.md5"
+    - md5sum "parity_"$VER"_i386.deb" > "parity_"$VER"_i386.deb.md5"
    - aws configure set aws_access_key_id $s3_key
    - aws configure set aws_secret_access_key $s3_secret
    - aws s3api put-object --bucket builds-parity --key $CI_BUILD_REF_NAME/i686-unknown-linux-gnu/parity --body target/i686-unknown-linux-gnu/release/parity
@ -188,12 +158,12 @@ linux-armv7:
    - cat .cargo/config
    - cargo build --target armv7-unknown-linux-gnueabihf --release $CARGOFLAGS
    - arm-linux-gnueabihf-strip target/armv7-unknown-linux-gnueabihf/release/parity
-    - md5sum target/armv7-unknown-linux-gnueabihf/release/parity >> parity.md5
+    - md5sum target/armv7-unknown-linux-gnueabihf/release/parity > parity.md5
    - sh scripts/deb-build.sh armhf
    - cp target/armv7-unknown-linux-gnueabihf/release/parity deb/usr/bin/parity
    - export VER=$(grep -m 1 version Cargo.toml | awk '{print $3}' | tr -d '"' | tr -d "\n")
    - dpkg-deb -b deb "parity_"$VER"_armhf.deb"
-    - md5sum "parity_"$VER"_armhf.deb" >> "parity_"$VER"_armhf.deb.md5"
+    - md5sum "parity_"$VER"_armhf.deb" > "parity_"$VER"_armhf.deb.md5"
    - aws configure set aws_access_key_id $s3_key
    - aws configure set aws_secret_access_key $s3_secret
    - aws s3api put-object --bucket builds-parity --key $CI_BUILD_REF_NAME/armv7-unknown-linux-gnueabihf/parity --body target/armv7-unknown-linux-gnueabihf/release/parity
@ -228,12 +198,12 @@ linux-arm:
    - cat .cargo/config
    - cargo build --target arm-unknown-linux-gnueabihf --release $CARGOFLAGS
    - arm-linux-gnueabihf-strip target/arm-unknown-linux-gnueabihf/release/parity
-    - md5sum target/arm-unknown-linux-gnueabihf/release/parity >> parity.md5
+    - md5sum target/arm-unknown-linux-gnueabihf/release/parity > parity.md5
    - sh scripts/deb-build.sh armhf
    - cp target/arm-unknown-linux-gnueabihf/release/parity deb/usr/bin/parity
    - export VER=$(grep -m 1 version Cargo.toml | awk '{print $3}' | tr -d '"' | tr -d "\n")
    - dpkg-deb -b deb "parity_"$VER"_armhf.deb"
-    - md5sum "parity_"$VER"_armhf.deb" >> "parity_"$VER"_armhf.deb.md5"
+    - md5sum "parity_"$VER"_armhf.deb" > "parity_"$VER"_armhf.deb.md5"
    - aws configure set aws_access_key_id $s3_key
    - aws configure set aws_secret_access_key $s3_secret
    - aws s3api put-object --bucket builds-parity --key $CI_BUILD_REF_NAME/arm-unknown-linux-gnueabihf/parity --body target/arm-unknown-linux-gnueabihf/release/parity
@ -268,7 +238,7 @@ linux-armv6:
    - cat .cargo/config
    - cargo build --target arm-unknown-linux-gnueabi --release $CARGOFLAGS
    - arm-linux-gnueabi-strip target/arm-unknown-linux-gnueabi/release/parity
-    - md5sum target/arm-unknown-linux-gnueabi/release/parity >> parity.md5
+    - md5sum target/arm-unknown-linux-gnueabi/release/parity > parity.md5
    - aws configure set aws_access_key_id $s3_key
    - aws configure set aws_secret_access_key $s3_secret
    - aws s3api put-object --bucket builds-parity --key $CI_BUILD_REF_NAME/arm-unknown-linux-gnueabi/parity --body target/arm-unknown-linux-gnueabi/release/parity
@ -301,12 +271,12 @@ linux-aarch64:
    - cat .cargo/config
    - cargo build --target aarch64-unknown-linux-gnu --release $CARGOFLAGS
    - aarch64-linux-gnu-strip target/aarch64-unknown-linux-gnu/release/parity
-    - md5sum target/aarch64-unknown-linux-gnu/release/parity >> parity.md5
+    - md5sum target/aarch64-unknown-linux-gnu/release/parity > parity.md5
    - sh scripts/deb-build.sh arm64
    - cp target/aarch64-unknown-linux-gnu/release/parity deb/usr/bin/parity
    - export VER=$(grep -m 1 version Cargo.toml | awk '{print $3}' | tr -d '"' | tr -d "\n")
    - dpkg-deb -b deb "parity_"$VER"_arm64.deb"
-    - md5sum "parity_"$VER"_arm64.deb" >> "parity_"$VER"_arm64.deb.md5"
+    - md5sum "parity_"$VER"_arm64.deb" > "parity_"$VER"_arm64.deb.md5"
    - aws configure set aws_access_key_id $s3_key
    - aws configure set aws_secret_access_key $s3_secret
    - aws s3api put-object --bucket builds-parity --key $CI_BUILD_REF_NAME/aarch64-unknown-linux-gnu/parity --body target/aarch64-unknown-linux-gnu/release/parity
@ -331,7 +301,7 @@ darwin:
  script:
    - cargo build --release $CARGOFLAGS
    - rm -rf parity.md5
-    - md5sum target/release/parity >> parity.md5
+    - md5sum target/release/parity > parity.md5
    - aws configure set aws_access_key_id $s3_key
    - aws configure set aws_secret_access_key $s3_secret
    - aws s3api put-object --bucket builds-parity --key $CI_BUILD_REF_NAME/x86_64-apple-darwin/parity --body target/release/parity
@ -487,12 +457,11 @@ js-release:
    - master
    - beta
    - stable
-    - tags
  image: ethcore/rust:stable
  before_script:
-    - ./js/scripts/install-deps.sh
+    - if [[ $NIGHTLY != "master" ]]; then ./js/scripts/install-deps.sh; fi
  script:
-    - ./js/scripts/build.sh
-    - ./js/scripts/release.sh
+    - if [[ $NIGHTLY != "master" ]]; then ./js/scripts/build.sh; fi
+    - if [[ $NIGHTLY != "master" ]]; then ./js/scripts/release.sh; fi
  tags:
    - javascript
--- a/Cargo.lock
+++ b/Cargo.lock
@ -1249,7 +1249,7 @@ dependencies = [
 [[package]]
 name = "parity-ui-precompiled"
 version = "1.4.0"
-source = "git+https://github.com/ethcore/js-precompiled.git#4c885041fd0bbb0ef012a97679abad3d04802713"
+source = "git+https://github.com/ethcore/js-precompiled.git#90bee2d692c71301ad7266d2d9667cba1a93e9f6"
 dependencies = [
 "parity-dapps-glue 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
--- a/ethcore/res/ethereum/tests
+++ b/ethcore/res/ethereum/tests
@ -1 +1 @@
-Subproject commit 853333e7da312775fb8f32f2c2771b8578cd0d79
+Subproject commit 9028c4801fd39fbb71a9796979182549a24e81c8
--- a/ethcore/src/client/client.rs
+++ b/ethcore/src/client/client.rs
@ -1224,8 +1224,7 @@ impl BlockChainClient for Client {

 	fn uncle_extra_info(&self, id: UncleID) -> Option<BTreeMap<String, String>> {
 		self.uncle(id)
-			.map(|block| BlockView::new(&block).header())
-			.map(|header| self.engine.extra_info(&header))
+			.map(|header| self.engine.extra_info(&decode(&header)))
 	}
 }

--- a/ethcore/src/json_tests/transaction.rs
+++ b/ethcore/src/json_tests/transaction.rs
@ -26,8 +26,7 @@ fn do_json_test(json_data: &[u8]) -> Vec<String> {
 	let old_schedule = evm::Schedule::new_frontier();
 	let new_schedule = evm::Schedule::new_homestead();
 	for (name, test) in tests.into_iter() {
-		let mut fail = false;
-		let mut fail_unless = |cond: bool| if !cond && !fail { failed.push(name.clone()); println!("Transaction failed: {:?}", name); fail = true };
+		let mut fail_unless = |cond: bool, title: &str| if !cond { failed.push(name.clone()); println!("Transaction failed: {:?}: {:?}", name, title); };

 		let number: Option<u64> = test.block_number.map(Into::into);
 		let schedule = match number {
@ -35,7 +34,7 @@ fn do_json_test(json_data: &[u8]) -> Vec<String> {
 			Some(x) if x < 1_150_000 => &old_schedule,
 			Some(_) => &new_schedule
 		};
-		let allow_network_id_of_one = number.map_or(false, |n| n > 2600000); 
+		let allow_network_id_of_one = number.map_or(false, |n| n >= 3_500_000); 

 		let rlp: Vec<u8> = test.rlp.into();
 		let res = UntrustedRlp::new(&rlp)
@ -43,26 +42,26 @@ fn do_json_test(json_data: &[u8]) -> Vec<String> {
 			.map_err(From::from)
 			.and_then(|t: SignedTransaction| t.validate(schedule, schedule.have_delegate_call, allow_network_id_of_one));

-		fail_unless(test.transaction.is_none() == res.is_err());
+		fail_unless(test.transaction.is_none() == res.is_err(), "Validity different");
 		if let (Some(tx), Some(sender)) = (test.transaction, test.sender) {
 			let t = res.unwrap();
-			fail_unless(t.sender().unwrap() == sender.into());
+			fail_unless(t.sender().unwrap() == sender.into(), "sender mismatch");
 			let is_acceptable_network_id = match t.network_id() {
 				None => true,
 				Some(1) if allow_network_id_of_one => true,
 				_ => false,
 			};
-			fail_unless(is_acceptable_network_id);
+			fail_unless(is_acceptable_network_id, "Network ID unacceptable");
 			let data: Vec<u8> = tx.data.into();
-			fail_unless(t.data == data);
-			fail_unless(t.gas_price == tx.gas_price.into());
-			fail_unless(t.nonce == tx.nonce.into());
-			fail_unless(t.value == tx.value.into());
+			fail_unless(t.data == data, "data mismatch");
+			fail_unless(t.gas_price == tx.gas_price.into(), "gas_price mismatch");
+			fail_unless(t.nonce == tx.nonce.into(), "nonce mismatch");
+			fail_unless(t.value == tx.value.into(), "value mismatch");
 			let to: Option<ethjson::hash::Address> = tx.to.into();
 			let to: Option<Address> = to.map(Into::into);
 			match t.action {
-				Action::Call(dest) => fail_unless(Some(dest) == to),
-				Action::Create => fail_unless(None == to),
+				Action::Call(dest) => fail_unless(Some(dest) == to, "call/destination mismatch"),
+				Action::Create => fail_unless(None == to, "create mismatch"),
 			}
 		}
 	}
@ -80,3 +79,7 @@ declare_test!{TransactionTests_Homestead_ttTransactionTest, "TransactionTests/Ho
 declare_test!{heavy => TransactionTests_Homestead_tt10mbDataField, "TransactionTests/Homestead/tt10mbDataField"}
 declare_test!{TransactionTests_Homestead_ttWrongRLPTransaction, "TransactionTests/Homestead/ttWrongRLPTransaction"}
 declare_test!{TransactionTests_RandomTests_tr201506052141PYTHON, "TransactionTests/RandomTests/tr201506052141PYTHON"}
+declare_test!{TransactionTests_Homestead_ttTransactionTestEip155VitaliksTests, "TransactionTests/Homestead/ttTransactionTestEip155VitaliksTests"}
+declare_test!{TransactionTests_EIP155_ttTransactionTest, "TransactionTests/EIP155/ttTransactionTest"}
+declare_test!{TransactionTests_EIP155_ttTransactionTestEip155VitaliksTests, "TransactionTests/EIP155/ttTransactionTestEip155VitaliksTests"}
+declare_test!{TransactionTests_EIP155_ttTransactionTestVRule, "TransactionTests/EIP155/ttTransactionTestVRule"}
--- a/js/build-server.js
+++ b/js/build-server.js
@ -14,7 +14,6 @@
 // You should have received a copy of the GNU General Public License
 // along with Parity.  If not, see <http://www.gnu.org/licenses/>.
 // test only
-
 /**
 * Run `PARITY_URL="127.0.0.1:8180" NODE_ENV="production" npm run build`
 * to build the project ; use this server to test that the minifed
--- a/js/package.json
+++ b/js/package.json
@ -1,6 +1,6 @@
 {
  "name": "parity.js",
-  "version": "0.2.19",
+  "version": "0.2.23",
  "main": "release/index.js",
  "jsnext:main": "src/index.js",
  "author": "Parity Team <admin@parity.io>",
--- a/js/src/dapps/basiccoin/Deploy/Deployment/deployment.js
+++ b/js/src/dapps/basiccoin/Deploy/Deployment/deployment.js
@ -148,7 +148,7 @@ export default class Deployment extends Component {
              addresses={ addresses }
              onChange={ this.onChangeFrom } />
            <div className={ styles.hint }>
-              the owner account to eploy from
+              the owner account to deploy from
            </div>
          </div>
          <div className={ nameError ? error : styles.input }>
--- a/js/src/secureApi.js
+++ b/js/src/secureApi.js
@ -28,19 +28,22 @@ export default class SecureApi extends Api {
    this._dappsPort = 8080;
    this._signerPort = 8180;

+    console.log('SecureApi:constructor', sysuiToken);
+
    this._followConnection();
  }

  setToken = () => {
    window.localStorage.setItem('sysuiToken', this._transport.token);
+    console.log('SecureApi:setToken', this._transport.token);
  }

  _followConnection = () => {
    const nextTick = () => {
-      setTimeout(this._followConnection, 250);
+      setTimeout(() => this._followConnection(), 250);
    };
    const setManual = () => {
-      this._connectedState = 100;
+      this._connectState = 100;
      this._needsToken = true;
      this._isConnecting = false;
    };
@ -51,7 +54,6 @@ export default class SecureApi extends Api {
      // token = <passed via constructor>
      case 0:
        if (isConnected) {
-          this._isConnecting = false;
          return this.connectSuccess();
        } else if (lastError) {
          this.updateToken('initial', 1);
@ -61,14 +63,13 @@ export default class SecureApi extends Api {
      // token = 'initial'
      case 1:
        if (isConnected) {
-          this._connectState = 2;
-          this.parity
+          this.signer
            .generateAuthorizationToken()
            .then((token) => {
              this.updateToken(token, 2);
            })
            .catch((error) => {
-              console.error('_followConnection', error);
+              console.error('SecureApi:generateAuthorizationToken', error);
              setManual();
            });
          return;
@ -80,7 +81,6 @@ export default class SecureApi extends Api {
      // token = <personal_generateAuthorizationToken>
      case 2:
        if (isConnected) {
-          this._isConnecting = false;
          return this.connectSuccess();
        } else if (lastError) {
          return setManual();
@ -92,6 +92,9 @@ export default class SecureApi extends Api {
  }

  connectSuccess () {
+    this._isConnecting = false;
+    this._needsToken = false;
+
    this.setToken();

    Promise
@ -103,12 +106,15 @@ export default class SecureApi extends Api {
        this._dappsPort = dappsPort.toNumber();
        this._signerPort = signerPort.toNumber();
      });
+
+    console.log('SecureApi:connectSuccess', this._transport.token);
  }

-  updateToken (token, connectedState = 0) {
-    this._connectState = connectedState;
+  updateToken (token, connectState) {
+    this._connectState = connectState;
    this._transport.updateToken(token.replace(/[^a-zA-Z0-9]/g, ''));
    this._followConnection();
+    console.log('SecureApi:updateToken', this._transport.token, connectState);
  }

  get dappsPort () {
@ -116,7 +122,7 @@ export default class SecureApi extends Api {
  }

  get dappsUrl () {
-    return `http://127.0.0.1:${this._dappsPort}`;
+    return `http://${window.location.hostname}:${this._dappsPort}`;
  }

  get signerPort () {
--- a/js/src/ui/Balance/balance.css
+++ b/js/src/ui/Balance/balance.css
@ -44,7 +44,7 @@
 }

 .balanceValue {
-  margin: 0 1em 0 0;
+  margin: 0 0.5em 0 0;
  text-overflow: ellipsis;
  white-space: nowrap;
  overflow: hidden;
--- a/js/src/ui/Balance/balance.js
+++ b/js/src/ui/Balance/balance.js
@ -44,15 +44,30 @@ class Balance extends Component {
      .filter((balance) => new BigNumber(balance.value).gt(0))
      .map((balance) => {
        const token = balance.token;
-        const value = token.format
-          ? new BigNumber(balance.value).div(new BigNumber(token.format)).toFormat(3)
-          : api.util.fromWei(balance.value).toFormat(3);
+
+        let value;
+        if (token.format) {
+          const bnf = new BigNumber(token.format);
+
+          let decimals = 0;
+          if (bnf.gte(1000)) {
+            decimals = 3;
+          } else if (bnf.gte(100)) {
+            decimals = 2;
+          } else if (bnf.gte(10)) {
+            decimals = 1;
+          }
+
+          value = new BigNumber(balance.value).div(bnf).toFormat(decimals);
+        } else {
+          value = api.util.fromWei(balance.value).toFormat(3);
+        }
+
        let imagesrc = token.image;
        if (!imagesrc) {
-          imagesrc =
-            images[token.address]
-              ? `${api.dappsUrl}${images[token.address]}`
-              : unknownImage;
+          imagesrc = images[token.address]
+            ? `${api.dappsUrl}${images[token.address]}`
+            : unknownImage;
        }

        return (
--- a/js/src/views/Connection/connection.js
+++ b/js/src/views/Connection/connection.js
@ -83,9 +83,8 @@ class Connection extends Component {
  }

  renderSigner () {
-    const { api } = this.context;
    const { token, validToken } = this.state;
-    const { needsToken, isConnecting } = api;
+    const { isConnecting, needsToken } = this.props;

    if (needsToken && !isConnecting) {
      return (
--- a/js/src/views/Dapps/Summary/summary.js
+++ b/js/src/views/Dapps/Summary/summary.js
@ -32,7 +32,7 @@ export default class Summary extends Component {
  }

  render () {
-    const { dappsPort } = this.context.api;
+    const { dappsUrl } = this.context.api;
    const { app } = this.props;

    if (!app) {
@ -41,9 +41,9 @@ export default class Summary extends Component {

    let image = <div className={ styles.image }>&nbsp;</div>;
    if (app.type === 'local') {
-      image = <img src={ `http://127.0.0.1:${dappsPort}/${app.id}/${app.iconUrl}` } className={ styles.image } />;
+      image = <img src={ `${dappsUrl}/${app.id}/${app.iconUrl}` } className={ styles.image } />;
    } else {
-      image = <img src={ `http://127.0.0.1:${dappsPort}${app.image}` } className={ styles.image } />;
+      image = <img src={ `${dappsUrl}${app.image}` } className={ styles.image } />;
    }

    return (
--- a/js/src/views/Settings/Views/defaults.js
+++ b/js/src/views/Settings/Views/defaults.js
@ -58,7 +58,7 @@ const defaultViews = {
    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-focussed environment, specifically for advanced users that understand the inner working of certain contracts.'
+    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.'
  },

  status: {
@ -77,7 +77,7 @@ const defaultViews = {
    label: 'Signer',
    route: '/signer',
    value: 'signer',
-    description: 'The security focussed 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.'
+    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.'
  },

  settings: {
--- a/mac/Parity.pkgproj
+++ b/mac/Parity.pkgproj
@ -474,6 +474,22 @@
 													<key>UID</key>
 													<integer>0</integer>
 												</dict>
+												<dict>
+													<key>CHILDREN</key>
+													<array/>
+													<key>GID</key>
+													<integer>0</integer>
+													<key>PATH</key>
+													<string>uninstall-parity.sh</string>
+													<key>PATH_TYPE</key>
+													<integer>3</integer>
+													<key>PERMISSIONS</key>
+													<integer>493</integer>
+													<key>TYPE</key>
+													<integer>3</integer>
+													<key>UID</key>
+													<integer>0</integer>
+												</dict>
 											</array>
 											<key>GID</key>
 											<integer>0</integer>
@ -562,7 +578,7 @@
 				<key>OVERWRITE_PERMISSIONS</key>
 				<false/>
 				<key>VERSION</key>
-				<string>1.4</string>
+				<string>1.5.0</string>
 			</dict>
 			<key>UUID</key>
 			<string>2DCD5B81-7BAF-4DA1-9251-6274B089FD36</string>
@ -653,6 +669,44 @@
 				<key>LOCALIZATIONS</key>
 				<array/>
 			</dict>
+			<key>LICENSE</key>
+			<dict>
+				<key>KEYWORDS</key>
+				<dict/>
+				<key>LOCALIZATIONS</key>
+				<array>
+					<dict>
+						<key>LANGUAGE</key>
+						<string>English</string>
+						<key>VALUE</key>
+						<dict>
+							<key>PATH</key>
+							<string>install-licence.txt</string>
+							<key>PATH_TYPE</key>
+							<integer>3</integer>
+						</dict>
+					</dict>
+				</array>
+				<key>MODE</key>
+				<integer>0</integer>
+			</dict>
+			<key>README</key>
+			<dict>
+				<key>LOCALIZATIONS</key>
+				<array>
+					<dict>
+						<key>LANGUAGE</key>
+						<string>English</string>
+						<key>VALUE</key>
+						<dict>
+							<key>PATH</key>
+							<string>install-readme.txt</string>
+							<key>PATH_TYPE</key>
+							<integer>3</integer>
+						</dict>
+					</dict>
+				</array>
+			</dict>
 			<key>TITLE</key>
 			<dict>
 				<key>LOCALIZATIONS</key>
--- a/mac/install-licence.txt
+++ b/mac/install-licence.txt
@ -0,0 +1,675 @@
+                    GNU GENERAL PUBLIC LICENSE
+                       Version 3, 29 June 2007
+
+ Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+                            Preamble
+
+  The GNU General Public License is a free, copyleft license for
+software and other kinds of works.
+
+  The licenses for most software and other practical works are designed
+to take away your freedom to share and change the works.  By contrast,
+the GNU General Public License is intended to guarantee your freedom to
+share and change all versions of a program--to make sure it remains free
+software for all its users.  We, the Free Software Foundation, use the
+GNU General Public License for most of our software; it applies also to
+any other work released this way by its authors.  You can apply it to
+your programs, too.
+
+  When we speak of free software, we are referring to freedom, not
+price.  Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+them if you wish), that you receive source code or can get it if you
+want it, that you can change the software or use pieces of it in new
+free programs, and that you know you can do these things.
+
+  To protect your rights, we need to prevent others from denying you
+these rights or asking you to surrender the rights.  Therefore, you have
+certain responsibilities if you distribute copies of the software, or if
+you modify it: responsibilities to respect the freedom of others.
+
+  For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must pass on to the recipients the same
+freedoms that you received.  You must make sure that they, too, receive
+or can get the source code.  And you must show them these terms so they
+know their rights.
+
+  Developers that use the GNU GPL protect your rights with two steps:
+(1) assert copyright on the software, and (2) offer you this License
+giving you legal permission to copy, distribute and/or modify it.
+
+  For the developers' and authors' protection, the GPL clearly explains
+that there is no warranty for this free software.  For both users' and
+authors' sake, the GPL requires that modified versions be marked as
+changed, so that their problems will not be attributed erroneously to
+authors of previous versions.
+
+  Some devices are designed to deny users access to install or run
+modified versions of the software inside them, although the manufacturer
+can do so.  This is fundamentally incompatible with the aim of
+protecting users' freedom to change the software.  The systematic
+pattern of such abuse occurs in the area of products for individuals to
+use, which is precisely where it is most unacceptable.  Therefore, we
+have designed this version of the GPL to prohibit the practice for those
+products.  If such problems arise substantially in other domains, we
+stand ready to extend this provision to those domains in future versions
+of the GPL, as needed to protect the freedom of users.
+
+  Finally, every program is threatened constantly by software patents.
+States should not allow patents to restrict development and use of
+software on general-purpose computers, but in those that do, we wish to
+avoid the special danger that patents applied to a free program could
+make it effectively proprietary.  To prevent this, the GPL assures that
+patents cannot be used to render the program non-free.
+
+  The precise terms and conditions for copying, distribution and
+modification follow.
+
+                       TERMS AND CONDITIONS
+
+  0. Definitions.
+
+  "This License" refers to version 3 of the GNU General Public License.
+
+  "Copyright" also means copyright-like laws that apply to other kinds of
+works, such as semiconductor masks.
+
+  "The Program" refers to any copyrightable work licensed under this
+License.  Each licensee is addressed as "you".  "Licensees" and
+"recipients" may be individuals or organizations.
+
+  To "modify" a work means to copy from or adapt all or part of the work
+in a fashion requiring copyright permission, other than the making of an
+exact copy.  The resulting work is called a "modified version" of the
+earlier work or a work "based on" the earlier work.
+
+  A "covered work" means either the unmodified Program or a work based
+on the Program.
+
+  To "propagate" a work means to do anything with it that, without
+permission, would make you directly or secondarily liable for
+infringement under applicable copyright law, except executing it on a
+computer or modifying a private copy.  Propagation includes copying,
+distribution (with or without modification), making available to the
+public, and in some countries other activities as well.
+
+  To "convey" a work means any kind of propagation that enables other
+parties to make or receive copies.  Mere interaction with a user through
+a computer network, with no transfer of a copy, is not conveying.
+
+  An interactive user interface displays "Appropriate Legal Notices"
+to the extent that it includes a convenient and prominently visible
+feature that (1) displays an appropriate copyright notice, and (2)
+tells the user that there is no warranty for the work (except to the
+extent that warranties are provided), that licensees may convey the
+work under this License, and how to view a copy of this License.  If
+the interface presents a list of user commands or options, such as a
+menu, a prominent item in the list meets this criterion.
+
+  1. Source Code.
+
+  The "source code" for a work means the preferred form of the work
+for making modifications to it.  "Object code" means any non-source
+form of a work.
+
+  A "Standard Interface" means an interface that either is an official
+standard defined by a recognized standards body, or, in the case of
+interfaces specified for a particular programming language, one that
+is widely used among developers working in that language.
+
+  The "System Libraries" of an executable work include anything, other
+than the work as a whole, that (a) is included in the normal form of
+packaging a Major Component, but which is not part of that Major
+Component, and (b) serves only to enable use of the work with that
+Major Component, or to implement a Standard Interface for which an
+implementation is available to the public in source code form.  A
+"Major Component", in this context, means a major essential component
+(kernel, window system, and so on) of the specific operating system
+(if any) on which the executable work runs, or a compiler used to
+produce the work, or an object code interpreter used to run it.
+
+  The "Corresponding Source" for a work in object code form means all
+the source code needed to generate, install, and (for an executable
+work) run the object code and to modify the work, including scripts to
+control those activities.  However, it does not include the work's
+System Libraries, or general-purpose tools or generally available free
+programs which are used unmodified in performing those activities but
+which are not part of the work.  For example, Corresponding Source
+includes interface definition files associated with source files for
+the work, and the source code for shared libraries and dynamically
+linked subprograms that the work is specifically designed to require,
+such as by intimate data communication or control flow between those
+subprograms and other parts of the work.
+
+  The Corresponding Source need not include anything that users
+can regenerate automatically from other parts of the Corresponding
+Source.
+
+  The Corresponding Source for a work in source code form is that
+same work.
+
+  2. Basic Permissions.
+
+  All rights granted under this License are granted for the term of
+copyright on the Program, and are irrevocable provided the stated
+conditions are met.  This License explicitly affirms your unlimited
+permission to run the unmodified Program.  The output from running a
+covered work is covered by this License only if the output, given its
+content, constitutes a covered work.  This License acknowledges your
+rights of fair use or other equivalent, as provided by copyright law.
+
+  You may make, run and propagate covered works that you do not
+convey, without conditions so long as your license otherwise remains
+in force.  You may convey covered works to others for the sole purpose
+of having them make modifications exclusively for you, or provide you
+with facilities for running those works, provided that you comply with
+the terms of this License in conveying all material for which you do
+not control copyright.  Those thus making or running the covered works
+for you must do so exclusively on your behalf, under your direction
+and control, on terms that prohibit them from making any copies of
+your copyrighted material outside their relationship with you.
+
+  Conveying under any other circumstances is permitted solely under
+the conditions stated below.  Sublicensing is not allowed; section 10
+makes it unnecessary.
+
+  3. Protecting Users' Legal Rights From Anti-Circumvention Law.
+
+  No covered work shall be deemed part of an effective technological
+measure under any applicable law fulfilling obligations under article
+11 of the WIPO copyright treaty adopted on 20 December 1996, or
+similar laws prohibiting or restricting circumvention of such
+measures.
+
+  When you convey a covered work, you waive any legal power to forbid
+circumvention of technological measures to the extent such circumvention
+is effected by exercising rights under this License with respect to
+the covered work, and you disclaim any intention to limit operation or
+modification of the work as a means of enforcing, against the work's
+users, your or third parties' legal rights to forbid circumvention of
+technological measures.
+
+  4. Conveying Verbatim Copies.
+
+  You may convey verbatim copies of the Program's source code as you
+receive it, in any medium, provided that you conspicuously and
+appropriately publish on each copy an appropriate copyright notice;
+keep intact all notices stating that this License and any
+non-permissive terms added in accord with section 7 apply to the code;
+keep intact all notices of the absence of any warranty; and give all
+recipients a copy of this License along with the Program.
+
+  You may charge any price or no price for each copy that you convey,
+and you may offer support or warranty protection for a fee.
+
+  5. Conveying Modified Source Versions.
+
+  You may convey a work based on the Program, or the modifications to
+produce it from the Program, in the form of source code under the
+terms of section 4, provided that you also meet all of these conditions:
+
+    a) The work must carry prominent notices stating that you modified
+    it, and giving a relevant date.
+
+    b) The work must carry prominent notices stating that it is
+    released under this License and any conditions added under section
+    7.  This requirement modifies the requirement in section 4 to
+    "keep intact all notices".
+
+    c) You must license the entire work, as a whole, under this
+    License to anyone who comes into possession of a copy.  This
+    License will therefore apply, along with any applicable section 7
+    additional terms, to the whole of the work, and all its parts,
+    regardless of how they are packaged.  This License gives no
+    permission to license the work in any other way, but it does not
+    invalidate such permission if you have separately received it.
+
+    d) If the work has interactive user interfaces, each must display
+    Appropriate Legal Notices; however, if the Program has interactive
+    interfaces that do not display Appropriate Legal Notices, your
+    work need not make them do so.
+
+  A compilation of a covered work with other separate and independent
+works, which are not by their nature extensions of the covered work,
+and which are not combined with it such as to form a larger program,
+in or on a volume of a storage or distribution medium, is called an
+"aggregate" if the compilation and its resulting copyright are not
+used to limit the access or legal rights of the compilation's users
+beyond what the individual works permit.  Inclusion of a covered work
+in an aggregate does not cause this License to apply to the other
+parts of the aggregate.
+
+  6. Conveying Non-Source Forms.
+
+  You may convey a covered work in object code form under the terms
+of sections 4 and 5, provided that you also convey the
+machine-readable Corresponding Source under the terms of this License,
+in one of these ways:
+
+    a) Convey the object code in, or embodied in, a physical product
+    (including a physical distribution medium), accompanied by the
+    Corresponding Source fixed on a durable physical medium
+    customarily used for software interchange.
+
+    b) Convey the object code in, or embodied in, a physical product
+    (including a physical distribution medium), accompanied by a
+    written offer, valid for at least three years and valid for as
+    long as you offer spare parts or customer support for that product
+    model, to give anyone who possesses the object code either (1) a
+    copy of the Corresponding Source for all the software in the
+    product that is covered by this License, on a durable physical
+    medium customarily used for software interchange, for a price no
+    more than your reasonable cost of physically performing this
+    conveying of source, or (2) access to copy the
+    Corresponding Source from a network server at no charge.
+
+    c) Convey individual copies of the object code with a copy of the
+    written offer to provide the Corresponding Source.  This
+    alternative is allowed only occasionally and noncommercially, and
+    only if you received the object code with such an offer, in accord
+    with subsection 6b.
+
+    d) Convey the object code by offering access from a designated
+    place (gratis or for a charge), and offer equivalent access to the
+    Corresponding Source in the same way through the same place at no
+    further charge.  You need not require recipients to copy the
+    Corresponding Source along with the object code.  If the place to
+    copy the object code is a network server, the Corresponding Source
+    may be on a different server (operated by you or a third party)
+    that supports equivalent copying facilities, provided you maintain
+    clear directions next to the object code saying where to find the
+    Corresponding Source.  Regardless of what server hosts the
+    Corresponding Source, you remain obligated to ensure that it is
+    available for as long as needed to satisfy these requirements.
+
+    e) Convey the object code using peer-to-peer transmission, provided
+    you inform other peers where the object code and Corresponding
+    Source of the work are being offered to the general public at no
+    charge under subsection 6d.
+
+  A separable portion of the object code, whose source code is excluded
+from the Corresponding Source as a System Library, need not be
+included in conveying the object code work.
+
+  A "User Product" is either (1) a "consumer product", which means any
+tangible personal property which is normally used for personal, family,
+or household purposes, or (2) anything designed or sold for incorporation
+into a dwelling.  In determining whether a product is a consumer product,
+doubtful cases shall be resolved in favor of coverage.  For a particular
+product received by a particular user, "normally used" refers to a
+typical or common use of that class of product, regardless of the status
+of the particular user or of the way in which the particular user
+actually uses, or expects or is expected to use, the product.  A product
+is a consumer product regardless of whether the product has substantial
+commercial, industrial or non-consumer uses, unless such uses represent
+the only significant mode of use of the product.
+
+  "Installation Information" for a User Product means any methods,
+procedures, authorization keys, or other information required to install
+and execute modified versions of a covered work in that User Product from
+a modified version of its Corresponding Source.  The information must
+suffice to ensure that the continued functioning of the modified object
+code is in no case prevented or interfered with solely because
+modification has been made.
+
+  If you convey an object code work under this section in, or with, or
+specifically for use in, a User Product, and the conveying occurs as
+part of a transaction in which the right of possession and use of the
+User Product is transferred to the recipient in perpetuity or for a
+fixed term (regardless of how the transaction is characterized), the
+Corresponding Source conveyed under this section must be accompanied
+by the Installation Information.  But this requirement does not apply
+if neither you nor any third party retains the ability to install
+modified object code on the User Product (for example, the work has
+been installed in ROM).
+
+  The requirement to provide Installation Information does not include a
+requirement to continue to provide support service, warranty, or updates
+for a work that has been modified or installed by the recipient, or for
+the User Product in which it has been modified or installed.  Access to a
+network may be denied when the modification itself materially and
+adversely affects the operation of the network or violates the rules and
+protocols for communication across the network.
+
+  Corresponding Source conveyed, and Installation Information provided,
+in accord with this section must be in a format that is publicly
+documented (and with an implementation available to the public in
+source code form), and must require no special password or key for
+unpacking, reading or copying.
+
+  7. Additional Terms.
+
+  "Additional permissions" are terms that supplement the terms of this
+License by making exceptions from one or more of its conditions.
+Additional permissions that are applicable to the entire Program shall
+be treated as though they were included in this License, to the extent
+that they are valid under applicable law.  If additional permissions
+apply only to part of the Program, that part may be used separately
+under those permissions, but the entire Program remains governed by
+this License without regard to the additional permissions.
+
+  When you convey a copy of a covered work, you may at your option
+remove any additional permissions from that copy, or from any part of
+it.  (Additional permissions may be written to require their own
+removal in certain cases when you modify the work.)  You may place
+additional permissions on material, added by you to a covered work,
+for which you have or can give appropriate copyright permission.
+
+  Notwithstanding any other provision of this License, for material you
+add to a covered work, you may (if authorized by the copyright holders of
+that material) supplement the terms of this License with terms:
+
+    a) Disclaiming warranty or limiting liability differently from the
+    terms of sections 15 and 16 of this License; or
+
+    b) Requiring preservation of specified reasonable legal notices or
+    author attributions in that material or in the Appropriate Legal
+    Notices displayed by works containing it; or
+
+    c) Prohibiting misrepresentation of the origin of that material, or
+    requiring that modified versions of such material be marked in
+    reasonable ways as different from the original version; or
+
+    d) Limiting the use for publicity purposes of names of licensors or
+    authors of the material; or
+
+    e) Declining to grant rights under trademark law for use of some
+    trade names, trademarks, or service marks; or
+
+    f) Requiring indemnification of licensors and authors of that
+    material by anyone who conveys the material (or modified versions of
+    it) with contractual assumptions of liability to the recipient, for
+    any liability that these contractual assumptions directly impose on
+    those licensors and authors.
+
+  All other non-permissive additional terms are considered "further
+restrictions" within the meaning of section 10.  If the Program as you
+received it, or any part of it, contains a notice stating that it is
+governed by this License along with a term that is a further
+restriction, you may remove that term.  If a license document contains
+a further restriction but permits relicensing or conveying under this
+License, you may add to a covered work material governed by the terms
+of that license document, provided that the further restriction does
+not survive such relicensing or conveying.
+
+  If you add terms to a covered work in accord with this section, you
+must place, in the relevant source files, a statement of the
+additional terms that apply to those files, or a notice indicating
+where to find the applicable terms.
+
+  Additional terms, permissive or non-permissive, may be stated in the
+form of a separately written license, or stated as exceptions;
+the above requirements apply either way.
+
+  8. Termination.
+
+  You may not propagate or modify a covered work except as expressly
+provided under this License.  Any attempt otherwise to propagate or
+modify it is void, and will automatically terminate your rights under
+this License (including any patent licenses granted under the third
+paragraph of section 11).
+
+  However, if you cease all violation of this License, then your
+license from a particular copyright holder is reinstated (a)
+provisionally, unless and until the copyright holder explicitly and
+finally terminates your license, and (b) permanently, if the copyright
+holder fails to notify you of the violation by some reasonable means
+prior to 60 days after the cessation.
+
+  Moreover, your license from a particular copyright holder is
+reinstated permanently if the copyright holder notifies you of the
+violation by some reasonable means, this is the first time you have
+received notice of violation of this License (for any work) from that
+copyright holder, and you cure the violation prior to 30 days after
+your receipt of the notice.
+
+  Termination of your rights under this section does not terminate the
+licenses of parties who have received copies or rights from you under
+this License.  If your rights have been terminated and not permanently
+reinstated, you do not qualify to receive new licenses for the same
+material under section 10.
+
+  9. Acceptance Not Required for Having Copies.
+
+  You are not required to accept this License in order to receive or
+run a copy of the Program.  Ancillary propagation of a covered work
+occurring solely as a consequence of using peer-to-peer transmission
+to receive a copy likewise does not require acceptance.  However,
+nothing other than this License grants you permission to propagate or
+modify any covered work.  These actions infringe copyright if you do
+not accept this License.  Therefore, by modifying or propagating a
+covered work, you indicate your acceptance of this License to do so.
+
+  10. Automatic Licensing of Downstream Recipients.
+
+  Each time you convey a covered work, the recipient automatically
+receives a license from the original licensors, to run, modify and
+propagate that work, subject to this License.  You are not responsible
+for enforcing compliance by third parties with this License.
+
+  An "entity transaction" is a transaction transferring control of an
+organization, or substantially all assets of one, or subdividing an
+organization, or merging organizations.  If propagation of a covered
+work results from an entity transaction, each party to that
+transaction who receives a copy of the work also receives whatever
+licenses to the work the party's predecessor in interest had or could
+give under the previous paragraph, plus a right to possession of the
+Corresponding Source of the work from the predecessor in interest, if
+the predecessor has it or can get it with reasonable efforts.
+
+  You may not impose any further restrictions on the exercise of the
+rights granted or affirmed under this License.  For example, you may
+not impose a license fee, royalty, or other charge for exercise of
+rights granted under this License, and you may not initiate litigation
+(including a cross-claim or counterclaim in a lawsuit) alleging that
+any patent claim is infringed by making, using, selling, offering for
+sale, or importing the Program or any portion of it.
+
+  11. Patents.
+
+  A "contributor" is a copyright holder who authorizes use under this
+License of the Program or a work on which the Program is based.  The
+work thus licensed is called the contributor's "contributor version".
+
+  A contributor's "essential patent claims" are all patent claims
+owned or controlled by the contributor, whether already acquired or
+hereafter acquired, that would be infringed by some manner, permitted
+by this License, of making, using, or selling its contributor version,
+but do not include claims that would be infringed only as a
+consequence of further modification of the contributor version.  For
+purposes of this definition, "control" includes the right to grant
+patent sublicenses in a manner consistent with the requirements of
+this License.
+
+  Each contributor grants you a non-exclusive, worldwide, royalty-free
+patent license under the contributor's essential patent claims, to
+make, use, sell, offer for sale, import and otherwise run, modify and
+propagate the contents of its contributor version.
+
+  In the following three paragraphs, a "patent license" is any express
+agreement or commitment, however denominated, not to enforce a patent
+(such as an express permission to practice a patent or covenant not to
+sue for patent infringement).  To "grant" such a patent license to a
+party means to make such an agreement or commitment not to enforce a
+patent against the party.
+
+  If you convey a covered work, knowingly relying on a patent license,
+and the Corresponding Source of the work is not available for anyone
+to copy, free of charge and under the terms of this License, through a
+publicly available network server or other readily accessible means,
+then you must either (1) cause the Corresponding Source to be so
+available, or (2) arrange to deprive yourself of the benefit of the
+patent license for this particular work, or (3) arrange, in a manner
+consistent with the requirements of this License, to extend the patent
+license to downstream recipients.  "Knowingly relying" means you have
+actual knowledge that, but for the patent license, your conveying the
+covered work in a country, or your recipient's use of the covered work
+in a country, would infringe one or more identifiable patents in that
+country that you have reason to believe are valid.
+
+  If, pursuant to or in connection with a single transaction or
+arrangement, you convey, or propagate by procuring conveyance of, a
+covered work, and grant a patent license to some of the parties
+receiving the covered work authorizing them to use, propagate, modify
+or convey a specific copy of the covered work, then the patent license
+you grant is automatically extended to all recipients of the covered
+work and works based on it.
+
+  A patent license is "discriminatory" if it does not include within
+the scope of its coverage, prohibits the exercise of, or is
+conditioned on the non-exercise of one or more of the rights that are
+specifically granted under this License.  You may not convey a covered
+work if you are a party to an arrangement with a third party that is
+in the business of distributing software, under which you make payment
+to the third party based on the extent of your activity of conveying
+the work, and under which the third party grants, to any of the
+parties who would receive the covered work from you, a discriminatory
+patent license (a) in connection with copies of the covered work
+conveyed by you (or copies made from those copies), or (b) primarily
+for and in connection with specific products or compilations that
+contain the covered work, unless you entered into that arrangement,
+or that patent license was granted, prior to 28 March 2007.
+
+  Nothing in this License shall be construed as excluding or limiting
+any implied license or other defenses to infringement that may
+otherwise be available to you under applicable patent law.
+
+  12. No Surrender of Others' Freedom.
+
+  If conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License.  If you cannot convey a
+covered work so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you may
+not convey it at all.  For example, if you agree to terms that obligate you
+to collect a royalty for further conveying from those to whom you convey
+the Program, the only way you could satisfy both those terms and this
+License would be to refrain entirely from conveying the Program.
+
+  13. Use with the GNU Affero General Public License.
+
+  Notwithstanding any other provision of this License, you have
+permission to link or combine any covered work with a work licensed
+under version 3 of the GNU Affero General Public License into a single
+combined work, and to convey the resulting work.  The terms of this
+License will continue to apply to the part which is the covered work,
+but the special requirements of the GNU Affero General Public License,
+section 13, concerning interaction through a network will apply to the
+combination as such.
+
+  14. Revised Versions of this License.
+
+  The Free Software Foundation may publish revised and/or new versions of
+the GNU General Public License from time to time.  Such new versions will
+be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
+
+  Each version is given a distinguishing version number.  If the
+Program specifies that a certain numbered version of the GNU General
+Public License "or any later version" applies to it, you have the
+option of following the terms and conditions either of that numbered
+version or of any later version published by the Free Software
+Foundation.  If the Program does not specify a version number of the
+GNU General Public License, you may choose any version ever published
+by the Free Software Foundation.
+
+  If the Program specifies that a proxy can decide which future
+versions of the GNU General Public License can be used, that proxy's
+public statement of acceptance of a version permanently authorizes you
+to choose that version for the Program.
+
+  Later license versions may give you additional or different
+permissions.  However, no additional obligations are imposed on any
+author or copyright holder as a result of your choosing to follow a
+later version.
+
+  15. Disclaimer of Warranty.
+
+  THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
+APPLICABLE LAW.  EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
+HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
+OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
+THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
+IS WITH YOU.  SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
+ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
+
+  16. Limitation of Liability.
+
+  IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
+THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
+GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
+USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
+DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
+PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
+EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
+SUCH DAMAGES.
+
+  17. Interpretation of Sections 15 and 16.
+
+  If the disclaimer of warranty and limitation of liability provided
+above cannot be given local legal effect according to their terms,
+reviewing courts shall apply local law that most closely approximates
+an absolute waiver of all civil liability in connection with the
+Program, unless a warranty or assumption of liability accompanies a
+copy of the Program in return for a fee.
+
+                     END OF TERMS AND CONDITIONS
+
+            How to Apply These Terms to Your New Programs
+
+  If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these terms.
+
+  To do so, attach the following notices to the program.  It is safest
+to attach them to the start of each source file to most effectively
+state the exclusion of warranty; and each file should have at least
+the "copyright" line and a pointer to where the full notice is found.
+
+    {one line to give the program's name and a brief idea of what it does.}
+    Copyright (C) {year}  {name of author}
+
+    This program 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.
+
+    This program 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 this program.  If not, see <http://www.gnu.org/licenses/>.
+
+Also add information on how to contact you by electronic and paper mail.
+
+  If the program does terminal interaction, make it output a short
+notice like this when it starts in an interactive mode:
+
+    {project}  Copyright (C) {year}  {fullname}
+    This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
+    This is free software, and you are welcome to redistribute it
+    under certain conditions; type `show c' for details.
+
+The hypothetical commands `show w' and `show c' should show the appropriate
+parts of the General Public License.  Of course, your program's commands
+might be different; for a GUI interface, you would use an "about box".
+
+  You should also get your employer (if you work as a programmer) or school,
+if any, to sign a "copyright disclaimer" for the program, if necessary.
+For more information on this, and how to apply and follow the GNU GPL, see
+<http://www.gnu.org/licenses/>.
+
+  The GNU General Public License does not permit incorporating your program
+into proprietary programs.  If your program is a subroutine library, you
+may consider it more useful to permit linking proprietary applications with
+the library.  If this is what you want to do, use the GNU Lesser General
+Public License instead of this License.  But first, please read
+<http://www.gnu.org/philosophy/why-not-lgpl.html>.
+
--- a/mac/install-readme.txt
+++ b/mac/install-readme.txt
@ -0,0 +1,20 @@
+Parity Wallet
+=============
+
+Welcome to Parity Wallet, your all-in-one Ethereum node and wallet.
+
+WARNING: This installer is **EXPERIMENTAL**. Use it at your own risk.
+
+If you continue, Parity will be installed as a system service. You will be able to use the Parity Wallet through your browser by following the shortcut in the Launchpad or navigating to http://localhost:8080/ in your browser.
+
+To temporarily disable Parity Wallet (and stop Parity) use:
+
+	launchctl stop io.parity.ethereum
+
+
+To completely uninstall Parity Wallet use:
+
+	sudo -c /usr/local/libexec/uninstall-parity.sh
+
+
+Parity is distributed under the terms of the GPL.
--- a/mac/post-install.sh
+++ b/mac/post-install.sh
@ -26,12 +26,12 @@ cat > $HOME/Library/LaunchAgents/io.parity.ethereum.plist <<EOF
 EOF

 mkdir -p $HOME/.parity/906a34e69aec8c0d
-echo -n '{"fat_db":false,"mode":"passive","pruning":"fast","tracing":false}' > $HOME/.parity/906a34e69aec8c0d/user_defaults
+echo -n '{"fat_db":false,"mode":"passive","mode.alarm":3600,"mode.timeout":300,"pruning":"fast","tracing":false}' > $HOME/.parity/906a34e69aec8c0d/user_defaults

 chown -R $USER $HOME/.parity $HOME/Library/LaunchAgents $HOME/Library/LaunchAgents/io.parity.ethereum.plist

 su $USER -c "launchctl load $HOME/Library/LaunchAgents/io.parity.ethereum.plist"
-sleep 1
+sleep 5

-open http://127.0.0.1:8080/
+su $USER -c "open http://127.0.0.1:8080/"

--- a/mac/uninstall-parity.sh
+++ b/mac/uninstall-parity.sh
@ -0,0 +1,13 @@
+#!/bin/bash
+
+if [[ "$SUDO_USER" == "" ]] ; then
+	echo "This script requires elevated privileges."
+	sudo $0
+	exit;
+fi
+
+PLIST=~/Library/LaunchAgents/io.parity.ethereum.plist
+su $SUDO_USER -c "launchctl stop io.parity.ethereum"
+su $SUDO_USER -c "launchctl unload $PLIST"
+rm -f /usr/local/libexec/parity /usr/local/libexec/uninstall-parity.sh /usr/local/bin/ethstore $PLIST
+
--- a/nsis/installer.nsi
+++ b/nsis/installer.nsi
@ -83,6 +83,10 @@ functionEnd
 section "install"
 	# Files for the install directory - to build the installer, these should be in the same directory as the install script (this file)
 	setOutPath $INSTDIR
+
+	# Close parity if running
+	!insertmacro TerminateApp
+
 	# Files added here should be removed by the uninstaller (see section "uninstall")
 	file /oname=parity.exe ..\target\release\parity.exe
 	file /oname=ptray.exe ..\windows\ptray\x64\Release\ptray.exe
@ -99,6 +103,7 @@ section "install"

 	# Start Menu
 	createDirectory "$SMPROGRAMS\${COMPANYNAME}"
+	delete "$SMPROGRAMS\${COMPANYNAME}\${APPNAME}.lnk"
 	createShortCut "$SMPROGRAMS\${COMPANYNAME}\${APPNAME} Ethereum.lnk" "$INSTDIR\ptray.exe" "ui" "$INSTDIR\logo.ico"
 	createShortCut "$DESKTOP\${APPNAME} Ethereum.lnk" "$INSTDIR\ptray.exe" "ui" "$INSTDIR\logo.ico"

@ -115,7 +120,7 @@ section "install"
 	SimpleFC::AdvAddRule  "Parity UDP discovery (UDP:30303)" "" 17 2 1 2147483647 1 "$INSTDIR\parity.exe" "" "" "Parity"    "" 30303 "" ""

 	# Registry information for add/remove programs
-	WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${COMPANYNAME} ${APPNAME}" "DisplayName" "${COMPANYNAME} - ${APPNAME} - ${DESCRIPTION}"
+	WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${COMPANYNAME} ${APPNAME}" "DisplayName" "${APPNAME} - ${DESCRIPTION}"
 	WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${COMPANYNAME} ${APPNAME}" "UninstallString" "$\"$INSTDIR\uninstall.exe$\""
 	WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${COMPANYNAME} ${APPNAME}" "QuietUninstallString" "$\"$INSTDIR\uninstall.exe$\" /S"
 	WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${COMPANYNAME} ${APPNAME}" "InstallLocation" "$\"$INSTDIR$\""
@ -133,7 +138,8 @@ section "install"
 	# Set the INSTALLSIZE constant (!defined at the top of this script) so Add/Remove Programs can accurately report the size
 	WriteRegDWORD HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${COMPANYNAME} ${APPNAME}" "EstimatedSize" ${INSTALLSIZE}

-	WriteRegStr HKEY_LOCAL_MACHINE "Software\Microsoft\Windows\CurrentVersion\Run" ${APPNAME} "$INSTDIR\ptray.exe ${ARGS}"
+	WriteRegStr HKEY_CURRENT_USER "Software\Microsoft\Windows\CurrentVersion\Run" ${APPNAME} "$INSTDIR\ptray.exe ${ARGS}"
+	DeleteRegValue HKLM "Software\Microsoft\Windows\CurrentVersion\Run" "${APPNAME}"
 	ExecShell "" "$INSTDIR\ptray.exe" "${FIRST_START_ARGS}"
 sectionEnd

@ -177,5 +183,6 @@ section "uninstall"
 	# Remove uninstaller information from the registry
 	DeleteRegKey HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${COMPANYNAME} ${APPNAME}"
 	DeleteRegValue HKLM "Software\Microsoft\Windows\CurrentVersion\Run" "${APPNAME}"
+	DeleteRegValue HKCU "Software\Microsoft\Windows\CurrentVersion\Run" "${APPNAME}"
 sectionEnd

--- a/parity/configuration.rs
+++ b/parity/configuration.rs
@ -511,7 +511,10 @@ impl Configuration {
 	fn rpc_apis(&self) -> String {
 		let mut apis = self.args.flag_rpcapi.clone().unwrap_or(self.args.flag_jsonrpc_apis.clone());
 		if self.args.flag_geth {
-			apis.push_str(",personal");
+			if !apis.is_empty() {
+				apis.push_str(",");
+			}
+			apis.push_str("personal");
 		}
 		apis
 	}
@ -548,6 +551,9 @@ impl Configuration {
 			apis: {
 				let mut apis = self.args.flag_ipcapi.clone().unwrap_or(self.args.flag_ipc_apis.clone());
 				if self.args.flag_geth {
+					if !apis.is_empty() {
+ 						apis.push_str(",");
+ 					}
 					apis.push_str("personal");
 				}
 				try!(apis.parse())
--- a/rpc/src/v1/helpers/dispatch.rs
+++ b/rpc/src/v1/helpers/dispatch.rs
@ -14,84 +14,153 @@
 // You should have received a copy of the GNU General Public License
 // along with Parity.  If not, see <http://www.gnu.org/licenses/>.

+use rlp;
 use util::{Address, H256, U256, Uint, Bytes};
 use util::bytes::ToPretty;
+
 use ethkey::Signature;
 use ethcore::miner::MinerService;
 use ethcore::client::MiningBlockChainClient;
 use ethcore::transaction::{Action, SignedTransaction, Transaction};
 use ethcore::account_provider::AccountProvider;
-use jsonrpc_core::{Error, Value, to_value};
-use v1::helpers::TransactionRequest;
-use v1::types::{H256 as RpcH256, H520 as RpcH520, Bytes as RpcBytes};
-use v1::helpers::errors;
+
+use jsonrpc_core::Error;
+use v1::helpers::{errors, TransactionRequest, FilledTransactionRequest, ConfirmationPayload};
+use v1::types::{
+	H256 as RpcH256, H520 as RpcH520, Bytes as RpcBytes,
+	ConfirmationPayload as RpcConfirmationPayload,
+	ConfirmationResponse,
+	SignRequest as RpcSignRequest,
+	DecryptRequest as RpcDecryptRequest,
+};

 pub const DEFAULT_MAC: [u8; 2] = [0, 0];

-pub fn dispatch_transaction<C, M>(client: &C, miner: &M, signed_transaction: SignedTransaction) -> Result<RpcH256, Error>
-	where C: MiningBlockChainClient, M: MinerService {
-	let hash = RpcH256::from(signed_transaction.hash());
-
-	miner.import_own_transaction(client, signed_transaction)
-		.map_err(errors::from_transaction_error)
-		.map(|_| hash)
+pub fn execute<C, M>(client: &C, miner: &M, accounts: &AccountProvider, payload: ConfirmationPayload, pass: Option<String>) -> Result<ConfirmationResponse, Error>
+	where C: MiningBlockChainClient, M: MinerService
+{
+	match payload {
+		ConfirmationPayload::SendTransaction(request) => {
+			sign_and_dispatch(client, miner, accounts, request, pass)
+				.map(RpcH256::from)
+				.map(ConfirmationResponse::SendTransaction)
+		},
+		ConfirmationPayload::SignTransaction(request) => {
+			sign_no_dispatch(client, miner, accounts, request, pass)
+				.map(|tx| rlp::encode(&tx).to_vec())
+				.map(RpcBytes)
+				.map(ConfirmationResponse::SignTransaction)
+		},
+		ConfirmationPayload::Signature(address, hash) => {
+			signature(accounts, address, hash, pass)
+				.map(RpcH520::from)
+				.map(ConfirmationResponse::Signature)
+		},
+		ConfirmationPayload::Decrypt(address, data) => {
+			decrypt(accounts, address, data, pass)
+				.map(RpcBytes)
+				.map(ConfirmationResponse::Decrypt)
+		},
+	}
 }

-fn signature(accounts: &AccountProvider, address: Address, password: Option<String>, hash: H256) -> Result<Signature, Error> {
+fn signature(accounts: &AccountProvider, address: Address, hash: H256, password: Option<String>) -> Result<Signature, Error> {
 	accounts.sign(address, password.clone(), hash).map_err(|e| match password {
 		Some(_) => errors::from_password_error(e),
 		None => errors::from_signing_error(e),
 	})
 }

-pub fn sign(accounts: &AccountProvider, address: Address, password: Option<String>, hash: H256) -> Result<Value, Error> {
-	signature(accounts, address, password, hash)
-		.map(RpcH520::from)
-		.map(to_value)
-}
-
-pub fn decrypt(accounts: &AccountProvider, address: Address, password: Option<String>, msg: Bytes) -> Result<Value, Error> {
+fn decrypt(accounts: &AccountProvider, address: Address, msg: Bytes, password: Option<String>) -> Result<Bytes, Error> {
 	accounts.decrypt(address, password.clone(), &DEFAULT_MAC, &msg)
 		.map_err(|e| match password {
 			Some(_) => errors::from_password_error(e),
 			None => errors::from_signing_error(e),
 		})
-		.map(RpcBytes::from)
-		.map(to_value)
 }

-pub fn sign_and_dispatch<C, M>(client: &C, miner: &M, accounts: &AccountProvider, request: TransactionRequest, password: Option<String>) -> Result<RpcH256, Error>
+pub fn dispatch_transaction<C, M>(client: &C, miner: &M, signed_transaction: SignedTransaction) -> Result<H256, Error>
+	where C: MiningBlockChainClient, M: MinerService {
+	let hash = signed_transaction.hash();
+
+	miner.import_own_transaction(client, signed_transaction)
+		.map_err(errors::from_transaction_error)
+		.map(|_| hash)
+}
+
+pub fn sign_no_dispatch<C, M>(client: &C, miner: &M, accounts: &AccountProvider, filled: FilledTransactionRequest, password: Option<String>) -> Result<SignedTransaction, Error>
 	where C: MiningBlockChainClient, M: MinerService {

 	let network_id = client.signing_network_id();
-	let address = request.from;
+	let address = filled.from;
 	let signed_transaction = {
-		let t = prepare_transaction(client, miner, request);
+		let t = Transaction {
+			nonce: filled.nonce
+				.or_else(|| miner
+					.last_nonce(&filled.from)
+					.map(|nonce| nonce + U256::one()))
+				.unwrap_or_else(|| client.latest_nonce(&filled.from)),
+
+			action: filled.to.map_or(Action::Create, Action::Call),
+			gas: filled.gas,
+			gas_price: filled.gas_price,
+			value: filled.value,
+			data: filled.data,
+		};
+
 		let hash = t.hash(network_id);
-		let signature = try!(signature(accounts, address, password, hash));
+		let signature = try!(signature(accounts, address, hash, password));
 		t.with_signature(signature, network_id)
 	};
+	Ok(signed_transaction)
+}

-	trace!(target: "miner", "send_transaction: dispatching tx: {} for network ID {:?}", ::rlp::encode(&signed_transaction).to_vec().pretty(), network_id);
+pub fn sign_and_dispatch<C, M>(client: &C, miner: &M, accounts: &AccountProvider, filled: FilledTransactionRequest, password: Option<String>) -> Result<H256, Error>
+	where C: MiningBlockChainClient, M: MinerService
+{
+
+	let network_id = client.signing_network_id();
+	let signed_transaction = try!(sign_no_dispatch(client, miner, accounts, filled, password));
+
+	trace!(target: "miner", "send_transaction: dispatching tx: {} for network ID {:?}", rlp::encode(&signed_transaction).to_vec().pretty(), network_id);
 	dispatch_transaction(&*client, &*miner, signed_transaction)
 }

-fn prepare_transaction<C, M>(client: &C, miner: &M, request: TransactionRequest) -> Transaction where C: MiningBlockChainClient, M: MinerService {
-	Transaction {
-		nonce: request.nonce
-			.or_else(|| miner
-				.last_nonce(&request.from)
-				.map(|nonce| nonce + U256::one()))
-			.unwrap_or_else(|| client.latest_nonce(&request.from)),
-
-		action: request.to.map_or(Action::Create, Action::Call),
-		gas: request.gas.unwrap_or_else(|| miner.sensible_gas_limit()),
+pub fn fill_optional_fields<C, M>(request: TransactionRequest, client: &C, miner: &M) -> FilledTransactionRequest
+	where C: MiningBlockChainClient, M: MinerService
+{
+	FilledTransactionRequest {
+		from: request.from,
+		to: request.to,
+		nonce: request.nonce,
 		gas_price: request.gas_price.unwrap_or_else(|| default_gas_price(client, miner)),
-		value: request.value.unwrap_or_else(U256::zero),
-		data: request.data.map_or_else(Vec::new, |b| b.to_vec()),
+		gas: request.gas.unwrap_or_else(|| miner.sensible_gas_limit()),
+		value: request.value.unwrap_or_else(|| 0.into()),
+		data: request.data.unwrap_or_else(Vec::new),
 	}
 }

-pub fn default_gas_price<C, M>(client: &C, miner: &M) -> U256 where C: MiningBlockChainClient, M: MinerService {
+pub fn default_gas_price<C, M>(client: &C, miner: &M) -> U256
+	where C: MiningBlockChainClient, M: MinerService
+{
 	client.gas_price_median(100).unwrap_or_else(|| miner.sensible_gas_price())
 }
+
+pub fn from_rpc<C, M>(payload: RpcConfirmationPayload, client: &C, miner: &M) -> ConfirmationPayload
+	where C: MiningBlockChainClient, M: MinerService {
+
+	match payload {
+		RpcConfirmationPayload::SendTransaction(request) => {
+			ConfirmationPayload::SendTransaction(fill_optional_fields(request.into(), client, miner))
+		},
+		RpcConfirmationPayload::SignTransaction(request) => {
+			ConfirmationPayload::SignTransaction(fill_optional_fields(request.into(), client, miner))
+		},
+		RpcConfirmationPayload::Decrypt(RpcDecryptRequest { address, msg }) => {
+			ConfirmationPayload::Decrypt(address.into(), msg.into())
+		},
+		RpcConfirmationPayload::Signature(RpcSignRequest { address, hash }) => {
+			ConfirmationPayload::Signature(address.into(), hash.into())
+		},
+	}
+}
--- a/rpc/src/v1/helpers/requests.rs
+++ b/rpc/src/v1/helpers/requests.rs
@ -100,9 +100,22 @@ pub struct ConfirmationRequest {
 #[derive(Debug, Clone, Eq, PartialEq, Hash)]
 pub enum ConfirmationPayload {
 	/// Transaction
-	Transaction(FilledTransactionRequest),
+	SendTransaction(FilledTransactionRequest),
+	/// Sign Transaction
+	SignTransaction(FilledTransactionRequest),
 	/// Sign request
-	Sign(Address, H256),
+	Signature(Address, H256),
 	/// Decrypt request
 	Decrypt(Address, Bytes),
 }
+
+impl ConfirmationPayload {
+	pub fn sender(&self) -> Address {
+		match *self {
+			ConfirmationPayload::SendTransaction(ref request) => request.from,
+			ConfirmationPayload::SignTransaction(ref request) => request.from,
+			ConfirmationPayload::Signature(ref address, _) => *address,
+			ConfirmationPayload::Decrypt(ref address, _) => *address,
+		}
+	}
+}
--- a/rpc/src/v1/helpers/signing_queue.rs
+++ b/rpc/src/v1/helpers/signing_queue.rs
@ -21,9 +21,10 @@ use std::collections::BTreeMap;
 use jsonrpc_core;
 use util::{Mutex, RwLock, U256};
 use v1::helpers::{ConfirmationRequest, ConfirmationPayload};
+use v1::types::ConfirmationResponse;

 /// Result that can be returned from JSON RPC.
-pub type RpcResult = Result<jsonrpc_core::Value, jsonrpc_core::Error>;
+pub type RpcResult = Result<ConfirmationResponse, jsonrpc_core::Error>;

 /// Possible events happening in the queue that can be listened to.
 #[derive(Debug, PartialEq)]
@ -314,13 +315,12 @@ mod test {
 	use std::time::Duration;
 	use std::thread;
 	use std::sync::{mpsc, Arc};
-	use util::{Address, U256, H256, Mutex};
+	use util::{Address, U256, Mutex};
 	use v1::helpers::{SigningQueue, ConfirmationsQueue, QueueEvent, FilledTransactionRequest, ConfirmationPayload};
-	use v1::types::H256 as NH256;
-	use jsonrpc_core::to_value;
+	use v1::types::ConfirmationResponse;

 	fn request() -> ConfirmationPayload {
-		ConfirmationPayload::Transaction(FilledTransactionRequest {
+		ConfirmationPayload::SendTransaction(FilledTransactionRequest {
 			from: Address::from(1),
 			to: Some(Address::from(2)),
 			gas_price: 0.into(),
@ -353,10 +353,10 @@ mod test {
 			// Just wait for the other thread to start
 			thread::sleep(Duration::from_millis(100));
 		}
-		queue.request_confirmed(id, Ok(to_value(&NH256::from(H256::from(1)))));
+		queue.request_confirmed(id, Ok(ConfirmationResponse::SendTransaction(1.into())));

 		// then
-		assert_eq!(handle.join().expect("Thread should finish nicely"), Ok(to_value(&NH256::from(H256::from(1)))));
+		assert_eq!(handle.join().expect("Thread should finish nicely"), Ok(ConfirmationResponse::SendTransaction(1.into())));
 	}

 	#[test]
--- a/rpc/src/v1/impls/eth.rs
+++ b/rpc/src/v1/impls/eth.rs
@ -49,7 +49,7 @@ use v1::types::{
 	H64 as RpcH64, H256 as RpcH256, H160 as RpcH160, U256 as RpcU256,
 };
 use v1::helpers::{CallRequest as CRequest, errors, limit_logs};
-use v1::helpers::dispatch::{default_gas_price, dispatch_transaction};
+use v1::helpers::dispatch::{dispatch_transaction, default_gas_price};
 use v1::helpers::block_import::is_major_importing;
 use v1::helpers::auto_args::Trailing;

@ -610,7 +610,7 @@ impl<C, SN: ?Sized, S: ?Sized, M, EM> Eth for EthClient<C, SN, S, M, EM> where

 		let raw_transaction = raw.to_vec();
 		match UntrustedRlp::new(&raw_transaction).as_val() {
-			Ok(signed_transaction) => dispatch_transaction(&*take_weak!(self.client), &*take_weak!(self.miner), signed_transaction),
+			Ok(signed_transaction) => dispatch_transaction(&*take_weak!(self.client), &*take_weak!(self.miner), signed_transaction).map(Into::into),
 			Err(e) => Err(errors::from_rlp_error(e)),
 		}
 	}
--- a/rpc/src/v1/impls/personal.rs
+++ b/rpc/src/v1/impls/personal.rs
@ -26,7 +26,7 @@ use jsonrpc_core::Error;
 use v1::traits::Personal;
 use v1::types::{H160 as RpcH160, H256 as RpcH256, TransactionRequest};
 use v1::helpers::errors;
-use v1::helpers::dispatch::sign_and_dispatch;
+use v1::helpers::dispatch::{self, sign_and_dispatch};

 /// Account management (personal) rpc implementation.
 pub struct PersonalClient<C, M> where C: MiningBlockChainClient, M: MinerService {
@ -92,13 +92,17 @@ impl<C: 'static, M: 'static> Personal for PersonalClient<C, M> where C: MiningBl

 	fn sign_and_send_transaction(&self, request: TransactionRequest, password: String) -> Result<RpcH256, Error> {
 		try!(self.active());
+		let client = take_weak!(self.client);
+		let miner = take_weak!(self.miner);
+		let accounts = take_weak!(self.accounts);

+		let request = dispatch::fill_optional_fields(request.into(), &*client, &*miner);
 		sign_and_dispatch(
-			&*take_weak!(self.client),
-			&*take_weak!(self.miner),
-			&*take_weak!(self.accounts),
-			request.into(),
+			&*client,
+			&*miner,
+			&*accounts,
+			request,
 			Some(password)
-		)
+		).map(Into::into)
 	}
 }
--- a/rpc/src/v1/impls/signer.rs
+++ b/rpc/src/v1/impls/signer.rs
@ -17,14 +17,15 @@
 //! Transactions Confirmations rpc implementation

 use std::sync::{Arc, Weak};
+
 use jsonrpc_core::*;
 use ethcore::account_provider::AccountProvider;
 use ethcore::client::MiningBlockChainClient;
 use ethcore::miner::MinerService;
 use v1::traits::Signer;
-use v1::types::{TransactionModification, ConfirmationRequest, U256};
+use v1::types::{TransactionModification, ConfirmationRequest, ConfirmationResponse, U256};
 use v1::helpers::{errors, SignerService, SigningQueue, ConfirmationPayload};
-use v1::helpers::dispatch::{sign_and_dispatch, sign, decrypt};
+use v1::helpers::dispatch;

 /// Transactions confirmation (personal) rpc implementation.
 pub struct SignerClient<C, M> where C: MiningBlockChainClient, M: MinerService {
@ -73,7 +74,7 @@ impl<C: 'static, M: 'static> Signer for SignerClient<C, M> where C: MiningBlockC

 	// TODO [ToDr] TransactionModification is redundant for some calls
 	// might be better to replace it in future
-	fn confirm_request(&self, id: U256, modification: TransactionModification, pass: String) -> Result<Value, Error> {
+	fn confirm_request(&self, id: U256, modification: TransactionModification, pass: String) -> Result<ConfirmationResponse, Error> {
 		try!(self.active());

 		let id = id.into();
@ -83,21 +84,16 @@ impl<C: 'static, M: 'static> Signer for SignerClient<C, M> where C: MiningBlockC
 		let miner = take_weak!(self.miner);

 		signer.peek(&id).map(|confirmation| {
-			let result = match confirmation.payload {
-				ConfirmationPayload::Transaction(mut request) => {
-					// apply modification
-					if let Some(gas_price) = modification.gas_price {
-						request.gas_price = gas_price.into();
-					}
-					sign_and_dispatch(&*client, &*miner, &*accounts, request.into(), Some(pass)).map(to_value)
+			let mut payload = confirmation.payload.clone();
+			// Modify payload
+			match (&mut payload, modification.gas_price) {
+				(&mut ConfirmationPayload::SendTransaction(ref mut request), Some(gas_price)) => {
+					request.gas_price = gas_price.into();
 				},
-				ConfirmationPayload::Sign(address, hash) => {
-					sign(&*accounts, address, Some(pass), hash)
-				},
-				ConfirmationPayload::Decrypt(address, msg) => {
-					decrypt(&*accounts, address, Some(pass), msg)
-				},
-			};
+				_ => {},
+			}
+			// Execute
+			let result = dispatch::execute(&*client, &*miner, &*accounts, payload, Some(pass));
 			if let Ok(ref response) = result {
 				signer.request_confirmed(id, Ok(response.clone()));
 			}
--- a/rpc/src/v1/impls/signing.rs
+++ b/rpc/src/v1/impls/signing.rs
@ -17,24 +17,33 @@
 //! Signing RPC implementation.

 use std::sync::{Arc, Weak};
+use transient_hashmap::TransientHashMap;
+use util::{U256, Mutex};

 use ethcore::account_provider::AccountProvider;
 use ethcore::miner::MinerService;
 use ethcore::client::MiningBlockChainClient;
-use transient_hashmap::TransientHashMap;
-use util::{U256, Address, H256, Mutex};

-use jsonrpc_core::*;
-use v1::helpers::{errors, SigningQueue, ConfirmationPromise, ConfirmationResult, ConfirmationPayload, TransactionRequest as TRequest, FilledTransactionRequest as FilledRequest, SignerService};
-use v1::helpers::dispatch::{default_gas_price, sign_and_dispatch, sign, decrypt};
+use jsonrpc_core::Error;
+use v1::helpers::auto_args::Ready;
+use v1::helpers::{
+	errors, dispatch,
+	SigningQueue, ConfirmationPromise, ConfirmationResult, ConfirmationPayload, SignerService
+};
 use v1::traits::{EthSigning, ParitySigning};
-use v1::types::{TransactionRequest, H160 as RpcH160, H256 as RpcH256, U256 as RpcU256, Bytes as RpcBytes};
+use v1::types::{
+	H160 as RpcH160, H256 as RpcH256, U256 as RpcU256, Bytes as RpcBytes, H520 as RpcH520,
+	Either as RpcEither,
+	TransactionRequest as RpcTransactionRequest,
+	ConfirmationPayload as RpcConfirmationPayload,
+	ConfirmationResponse as RpcConfirmationResponse
+};

 const MAX_PENDING_DURATION: u64 = 60 * 60;

 pub enum DispatchResult {
 	Promise(ConfirmationPromise),
-	Value(Value),
+	Value(RpcConfirmationResponse),
 }

 /// Implementation of functions that require signing when no trusted signer is used.
@ -68,59 +77,41 @@ impl<C, M> SigningQueueClient<C, M> where
 		Ok(())
 	}

-	fn add_to_queue<WhenUnlocked, Payload>(&self, sender: Address, when_unlocked: WhenUnlocked, payload: Payload)
-		-> Result<DispatchResult, Error> where
-			WhenUnlocked: Fn(&AccountProvider) -> Result<Value, Error>,
-			Payload: Fn() -> ConfirmationPayload, {
+	fn handle_dispatch<OnResponse>(&self, res: Result<DispatchResult, Error>, on_response: OnResponse)
+		where OnResponse: FnOnce(Result<RpcConfirmationResponse, Error>) + Send + 'static
+	{
+		match res {
+			Ok(DispatchResult::Value(result)) => on_response(Ok(result)),
+			Ok(DispatchResult::Promise(promise)) => {
+				promise.wait_for_result(move |result| {
+					on_response(result.unwrap_or_else(|| Err(errors::request_rejected())))
+				})
+			},
+			Err(e) => on_response(Err(e)),
+		}
+	}

+	fn add_to_queue(&self, payload: ConfirmationPayload) -> Result<DispatchResult, Error> {
+		let client = take_weak!(self.client);
+		let miner = take_weak!(self.miner);
 		let accounts = take_weak!(self.accounts);
+
+		let sender = payload.sender();
 		if accounts.is_unlocked(sender) {
-			return when_unlocked(&accounts).map(DispatchResult::Value);
+			return dispatch::execute(&*client, &*miner, &*accounts, payload, None).map(DispatchResult::Value);
 		}

-		take_weak!(self.signer).add_request(payload())
+		take_weak!(self.signer).add_request(payload)
 			.map(DispatchResult::Promise)
 			.map_err(|_| errors::request_rejected_limit())
 	}

-	fn handle_dispatch(&self, res: Result<DispatchResult, Error>, ready: Ready) {
-		match res {
-			Ok(DispatchResult::Value(v)) => ready.ready(Ok(v)),
-			Ok(DispatchResult::Promise(promise)) => {
-				promise.wait_for_result(move |result| {
-					ready.ready(result.unwrap_or_else(|| Err(errors::request_rejected())))
-				})
-			},
-			Err(e) => ready.ready(Err(e)),
-		}
-	}
+	fn dispatch(&self, payload: RpcConfirmationPayload) -> Result<DispatchResult, Error> {
+		let client = take_weak!(self.client);
+		let miner = take_weak!(self.miner);

-	fn dispatch_sign(&self, params: Params) -> Result<DispatchResult, Error> {
-		from_params::<(RpcH160, RpcH256)>(params).and_then(|(address, msg)| {
-			let address: Address = address.into();
-			let msg: H256 = msg.into();
-
-			self.add_to_queue(
-				address,
-				|accounts| sign(accounts, address, None, msg.clone()),
-				|| ConfirmationPayload::Sign(address, msg.clone()),
-			)
-		})
-	}
-
-	fn dispatch_transaction(&self, params: Params) -> Result<DispatchResult, Error> {
-		from_params::<(TransactionRequest, )>(params).and_then(|(request, )| {
-			let request: TRequest = request.into();
-			let (client, miner) = (take_weak!(self.client), take_weak!(self.miner));
-			self.add_to_queue(
-				request.from,
-				|accounts| sign_and_dispatch(&*client, &*miner, accounts, request.clone(), None).map(to_value),
-				|| {
-					let request = fill_optional_fields(request.clone(), &*client, &*miner);
-					ConfirmationPayload::Transaction(request)
-				}
-			)
-		})
+		let payload = dispatch::from_rpc(payload, &*client, &*miner);
+		self.add_to_queue(payload)
 	}
 }

@ -128,62 +119,59 @@ impl<C: 'static, M: 'static> ParitySigning for SigningQueueClient<C, M> where
 	C: MiningBlockChainClient,
 	M: MinerService,
 {
-	fn post_sign(&self, params: Params) -> Result<Value, Error> {
+	fn post_sign(&self, address: RpcH160, hash: RpcH256) -> Result<RpcEither<RpcU256, RpcConfirmationResponse>, Error> {
 		try!(self.active());
-		self.dispatch_sign(params).map(|result| match result {
-			DispatchResult::Value(v) => v,
-			DispatchResult::Promise(promise) => {
-				let id = promise.id();
-				self.pending.lock().insert(id, promise);
-				to_value(&RpcU256::from(id))
-			},
-		})
+		self.dispatch(RpcConfirmationPayload::Signature((address, hash).into()))
+			.map(|result| match result {
+				DispatchResult::Value(v) => RpcEither::Or(v),
+				DispatchResult::Promise(promise) => {
+					let id = promise.id();
+					self.pending.lock().insert(id, promise);
+					RpcEither::Either(id.into())
+				},
+			})
 	}

-	fn post_transaction(&self, params: Params) -> Result<Value, Error> {
+	fn post_transaction(&self, request: RpcTransactionRequest) -> Result<RpcEither<RpcU256, RpcConfirmationResponse>, Error> {
 		try!(self.active());
-		self.dispatch_transaction(params).map(|result| match result {
-			DispatchResult::Value(v) => v,
-			DispatchResult::Promise(promise) => {
-				let id = promise.id();
-				self.pending.lock().insert(id, promise);
-				to_value(&RpcU256::from(id))
-			},
-		})
+		self.dispatch(RpcConfirmationPayload::SendTransaction(request))
+			.map(|result| match result {
+				DispatchResult::Value(v) => RpcEither::Or(v),
+				DispatchResult::Promise(promise) => {
+					let id = promise.id();
+					self.pending.lock().insert(id, promise);
+					RpcEither::Either(id.into())
+				},
+			})
 	}

-	fn check_request(&self, params: Params) -> Result<Value, Error> {
+	fn check_request(&self, id: RpcU256) -> Result<Option<RpcConfirmationResponse>, Error> {
 		try!(self.active());
 		let mut pending = self.pending.lock();
-		from_params::<(RpcU256, )>(params).and_then(|(id, )| {
-			let id: U256 = id.into();
-			let res = match pending.get(&id) {
-				Some(ref promise) => match promise.result() {
-					ConfirmationResult::Waiting => { return Ok(Value::Null); }
-					ConfirmationResult::Rejected => Err(errors::request_rejected()),
-					ConfirmationResult::Confirmed(rpc_response) => rpc_response,
-				},
-				_ => { return Err(errors::request_not_found()); }
-			};
-			pending.remove(&id);
-			res
-		})
+		let id: U256 = id.into();
+		let res = match pending.get(&id) {
+			Some(ref promise) => match promise.result() {
+				ConfirmationResult::Waiting => { return Ok(None); }
+				ConfirmationResult::Rejected => Err(errors::request_rejected()),
+				ConfirmationResult::Confirmed(rpc_response) => rpc_response.map(Some),
+			},
+			_ => { return Err(errors::request_not_found()); }
+		};
+		pending.remove(&id);
+		res
 	}

-	fn decrypt_message(&self, params: Params, ready: Ready) {
+	fn decrypt_message(&self, ready: Ready<RpcBytes>, address: RpcH160, data: RpcBytes) {
 		let res = self.active()
-			.and_then(|_| from_params::<(RpcH160, RpcBytes)>(params))
-			.and_then(|(address, msg)| {
-				let address: Address = address.into();
-
-				self.add_to_queue(
-					address,
-					|accounts| decrypt(accounts, address, None, msg.clone().into()),
-					|| ConfirmationPayload::Decrypt(address, msg.clone().into())
-				)
-			});
-
-		self.handle_dispatch(res, ready);
+			.and_then(|_| self.dispatch(RpcConfirmationPayload::Decrypt((address, data).into())));
+		// TODO [todr] typed handle_dispatch
+		self.handle_dispatch(res, |response| {
+			match response {
+				Ok(RpcConfirmationResponse::Decrypt(data)) => ready.ready(Ok(data)),
+				Err(e) => ready.ready(Err(e)),
+				e => ready.ready(Err(errors::internal("Unexpected result.", e))),
+			}
+		});
 	}
 }

@ -191,26 +179,36 @@ impl<C: 'static, M: 'static> EthSigning for SigningQueueClient<C, M> where
 	C: MiningBlockChainClient,
 	M: MinerService,
 {
-	fn sign(&self, params: Params, ready: Ready) {
-		let res = self.active().and_then(|_| self.dispatch_sign(params));
-		self.handle_dispatch(res, ready);
+	fn sign(&self, ready: Ready<RpcH520>, address: RpcH160, hash: RpcH256) {
+		let res = self.active().and_then(|_| self.dispatch(RpcConfirmationPayload::Signature((address, hash).into())));
+		self.handle_dispatch(res, |response| {
+			match response {
+				Ok(RpcConfirmationResponse::Signature(signature)) => ready.ready(Ok(signature)),
+				Err(e) => ready.ready(Err(e)),
+				e => ready.ready(Err(errors::internal("Unexpected result.", e))),
+			}
+		});
 	}

-	fn send_transaction(&self, params: Params, ready: Ready) {
-		let res = self.active().and_then(|_| self.dispatch_transaction(params));
-		self.handle_dispatch(res, ready);
+	fn send_transaction(&self, ready: Ready<RpcH256>, request: RpcTransactionRequest) {
+		let res = self.active().and_then(|_| self.dispatch(RpcConfirmationPayload::SendTransaction(request)));
+		self.handle_dispatch(res, |response| {
+			match response {
+				Ok(RpcConfirmationResponse::SendTransaction(hash)) => ready.ready(Ok(hash)),
+				Err(e) => ready.ready(Err(e)),
+				e => ready.ready(Err(errors::internal("Unexpected result.", e))),
+			}
+		});
 	}
-}

-fn fill_optional_fields<C, M>(request: TRequest, client: &C, miner: &M) -> FilledRequest
-	where C: MiningBlockChainClient, M: MinerService {
-	FilledRequest {
-		from: request.from,
-		to: request.to,
-		nonce: request.nonce,
-		gas_price: request.gas_price.unwrap_or_else(|| default_gas_price(client, miner)),
-		gas: request.gas.unwrap_or_else(|| miner.sensible_gas_limit()),
-		value: request.value.unwrap_or_else(|| 0.into()),
-		data: request.data.unwrap_or_else(Vec::new),
+	fn sign_transaction(&self, ready: Ready<RpcBytes>, request: RpcTransactionRequest) {
+		let res = self.active().and_then(|_| self.dispatch(RpcConfirmationPayload::SignTransaction(request)));
+		self.handle_dispatch(res, |response| {
+			match response {
+				Ok(RpcConfirmationResponse::SignTransaction(rlp)) => ready.ready(Ok(rlp)),
+				Err(e) => ready.ready(Err(e)),
+				e => ready.ready(Err(errors::internal("Unexpected result.", e))),
+			}
+		});
 	}
 }
--- a/rpc/src/v1/impls/signing_unsafe.rs
+++ b/rpc/src/v1/impls/signing_unsafe.rs
@ -22,11 +22,19 @@ use ethcore::account_provider::AccountProvider;
 use ethcore::miner::MinerService;
 use ethcore::client::MiningBlockChainClient;

-use jsonrpc_core::*;
+use jsonrpc_core::Error;
+use v1::helpers::auto_args::Ready;
 use v1::helpers::errors;
-use v1::helpers::dispatch::{sign_and_dispatch, sign, decrypt};
+use v1::helpers::dispatch;
 use v1::traits::{EthSigning, ParitySigning};
-use v1::types::{TransactionRequest, H160 as RpcH160, H256 as RpcH256, Bytes as RpcBytes};
+use v1::types::{
+	U256 as RpcU256,
+	H160 as RpcH160, H256 as RpcH256, H520 as RpcH520, Bytes as RpcBytes,
+	Either as RpcEither,
+	TransactionRequest as RpcTransactionRequest,
+	ConfirmationPayload as RpcConfirmationPayload,
+	ConfirmationResponse as RpcConfirmationResponse,
+};

 /// Implementation of functions that require signing when no trusted signer is used.
 pub struct SigningUnsafeClient<C, M> where
@ -58,26 +66,47 @@ impl<C, M> SigningUnsafeClient<C, M> where
 		take_weak!(self.client).keep_alive();
 		Ok(())
 	}
+
+	fn handle(&self, payload: RpcConfirmationPayload) -> Result<RpcConfirmationResponse, Error> {
+		try!(self.active());
+		let client = take_weak!(self.client);
+		let miner = take_weak!(self.miner);
+		let accounts = take_weak!(self.accounts);
+
+		let payload = dispatch::from_rpc(payload, &*client, &*miner);
+		dispatch::execute(&*client, &*miner, &*accounts, payload, None)
+	}
 }

 impl<C: 'static, M: 'static> EthSigning for SigningUnsafeClient<C, M> where
 	C: MiningBlockChainClient,
 	M: MinerService,
 {
-	fn sign(&self, params: Params, ready: Ready) {
-		ready.ready(self.active()
-			.and_then(|_| from_params::<(RpcH160, RpcH256)>(params))
-			.and_then(|(address, msg)| {
-				sign(&*take_weak!(self.accounts), address.into(), None, msg.into())
-			}))
+	fn sign(&self, ready: Ready<RpcH520>, address: RpcH160, hash: RpcH256) {
+		let result = match self.handle(RpcConfirmationPayload::Signature((address, hash).into())) {
+			Ok(RpcConfirmationResponse::Signature(signature)) => Ok(signature),
+			Err(e) => Err(e),
+			e => Err(errors::internal("Unexpected result", e)),
+		};
+		ready.ready(result);
 	}

-	fn send_transaction(&self, params: Params, ready: Ready) {
-		ready.ready(self.active()
-			.and_then(|_| from_params::<(TransactionRequest, )>(params))
-			.and_then(|(request, )| {
-				sign_and_dispatch(&*take_weak!(self.client), &*take_weak!(self.miner), &*take_weak!(self.accounts), request.into(), None).map(to_value)
-			}))
+	fn send_transaction(&self, ready: Ready<RpcH256>, request: RpcTransactionRequest) {
+		let result = match self.handle(RpcConfirmationPayload::SendTransaction(request)) {
+			Ok(RpcConfirmationResponse::SendTransaction(hash)) => Ok(hash),
+			Err(e) => Err(e),
+			e => Err(errors::internal("Unexpected result", e)),
+		};
+		ready.ready(result);
+	}
+
+	fn sign_transaction(&self, ready: Ready<RpcBytes>, request: RpcTransactionRequest) {
+		let result = match self.handle(RpcConfirmationPayload::SignTransaction(request)) {
+			Ok(RpcConfirmationResponse::SignTransaction(rlp)) => Ok(rlp),
+			Err(e) => Err(e),
+			e => Err(errors::internal("Unexpected result", e)),
+		};
+		ready.ready(result);
 	}
 }

@ -85,25 +114,26 @@ impl<C: 'static, M: 'static> ParitySigning for SigningUnsafeClient<C, M> where
 	C: MiningBlockChainClient,
 	M: MinerService,
 {
-	fn decrypt_message(&self, params: Params, ready: Ready) {
-		ready.ready(self.active()
-			.and_then(|_| from_params::<(RpcH160, RpcBytes)>(params))
-			.and_then(|(address, ciphertext)| {
-				decrypt(&*take_weak!(self.accounts), address.into(), None, ciphertext.0)
-			}))
+	fn decrypt_message(&self, ready: Ready<RpcBytes>, address: RpcH160, data: RpcBytes) {
+		let result = match self.handle(RpcConfirmationPayload::Decrypt((address, data).into())) {
+			Ok(RpcConfirmationResponse::Decrypt(data)) => Ok(data),
+			Err(e) => Err(e),
+			e => Err(errors::internal("Unexpected result", e)),
+		};
+		ready.ready(result);
 	}

-	fn post_sign(&self, _: Params) -> Result<Value, Error> {
+	fn post_sign(&self, _: RpcH160, _: RpcH256) -> Result<RpcEither<RpcU256, RpcConfirmationResponse>, Error> {
 		// We don't support this in non-signer mode.
 		Err(errors::signer_disabled())
 	}

-	fn post_transaction(&self, _: Params) -> Result<Value, Error> {
+	fn post_transaction(&self, _: RpcTransactionRequest) -> Result<RpcEither<RpcU256, RpcConfirmationResponse>, Error> {
 		// We don't support this in non-signer mode.
 		Err(errors::signer_disabled())
 	}

-	fn check_request(&self, _: Params) -> Result<Value, Error> {
+	fn check_request(&self, _: RpcU256) -> Result<Option<RpcConfirmationResponse>, Error> {
 		// We don't support this in non-signer mode.
 		Err(errors::signer_disabled())
 	}
--- a/rpc/src/v1/tests/mocked/eth.rs
+++ b/rpc/src/v1/tests/mocked/eth.rs
@ -18,6 +18,7 @@ use std::str::FromStr;
 use std::collections::HashMap;
 use std::sync::Arc;
 use std::time::{Instant, Duration};
+use rlp;
 use jsonrpc_core::IoHandler;
 use util::{Uint, U256, Address, H256, FixedHash, Mutex};
 use ethcore::account_provider::AccountProvider;
@ -761,6 +762,44 @@ fn rpc_eth_send_transaction() {

 	assert_eq!(tester.io.handle_request_sync(&request), Some(response));
 }
+
+#[test]
+fn rpc_eth_sign_transaction() {
+	let tester = EthTester::default();
+	let address = tester.accounts_provider.new_account("").unwrap();
+	tester.accounts_provider.unlock_account_permanently(address, "".into()).unwrap();
+	let request = r#"{
+		"jsonrpc": "2.0",
+		"method": "eth_signTransaction",
+		"params": [{
+			"from": ""#.to_owned() + format!("0x{:?}", address).as_ref() + r#"",
+			"to": "0xd46e8dd67c5d32be8058bb8eb970870f07244567",
+			"gas": "0x76c0",
+			"gasPrice": "0x9184e72a000",
+			"value": "0x9184e72a"
+		}],
+		"id": 1
+	}"#;
+
+	let t = Transaction {
+		nonce: U256::one(),
+		gas_price: U256::from(0x9184e72a000u64),
+		gas: U256::from(0x76c0),
+		action: Action::Call(Address::from_str("d46e8dd67c5d32be8058bb8eb970870f07244567").unwrap()),
+		value: U256::from(0x9184e72au64),
+		data: vec![]
+	};
+	let signature = tester.accounts_provider.sign(address, None, t.hash(None)).unwrap();
+	let t = t.with_signature(signature, None);
+	let rlp = rlp::encode(&t);
+
+	let response = r#"{"jsonrpc":"2.0","result":"0x"#.to_owned() + &rlp.to_hex() + r#"","id":1}"#;
+
+	tester.miner.last_nonces.write().insert(address.clone(), U256::zero());
+
+	assert_eq!(tester.io.handle_request_sync(&request), Some(response));
+}
+
 #[test]
 fn rpc_eth_send_transaction_with_bad_to() {
 	let tester = EthTester::default();
@ -839,7 +878,7 @@ fn rpc_eth_send_raw_transaction() {
 	let signature = tester.accounts_provider.sign(address, None, t.hash(None)).unwrap();
 	let t = t.with_signature(signature, None);

-	let rlp = ::rlp::encode(&t).to_vec().to_hex();
+	let rlp = rlp::encode(&t).to_vec().to_hex();

 	let req = r#"{
 		"jsonrpc": "2.0",
--- a/rpc/src/v1/tests/mocked/signer.rs
+++ b/rpc/src/v1/tests/mocked/signer.rs
@ -71,7 +71,7 @@ fn signer_tester() -> SignerTester {
 fn should_return_list_of_items_to_confirm() {
 	// given
 	let tester = signer_tester();
-	tester.signer.add_request(ConfirmationPayload::Transaction(FilledTransactionRequest {
+	tester.signer.add_request(ConfirmationPayload::SendTransaction(FilledTransactionRequest {
 		from: Address::from(1),
 		to: Some(Address::from_str("d46e8dd67c5d32be8058bb8eb970870f07244567").unwrap()),
 		gas_price: U256::from(10_000),
@ -80,7 +80,7 @@ fn should_return_list_of_items_to_confirm() {
 		data: vec![],
 		nonce: None,
 	})).unwrap();
-	tester.signer.add_request(ConfirmationPayload::Sign(1.into(), 5.into())).unwrap();
+	tester.signer.add_request(ConfirmationPayload::Signature(1.into(), 5.into())).unwrap();

 	// when
 	let request = r#"{"jsonrpc":"2.0","method":"signer_requestsToConfirm","params":[],"id":1}"#;
@ -100,7 +100,7 @@ fn should_return_list_of_items_to_confirm() {
 fn should_reject_transaction_from_queue_without_dispatching() {
 	// given
 	let tester = signer_tester();
-	tester.signer.add_request(ConfirmationPayload::Transaction(FilledTransactionRequest {
+	tester.signer.add_request(ConfirmationPayload::SendTransaction(FilledTransactionRequest {
 		from: Address::from(1),
 		to: Some(Address::from_str("d46e8dd67c5d32be8058bb8eb970870f07244567").unwrap()),
 		gas_price: U256::from(10_000),
@ -125,7 +125,7 @@ fn should_reject_transaction_from_queue_without_dispatching() {
 fn should_not_remove_transaction_if_password_is_invalid() {
 	// given
 	let tester = signer_tester();
-	tester.signer.add_request(ConfirmationPayload::Transaction(FilledTransactionRequest {
+	tester.signer.add_request(ConfirmationPayload::SendTransaction(FilledTransactionRequest {
 		from: Address::from(1),
 		to: Some(Address::from_str("d46e8dd67c5d32be8058bb8eb970870f07244567").unwrap()),
 		gas_price: U256::from(10_000),
@ -149,7 +149,7 @@ fn should_not_remove_transaction_if_password_is_invalid() {
 fn should_not_remove_sign_if_password_is_invalid() {
 	// given
 	let tester = signer_tester();
-	tester.signer.add_request(ConfirmationPayload::Sign(0.into(), 5.into())).unwrap();
+	tester.signer.add_request(ConfirmationPayload::Signature(0.into(), 5.into())).unwrap();
 	assert_eq!(tester.signer.requests().len(), 1);

 	// when
@ -167,7 +167,7 @@ fn should_confirm_transaction_and_dispatch() {
 	let tester = signer_tester();
 	let address = tester.accounts.new_account("test").unwrap();
 	let recipient = Address::from_str("d46e8dd67c5d32be8058bb8eb970870f07244567").unwrap();
-	tester.signer.add_request(ConfirmationPayload::Transaction(FilledTransactionRequest {
+	tester.signer.add_request(ConfirmationPayload::SendTransaction(FilledTransactionRequest {
 		from: address,
 		to: Some(recipient),
 		gas_price: U256::from(10_000),
--- a/rpc/src/v1/tests/mocked/signing.rs
+++ b/rpc/src/v1/tests/mocked/signing.rs
@ -16,15 +16,17 @@

 use std::str::FromStr;
 use std::sync::Arc;
-use jsonrpc_core::{IoHandler, to_value, Success};
+use rlp;
+
+use jsonrpc_core::{IoHandler, Success};
 use v1::impls::SigningQueueClient;
 use v1::traits::{EthSigning, ParitySigning, Parity};
 use v1::helpers::{SignerService, SigningQueue};
-use v1::types::{H256 as RpcH256, H520 as RpcH520, Bytes};
+use v1::types::ConfirmationResponse;
 use v1::tests::helpers::TestMinerService;
 use v1::tests::mocked::parity;

-use util::{Address, FixedHash, Uint, U256, H256, H520};
+use util::{Address, FixedHash, Uint, U256, H256, ToPretty};
 use ethcore::account_provider::AccountProvider;
 use ethcore::client::TestBlockChainClient;
 use ethcore::transaction::{Transaction, Action};
@ -88,7 +90,7 @@ fn should_add_sign_to_queue() {
 	let async_result = tester.io.handle_request(&request).unwrap();
 	assert_eq!(tester.signer.requests().len(), 1);
 	// respond
-	tester.signer.request_confirmed(U256::from(1), Ok(to_value(&RpcH520::from(H520::default()))));
+	tester.signer.request_confirmed(1.into(), Ok(ConfirmationResponse::Signature(0.into())));
 	assert!(async_result.on_result(move |res| {
 		assert_eq!(res, response.to_owned());
 	}));
@ -162,7 +164,7 @@ fn should_check_status_of_request_when_its_resolved() {
 		"id": 1
 	}"#;
 	tester.io.handle_request_sync(&request).expect("Sent");
-	tester.signer.request_confirmed(U256::from(1), Ok(to_value(&"Hello World!")));
+	tester.signer.request_confirmed(1.into(), Ok(ConfirmationResponse::Signature(1.into())));

 	// when
 	let request = r#"{
@ -171,7 +173,7 @@ fn should_check_status_of_request_when_its_resolved() {
 		"params": ["0x1"],
 		"id": 1
 	}"#;
-	let response = r#"{"jsonrpc":"2.0","result":"Hello World!","id":1}"#;
+	let response = r#"{"jsonrpc":"2.0","result":"0x0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001","id":1}"#;

 	// then
 	assert_eq!(tester.io.handle_request_sync(&request), Some(response.to_owned()));
@ -228,7 +230,54 @@ fn should_add_transaction_to_queue() {
 	let async_result = tester.io.handle_request(&request).unwrap();
 	assert_eq!(tester.signer.requests().len(), 1);
 	// respond
-	tester.signer.request_confirmed(U256::from(1), Ok(to_value(&RpcH256::from(H256::default()))));
+	tester.signer.request_confirmed(1.into(), Ok(ConfirmationResponse::SendTransaction(0.into())));
+	assert!(async_result.on_result(move |res| {
+		assert_eq!(res, response.to_owned());
+	}));
+}
+
+#[test]
+fn should_add_sign_transaction_to_the_queue() {
+	// given
+	let tester = eth_signing();
+	let address = tester.accounts.new_account("test").unwrap();
+
+	assert_eq!(tester.signer.requests().len(), 0);
+
+	// when
+	let request = r#"{
+		"jsonrpc": "2.0",
+		"method": "eth_signTransaction",
+		"params": [{
+			"from": ""#.to_owned() + format!("0x{:?}", address).as_ref() + r#"",
+			"to": "0xd46e8dd67c5d32be8058bb8eb970870f07244567",
+			"gas": "0x76c0",
+			"gasPrice": "0x9184e72a000",
+			"value": "0x9184e72a"
+		}],
+		"id": 1
+	}"#;
+
+	let t = Transaction {
+		nonce: U256::one(),
+		gas_price: U256::from(0x9184e72a000u64),
+		gas: U256::from(0x76c0),
+		action: Action::Call(Address::from_str("d46e8dd67c5d32be8058bb8eb970870f07244567").unwrap()),
+		value: U256::from(0x9184e72au64),
+		data: vec![]
+	};
+	let signature = tester.accounts.sign(address, Some("test".into()), t.hash(None)).unwrap();
+	let t = t.with_signature(signature, None);
+	let rlp = rlp::encode(&t);
+
+	let response = r#"{"jsonrpc":"2.0","result":"0x"#.to_owned() + &rlp.to_hex() + r#"","id":1}"#;
+
+	// then
+	tester.miner.last_nonces.write().insert(address.clone(), U256::zero());
+	let async_result = tester.io.handle_request(&request).unwrap();
+	assert_eq!(tester.signer.requests().len(), 1);
+	// respond
+	tester.signer.request_confirmed(1.into(), Ok(ConfirmationResponse::SignTransaction(rlp.to_vec().into())));
 	assert!(async_result.on_result(move |res| {
 		assert_eq!(res, response.to_owned());
 	}));
@ -325,7 +374,7 @@ fn should_add_decryption_to_the_queue() {
 	let async_result = tester.io.handle_request(&request).unwrap();
 	assert_eq!(tester.signer.requests().len(), 1);
 	// respond
-	tester.signer.request_confirmed(U256::from(1), Ok(to_value(Bytes(vec![0x1, 0x2]))));
+	tester.signer.request_confirmed(1.into(), Ok(ConfirmationResponse::Decrypt(vec![0x1, 0x2].into())));
 	assert!(async_result.on_result(move |res| {
 		assert_eq!(res, response.to_owned());
 	}));
--- a/rpc/src/v1/traits/eth.rs
+++ b/rpc/src/v1/traits/eth.rs
@ -15,7 +15,7 @@
 // along with Parity.  If not, see <http://www.gnu.org/licenses/>.

 //! Eth rpc interface.
-use jsonrpc_core::*;
+use jsonrpc_core::Error;

 use v1::types::{RichBlock, BlockNumber, Bytes, CallRequest, Filter, FilterChanges, Index};
 use v1::types::{Log, Receipt, SyncStatus, Transaction, Work};
--- a/rpc/src/v1/traits/eth_signing.rs
+++ b/rpc/src/v1/traits/eth_signing.rs
@ -15,26 +15,27 @@
 // along with Parity.  If not, see <http://www.gnu.org/licenses/>.

 //! Eth rpc interface.
-use std::sync::Arc;
-use jsonrpc_core::*;

-/// Signing methods implementation relying on unlocked accounts.
-pub trait EthSigning: Sized + Send + Sync + 'static {
-	/// Signs the data with given address signature.
-	fn sign(&self, _: Params, _: Ready);
+use v1::helpers::auto_args::{WrapAsync, Ready};
+use v1::types::{H160, H256, H520, TransactionRequest, Bytes};

-	/// Sends transaction; will block for 20s to try to return the
-	/// transaction hash.
-	/// If it cannot yet be signed, it will return a transaction ID for
-	/// later use with check_transaction.
-	fn send_transaction(&self, _: Params, _: Ready);
+build_rpc_trait! {
+	/// Signing methods implementation relying on unlocked accounts.
+	pub trait EthSigning {
+		/// Signs the data with given address signature.
+		#[rpc(async, name = "eth_sign")]
+		fn sign(&self, Ready<H520>, H160, H256);

-	/// Should be used to convert object to io delegate.
-	fn to_delegate(self) -> IoDelegate<Self> {
-		let mut delegate = IoDelegate::new(Arc::new(self));
-		delegate.add_async_method("eth_sign", EthSigning::sign);
-		delegate.add_async_method("eth_sendTransaction", EthSigning::send_transaction);
+		/// Sends transaction; will block waiting for signer to return the
+		/// transaction hash.
+		/// If Signer is disable it will require the account to be unlocked.
+		#[rpc(async, name = "eth_sendTransaction")]
+		fn send_transaction(&self, Ready<H256>, TransactionRequest);

-		delegate
+		/// Signs transactions without dispatching it to the network.
+		/// Returns signed transaction RLP representation.
+		/// It can be later submitted using `eth_sendRawTransaction`.
+		#[rpc(async, name = "eth_signTransaction")]
+		fn sign_transaction(&self, Ready<Bytes>, TransactionRequest);
 	}
 }
--- a/rpc/src/v1/traits/parity_signing.rs
+++ b/rpc/src/v1/traits/parity_signing.rs
@ -15,38 +15,32 @@
 // along with Parity.  If not, see <http://www.gnu.org/licenses/>.

 //! ParitySigning rpc interface.
-use std::sync::Arc;
-use jsonrpc_core::*;
+use jsonrpc_core::Error;

-/// Signing methods implementation relying on unlocked accounts.
-pub trait ParitySigning: Sized + Send + Sync + 'static {
-	/// Posts sign request asynchronously.
-	/// Will return a confirmation ID for later use with check_transaction.
-	fn post_sign(&self, _: Params) -> Result<Value, Error>;
+use v1::helpers::auto_args::{Wrap, WrapAsync, Ready};
+use v1::types::{U256, H160, H256, Bytes, ConfirmationResponse, TransactionRequest, Either};

-	/// Posts transaction asynchronously.
-	/// Will return a transaction ID for later use with check_transaction.
-	fn post_transaction(&self, _: Params) -> Result<Value, Error>;
+build_rpc_trait! {
+	/// Signing methods implementation.
+	pub trait ParitySigning {
+		/// Posts sign request asynchronously.
+		/// Will return a confirmation ID for later use with check_transaction.
+		#[rpc(name = "parity_postSign")]
+		fn post_sign(&self, H160, H256) -> Result<Either<U256, ConfirmationResponse>, Error>;

-	/// Checks the progress of a previously posted request (transaction/sign).
-	/// Should be given a valid send_transaction ID.
-	/// Returns the transaction hash, the zero hash (not yet available),
-	/// or the signature,
-	/// or an error.
-	fn check_request(&self, _: Params) -> Result<Value, Error>;
+		/// Posts transaction asynchronously.
+		/// Will return a transaction ID for later use with check_transaction.
+		#[rpc(name = "parity_postTransaction")]
+		fn post_transaction(&self, TransactionRequest) -> Result<Either<U256, ConfirmationResponse>, Error>;

-	/// Decrypt some ECIES-encrypted message.
-	/// First parameter is the address with which it is encrypted, second is the ciphertext.
-	fn decrypt_message(&self, _: Params, _: Ready);
+		/// Checks the progress of a previously posted request (transaction/sign).
+		/// Should be given a valid send_transaction ID.
+		#[rpc(name = "parity_checkRequest")]
+		fn check_request(&self, U256) -> Result<Option<ConfirmationResponse>, Error>;

-	/// Should be used to convert object to io delegate.
-	fn to_delegate(self) -> IoDelegate<Self> {
-		let mut delegate = IoDelegate::new(Arc::new(self));
-		delegate.add_method("parity_postSign", ParitySigning::post_sign);
-		delegate.add_method("parity_postTransaction", ParitySigning::post_transaction);
-		delegate.add_method("parity_checkRequest", ParitySigning::check_request);
-		delegate.add_async_method("parity_decryptMessage", ParitySigning::decrypt_message);
-
-		delegate
+		/// Decrypt some ECIES-encrypted message.
+		/// First parameter is the address with which it is encrypted, second is the ciphertext.
+		#[rpc(async, name = "parity_decryptMessage")]
+		fn decrypt_message(&self, Ready<Bytes>, H160, Bytes);
 	}
 }
--- a/rpc/src/v1/traits/signer.rs
+++ b/rpc/src/v1/traits/signer.rs
@ -15,10 +15,10 @@
 // along with Parity.  If not, see <http://www.gnu.org/licenses/>.

 //! Parity Signer-related rpc interface.
-use jsonrpc_core::{Value, Error};
+use jsonrpc_core::Error;

 use v1::helpers::auto_args::Wrap;
-use v1::types::{U256, TransactionModification, ConfirmationRequest};
+use v1::types::{U256, TransactionModification, ConfirmationRequest, ConfirmationResponse};


 build_rpc_trait! {
@ -31,7 +31,7 @@ build_rpc_trait! {

 		/// Confirm specific request.
 		#[rpc(name = "signer_confirmRequest")]
-		fn confirm_request(&self, U256, TransactionModification, String) -> Result<Value, Error>;
+		fn confirm_request(&self, U256, TransactionModification, String) -> Result<ConfirmationResponse, Error>;

 		/// Reject the confirmation request.
 		#[rpc(name = "signer_rejectRequest")]
--- a/rpc/src/v1/types/confirmations.rs
+++ b/rpc/src/v1/types/confirmations.rs
@ -16,10 +16,11 @@

 //! Types used in Confirmations queue (Trusted Signer)

-use v1::types::{U256, TransactionRequest, H160, H256, Bytes};
+use std::fmt;
+use serde::{Serialize, Serializer};
+use v1::types::{U256, TransactionRequest, H160, H256, H520, Bytes};
 use v1::helpers;

-
 /// Confirmation waiting in a queue
 #[derive(Debug, Clone, Eq, PartialEq, Hash, Serialize)]
 pub struct ConfirmationRequest {
@ -47,6 +48,15 @@ pub struct SignRequest {
 	pub hash: H256,
 }

+impl From<(H160, H256)> for SignRequest {
+	fn from(tuple: (H160, H256)) -> Self {
+		SignRequest {
+			address: tuple.0,
+			hash: tuple.1,
+		}
+	}
+}
+
 /// Decrypt request
 #[derive(Debug, Clone, Eq, PartialEq, Hash, Serialize)]
 pub struct DecryptRequest {
@ -56,15 +66,53 @@ pub struct DecryptRequest {
 	pub msg: Bytes,
 }

+impl From<(H160, Bytes)> for DecryptRequest {
+	fn from(tuple: (H160, Bytes)) -> Self {
+		DecryptRequest {
+			address: tuple.0,
+			msg: tuple.1,
+		}
+	}
+}
+
+/// Confirmation response for particular payload
+#[derive(Debug, Clone, Eq, PartialEq, Hash)]
+pub enum ConfirmationResponse {
+	/// Transaction Hash
+	SendTransaction(H256),
+	/// Transaction RLP
+	SignTransaction(Bytes),
+	/// Signature
+	Signature(H520),
+	/// Decrypted data
+	Decrypt(Bytes),
+}
+
+impl Serialize for ConfirmationResponse {
+	fn serialize<S>(&self, serializer: &mut S) -> Result<(), S::Error>
+		where S: Serializer
+	{
+		match *self {
+			ConfirmationResponse::SendTransaction(ref hash) => hash.serialize(serializer),
+			ConfirmationResponse::SignTransaction(ref rlp) => rlp.serialize(serializer),
+			ConfirmationResponse::Signature(ref signature) => signature.serialize(serializer),
+			ConfirmationResponse::Decrypt(ref data) => data.serialize(serializer),
+		}
+	}
+}
+
 /// Confirmation payload, i.e. the thing to be confirmed
 #[derive(Debug, Clone, Eq, PartialEq, Hash, Serialize)]
 pub enum ConfirmationPayload {
-	/// Transaction
+	/// Send Transaction
 	#[serde(rename="transaction")]
-	Transaction(TransactionRequest),
+	SendTransaction(TransactionRequest),
+	/// Sign Transaction
+	#[serde(rename="transaction")]
+	SignTransaction(TransactionRequest),
 	/// Signature
 	#[serde(rename="sign")]
-	Sign(SignRequest),
+	Signature(SignRequest),
 	/// Decryption
 	#[serde(rename="decrypt")]
 	Decrypt(DecryptRequest),
@ -73,8 +121,9 @@ pub enum ConfirmationPayload {
 impl From<helpers::ConfirmationPayload> for ConfirmationPayload {
 	fn from(c: helpers::ConfirmationPayload) -> Self {
 		match c {
-			helpers::ConfirmationPayload::Transaction(t) => ConfirmationPayload::Transaction(t.into()),
-			helpers::ConfirmationPayload::Sign(address, hash) => ConfirmationPayload::Sign(SignRequest {
+			helpers::ConfirmationPayload::SendTransaction(t) => ConfirmationPayload::SendTransaction(t.into()),
+			helpers::ConfirmationPayload::SignTransaction(t) => ConfirmationPayload::SignTransaction(t.into()),
+			helpers::ConfirmationPayload::Signature(address, hash) => ConfirmationPayload::Signature(SignRequest {
 				address: address.into(),
 				hash: hash.into(),
 			}),
@ -94,6 +143,41 @@ pub struct TransactionModification {
 	pub gas_price: Option<U256>,
 }

+/// Represents two possible return values.
+#[derive(Debug, Clone)]
+pub enum Either<A, B> where
+	A: fmt::Debug + Clone,
+	B: fmt::Debug + Clone,
+{
+	/// Primary value
+	Either(A),
+	/// Secondary value
+	Or(B),
+}
+
+impl<A, B> From<A> for Either<A, B> where
+	A: fmt::Debug + Clone,
+	B: fmt::Debug + Clone,
+{
+	fn from(a: A) -> Self {
+		Either::Either(a)
+	}
+}
+
+impl<A, B> Serialize for Either<A, B>  where
+	A: Serialize + fmt::Debug + Clone,
+	B: Serialize + fmt::Debug + Clone,
+{
+	fn serialize<S>(&self, serializer: &mut S) -> Result<(), S::Error>
+		where S: Serializer
+	{
+		match *self {
+			Either::Either(ref a) => a.serialize(serializer),
+			Either::Or(ref b) => b.serialize(serializer),
+		}
+	}
+}
+
 #[cfg(test)]
 mod tests {
 	use std::str::FromStr;
@ -107,7 +191,7 @@ mod tests {
 		// given
 		let request = helpers::ConfirmationRequest {
 			id: 15.into(),
-			payload: helpers::ConfirmationPayload::Sign(1.into(), 5.into()),
+			payload: helpers::ConfirmationPayload::Signature(1.into(), 5.into()),
 		};

 		// when
@ -123,7 +207,7 @@ mod tests {
 		// given
 		let request = helpers::ConfirmationRequest {
 			id: 15.into(),
-			payload: helpers::ConfirmationPayload::Transaction(helpers::FilledTransactionRequest {
+			payload: helpers::ConfirmationPayload::SendTransaction(helpers::FilledTransactionRequest {
 				from: 0.into(),
 				to: None,
 				gas: 15_000.into(),
--- a/rpc/src/v1/types/mod.rs.in
+++ b/rpc/src/v1/types/mod.rs.in
@ -38,7 +38,7 @@ pub use self::bytes::Bytes;
 pub use self::block::{RichBlock, Block, BlockTransactions};
 pub use self::block_number::BlockNumber;
 pub use self::call_request::CallRequest;
-pub use self::confirmations::{ConfirmationPayload, ConfirmationRequest, TransactionModification};
+pub use self::confirmations::{ConfirmationPayload, ConfirmationRequest, ConfirmationResponse, TransactionModification, SignRequest, DecryptRequest, Either};
 pub use self::filter::{Filter, FilterChanges};
 pub use self::hash::{H64, H160, H256, H512, H520, H2048};
 pub use self::index::Index;
--- a/util/io/src/service.rs
+++ b/util/io/src/service.rs
@ -433,6 +433,9 @@ impl<Message> IoService<Message> where Message: Send + Sync + Clone + 'static {
 impl<Message> Drop for IoService<Message> where Message: Send + Sync + Clone {
 	fn drop(&mut self) {
 		trace!(target: "shutdown", "[IoService] Closing...");
+		// Clear handlers so that shared pointers are not stuck on stack
+		// in Channel::send_sync
+		self.handlers.write().clear();
 		self.host_channel.lock().send(IoMessage::Shutdown).unwrap_or_else(|e| warn!("Error on IO service shutdown: {:?}", e));
 		if let Some(thread) = self.thread.take() {
 			thread.join().unwrap_or_else(|e| {
--- a/windows/ptray/ptray.cpp
+++ b/windows/ptray/ptray.cpp
@ -33,6 +33,7 @@
 #define MAX_LOADSTRING 100
 #define IDM_EXIT 100
 #define IDM_OPEN 101
+#define IDM_AUTOSTART 102
 #define	WM_USER_SHELLICON WM_USER + 1

 HANDLE parityHandle = INVALID_HANDLE_VALUE;
@ -49,17 +50,27 @@ LRESULT CALLBACK WndProc(HWND, UINT, WPARAM, LPARAM);
 void KillParity();
 void OpenUI();
 bool ParityIsRunning();
+bool AutostartEnabled();
+void EnableAutostart(bool enable);

 bool GetParityExePath(TCHAR* dest, size_t destSize)
 {
 	if (!dest || MAX_PATH > destSize)
 		return false;
-	GetModuleFileName(NULL, dest, destSize);
+	GetModuleFileName(NULL, dest, (DWORD)destSize);
 	if (!PathRemoveFileSpec(dest))
 		return false;
 	return PathAppend(dest, _T("parity.exe")) == TRUE;
 }

+bool GetTrayExePath(TCHAR* dest, size_t destSize)
+{
+	if (!dest || MAX_PATH > destSize)
+		return false;
+	GetModuleFileName(NULL, dest, (DWORD)destSize);
+	return true;
+}
+
 int APIENTRY wWinMain(_In_ HINSTANCE hInstance,
 	_In_opt_ HINSTANCE hPrevInstance,
 	_In_ LPWSTR    lpCmdLine,
@ -201,7 +212,11 @@ LRESULT CALLBACK WndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam)
 			HMENU hPopMenu = CreatePopupMenu();
 			InsertMenu(hPopMenu, 0xFFFFFFFF, MF_BYPOSITION | MF_STRING, IDM_OPEN, _T("Open"));
 			InsertMenu(hPopMenu, 0xFFFFFFFF, MF_SEPARATOR | MF_BYPOSITION, 0, nullptr);
+			InsertMenu(hPopMenu, 0xFFFFFFFF, MF_BYPOSITION | MF_STRING, IDM_AUTOSTART, _T("Start at Login"));
+			InsertMenu(hPopMenu, 0xFFFFFFFF, MF_SEPARATOR | MF_BYPOSITION, 0, nullptr);
 			InsertMenu(hPopMenu, 0xFFFFFFFF, MF_BYPOSITION | MF_STRING, IDM_EXIT, _T("Exit"));
+			bool autoStart = AutostartEnabled();
+			CheckMenuItem(hPopMenu, IDM_AUTOSTART, autoStart ? MF_CHECKED : autoStart);

 			SetForegroundWindow(hWnd);
 			TrackPopupMenu(hPopMenu, TPM_LEFTALIGN | TPM_LEFTBUTTON | TPM_BOTTOMALIGN, lpClickPoint.x, lpClickPoint.y, 0, hWnd, NULL);
@ -221,6 +236,12 @@ LRESULT CALLBACK WndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam)
 		case IDM_OPEN:
 			OpenUI();
 			break;
+		case IDM_AUTOSTART:
+			{
+				bool autoStart = AutostartEnabled();
+				EnableAutostart(!autoStart);
+			}
+			break;
 		default:
 			return DefWindowProc(hWnd, message, wParam, lParam);
 		}
@ -276,3 +297,38 @@ void OpenUI()
 	LPWSTR cmd = _T("parity.exe ui");
 	CreateProcess(path, cmd, nullptr, nullptr, false, CREATE_NO_WINDOW, nullptr, nullptr, &startupInfo, &procInfo);
 }
+
+bool AutostartEnabled() {
+	HKEY hKey;
+	LONG lRes = RegOpenKeyExW(HKEY_CURRENT_USER, L"Software\\Microsoft\\Windows\\CurrentVersion\\Run", 0, KEY_READ, &hKey);
+	if (lRes != ERROR_SUCCESS)
+		return false;
+
+	WCHAR szBuffer[512];
+	DWORD dwBufferSize = sizeof(szBuffer);
+	ULONG nError;
+	nError = RegQueryValueExW(hKey, L"Parity", 0, nullptr, (LPBYTE)szBuffer, &dwBufferSize);
+	if (ERROR_SUCCESS != nError)
+		return false;
+	return true;
+}
+
+void EnableAutostart(bool enable) {
+	HKEY hKey;
+	LONG lRes = RegOpenKeyExW(HKEY_CURRENT_USER, L"Software\\Microsoft\\Windows\\CurrentVersion\\Run", 0, KEY_WRITE, &hKey);
+	if (lRes != ERROR_SUCCESS)
+		return;
+
+	if (enable) 
+	{
+		TCHAR path[MAX_PATH] = { 0 };
+		if (!GetTrayExePath(path, MAX_PATH))
+			return;
+		RegSetValueEx(hKey, L"Parity", 0, REG_SZ, (LPBYTE)path, MAX_PATH);
+	}
+	else
+	{
+		RegDeleteValue(hKey, L"Parity");
+	}
+}
+
--- a/windows/ptray/ptray.vcxproj
+++ b/windows/ptray/ptray.vcxproj
@ -95,7 +95,7 @@
  </ItemDefinitionGroup>
  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
    <ClCompile>
-      <PrecompiledHeader>Use</PrecompiledHeader>
+      <PrecompiledHeader>NotUsing</PrecompiledHeader>
      <WarningLevel>Level3</WarningLevel>
      <Optimization>Disabled</Optimization>
      <PreprocessorDefinitions>_DEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>