Merge branch 'master' into check-updates

.gitlab-ci.yml

@@ -8,7 +8,6 @@ variables:
   RUST_BACKTRACE: "1"
   RUSTFLAGS: ""
   CARGOFLAGS: ""
-  NIGHTLY: "nigtly"
 cache:
   key: "$CI_BUILD_STAGE/$CI_BUILD_REF_NAME"
   untracked: true
@@ -21,7 +20,7 @@ linux-stable:
     - stable
     - triggers
   script:
-    - cargo build --release $CARGOFLAGS
+    - cargo build -j $(nproc) --release $CARGOFLAGS
     - strip target/release/parity
     - md5sum target/release/parity > parity.md5
     - sh scripts/deb-build.sh amd64
@@ -53,7 +52,7 @@ linux-beta:
     - stable
     - triggers
   script:
-    - cargo build --release $CARGOFLAGS
+    - cargo build -j $(nproc) --release $CARGOFLAGS
     - strip target/release/parity
   tags:
     - rust
@@ -72,7 +71,7 @@ linux-nightly:
     - stable
     - triggers
   script:
-    - cargo build --release $CARGOFLAGS
+    - cargo build -j $(nproc) --release $CARGOFLAGS
     - strip target/release/parity
   tags:
     - rust
@@ -93,7 +92,7 @@ linux-centos:
   script:
     - export CXX="g++"
     - export CC="gcc"
-    - cargo build --release $CARGOFLAGS
+    - cargo build -j $(nproc) --release $CARGOFLAGS
     - strip target/release/parity
     - md5sum target/release/parity > parity.md5
     - aws configure set aws_access_key_id $s3_key
@@ -120,7 +119,7 @@ linux-i686:
   script:
     - export HOST_CC=gcc
     - export HOST_CXX=g++
-    - cargo build --target i686-unknown-linux-gnu --release $CARGOFLAGS
+    - cargo build -j $(nproc) --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
     - sh scripts/deb-build.sh i386
@@ -162,7 +161,7 @@ linux-armv7:
     - echo "[target.armv7-unknown-linux-gnueabihf]" >> .cargo/config
     - echo "linker= \"arm-linux-gnueabihf-gcc\"" >> .cargo/config
     - cat .cargo/config
-    - cargo build --target armv7-unknown-linux-gnueabihf --release $CARGOFLAGS
+    - cargo build -j $(nproc) --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
     - sh scripts/deb-build.sh armhf
@@ -204,7 +203,7 @@ linux-arm:
     - echo "[target.arm-unknown-linux-gnueabihf]" >> .cargo/config
     - echo "linker= \"arm-linux-gnueabihf-gcc\"" >> .cargo/config
     - cat .cargo/config
-    - cargo build --target arm-unknown-linux-gnueabihf --release $CARGOFLAGS
+    - cargo build -j $(nproc) --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
     - sh scripts/deb-build.sh armhf
@@ -232,9 +231,9 @@ linux-armv6:
   stage: build
   image: ethcore/rust-armv6:latest
   only:
-    - beta
+#    - beta
-    - tags
+#    - tags
-    - stable
+#    - stable
     - triggers
   script:
     - export CC=arm-linux-gnueabi-gcc
@@ -246,7 +245,7 @@ linux-armv6:
     - echo "[target.arm-unknown-linux-gnueabi]" >> .cargo/config
     - echo "linker= \"arm-linux-gnueabi-gcc\"" >> .cargo/config
     - cat .cargo/config
-    - cargo build --target arm-unknown-linux-gnueabi --release $CARGOFLAGS
+    - cargo build -j $(nproc) --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
     - aws configure set aws_access_key_id $s3_key
@@ -281,7 +280,7 @@ linux-aarch64:
     - echo "[target.aarch64-unknown-linux-gnu]" >> .cargo/config
     - echo "linker= \"aarch64-linux-gnu-gcc\"" >> .cargo/config
     - cat .cargo/config
-    - cargo build --target aarch64-unknown-linux-gnu --release $CARGOFLAGS
+    - cargo build -j $(nproc) --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
     - sh scripts/deb-build.sh arm64
@@ -305,41 +304,6 @@ 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:
@@ -348,8 +312,8 @@ darwin:
     - stable
     - triggers
   script:
-    - cargo build --release -p ethstore $CARGOFLAGS
+    - cargo build -j 8 --release -p ethstore #$CARGOFLAGS
-    - cargo build --release $CARGOFLAGS
+    - cargo build -j 8 --release #$CARGOFLAGS
     - rm -rf parity.md5
     - md5sum target/release/parity > parity.md5
     - packagesbuild -v mac/Parity.pkgproj
@@ -386,7 +350,7 @@ windows:
     - set RUST_BACKTRACE=1
     - set RUSTFLAGS=%RUSTFLAGS% 
     - rustup default stable-x86_64-pc-windows-msvc
-    - cargo build --release %CARGOFLAGS%
+    - cargo build -j 8 --release #%CARGOFLAGS%
     - curl -sL --url "https://github.com/ethcore/win-build/raw/master/SimpleFC.dll" -o nsis\SimpleFC.dll
     - curl -sL --url "https://github.com/ethcore/win-build/raw/master/vc_redist.x64.exe" -o nsis\vc_redist.x64.exe
     - signtool sign /f %keyfile% /p %certpass% target\release\parity.exe
@@ -449,7 +413,7 @@ test-windows:
     - git submodule update --init --recursive
   script:
     - set RUST_BACKTRACE=1
-    - cargo test --features json-tests -p rlp -p ethash -p ethcore -p ethcore-bigint -p ethcore-dapps -p ethcore-rpc -p ethcore-signer -p ethcore-util -p ethcore-network -p ethcore-io -p ethkey -p ethstore -p ethsync -p ethcore-ipc -p ethcore-ipc-tests -p ethcore-ipc-nano -p parity %CARGOFLAGS% --verbose --release
+    - cargo -j 8 test --features json-tests -p rlp -p ethash -p ethcore -p ethcore-bigint -p ethcore-dapps -p ethcore-rpc -p ethcore-signer -p ethcore-util -p ethcore-network -p ethcore-io -p ethkey -p ethstore -p ethsync -p ethcore-ipc -p ethcore-ipc-tests -p ethcore-ipc-nano -p parity %CARGOFLAGS% --verbose --release
   tags:
     - rust-windows
   allow_failure: true

Cargo.lock

@@ -3,7 +3,7 @@ name = "parity"
 version = "1.5.0"
 dependencies = [
  "ansi_term 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "clippy 0.0.96 (registry+https://github.com/rust-lang/crates.io-index)",
+ "clippy 0.0.103 (registry+https://github.com/rust-lang/crates.io-index)",
  "ctrlc 1.1.1 (git+https://github.com/ethcore/rust-ctrlc.git)",
  "daemonize 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
  "docopt 0.6.80 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -27,7 +27,6 @@ dependencies = [
  "fdlimit 0.1.0",
  "hyper 0.9.10 (registry+https://github.com/rust-lang/crates.io-index)",
  "isatty 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "json-ipc-server 0.2.4 (git+https://github.com/ethcore/json-ipc-server.git)",
  "lazy_static 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "log 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)",
  "num_cpus 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -146,15 +145,15 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 
 [[package]]
 name = "clippy"
-version = "0.0.96"
+version = "0.0.103"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "clippy_lints 0.0.96 (registry+https://github.com/rust-lang/crates.io-index)",
+ "clippy_lints 0.0.103 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
 name = "clippy_lints"
-version = "0.0.96"
+version = "0.0.103"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
  "matches 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -175,6 +174,15 @@ dependencies = [
  "url 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
+[[package]]
+name = "cookie"
+version = "0.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "time 0.1.35 (registry+https://github.com/rust-lang/crates.io-index)",
+ "url 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
 [[package]]
 name = "crossbeam"
 version = "0.2.9"
@@ -224,7 +232,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 [[package]]
 name = "elastic-array"
 version = "0.6.0"
-source = "git+https://github.com/ethcore/elastic-array#70e4012e691b732c7c4cb04e9232799e6aa268bc"
+source = "git+https://github.com/ethcore/elastic-array#346f1ba5982576dab9d0b8fa178b50e1db0a21cd"
 dependencies = [
  "heapsize 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
@@ -280,7 +288,7 @@ dependencies = [
  "bit-set 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "bloomchain 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "byteorder 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)",
- "clippy 0.0.96 (registry+https://github.com/rust-lang/crates.io-index)",
+ "clippy 0.0.103 (registry+https://github.com/rust-lang/crates.io-index)",
  "crossbeam 0.2.9 (registry+https://github.com/rust-lang/crates.io-index)",
  "env_logger 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)",
  "ethabi 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -298,7 +306,7 @@ dependencies = [
  "ethstore 0.1.0",
  "evmjit 1.4.0",
  "heapsize 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)",
- "hyper 0.9.4 (git+https://github.com/ethcore/hyper)",
+ "hyper 0.10.0-a.0 (git+https://github.com/ethcore/hyper)",
  "lazy_static 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "linked-hash-map 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "log 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -335,16 +343,16 @@ dependencies = [
 name = "ethcore-dapps"
 version = "1.5.0"
 dependencies = [
- "clippy 0.0.96 (registry+https://github.com/rust-lang/crates.io-index)",
+ "clippy 0.0.103 (registry+https://github.com/rust-lang/crates.io-index)",
  "env_logger 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)",
  "ethcore-devtools 1.4.0",
  "ethcore-hash-fetch 1.5.0",
  "ethcore-rpc 1.5.0",
  "ethcore-util 1.5.0",
  "fetch 0.1.0",
- "hyper 0.9.4 (git+https://github.com/ethcore/hyper)",
+ "hyper 0.10.0-a.0 (git+https://github.com/ethcore/hyper)",
- "jsonrpc-core 3.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "jsonrpc-core 4.0.0 (git+https://github.com/ethcore/jsonrpc.git)",
- "jsonrpc-http-server 6.1.1 (git+https://github.com/ethcore/jsonrpc-http-server.git)",
+ "jsonrpc-http-server 6.1.1 (git+https://github.com/ethcore/jsonrpc.git)",
  "linked-hash-map 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "log 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)",
  "mime 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -492,7 +500,7 @@ dependencies = [
 name = "ethcore-rpc"
 version = "1.5.0"
 dependencies = [
- "clippy 0.0.96 (registry+https://github.com/rust-lang/crates.io-index)",
+ "clippy 0.0.103 (registry+https://github.com/rust-lang/crates.io-index)",
  "ethash 1.4.0",
  "ethcore 1.5.0",
  "ethcore-devtools 1.4.0",
@@ -505,9 +513,9 @@ dependencies = [
  "ethstore 0.1.0",
  "ethsync 1.5.0",
  "fetch 0.1.0",
- "json-ipc-server 0.2.4 (git+https://github.com/ethcore/json-ipc-server.git)",
+ "jsonrpc-core 4.0.0 (git+https://github.com/ethcore/jsonrpc.git)",
- "jsonrpc-core 3.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "jsonrpc-http-server 6.1.1 (git+https://github.com/ethcore/jsonrpc.git)",
- "jsonrpc-http-server 6.1.1 (git+https://github.com/ethcore/jsonrpc-http-server.git)",
+ "jsonrpc-ipc-server 0.2.4 (git+https://github.com/ethcore/jsonrpc.git)",
  "log 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)",
  "rlp 0.1.0",
  "rustc-serialize 0.3.19 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -522,13 +530,13 @@ dependencies = [
 name = "ethcore-signer"
 version = "1.5.0"
 dependencies = [
- "clippy 0.0.96 (registry+https://github.com/rust-lang/crates.io-index)",
+ "clippy 0.0.103 (registry+https://github.com/rust-lang/crates.io-index)",
  "env_logger 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)",
  "ethcore-devtools 1.4.0",
  "ethcore-io 1.5.0",
  "ethcore-rpc 1.5.0",
  "ethcore-util 1.5.0",
- "jsonrpc-core 3.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "jsonrpc-core 4.0.0 (git+https://github.com/ethcore/jsonrpc.git)",
  "log 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)",
  "parity-dapps-glue 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "parity-ui 1.4.0",
@@ -547,8 +555,8 @@ dependencies = [
  "ethcore-ipc-codegen 1.4.0",
  "ethcore-ipc-nano 1.4.0",
  "ethcore-util 1.5.0",
- "json-tcp-server 0.1.0 (git+https://github.com/ethcore/json-tcp-server)",
+ "jsonrpc-core 4.0.0 (git+https://github.com/ethcore/jsonrpc.git)",
- "jsonrpc-core 3.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "jsonrpc-tcp-server 0.1.0 (git+https://github.com/ethcore/jsonrpc.git)",
  "lazy_static 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "log 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)",
  "mio 0.5.1 (git+https://github.com/ethcore/mio?branch=v0.5.x)",
@@ -561,7 +569,7 @@ version = "1.5.0"
 dependencies = [
  "ansi_term 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)",
  "arrayvec 0.3.16 (registry+https://github.com/rust-lang/crates.io-index)",
- "clippy 0.0.96 (registry+https://github.com/rust-lang/crates.io-index)",
+ "clippy 0.0.103 (registry+https://github.com/rust-lang/crates.io-index)",
  "elastic-array 0.6.0 (git+https://github.com/ethcore/elastic-array)",
  "env_logger 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)",
  "eth-secp256k1 0.5.4 (git+https://github.com/ethcore/rust-secp256k1)",
@@ -652,7 +660,7 @@ dependencies = [
 name = "ethsync"
 version = "1.5.0"
 dependencies = [
- "clippy 0.0.96 (registry+https://github.com/rust-lang/crates.io-index)",
+ "clippy 0.0.103 (registry+https://github.com/rust-lang/crates.io-index)",
  "env_logger 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)",
  "ethcore 1.5.0",
  "ethcore-io 1.5.0",
@@ -689,7 +697,7 @@ name = "fetch"
 version = "0.1.0"
 dependencies = [
  "https-fetch 0.1.0",
- "hyper 0.9.4 (git+https://github.com/ethcore/hyper)",
+ "hyper 0.10.0-a.0 (git+https://github.com/ethcore/hyper)",
  "log 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)",
  "rand 0.3.14 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
@@ -751,27 +759,6 @@ dependencies = [
  "rustls 0.1.2 (git+https://github.com/ctz/rustls)",
 ]
 
-[[package]]
-name = "hyper"
-version = "0.9.4"
-source = "git+https://github.com/ethcore/hyper#9e346c1d4bc30cd4142dea9d8a0b117d30858ca4"
-dependencies = [
- "cookie 0.2.4 (registry+https://github.com/rust-lang/crates.io-index)",
- "httparse 1.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "language-tags 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "log 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)",
- "mime 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "rotor 0.6.3 (git+https://github.com/ethcore/rotor)",
- "rustc-serialize 0.3.19 (registry+https://github.com/rust-lang/crates.io-index)",
- "spmc 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "time 0.1.35 (registry+https://github.com/rust-lang/crates.io-index)",
- "traitobject 0.0.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "typeable 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "unicase 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "url 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "vecio 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
 [[package]]
 name = "hyper"
 version = "0.9.10"
@@ -792,6 +779,25 @@ dependencies = [
  "url 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
+[[package]]
+name = "hyper"
+version = "0.10.0-a.0"
+source = "git+https://github.com/ethcore/hyper#7d4f7fa0baddcb2b0c523f7c05855d67de94fe88"
+dependencies = [
+ "cookie 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "httparse 1.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "language-tags 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "log 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)",
+ "mime 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "rotor 0.6.3 (git+https://github.com/ethcore/rotor)",
+ "rustc-serialize 0.3.19 (registry+https://github.com/rust-lang/crates.io-index)",
+ "spmc 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "time 0.1.35 (registry+https://github.com/rust-lang/crates.io-index)",
+ "unicase 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "url 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "vecio 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
 [[package]]
 name = "idna"
 version = "0.1.0"
@@ -834,39 +840,10 @@ name = "itoa"
 version = "0.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 
-[[package]]
-name = "json-ipc-server"
-version = "0.2.4"
-source = "git+https://github.com/ethcore/json-ipc-server.git#4642cd03ec1d23db89df80d22d5a88e7364ab885"
-dependencies = [
- "bytes 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "env_logger 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)",
- "jsonrpc-core 3.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "lazy_static 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "log 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)",
- "mio 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "miow 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)",
- "slab 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
-[[package]]
-name = "json-tcp-server"
-version = "0.1.0"
-source = "git+https://github.com/ethcore/json-tcp-server#c2858522274ae56042472bb5d22845a1b85e5338"
-dependencies = [
- "bytes 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "env_logger 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)",
- "jsonrpc-core 3.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "lazy_static 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "log 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)",
- "mio 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "slab 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
 [[package]]
 name = "jsonrpc-core"
-version = "3.0.2"
+version = "4.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
+source = "git+https://github.com/ethcore/jsonrpc.git#20c7e55b84d7fd62732f062dc3058e1b71133e4a"
 dependencies = [
  "log 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)",
  "parking_lot 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -878,14 +855,44 @@ dependencies = [
 [[package]]
 name = "jsonrpc-http-server"
 version = "6.1.1"
-source = "git+https://github.com/ethcore/jsonrpc-http-server.git#cd6d4cb37d672cc3057aecd0692876f9e85f3ba5"
+source = "git+https://github.com/ethcore/jsonrpc.git#20c7e55b84d7fd62732f062dc3058e1b71133e4a"
 dependencies = [
- "hyper 0.9.4 (git+https://github.com/ethcore/hyper)",
+ "hyper 0.10.0-a.0 (git+https://github.com/ethcore/hyper)",
- "jsonrpc-core 3.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "jsonrpc-core 4.0.0 (git+https://github.com/ethcore/jsonrpc.git)",
  "log 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)",
  "unicase 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
+[[package]]
+name = "jsonrpc-ipc-server"
+version = "0.2.4"
+source = "git+https://github.com/ethcore/jsonrpc.git#20c7e55b84d7fd62732f062dc3058e1b71133e4a"
+dependencies = [
+ "bytes 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "env_logger 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)",
+ "jsonrpc-core 4.0.0 (git+https://github.com/ethcore/jsonrpc.git)",
+ "lazy_static 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "log 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)",
+ "mio 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "miow 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)",
+ "slab 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "jsonrpc-tcp-server"
+version = "0.1.0"
+source = "git+https://github.com/ethcore/jsonrpc.git#20c7e55b84d7fd62732f062dc3058e1b71133e4a"
+dependencies = [
+ "bytes 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "env_logger 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)",
+ "jsonrpc-core 4.0.0 (git+https://github.com/ethcore/jsonrpc.git)",
+ "lazy_static 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "log 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)",
+ "mio 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde_json 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "slab 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
 [[package]]
 name = "kernel32-sys"
 version = "0.2.2"
@@ -1266,7 +1273,7 @@ dependencies = [
 [[package]]
 name = "parity-ui-precompiled"
 version = "1.4.0"
-source = "git+https://github.com/ethcore/js-precompiled.git#7cb42b0c636f76eb478c9270a1e507ac3c3ba434"
+source = "git+https://github.com/ethcore/js-precompiled.git#55a2cc4707bf9f8bacde3c3f68e32b4a5ac777cf"
 dependencies = [
  "parity-dapps-glue 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
@@ -1506,11 +1513,12 @@ dependencies = [
 [[package]]
 name = "rotor"
 version = "0.6.3"
-source = "git+https://github.com/ethcore/rotor#e63d45137b2eb66d1e085a7c6321a5db8b187576"
+source = "git+https://github.com/ethcore/rotor#c1a2dd0046c5ea2517a5b637fca8ee2e77021e82"
 dependencies = [
  "log 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)",
- "mio 0.5.1 (git+https://github.com/ethcore/mio?branch=v0.5.x)",
+ "mio 0.6.1 (git+https://github.com/ethcore/mio)",
  "quick-error 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "slab 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "void 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
@@ -2025,9 +2033,10 @@ dependencies = [
 "checksum bytes 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "c129aff112dcc562970abb69e2508b40850dd24c274761bb50fb8a0067ba6c27"
 "checksum bytes 0.4.0-dev (git+https://github.com/carllerche/bytes)" = "<none>"
 "checksum cfg-if 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "de1e760d7b6535af4241fca8bd8adf68e2e7edacc6b29f5d399050c5e48cf88c"
-"checksum clippy 0.0.96 (registry+https://github.com/rust-lang/crates.io-index)" = "6eacf01b0aad84a0817703498f72d252df7c0faf6a5b86d0be4265f1829e459f"
+"checksum clippy 0.0.103 (registry+https://github.com/rust-lang/crates.io-index)" = "5b4fabf979ddf6419a313c1c0ada4a5b95cfd2049c56e8418d622d27b4b6ff32"
-"checksum clippy_lints 0.0.96 (registry+https://github.com/rust-lang/crates.io-index)" = "a49960c9aab544ce86b004dcb61620e8b898fea5fc0f697a028f460f48221ed6"
+"checksum clippy_lints 0.0.103 (registry+https://github.com/rust-lang/crates.io-index)" = "ce96ec05bfe018a0d5d43da115e54850ea2217981ff0f2e462780ab9d594651a"
 "checksum cookie 0.2.4 (registry+https://github.com/rust-lang/crates.io-index)" = "90266f45846f14a1e986c77d1e9c2626b8c342ed806fe60241ec38cc8697b245"
+"checksum cookie 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "d53b80dde876f47f03cda35303e368a79b91c70b0d65ecba5fd5280944a08591"
 "checksum crossbeam 0.2.9 (registry+https://github.com/rust-lang/crates.io-index)" = "fb974f835e90390c5f9dfac00f05b06dc117299f5ea4e85fbc7bb443af4911cc"
 "checksum ctrlc 1.1.1 (git+https://github.com/ethcore/rust-ctrlc.git)" = "<none>"
 "checksum daemonize 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "271ec51b7e0bee92f0d04601422c73eb76ececf197026711c97ad25038a010cf"
@@ -2045,17 +2054,17 @@ dependencies = [
 "checksum heapsize 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)" = "abb306abb8d398e053cfb1b3e7b72c2f580be048b85745c52652954f8ad1439c"
 "checksum hpack 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "3d2da7d3a34cf6406d9d700111b8eafafe9a251de41ae71d8052748259343b58"
 "checksum httparse 1.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "46534074dbb80b070d60a5cb8ecadd8963a00a438ae1a95268850a7ef73b67ae"
+"checksum hyper 0.10.0-a.0 (git+https://github.com/ethcore/hyper)" = "<none>"
 "checksum hyper 0.9.10 (registry+https://github.com/rust-lang/crates.io-index)" = "eb27e8a3e8f17ac43ffa41bbda9cf5ad3f9f13ef66fa4873409d4902310275f7"
-"checksum hyper 0.9.4 (git+https://github.com/ethcore/hyper)" = "<none>"
 "checksum idna 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "1053236e00ce4f668aeca4a769a09b3bf5a682d802abd6f3cb39374f6b162c11"
 "checksum igd 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)" = "c8c12b1795b8b168f577c45fa10379b3814dcb11b7ab702406001f0d63f40484"
 "checksum isatty 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "7408a548dc0e406b7912d9f84c261cc533c1866e047644a811c133c56041ac0c"
 "checksum itertools 0.4.13 (registry+https://github.com/rust-lang/crates.io-index)" = "086e1fa5fe48840b1cfdef3a20c7e3115599f8d5c4c87ef32a794a7cdd184d76"
 "checksum itoa 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "ae3088ea4baeceb0284ee9eea42f591226e6beaecf65373e41b38d95a1b8e7a1"
-"checksum json-ipc-server 0.2.4 (git+https://github.com/ethcore/json-ipc-server.git)" = "<none>"
+"checksum jsonrpc-core 4.0.0 (git+https://github.com/ethcore/jsonrpc.git)" = "<none>"
-"checksum json-tcp-server 0.1.0 (git+https://github.com/ethcore/json-tcp-server)" = "<none>"
+"checksum jsonrpc-http-server 6.1.1 (git+https://github.com/ethcore/jsonrpc.git)" = "<none>"
-"checksum jsonrpc-core 3.0.2 (registry+https://github.com/rust-lang/crates.io-index)" = "3c5094610b07f28f3edaf3947b732dadb31dbba4941d4d0c1c7a8350208f4414"
+"checksum jsonrpc-ipc-server 0.2.4 (git+https://github.com/ethcore/jsonrpc.git)" = "<none>"
-"checksum jsonrpc-http-server 6.1.1 (git+https://github.com/ethcore/jsonrpc-http-server.git)" = "<none>"
+"checksum jsonrpc-tcp-server 0.1.0 (git+https://github.com/ethcore/jsonrpc.git)" = "<none>"
 "checksum kernel32-sys 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "7507624b29483431c0ba2d82aece8ca6cdba9382bff4ddd0f7490560c056098d"
 "checksum language-tags 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "a91d884b6667cd606bb5a69aa0c99ba811a115fc68915e7056ec08a46e93199a"
 "checksum lazy_static 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "49247ec2a285bb3dcb23cbd9c35193c025e7251bfce77c1d5da97e6362dffe7f"

Cargo.toml

@@ -30,7 +30,6 @@ serde = "0.8.0"
 serde_json = "0.8.0"
 hyper = { version = "0.9", default-features = false }
 ctrlc = { git = "https://github.com/ethcore/rust-ctrlc.git" }
-json-ipc-server = { git = "https://github.com/ethcore/json-ipc-server.git" }
 fdlimit = { path = "util/fdlimit" }
 ethcore = { path = "ethcore" }
 ethcore-util = { path = "util" }
@@ -47,7 +46,7 @@ ethcore-hash-fetch = { path = "ethcore/hash-fetch" }
 rlp = { path = "util/rlp" }
 ethcore-stratum = { path = "stratum" }
 ethcore-dapps = { path = "dapps", optional = true }
-clippy = { version = "0.0.96", optional = true}
+clippy = { version = "0.0.103", optional = true}
 
 [target.'cfg(windows)'.dependencies]
 winapi = "0.2"

dapps/Cargo.toml

@@ -12,8 +12,8 @@ build = "build.rs"
 rand = "0.3.14"
 log = "0.3"
 env_logger = "0.3"
-jsonrpc-core = "3.0"
+jsonrpc-core = { git = "https://github.com/ethcore/jsonrpc.git" }
-jsonrpc-http-server = { git = "https://github.com/ethcore/jsonrpc-http-server.git" }
+jsonrpc-http-server = { git = "https://github.com/ethcore/jsonrpc.git" }
 hyper = { default-features = false, git = "https://github.com/ethcore/hyper" }
 unicase = "1.3"
 url = "1.0"
@@ -34,7 +34,7 @@ ethcore-hash-fetch = { path = "../ethcore/hash-fetch" }
 fetch = { path = "../util/fetch" }
 parity-ui = { path = "./ui" }
 
-clippy = { version = "0.0.96", optional = true}
+clippy = { version = "0.0.103", optional = true}
 
 [build-dependencies]
 serde_codegen = { version = "0.8", optional = true }

dapps/src/api/types.rs.in

@@ -17,6 +17,7 @@
 use endpoint::EndpointInfo;
 
 #[derive(Debug, PartialEq, Clone, Serialize, Deserialize)]
+#[serde(deny_unknown_fields)]
 pub struct App {
 	pub id: String,
 	pub name: String,
@@ -54,6 +55,7 @@ impl Into<EndpointInfo> for App {
 }
 
 #[derive(Debug, PartialEq, Serialize, Deserialize)]
+#[serde(deny_unknown_fields)]
 pub struct ApiError {
 	pub code: String,
 	pub title: String,

dapps/src/handlers/content.rs

@@ -16,7 +16,6 @@
 
 //! Simple Content Handler
 
-use std::io::Write;
 use hyper::{header, server, Decoder, Encoder, Next};
 use hyper::net::HttpStream;
 use hyper::mime::Mime;

dapps/src/handlers/mod.rs

@@ -58,7 +58,7 @@ pub fn extract_url(req: &server::Request<net::HttpStream>) -> Option<Url> {
 				_ => None,
 			}
 		},
-		uri::RequestUri::AbsolutePath(ref path) => {
+		uri::RequestUri::AbsolutePath { ref path, .. } => {
 			// Attempt to prepend the Host header (mandatory in HTTP/1.1)
 			let url_string = match req.headers().get::<header::Host>() {
 				Some(ref host) => {

dapps/src/lib.rs

@@ -266,7 +266,11 @@ impl Server {
 	#[cfg(test)]
 	/// Returns address that this server is bound to.
 	pub fn addr(&self) -> &SocketAddr {
-		self.server.as_ref().expect("server is always Some at the start; it's consumed only when object is dropped; qed").addr()
+		self.server.as_ref()
+			.expect("server is always Some at the start; it's consumed only when object is dropped; qed")
+			.addrs()
+			.first()
+			.expect("You cannot start the server without binding to at least one address; qed")
 	}
 }
 

dapps/src/page/handler.rs

@@ -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/>.
 
-use std::io::Write;
 use time::{self, Duration};
 
 use hyper::header;
@@ -126,7 +125,7 @@ impl<T: Dapp> PageHandler<T> {
 impl<T: Dapp> server::Handler<HttpStream> for PageHandler<T> {
 	fn on_request(&mut self, req: server::Request<HttpStream>) -> Next {
 		self.file = match *req.uri() {
-			RequestUri::AbsolutePath(ref path) => {
+			RequestUri::AbsolutePath { ref path, .. } => {
 				self.app.file(&self.extract_path(path))
 			},
 			RequestUri::AbsoluteUri(ref url) => {

dapps/src/rpc.rs

@@ -16,13 +16,14 @@
 
 use std::sync::{Arc, Mutex};
 use hyper;
-use jsonrpc_core::IoHandler;
+
-use jsonrpc_http_server::{ServerHandler, PanicHandler, AccessControlAllowOrigin};
+use jsonrpc_core::{IoHandler, ResponseHandler, Request, Response};
+use jsonrpc_http_server::{ServerHandler, PanicHandler, AccessControlAllowOrigin, RpcHandler};
 use endpoint::{Endpoint, EndpointPath, Handler};
 
 pub fn rpc(handler: Arc<IoHandler>, panic_handler: Arc<Mutex<Option<Box<Fn() -> () + Send>>>>) -> Box<Endpoint> {
 	Box::new(RpcEndpoint {
-		handler: handler,
+		handler: Arc::new(RpcMiddleware::new(handler)),
 		panic_handler: panic_handler,
 		cors_domain: None,
 		// NOTE [ToDr] We don't need to do any hosts validation here. It's already done in router.
@@ -31,7 +32,7 @@ pub fn rpc(handler: Arc<IoHandler>, panic_handler: Arc<Mutex<Option<Box<Fn() ->
 }
 
 struct RpcEndpoint {
-	handler: Arc<IoHandler>,
+	handler: Arc<RpcMiddleware>,
 	panic_handler: Arc<Mutex<Option<Box<Fn() -> () + Send>>>>,
 	cors_domain: Option<Vec<AccessControlAllowOrigin>>,
 	allowed_hosts: Option<Vec<String>>,
@@ -49,3 +50,86 @@ impl Endpoint for RpcEndpoint {
 		))
 	}
 }
+
+const MIDDLEWARE_METHOD: &'static str = "eth_accounts";
+
+struct RpcMiddleware {
+	handler: Arc<IoHandler>,
+}
+
+impl RpcMiddleware {
+	fn new(handler: Arc<IoHandler>) -> Self {
+		RpcMiddleware {
+			handler: handler,
+		}
+	}
+
+	/// Appends additional parameter for specific calls.
+	fn augment_request(&self, request: &mut Request, meta: Option<Meta>) {
+		use jsonrpc_core::{Call, Params, to_value};
+
+		fn augment_call(call: &mut Call, meta: Option<&Meta>) {
+			match (call, meta) {
+				(&mut Call::MethodCall(ref mut method_call), Some(meta)) if &method_call.method == MIDDLEWARE_METHOD => {
+					let session = to_value(&meta.app_id);
+
+					let params = match method_call.params {
+						Some(Params::Array(ref vec)) if vec.len() == 0 => Some(Params::Array(vec![session])),
+						// invalid params otherwise
+						_ => None,
+					};
+
+					method_call.params = params;
+				},
+				_ => {}
+			}
+		}
+
+		match *request {
+			Request::Single(ref mut call) => augment_call(call, meta.as_ref()),
+			Request::Batch(ref mut vec) => {
+				for mut call in vec {
+					augment_call(call, meta.as_ref())
+				}
+			},
+		}
+	}
+}
+
+#[derive(Debug)]
+struct Meta {
+	app_id: String,
+}
+
+impl RpcHandler for RpcMiddleware {
+	type Metadata = Meta;
+
+	fn read_metadata(&self, request: &hyper::server::Request<hyper::net::HttpStream>) -> Option<Self::Metadata> {
+		request.headers().get::<hyper::header::Referer>()
+			.and_then(|referer| hyper::Url::parse(referer).ok())
+			.and_then(|url| {
+				url.path_segments()
+					.and_then(|mut split| split.next())
+					.map(|app_id| Meta {
+						app_id: app_id.to_owned(),
+					})
+			})
+	}
+
+	fn handle_request<H>(&self, request_str: &str, response_handler: H, meta: Option<Self::Metadata>) where
+		H: ResponseHandler<Option<String>, Option<String>> + 'static
+	{
+		let handler = IoHandler::convert_handler(response_handler);
+		let request = IoHandler::read_request(request_str);
+		trace!(target: "rpc", "Request metadata: {:?}", meta);
+
+		match request {
+			Ok(mut request) => {
+				self.augment_request(&mut request, meta);
+				self.handler.request_handler().handle_request(request, handler, None)
+			},
+			Err(error) => handler.send(Some(Response::from(error))),
+		}
+	}
+}
+

db/Cargo.toml

@@ -11,7 +11,7 @@ build = "build.rs"
 ethcore-ipc-codegen = { path = "../ipc/codegen" }
 
 [dependencies]
-clippy = { version = "0.0.96", optional = true}
+clippy = { version = "0.0.103", optional = true}
 ethcore-devtools = { path = "../devtools" }
 ethcore-ipc = { path = "../ipc/rpc" }
 rocksdb = { git = "https://github.com/ethcore/rust-rocksdb" }

docker/ubuntu-stable/Dockerfile

@@ -3,6 +3,7 @@ WORKDIR /build
 # install tools and dependencies
 RUN apt-get update && \
         apt-get install -y \
+        build-essential \
         g++ \
         curl \
         git \

docker/ubuntu/Dockerfile

@@ -4,6 +4,7 @@ WORKDIR /build
 RUN apt-get update && \
         apt-get install -y \
         g++ \
+        build-essential \
         curl \
         git \
         file \

ethcore/Cargo.toml

@@ -29,7 +29,7 @@ byteorder = "0.5"
 transient-hashmap = "0.1"
 linked-hash-map = "0.3.0"
 evmjit = { path = "../evmjit", optional = true }
-clippy = { version = "0.0.96", optional = true}
+clippy = { version = "0.0.103", optional = true}
 ethash = { path = "../ethash" }
 ethcore-util = { path = "../util" }
 ethcore-io = { path = "../util/io" }

ethcore/res/ethereum/tests

@@ -1 +1 @@
-Subproject commit d509c75936ec6cbba683ee1916aa0bca436bc376
+Subproject commit e8f4624b7f1a15c63674eecf577c7ab76c3b16be

ethcore/src/account_db.rs

@@ -121,10 +121,6 @@ impl<'db> HashDB for AccountDB<'db>{
 	fn remove(&mut self, _key: &H256) {
 		unimplemented!()
 	}
-
-	fn get_aux(&self, hash: &[u8]) -> Option<DBValue> {
-		self.db.get_aux(hash)
-	}
 }
 
 /// DB backend wrapper for Account trie
@@ -197,18 +193,6 @@ impl<'db> HashDB for AccountDBMut<'db>{
 		let key = combine_key(&self.address_hash, key);
 		self.db.remove(&key)
 	}
-
-	fn insert_aux(&mut self, hash: Vec<u8>, value: Vec<u8>) {
-		self.db.insert_aux(hash, value);
-	}
-
-	fn get_aux(&self, hash: &[u8]) -> Option<DBValue> {
-		self.db.get_aux(hash)
-	}
-
-	fn remove_aux(&mut self, hash: &[u8]) {
-		self.db.remove_aux(hash);
-	}
 }
 
 struct Wrapping<'db>(&'db HashDB);

ethcore/src/account_provider/mod.rs

@@ -16,9 +16,12 @@
 
 //! Account management.
 
-use std::{fs, fmt};
+mod stores;
+
+use self::stores::{AddressBook, DappsSettingsStore};
+
+use std::fmt;
 use std::collections::HashMap;
-use std::path::PathBuf;
 use std::time::{Instant, Duration};
 use util::{Mutex, RwLock};
 use ethstore::{SecretStore, Error as SSError, SafeAccount, EthStore};
@@ -91,84 +94,16 @@ impl KeyDirectory for NullDir {
 	}
 }
 
-/// Disk-backed map from Address to String. Uses JSON.
+/// Dapp identifier
-struct AddressBook {
+pub type DappId = String;
-	path: PathBuf,
-	cache: HashMap<Address, AccountMeta>,
-	transient: bool,
-}
-
-impl AddressBook {
-	pub fn new(path: String) -> Self {
-		trace!(target: "addressbook", "new({})", path);
-		let mut path: PathBuf = path.into();
-		path.push("address_book.json");
-		trace!(target: "addressbook", "path={:?}", path);
-		let mut r = AddressBook {
-			path: path,
-			cache: HashMap::new(),
-			transient: false,
-		};
-		r.revert();
-		r
-	}
-
-	pub fn transient() -> Self {
-		let mut book = AddressBook::new(Default::default());
-		book.transient = true;
-		book
-	}
-
-	pub fn get(&self) -> HashMap<Address, AccountMeta> {
-		self.cache.clone()
-	}
-
-	pub fn set_name(&mut self, a: Address, name: String) {
-		let mut x = self.cache.get(&a)
-			.cloned()
-			.unwrap_or_else(|| AccountMeta {name: Default::default(), meta: "{}".to_owned(), uuid: None});
-		x.name = name;
-		self.cache.insert(a, x);
-		self.save();
-	}
-
-	pub fn set_meta(&mut self, a: Address, meta: String) {
-		let mut x = self.cache.get(&a)
-			.cloned()
-			.unwrap_or_else(|| AccountMeta {name: "Anonymous".to_owned(), meta: Default::default(), uuid: None});
-		x.meta = meta;
-		self.cache.insert(a, x);
-		self.save();
-	}
-
-	fn revert(&mut self) {
-		if self.transient { return; }
-		trace!(target: "addressbook", "revert");
-		let _ = fs::File::open(self.path.clone())
-			.map_err(|e| trace!(target: "addressbook", "Couldn't open address book: {}", e))
-			.and_then(|f| AccountMeta::read_address_map(&f)
-				.map_err(|e| warn!(target: "addressbook", "Couldn't read address book: {}", e))
-				.and_then(|m| { self.cache = m; Ok(()) })
-			);
-	}
-
-	fn save(&mut self) {
-		if self.transient { return; }
-		trace!(target: "addressbook", "save");
-		let _ = fs::File::create(self.path.clone())
-			.map_err(|e| warn!(target: "addressbook", "Couldn't open address book for writing: {}", e))
-			.and_then(|mut f| AccountMeta::write_address_map(&self.cache, &mut f)
-				.map_err(|e| warn!(target: "addressbook", "Couldn't write to address book: {}", e))
-			);
-	}
-}
 
 /// Account management.
 /// Responsible for unlocking accounts.
 pub struct AccountProvider {
 	unlocked: Mutex<HashMap<Address, AccountData>>,
 	sstore: Box<SecretStore>,
-	address_book: Mutex<AddressBook>,
+	address_book: RwLock<AddressBook>,
+	dapps_settings: RwLock<DappsSettingsStore>,
 }
 
 impl AccountProvider {
@@ -176,7 +111,8 @@ impl AccountProvider {
 	pub fn new(sstore: Box<SecretStore>) -> Self {
 		AccountProvider {
 			unlocked: Mutex::new(HashMap::new()),
-			address_book: Mutex::new(AddressBook::new(sstore.local_path().into())),
+			address_book: RwLock::new(AddressBook::new(sstore.local_path().into())),
+			dapps_settings: RwLock::new(DappsSettingsStore::new(sstore.local_path().into())),
 			sstore: sstore,
 		}
 	}
@@ -185,7 +121,8 @@ impl AccountProvider {
 	pub fn transient_provider() -> Self {
 		AccountProvider {
 			unlocked: Mutex::new(HashMap::new()),
-			address_book: Mutex::new(AddressBook::transient()),
+			address_book: RwLock::new(AddressBook::transient()),
+			dapps_settings: RwLock::new(DappsSettingsStore::transient()),
 			sstore: Box::new(EthStore::open(Box::new(NullDir::default()))
 				.expect("NullDir load always succeeds; qed"))
 		}
@@ -230,19 +167,31 @@ impl AccountProvider {
 		Ok(accounts)
 	}
 
+	/// Gets addresses visile for dapp.
+	pub fn dapps_addresses(&self, dapp: DappId) -> Result<Vec<Address>, Error> {
+		let accounts = self.dapps_settings.read().get();
+		Ok(accounts.get(&dapp).map(|settings| settings.accounts.clone()).unwrap_or_else(Vec::new))
+	}
+
+	/// Sets addresses visile for dapp.
+	pub fn set_dapps_addresses(&self, dapp: DappId, addresses: Vec<Address>) -> Result<(), Error> {
+		self.dapps_settings.write().set_accounts(dapp, addresses);
+		Ok(())
+	}
+
 	/// Returns each address along with metadata.
 	pub fn addresses_info(&self) -> Result<HashMap<Address, AccountMeta>, Error> {
-		Ok(self.address_book.lock().get())
+		Ok(self.address_book.read().get())
 	}
 
 	/// Returns each address along with metadata.
 	pub fn set_address_name(&self, account: Address, name: String) -> Result<(), Error> {
-		Ok(self.address_book.lock().set_name(account, name))
+		Ok(self.address_book.write().set_name(account, name))
 	}
 
 	/// Returns each address along with metadata.
 	pub fn set_address_meta(&self, account: Address, meta: String) -> Result<(), Error> {
-		Ok(self.address_book.lock().set_meta(account, meta))
+		Ok(self.address_book.write().set_meta(account, meta))
 	}
 
 	/// Returns each account along with name and meta.
@@ -379,23 +328,9 @@ impl AccountProvider {
 
 #[cfg(test)]
 mod tests {
-	use super::{AccountProvider, AddressBook, Unlock};
+	use super::{AccountProvider, Unlock};
-	use std::collections::HashMap;
 	use std::time::Instant;
-	use ethjson::misc::AccountMeta;
 	use ethstore::ethkey::{Generator, Random};
-	use devtools::RandomTempPath;
-
-	#[test]
-	fn should_save_and_reload_address_book() {
-		let temp = RandomTempPath::create_dir();
-		let path = temp.as_str().to_owned();
-		let mut b = AddressBook::new(path.clone());
-		b.set_name(1.into(), "One".to_owned());
-		b.set_meta(1.into(), "{1:1}".to_owned());
-		let b = AddressBook::new(path);
-		assert_eq!(b.get(), hash_map![1.into() => AccountMeta{name: "One".to_owned(), meta: "{1:1}".to_owned(), uuid: None}]);
-	}
 
 	#[test]
 	fn unlock_account_temp() {
@@ -433,4 +368,17 @@ mod tests {
 		ap.unlocked.lock().get_mut(&kp.address()).unwrap().unlock = Unlock::Timed(Instant::now());
 		assert!(ap.sign(kp.address(), None, Default::default()).is_err());
 	}
+
+	#[test]
+	fn should_set_dapps_addresses() {
+		// given
+		let ap = AccountProvider::transient_provider();
+		let app = "app1".to_owned();
+
+		// when
+		ap.set_dapps_addresses(app.clone(), vec![1.into(), 2.into()]).unwrap();
+
+		// then
+		assert_eq!(ap.dapps_addresses(app.clone()).unwrap(), vec![1.into(), 2.into()]);
+	}
 }

ethcore/src/account_provider/stores.rs

@@ -0,0 +1,247 @@
+// 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/>.
+
+//! Address Book and Dapps Settings Store
+
+use std::{fs, fmt, hash, ops};
+use std::collections::HashMap;
+use std::path::PathBuf;
+
+use ethstore::ethkey::Address;
+use ethjson::misc::{AccountMeta, DappsSettings as JsonSettings};
+use account_provider::DappId;
+
+/// Disk-backed map from Address to String. Uses JSON.
+pub struct AddressBook {
+	cache: DiskMap<Address, AccountMeta>,
+}
+
+impl AddressBook {
+	/// Creates new address book at given directory.
+	pub fn new(path: String) -> Self {
+		let mut r = AddressBook {
+			cache: DiskMap::new(path, "address_book.json".into())
+		};
+		r.cache.revert(AccountMeta::read_address_map);
+		r
+	}
+
+	/// Creates transient address book (no changes are saved to disk).
+	pub fn transient() -> Self {
+		AddressBook {
+			cache: DiskMap::transient()
+		}
+	}
+
+	/// Get the address book.
+	pub fn get(&self) -> HashMap<Address, AccountMeta> {
+		self.cache.clone()
+	}
+
+	fn save(&self) {
+		self.cache.save(AccountMeta::write_address_map)
+	}
+
+	/// Sets new name for given address.
+	pub fn set_name(&mut self, a: Address, name: String) {
+		{
+			let mut x = self.cache.entry(a)
+				.or_insert_with(|| AccountMeta {name: Default::default(), meta: "{}".to_owned(), uuid: None});
+			x.name = name;
+		}
+		self.save();
+	}
+
+	/// Sets new meta for given address.
+	pub fn set_meta(&mut self, a: Address, meta: String) {
+		{
+			let mut x = self.cache.entry(a)
+				.or_insert_with(|| AccountMeta {name: "Anonymous".to_owned(), meta: Default::default(), uuid: None});
+			x.meta = meta;
+		}
+		self.save();
+	}
+}
+
+/// Dapps user settings
+#[derive(Debug, Default, Clone, Eq, PartialEq)]
+pub struct DappsSettings {
+	/// A list of visible accounts
+	pub accounts: Vec<Address>,
+}
+
+impl From<JsonSettings> for DappsSettings {
+	fn from(s: JsonSettings) -> Self {
+		DappsSettings {
+			accounts: s.accounts.into_iter().map(Into::into).collect(),
+		}
+	}
+}
+
+impl From<DappsSettings> for JsonSettings {
+	fn from(s: DappsSettings) -> Self {
+		JsonSettings {
+			accounts: s.accounts.into_iter().map(Into::into).collect(),
+		}
+	}
+}
+
+/// Disk-backed map from DappId to Settings. Uses JSON.
+pub struct DappsSettingsStore {
+	cache: DiskMap<DappId, DappsSettings>,
+}
+
+impl DappsSettingsStore {
+	/// Creates new store at given directory path.
+	pub fn new(path: String) -> Self {
+		let mut r = DappsSettingsStore {
+			cache: DiskMap::new(path, "dapps_accounts.json".into())
+		};
+		r.cache.revert(JsonSettings::read_dapps_settings);
+		r
+	}
+
+	/// Creates transient store (no changes are saved to disk).
+	pub fn transient() -> Self {
+		DappsSettingsStore {
+			cache: DiskMap::transient()
+		}
+	}
+
+	/// Get copy of the dapps settings
+	pub fn get(&self) -> HashMap<DappId, DappsSettings> {
+		self.cache.clone()
+	}
+
+	fn save(&self) {
+		self.cache.save(JsonSettings::write_dapps_settings)
+	}
+
+	pub fn set_accounts(&mut self, id: DappId, accounts: Vec<Address>) {
+		{
+			let mut settings = self.cache.entry(id).or_insert_with(DappsSettings::default);
+			settings.accounts = accounts;
+		}
+		self.save();
+	}
+}
+
+/// Disk-serializable HashMap
+#[derive(Debug)]
+struct DiskMap<K: hash::Hash + Eq, V> {
+	path: PathBuf,
+	cache: HashMap<K, V>,
+	transient: bool,
+}
+
+impl<K: hash::Hash + Eq, V> ops::Deref for DiskMap<K, V> {
+	type Target = HashMap<K, V>;
+	fn deref(&self) -> &Self::Target {
+		&self.cache
+	}
+}
+
+impl<K: hash::Hash + Eq, V> ops::DerefMut for DiskMap<K, V> {
+	fn deref_mut(&mut self) -> &mut Self::Target {
+		&mut self.cache
+	}
+}
+
+impl<K: hash::Hash + Eq, V> DiskMap<K, V> {
+	pub fn new(path: String, file_name: String) -> Self {
+		trace!(target: "diskmap", "new({})", path);
+		let mut path: PathBuf = path.into();
+		path.push(file_name);
+		trace!(target: "diskmap", "path={:?}", path);
+		DiskMap {
+			path: path,
+			cache: HashMap::new(),
+			transient: false,
+		}
+	}
+
+	pub fn transient() -> Self {
+		let mut map = DiskMap::new(Default::default(), "diskmap.json".into());
+		map.transient = true;
+		map
+	}
+
+	fn revert<F, E>(&mut self, read: F) where
+		F: Fn(fs::File) -> Result<HashMap<K, V>, E>,
+		E: fmt::Display,
+	{
+		if self.transient { return; }
+		trace!(target: "diskmap", "revert {:?}", self.path);
+		let _ = fs::File::open(self.path.clone())
+			.map_err(|e| trace!(target: "diskmap", "Couldn't open disk map: {}", e))
+			.and_then(|f| read(f).map_err(|e| warn!(target: "diskmap", "Couldn't read disk map: {}", e)))
+			.and_then(|m| {
+				self.cache = m;
+				Ok(())
+			});
+	}
+
+	fn save<F, E>(&self, write: F) where
+		F: Fn(&HashMap<K, V>, &mut fs::File) -> Result<(), E>,
+		E: fmt::Display,
+	{
+		if self.transient { return; }
+		trace!(target: "diskmap", "save {:?}", self.path);
+		let _ = fs::File::create(self.path.clone())
+			.map_err(|e| warn!(target: "diskmap", "Couldn't open disk map for writing: {}", e))
+			.and_then(|mut f| {
+				write(&self.cache, &mut f).map_err(|e| warn!(target: "diskmap", "Couldn't write to disk map: {}", e))
+			});
+	}
+}
+
+#[cfg(test)]
+mod tests {
+	use super::{AddressBook, DappsSettingsStore, DappsSettings};
+	use std::collections::HashMap;
+	use ethjson::misc::AccountMeta;
+	use devtools::RandomTempPath;
+
+	#[test]
+	fn should_save_and_reload_address_book() {
+		let temp = RandomTempPath::create_dir();
+		let path = temp.as_str().to_owned();
+		let mut b = AddressBook::new(path.clone());
+		b.set_name(1.into(), "One".to_owned());
+		b.set_meta(1.into(), "{1:1}".to_owned());
+		let b = AddressBook::new(path);
+		assert_eq!(b.get(), hash_map![1.into() => AccountMeta{name: "One".to_owned(), meta: "{1:1}".to_owned(), uuid: None}]);
+	}
+
+	#[test]
+	fn should_save_and_reload_dapps_settings() {
+		// given
+		let temp = RandomTempPath::create_dir();
+		let path = temp.as_str().to_owned();
+		let mut b = DappsSettingsStore::new(path.clone());
+
+		// when
+		b.set_accounts("dappOne".into(), vec![1.into(), 2.into()]);
+
+		// then
+		let b = DappsSettingsStore::new(path);
+		assert_eq!(b.get(), hash_map![
+			"dappOne".into() => DappsSettings {
+				accounts: vec![1.into(), 2.into()],
+			}
+		]);
+	}
+}

ethcore/src/block.rs

@@ -594,9 +594,9 @@ mod tests {
 	use factory::Factories;
 	use state_db::StateDB;
 	use views::BlockView;
-	use util::Address;
+	use util::{Address, TrieFactory};
 	use util::hash::FixedHash;
-
+	use util::trie::TrieSpec;
 	use std::sync::Arc;
 
 	/// Enact the block given by `block_bytes` using `engine` on the database `db` with given `parent` block header
@@ -637,7 +637,7 @@ mod tests {
 		let genesis_header = spec.genesis_header();
 		let mut db_result = get_temp_state_db();
 		let mut db = db_result.take();
-		spec.ensure_db_good(&mut db).unwrap();
+		spec.ensure_db_good(&mut db, &TrieFactory::new(TrieSpec::Secure)).unwrap();
 		let last_hashes = Arc::new(vec![genesis_header.hash()]);
 		let b = OpenBlock::new(&*spec.engine, Default::default(), false, db, &genesis_header, last_hashes, Address::zero(), (3141562.into(), 31415620.into()), vec![]).unwrap();
 		let b = b.close_and_lock();
@@ -653,7 +653,7 @@ mod tests {
 
 		let mut db_result = get_temp_state_db();
 		let mut db = db_result.take();
-		spec.ensure_db_good(&mut db).unwrap();
+		spec.ensure_db_good(&mut db, &TrieFactory::new(TrieSpec::Secure)).unwrap();
 		let last_hashes = Arc::new(vec![genesis_header.hash()]);
 		let b = OpenBlock::new(engine, Default::default(), false, db, &genesis_header, last_hashes.clone(), Address::zero(), (3141562.into(), 31415620.into()), vec![]).unwrap()
 			.close_and_lock().seal(engine, vec![]).unwrap();
@@ -662,7 +662,7 @@ mod tests {
 
 		let mut db_result = get_temp_state_db();
 		let mut db = db_result.take();
-		spec.ensure_db_good(&mut db).unwrap();
+		spec.ensure_db_good(&mut db, &TrieFactory::new(TrieSpec::Secure)).unwrap();
 		let e = enact_and_seal(&orig_bytes, engine, false, db, &genesis_header, last_hashes, Default::default()).unwrap();
 
 		assert_eq!(e.rlp_bytes(), orig_bytes);
@@ -681,7 +681,7 @@ mod tests {
 
 		let mut db_result = get_temp_state_db();
 		let mut db = db_result.take();
-		spec.ensure_db_good(&mut db).unwrap();
+		spec.ensure_db_good(&mut db, &TrieFactory::new(TrieSpec::Secure)).unwrap();
 		let last_hashes = Arc::new(vec![genesis_header.hash()]);
 		let mut open_block = OpenBlock::new(engine, Default::default(), false, db, &genesis_header, last_hashes.clone(), Address::zero(), (3141562.into(), 31415620.into()), vec![]).unwrap();
 		let mut uncle1_header = Header::new();
@@ -697,7 +697,7 @@ mod tests {
 
 		let mut db_result = get_temp_state_db();
 		let mut db = db_result.take();
-		spec.ensure_db_good(&mut db).unwrap();
+		spec.ensure_db_good(&mut db, &TrieFactory::new(TrieSpec::Secure)).unwrap();
 		let e = enact_and_seal(&orig_bytes, engine, false, db, &genesis_header, last_hashes, Default::default()).unwrap();
 
 		let bytes = e.rlp_bytes();

ethcore/src/client/client.rs

@@ -181,9 +181,10 @@ impl Client {
 			false => TrieSpec::Secure,
 		};
 
+		let trie_factory = TrieFactory::new(trie_spec);
 		let journal_db = journaldb::new(db.clone(), config.pruning, ::db::COL_STATE);
 		let mut state_db = StateDB::new(journal_db, config.state_cache_size);
-		if state_db.journal_db().is_empty() && try!(spec.ensure_db_good(&mut state_db)) {
+		if state_db.journal_db().is_empty() && try!(spec.ensure_db_good(&mut state_db, &trie_factory)) {
 			let mut batch = DBTransaction::new(&db);
 			try!(state_db.journal_under(&mut batch, 0, &spec.genesis_header().hash()));
 			try!(db.write(batch).map_err(ClientError::Database));
@@ -225,7 +226,7 @@ impl Client {
 
 		let factories = Factories {
 			vm: EvmFactory::new(config.vm_type.clone(), config.jump_table_size),
-			trie: TrieFactory::new(trie_spec),
+			trie: trie_factory,
 			accountdb: Default::default(),
 		};
 
@@ -936,8 +937,8 @@ impl BlockChainClient for Client {
 	}
 
 	fn keep_alive(&self) {
-		let should_wake = match &*self.mode.lock() {
+		let should_wake = match *self.mode.lock() {
-			&Mode::Dark(..) | &Mode::Passive(..) => true,
+			Mode::Dark(..) | Mode::Passive(..) => true,
 			_ => false,
 		};
 		if should_wake {
@@ -1019,6 +1020,10 @@ impl BlockChainClient for Client {
 		self.state_at(id).map(|s| s.nonce(address))
 	}
 
+	fn storage_root(&self, address: &Address, id: BlockId) -> Option<H256> {
+		self.state_at(id).and_then(|s| s.storage_root(address))
+	}
+
 	fn block_hash(&self, id: BlockId) -> Option<H256> {
 		let chain = self.chain.read();
 		Self::block_hash(&chain, id)
@@ -1036,7 +1041,7 @@ impl BlockChainClient for Client {
 		self.state_at(id).map(|s| s.storage_at(address, position))
 	}
 
-	fn list_accounts(&self, id: BlockId) -> Option<Vec<Address>> {
+	fn list_accounts(&self, id: BlockId, after: Option<&Address>, count: u64) -> Option<Vec<Address>> {
 		if !self.factories.trie.is_fat() {
 			trace!(target: "fatdb", "list_accounts: Not a fat DB");
 			return None;
@@ -1056,18 +1061,68 @@ impl BlockChainClient for Client {
 			}
 		};
 
-		let iter = match trie.iter() {
+		let mut iter = match trie.iter() {
 			Ok(iter) => iter,
 			_ => return None,
 		};
 
+		if let Some(after) = after {
+			if let Err(e) = iter.seek(after) {
+				trace!(target: "fatdb", "list_accounts: Couldn't seek the DB: {:?}", e);
+			}
+		}
+
 		let accounts = iter.filter_map(|item| {
 			item.ok().map(|(addr, _)| Address::from_slice(&addr))
-		}).collect();
+		}).take(count as usize).collect();
 
 		Some(accounts)
 	}
 
+	fn list_storage(&self, id: BlockId, account: &Address, after: Option<&H256>, count: u64) -> Option<Vec<H256>> {
+		if !self.factories.trie.is_fat() {
+			trace!(target: "fatdb", "list_stroage: Not a fat DB");
+			return None;
+		}
+
+		let state = match self.state_at(id) {
+			Some(state) => state,
+			_ => return None,
+		};
+
+		let root = match state.storage_root(account) {
+			Some(root) => root,
+			_ => return None,
+		};
+
+		let (_, db) = state.drop();
+		let account_db = self.factories.accountdb.readonly(db.as_hashdb(), account.sha3());
+		let trie = match self.factories.trie.readonly(account_db.as_hashdb(), &root) {
+			Ok(trie) => trie,
+			_ => {
+				trace!(target: "fatdb", "list_storage: Couldn't open the DB");
+				return None;
+			}
+		};
+
+		let mut iter = match trie.iter() {
+			Ok(iter) => iter,
+			_ => return None,
+		};
+
+		if let Some(after) = after {
+			if let Err(e) = iter.seek(after) {
+				trace!(target: "fatdb", "list_accounts: Couldn't seek the DB: {:?}", e);
+			}
+		}
+
+		let keys = iter.filter_map(|item| {
+			item.ok().map(|(key, _)| H256::from_slice(&key))
+		}).take(count as usize).collect();
+
+		Some(keys)
+	}
+
 	fn transaction(&self, id: TransactionId) -> Option<LocalizedTransaction> {
 		self.transaction_address(id).and_then(|address| self.chain.read().transaction(&address))
 	}

ethcore/src/client/test_client.rs

@@ -333,7 +333,7 @@ impl MiningBlockChainClient for TestBlockChainClient {
 		let genesis_header = self.spec.genesis_header();
 		let mut db_result = get_temp_state_db();
 		let mut db = db_result.take();
-		self.spec.ensure_db_good(&mut db).unwrap();
+		self.spec.ensure_db_good(&mut db, &TrieFactory::default()).unwrap();
 
 		let last_hashes = vec![genesis_header.hash()];
 		let mut open_block = OpenBlock::new(
@@ -385,6 +385,10 @@ impl BlockChainClient for TestBlockChainClient {
 		}
 	}
 
+	fn storage_root(&self, _address: &Address, _id: BlockID) -> Option<H256> {
+		None
+	}
+
 	fn latest_nonce(&self, address: &Address) -> U256 {
 		self.nonce(address, BlockId::Latest).unwrap()
 	}
@@ -416,10 +420,13 @@ impl BlockChainClient for TestBlockChainClient {
 		}
 	}
 
-	fn list_accounts(&self, _id: BlockId) -> Option<Vec<Address>> {
+	fn list_accounts(&self, _id: BlockId, _after: Option<&Address>, _count: u64) -> Option<Vec<Address>> {
 		None
 	}
 
+	fn list_storage(&self, _id: BlockID, _account: &Address, _after: Option<&H256>, _count: u64) -> Option<Vec<H256>> {
+		None
+	}
 	fn transaction(&self, _id: TransactionId) -> Option<LocalizedTransaction> {
 		None	// Simple default.
 	}

ethcore/src/client/traits.rs

@@ -68,6 +68,10 @@ pub trait BlockChainClient : Sync + Send {
 	/// May not fail on BlockId::Latest.
 	fn nonce(&self, address: &Address, id: BlockId) -> Option<U256>;
 
+	/// Attempt to get address storage root at given block.
+	/// May not fail on BlockID::Latest.
+	fn storage_root(&self, address: &Address, id: BlockID) -> Option<H256>;
+
 	/// Get address nonce at the latest block's state.
 	fn latest_nonce(&self, address: &Address) -> U256 {
 		self.nonce(address, BlockId::Latest)
@@ -114,7 +118,12 @@ pub trait BlockChainClient : Sync + Send {
 	}
 
 	/// Get a list of all accounts in the block `id`, if fat DB is in operation, otherwise `None`.
-	fn list_accounts(&self, id: BlockId) -> Option<Vec<Address>>;
+	/// If `after` is set the list starts with the following item.
+	fn list_accounts(&self, id: BlockId, after: Option<&Address>, count: u64) -> Option<Vec<Address>>;
+
+	/// Get a list of all storage keys in the block `id`, if fat DB is in operation, otherwise `None`.
+	/// If `after` is set the list starts with the following item.
+	fn list_storage(&self, id: BlockId, account: &Address, after: Option<&H256>, count: u64) -> Option<Vec<H256>>;
 
 	/// Get transaction with given hash.
 	fn transaction(&self, id: TransactionId) -> Option<LocalizedTransaction>;

ethcore/src/engines/authority_round.rs

@@ -124,7 +124,7 @@ impl AuthorityRound {
 	}
 
 	fn step_proposer(&self, step: usize) -> &Address {
-		let ref p = self.our_params;
+		let p = &self.our_params;
 		p.authorities.get(step % p.authority_n).expect("There are authority_n authorities; taking number modulo authority_n gives number in authority_n range; qed")
 	}
 
@@ -211,7 +211,7 @@ impl Engine for AuthorityRound {
 	fn on_close_block(&self, _block: &mut ExecutedBlock) {}
 
 	fn is_sealer(&self, author: &Address) -> Option<bool> {
-		let ref p = self.our_params;
+		let p = &self.our_params;
 		Some(p.authorities.contains(author))
 	}
 
@@ -279,7 +279,7 @@ impl Engine for AuthorityRound {
 
 		let step = try!(header_step(header));
 		// Check if parent is from a previous step.
-		if step == try!(header_step(parent)) { 
+		if step == try!(header_step(parent)) {
 			trace!(target: "poa", "Multiple blocks proposed for step {}.", step);
 			try!(Err(BlockError::DoubleVote(header.author().clone())));
 		}
@@ -315,6 +315,7 @@ impl Engine for AuthorityRound {
 #[cfg(test)]
 mod tests {
 	use util::*;
+	use util::trie::TrieSpec;
 	use env_info::EnvInfo;
 	use header::Header;
 	use error::{Error, BlockError};
@@ -384,9 +385,9 @@ mod tests {
 		let engine = &*spec.engine;
 		let genesis_header = spec.genesis_header();
 		let mut db1 = get_temp_state_db().take();
-		spec.ensure_db_good(&mut db1).unwrap();
+		spec.ensure_db_good(&mut db1, &TrieFactory::new(TrieSpec::Secure)).unwrap();
 		let mut db2 = get_temp_state_db().take();
-		spec.ensure_db_good(&mut db2).unwrap();
+		spec.ensure_db_good(&mut db2, &TrieFactory::new(TrieSpec::Secure)).unwrap();
 		let last_hashes = Arc::new(vec![genesis_header.hash()]);
 		let b1 = OpenBlock::new(engine, Default::default(), false, db1, &genesis_header, last_hashes.clone(), addr1, (3141562.into(), 31415620.into()), vec![]).unwrap();
 		let b1 = b1.close_and_lock();

ethcore/src/engines/basic_authority.rs

@@ -184,6 +184,7 @@ impl Engine for BasicAuthority {
 #[cfg(test)]
 mod tests {
 	use util::*;
+	use util::trie::TrieSpec;
 	use block::*;
 	use env_info::EnvInfo;
 	use error::{BlockError, Error};
@@ -256,7 +257,7 @@ mod tests {
 		let genesis_header = spec.genesis_header();
 		let mut db_result = get_temp_state_db();
 		let mut db = db_result.take();
-		spec.ensure_db_good(&mut db).unwrap();
+		spec.ensure_db_good(&mut db, &TrieFactory::new(TrieSpec::Secure)).unwrap();
 		let last_hashes = Arc::new(vec![genesis_header.hash()]);
 		let b = OpenBlock::new(engine, Default::default(), false, db, &genesis_header, last_hashes, addr, (3141562.into(), 31415620.into()), vec![]).unwrap();
 		let b = b.close_and_lock();

ethcore/src/engines/instant_seal.rs

@@ -68,6 +68,7 @@ impl Engine for InstantSeal {
 #[cfg(test)]
 mod tests {
 	use util::*;
+	use util::trie::TrieSpec;
 	use tests::helpers::*;
 	use account_provider::AccountProvider;
 	use spec::Spec;
@@ -84,7 +85,7 @@ mod tests {
 		let genesis_header = spec.genesis_header();
 		let mut db_result = get_temp_state_db();
 		let mut db = db_result.take();
-		spec.ensure_db_good(&mut db).unwrap();
+		spec.ensure_db_good(&mut db, &TrieFactory::new(TrieSpec::Secure)).unwrap();
 		let last_hashes = Arc::new(vec![genesis_header.hash()]);
 		let b = OpenBlock::new(engine, Default::default(), false, db, &genesis_header, last_hashes, addr, (3141562.into(), 31415620.into()), vec![]).unwrap();
 		let b = b.close_and_lock();

ethcore/src/ethereum/ethash.rs

@@ -422,6 +422,7 @@ impl Header {
 #[cfg(test)]
 mod tests {
 	use util::*;
+	use util::trie::TrieSpec;
 	use block::*;
 	use tests::helpers::*;
 	use env_info::EnvInfo;
@@ -438,7 +439,7 @@ mod tests {
 		let genesis_header = spec.genesis_header();
 		let mut db_result = get_temp_state_db();
 		let mut db = db_result.take();
-		spec.ensure_db_good(&mut db).unwrap();
+		spec.ensure_db_good(&mut db, &TrieFactory::new(TrieSpec::Secure)).unwrap();
 		let last_hashes = Arc::new(vec![genesis_header.hash()]);
 		let b = OpenBlock::new(engine, Default::default(), false, db, &genesis_header, last_hashes, Address::zero(), (3141562.into(), 31415620.into()), vec![]).unwrap();
 		let b = b.close();
@@ -452,7 +453,7 @@ mod tests {
 		let genesis_header = spec.genesis_header();
 		let mut db_result = get_temp_state_db();
 		let mut db = db_result.take();
-		spec.ensure_db_good(&mut db).unwrap();
+		spec.ensure_db_good(&mut db, &TrieFactory::new(TrieSpec::Secure)).unwrap();
 		let last_hashes = Arc::new(vec![genesis_header.hash()]);
 		let mut b = OpenBlock::new(engine, Default::default(), false, db, &genesis_header, last_hashes, Address::zero(), (3141562.into(), 31415620.into()), vec![]).unwrap();
 		let mut uncle = Header::new();

ethcore/src/ethereum/mod.rs

@@ -72,6 +72,7 @@ pub fn new_morden() -> Spec { load(include_bytes!("../../res/ethereum/morden.jso
 #[cfg(test)]
 mod tests {
 	use util::*;
+	use util::trie::TrieSpec;
 	use state::*;
 	use super::*;
 	use tests::helpers::*;
@@ -84,7 +85,7 @@ mod tests {
 		let genesis_header = spec.genesis_header();
 		let mut db_result = get_temp_state_db();
 		let mut db = db_result.take();
-		spec.ensure_db_good(&mut db).unwrap();
+		spec.ensure_db_good(&mut db, &TrieFactory::new(TrieSpec::Secure)).unwrap();
 		let s = State::from_existing(db, genesis_header.state_root().clone(), engine.account_start_nonce(), Default::default()).unwrap();
 		assert_eq!(s.balance(&"0000000000000000000000000000000000000001".into()), 1u64.into());
 		assert_eq!(s.balance(&"0000000000000000000000000000000000000002".into()), 1u64.into());

ethcore/src/evm/interpreter/gasometer.rs

@@ -197,19 +197,17 @@ impl<Gas: CostType> Gasometer<Gas> {
 				let address = u256_to_address(stack.peek(1));
 				let is_value_transfer = !stack.peek(2).is_zero();
 
-				if instruction == instructions::CALL {
+				if instruction == instructions::CALL && (
-					if (
+					(!schedule.no_empty && !ext.exists(&address))
-						!schedule.no_empty && !ext.exists(&address)
+					||
-					) || (
+					(schedule.no_empty && is_value_transfer && !ext.exists_and_not_null(&address))
-						schedule.no_empty && is_value_transfer && !ext.exists_and_not_null(&address)
+				) {
-					) {
+					gas = overflowing!(gas.overflow_add(schedule.call_new_account_gas.into()));
-						gas = overflowing!(gas.overflow_add(schedule.call_new_account_gas.into()));
+				}
-					}
-				};
 
 				if is_value_transfer {
 					gas = overflowing!(gas.overflow_add(schedule.call_value_transfer_gas.into()));
-				};
+				}
 
 				let requested = *stack.peek(0);
 
@@ -347,7 +345,7 @@ fn test_mem_gas_cost() {
 	let result = gasometer.mem_gas_cost(&schedule, current_mem_size, &mem_size);
 
 	// then
-	if let Ok(_) = result {
+	if result.is_ok() {
 		assert!(false, "Should fail with OutOfGas");
 	}
 }

ethcore/src/evm/tests.rs

@@ -95,7 +95,7 @@ impl Ext for FakeExt {
 	}
 
 	fn exists_and_not_null(&self, address: &Address) -> bool {
-		self.balances.get(address).map_or(false, |b| !b.is_zero()) 
+		self.balances.get(address).map_or(false, |b| !b.is_zero())
 	}
 
 	fn origin_balance(&self) -> U256 {
@@ -103,7 +103,7 @@ impl Ext for FakeExt {
 	}
 
 	fn balance(&self, address: &Address) -> U256 {
-		*self.balances.get(address).unwrap()
+		self.balances[address]
 	}
 
 	fn blockhash(&self, number: &U256) -> H256 {

ethcore/src/executive.rs

@@ -445,7 +445,7 @@ impl<'a> Executive<'a> {
 
 		trace!("exec::finalize: Refunding refund_value={}, sender={}\n", refund_value, sender);
 		// Below: NoEmpty is safe since the sender must already be non-null to have sent this transaction
-		self.state.add_balance(&sender, &refund_value, CleanupMode::NoEmpty);  
+		self.state.add_balance(&sender, &refund_value, CleanupMode::NoEmpty);
 		trace!("exec::finalize: Compensating author: fees_value={}, author={}\n", fees_value, &self.info.author);
 		self.state.add_balance(&self.info.author, &fees_value, substate.to_cleanup_mode(&schedule));
 
@@ -514,9 +514,11 @@ impl<'a> Executive<'a> {
 #[cfg(test)]
 #[allow(dead_code)]
 mod tests {
+	use std::sync::Arc;
 	use ethkey::{Generator, Random};
 	use super::*;
-	use util::*;
+	use util::{H256, U256, U512, Address, Uint, FixedHash, FromHex, FromStr};
+	use util::bytes::BytesRef;
 	use action_params::{ActionParams, ActionValue};
 	use env_info::EnvInfo;
 	use evm::{Factory, VMType};

ethcore/src/miner/miner.rs

@@ -151,7 +151,7 @@ impl GasPriceCalibrator {
 		if Instant::now() >= self.next_calibration {
 			let usd_per_tx = self.options.usd_per_tx;
 			trace!(target: "miner", "Getting price info");
-			if let Ok(_) = PriceInfo::get(move |price: PriceInfo| {
+			let price_info = PriceInfo::get(move |price: PriceInfo| {
 				trace!(target: "miner", "Price info arrived: {:?}", price);
 				let usd_per_eth = price.ethusd;
 				let wei_per_usd: f32 = 1.0e18 / usd_per_eth;
@@ -159,7 +159,9 @@ impl GasPriceCalibrator {
 				let wei_per_gas: f32 = wei_per_usd * usd_per_tx / gas_per_tx;
 				info!(target: "miner", "Updated conversion rate to Ξ1 = {} ({} wei/gas)", Colour::White.bold().paint(format!("US${}", usd_per_eth)), Colour::Yellow.bold().paint(format!("{}", wei_per_gas)));
 				set_price(U256::from(wei_per_gas as u64));
-			}) {
+			});
+
+			if price_info.is_ok() {
 				self.next_calibration = Instant::now() + self.options.recalibration_period;
 			} else {
 				warn!(target: "miner", "Unable to update Ether price.");
@@ -1139,15 +1141,16 @@ impl MinerService for Miner {
 #[cfg(test)]
 mod tests {
 
+	use std::sync::Arc;
 	use std::time::Duration;
 	use super::super::{MinerService, PrioritizationStrategy};
 	use super::*;
-	use util::*;
+	use block::IsBlock;
+	use util::{U256, Uint, FromHex};
 	use ethkey::{Generator, Random};
 	use client::{BlockChainClient, TestBlockChainClient, EachBlockWith, TransactionImportResult};
 	use header::BlockNumber;
 	use types::transaction::{Transaction, SignedTransaction, Action};
-	use block::*;
 	use spec::Spec;
 	use tests::helpers::{generate_dummy_client};
 

ethcore/src/miner/transaction_queue.rs

@@ -990,7 +990,7 @@ impl TransactionQueue {
 		let mut update_last_nonce_to = None;
 		{
 			let by_nonce = self.future.by_address.row_mut(&address);
-			if let None = by_nonce {
+			if by_nonce.is_none() {
 				return;
 			}
 			let mut by_nonce = by_nonce.expect("None is tested in early-exit condition above; qed");
@@ -1212,12 +1212,12 @@ mod test {
 	use util::table::*;
 	use util::*;
 	use ethkey::{Random, Generator};
-	use transaction::*;
 	use error::{Error, TransactionError};
 	use super::*;
 	use super::{TransactionSet, TransactionOrder, VerifiedTransaction};
 	use miner::local_transactions::LocalTransactionsList;
 	use client::TransactionImportResult;
+	use transaction::{SignedTransaction, Transaction, Action};
 
 	fn unwrap_tx_err(err: Result<TransactionImportResult, Error>) -> TransactionError {
 		match err.unwrap_err() {

ethcore/src/pod_account.rs

@@ -64,13 +64,13 @@ impl PodAccount {
 	}
 
 	/// Place additional data into given hash DB.
-	pub fn insert_additional(&self, db: &mut AccountDBMut) {
+	pub fn insert_additional(&self, db: &mut AccountDBMut, factory: &TrieFactory) {
 		match self.code {
 			Some(ref c) if !c.is_empty() => { db.insert(c); }
 			_ => {}
 		}
 		let mut r = H256::new();
-		let mut t = SecTrieDBMut::new(db, &mut r);
+		let mut t = factory.create(db, &mut r);
 		for (k, v) in &self.storage {
 			if let Err(e) = t.insert(k, &rlp::encode(&U256::from(&**v))) {
 				warn!("Encountered potential DB corruption: {}", e);

ethcore/src/snapshot/mod.rs

@@ -552,11 +552,11 @@ const POW_VERIFY_RATE: f32 = 0.02;
 pub fn verify_old_block(rng: &mut OsRng, header: &Header, engine: &Engine, chain: &BlockChain, body: Option<&[u8]>, always: bool) -> Result<(), ::error::Error> {
 	if always || rng.gen::<f32>() <= POW_VERIFY_RATE {
 		match chain.block_header(header.parent_hash()) {
-			Some(parent) => engine.verify_block_family(&header, &parent, body),
+			Some(parent) => engine.verify_block_family(header, &parent, body),
-			None => engine.verify_block_seal(&header),
+			None => engine.verify_block_seal(header),
 		}
 	} else {
-		engine.verify_block_basic(&header, body)
+		engine.verify_block_basic(header, body)
 	}
 }
 

ethcore/src/spec/spec.rs

@@ -244,13 +244,13 @@ impl Spec {
 	}
 
 	/// Ensure that the given state DB has the trie nodes in for the genesis state.
-	pub fn ensure_db_good(&self, db: &mut StateDB) -> Result<bool, Box<TrieError>> {
+	pub fn ensure_db_good(&self, db: &mut StateDB, factory: &TrieFactory) -> Result<bool, Box<TrieError>> {
 		if !db.as_hashdb().contains(&self.state_root()) {
 			trace!(target: "spec", "ensure_db_good: Fresh database? Cannot find state root {}", self.state_root());
 			let mut root = H256::new();
 
 			{
-				let mut t = SecTrieDBMut::new(db.as_hashdb_mut(), &mut root);
+				let mut t = factory.create(db.as_hashdb_mut(), &mut root);
 				for (address, account) in self.genesis_state.get().iter() {
 					try!(t.insert(&**address, &account.rlp()));
 				}
@@ -258,7 +258,7 @@ impl Spec {
 			trace!(target: "spec", "ensure_db_good: Populated sec trie; root is {}", root);
 			for (address, account) in self.genesis_state.get().iter() {
 				db.note_non_null_account(address);
-				account.insert_additional(&mut AccountDBMut::new(db.as_hashdb_mut(), address));
+				account.insert_additional(&mut AccountDBMut::new(db.as_hashdb_mut(), address), factory);
 			}
 			assert!(db.as_hashdb().contains(&self.state_root()));
 			Ok(true)

ethcore/src/state/account.rs

@@ -314,11 +314,10 @@ impl Account {
 		self.code_hash == SHA3_EMPTY
 	}
 
-	#[cfg(test)]
+	/// Return the storage root associated with this account or None if it has been altered via the overlay.
-	/// return the storage root associated with this account or None if it has been altered via the overlay.
 	pub fn storage_root(&self) -> Option<&H256> { if self.storage_is_clean() {Some(&self.storage_root)} else {None} }
 
-	/// return the storage overlay.
+	/// Return the storage overlay.
 	pub fn storage_changes(&self) -> &HashMap<H256, H256> { &self.storage_changes }
 
 	/// Increment the nonce of the account by one.
@@ -445,11 +444,10 @@ impl fmt::Debug for Account {
 
 #[cfg(test)]
 mod tests {
-
+	use rlp::{UntrustedRlp, RlpType, View, Compressible};
 	use util::*;
 	use super::*;
 	use account_db::*;
-	use rlp::*;
 
 	#[test]
 	fn account_compress() {

ethcore/src/state/substate.rs

@@ -57,6 +57,7 @@ impl Substate {
 	}
 
 	/// Get the cleanup mode object from this.
+	#[cfg_attr(feature="dev", allow(wrong_self_convention))]
 	pub fn to_cleanup_mode(&mut self, schedule: &Schedule) -> CleanupMode {
 		match (schedule.no_empty, schedule.kill_empty) {
 			(false, _) => CleanupMode::ForceCreate,

ethcore/src/state_db.rs

@@ -397,6 +397,7 @@ impl StateDB {
 	}
 
 	/// Get cached code based on hash.
+	#[cfg_attr(feature="dev", allow(map_clone))]
 	pub fn get_cached_code(&self, hash: &H256) -> Option<Arc<Vec<u8>>> {
 		let mut cache = self.code_cache.lock();
 

ethcore/src/tests/client.rs

@@ -62,7 +62,7 @@ fn should_return_registrar() {
 		&db_config
 	).unwrap();
 	let params = client.additional_params();
-	let address = params.get("registrar").unwrap();
+	let address = &params["registrar"];
 
 	assert_eq!(address.len(), 40);
 	assert!(U256::from_str(address).is_ok());
@@ -93,7 +93,7 @@ fn imports_good_block() {
 		&db_config
 	).unwrap();
 	let good_block = get_good_dummy_block();
-	if let Err(_) = client.import_block(good_block) {
+	if client.import_block(good_block).is_err() {
 		panic!("error importing block being good by definition");
 	}
 	client.flush_queue();
@@ -203,18 +203,18 @@ fn can_collect_garbage() {
 
 #[test]
 fn can_generate_gas_price_median() {
-	let client_result = generate_dummy_client_with_data(3, 1, &vec_into![1, 2, 3]);
+	let client_result = generate_dummy_client_with_data(3, 1, slice_into![1, 2, 3]);
 	let client = client_result.reference();
 	assert_eq!(Some(U256::from(2)), client.gas_price_median(3));
 
-	let client_result = generate_dummy_client_with_data(4, 1, &vec_into![1, 4, 3, 2]);
+	let client_result = generate_dummy_client_with_data(4, 1, slice_into![1, 4, 3, 2]);
 	let client = client_result.reference();
 	assert_eq!(Some(U256::from(3)), client.gas_price_median(4));
 }
 
 #[test]
 fn can_generate_gas_price_histogram() {
-	let client_result = generate_dummy_client_with_data(20, 1, &vec_into![6354,8593,6065,4842,7845,7002,689,4958,4250,6098,5804,4320,643,8895,2296,8589,7145,2000,2512,1408]);
+	let client_result = generate_dummy_client_with_data(20, 1, slice_into![6354,8593,6065,4842,7845,7002,689,4958,4250,6098,5804,4320,643,8895,2296,8589,7145,2000,2512,1408]);
 	let client = client_result.reference();
 
 	let hist = client.gas_price_histogram(20, 5).unwrap();
@@ -224,7 +224,7 @@ fn can_generate_gas_price_histogram() {
 
 #[test]
 fn empty_gas_price_histogram() {
-	let client_result = generate_dummy_client_with_data(20, 0, &vec_into![]);
+	let client_result = generate_dummy_client_with_data(20, 0, slice_into![]);
 	let client = client_result.reference();
 
 	assert!(client.gas_price_histogram(20, 5).is_none());

ethcore/src/tests/helpers.rs

@@ -18,6 +18,7 @@ use ethkey::KeyPair;
 use io::*;
 use client::{BlockChainClient, Client, ClientConfig};
 use util::*;
+use util::trie::TrieSpec;
 use spec::*;
 use state_db::StateDB;
 use block::{OpenBlock, Drain};
@@ -157,7 +158,7 @@ pub fn generate_dummy_client_with_spec_and_data<F>(get_test_spec: F, block_numbe
 
 	let mut db_result = get_temp_state_db();
 	let mut db = db_result.take();
-	test_spec.ensure_db_good(&mut db).unwrap();
+	test_spec.ensure_db_good(&mut db, &TrieFactory::new(TrieSpec::Secure)).unwrap();
 	let genesis_header = test_spec.genesis_header();
 
 	let mut rolling_timestamp = 40;
@@ -262,7 +263,7 @@ pub fn get_test_client_with_blocks(blocks: Vec<Bytes>) -> GuardedTempResult<Arc<
 	).unwrap();
 
 	for block in &blocks {
-		if let Err(_) = client.import_block(block.clone()) {
+		if client.import_block(block.clone()).is_err() {
 			panic!("panic importing block which is well-formed");
 		}
 	}

ethcore/src/types/mode.rs

@@ -19,16 +19,16 @@
 pub use std::time::Duration;
 use client::Mode as ClientMode;
 
-/// IPC-capable shadow-type for client::config::Mode
+/// IPC-capable shadow-type for `client::config::Mode`
 #[derive(Clone, Binary, Debug)]
 pub enum Mode {
-	/// Same as ClientMode::Off.
+	/// Same as `ClientMode::Off`.
 	Off,
-	/// Same as ClientMode::Dark; values in seconds.
+	/// Same as `ClientMode::Dark`; values in seconds.
 	Dark(u64),
-	/// Same as ClientMode::Passive; values in seconds.
+	/// Same as `ClientMode::Passive`; values in seconds.
 	Passive(u64, u64),
-	/// Same as ClientMode::Active.
+	/// Same as `ClientMode::Active`.
 	Active,
 }
 
@@ -52,4 +52,4 @@ impl From<Mode> for ClientMode {
 			Mode::Active => ClientMode::Active,
 		}
 	}
-}
+}

ethcore/src/types/transaction.rs

@@ -73,7 +73,7 @@ pub struct Transaction {
 impl Transaction {
 	/// Append object with a without signature into RLP stream
 	pub fn rlp_append_unsigned_transaction(&self, s: &mut RlpStream, network_id: Option<u8>) {
-		s.begin_list(if let None = network_id { 6 } else { 9 });
+		s.begin_list(if network_id.is_none() { 6 } else { 9 });
 		s.append(&self.nonce);
 		s.append(&self.gas_price);
 		s.append(&self.gas);
@@ -210,7 +210,7 @@ pub struct SignedTransaction {
 	/// Plain Transaction.
 	unsigned: Transaction,
 	/// The V field of the signature; the LS bit described which half of the curve our point falls
-	/// in. The MS bits describe which network this transaction is for. If 27/28, its for all networks.  
+	/// in. The MS bits describe which network this transaction is for. If 27/28, its for all networks.
 	v: u8,
 	/// The R field of the signature; helps describe the point on the curve.
 	r: U256,
@@ -304,7 +304,7 @@ impl SignedTransaction {
 	/// 0 if `v` would have been 27 under "Electrum" notation, 1 if 28 or 4 if invalid.
 	pub fn standard_v(&self) -> u8 { match self.v { v if v == 27 || v == 28 || v > 36 => (v - 1) % 2, _ => 4 } }
 
-	/// The network ID, or `None` if this is a global transaction. 
+	/// The network ID, or `None` if this is a global transaction.
 	pub fn network_id(&self) -> Option<u8> {
 		match self.v {
 			v if v > 36 => Some((v - 35) / 2),
@@ -461,7 +461,7 @@ fn should_agree_with_vitalik() {
 		let signed: SignedTransaction = decode(&FromHex::from_hex(tx_data).unwrap());
 		signed.check_low_s().unwrap();
 		assert_eq!(signed.sender().unwrap(), address.into());
-		flushln!("networkid: {:?}", signed.network_id()); 
+		flushln!("networkid: {:?}", signed.network_id());
 	};
 
 	test_vector("f864808504a817c800825208943535353535353535353535353535353535353535808025a0044852b2a670ade5407e78fb2863c51de9fcb96542a07186fe3aeda6bb8a116da0044852b2a670ade5407e78fb2863c51de9fcb96542a07186fe3aeda6bb8a116d", "0xf0f6f18bca1b28cd68e4357452947e021241e9ce")
@@ -474,4 +474,4 @@ fn should_agree_with_vitalik() {
 	test_vector("f867078504a817c807830290409435353535353535353535353535353535353535358201578025a052f1a9b320cab38e5da8a8f97989383aab0a49165fc91c737310e4f7e9821021a052f1a9b320cab38e5da8a8f97989383aab0a49165fc91c737310e4f7e9821021", "0xd37922162ab7cea97c97a87551ed02c9a38b7332")
 	test_vector("f867088504a817c8088302e2489435353535353535353535353535353535353535358202008025a064b1702d9298fee62dfeccc57d322a463ad55ca201256d01f62b45b2e1c21c12a064b1702d9298fee62dfeccc57d322a463ad55ca201256d01f62b45b2e1c21c10", "0x9bddad43f934d313c2b79ca28a432dd2b7281029")
 	test_vector("f867098504a817c809830334509435353535353535353535353535353535353535358202d98025a052f8f61201b2b11a78d6e866abc9c3db2ae8631fa656bfe5cb53668255367afba052f8f61201b2b11a78d6e866abc9c3db2ae8631fa656bfe5cb53668255367afb", "0x3c24d7329e92f84f08556ceb6df1cdb0104ca49f")
-}
+}

ethcore/src/verification/verification.rs

@@ -29,6 +29,7 @@ use header::{BlockNumber, Header};
 use rlp::{UntrustedRlp, View};
 use transaction::SignedTransaction;
 use views::BlockView;
+use time::get_time;
 
 /// Preprocessed block data gathered in `verify_block_unordered` call
 pub struct PreverifiedBlock {
@@ -209,6 +210,10 @@ pub fn verify_header_params(header: &Header, engine: &Engine) -> Result<(), Erro
 	if header.number() != 0 && header.extra_data().len() > maximum_extra_data_size {
 		return Err(From::from(BlockError::ExtraDataOutOfBounds(OutOfBounds { min: None, max: Some(maximum_extra_data_size), found: header.extra_data().len() })));
 	}
+	let max_time = get_time().sec as u64 + 30;
+	if header.timestamp() > max_time {
+		return Err(From::from(BlockError::InvalidTimestamp(OutOfBounds { max: Some(max_time), min: None, found: header.timestamp() })))
+	}
 	Ok(())
 }
 
@@ -258,6 +263,7 @@ mod tests {
 	use tests::helpers::*;
 	use types::log_entry::{LogEntry, LocalizedLogEntry};
 	use rlp::View;
+	use time::get_time;
 
 	fn check_ok(result: Result<(), Error>) {
 		result.unwrap_or_else(|e| panic!("Block verification failed: {:?}", e));
@@ -271,6 +277,14 @@ mod tests {
 		}
 	}
 
+	fn check_fail_timestamp(result: Result<(), Error>) {
+		match result {
+			Err(Error::Block(BlockError::InvalidTimestamp(_))) => (),
+			Err(other) => panic!("Block verification failed.\nExpected: InvalidTimestamp\nGot: {:?}", other),
+			Ok(_) => panic!("Block verification failed.\nExpected: InvalidTimestamp\nGot: Ok"),
+		}
+	}
+
 	struct TestBlockChain {
 		blocks: HashMap<H256, Bytes>,
 		numbers: HashMap<BlockNumber, H256>,
@@ -515,6 +529,14 @@ mod tests {
 		check_fail(family_test(&create_test_block_with_data(&header, &good_transactions, &good_uncles), engine, &bc),
 			InvalidTimestamp(OutOfBounds { max: None, min: Some(parent.timestamp() + 1), found: header.timestamp() }));
 
+		header = good.clone();
+		header.set_timestamp(2450000000);
+		check_fail_timestamp(basic_test(&create_test_block_with_data(&header, &good_transactions, &good_uncles), engine));
+
+		header = good.clone();
+		header.set_timestamp(get_time().sec as u64 + 40);
+		check_fail_timestamp(basic_test(&create_test_block_with_data(&header, &good_transactions, &good_uncles), engine));
+
 		header = good.clone();
 		header.set_number(9);
 		check_fail(family_test(&create_test_block_with_data(&header, &good_transactions, &good_uncles), engine, &bc),

js/.babelrc

@@ -1,5 +1,8 @@
 {
-  "presets": ["es2017", "es2016", "es2015", "stage-0", "react"],
+  "presets": [
+    "es2017", "es2016", "es2015",
+    "stage-0", "react"
+  ],
   "plugins": [
     "transform-runtime",
     "transform-decorators-legacy",
@@ -10,6 +13,9 @@
   "env": {
     "production": {
       "plugins": ["transform-react-remove-prop-types"]
+    },
+    "development": {
+      "plugins": ["react-hot-loader/babel"]
     }
   }
 }

js/.eslintrc.json

@@ -15,6 +15,7 @@
     "no-debugger": "error",
     "no-alert": "error",
     "jsx-quotes": ["error", "prefer-single"],
-    "react/jsx-curly-spacing": ["error", "always"]
+    "react/jsx-curly-spacing": ["error", "always"],
+    "object-property-newline": 0
   }
 }

js/.npmrc

@@ -0,0 +1 @@
+save-prefix='~'

js/assets/images/certifications/unknown.svg

@@ -0,0 +1,4 @@
+<svg width="100" height="100" viewBox="0 0 100 100" xmlns="http://www.w3.org/2000/svg">
+	<circle fill="#4A90E2" cx="50" cy="50" r="50"/>
+	<path d="M20 45 L10 55 L35 85 L90 35 L80 25 L36 65 z" fill="#FFF"/>
+</svg>

js/package.json

@@ -1,6 +1,6 @@
 {
   "name": "parity.js",
-  "version": "0.2.74",
+  "version": "0.2.89",
   "main": "release/index.js",
   "jsnext:main": "src/index.js",
   "author": "Parity Team <admin@parity.io>",
@@ -26,16 +26,16 @@
   ],
   "scripts": {
     "build": "npm run build:lib && npm run build:dll && npm run build:app",
-    "build:app": "webpack --progress",
+    "build:app": "webpack --config webpack/app --progress",
-    "build:lib": "webpack --config webpack.libraries --progress",
+    "build:lib": "webpack --config webpack/libraries --progress",
-    "build:dll": "webpack --config webpack.vendor --progress",
+    "build:dll": "webpack --config webpack/vendor --progress",
     "ci:build": "npm run ci:build:lib && npm run ci:build:dll && npm run ci:build:app",
-    "ci:build:app": "NODE_ENV=production webpack",
+    "ci:build:app": "NODE_ENV=production webpack --config webpack/app",
-    "ci:build:lib": "NODE_ENV=production webpack --config webpack.libraries",
+    "ci:build:lib": "NODE_ENV=production webpack --config webpack/libraries",
-    "ci:build:dll": "NODE_ENV=production webpack --config webpack.vendor",
+    "ci:build:dll": "NODE_ENV=production webpack --config webpack/vendor",
-    "ci:build:npm": "NODE_ENV=production webpack --config webpack.npm",
+    "ci:build:npm": "NODE_ENV=production webpack --config webpack/npm",
     "start": "npm install && npm run build:lib && npm run build:dll && npm run start:app",
-    "start:app": "webpack-dev-server -d --history-api-fallback --open --hot --inline --progress --colors --port 3000",
+    "start:app": "node webpack/dev.server",
     "clean": "rm -rf ./build ./coverage",
     "coveralls": "npm run testCoverage && coveralls < coverage/lcov.info",
     "lint": "eslint --ignore-path .gitignore ./src/",
@@ -47,127 +47,132 @@
     "prepush": "npm run lint:cached"
   },
   "devDependencies": {
-    "babel-cli": "^6.10.1",
+    "babel-cli": "~6.18.0",
-    "babel-core": "^6.10.4",
+    "babel-core": "~6.18.2",
-    "babel-eslint": "^7.1.0",
+    "babel-eslint": "~7.1.0",
-    "babel-loader": "^6.2.3",
+    "babel-loader": "~6.2.3",
-    "babel-plugin-lodash": "^3.2.2",
+    "babel-plugin-lodash": "~3.2.2",
-    "babel-plugin-transform-class-properties": "^6.11.5",
+    "babel-plugin-transform-class-properties": "~6.19.0",
-    "babel-plugin-transform-decorators-legacy": "^1.3.4",
+    "babel-plugin-transform-decorators-legacy": "~1.3.4",
-    "babel-plugin-transform-react-remove-prop-types": "^0.2.9",
+    "babel-plugin-transform-react-remove-prop-types": "~0.2.9",
-    "babel-plugin-transform-runtime": "^6.9.0",
+    "babel-plugin-transform-runtime": "~6.15.0",
-    "babel-polyfill": "^6.13.0",
+    "babel-polyfill": "~6.16.0",
-    "babel-preset-es2015": "^6.9.0",
+    "babel-preset-es2015": "~6.18.0",
-    "babel-preset-es2015-rollup": "^1.1.1",
+    "babel-preset-es2015-rollup": "~1.2.0",
-    "babel-preset-es2016": "^6.11.3",
+    "babel-preset-es2016": "~6.16.0",
-    "babel-preset-es2017": "^6.14.0",
+    "babel-preset-es2017": "~6.16.0",
-    "babel-preset-react": "^6.5.0",
+    "babel-preset-react": "~6.16.0",
-    "babel-preset-stage-0": "^6.5.0",
+    "babel-preset-stage-0": "~6.16.0",
-    "babel-register": "6.9.0",
+    "babel-register": "6.18.0",
-    "babel-runtime": "^6.9.2",
+    "babel-runtime": "~6.18.0",
-    "chai": "^3.5.0",
+    "chai": "~3.5.0",
     "chai-enzyme": "0.4.2",
     "cheerio": "0.20.0",
-    "copy-webpack-plugin": "^4.0.0",
+    "copy-webpack-plugin": "~4.0.0",
-    "core-js": "^2.4.1",
+    "core-js": "~2.4.1",
-    "coveralls": "^2.11.11",
+    "coveralls": "~2.11.11",
-    "css-loader": "^0.23.1",
+    "css-loader": "~0.26.0",
+    "ejs-loader": "~0.3.0",
     "enzyme": "2.3.0",
-    "eslint": "^3.1.0",
+    "eslint": "~3.10.2",
-    "eslint-config-semistandard": "^6.0.2",
+    "eslint-config-semistandard": "~7.0.0",
-    "eslint-config-standard": "^5.3.5",
+    "eslint-config-standard": "~6.2.1",
-    "eslint-config-standard-react": "^3.0.0",
+    "eslint-config-standard-react": "~4.2.0",
-    "eslint-plugin-promise": "^2.0.0",
+    "eslint-plugin-promise": "~3.4.0",
-    "eslint-plugin-react": "^5.1.1",
+    "eslint-plugin-react": "~6.7.1",
-    "eslint-plugin-standard": "^2.0.0",
+    "eslint-plugin-standard": "~2.0.0",
-    "extract-loader": "0.0.2",
+    "express": "~4.14.0",
-    "extract-text-webpack-plugin": "^1.0.1",
+    "extract-loader": "0.1.0",
-    "file-loader": "^0.8.5",
+    "extract-text-webpack-plugin": "~2.0.0-beta.4",
-    "fs-extra": "^0.30.0",
+    "file-loader": "~0.9.0",
-    "happypack": "^2.2.1",
+    "fs-extra": "~0.30.0",
-    "history": "^2.0.0",
+    "happypack": "~3.0.0",
-    "html-loader": "^0.4.4",
+    "history": "~2.0.0",
-    "husky": "^0.11.9",
+    "html-loader": "~0.4.4",
+    "html-webpack-plugin": "~2.24.1",
+    "http-proxy-middleware": "~0.17.2",
+    "husky": "~0.11.9",
     "ignore-styles": "2.0.0",
-    "image-webpack-loader": "^1.8.0",
+    "image-webpack-loader": "~3.0.0",
-    "istanbul": "^1.0.0-alpha.2",
+    "istanbul": "~1.0.0-alpha.2",
     "jsdom": "9.2.1",
-    "json-loader": "^0.5.4",
+    "json-loader": "~0.5.4",
-    "mocha": "^3.0.0-1",
+    "mocha": "~3.0.0-1",
     "mock-local-storage": "1.0.2",
-    "mock-socket": "^3.0.1",
+    "mock-socket": "~3.0.1",
-    "nock": "^8.0.0",
+    "nock": "~8.0.0",
-    "postcss-import": "^8.1.2",
+    "postcss-import": "8.1.0",
-    "postcss-loader": "^0.8.1",
+    "postcss-loader": "~1.1.1",
-    "postcss-nested": "^1.0.0",
+    "postcss-nested": "~1.0.0",
-    "postcss-simple-vars": "^3.0.0",
+    "postcss-simple-vars": "~3.0.0",
-    "raw-loader": "^0.5.1",
+    "progress": "~1.1.8",
-    "react-addons-perf": "~15.3.2",
+    "raw-loader": "~0.5.1",
-    "react-addons-test-utils": "~15.3.2",
+    "react-addons-perf": "~15.4.1",
-    "react-copy-to-clipboard": "^4.2.3",
+    "react-addons-test-utils": "~15.4.1",
-    "react-dom": "~15.3.2",
+    "react-hot-loader": "~3.0.0-beta.6",
-    "react-hot-loader": "~1.3.0",
+    "rucksack-css": "~0.8.6",
-    "rucksack-css": "^0.8.6",
+    "sinon": "~1.17.4",
-    "sinon": "^1.17.4",
+    "sinon-as-promised": "~4.0.2",
-    "sinon-as-promised": "^4.0.2",
+    "sinon-chai": "~2.8.0",
-    "sinon-chai": "^2.8.0",
+    "style-loader": "~0.13.0",
-    "style-loader": "^0.13.0",
+    "url-loader": "~0.5.7",
-    "url-loader": "^0.5.7",
+    "webpack": "~2.1.0-beta.27",
-    "webpack": "^1.13.2",
+    "webpack-dev-middleware": "~1.8.4",
-    "webpack-dev-server": "^1.15.2",
     "webpack-error-notification": "0.1.6",
     "webpack-hot-middleware": "~2.13.2",
-    "websocket": "^1.0.23"
+    "websocket": "~1.0.23"
   },
   "dependencies": {
-    "bignumber.js": "^2.3.0",
+    "bignumber.js": "~2.3.0",
     "blockies": "0.0.2",
-    "brace": "^0.9.0",
+    "brace": "~0.9.0",
-    "bytes": "^2.4.0",
+    "bytes": "~2.4.0",
-    "chart.js": "^2.3.0",
+    "chart.js": "~2.3.0",
-    "es6-error": "^4.0.0",
+    "es6-error": "~4.0.0",
-    "es6-promise": "^3.2.1",
+    "es6-promise": "~3.2.1",
-    "ethereumjs-tx": "^1.1.2",
+    "ethereumjs-tx": "~1.1.2",
-    "file-saver": "^1.3.3",
+    "eventemitter3": "~2.0.2",
-    "format-json": "^1.0.3",
+    "file-saver": "~1.3.3",
-    "format-number": "^2.0.1",
+    "format-json": "~1.0.3",
-    "geopattern": "^1.2.3",
+    "format-number": "~2.0.1",
-    "isomorphic-fetch": "^2.2.1",
+    "geopattern": "~1.2.3",
-    "js-sha3": "^0.5.2",
+    "isomorphic-fetch": "~2.2.1",
-    "lodash": "^4.11.1",
+    "js-sha3": "~0.5.2",
-    "marked": "^0.3.6",
+    "lodash": "~4.11.1",
-    "material-ui": "0.16.1",
+    "marked": "~0.3.6",
-    "material-ui-chip-input": "^0.8.0",
+    "material-ui": "~0.16.4",
-    "mobx": "^2.6.1",
+    "material-ui-chip-input": "~0.11.1",
-    "mobx-react": "^3.5.8",
+    "mobx": "~2.6.1",
-    "mobx-react-devtools": "^4.2.9",
+    "mobx-react": "~3.5.8",
-    "moment": "^2.14.1",
+    "mobx-react-devtools": "~4.2.9",
-    "phoneformat.js": "^1.0.3",
+    "moment": "~2.14.1",
-    "qs": "^6.3.0",
+    "phoneformat.js": "~1.0.3",
-    "react": "~15.3.2",
+    "qs": "~6.3.0",
-    "react-ace": "^4.0.0",
+    "react": "~15.4.1",
-    "react-addons-css-transition-group": "~15.3.2",
+    "react-ace": "~4.0.0",
-    "react-chartjs-2": "^1.5.0",
+    "react-addons-css-transition-group": "~15.4.1",
-    "react-dom": "~15.3.2",
+    "react-chartjs-2": "~1.5.0",
-    "react-dropzone": "^3.7.3",
+    "react-copy-to-clipboard": "~4.2.3",
-    "react-redux": "^4.4.5",
+    "react-dom": "~15.4.1",
-    "react-router": "^2.6.1",
+    "react-dropzone": "~3.7.3",
-    "react-router-redux": "^4.0.5",
+    "react-redux": "~4.4.5",
-    "react-tap-event-plugin": "~1.0.0",
+    "react-router": "~2.6.1",
-    "react-tooltip": "^2.0.3",
+    "react-router-redux": "~4.0.5",
-    "recharts": "^0.15.2",
+    "react-tap-event-plugin": "~2.0.1",
-    "redux": "^3.5.2",
+    "react-tooltip": "~2.0.3",
-    "redux-actions": "^0.10.1",
+    "recharts": "~0.15.2",
-    "redux-thunk": "^2.1.0",
+    "redux": "~3.5.2",
-    "rlp": "^2.0.0",
+    "redux-actions": "~0.10.1",
-    "scryptsy": "^2.0.0",
+    "redux-thunk": "~2.1.0",
+    "rlp": "~2.0.0",
+    "scryptsy": "~2.0.0",
     "solc": "ngotchac/solc-js",
-    "store": "^1.3.20",
+    "store": "~1.3.20",
-    "utf8": "^2.1.1",
+    "utf8": "~2.1.1",
-    "valid-url": "^1.0.9",
+    "valid-url": "~1.0.9",
-    "validator": "^5.7.0",
+    "validator": "~5.7.0",
-    "web3": "^0.17.0-beta",
+    "web3": "~0.17.0-beta",
-    "whatwg-fetch": "^1.0.0",
+    "whatwg-fetch": "~1.0.0",
-    "worker-loader": "^0.7.1"
+    "worker-loader": "~0.7.1"
   }
 }

js/src/3rdparty/sms-verification/index.js

@@ -27,9 +27,10 @@ export const termsOfService = (
   </ul>
 );
 
-export const postToServer = (query) => {
+export const postToServer = (query, isTestnet = false) => {
+  const port = isTestnet ? 8443 : 443;
   query = stringify(query);
-  return fetch('https://sms-verification.parity.io/?' + query, {
+  return fetch(`https://sms-verification.parity.io:${port}/?` + query, {
     method: 'POST', mode: 'cors', cache: 'no-store'
   })
   .then((res) => {

js/src/abi/util/slice.js

@@ -27,9 +27,5 @@ export function sliceData (_data) {
     data = padAddress('');
   }
 
-  if (data.length % 64) {
-    throw new Error(`Invalid data length (not mod 64) passed to sliceData, ${data}, % 64 == ${data.length % 64}`);
-  }
-
   return data.match(/.{1,64}/g);
 }

js/src/abi/util/slice.spec.js

@@ -21,10 +21,6 @@ describe('abi/util/slice', () => {
     const slice1 = '131a3afc00d1b1e3461b955e53fc866dcf303b3eb9f4c16f89e388930f48134b';
     const slice2 = '2124768576358735263578356373526387638357635873563586353756358763';
 
-    it('throws an error on mod 64 != 0', () => {
-      expect(() => sliceData('123')).to.throw(/sliceData/);
-    });
-
     it('returns an empty array when length === 0', () => {
       expect(sliceData('')).to.deep.equal([]);
     });

js/src/api/contract/contract.js

@@ -15,16 +15,16 @@
 // along with Parity.  If not, see <http://www.gnu.org/licenses/>.
 
 import Abi from '../../abi';
-import Api from '../api';
-import { isInstanceOf } from '../util/types';
 
 let nextSubscriptionId = 0;
 
 export default class Contract {
   constructor (api, abi) {
-    if (!isInstanceOf(api, Api)) {
+    if (!api) {
       throw new Error('API instance needs to be provided to Contract');
-    } else if (!abi) {
+    }
+
+    if (!abi) {
       throw new Error('ABI needs to be provided to Contract instance');
     }
 
@@ -240,9 +240,29 @@ export default class Contract {
       return this.unsubscribe(subscriptionId);
     };
 
+    event.getAllLogs = (options = {}) => {
+      return this.getAllLogs(event);
+    };
+
     return event;
   }
 
+  getAllLogs (event, _options) {
+    // Options as first parameter
+    if (!_options && event && event.topics) {
+      return this.getAllLogs(null, event);
+    }
+
+    const options = this._getFilterOptions(event, _options);
+    return this._api.eth
+      .getLogs({
+        fromBlock: 0,
+        toBlock: 'latest',
+        ...options
+      })
+      .then((logs) => this.parseEventLogs(logs));
+  }
+
   _findEvent (eventName = null) {
     const event = eventName
       ? this._events.find((evt) => evt.name === eventName)
@@ -256,7 +276,7 @@ export default class Contract {
     return event;
   }
 
-  _createEthFilter (event = null, _options) {
+  _getFilterOptions (event = null, _options = {}) {
     const optionTopics = _options.topics || [];
     const signature = event && event.signature || null;
 
@@ -271,6 +291,11 @@ export default class Contract {
       topics
     });
 
+    return options;
+  }
+
+  _createEthFilter (event = null, _options) {
+    const options = this._getFilterOptions(event, _options);
     return this._api.eth.newFilter(options);
   }
 

js/src/api/format/input.js

@@ -17,7 +17,7 @@
 import BigNumber from 'bignumber.js';
 
 import { isArray, isHex, isInstanceOf, isString } from '../util/types';
-import { padLeft } from '../util/format';
+import { padLeft, toHex } from '../util/format';
 
 export function inAddress (address) {
   // TODO: address validation if we have upper-lower addresses
@@ -100,15 +100,7 @@ export function inFilter (options) {
 }
 
 export function inHex (str) {
-  if (str && str.toString) {
+  return toHex(str);
-    str = str.toString(16);
-  }
-
-  if (str && str.substr(0, 2) === '0x') {
-    return str.toLowerCase();
-  }
-
-  return `0x${(str || '').toLowerCase()}`;
 }
 
 export function inNumber10 (number) {

js/src/api/format/output.js

@@ -144,7 +144,8 @@ export function outSignerRequest (request) {
           break;
 
         case 'payload':
-          request[key].transaction = outTransaction(request[key].transaction);
+          request[key].signTransaction = outTransaction(request[key].signTransaction);
+          request[key].sendTransaction = outTransaction(request[key].sendTransaction);
           break;
       }
     });

js/src/api/rpc/eth/eth.js

@@ -146,7 +146,8 @@ export default class Eth {
 
   getLogs (options) {
     return this._transport
-      .execute('eth_getLogs', inFilter(options));
+      .execute('eth_getLogs', inFilter(options))
+      .then((logs) => logs.map(outLog));
   }
 
   getLogsEx (options) {

js/src/api/util/format.js

@@ -15,7 +15,6 @@
 // along with Parity.  If not, see <http://www.gnu.org/licenses/>.
 
 import { range } from 'lodash';
-import { inHex } from '../format/input';
 
 export function bytesToHex (bytes) {
   return '0x' + bytes.map((b) => ('0' + b.toString(16)).slice(-2)).join('');
@@ -33,16 +32,32 @@ export function hex2Ascii (_hex) {
   return str;
 }
 
+export function bytesToAscii (bytes) {
+  return bytes.map((b) => String.fromCharCode(b % 512)).join('');
+}
+
 export function asciiToHex (string) {
   return '0x' + string.split('').map((s) => s.charCodeAt(0).toString(16)).join('');
 }
 
 export function padRight (input, length) {
-  const value = inHex(input).substr(2, length * 2);
+  const value = toHex(input).substr(2, length * 2);
   return '0x' + value + range(length * 2 - value.length).map(() => '0').join('');
 }
 
 export function padLeft (input, length) {
-  const value = inHex(input).substr(2, length * 2);
+  const value = toHex(input).substr(2, length * 2);
   return '0x' + range(length * 2 - value.length).map(() => '0').join('') + value;
 }
+
+export function toHex (str) {
+  if (str && str.toString) {
+    str = str.toString(16);
+  }
+
+  if (str && str.substr(0, 2) === '0x') {
+    return str.toLowerCase();
+  }
+
+  return `0x${(str || '').toLowerCase()}`;
+}

js/src/contracts/abi/badgereg.json

@@ -0,0 +1 @@
+[{"constant":false,"inputs":[{"name":"_new","type":"address"}],"name":"setOwner","outputs":[],"payable":false,"type":"function"},{"constant":false,"inputs":[{"name":"_addr","type":"address"},{"name":"_name","type":"bytes32"}],"name":"register","outputs":[{"name":"","type":"bool"}],"payable":false,"type":"function"},{"constant":true,"inputs":[{"name":"_name","type":"bytes32"}],"name":"fromName","outputs":[{"name":"id","type":"uint256"},{"name":"addr","type":"address"},{"name":"owner","type":"address"}],"payable":false,"type":"function"},{"constant":true,"inputs":[],"name":"badgeCount","outputs":[{"name":"","type":"uint256"}],"payable":false,"type":"function"},{"constant":false,"inputs":[{"name":"_fee","type":"uint256"}],"name":"setFee","outputs":[],"payable":false,"type":"function"},{"constant":true,"inputs":[{"name":"_id","type":"uint256"},{"name":"_key","type":"bytes32"}],"name":"meta","outputs":[{"name":"","type":"bytes32"}],"payable":false,"type":"function"},{"constant":true,"inputs":[],"name":"owner","outputs":[{"name":"","type":"address"}],"payable":false,"type":"function"},{"constant":false,"inputs":[],"name":"drain","outputs":[],"payable":false,"type":"function"},{"constant":false,"inputs":[{"name":"_id","type":"uint256"}],"name":"unregister","outputs":[],"payable":false,"type":"function"},{"constant":true,"inputs":[{"name":"_addr","type":"address"}],"name":"fromAddress","outputs":[{"name":"id","type":"uint256"},{"name":"name","type":"bytes32"},{"name":"owner","type":"address"}],"payable":false,"type":"function"},{"constant":true,"inputs":[{"name":"_id","type":"uint256"}],"name":"badge","outputs":[{"name":"addr","type":"address"},{"name":"name","type":"bytes32"},{"name":"owner","type":"address"}],"payable":false,"type":"function"},{"constant":false,"inputs":[{"name":"_id","type":"uint256"},{"name":"_key","type":"bytes32"},{"name":"_value","type":"bytes32"}],"name":"setMeta","outputs":[],"payable":false,"type":"function"},{"constant":false,"inputs":[{"name":"_addr","type":"address"},{"name":"_name","type":"bytes32"},{"name":"_owner","type":"address"}],"name":"registerAs","outputs":[{"name":"","type":"bool"}],"payable":false,"type":"function"},{"constant":true,"inputs":[],"name":"fee","outputs":[{"name":"","type":"uint256"}],"payable":false,"type":"function"},{"anonymous":false,"inputs":[{"indexed":true,"name":"name","type":"bytes32"},{"indexed":true,"name":"id","type":"uint256"},{"indexed":false,"name":"addr","type":"address"}],"name":"Registered","type":"event"},{"anonymous":false,"inputs":[{"indexed":true,"name":"name","type":"bytes32"},{"indexed":true,"name":"id","type":"uint256"}],"name":"Unregistered","type":"event"},{"anonymous":false,"inputs":[{"indexed":true,"name":"id","type":"uint256"},{"indexed":true,"name":"key","type":"bytes32"},{"indexed":false,"name":"value","type":"bytes32"}],"name":"MetaChanged","type":"event"},{"anonymous":false,"inputs":[{"indexed":true,"name":"old","type":"address"},{"indexed":true,"name":"current","type":"address"}],"name":"NewOwner","type":"event"}]

js/src/contracts/abi/certifier.json

@@ -0,0 +1 @@
+[{"constant":true,"inputs":[{"name":"_who","type":"address"},{"name":"_field","type":"string"}],"name":"getAddress","outputs":[{"name":"","type":"address"}],"payable":false,"type":"function"},{"constant":true,"inputs":[{"name":"_who","type":"address"},{"name":"_field","type":"string"}],"name":"getUint","outputs":[{"name":"","type":"uint256"}],"payable":false,"type":"function"},{"constant":true,"inputs":[{"name":"_who","type":"address"}],"name":"certified","outputs":[{"name":"","type":"bool"}],"payable":false,"type":"function"},{"constant":true,"inputs":[{"name":"_who","type":"address"},{"name":"_field","type":"string"}],"name":"get","outputs":[{"name":"","type":"bytes32"}],"payable":false,"type":"function"},{"anonymous":false,"inputs":[{"indexed":true,"name":"who","type":"address"}],"name":"Confirmed","type":"event"},{"anonymous":false,"inputs":[{"indexed":true,"name":"who","type":"address"}],"name":"Revoked","type":"event"}]

js/src/contracts/abi/index.js

@@ -14,6 +14,7 @@
 // You should have received a copy of the GNU General Public License
 // along with Parity.  If not, see <http://www.gnu.org/licenses/>.
 
+import badgereg from './badgereg.json';
 import basiccoin from './basiccoin.json';
 import basiccoinmanager from './basiccoinmanager.json';
 import dappreg from './dappreg.json';
@@ -28,6 +29,7 @@ import tokenreg from './tokenreg.json';
 import wallet from './wallet.json';
 
 export {
+  badgereg,
   basiccoin,
   basiccoinmanager,
   dappreg,

js/src/contracts/abi/sms-verification.json

@@ -1 +1 @@
-[{"constant":false,"inputs":[{"name":"_new","type":"address"}],"name":"setOwner","outputs":[],"payable":false,"type":"function"},{"constant":false,"inputs":[{"name":"_who","type":"address"}],"name":"certify","outputs":[],"payable":false,"type":"function"},{"constant":false,"inputs":[],"name":"request","outputs":[],"payable":true,"type":"function"},{"constant":false,"inputs":[{"name":"_who","type":"address"},{"name":"_puzzle","type":"bytes32"}],"name":"puzzle","outputs":[],"payable":false,"type":"function"},{"constant":true,"inputs":[{"name":"_who","type":"address"},{"name":"_field","type":"string"}],"name":"getAddress","outputs":[{"name":"","type":"address"}],"payable":false,"type":"function"},{"constant":false,"inputs":[{"name":"_new","type":"uint256"}],"name":"setFee","outputs":[],"payable":false,"type":"function"},{"constant":false,"inputs":[{"name":"_who","type":"address"}],"name":"revoke","outputs":[],"payable":false,"type":"function"},{"constant":false,"inputs":[{"name":"_code","type":"bytes32"}],"name":"confirm","outputs":[],"payable":false,"type":"function"},{"constant":true,"inputs":[],"name":"owner","outputs":[{"name":"","type":"address"}],"payable":false,"type":"function"},{"constant":false,"inputs":[],"name":"drain","outputs":[],"payable":false,"type":"function"},{"constant":true,"inputs":[],"name":"delegate","outputs":[{"name":"","type":"address"}],"payable":false,"type":"function"},{"constant":true,"inputs":[{"name":"_who","type":"address"},{"name":"_field","type":"string"}],"name":"getUint","outputs":[{"name":"","type":"uint256"}],"payable":false,"type":"function"},{"constant":false,"inputs":[{"name":"_new","type":"address"}],"name":"setDelegate","outputs":[],"payable":false,"type":"function"},{"constant":true,"inputs":[{"name":"_who","type":"address"}],"name":"certified","outputs":[{"name":"","type":"bool"}],"payable":false,"type":"function"},{"constant":true,"inputs":[],"name":"fee","outputs":[{"name":"","type":"uint256"}],"payable":false,"type":"function"},{"constant":true,"inputs":[{"name":"_who","type":"address"},{"name":"_field","type":"string"}],"name":"get","outputs":[{"name":"","type":"bytes32"}],"payable":false,"type":"function"},{"anonymous":false,"inputs":[{"indexed":true,"name":"who","type":"address"}],"name":"Requested","type":"event"},{"anonymous":false,"inputs":[{"indexed":true,"name":"who","type":"address"},{"indexed":false,"name":"puzzle","type":"bytes32"}],"name":"Puzzled","type":"event"},{"anonymous":false,"inputs":[{"indexed":true,"name":"who","type":"address"}],"name":"Confirmed","type":"event"},{"anonymous":false,"inputs":[{"indexed":true,"name":"who","type":"address"}],"name":"Revoked","type":"event"},{"anonymous":false,"inputs":[{"indexed":true,"name":"old","type":"address"},{"indexed":true,"name":"current","type":"address"}],"name":"NewOwner","type":"event"}]
+[{"constant":false,"inputs":[{"name":"_new","type":"address"}],"name":"setOwner","outputs":[],"payable":false,"type":"function"},{"constant":false,"inputs":[{"name":"_who","type":"address"}],"name":"certify","outputs":[],"payable":false,"type":"function"},{"constant":false,"inputs":[],"name":"request","outputs":[],"payable":true,"type":"function"},{"constant":false,"inputs":[{"name":"_who","type":"address"},{"name":"_puzzle","type":"bytes32"}],"name":"puzzle","outputs":[],"payable":false,"type":"function"},{"constant":true,"inputs":[{"name":"_who","type":"address"},{"name":"_field","type":"string"}],"name":"getAddress","outputs":[{"name":"","type":"address"}],"payable":false,"type":"function"},{"constant":false,"inputs":[{"name":"_new","type":"uint256"}],"name":"setFee","outputs":[],"payable":false,"type":"function"},{"constant":false,"inputs":[{"name":"_who","type":"address"}],"name":"revoke","outputs":[],"payable":false,"type":"function"},{"constant":false,"inputs":[{"name":"_code","type":"bytes32"}],"name":"confirm","outputs":[{"name":"","type":"bool"}],"payable":false,"type":"function"},{"constant":true,"inputs":[],"name":"owner","outputs":[{"name":"","type":"address"}],"payable":false,"type":"function"},{"constant":false,"inputs":[],"name":"drain","outputs":[],"payable":false,"type":"function"},{"constant":true,"inputs":[],"name":"delegate","outputs":[{"name":"","type":"address"}],"payable":false,"type":"function"},{"constant":true,"inputs":[{"name":"_who","type":"address"},{"name":"_field","type":"string"}],"name":"getUint","outputs":[{"name":"","type":"uint256"}],"payable":false,"type":"function"},{"constant":false,"inputs":[{"name":"_new","type":"address"}],"name":"setDelegate","outputs":[],"payable":false,"type":"function"},{"constant":true,"inputs":[{"name":"_who","type":"address"}],"name":"certified","outputs":[{"name":"","type":"bool"}],"payable":false,"type":"function"},{"constant":true,"inputs":[],"name":"fee","outputs":[{"name":"","type":"uint256"}],"payable":false,"type":"function"},{"constant":true,"inputs":[{"name":"_who","type":"address"},{"name":"_field","type":"string"}],"name":"get","outputs":[{"name":"","type":"bytes32"}],"payable":false,"type":"function"},{"anonymous":false,"inputs":[{"indexed":true,"name":"who","type":"address"}],"name":"Requested","type":"event"},{"anonymous":false,"inputs":[{"indexed":true,"name":"who","type":"address"},{"indexed":false,"name":"puzzle","type":"bytes32"}],"name":"Puzzled","type":"event"},{"anonymous":false,"inputs":[{"indexed":true,"name":"who","type":"address"}],"name":"Confirmed","type":"event"},{"anonymous":false,"inputs":[{"indexed":true,"name":"who","type":"address"}],"name":"Revoked","type":"event"},{"anonymous":false,"inputs":[{"indexed":true,"name":"old","type":"address"},{"indexed":true,"name":"current","type":"address"}],"name":"NewOwner","type":"event"}]

js/src/contracts/badgereg.js

@@ -0,0 +1,66 @@
+// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// This file is part of Parity.
+
+// Parity is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+
+// Parity is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+
+// You should have received a copy of the GNU General Public License
+// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
+
+import { bytesToHex, hex2Ascii } from '../api/util/format';
+
+import ABI from './abi/certifier.json';
+
+const ZERO = '0x0000000000000000000000000000000000000000000000000000000000000000';
+
+export default class BadgeReg {
+  constructor (api, registry) {
+    this._api = api;
+    this._registry = registry;
+
+    registry.getContract('badgereg');
+    this.certifiers = {}; // by name
+    this.contracts = {}; // by name
+  }
+
+  fetchCertifier (name) {
+    if (this.certifiers[name]) {
+      return Promise.resolve(this.certifiers[name]);
+    }
+    return this._registry.getContract('badgereg')
+      .then((badgeReg) => {
+        return badgeReg.instance.fromName.call({}, [name])
+        .then(([ id, address ]) => {
+          return Promise.all([
+            badgeReg.instance.meta.call({}, [id, 'TITLE']),
+            badgeReg.instance.meta.call({}, [id, 'IMG'])
+          ])
+            .then(([ title, img ]) => {
+              title = bytesToHex(title);
+              title = title === ZERO ? null : hex2Ascii(title);
+              if (bytesToHex(img) === ZERO) img = null;
+
+              const data = { address, name, title, icon: img };
+              this.certifiers[name] = data;
+              return data;
+            });
+        });
+      });
+  }
+
+  checkIfCertified (certifier, address) {
+    if (!this.contracts[certifier]) {
+      this.contracts[certifier] = this._api.newContract(ABI, certifier);
+    }
+    const contract = this.contracts[certifier];
+
+    return contract.instance.certified.call({}, [address]);
+  }
+}

js/src/contracts/contracts.js

@@ -19,7 +19,8 @@ import Registry from './registry';
 import SignatureReg from './signaturereg';
 import TokenReg from './tokenreg';
 import GithubHint from './githubhint';
-import smsVerification from './sms-verification';
+import * as smsVerification from './sms-verification';
+import BadgeReg from './badgereg';
 
 let instance = null;
 
@@ -33,6 +34,7 @@ export default class Contracts {
     this._signaturereg = new SignatureReg(api, this._registry);
     this._tokenreg = new TokenReg(api, this._registry);
     this._githubhint = new GithubHint(api, this._registry);
+    this.badgeReg = new BadgeReg(api, this._registry);
   }
 
   get registry () {

js/src/contracts/sms-verification.js

@@ -14,6 +14,8 @@
 // You should have received a copy of the GNU General Public License
 // along with Parity.  If not, see <http://www.gnu.org/licenses/>.
 
+import subscribeToEvent from '../util/subscribe-to-event';
+
 export const checkIfVerified = (contract, account) => {
   return contract.instance.certified.call({}, [account]);
 };
@@ -50,3 +52,36 @@ export const checkIfRequested = (contract, account) => {
       });
   });
 };
+
+const blockNumber = (api) => {
+  return new Promise((resolve, reject) => {
+    api.subscribe('eth_blockNumber', (err, block) => {
+      if (err) {
+        return reject(err);
+      }
+      resolve(block);
+    })
+    .then((subscription) => {
+      api.unsubscribe(subscription);
+    })
+    .catch(reject);
+  });
+};
+
+export const awaitPuzzle = (api, contract, account) => {
+  return blockNumber(api)
+    .then((block) => {
+      return new Promise((resolve, reject) => {
+        const subscription = subscribeToEvent(contract, 'Puzzled', {
+          from: block.toNumber(),
+          filter: (log) => log.params.who.value === account
+        });
+        subscription.once('error', reject);
+        subscription.once('log', subscription.unsubscribe);
+        subscription.once('log', resolve);
+        subscription.once('timeout', () => {
+          reject(new Error('Timed out waiting for the puzzle.'));
+        });
+      });
+    });
+};

js/src/dapps/basiccoin.html

@@ -1,17 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <meta charset="utf-8">
-    <meta name="viewport" content="width=device-width">
-    <meta http-equiv="X-UA-Compatible" content="IE=edge">
-    <link rel="icon" href="/parity-logo-black-no-text.png" type="image/png">
-    <title>Basic Token Deployment</title>
-  </head>
-  <body>
-    <div id="container"></div>
-    <script src="vendor.js"></script>
-    <script src="commons.js"></script>
-    <script src="/parity-utils/parity.js"></script>
-    <script src="basiccoin.js"></script>
-  </body>
-</html>

js/src/dapps/basiccoin.js

@@ -32,7 +32,6 @@ const routerHistory = useRouterHistory(createHashHistory)({});
 import '../../assets/fonts/Roboto/font.css';
 import '../../assets/fonts/RobotoMono/font.css';
 import './style.css';
-import './basiccoin.html';
 
 ReactDOM.render(
   <Router history={ routerHistory }>

js/src/dapps/dappreg.html

@@ -1,17 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <meta charset="utf-8">
-    <meta name="viewport" content="width=device-width">
-    <meta http-equiv="X-UA-Compatible" content="IE=edge">
-    <link rel="icon" href="/parity-logo-black-no-text.png" type="image/png">
-    <title>Dapp Registry</title>
-  </head>
-  <body>
-    <div id="container"></div>
-    <script src="vendor.js"></script>
-    <script src="commons.js"></script>
-    <script src="/parity-utils/parity.js"></script>
-    <script src="dappreg.js"></script>
-  </body>
-</html>

js/src/dapps/dappreg.js

@@ -17,17 +17,14 @@
 import React from 'react';
 import ReactDOM from 'react-dom';
 import injectTapEventPlugin from 'react-tap-event-plugin';
-import { useStrict } from 'mobx';
 
 injectTapEventPlugin();
-useStrict(true);
 
 import Application from './dappreg/Application';
 
 import '../../assets/fonts/Roboto/font.css';
 import '../../assets/fonts/RobotoMono/font.css';
 import './style.css';
-import './dappreg.html';
 
 ReactDOM.render(
   <Application />,

js/src/dapps/githubhint.html

@@ -1,16 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <meta charset="utf-8">
-    <meta name="viewport" content="width=device-width">
-    <meta http-equiv="X-UA-Compatible" content="IE=edge">
-    <link rel="icon" href="/parity-logo-black-no-text.png" type="image/png">
-    <title>GitHub Hint</title>
-  </head>
-  <body>
-    <div id="container"></div>
-    <script src="vendor.js"></script>
-    <script src="commons.js"></script>
-    <script src="githubhint.js"></script>
-  </body>
-</html>

js/src/dapps/githubhint.js

@@ -25,7 +25,6 @@ import Application from './githubhint/Application';
 import '../../assets/fonts/Roboto/font.css';
 import '../../assets/fonts/RobotoMono/font.css';
 import './style.css';
-import './githubhint.html';
 
 ReactDOM.render(
   <Application />,

js/src/dapps/index.ejs

@@ -0,0 +1,37 @@
+<!DOCTYPE html>
+<html>
+  <head>
+    <meta charset="utf-8">
+    <meta name="viewport" content="width=device-width">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge">
+    <title><%= htmlWebpackPlugin.options.title %></title>
+    <style>
+      html, body, #container {
+        width: 100%;
+        min-height: 100%;
+        margin: 0;
+        padding: 0;
+        background: white;
+        font-family: 'Roboto', sans-serif;
+        font-size: 16px;
+        font-weight: 300;
+      }
+
+      .loading {
+        text-align: center;
+        padding-top: 5em;
+        font-size: 2em;
+        color: #999;
+      }
+    </style>
+  </head>
+  <body>
+    <div id="container">
+      <div class="loading">Loading</div>
+    </div>
+    <script src="vendor.js"></script>
+    <% if (!htmlWebpackPlugin.options.secure) { %>
+      <script src="/parity-utils/parity.js"></script>
+    <% } %>
+  </body>
+</html>

js/src/dapps/index.js

@@ -0,0 +1,25 @@
+// 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/>.
+
+module.exports = [
+  { name: 'basiccoin', entry: 'basiccoin.js', title: 'Basic Token Deployment' },
+  { name: 'dappreg', entry: 'dappreg.js', title: 'Dapp Registry' },
+  { name: 'githubhint', entry: 'githubhint.js', title: 'GitHub Hint', secure: true },
+  { name: 'localtx', entry: 'localtx.js', title: 'Local transactions Viewer', secure: true },
+  { name: 'registry', entry: 'registry.js', title: 'Registry' },
+  { name: 'signaturereg', entry: 'signaturereg.js', title: 'Method Signature Registry' },
+  { name: 'tokenreg', entry: 'tokenreg.js', title: 'Token Registry' }
+];

js/src/dapps/localtx.html

@@ -1,17 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <meta charset="utf-8">
-    <meta name="viewport" content="width=device-width">
-    <meta http-equiv="X-UA-Compatible" content="IE=edge">
-    <link rel="icon" href="/parity-logo-black-no-text.png" type="image/png">
-    <title>Local transactions Viewer</title>
-  </head>
-  <body>
-    <div id="container"></div>
-    <script src="vendor.js"></script>
-    <script src="commons.js"></script>
-    <script src="/parity-utils/parity.js"></script>
-    <script src="localtx.js"></script>
-  </body>
-</html>

js/src/dapps/localtx.js

@@ -25,7 +25,6 @@ import Application from './localtx/Application';
 import '../../assets/fonts/Roboto/font.css';
 import '../../assets/fonts/RobotoMono/font.css';
 import './style.css';
-import './localtx.html';
 
 ReactDOM.render(
   <Application />,

js/src/dapps/localtx/Application/application.js

@@ -158,18 +158,18 @@ export default class Application extends Component {
           { Transaction.renderHeader() }
         </thead>
         <tbody>
-        {
+          {
-          transactions.map((tx, idx) => (
+            transactions.map((tx, idx) => (
-            <Transaction
+              <Transaction
-              key={ tx.transaction.hash }
+                key={ tx.transaction.hash }
-              idx={ idx + 1 }
+                idx={ idx + 1 }
-              isLocal={ tx.isLocal }
+                isLocal={ tx.isLocal }
-              transaction={ tx.transaction }
+                transaction={ tx.transaction }
-              stats={ tx.stats }
+                stats={ tx.stats }
-              blockNumber={ blockNumber }
+                blockNumber={ blockNumber }
-              />
+                />
-          ))
+            ))
-        }
+          }
         </tbody>
       </table>
     );

js/src/dapps/localtx/Transaction/transaction.js

@@ -83,7 +83,7 @@ class BaseTransaction extends Component {
 
     return (
       <span className={ styles.nowrap }>
-       { noOfPropagations } ({ noOfPeers } peers)
+        { noOfPropagations } ({ noOfPeers } peers)
       </span>
     );
   }
@@ -110,7 +110,7 @@ export class Transaction extends BaseTransaction {
   static renderHeader () {
     return (
       <tr className={ styles.header }>
-        <th></th>
+        <th />
         <th>
           Transaction
         </th>
@@ -129,8 +129,7 @@ export class Transaction extends BaseTransaction {
         <th>
           # Propagated
         </th>
-        <th>
+        <th />
-        </th>
       </tr>
     );
   }
@@ -201,7 +200,7 @@ export class LocalTransaction extends BaseTransaction {
   static renderHeader () {
     return (
       <tr className={ styles.header }>
-        <th></th>
+        <th />
         <th>
           Transaction
         </th>

js/src/dapps/registry.html

@@ -1,17 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <meta charset="utf-8">
-    <meta name="viewport" content="width=device-width">
-    <meta http-equiv="X-UA-Compatible" content="IE=edge">
-    <link rel="icon" href="/parity-logo-black-no-text.png" type="image/png">
-    <title>Token Registry</title>
-  </head>
-  <body>
-    <div id="container"></div>
-    <script src="vendor.js"></script>
-    <script src="commons.js"></script>
-    <script src="/parity-utils/parity.js"></script>
-    <script src="registry.js"></script>
-  </body>
-</html>

js/src/dapps/registry.js

@@ -27,7 +27,6 @@ import Container from './registry/Container';
 import '../../assets/fonts/Roboto/font.css';
 import '../../assets/fonts/RobotoMono/font.css';
 import './style.css';
-import './registry.html';
 
 ReactDOM.render(
   <Provider store={ store }>

js/src/dapps/signaturereg.html

@@ -1,17 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <meta charset="utf-8">
-    <meta name="viewport" content="width=device-width">
-    <meta http-equiv="X-UA-Compatible" content="IE=edge">
-    <link rel="icon" href="/parity-logo-black-no-text.png" type="image/png">
-    <title>Method Signature Registry</title>
-  </head>
-  <body>
-    <div id="container"></div>
-    <script src="vendor.js"></script>
-    <script src="commons.js"></script>
-    <script src="/parity-utils/parity.js"></script>
-    <script src="signaturereg.js"></script>
-  </body>
-</html>

js/src/dapps/signaturereg.js

@@ -25,7 +25,6 @@ import Application from './signaturereg/Application';
 import '../../assets/fonts/Roboto/font.css';
 import '../../assets/fonts/RobotoMono/font.css';
 import './style.css';
-import './signaturereg.html';
 
 ReactDOM.render(
   <Application />,

js/src/dapps/signaturereg/Import/import.js

@@ -73,7 +73,7 @@ export default class Import extends Component {
           Provide the ABI (Contract Interface) in the space provided below. Only non-constant functions (names & types) will be imported, while constant functions and existing signatures will be ignored.
         </div>
         <div className={ styles.info }>
-          <textarea rows='8' className={ styles.error } onChange={ this.onAbiEdit }></textarea>
+          <textarea rows='8' className={ styles.error } onChange={ this.onAbiEdit } />
           <div className={ styles.error }>
             { abiError }
           </div>

js/src/dapps/tokenreg.html

@@ -1,17 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <meta charset="utf-8">
-    <meta name="viewport" content="width=device-width">
-    <meta http-equiv="X-UA-Compatible" content="IE=edge">
-    <link rel="icon" href="/parity-logo-black-no-text.png" type="image/png">
-    <title>Token Registry</title>
-  </head>
-  <body>
-    <div id="container"></div>
-    <script src="vendor.js"></script>
-    <script src="commons.js"></script>
-    <script src="/parity-utils/parity.js"></script>
-    <script src="tokenreg.js"></script>
-  </body>
-</html>

js/src/dapps/tokenreg.js

@@ -27,13 +27,12 @@ import Container from './tokenreg/Container';
 import '../../assets/fonts/Roboto/font.css';
 import '../../assets/fonts/RobotoMono/font.css';
 import './style.css';
-import './tokenreg.html';
 
 ReactDOM.render(
   (
-  <Provider store={ store }>
+    <Provider store={ store }>
-    <Container />
+      <Container />
-  </Provider>
+    </Provider>
   ),
   document.querySelector('#container')
 );

js/src/dapps/tokenreg/Tokens/actions.js

@@ -147,7 +147,7 @@ export const loadToken = (index) => (dispatch, getState) => {
       dispatch(setTokenData(index, null));
       dispatch(setTokenLoading(index, false));
 
-      if (!e instanceof TypeError) {
+      if (!(e instanceof TypeError)) {
         console.error(`loadToken #${index} error`, e);
       }
     });

js/src/index.ejs

@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<html>
+  <head>
+    <meta charset="utf-8">
+    <meta name="viewport" content="width=device-width">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge">
+    <title><%= htmlWebpackPlugin.options.title %></title>
+    <style>
+      html, body, #container {
+        width: 100%;
+        height: 100%;
+        margin: 0;
+        padding: 0;
+        background: white;
+        font-family: 'Roboto', sans-serif;
+        font-size: 16px;
+        font-weight: 300;
+      }
+
+      .loading {
+        text-align: center;
+        padding-top: 5em;
+        font-size: 2em;
+        color: #999;
+      }
+    </style>
+  </head>
+  <body>
+    <div id="container">
+      <div class="loading">Loading</span>
+    </div>
+    <script src="vendor.js"></script>
+  </body>
+</html>

js/src/index.html

@@ -1,21 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <meta charset="utf-8">
-    <meta name="viewport" content="width=device-width">
-    <meta http-equiv="X-UA-Compatible" content="IE=edge">
-    <link rel="icon" href="/parity-logo-black-no-text.png" type="image/png">
-    <title>Parity</title>
-    <style>
-      html, body, #container {
-        height: 100%;
-      }
-    </style>
-  </head>
-  <body>
-    <div id="container"></div>
-    <script src="vendor.js"></script>
-    <script src="commons.js"></script>
-    <script src="index.js"></script>
-  </body>
-</html>

js/src/index.js

@@ -22,17 +22,20 @@ es6Promise.polyfill();
 
 import React from 'react';
 import ReactDOM from 'react-dom';
+import { AppContainer } from 'react-hot-loader';
+
 import injectTapEventPlugin from 'react-tap-event-plugin';
 import { createHashHistory } from 'history';
-import { Redirect, Router, Route, useRouterHistory } from 'react-router';
+import { useRouterHistory } from 'react-router';
 import qs from 'querystring';
 
 import SecureApi from './secureApi';
 import ContractInstances from './contracts';
 
 import { initStore } from './redux';
-import { ContextProvider, muiTheme } from './ui';
+import ContextProvider from './ui/ContextProvider';
-import { Accounts, Account, Addresses, Address, Application, Contract, Contracts, WriteContract, Dapp, Dapps, Settings, SettingsBackground, SettingsParity, SettingsProxy, SettingsViews, Signer, Status } from './views';
+import muiTheme from './ui/Theme';
+import MainApplication from './main';
 
 import { setApi } from './redux/providers/apiActions';
 
@@ -41,9 +44,6 @@ import './environment';
 import '../assets/fonts/Roboto/font.css';
 import '../assets/fonts/RobotoMono/font.css';
 
-import styles from './reset.css';
-import './index.html';
-
 injectTapEventPlugin();
 
 if (process.env.NODE_ENV === 'development') {
@@ -77,32 +77,47 @@ window.secureApi = api;
 const routerHistory = useRouterHistory(createHashHistory)({});
 
 ReactDOM.render(
-  <ContextProvider api={ api } muiTheme={ muiTheme } store={ store }>
+  <AppContainer>
-    <Router className={ styles.reset } history={ routerHistory }>
+    <ContextProvider api={ api } muiTheme={ muiTheme } store={ store }>
-      <Redirect from='/' to='/accounts' />
+      <MainApplication
-      <Redirect from='/auth' to='/accounts' query={ {} } />
+        routerHistory={ routerHistory }
-      <Redirect from='/settings' to='/settings/views' />
+      />
-      <Route path='/' component={ Application }>
+    </ContextProvider>
-        <Route path='accounts' component={ Accounts } />
+  </AppContainer>,
-        <Route path='account/:address' component={ Account } />
-        <Route path='addresses' component={ Addresses } />
-        <Route path='address/:address' component={ Address } />
-        <Route path='apps' component={ Dapps } />
-        <Route path='app/:id' component={ Dapp } />
-        <Route path='contracts' component={ Contracts } />
-        <Route path='contracts/write' component={ WriteContract } />
-        <Route path='contract/:address' component={ Contract } />
-        <Route path='settings' component={ Settings }>
-          <Route path='background' component={ SettingsBackground } />
-          <Route path='proxy' component={ SettingsProxy } />
-          <Route path='views' component={ SettingsViews } />
-          <Route path='parity' component={ SettingsParity } />
-        </Route>
-        <Route path='signer' component={ Signer } />
-        <Route path='status' component={ Status } />
-        <Route path='status/:subpage' component={ Status } />
-      </Route>
-    </Router>
-  </ContextProvider>,
   document.querySelector('#container')
 );
+
+if (module.hot) {
+  // module.hot.accept('./redux', () => {
+  //   // redux store has a method replaceReducer
+  //   // const newStore = initStore(api);
+  //   console.warn('REDUX UPDATE');
+  //   // store.replaceReducer(appReducer);
+
+  //   // ReactDOM.render(
+  //   //   <AppContainer>
+  //   //     <ContextProvider api={ api } muiTheme={ muiTheme } store={ newStore }>
+  //   //       <MainApplication
+  //   //         routerHistory={ routerHistory }
+  //   //       />
+  //   //     </ContextProvider>
+  //   //   </AppContainer>,
+  //   //   document.querySelector('#container')
+  //   // );
+  // });
+
+  module.hot.accept('./main.js', () => {
+    require('./main.js');
+
+    ReactDOM.render(
+      <AppContainer>
+        <ContextProvider api={ api } muiTheme={ muiTheme } store={ store }>
+          <MainApplication
+            routerHistory={ routerHistory }
+          />
+        </ContextProvider>
+      </AppContainer>,
+      document.querySelector('#container')
+    );
+  });
+}

js/src/main.js

@@ -0,0 +1,60 @@
+// 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 { Redirect, Router, Route } from 'react-router';
+
+import { Accounts, Account, Addresses, Address, Application, Contract, Contracts, WriteContract, Dapp, Dapps, Settings, SettingsBackground, SettingsParity, SettingsProxy, SettingsViews, Signer, Status } from './views';
+
+import styles from './reset.css';
+
+export default class MainApplication extends Component {
+  static propTypes = {
+    routerHistory: PropTypes.any.isRequired
+  };
+
+  render () {
+    const { routerHistory } = this.props;
+
+    return (
+      <Router className={ styles.reset } history={ routerHistory }>
+        <Redirect from='/' to='/accounts' />
+        <Redirect from='/auth' to='/accounts' query={ {} } />
+        <Redirect from='/settings' to='/settings/views' />
+        <Route path='/' component={ Application }>
+          <Route path='accounts' component={ Accounts } />
+          <Route path='account/:address' component={ Account } />
+          <Route path='addresses' component={ Addresses } />
+          <Route path='address/:address' component={ Address } />
+          <Route path='apps' component={ Dapps } />
+          <Route path='app/:id' component={ Dapp } />
+          <Route path='contracts' component={ Contracts } />
+          <Route path='contracts/write' component={ WriteContract } />
+          <Route path='contract/:address' component={ Contract } />
+          <Route path='settings' component={ Settings }>
+            <Route path='background' component={ SettingsBackground } />
+            <Route path='proxy' component={ SettingsProxy } />
+            <Route path='views' component={ SettingsViews } />
+            <Route path='parity' component={ SettingsParity } />
+          </Route>
+          <Route path='signer' component={ Signer } />
+          <Route path='status' component={ Status } />
+          <Route path='status/:subpage' component={ Status } />
+        </Route>
+      </Router>
+    );
+  }
+}

js/src/modals/CreateAccount/createAccount.js

@@ -20,6 +20,7 @@ import ActionDoneAll from 'material-ui/svg-icons/action/done-all';
 import ContentClear from 'material-ui/svg-icons/content/clear';
 import NavigationArrowBack from 'material-ui/svg-icons/navigation/arrow-back';
 import NavigationArrowForward from 'material-ui/svg-icons/navigation/arrow-forward';
+import PrintIcon from 'material-ui/svg-icons/action/print';
 
 import { Button, Modal } from '../../ui';
 
@@ -32,6 +33,11 @@ import NewImport from './NewImport';
 import RawKey from './RawKey';
 import RecoveryPhrase from './RecoveryPhrase';
 
+import { createIdentityImg } from '../../api/util/identity';
+import print from './print';
+import recoveryPage from './recovery-page.ejs';
+import ParityLogo from '../../../assets/images/parity-logo-black-no-text.svg';
+
 const TITLES = {
   type: 'creation type',
   create: 'create account',
@@ -179,12 +185,18 @@ export default class CreateAccount extends Component {
         ];
 
       case 2:
-        return (
+        return [
+          createType === 'fromNew' || createType === 'fromPhrase' ? (
+            <Button
+              icon={ <PrintIcon /> }
+              label='Print Phrase'
+              onClick={ this.printPhrase } />
+          ) : null,
           <Button
             icon={ <ActionDoneAll /> }
             label='Close'
             onClick={ this.onClose } />
-        );
+        ];
     }
   }
 
@@ -377,4 +389,11 @@ export default class CreateAccount extends Component {
 
     store.dispatch({ type: 'newError', error });
   }
+
+  printPhrase = () => {
+    const { address, phrase, name } = this.state;
+    const identity = createIdentityImg(address);
+
+    print(recoveryPage({ phrase, name, identity, address, logo: ParityLogo }));
+  }
 }

js/src/modals/CreateAccount/print.js

@@ -0,0 +1,63 @@
+// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// This file is part of Parity.
+
+// Parity is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+
+// Parity is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+
+// You should have received a copy of the GNU General Public License
+// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
+
+export const onPrint = (window, cb) => {
+  let called = false; let query, queryFn;
+
+  const onPrint = () => {
+    if (queryFn) {
+      query.removeListener(queryFn);
+    }
+    window.removeEventListener('afterprint', onPrint, false);
+    if (!called) {
+      called = true;
+      cb();
+    }
+  };
+
+  if (window.matchMedia) {
+    queryFn = (query) => {
+      if (!query.matches) {
+        onPrint();
+      }
+    };
+    query = window.matchMedia('print');
+    query.addListener(queryFn);
+  }
+  window.addEventListener('afterprint', onPrint, false);
+};
+
+export default (html) => {
+  const iframe = document.createElement('iframe');
+  iframe.setAttribute('sandbox', 'allow-modals allow-same-origin allow-scripts');
+  iframe.setAttribute('src', '/');
+  iframe.setAttribute('style', 'display: none');
+  document.body.appendChild(iframe);
+  const teardown = () => {
+    // Safari crashes without a timeout.
+    setTimeout(() => document.body.removeChild(iframe), 0);
+  };
+
+  setTimeout(() => {
+    iframe.contentDocument.write(html);
+
+    setTimeout(() => {
+      onPrint(iframe.contentWindow, teardown);
+      iframe.contentWindow.focus();
+      iframe.contentWindow.print();
+    }, 20);
+  }, 0);
+};

js/src/modals/CreateAccount/recovery-page.ejs

@@ -0,0 +1,49 @@
+<!DOCTYPE html>
+
+<html lang="en">
+  <head>
+    <title>Recovery phrase for <%= name %></title>
+    <meta charset="utf-8">
+    <meta name="viewport" content="width=device-width">
+    <style>
+      body {
+        margin: 2em auto;
+        max-width: 30em;
+        padding: 1em;
+        text-align: center;
+        font-size: 110%;
+        font-family: sans-serif;
+        font-weight: 300;
+      }
+      #logo {
+        max-width: 4rem;
+        margin-bottom: 3rem;
+      }
+      p {
+        margin-bottom: 1rem;
+      }
+      figure {
+        margin-bottom: 1rem;
+      }
+      figure.address img {
+        border-radius: 100%;
+      }
+      pre code {
+        display: inline-block;
+        text-align: center;
+        white-space: normal;
+        line-height: 1.3;
+      }
+    </style>
+  </head>
+  <body>
+    <img id="logo" src="<%= logo %>" alt="Parity Logo" />
+    <p>This is your account <em><%= name %></em>:</p>
+    <figure class="address">
+      <img src="<%= identity %>" alt="symbol for the address of the account" />
+      <figcaption><code><%= address %></code></figcaption>
+    </figure>
+    <p>This is the recovery phrase:</p>
+    <pre><code><%= phrase %></code></pre>
+  </body>
+</html>

js/src/modals/DeployContract/deployContract.js

@@ -128,7 +128,7 @@ export default class DeployContract extends Component {
         title={ title }
         waiting={ waiting }
         visible
-        scroll>
+      >
         { this.renderStep() }
       </Modal>
     );

js/src/modals/FirstRun/firstRun.js

@@ -18,6 +18,7 @@ import React, { Component, PropTypes } from 'react';
 import ActionDone from 'material-ui/svg-icons/action/done';
 import ActionDoneAll from 'material-ui/svg-icons/action/done-all';
 import NavigationArrowForward from 'material-ui/svg-icons/navigation/arrow-forward';
+import PrintIcon from 'material-ui/svg-icons/action/print';
 
 import { Button, Modal } from '../../ui';
 
@@ -27,6 +28,11 @@ import Completed from './Completed';
 import TnC from './TnC';
 import Welcome from './Welcome';
 
+import { createIdentityImg } from '../../api/util/identity';
+import print from '../CreateAccount/print';
+import recoveryPage from '../CreateAccount/recovery-page.ejs';
+import ParityLogo from '../../../assets/images/parity-logo-black-no-text.svg';
+
 const STAGE_NAMES = ['welcome', 'terms', 'new account', 'recovery', 'completed'];
 
 export default class FirstRun extends Component {
@@ -107,7 +113,6 @@ export default class FirstRun extends Component {
 
     switch (stage) {
       case 0:
-      case 3:
         return (
           <Button
             icon={ <NavigationArrowForward /> }
@@ -133,6 +138,20 @@ export default class FirstRun extends Component {
             onClick={ this.onCreate } />
         );
 
+      case 3:
+        return [
+          <Button
+            icon={ <PrintIcon /> }
+            label='Print Phrase'
+            onClick={ this.printPhrase }
+          />,
+          <Button
+            icon={ <NavigationArrowForward /> }
+            label='Next'
+            onClick={ this.onNext }
+          />
+        ];
+
       case 4:
         return (
           <Button
@@ -205,4 +224,11 @@ export default class FirstRun extends Component {
 
     store.dispatch({ type: 'newError', error });
   }
+
+  printPhrase = () => {
+    const { address, phrase, name } = this.state;
+    const identity = createIdentityImg(address);
+
+    print(recoveryPage({ phrase, name, identity, address, logo: ParityLogo }));
+  }
 }

js/src/modals/LoadContract/loadContract.js

@@ -62,7 +62,6 @@ export default class LoadContract extends Component {
         title={ title }
         actions={ this.renderDialogActions() }
         visible
-        scroll
       >
         { this.renderBody() }
       </Modal>
@@ -79,16 +78,16 @@ export default class LoadContract extends Component {
     const contractsTab = Object.keys(contracts).length === 0
       ? null
       : (
-      <Tab label='Local' >
+        <Tab label='Local' >
-        { this.renderEditor() }
+          { this.renderEditor() }
 
-        <SelectableList
+          <SelectableList
-          onChange={ this.onClickContract }
+            onChange={ this.onClickContract }
-        >
+          >
-          <Subheader>Saved Contracts</Subheader>
+            <Subheader>Saved Contracts</Subheader>
-          { this.renderContracts(contracts) }
+            { this.renderContracts(contracts) }
-        </SelectableList>
+          </SelectableList>
-      </Tab>
+        </Tab>
       );
 
     return (
@@ -174,9 +173,9 @@ export default class LoadContract extends Component {
         const secondaryText = description || `Saved ${moment(timestamp).fromNow()}`;
         const remove = removable
           ? (
-          <IconButton onTouchTap={ onDelete }>
+            <IconButton onTouchTap={ onDelete }>
-            <DeleteIcon />
+              <DeleteIcon />
-          </IconButton>
+            </IconButton>
           )
           : null;
 

js/src/modals/PasswordManager/passwordManager.js

@@ -22,6 +22,10 @@ import SendIcon from 'material-ui/svg-icons/content/send';
 import { Tabs, Tab } from 'material-ui/Tabs';
 import Paper from 'material-ui/Paper';
 
+import { connect } from 'react-redux';
+import { bindActionCreators } from 'redux';
+import { showSnackbar } from '../../redux/providers/snackbarActions';
+
 import Form, { Input } from '../../ui/Form';
 import { Button, Modal, IdentityName, IdentityIcon } from '../../ui';
 
@@ -30,13 +34,14 @@ import styles from './passwordManager.css';
 const TEST_ACTION = 'TEST_ACTION';
 const CHANGE_ACTION = 'CHANGE_ACTION';
 
-export default class PasswordManager extends Component {
+class PasswordManager extends Component {
   static contextTypes = {
     api: PropTypes.object.isRequired
   }
 
   static propTypes = {
     account: PropTypes.object.isRequired,
+    showSnackbar: PropTypes.func.isRequired,
     onClose: PropTypes.func
   }
 
@@ -98,10 +103,10 @@ export default class PasswordManager extends Component {
 
     const passwordHint = meta && meta.passwordHint
       ? (
-      <span className={ styles.passwordHint }>
+        <span className={ styles.passwordHint }>
-        <span className={ styles.hintLabel }>Hint </span>
+          <span className={ styles.hintLabel }>Hint </span>
-        { meta.passwordHint }
+          { meta.passwordHint }
-      </span>
+        </span>
       )
       : null;
 
@@ -333,7 +338,7 @@ export default class PasswordManager extends Component {
   }
 
   handleChangePassword = () => {
-    const { account } = this.props;
+    const { account, showSnackbar, onClose } = this.props;
     const { currentPass, newPass, repeatNewPass, passwordHint } = this.state;
 
     if (repeatNewPass !== newPass) {
@@ -371,12 +376,9 @@ export default class PasswordManager extends Component {
             .changePassword(account.address, currentPass, newPass)
         ])
           .then(() => {
-            const message = {
+            showSnackbar(<div>Your password has been successfully changed.</div>);
-              value: 'Your password has been successfully changed',
+            this.setState({ waiting: false, showMessage: false });
-              success: true
+            onClose();
-            };
-
-            this.setState({ waiting: false, message, showMessage: true });
           });
       })
       .catch(e => {
@@ -385,3 +387,14 @@ export default class PasswordManager extends Component {
       });
   }
 }
+
+function mapDispatchToProps (dispatch) {
+  return bindActionCreators({
+    showSnackbar
+  }, dispatch);
+}
+
+export default connect(
+  null,
+  mapDispatchToProps
+)(PasswordManager);

js/src/modals/SMSVerification/GatherData/gatherData.js

@@ -53,7 +53,7 @@ export default class GatherData extends Component {
         { this.renderCertified() }
         { this.renderRequested() }
         <Input
-          label={ 'phone number' }
+          label={ 'phone number in international format' }
           hint={ 'the SMS will be sent to this number' }
           error={ isNumberValid ? null : 'invalid number' }
           disabled={ isVerified }

js/src/modals/SMSVerification/SMSVerification.js

@@ -25,7 +25,7 @@ import {
   LOADING,
   QUERY_DATA,
   POSTING_REQUEST, POSTED_REQUEST,
-  REQUESTING_SMS, REQUESTED_SMS,
+  REQUESTING_SMS, QUERY_CODE,
   POSTING_CONFIRMATION, POSTED_CONFIRMATION,
   DONE
 } from './store';
@@ -48,7 +48,7 @@ export default class SMSVerification extends Component {
     [LOADING]: 0,
     [QUERY_DATA]: 1,
     [POSTING_REQUEST]: 2, [POSTED_REQUEST]: 2, [REQUESTING_SMS]: 2,
-    [REQUESTED_SMS]: 3,
+    [QUERY_CODE]: 3,
     [POSTING_CONFIRMATION]: 4, [POSTED_CONFIRMATION]: 4,
     [DONE]: 5
   }
@@ -61,7 +61,7 @@ export default class SMSVerification extends Component {
       <Modal
         actions={ this.renderDialogActions(phase, error, isStepValid) }
         title='verify your account via SMS'
-        visible scroll
+        visible
         current={ phase }
         steps={ ['Prepare', 'Enter Data', 'Request', 'Enter Code', 'Confirm', 'Done!'] }
         waiting={ error ? [] : [ 0, 2, 4 ] }
@@ -137,7 +137,7 @@ export default class SMSVerification extends Component {
       step,
       fee, number, isNumberValid, isVerified, hasRequested,
       requestTx, isCodeValid, confirmationTx,
-      setNumber, setConsentGiven, setCode
+      setCode
     } = this.props.store;
 
     switch (phase) {

js/src/modals/SMSVerification/SendRequest/sendRequest.js

@@ -47,7 +47,7 @@ export default class SendRequest extends Component {
 
       case REQUESTING_SMS:
         return (
-          <p>Requesting an SMS from the Parity server.</p>
+          <p>Requesting an SMS from the Parity server and waiting for the puzzle to be put into the contract.</p>
         );
 
       default:

js/src/modals/SMSVerification/store.js

@@ -20,19 +20,16 @@ import { sha3 } from '../../api/util/sha3';
 
 import Contracts from '../../contracts';
 
-import { checkIfVerified, checkIfRequested } from '../../contracts/sms-verification';
+import { checkIfVerified, checkIfRequested, awaitPuzzle } from '../../contracts/sms-verification';
 import { postToServer } from '../../3rdparty/sms-verification';
 import checkIfTxFailed from '../../util/check-if-tx-failed';
 import waitForConfirmations from '../../util/wait-for-block-confirmations';
 
-const validCode = /^[A-Z\s]+$/i;
-
 export const LOADING = 'fetching-contract';
 export const QUERY_DATA = 'query-data';
 export const POSTING_REQUEST = 'posting-request';
 export const POSTED_REQUEST = 'posted-request';
 export const REQUESTING_SMS = 'requesting-sms';
-export const REQUESTED_SMS = 'requested-sms';
 export const QUERY_CODE = 'query-code';
 export const POSTING_CONFIRMATION = 'posting-confirmation';
 export const POSTED_CONFIRMATION = 'posted-confirmation';
@@ -50,11 +47,9 @@ export default class VerificationStore {
   @observable number = '';
   @observable requestTx = null;
   @observable code = '';
+  @observable isCodeValid = null;
   @observable confirmationTx = null;
 
-  @computed get isCodeValid () {
-    return validCode.test(this.code);
-  }
   @computed get isNumberValid () {
     return phone.isValidNumber(this.number);
   }
@@ -72,20 +67,19 @@ export default class VerificationStore {
         return this.contract && this.fee && this.isVerified !== null && this.hasRequested !== null;
       case QUERY_DATA:
         return this.isNumberValid && this.consentGiven;
-      case REQUESTED_SMS:
-        return this.requestTx;
       case QUERY_CODE:
-        return this.isCodeValid;
+        return this.requestTx && this.isCodeValid === true;
       case POSTED_CONFIRMATION:
-        return this.confirmationTx;
+        return !!this.confirmationTx;
       default:
         return false;
     }
   }
 
-  constructor (api, account) {
+  constructor (api, account, isTestnet) {
     this.api = api;
     this.account = account;
+    this.isTestnet = isTestnet;
 
     this.step = LOADING;
     Contracts.create(api).registry.getContract('smsverification')
@@ -151,7 +145,26 @@ export default class VerificationStore {
   }
 
   @action setCode = (code) => {
+    const { contract, account } = this;
+    if (!contract || !account || code.length === 0) return;
+
+    const confirm = contract.functions.find((fn) => fn.name === 'confirm');
+    const options = { from: account };
+    const values = [ sha3(code) ];
+
     this.code = code;
+    this.isCodeValid = null;
+    confirm.estimateGas(options, values)
+      .then((gas) => {
+        options.gas = gas.mul(1.2).toFixed(0);
+        return confirm.call(options, values);
+      })
+      .then((result) => {
+        this.isCodeValid = result === true;
+      })
+      .catch((err) => {
+        this.error = 'Failed to check if the code is valid: ' + err.message;
+      });
   }
 
   @action sendRequest = () => {
@@ -188,11 +201,15 @@ export default class VerificationStore {
 
     chain
       .then(() => {
-        this.step = REQUESTING_SMS;
+        return api.parity.netChain();
-        return postToServer({ number, address: account });
       })
+      .then((chain) => {
+        this.step = REQUESTING_SMS;
+        return postToServer({ number, address: account }, this.isTestnet);
+      })
+      .then(() => awaitPuzzle(api, contract, account))
       .then(() => {
-        this.step = REQUESTED_SMS;
+        this.step = QUERY_CODE;
       })
       .catch((err) => {
         this.error = 'Failed to request a confirmation SMS: ' + err.message;

js/src/modals/Transfer/Details/details.js

@@ -18,6 +18,8 @@ import BigNumber from 'bignumber.js';
 import React, { Component, PropTypes } from 'react';
 import { Checkbox, MenuItem } from 'material-ui';
 
+import { isEqual } from 'lodash';
+
 import Form, { Input, InputAddressSelect, Select } from '../../../ui/Form';
 
 import imageUnknown from '../../../../assets/images/contracts/unknown-64x64.png';
@@ -29,11 +31,101 @@ const CHECK_STYLE = {
   left: '1em'
 };
 
-export default class Details extends Component {
+class TokenSelect extends Component {
   static contextTypes = {
     api: PropTypes.object
   }
 
+  static propTypes = {
+    onChange: PropTypes.func.isRequired,
+    balance: PropTypes.object.isRequired,
+    images: PropTypes.object.isRequired,
+    tag: PropTypes.string.isRequired
+  };
+
+  componentWillMount () {
+    this.computeTokens();
+  }
+
+  componentWillReceiveProps (nextProps) {
+    const prevTokens = this.props.balance.tokens.map((t) => `${t.token.tag}_${t.value.toNumber()}`);
+    const nextTokens = nextProps.balance.tokens.map((t) => `${t.token.tag}_${t.value.toNumber()}`);
+
+    if (!isEqual(prevTokens, nextTokens)) {
+      this.computeTokens(nextProps);
+    }
+  }
+
+  computeTokens (props = this.props) {
+    const { api } = this.context;
+    const { balance, images } = this.props;
+
+    const items = balance.tokens
+      .filter((token, index) => !index || token.value.gt(0))
+      .map((balance, index) => {
+        const token = balance.token;
+        const isEth = index === 0;
+        let imagesrc = token.image;
+        if (!imagesrc) {
+          imagesrc =
+            images[token.address]
+              ? `${api.dappsUrl}${images[token.address]}`
+              : imageUnknown;
+        }
+        let value = 0;
+
+        if (isEth) {
+          value = api.util.fromWei(balance.value).toFormat(3);
+        } else {
+          const format = balance.token.format || 1;
+          const decimals = format === 1 ? 0 : Math.min(3, Math.floor(format / 10));
+          value = new BigNumber(balance.value).div(format).toFormat(decimals);
+        }
+
+        const label = (
+          <div className={ styles.token }>
+            <img src={ imagesrc } />
+            <div className={ styles.tokenname }>
+              { token.name }
+            </div>
+            <div className={ styles.tokenbalance }>
+              { value }<small> { token.tag }</small>
+            </div>
+          </div>
+        );
+
+        return (
+          <MenuItem
+            key={ token.tag }
+            value={ token.tag }
+            label={ label }>
+            { label }
+          </MenuItem>
+        );
+      });
+
+    this.setState({ items });
+  }
+
+  render () {
+    const { tag, onChange } = this.props;
+    const { items } = this.state;
+
+    return (
+      <Select
+        className={ styles.tokenSelect }
+        label='type of token transfer'
+        hint='type of token to transfer'
+        value={ tag }
+        onChange={ onChange }
+      >
+        { items }
+      </Select>
+    );
+  }
+}
+
+export default class Details extends Component {
   static propTypes = {
     address: PropTypes.string,
     balance: PropTypes.object,
@@ -115,62 +207,15 @@ export default class Details extends Component {
   }
 
   renderTokenSelect () {
-    const { api } = this.context;
     const { balance, images, tag } = this.props;
 
-    const items = balance.tokens
-      .filter((token, index) => !index || token.value.gt(0))
-      .map((balance, index) => {
-        const token = balance.token;
-        const isEth = index === 0;
-        let imagesrc = token.image;
-        if (!imagesrc) {
-          imagesrc =
-            images[token.address]
-              ? `${api.dappsUrl}${images[token.address]}`
-              : imageUnknown;
-        }
-        let value = 0;
-
-        if (isEth) {
-          value = api.util.fromWei(balance.value).toFormat(3);
-        } else {
-          const format = balance.token.format || 1;
-          const decimals = format === 1 ? 0 : Math.min(3, Math.floor(format / 10));
-          value = new BigNumber(balance.value).div(format).toFormat(decimals);
-        }
-
-        const label = (
-          <div className={ styles.token }>
-            <img src={ imagesrc } />
-            <div className={ styles.tokenname }>
-              { token.name }
-            </div>
-            <div className={ styles.tokenbalance }>
-              { value }<small> { token.tag }</small>
-            </div>
-          </div>
-        );
-
-        return (
-          <MenuItem
-            key={ token.tag }
-            value={ token.tag }
-            label={ label }>
-            { label }
-          </MenuItem>
-        );
-      });
-
     return (
-      <Select
+      <TokenSelect
-        className={ styles.tokenSelect }
+        balance={ balance }
-        label='type of token transfer'
+        images={ images }
-        hint='type of token to transfer'
+        tag={ tag }
-        value={ tag }
+        onChange={ this.onChangeToken }
-        onChange={ this.onChangeToken }>
+      />
-        { items }
-      </Select>
     );
   }