Merge branch 'fix-number' into check-updates

2016-11-25 12:17:58 +01:00 · 2016-11-25 12:17:58 +01:00 · befb0bf2bd
commit befb0bf2bd
parent 735df6c30f 45017c599a
22 changed files with 498 additions and 105 deletions
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@ -31,10 +31,12 @@ linux-stable:
    - 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
-    - aws s3api put-object --bucket builds-parity --key $CI_BUILD_REF_NAME/x86_64-unknown-linux-gnu/parity.md5 --body parity.md5
-    - aws s3api put-object --bucket builds-parity --key $CI_BUILD_REF_NAME/x86_64-unknown-linux-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-linux-gnu/"parity_"$VER"_amd64.deb.md5" --body "parity_"$VER"_amd64.deb.md5"
+    - if [[ $CI_BUILD_REF_NAME =~ ^(master|beta|stable)$ ]]; then export S3_BUCKET=builds-parity-published; else export S3_BUCKET=builds-parity; fi
+    - aws s3 rm --recursive s3://$S3_BUCKET/$CI_BUILD_REF_NAME/x86_64-unknown-linux-gnu
+    - aws s3api put-object --bucket $S3_BUCKET --key $CI_BUILD_REF_NAME/x86_64-unknown-linux-gnu/parity --body target/release/parity
+    - aws s3api put-object --bucket $S3_BUCKET --key $CI_BUILD_REF_NAME/x86_64-unknown-linux-gnu/parity.md5 --body parity.md5
+    - aws s3api put-object --bucket $S3_BUCKET --key $CI_BUILD_REF_NAME/x86_64-unknown-linux-gnu/"parity_"$VER"_amd64.deb" --body "parity_"$VER"_amd64.deb"
+    - aws s3api put-object --bucket $S3_BUCKET --key $CI_BUILD_REF_NAME/x86_64-unknown-linux-gnu/"parity_"$VER"_amd64.deb.md5" --body "parity_"$VER"_amd64.deb.md5"
  tags:
    - rust
    - rust-stable
@ -96,6 +98,8 @@ linux-centos:
    - md5sum target/release/parity > parity.md5
    - aws configure set aws_access_key_id $s3_key
    - aws configure set aws_secret_access_key $s3_secret
+    - if [[ $CI_BUILD_REF_NAME =~ ^(master|beta|stable)$ ]]; then export S3_BUCKET=builds-parity-published; else export S3_BUCKET=builds-parity; fi
+    - aws s3 rm --recursive s3://$S3_BUCKET/$CI_BUILD_REF_NAME/x86_64-unknown-centos-gnu
    - aws s3api put-object --bucket builds-parity --key $CI_BUILD_REF_NAME/x86_64-unknown-centos-gnu/parity --body target/release/parity
    - aws s3api put-object --bucket builds-parity --key $CI_BUILD_REF_NAME/x86_64-unknown-centos-gnu/parity.md5 --body parity.md5
  tags:
@ -126,10 +130,12 @@ linux-i686:
    - 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
-    - aws s3api put-object --bucket builds-parity --key $CI_BUILD_REF_NAME/i686-unknown-linux-gnu/parity.md5 --body parity.md5
-    - aws s3api put-object --bucket builds-parity --key $CI_BUILD_REF_NAME/i686-unknown-linux-gnu/"parity_"$VER"_i386.deb" --body "parity_"$VER"_i386.deb"
-    - aws s3api put-object --bucket builds-parity --key $CI_BUILD_REF_NAME/i686-unknown-linux-gnu/"parity_"$VER"_i386.deb.md5" --body "parity_"$VER"_i386.deb.md5"
+    - if [[ $CI_BUILD_REF_NAME =~ ^(master|beta|stable)$ ]]; then export S3_BUCKET=builds-parity-published; else export S3_BUCKET=builds-parity; fi
+    - aws s3 rm --recursive s3://$S3_BUCKET/$CI_BUILD_REF_NAME/i686-unknown-linux-gnu
+    - aws s3api put-object --bucket $S3_BUCKET --key $CI_BUILD_REF_NAME/i686-unknown-linux-gnu/parity --body target/i686-unknown-linux-gnu/release/parity
+    - aws s3api put-object --bucket $S3_BUCKET --key $CI_BUILD_REF_NAME/i686-unknown-linux-gnu/parity.md5 --body parity.md5
+    - aws s3api put-object --bucket $S3_BUCKET --key $CI_BUILD_REF_NAME/i686-unknown-linux-gnu/"parity_"$VER"_i386.deb" --body "parity_"$VER"_i386.deb"
+    - aws s3api put-object --bucket $S3_BUCKET --key $CI_BUILD_REF_NAME/i686-unknown-linux-gnu/"parity_"$VER"_i386.deb.md5" --body "parity_"$VER"_i386.deb.md5"
  tags:
    - rust
    - rust-i686
@ -166,10 +172,12 @@ linux-armv7:
    - 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
-    - aws s3api put-object --bucket builds-parity --key $CI_BUILD_REF_NAME/armv7-unknown-linux-gnueabihf/parity.md5 --body parity.md5
-    - aws s3api put-object --bucket builds-parity --key $CI_BUILD_REF_NAME/armv7-unknown-linux-gnueabihf/"parity_"$VER"_armhf.deb" --body "parity_"$VER"_armhf.deb"
-    - aws s3api put-object --bucket builds-parity --key $CI_BUILD_REF_NAME/armv7-unknown-linux-gnueabihf/"parity_"$VER"_armhf.deb.md5" --body "parity_"$VER"_armhf.deb.md5"
+    - if [[ $CI_BUILD_REF_NAME =~ ^(master|beta|stable)$ ]]; then export S3_BUCKET=builds-parity-published; else export S3_BUCKET=builds-parity; fi
+    - aws s3 rm --recursive s3://$S3_BUCKET/$CI_BUILD_REF_NAME/armv7-unknown-linux-gnueabihf
+    - aws s3api put-object --bucket $S3_BUCKET --key $CI_BUILD_REF_NAME/armv7-unknown-linux-gnueabihf/parity --body target/armv7-unknown-linux-gnueabihf/release/parity
+    - aws s3api put-object --bucket $S3_BUCKET --key $CI_BUILD_REF_NAME/armv7-unknown-linux-gnueabihf/parity.md5 --body parity.md5
+    - aws s3api put-object --bucket $S3_BUCKET --key $CI_BUILD_REF_NAME/armv7-unknown-linux-gnueabihf/"parity_"$VER"_armhf.deb" --body "parity_"$VER"_armhf.deb"
+    - aws s3api put-object --bucket $S3_BUCKET --key $CI_BUILD_REF_NAME/armv7-unknown-linux-gnueabihf/"parity_"$VER"_armhf.deb.md5" --body "parity_"$VER"_armhf.deb.md5"
  tags:
    - rust
    - rust-arm
@ -206,10 +214,12 @@ linux-arm:
    - 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
-    - aws s3api put-object --bucket builds-parity --key $CI_BUILD_REF_NAME/arm-unknown-linux-gnueabihf/parity.md5 --body parity.md5
-    - aws s3api put-object --bucket builds-parity --key $CI_BUILD_REF_NAME/arm-unknown-linux-gnueabihf/"parity_"$VER"_armhf.deb" --body "parity_"$VER"_armhf.deb"
-    - aws s3api put-object --bucket builds-parity --key $CI_BUILD_REF_NAME/arm-unknown-linux-gnueabihf/"parity_"$VER"_armhf.deb.md5" --body "parity_"$VER"_armhf.deb.md5"
+    - if [[ $CI_BUILD_REF_NAME =~ ^(master|beta|stable)$ ]]; then export S3_BUCKET=builds-parity-published; else export S3_BUCKET=builds-parity; fi
+    - aws s3 rm --recursive s3://$S3_BUCKET/$CI_BUILD_REF_NAME/arm-unknown-linux-gnueabihf
+    - aws s3api put-object --bucket $S3_BUCKET --key $CI_BUILD_REF_NAME/arm-unknown-linux-gnueabihf/parity --body target/arm-unknown-linux-gnueabihf/release/parity
+    - aws s3api put-object --bucket $S3_BUCKET --key $CI_BUILD_REF_NAME/arm-unknown-linux-gnueabihf/parity.md5 --body parity.md5
+    - aws s3api put-object --bucket $S3_BUCKET --key $CI_BUILD_REF_NAME/arm-unknown-linux-gnueabihf/"parity_"$VER"_armhf.deb" --body "parity_"$VER"_armhf.deb"
+    - aws s3api put-object --bucket $S3_BUCKET --key $CI_BUILD_REF_NAME/arm-unknown-linux-gnueabihf/"parity_"$VER"_armhf.deb.md5" --body "parity_"$VER"_armhf.deb.md5"
  tags:
    - rust
    - rust-arm
@ -241,8 +251,10 @@ linux-armv6:
    - 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
-    - aws s3api put-object --bucket builds-parity --key $CI_BUILD_REF_NAME/arm-unknown-linux-gnueabi/parity.md5 --body parity.md5
+    - if [[ $CI_BUILD_REF_NAME =~ ^(master|beta|stable)$ ]]; then export S3_BUCKET=builds-parity-published; else export S3_BUCKET=builds-parity; fi
+    - aws s3 rm --recursive s3://$S3_BUCKET/$CI_BUILD_REF_NAME/arm-unknown-linux-gnueabi
+    - aws s3api put-object --bucket $S3_BUCKET --key $CI_BUILD_REF_NAME/arm-unknown-linux-gnueabi/parity --body target/arm-unknown-linux-gnueabi/release/parity
+    - aws s3api put-object --bucket $S3_BUCKET --key $CI_BUILD_REF_NAME/arm-unknown-linux-gnueabi/parity.md5 --body parity.md5
  tags:
    - rust
    - rust-arm
@ -279,10 +291,12 @@ linux-aarch64:
    - 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
-    - aws s3api put-object --bucket builds-parity --key $CI_BUILD_REF_NAME/aarch64-unknown-linux-gnu/parity.md5 --body parity.md5
-    - aws s3api put-object --bucket builds-parity --key $CI_BUILD_REF_NAME/aarch64-unknown-linux-gnu/"parity_"$VER"_arm64.deb" --body "parity_"$VER"_arm64.deb"
-    - aws s3api put-object --bucket builds-parity --key $CI_BUILD_REF_NAME/aarch64-unknown-linux-gnu/"parity_"$VER"_arm64.deb.md5" --body "parity_"$VER"_arm64.deb.md5"
+    - if [[ $CI_BUILD_REF_NAME =~ ^(master|beta|stable)$ ]]; then export S3_BUCKET=builds-parity-published; else export S3_BUCKET=builds-parity; fi
+    - aws s3 rm --recursive s3://$S3_BUCKET/$CI_BUILD_REF_NAME/aarch64-unknown-linux-gnu
+    - aws s3api put-object --bucket $S3_BUCKET --key $CI_BUILD_REF_NAME/aarch64-unknown-linux-gnu/parity --body target/aarch64-unknown-linux-gnu/release/parity
+    - aws s3api put-object --bucket $S3_BUCKET --key $CI_BUILD_REF_NAME/aarch64-unknown-linux-gnu/parity.md5 --body parity.md5
+    - aws s3api put-object --bucket $S3_BUCKET --key $CI_BUILD_REF_NAME/aarch64-unknown-linux-gnu/"parity_"$VER"_arm64.deb" --body "parity_"$VER"_arm64.deb"
+    - aws s3api put-object --bucket $S3_BUCKET --key $CI_BUILD_REF_NAME/aarch64-unknown-linux-gnu/"parity_"$VER"_arm64.deb.md5" --body "parity_"$VER"_arm64.deb.md5"
  tags:
    - rust
    - rust-arm
@ -291,6 +305,41 @@ linux-aarch64:
    - target/aarch64-unknown-linux-gnu/release/parity
    name: "aarch64-unknown-linux-gnu_parity"
  allow_failure: true
+#linux-alpine:
+#  stage: build
+#  image: ethcore/rust-alpine:latest
+#  only:
+#    - beta
+#    - tags
+#    - stable
+#    - triggers
+#  script:
+#    - export HOST_CC=gcc
+#    - export HOST_CXX=g++
+#    - cargo build --release $CARGOFLAGS
+#    - strip target/release/parity
+#    - md5sum target/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"
+#    - aws configure set aws_access_key_id $s3_key
+#    - aws configure set aws_secret_access_key $s3_secret
+#    - if [[ $CI_BUILD_REF_NAME =~ ^(master|beta|stable)$ ]]; then export S3_BUCKET=builds-parity-published; else export S3_BUCKET=builds-parity; fi
+#    - aws s3 rm --recursive s3://$S3_BUCKET/$CI_BUILD_REF_NAME/aarch64-unknown-linux-gnu
+#    - aws s3api put-object --bucket $S3_BUCKET --key $CI_BUILD_REF_NAME/aarch64-unknown-linux-gnu/parity --body target/aarch64-unknown-linux-gnu/release/parity
+#    - aws s3api put-object --bucket $S3_BUCKET --key $CI_BUILD_REF_NAME/aarch64-unknown-linux-gnu/parity.md5 --body parity.md5
+#    - aws s3api put-object --bucket $S3_BUCKET --key $CI_BUILD_REF_NAME/aarch64-unknown-linux-gnu/"parity_"$VER"_arm64.deb" --body "parity_"$VER"_arm64.deb"
+#    - aws s3api put-object --bucket $S3_BUCKET --key $CI_BUILD_REF_NAME/aarch64-unknown-linux-gnu/"parity_"$VER"_arm64.deb.md5" --body "parity_"$VER"_arm64.deb.md5"
+#  tags:
+#    - rust
+#    - rust-alpine
+#  artifacts:
+#    paths:
+#    - target/aarch64-unknown-linux-gnu/release/parity
+#    name: "aarch64-unknown-linux-gnu_parity"
+#  allow_failure: true
 darwin:
  stage: build
  only:
@ -304,8 +353,10 @@ darwin:
    - 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
-    - aws s3api put-object --bucket builds-parity --key $CI_BUILD_REF_NAME/x86_64-apple-darwin/parity.md5 --body parity.md5
+    - if [[ $CI_BUILD_REF_NAME =~ ^(master|beta|stable)$ ]]; then export S3_BUCKET=builds-parity-published; else export S3_BUCKET=builds-parity; fi
+    - aws s3 rm --recursive s3://$S3_BUCKET/$CI_BUILD_REF_NAME/x86_64-apple-darwin
+    - aws s3api put-object --bucket $S3_BUCKET --key $CI_BUILD_REF_NAME/x86_64-apple-darwin/parity --body target/release/parity
+    - aws s3api put-object --bucket $S3_BUCKET --key $CI_BUILD_REF_NAME/x86_64-apple-darwin/parity.md5 --body parity.md5
  tags:
    - osx
  artifacts:
@ -349,14 +400,20 @@ windows:
    - cd ..\..
    - 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-pc-windows-msvc/parity.exe --body target\release\parity.exe
-    - aws s3api put-object --bucket builds-parity --key %CI_BUILD_REF_NAME%/x86_64-pc-windows-msvc/parity.exe.md5 --body target\release\parity.exe.md5
-    - aws s3api put-object --bucket builds-parity --key %CI_BUILD_REF_NAME%/x86_64-pc-windows-msvc/parity.zip --body target\release\parity.zip
-    - aws s3api put-object --bucket builds-parity --key %CI_BUILD_REF_NAME%/x86_64-pc-windows-msvc/parity.zip.md5 --body target\release\parity.zip.md5
-    - aws s3api put-object --bucket builds-parity --key %CI_BUILD_REF_NAME%/x86_64-pc-windows-msvc/InstallParity.exe --body nsis\InstallParity.exe
-    - aws s3api put-object --bucket builds-parity --key %CI_BUILD_REF_NAME%/x86_64-pc-windows-msvc/InstallParity.exe.md5 --body nsis\InstallParity.exe.md5
-    - aws s3api put-object --bucket builds-parity --key %CI_BUILD_REF_NAME%/x86_64-pc-windows-msvc/win-installer.zip --body nsis\win-installer.zip
-    - aws s3api put-object --bucket builds-parity --key %CI_BUILD_REF_NAME%/x86_64-pc-windows-msvc/win-installer.zip.md5 --body nsis\win-installer.zip.md5
+    - echo %CI_BUILD_REF_NAME%
+    - echo %CI_BUILD_REF_NAME% | findstr /R "master" >nul 2>&1 && set S3_BUCKET=builds-parity-published || set S3_BUCKET=builds-parity
+    - echo %CI_BUILD_REF_NAME% | findstr /R "beta" >nul 2>&1 && set S3_BUCKET=builds-parity-published || set S3_BUCKET=builds-parity
+    - echo %CI_BUILD_REF_NAME% | findstr /R "stable" >nul 2>&1 && set S3_BUCKET=builds-parity-published || set S3_BUCKET=builds-parity
+    - echo %S3_BUCKET%
+    - aws s3 rm --recursive s3://%S3_BUCKET%/%CI_BUILD_REF_NAME%/x86_64-pc-windows-msvc
+    - aws s3api put-object --bucket %S3_BUCKET% --key %CI_BUILD_REF_NAME%/x86_64-pc-windows-msvc/parity.exe --body target\release\parity.exe
+    - aws s3api put-object --bucket %S3_BUCKET% --key %CI_BUILD_REF_NAME%/x86_64-pc-windows-msvc/parity.exe.md5 --body target\release\parity.exe.md5
+    - aws s3api put-object --bucket %S3_BUCKET% --key %CI_BUILD_REF_NAME%/x86_64-pc-windows-msvc/parity.zip --body target\release\parity.zip
+    - aws s3api put-object --bucket %S3_BUCKET% --key %CI_BUILD_REF_NAME%/x86_64-pc-windows-msvc/parity.zip.md5 --body target\release\parity.zip.md5
+    - aws s3api put-object --bucket %S3_BUCKET% --key %CI_BUILD_REF_NAME%/x86_64-pc-windows-msvc/InstallParity.exe --body nsis\InstallParity.exe
+    - aws s3api put-object --bucket %S3_BUCKET% --key %CI_BUILD_REF_NAME%/x86_64-pc-windows-msvc/InstallParity.exe.md5 --body nsis\InstallParity.exe.md5
+    - aws s3api put-object --bucket %S3_BUCKET% --key %CI_BUILD_REF_NAME%/x86_64-pc-windows-msvc/win-installer.zip --body nsis\win-installer.zip
+    - aws s3api put-object --bucket %S3_BUCKET% --key %CI_BUILD_REF_NAME%/x86_64-pc-windows-msvc/win-installer.zip.md5 --body nsis\win-installer.zip.md5
  tags:
   - rust-windows
  artifacts:
@ -394,7 +451,7 @@ test-rust-stable:
  image: ethcore/rust:stable
  before_script:
    - git submodule update --init --recursive
-    - export JS_FILES_MODIFIED=$(git --no-pager diff --name-only CI_BUILD_REF CI_BUILD_REF@{1} | grep \.js | wc -l)
+    - export JS_FILES_MODIFIED=$(git --no-pager diff --name-only $CI_BUILD_REF^ $CI_BUILD_REF | grep \.js | wc -l)
    - echo $JS_FILES_MODIFIED
    - if [ -z $JS_FILES_MODIFIED ]; then echo "skip js test"; fi
  script:
@ -411,7 +468,7 @@ test-rust-beta:
  image: ethcore/rust:beta
  before_script:
    - git submodule update --init --recursive
-    - export JS_FILES_MODIFIED=$(git --no-pager diff --name-only CI_BUILD_REF CI_BUILD_REF@{1} | grep \.js | wc -l)
+    - export JS_FILES_MODIFIED=$(git --no-pager diff --name-only $CI_BUILD_REF^ $CI_BUILD_REF | grep \.js | wc -l)
    - echo $JS_FILES_MODIFIED
    - if [ -z $JS_FILES_MODIFIED ]; then echo "skip js test"; fi
  script:
@ -429,7 +486,7 @@ test-rust-nightly:
  image: ethcore/rust:nightly
  before_script:
    - git submodule update --init --recursive
-    - export JS_FILES_MODIFIED=$(git --no-pager diff --name-only CI_BUILD_REF CI_BUILD_REF@{1} | grep \.js | wc -l)
+    - export JS_FILES_MODIFIED=$(git --no-pager diff --name-only $CI_BUILD_REF^ $CI_BUILD_REF | grep \.js | wc -l)
    - echo $JS_FILES_MODIFIED
    - if [ -z $JS_FILES_MODIFIED ]; then echo "skip js test"; fi
  script:
--- a/Cargo.lock
+++ b/Cargo.lock
@ -1265,7 +1265,7 @@ dependencies = [
 [[package]]
 name = "parity-ui-precompiled"
 version = "1.4.0"
-source = "git+https://github.com/ethcore/js-precompiled.git#1099b22904fd8c6f2e0925cc7124da4d68462d4e"
+source = "git+https://github.com/ethcore/js-precompiled.git#bed8cd5ea70b002300ed934f77f6fa3812fb380a"
 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 9028c4801fd39fbb71a9796979182549a24e81c8
+Subproject commit e8f4624b7f1a15c63674eecf577c7ab76c3b16be
--- a/ethcore/src/account_provider.rs
+++ b/ethcore/src/account_provider.rs
@ -276,14 +276,20 @@ impl AccountProvider {
 	}

 	/// Returns `true` if the password for `account` is `password`. `false` if not.
-	pub fn test_password(&self, account: &Address, password: String) -> Result<bool, Error> {
-		match self.sstore.sign(account, &password, &Default::default()) {
+	pub fn test_password(&self, account: &Address, password: &str) -> Result<bool, Error> {
+		match self.sstore.sign(account, password, &Default::default()) {
 			Ok(_) => Ok(true),
 			Err(SSError::InvalidPassword) => Ok(false),
 			Err(e) => Err(Error::SStore(e)),
 		}
 	}

+	/// Permanently removes an account.
+	pub fn kill_account(&self, account: &Address, password: &str) -> Result<(), Error> {
+		try!(self.sstore.remove_account(account, &password));
+		Ok(())
+	}
+
 	/// Changes the password of `account` from `password` to `new_password`. Fails if incorrect `password` given.
 	pub fn change_password(&self, account: &Address, password: String, new_password: String) -> Result<(), Error> {
 		self.sstore.change_password(account, &password, &new_password).map_err(Error::SStore)
--- a/ethcore/src/json_tests/transaction.rs
+++ b/ethcore/src/json_tests/transaction.rs
@ -34,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 >= 3_500_000); 
+		let allow_network_id_of_one = number.map_or(false, |n| n >= 2_675_000); 

 		let rlp: Vec<u8> = test.rlp.into();
 		let res = UntrustedRlp::new(&rlp)
--- a/ethcore/src/trace/db.rs
+++ b/ethcore/src/trace/db.rs
@ -128,6 +128,9 @@ impl<T> TraceDB<T> where T: DatabaseExtras {
 	/// Creates new instance of `TraceDB`.
 	pub fn new(config: Config, tracesdb: Arc<Database>, extras: Arc<T>) -> Self {
 		let mut batch = DBTransaction::new(&tracesdb);
+		let genesis = extras.block_hash(0)
+			.expect("Genesis block is always inserted upon extras db creation qed");
+		batch.write(db::COL_TRACE, &genesis, &FlatBlockTraces::default());
 		batch.put(db::COL_TRACE, b"version", TRACE_DB_VER);
 		tracesdb.write(batch).expect("failed to update version");

@ -413,8 +416,12 @@ mod tests {
 	struct NoopExtras;

 	impl DatabaseExtras for NoopExtras {
-		fn block_hash(&self, _block_number: BlockNumber) -> Option<H256> {
-			unimplemented!();
+		fn block_hash(&self, block_number: BlockNumber) -> Option<H256> {
+			if block_number == 0 {
+				Some(H256::default())
+			} else {
+				unimplemented!()
+			}
 		}

 		fn transaction_hash(&self, _block_number: BlockNumber, _tx_position: usize) -> Option<H256> {
@ -581,35 +588,21 @@ mod tests {
 		let db = Arc::new(Database::open(&DatabaseConfig::with_columns(::db::NUM_COLUMNS), temp.as_str()).unwrap());
 		let mut config = Config::default();
 		config.enabled = true;
-		let block_0 = H256::from(0xa1);
-		let block_1 = H256::from(0xa2);
-		let tx_0 = H256::from(0xff);
-		let tx_1 = H256::from(0xaf);
+		let block_1 = H256::from(0xa1);
+		let block_2 = H256::from(0xa2);
+		let tx_1 = H256::from(0xff);
+		let tx_2 = H256::from(0xaf);

 		let mut extras = Extras::default();
-		extras.block_hashes.insert(0, block_0.clone());
+		extras.block_hashes.insert(0, H256::default());
+
 		extras.block_hashes.insert(1, block_1.clone());
-		extras.transaction_hashes.insert(0, vec![tx_0.clone()]);
+		extras.block_hashes.insert(2, block_2.clone());
 		extras.transaction_hashes.insert(1, vec![tx_1.clone()]);
+		extras.transaction_hashes.insert(2, vec![tx_2.clone()]);

 		let tracedb = TraceDB::new(config, db.clone(), Arc::new(extras));

-		// import block 0
-		let request = create_simple_import_request(0, block_0.clone());
-		let mut batch = DBTransaction::new(&db);
-		tracedb.import(&mut batch, request);
-		db.write(batch).unwrap();
-
-		let filter = Filter {
-			range: (0..0),
-			from_address: AddressesFilter::from(vec![Address::from(1)]),
-			to_address: AddressesFilter::from(vec![]),
-		};
-
-		let traces = tracedb.filter(&filter);
-		assert_eq!(traces.len(), 1);
-		assert_eq!(traces[0], create_simple_localized_trace(0, block_0.clone(), tx_0.clone()));
-
 		// import block 1
 		let request = create_simple_import_request(1, block_1.clone());
 		let mut batch = DBTransaction::new(&db);
@ -617,38 +610,56 @@ mod tests {
 		db.write(batch).unwrap();

 		let filter = Filter {
-			range: (0..1),
+			range: (1..1),
+			from_address: AddressesFilter::from(vec![Address::from(1)]),
+			to_address: AddressesFilter::from(vec![]),
+		};
+
+		let traces = tracedb.filter(&filter);
+		assert_eq!(traces.len(), 1);
+		assert_eq!(traces[0], create_simple_localized_trace(1, block_1.clone(), tx_1.clone()));
+
+		// import block 2
+		let request = create_simple_import_request(2, block_2.clone());
+		let mut batch = DBTransaction::new(&db);
+		tracedb.import(&mut batch, request);
+		db.write(batch).unwrap();
+
+		let filter = Filter {
+			range: (1..2),
 			from_address: AddressesFilter::from(vec![Address::from(1)]),
 			to_address: AddressesFilter::from(vec![]),
 		};

 		let traces = tracedb.filter(&filter);
 		assert_eq!(traces.len(), 2);
-		assert_eq!(traces[0], create_simple_localized_trace(0, block_0.clone(), tx_0.clone()));
-		assert_eq!(traces[1], create_simple_localized_trace(1, block_1.clone(), tx_1.clone()));
+		assert_eq!(traces[0], create_simple_localized_trace(1, block_1.clone(), tx_1.clone()));
+		assert_eq!(traces[1], create_simple_localized_trace(2, block_2.clone(), tx_2.clone()));

-		let traces = tracedb.block_traces(0).unwrap();
-		assert_eq!(traces.len(), 1);
-		assert_eq!(traces[0], create_simple_localized_trace(0, block_0.clone(), tx_0.clone()));
+		assert!(tracedb.block_traces(0).is_some(), "Genesis trace should be always present.");

 		let traces = tracedb.block_traces(1).unwrap();
 		assert_eq!(traces.len(), 1);
 		assert_eq!(traces[0], create_simple_localized_trace(1, block_1.clone(), tx_1.clone()));

-		assert_eq!(None, tracedb.block_traces(2));
-
-		let traces = tracedb.transaction_traces(0, 0).unwrap();
+		let traces = tracedb.block_traces(2).unwrap();
 		assert_eq!(traces.len(), 1);
-		assert_eq!(traces[0], create_simple_localized_trace(0, block_0.clone(), tx_0.clone()));
+		assert_eq!(traces[0], create_simple_localized_trace(2, block_2.clone(), tx_2.clone()));
+
+		assert_eq!(None, tracedb.block_traces(3));

 		let traces = tracedb.transaction_traces(1, 0).unwrap();
 		assert_eq!(traces.len(), 1);
 		assert_eq!(traces[0], create_simple_localized_trace(1, block_1.clone(), tx_1.clone()));

-		assert_eq!(None, tracedb.transaction_traces(1, 1));
+		let traces = tracedb.transaction_traces(2, 0).unwrap();
+		assert_eq!(traces.len(), 1);
+		assert_eq!(traces[0], create_simple_localized_trace(2, block_2.clone(), tx_2.clone()));
+
+		assert_eq!(None, tracedb.transaction_traces(2, 1));

-		assert_eq!(tracedb.trace(0, 0, vec![]).unwrap(), create_simple_localized_trace(0, block_0.clone(), tx_0.clone()));
 		assert_eq!(tracedb.trace(1, 0, vec![]).unwrap(), create_simple_localized_trace(1, block_1.clone(), tx_1.clone()));
+		assert_eq!(tracedb.trace(2, 0, vec![]).unwrap(), create_simple_localized_trace(2, block_2.clone(), tx_2.clone()));
 	}

 	#[test]
@ -660,8 +671,10 @@ mod tests {
 		let block_0 = H256::from(0xa1);
 		let tx_0 = H256::from(0xff);

-		extras.block_hashes.insert(0, block_0.clone());
-		extras.transaction_hashes.insert(0, vec![tx_0.clone()]);
+		extras.block_hashes.insert(0, H256::default());
+		extras.transaction_hashes.insert(0, vec![]);
+		extras.block_hashes.insert(1, block_0.clone());
+		extras.transaction_hashes.insert(1, vec![tx_0.clone()]);

 		// set tracing on
 		config.enabled = true;
@ -669,8 +682,8 @@ mod tests {
 		{
 			let tracedb = TraceDB::new(config.clone(), db.clone(), Arc::new(extras.clone()));

-			// import block 0
-			let request = create_simple_import_request(0, block_0.clone());
+			// import block 1
+			let request = create_simple_import_request(1, block_0.clone());
 			let mut batch = DBTransaction::new(&db);
 			tracedb.import(&mut batch, request);
 			db.write(batch).unwrap();
@ -678,8 +691,28 @@ mod tests {

 		{
 			let tracedb = TraceDB::new(config.clone(), db.clone(), Arc::new(extras));
-			let traces = tracedb.transaction_traces(0, 0);
-			assert_eq!(traces.unwrap(), vec![create_simple_localized_trace(0, block_0, tx_0)]);
+			let traces = tracedb.transaction_traces(1, 0);
+			assert_eq!(traces.unwrap(), vec![create_simple_localized_trace(1, block_0, tx_0)]);
 		}
 	}
+
+	#[test]
+	fn query_genesis() {
+		let temp = RandomTempPath::new();
+		let db = new_db(temp.as_str());
+		let mut config = Config::default();
+		let mut extras = Extras::default();
+		let block_0 = H256::from(0xa1);
+
+		extras.block_hashes.insert(0, block_0.clone());
+		extras.transaction_hashes.insert(0, vec![]);
+
+		// set tracing on
+		config.enabled = true;
+
+		let tracedb = TraceDB::new(config.clone(), db.clone(), Arc::new(extras.clone()));
+		let traces = tracedb.block_traces(0).unwrap();
+
+		assert_eq!(traces.len(), 0);
+	}
 }
--- a/ethcore/src/types/trace_types/flat.rs
+++ b/ethcore/src/types/trace_types/flat.rs
@ -119,7 +119,7 @@ impl Into<Vec<FlatTrace>> for FlatTransactionTraces {
 }

 /// Represents all traces produced by transactions in a single block.
-#[derive(Debug, PartialEq, Clone)]
+#[derive(Debug, PartialEq, Clone, Default)]
 pub struct FlatBlockTraces(Vec<FlatTransactionTraces>);

 impl HeapSizeOf for FlatBlockTraces {
--- a/js/package.json
+++ b/js/package.json
@ -1,6 +1,6 @@
 {
  "name": "parity.js",
-  "version": "0.2.68",
+  "version": "0.2.70",
  "main": "release/index.js",
  "jsnext:main": "src/index.js",
  "author": "Parity Team <admin@parity.io>",
--- a/js/src/api/rpc/parity/parity.js
+++ b/js/src/api/rpc/parity/parity.js
@ -123,6 +123,11 @@ export default class Parity {
      .then((accounts) => (accounts || []).map(outAddress));
  }

+  killAccount (account, password) {
+    return this._transport
+      .execute('parity_killAccount', inAddress(account), password);
+  }
+
  listGethAccounts () {
    return this._transport
      .execute('parity_listGethAccounts')
--- a/js/src/api/subscriptions/personal.js
+++ b/js/src/api/subscriptions/personal.js
@ -59,6 +59,7 @@ export default class Personal {
      }

      switch (data.method) {
+        case 'parity_killAccount':
        case 'parity_importGethAccounts':
        case 'personal_newAccount':
        case 'parity_newAccountFromPhrase':
--- a/js/src/dapps/localtx/Application/application.js
+++ b/js/src/dapps/localtx/Application/application.js
@ -32,8 +32,13 @@ export default class Application extends Component {
  }

  componentDidMount () {
-    const poll = () => this.fetchTransactionData().then(poll).catch(poll);
-    this._timeout = setTimeout(poll, 2000);
+    const poll = () => {
+      this._timeout = window.setTimeout(() => {
+        this.fetchTransactionData().then(poll).catch(poll);
+      }, 1000);
+    };
+
+    poll();
  }

  componentWillUnmount () {
--- a/js/src/jsonrpc/interfaces/parity.js
+++ b/js/src/jsonrpc/interfaces/parity.js
@ -238,6 +238,24 @@ export default {
    }
  },

+  killAccount: {
+    desc: 'Deletes an account',
+    params: [
+      {
+        type: Address,
+        desc: 'The account to remove'
+      },
+      {
+        type: String,
+        desc: 'Account password'
+      }
+    ],
+    returns: {
+      type: Boolean,
+      desc: 'true on success'
+    }
+  },
+
  listGethAccounts: {
    desc: 'Returns a list of the accounts available from Geth',
    params: [],
--- a/js/src/modals/CreateAccount/RecoveryPhrase/recoveryPhrase.js
+++ b/js/src/modals/CreateAccount/RecoveryPhrase/recoveryPhrase.js
@ -54,8 +54,6 @@ export default class RecoveryPhrase extends Component {
        <Input
          hint='the account recovery phrase'
          label='account recovery phrase'
-          multiLine
-          rows={ 1 }
          value={ recoveryPhrase }
          onChange={ this.onEditPhrase } />
        <Input
@ -112,17 +110,23 @@ export default class RecoveryPhrase extends Component {
  }

  onEditPhrase = (event) => {
-    const value = event.target.value;
-    let error = null;
+    const recoveryPhrase = event.target.value
+      .toLowerCase() // wordlists are lowercase
+      .trim() // remove whitespace at both ends
+      .replace(/\s/g, ' ') // replace any whitespace with single space
+      .replace(/ +/g, ' '); // replace multiple spaces with a single space

-    if (!value || value.trim().length < 25) {
-      error = ERRORS.noPhrase;
+    const parts = recoveryPhrase.split(' ');
+    let recoveryPhraseError = null;
+
+    if (!recoveryPhrase || recoveryPhrase.length < 25 || parts.length < 8) {
+      recoveryPhraseError = ERRORS.noPhrase;
    }

    this.setState({
-      recoveryPhrase: value,
-      recoveryPhraseError: error,
-      isValidPhrase: !error
+      recoveryPhrase,
+      recoveryPhraseError,
+      isValidPhrase: !recoveryPhraseError
    }, this.updateParent);
  }

--- a/js/src/modals/DeleteAccount/deleteAccount.css
+++ b/js/src/modals/DeleteAccount/deleteAccount.css
@ -0,0 +1,54 @@
+/* Copyright 2015, 2016 Ethcore (UK) Ltd.
+/* This file is part of Parity.
+/*
+/* Parity is free software: you can redistribute it and/or modify
+/* it under the terms of the GNU General Public License as published by
+/* the Free Software Foundation, either version 3 of the License, or
+/* (at your option) any later version.
+/*
+/* Parity is distributed in the hope that it will be useful,
+/* but WITHOUT ANY WARRANTY; without even the implied warranty of
+/* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+/* GNU General Public License for more details.
+/*
+/* You should have received a copy of the GNU General Public License
+/* along with Parity.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+.body {
+  .hero {
+    padding-bottom: 1em;
+  }
+
+  .info {
+    display: inline-block;
+  }
+
+  .icon {
+    display: inline-block;
+  }
+
+  .nameinfo {
+    display: inline-block;
+    text-align: left;
+  }
+
+  .header {
+    text-transform: uppercase;
+    font-size: 1.25em;
+    padding-bottom: 0.25em;
+  }
+
+  .address {
+  }
+
+  .description {
+    padding-top: 1em;
+    font-size: 0.75em;
+    color: #aaa;
+  }
+
+  .password {
+    padding: 1em 5em;
+  }
+}
--- a/js/src/modals/DeleteAccount/deleteAccount.js
+++ b/js/src/modals/DeleteAccount/deleteAccount.js
@ -0,0 +1,125 @@
+// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// This file is part of Parity.
+
+// Parity is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+
+// Parity is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+
+// You should have received a copy of the GNU General Public License
+// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
+
+import React, { Component, PropTypes } from 'react';
+import { connect } from 'react-redux';
+import { bindActionCreators } from 'redux';
+
+import { ConfirmDialog, IdentityIcon, IdentityName, Input } from '../../ui';
+import { newError } from '../../redux/actions';
+
+import styles from './deleteAccount.css';
+
+class DeleteAccount extends Component {
+  static contextTypes = {
+    api: PropTypes.object.isRequired,
+    router: PropTypes.object
+  }
+
+  static propTypes = {
+    account: PropTypes.object.isRequired,
+    onClose: PropTypes.func.isRequired,
+    newError: PropTypes.func.isRequired
+  }
+
+  state = {
+    password: ''
+  }
+
+  render () {
+    const { account } = this.props;
+    const { password } = this.state;
+
+    return (
+      <ConfirmDialog
+        className={ styles.body }
+        title='confirm removal'
+        visible
+        onDeny={ this.closeDeleteDialog }
+        onConfirm={ this.onDeleteConfirmed }>
+        <div className={ styles.hero }>
+          Are you sure you want to permanently delete the following account?
+        </div>
+        <div className={ styles.info }>
+          <IdentityIcon
+            className={ styles.icon }
+            address={ account.address } />
+          <div className={ styles.nameinfo }>
+            <div className={ styles.header }>
+              <IdentityName address={ account.address } unknown />
+            </div>
+            <div className={ styles.address }>
+              { account.address }
+            </div>
+          </div>
+        </div>
+        <div className={ styles.description }>
+          { account.meta.description }
+        </div>
+        <div className={ styles.password }>
+          <Input
+            label='account password'
+            hint='provide the account password to confirm the account deletion'
+            type='password'
+            value={ password }
+            onChange={ this.onChangePassword } />
+        </div>
+      </ConfirmDialog>
+    );
+  }
+
+  onChangePassword = (event, password) => {
+    this.setState({ password });
+  }
+
+  onDeleteConfirmed = () => {
+    const { api, router } = this.context;
+    const { account, newError } = this.props;
+    const { password } = this.state;
+
+    api.parity
+      .killAccount(account.address, password)
+      .then((result) => {
+        if (result === true) {
+          router.push('/accounts');
+          this.closeDeleteDialog();
+        } else {
+          newError(new Error('Deletion failed.'));
+        }
+      })
+      .catch((error) => {
+        console.error('onDeleteConfirmed', error);
+        newError(new Error(`Deletion failed: ${error.message}`));
+      });
+  }
+
+  closeDeleteDialog = () => {
+    this.props.onClose();
+  }
+}
+
+function mapStateToProps (state) {
+  return {};
+}
+
+function mapDispatchToProps (dispatch) {
+  return bindActionCreators({ newError }, dispatch);
+}
+
+export default connect(
+  mapStateToProps,
+  mapDispatchToProps
+)(DeleteAccount);
--- a/js/src/modals/DeleteAccount/index.js
+++ b/js/src/modals/DeleteAccount/index.js
@ -0,0 +1,17 @@
+// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// This file is part of Parity.
+
+// Parity is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+
+// Parity is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+
+// You should have received a copy of the GNU General Public License
+// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
+
+export default from './deleteAccount';
--- a/js/src/modals/index.js
+++ b/js/src/modals/index.js
@ -17,6 +17,7 @@
 import AddAddress from './AddAddress';
 import AddContract from './AddContract';
 import CreateAccount from './CreateAccount';
+import DeleteAccount from './DeleteAccount';
 import DeployContract from './DeployContract';
 import EditMeta from './EditMeta';
 import ExecuteContract from './ExecuteContract';
@ -32,6 +33,7 @@ export {
  AddAddress,
  AddContract,
  CreateAccount,
+  DeleteAccount,
  DeployContract,
  EditMeta,
  ExecuteContract,
--- a/js/src/views/Account/account.js
+++ b/js/src/views/Account/account.js
@ -17,12 +17,13 @@
 import React, { Component, PropTypes } from 'react';
 import { connect } from 'react-redux';
 import { bindActionCreators } from 'redux';
+import ActionDelete from 'material-ui/svg-icons/action/delete';
 import ContentCreate from 'material-ui/svg-icons/content/create';
 import ContentSend from 'material-ui/svg-icons/content/send';
 import LockIcon from 'material-ui/svg-icons/action/lock';
 import VerifyIcon from 'material-ui/svg-icons/action/verified-user';

-import { EditMeta, Shapeshift, SMSVerification, Transfer, PasswordManager } from '../../modals';
+import { EditMeta, DeleteAccount, Shapeshift, SMSVerification, Transfer, PasswordManager } from '../../modals';
 import { Actionbar, Button, Page } from '../../ui';

 import shapeshiftBtn from '../../../assets/images/shapeshift-btn.png';
@ -50,6 +51,7 @@ class Account extends Component {
  propName = null

  state = {
+    showDeleteDialog: false,
    showEditDialog: false,
    showFundDialog: false,
    showVerificationDialog: false,
@ -62,8 +64,8 @@ class Account extends Component {
    const { api } = this.context;
    const { address } = this.props.params;

-    const store = new VerificationStore(api, address);
-    this.setState({ verificationStore: store });
+    const verificationStore = new VerificationStore(api, address);
+    this.setState({ verificationStore });
  }

  render () {
@ -79,6 +81,7 @@ class Account extends Component {

    return (
      <div className={ styles.account }>
+        { this.renderDeleteDialog(account) }
        { this.renderEditDialog(account) }
        { this.renderFundDialog() }
        { this.renderVerificationDialog() }
@ -131,7 +134,12 @@ class Account extends Component {
        key='passwordManager'
        icon={ <LockIcon /> }
        label='password'
-        onClick={ this.onPasswordClick } />
+        onClick={ this.onPasswordClick } />,
+      <Button
+        key='delete'
+        icon={ <ActionDelete /> }
+        label='delete account'
+        onClick={ this.onDeleteClick } />
    ];

    return (
@ -141,6 +149,20 @@ class Account extends Component {
    );
  }

+  renderDeleteDialog (account) {
+    const { showDeleteDialog } = this.state;
+
+    if (!showDeleteDialog) {
+      return null;
+    }
+
+    return (
+      <DeleteAccount
+        account={ account }
+        onClose={ this.onDeleteClose } />
+    );
+  }
+
  renderEditDialog (account) {
    const { showEditDialog } = this.state;

@ -228,6 +250,14 @@ class Account extends Component {
    );
  }

+  onDeleteClick = () => {
+    this.setState({ showDeleteDialog: true });
+  }
+
+  onDeleteClose = () => {
+    this.setState({ showDeleteDialog: false });
+  }
+
  onEditClick = () => {
    this.setState({
      showEditDialog: !this.state.showEditDialog
--- a/js/webpack.config.js
+++ b/js/webpack.config.js
@ -207,13 +207,13 @@ module.exports = {
        autoRewrite: true
      },
      {
-        context: '/api/*',
+        context: '/api',
        target: 'http://127.0.0.1:8080',
        changeOrigin: true,
        autoRewrite: true
      },
      {
-        context: '/app/*',
+        context: '/app',
        target: 'http://127.0.0.1:8080',
        changeOrigin: true,
        pathRewrite: {
@ -221,7 +221,7 @@ module.exports = {
        }
      },
      {
-        context: '/parity-utils/*',
+        context: '/parity-utils',
        target: 'http://127.0.0.1:3000',
        changeOrigin: true,
        pathRewrite: {
@ -229,8 +229,8 @@ module.exports = {
        }
      },
      {
-        context: '/rpc/*',
-        target: 'http://localhost:8080',
+        context: '/rpc',
+        target: 'http://127.0.0.1:8080',
        changeOrigin: true
      }
    ]
--- a/rpc/src/v1/impls/parity_accounts.rs
+++ b/rpc/src/v1/impls/parity_accounts.rs
@ -104,7 +104,7 @@ impl<C: 'static> ParityAccounts for ParityAccountsClient<C> where C: MiningBlock
 		let account: Address = account.into();

 		take_weak!(self.accounts)
-			.test_password(&account, password)
+			.test_password(&account, &password)
 			.map_err(|e| errors::account("Could not fetch account info.", e))
 	}

@ -117,6 +117,15 @@ impl<C: 'static> ParityAccounts for ParityAccountsClient<C> where C: MiningBlock
 			.map_err(|e| errors::account("Could not fetch account info.", e))
 	}

+	fn kill_account(&self, account: RpcH160, password: String) -> Result<bool, Error> {
+		try!(self.active());
+		let account: Address = account.into();
+		take_weak!(self.accounts)
+			.kill_account(&account, &password)
+			.map(|_| true)
+			.map_err(|e| errors::account("Could not delete account.", e))
+	}
+
 	fn set_account_name(&self, addr: RpcH160, name: String) -> Result<bool, Error> {
 		try!(self.active());
 		let store = take_weak!(self.accounts);
--- a/rpc/src/v1/tests/mocked/parity_accounts.rs
+++ b/rpc/src/v1/tests/mocked/parity_accounts.rs
@ -116,3 +116,25 @@ fn should_be_able_to_set_meta() {
 	assert_eq!(res, Some(response));
 }

+#[test]
+fn should_be_able_to_kill_account() {
+	let tester = setup();
+	tester.accounts.new_account("password").unwrap();
+	let accounts = tester.accounts.accounts().unwrap();
+	assert_eq!(accounts.len(), 1);
+	let address = accounts[0];
+
+	let request = format!(r#"{{"jsonrpc": "2.0", "method": "parity_killAccount", "params": ["0xf00baba2f00baba2f00baba2f00baba2f00baba2"], "id": 1}}"#);
+	let response = r#"{"jsonrpc":"2.0","error":{"code":-32602,"message":"Invalid params","data":null},"id":1}"#;
+	let res = tester.io.handle_request_sync(&request);
+	assert_eq!(res, Some(response.into()));
+
+	let request = format!(r#"{{"jsonrpc": "2.0", "method": "parity_killAccount", "params": ["0x{}", "password"], "id": 1}}"#, address.hex());
+	let response = r#"{"jsonrpc":"2.0","result":true,"id":1}"#;
+	let res = tester.io.handle_request_sync(&request);
+	assert_eq!(res, Some(response.into()));
+
+	let accounts = tester.accounts.accounts().unwrap();
+	assert_eq!(accounts.len(), 0);
+}
+
--- a/rpc/src/v1/traits/parity_accounts.rs
+++ b/rpc/src/v1/traits/parity_accounts.rs
@ -53,6 +53,11 @@ build_rpc_trait! {
 		#[rpc(name = "parity_changePassword")]
 		fn change_password(&self, H160, String, String) -> Result<bool, Error>;

+		/// Permanently deletes an account.
+		/// Arguments: `account`, `password`.
+		#[rpc(name = "parity_killAccount")]
+		fn kill_account(&self, H160, String) -> Result<bool, Error>;
+
 		/// Set an account's name.
 		#[rpc(name = "parity_setAccountName")]
 		fn set_account_name(&self, H160, String) -> Result<bool, Error>;