Quick fix for missing tree route blocks (#2400)

* Removing extras data from retracted blocks. (#2375)

* Removing extras data from retracted blocks.

* Adding a test case

Conflicts:
	ethcore/src/blockchain/blockchain.rs

* Fixing transaction queue

Conflicts:
	ethcore/src/miner/transaction_queue.rs

* Prioritizing re-imported transactions (#2372)

* Prioritizing re-imported transactions

* Fixing compilation on beta

Conflicts:
	Cargo.lock
	ethcore/src/client/client.rs
	ethcore/src/miner/transaction_queue.rs

* Post-merge fixes

.cargo/config

@@ -1,2 +0,0 @@
-[target.armv7-unknown-linux-gnueabihf]
-linker= "arm-linux-gnueabihf-gcc"

.gitignore

@@ -30,5 +30,3 @@
 
 # Build artifacts
 out/
-
-.vscode

.gitlab-ci.yml

@@ -1,38 +1,27 @@
 stages:
-  - test
-  - js-build
   - build
+  - test
 variables:
   GIT_DEPTH: "3"
-  SIMPLECOV: "true"
+  SIMPLECOV: "true" 
   RUST_BACKTRACE: "1"
-  RUSTFLAGS: ""
-  CARGOFLAGS: ""
 cache:
-  key: "$CI_BUILD_STAGE/$CI_BUILD_REF_NAME"
+  key: "$CI_BUILD_NAME/$CI_BUILD_REF_NAME"
   untracked: true
 linux-stable:
   stage: build
   image: ethcore/rust:stable
   only:
+    - master
     - beta
     - tags
     - stable
   script:
-    - cargo build --release $CARGOFLAGS
+    - cargo build --release --verbose
     - strip target/release/parity
-    - md5sum target/release/parity > parity.md5
-    - sh scripts/deb-build.sh amd64
-    - cp target/release/parity deb/usr/bin/parity
-    - export VER=$(grep -m 1 version Cargo.toml | awk '{print $3}' | tr -d '"' | tr -d "\n")
-    - dpkg-deb -b deb "parity_"$VER"_amd64.deb"
-    - md5sum "parity_"$VER"_amd64.deb" > "parity_"$VER"_amd64.deb.md5"
-    - aws configure set aws_access_key_id $s3_key
+    - aws configure set aws_access_key_id $s3_key 
     - aws configure set aws_secret_access_key $s3_secret
     - aws s3api put-object --bucket builds-parity --key $CI_BUILD_REF_NAME/x86_64-unknown-linux-gnu/parity --body target/release/parity
-    - aws s3api put-object --bucket builds-parity --key $CI_BUILD_REF_NAME/x86_64-unknown-linux-gnu/parity.md5 --body parity.md5
-    - aws s3api put-object --bucket builds-parity --key $CI_BUILD_REF_NAME/x86_64-unknown-linux-gnu/"parity_"$VER"_amd64.deb" --body "parity_"$VER"_amd64.deb"
-    - aws s3api put-object --bucket builds-parity --key $CI_BUILD_REF_NAME/x86_64-unknown-linux-gnu/"parity_"$VER"_amd64.deb.md5" --body "parity_"$VER"_amd64.deb.md5"
   tags:
     - rust
     - rust-stable
@@ -40,15 +29,37 @@ linux-stable:
     paths:
     - target/release/parity
     name: "stable-x86_64-unknown-linux-gnu_parity"
-linux-beta:
+linux-stable-14.04:
   stage: build
-  image: ethcore/rust:beta
+  image: ethcore/rust-14.04:latest
   only:
+    - master
     - beta
     - tags
     - stable
   script:
-    - cargo build --release $CARGOFLAGS
+    - cargo build --release --verbose
+    - strip target/release/parity
+    - aws configure set aws_access_key_id $s3_key 
+    - aws configure set aws_secret_access_key $s3_secret
+    - aws s3api put-object --bucket builds-parity --key $CI_BUILD_REF_NAME/x86_64-unknown-ubuntu_14_04-gnu/parity --body target/release/parity
+  tags:
+    - rust
+    - rust-14.04
+  artifacts:
+    paths:
+    - target/release/parity
+    name: "stable-x86_64-unknown-ubuntu_14_04-gnu_parity"
+linux-beta:
+  stage: build
+  image: ethcore/rust:beta
+  only:
+    - master
+    - beta
+    - tags
+    - stable
+  script:
+    - cargo build --release --verbose
     - strip target/release/parity
   tags:
     - rust
@@ -62,11 +73,12 @@ linux-nightly:
   stage: build
   image: ethcore/rust:nightly
   only:
+    - master
     - beta
     - tags
     - stable
   script:
-    - cargo build --release $CARGOFLAGS
+    - cargo build --release --verbose
     - strip target/release/parity
   tags:
     - rust
@@ -80,19 +92,18 @@ linux-centos:
   stage: build
   image: ethcore/rust-centos:latest
   only:
+    - master
     - beta
     - tags
     - stable
   script:
     - export CXX="g++"
     - export CC="gcc"
-    - cargo build --release $CARGOFLAGS
+    - cargo build --release --verbose
     - strip target/release/parity
-    - md5sum target/release/parity > parity.md5
-    - aws configure set aws_access_key_id $s3_key
+    - aws configure set aws_access_key_id $s3_key 
     - aws configure set aws_secret_access_key $s3_secret
     - aws s3api put-object --bucket builds-parity --key $CI_BUILD_REF_NAME/x86_64-unknown-centos-gnu/parity --body target/release/parity
-    - aws s3api put-object --bucket builds-parity --key $CI_BUILD_REF_NAME/x86_64-unknown-centos-gnu/parity.md5 --body parity.md5
   tags:
     - rust
     - rust-centos
@@ -100,70 +111,25 @@ linux-centos:
     paths:
     - target/release/parity
     name: "x86_64-unknown-centos-gnu_parity"
-  allow_failure: true
-linux-i686:   
-  stage: build   
-  image: ethcore/rust-i686:latest   
-  only:
-    - beta
-#    - tags
-    - stable
-  script:
-    - export HOST_CC=gcc
-    - export HOST_CXX=g++
-    - cargo build --target i686-unknown-linux-gnu --release $CARGOFLAGS
-    - strip target/i686-unknown-linux-gnu/release/parity
-    - md5sum target/i686-unknown-linux-gnu/release/parity > parity.md5
-    - sh scripts/deb-build.sh i386
-    - cp target/i686-unknown-linux-gnu/release/parity deb/usr/bin/parity
-    - export VER=$(grep -m 1 version Cargo.toml | awk '{print $3}' | tr -d '"' | tr -d "\n")
-    - dpkg-deb -b deb "parity_"$VER"_i386.deb"
-    - md5sum "parity_"$VER"_i386.deb" > "parity_"$VER"_i386.deb.md5"
-    - aws configure set aws_access_key_id $s3_key
-    - aws configure set aws_secret_access_key $s3_secret
-    - aws s3api put-object --bucket builds-parity --key $CI_BUILD_REF_NAME/i686-unknown-linux-gnu/parity --body target/i686-unknown-linux-gnu/release/parity
-    - aws s3api put-object --bucket builds-parity --key $CI_BUILD_REF_NAME/i686-unknown-linux-gnu/parity.md5 --body parity.md5
-    - aws s3api put-object --bucket builds-parity --key $CI_BUILD_REF_NAME/i686-unknown-linux-gnu/"parity_"$VER"_i386.deb" --body "parity_"$VER"_i386.deb"
-    - aws s3api put-object --bucket builds-parity --key $CI_BUILD_REF_NAME/i686-unknown-linux-gnu/"parity_"$VER"_i386.deb.md5" --body "parity_"$VER"_i386.deb.md5"
-  tags:
-    - rust
-    - rust-i686
-  artifacts:
-    paths:
-      - target/i686-unknown-linux-gnu/release/parity
-    name: "i686-unknown-linux-gnu"
-  allow_failure: true
 linux-armv7:
   stage: build
   image: ethcore/rust-armv7:latest
   only:
+    - master
     - beta
     - tags
     - stable
   script:
-    - export CC=arm-linux-gnueabihf-gcc
-    - export CXX=arm-linux-gnueabihf-g++
-    - export HOST_CC=gcc
-    - export HOST_CXX=g++
     - rm -rf .cargo
     - mkdir -p .cargo
     - 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 --target armv7-unknown-linux-gnueabihf --release --verbose
     - 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
-    - cp target/armv7-unknown-linux-gnueabihf/release/parity deb/usr/bin/parity
-    - export VER=$(grep -m 1 version Cargo.toml | awk '{print $3}' | tr -d '"' | tr -d "\n")
-    - dpkg-deb -b deb "parity_"$VER"_armhf.deb"
-    - md5sum "parity_"$VER"_armhf.deb" > "parity_"$VER"_armhf.deb.md5"
-    - aws configure set aws_access_key_id $s3_key
+    - aws configure set aws_access_key_id $s3_key 
     - aws configure set aws_secret_access_key $s3_secret
     - aws s3api put-object --bucket builds-parity --key $CI_BUILD_REF_NAME/armv7-unknown-linux-gnueabihf/parity --body target/armv7-unknown-linux-gnueabihf/release/parity
-    - aws s3api put-object --bucket builds-parity --key $CI_BUILD_REF_NAME/armv7-unknown-linux-gnueabihf/parity.md5 --body parity.md5
-    - aws s3api put-object --bucket builds-parity --key $CI_BUILD_REF_NAME/armv7-unknown-linux-gnueabihf/"parity_"$VER"_armhf.deb" --body "parity_"$VER"_armhf.deb"
-    - aws s3api put-object --bucket builds-parity --key $CI_BUILD_REF_NAME/armv7-unknown-linux-gnueabihf/"parity_"$VER"_armhf.deb.md5" --body "parity_"$VER"_armhf.deb.md5"
   tags:
     - rust
     - rust-arm
@@ -176,33 +142,21 @@ linux-arm:
   stage: build
   image: ethcore/rust-arm:latest
   only:
+    - master
     - beta
     - tags
     - stable
   script:
-    - export CC=arm-linux-gnueabihf-gcc
-    - export CXX=arm-linux-gnueabihf-g++
-    - export HOST_CC=gcc
-    - export HOST_CXX=g++
     - rm -rf .cargo
     - mkdir -p .cargo
     - 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 --target arm-unknown-linux-gnueabihf --release --verbose
     - 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
-    - cp target/arm-unknown-linux-gnueabihf/release/parity deb/usr/bin/parity
-    - export VER=$(grep -m 1 version Cargo.toml | awk '{print $3}' | tr -d '"' | tr -d "\n")
-    - dpkg-deb -b deb "parity_"$VER"_armhf.deb"
-    - md5sum "parity_"$VER"_armhf.deb" > "parity_"$VER"_armhf.deb.md5"
-    - aws configure set aws_access_key_id $s3_key
+    - aws configure set aws_access_key_id $s3_key 
     - aws configure set aws_secret_access_key $s3_secret
     - aws s3api put-object --bucket builds-parity --key $CI_BUILD_REF_NAME/arm-unknown-linux-gnueabihf/parity --body target/arm-unknown-linux-gnueabihf/release/parity
-    - aws s3api put-object --bucket builds-parity --key $CI_BUILD_REF_NAME/arm-unknown-linux-gnueabihf/parity.md5 --body parity.md5
-    - aws s3api put-object --bucket builds-parity --key $CI_BUILD_REF_NAME/arm-unknown-linux-gnueabihf/"parity_"$VER"_armhf.deb" --body "parity_"$VER"_armhf.deb"
-    - aws s3api put-object --bucket builds-parity --key $CI_BUILD_REF_NAME/arm-unknown-linux-gnueabihf/"parity_"$VER"_armhf.deb.md5" --body "parity_"$VER"_armhf.deb.md5"
   tags:
     - rust
     - rust-arm
@@ -215,26 +169,21 @@ linux-armv6:
   stage: build
   image: ethcore/rust-armv6:latest
   only:
-#    - beta
-#    - tags
+    - master
+    - beta
+    - tags
     - stable
   script:
-    - export CC=arm-linux-gnueabi-gcc
-    - export CXX=arm-linux-gnueabi-g++
-    - export HOST_CC=gcc
-    - export HOST_CXX=g++
     - rm -rf .cargo
     - mkdir -p .cargo
     - 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 --target arm-unknown-linux-gnueabi --release --verbose
     - 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
+    - aws configure set aws_access_key_id $s3_key 
     - aws configure set aws_secret_access_key $s3_secret
     - aws s3api put-object --bucket builds-parity --key $CI_BUILD_REF_NAME/arm-unknown-linux-gnueabi/parity --body target/arm-unknown-linux-gnueabi/release/parity
-    - aws s3api put-object --bucket builds-parity --key $CI_BUILD_REF_NAME/arm-unknown-linux-gnueabi/parity.md5 --body parity.md5
   tags:
     - rust
     - rust-arm
@@ -247,33 +196,21 @@ linux-aarch64:
   stage: build
   image: ethcore/rust-aarch64:latest
   only:
+    - master
     - beta
     - tags
     - stable
   script:
-    - export CC=aarch64-linux-gnu-gcc
-    - export CXX=aarch64-linux-gnu-g++
-    - export HOST_CC=gcc
-    - export HOST_CXX=g++
     - rm -rf .cargo
     - mkdir -p .cargo
     - 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 --target aarch64-unknown-linux-gnu --release --verbose
     - 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
-    - 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_access_key_id $s3_key 
     - aws configure set aws_secret_access_key $s3_secret
     - aws s3api put-object --bucket builds-parity --key $CI_BUILD_REF_NAME/aarch64-unknown-linux-gnu/parity --body target/aarch64-unknown-linux-gnu/release/parity
-    - aws s3api put-object --bucket builds-parity --key $CI_BUILD_REF_NAME/aarch64-unknown-linux-gnu/parity.md5 --body parity.md5
-    - aws s3api put-object --bucket builds-parity --key $CI_BUILD_REF_NAME/aarch64-unknown-linux-gnu/"parity_"$VER"_arm64.deb" --body "parity_"$VER"_arm64.deb"
-    - aws s3api put-object --bucket builds-parity --key $CI_BUILD_REF_NAME/aarch64-unknown-linux-gnu/"parity_"$VER"_arm64.deb.md5" --body "parity_"$VER"_arm64.deb.md5"
   tags:
     - rust
     - rust-arm
@@ -285,23 +222,15 @@ linux-aarch64:
 darwin:
   stage: build
   only:
+    - master
     - beta
     - tags
     - stable
   script:
-    - cargo build --release -p ethstore $CARGOFLAGS
-    - cargo build --release $CARGOFLAGS
-    - rm -rf parity.md5
-    - md5sum target/release/parity > parity.md5
-    - packagesbuild -v mac/Parity.pkgproj
-    - mv target/release/Parity\ Ethereum.pkg parity-osx-installer-EXPERIMENTAL.pkg
-    - md5sum parity-osx-installer-EXPERIMENTAL.pkg > parity-osx-installer-EXPERIMENTAL.pkg.md5
-    - aws configure set aws_access_key_id $s3_key
+    - cargo build --release --verbose
+    - aws configure set aws_access_key_id $s3_key 
     - aws configure set aws_secret_access_key $s3_secret
     - aws s3api put-object --bucket builds-parity --key $CI_BUILD_REF_NAME/x86_64-apple-darwin/parity --body target/release/parity
-    - aws s3api put-object --bucket builds-parity --key $CI_BUILD_REF_NAME/x86_64-apple-darwin/parity.md5 --body parity.md5
-    - aws s3api put-object --bucket builds-parity --key $CI_BUILD_REF_NAME/x86_64-apple-darwin/parity-osx-installer-EXPERIMENTAL.pkg --body parity-osx-installer-EXPERIMENTAL.pkg
-    - aws s3api put-object --bucket builds-parity --key $CI_BUILD_REF_NAME/x86_64-apple-darwin/parity-osx-installer-EXPERIMENTAL.pkg.md5 --body parity-osx-installer-EXPERIMENTAL.pkg.md5
   tags:
     - osx
   artifacts:
@@ -309,11 +238,9 @@ darwin:
     - target/release/parity
     name: "x86_64-apple-darwin_parity"
 windows:
-  cache:
-    key: "%CI_BUILD_STAGE%/%CI_BUILD_REF_NAME%"
-    untracked: true
   stage: build
   only:
+    - master
     - beta
     - tags
     - stable
@@ -321,109 +248,27 @@ windows:
     - set INCLUDE=C:\Program Files (x86)\Microsoft SDKs\Windows\v7.1A\Include;C:\vs2015\VC\include;C:\Program Files (x86)\Windows Kits\10\Include\10.0.10240.0\ucrt
     - set LIB=C:\vs2015\VC\lib;C:\Program Files (x86)\Windows Kits\10\Lib\10.0.10240.0\ucrt\x64
     - set RUST_BACKTRACE=1
-    - set RUSTFLAGS=%RUSTFLAGS% -Zorbit=off
     - rustup default stable-x86_64-pc-windows-msvc
-    - cargo build --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
-    - msbuild windows\ptray\ptray.vcxproj /p:Platform=x64 /p:Configuration=Release
-    - signtool sign /f %keyfile% /p %certpass% windows\ptray\x64\release\ptray.exe
-    - cd nsis
-    - makensis.exe installer.nsi
-    - copy installer.exe InstallParity.exe
-    - signtool sign /f %keyfile% /p %certpass% InstallParity.exe
-    - md5sums InstallParity.exe > InstallParity.exe.md5
-    - zip win-installer.zip InstallParity.exe InstallParity.exe.md5
-    - md5sums win-installer.zip > win-installer.zip.md5
-    - cd ..\target\release\
-    - md5sums parity.exe parity.pdb > parity.md5
-    - md5sums parity.exe > parity.exe.md5
-    - zip parity.zip parity.exe parity.pdb parity.md5
-    - md5sums parity.zip > parity.zip.md5
-    - cd ..\..
+    - cargo build --release --verbose
     - aws configure set aws_access_key_id %s3_key%
     - aws configure set aws_secret_access_key %s3_secret%
-    - aws s3api put-object --bucket builds-parity --key %CI_BUILD_REF_NAME%/x86_64-pc-windows-msvc/parity.exe --body target\release\parity.exe
-    - aws s3api put-object --bucket builds-parity --key %CI_BUILD_REF_NAME%/x86_64-pc-windows-msvc/parity.exe.md5 --body target\release\parity.exe.md5
-    - aws s3api put-object --bucket builds-parity --key %CI_BUILD_REF_NAME%/x86_64-pc-windows-msvc/parity.zip --body target\release\parity.zip
-    - aws s3api put-object --bucket builds-parity --key %CI_BUILD_REF_NAME%/x86_64-pc-windows-msvc/parity.zip.md5 --body target\release\parity.zip.md5
-    - aws s3api put-object --bucket builds-parity --key %CI_BUILD_REF_NAME%/x86_64-pc-windows-msvc/InstallParity.exe --body nsis\InstallParity.exe
-    - aws s3api put-object --bucket builds-parity --key %CI_BUILD_REF_NAME%/x86_64-pc-windows-msvc/InstallParity.exe.md5 --body nsis\InstallParity.exe.md5
-    - aws s3api put-object --bucket builds-parity --key %CI_BUILD_REF_NAME%/x86_64-pc-windows-msvc/win-installer.zip --body nsis\win-installer.zip
-    - aws s3api put-object --bucket builds-parity --key %CI_BUILD_REF_NAME%/x86_64-pc-windows-msvc/win-installer.zip.md5 --body nsis\win-installer.zip.md5
+    - aws s3api put-object --bucket builds-parity --key %CI_BUILD_REF_NAME%/x86_64-pc-windows-msvc/parity --body target/release/parity.exe
+    - aws s3api put-object --bucket builds-parity --key %CI_BUILD_REF_NAME%/x86_64-pc-windows-msvc/parity --body target/release/parity.pdb
   tags:
    - rust-windows
   artifacts:
     paths:
     - target/release/parity.exe
     - target/release/parity.pdb
-    - nsis/InstallParity.exe
     name: "x86_64-pc-windows-msvc_parity"
-test-darwin:
+test-linux:
   stage: test
-  only:
-#    - beta
-#    - tags
-    - stable
   before_script:
     - git submodule update --init --recursive
   script:
     - export RUST_BACKTRACE=1
-    - ./test.sh $CARGOFLAGS --no-release
+    - ./test.sh --verbose
   tags:
-    - osx
-test-windows:
-  stage: test
-  only:
-#    - beta
-#    - tags
-    - stable
-  before_script:
-    - 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
-  tags:
-    - rust-windows
-  allow_failure: true
-test-rust-stable:
-  stage: test
-  image: ethcore/rust:stable
-  before_script:
-    - git submodule update --init --recursive
-    - export JS_FILES_MODIFIED=$(git --no-pager diff --name-only $CI_BUILD_REF $CI_BUILD_REF@{1} | grep \.js | wc -l)
-    - echo $JS_FILES_MODIFIED
-    - if [ -z $JS_FILES_MODIFIED ]; then echo "skip js test"; fi
-  script:
-    - export RUST_BACKTRACE=1
-    - echo $JS_FILES_MODIFIED
-    - if [ -z $JS_FILES_MODIFIED ]; then echo "skip js test"; else ./test.sh $CARGOFLAGS --no-release; fi
-  tags:
-    - rust
-    - rust-stable
-js-tests:
-  stage: test
-  image: ethcore/rust:stable
-  before_script:
-    - ./js/scripts/install-deps.sh
-  script:
-    - ./js/scripts/lint.sh
-    - ./js/scripts/test.sh
-    - ./js/scripts/build.sh
-  tags:
-    - javascript-test
-js-release:
-  stage: js-build
-  only:
-    - master
-    - beta
-    - stable
-  image: ethcore/rust:stable
-  before_script:
-    - ./js/scripts/install-deps.sh
-  script:
-    - ./js/scripts/build.sh
-    - ./js/scripts/release.sh
-  tags:
-    - javascript
+    - rust-test
+  dependencies:
+    - linux-stable

.travis.yml

@@ -16,7 +16,7 @@ git:
 matrix:
   include:
   - rust: stable
-    env: RUN_TESTS="true" TEST_OPTIONS="--no-release"
+    env: RUN_TESTS="true"
   - rust: beta
     env: RUN_COVERAGE="true"
   - rust: stable
@@ -30,9 +30,6 @@ env:
   - RUN_TESTS="false"
   - RUN_COVERAGE="false"
   - RUN_DOCS="false"
-  - TEST_OPTIONS=""
-  - RUSTFLAGS="-D warnings"
-  - TRAVIS_NODE_VERSION="6"
   # GH_TOKEN for documentation
   - secure: bumJASbZSU8bxJ0EyPUJmu16AiV9EXOpyOj86Jlq/Ty9CfwGqsSXt96uDyE+OUJf34RUFQMsw0nk37/zC4lcn6kqk2wpuH3N/o85Zo/cVZY/NusBWLQqtT5VbYWsV+u2Ua4Tmmsw8yVYQhYwU2ZOejNpflL+Cs9XGgORp1L+/gMRMC2y5Se6ZhwnKPQlRJ8LGsG1dzjQULxzADIt3/zuspNBS8a2urJwlHfGMkvHDoUWCviP/GXoSqw3TZR7FmKyxE19I8n9+iSvm9+oZZquvcgfUxMHn8Gq/b44UbPvjtFOg2yam4xdWXF/RyWCHdc/R9EHorSABeCbefIsm+zcUF3/YQxwpSxM4IZEeH2rTiC7dcrsKw3XsO16xFQz5YI5Bay+CT/wTdMmJd7DdYz7Dyf+pOvcM9WOf/zorxYWSBOMYy0uzbusU2iyIghQ82s7E/Ahg+WARtPgkuTLSB5aL1oCTBKHqQscMr7lo5Ti6RpWLxEdTQMBznc+bMr+6dEtkEcG9zqc6cE9XX+ox3wTU6+HVMfQ1ltCntJ4UKcw3A6INEbw9wgocQa812CIASQ2fE+SCAbz6JxBjIAlFUnD1lUB7S8PdMPwn9plfQgKQ2A5YZqg6FnBdf0rQXIJYxQWKHXj/rBHSUCT0tHACDlzTA+EwWggvkP5AGIxRxm8jhw=
   - KCOV_CMD="./kcov-master/tmp/usr/local/bin/kcov"
@@ -42,7 +39,6 @@ cache:
   directories:
   - $TRAVIS_BUILD_DIR/target
   - $TRAVIS_BUILD_DIR/kcov-master
-  - $TRAVIS_BUILD_DIR/js/node_modules
   - $HOME/.cargo
 
 addons:
@@ -66,14 +62,9 @@ install:
       make && make install DESTDIR=../tmp &&
       cd
     )
-  - nvm install $TRAVIS_NODE_VERSION && nvm use $TRAVIS_NODE_VERSION && ./js/scripts/install-deps.sh
 
 script:
-  - if [ "$RUN_TESTS" = "true" ]; then
-      ./js/scripts/lint.sh &&
-      ./js/scripts/test.sh &&
-      ./test.sh $TEST_OPTIONS --verbose;
-    fi
+  - if [ "$RUN_TESTS" = "true" ]; then ./test.sh --verbose; fi
   - if [ "$RUN_COVERAGE" = "true" ]; then ./scripts/cov.sh "$KCOV_CMD"; fi
 
 after_success: |

Cargo.toml

@@ -1,13 +1,14 @@
 [package]
 description = "Ethcore client."
 name = "parity"
-version = "1.4.2"
+version = "1.3.2"
 license = "GPL-3.0"
 authors = ["Ethcore <admin@ethcore.io>"]
 build = "build.rs"
 
 [build-dependencies]
 rustc_version = "0.1"
+syntex = "*"
 ethcore-ipc-codegen = { path = "ipc/codegen" }
 ethcore-ipc-tests = { path = "ipc/tests" }
 
@@ -25,12 +26,7 @@ ansi_term = "0.7"
 lazy_static = "0.2"
 regex = "0.1"
 isatty = "0.1"
-toml = "0.2"
-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" }
@@ -43,10 +39,9 @@ ethcore-ipc-nano = { path = "ipc/nano" }
 ethcore-ipc = { path = "ipc/rpc" }
 ethcore-ipc-hypervisor = { path = "ipc/hypervisor" }
 ethcore-logger = { path = "logger" }
-rlp = { path = "util/rlp" }
-ethcore-stratum = { path = "stratum" }
+json-ipc-server = { git = "https://github.com/ethcore/json-ipc-server.git" }
 ethcore-dapps = { path = "dapps", optional = true }
-clippy = { version = "0.0.96", optional = true}
+clippy = { version = "0.0.80", optional = true}
 
 [target.'cfg(windows)'.dependencies]
 winapi = "0.2"
@@ -54,38 +49,25 @@ winapi = "0.2"
 [target.'cfg(not(windows))'.dependencies]
 daemonize = "0.2"
 
+[dependencies.hyper]
+version = "0.8"
+default-features = false
+
 [features]
-default = ["ui-precompiled"]
-
-ui = [
-	"dapps",
-	"ethcore-dapps/ui",
-	"ethcore-signer/ui",
-]
-ui-precompiled = [
-	"dapps",
-	"ethcore-signer/ui-precompiled",
-	"ethcore-dapps/ui-precompiled",
-]
-
+default = ["ui", "use-precompiled-js"]
+ui = ["dapps", "ethcore-signer/ui"]
+use-precompiled-js = ["ethcore-dapps/use-precompiled-js", "ethcore-signer/use-precompiled-js"]
 dapps = ["ethcore-dapps"]
-ipc = ["ethcore/ipc", "ethsync/ipc"]
+ipc = ["ethcore/ipc"]
 jit = ["ethcore/jit"]
 dev = ["clippy", "ethcore/dev", "ethcore-util/dev", "ethsync/dev", "ethcore-rpc/dev", "ethcore-dapps/dev", "ethcore-signer/dev"]
 json-tests = ["ethcore/json-tests"]
-test-heavy = ["ethcore/test-heavy"]
-stratum = ["ipc"]
-ethkey-cli = ["ethcore/ethkey-cli"]
-ethstore-cli = ["ethcore/ethstore-cli"]
-evm-debug = ["ethcore/evm-debug"]
-evm-debug-tests = ["ethcore/evm-debug-tests"]
-slow-blocks = ["ethcore/slow-blocks"]
 
 [[bin]]
 path = "parity/main.rs"
 name = "parity"
 
 [profile.release]
-debug = false
+debug = true
 lto = false
 

README.md

@@ -1,16 +1,10 @@
 # [Parity](https://ethcore.io/parity.html)
 ### Fast, light, and robust Ethereum implementation
 
-[![Build Status][travis-image]][travis-url] [![build status](https://gitlab.ethcore.io/Mirrors/ethcore-parity/badges/master/build.svg)](https://gitlab.ethcore.io/Mirrors/ethcore-parity/commits/master) [![Coverage Status][coveralls-image]][coveralls-url]  [![GPLv3][license-image]][license-url]
-
-### Join the chat!
-
-Parity [![Join the chat at https://gitter.im/ethcore/parity][gitter-image]][gitter-url] and
-parity.js [![Join the chat at https://gitter.im/ethcore/parity.js](https://badges.gitter.im/ethcore/parity.js.svg)](https://gitter.im/ethcore/parity.js?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
+[![Build Status][travis-image]][travis-url] [![Coverage Status][coveralls-image]][coveralls-url] [![Join the chat at https://gitter.im/ethcore/parity][gitter-image]][gitter-url] [![GPLv3][license-image]][license-url]
 
 [Internal Documentation][doc-url]
 
-
 Be sure to check out [our wiki][wiki-url] for more information.
 
 [travis-image]: https://travis-ci.org/ethcore/parity.svg?branch=master
@@ -20,34 +14,28 @@ Be sure to check out [our wiki][wiki-url] for more information.
 [gitter-image]: https://badges.gitter.im/Join%20Chat.svg
 [gitter-url]: https://gitter.im/ethcore/parity?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge
 [license-image]: https://img.shields.io/badge/license-GPL%20v3-green.svg
-[license-url]: https://www.gnu.org/licenses/gpl-3.0.en.html
-[doc-url]: https://ethcore.github.io/parity/ethcore/index.html
+[license-url]: http://www.gnu.org/licenses/gpl-3.0.en.html
+[doc-url]: http://ethcore.github.io/parity/ethcore/index.html
 [wiki-url]: https://github.com/ethcore/parity/wiki
 
-**Parity requires Rust version 1.12.0 to build**
-
 ----
 
-
 ## About Parity
 
 Parity's goal is to be the fastest, lightest, and most secure Ethereum client. We are developing Parity using the sophisticated and
 cutting-edge Rust programming language. Parity is licensed under the GPLv3, and can be used for all your Ethereum needs.
 
-Parity comes with a built-in wallet. To access [Parity Wallet](http://127.0.0.1:8080/) this simply go to http://127.0.0.1:8080/. It
-includes various functionality allowing you to:
-- create and manage your Ethereum accounts;
-- manage your Ether and any Ethereum tokens;
-- create and register your own tokens;
-- and much more.    
-
-By default, Parity will also run a JSONRPC server on `127.0.0.1:8545`. This is fully configurable and supports a number
+By default, Parity will run a JSONRPC server on `127.0.0.1:8545`. This is fully configurable and supports a number
 of RPC APIs.
 
+Parity also runs a server for running decentralized apps, or "Dapps", on `http://127.0.0.1:8080`.
+This includes a few useful Dapps, including Ethereum Wallet, Maker OTC, and a node status page.
+In a near-future release, it will be easy to install Dapps and use them through this web interface.
+
 If you run into an issue while using parity, feel free to file one in this repository
 or hop on our [gitter chat room][gitter-url] to ask a question. We are glad to help!
 
-Parity's current release is 1.3. You can download it at https://ethcore.io/parity.html or follow the instructions
+Parity's current release is 1.2. You can download it at https://ethcore.io/parity.html or follow the instructions
 below to build from source.
 
 ----
@@ -96,21 +84,9 @@ $ cargo build --release
 
 This will produce an executable in the `./target/release` subdirectory.
 
-## Start Parity
-### Manually
-To start Parity manually, just run
+To get started, just run
 ```bash
 $ ./target/release/parity
 ```
 
-and Parity will begin syncing the Ethereum blockchain.
-
-### Using systemd service file
-To start Parity as a regular user using systemd init:
-
-1. Copy `parity/scripts/parity.service` to your
-systemd user directory (usually `~/.config/systemd/user`).
-2. To pass any argument to Parity, write a `~/.parity/parity.conf` file this way:
-`ARGS="ARG1 ARG2 ARG3"`.
-
-	Example: `ARGS="ui --geth --identity MyMachine"`.
+and parity will begin syncing the Ethereum blockchain.

appveyor.yml

@@ -6,7 +6,6 @@ environment:
   certpass:
     secure: 0BgXJqxq9Ei34/hZ7121FQ==
   keyfile: C:\users\appveyor\Certificates.p12
-  RUSTFLAGS: -Zorbit=off -D warnings
 
 branches:
   only:
@@ -19,10 +18,10 @@ branches:
 install:
   - git submodule update --init --recursive
   - ps: Install-Product node 6
-  - ps: Start-FileDownload "https://static.rust-lang.org/dist/rust-1.12.0-x86_64-pc-windows-msvc.exe"
+  - ps: Start-FileDownload "https://static.rust-lang.org/dist/rust-1.10.0-x86_64-pc-windows-msvc.exe"
   - ps: Start-FileDownload "https://github.com/ethcore/win-build/raw/master/SimpleFC.dll" -FileName nsis\SimpleFC.dll
   - ps: Start-FileDownload "https://github.com/ethcore/win-build/raw/master/vc_redist.x64.exe" -FileName nsis\vc_redist.x64.exe
-  - rust-1.12.0-x86_64-pc-windows-msvc.exe /VERYSILENT /NORESTART /DIR="C:\Program Files (x86)\Rust"
+  - rust-1.10.0-x86_64-pc-windows-msvc.exe /VERYSILENT /NORESTART /DIR="C:\Program Files (x86)\Rust"
   - SET PATH=%PATH%;C:\Program Files (x86)\Rust\bin;C:\Program Files (x86)\NSIS;C:\Program Files (x86)\Microsoft SDKs\Windows\v7.1A\Bin
   - rustc -V
   - cargo -V
@@ -38,8 +37,6 @@ after_test:
   - cargo build --verbose --release
   - ps: if($env:cert) { Start-FileDownload $env:cert -FileName $env:keyfile }
   - ps: if($env:cert) { signtool sign /f $env:keyfile /p $env:certpass target\release\parity.exe }
-  - msbuild windows\ptray\ptray.vcxproj /p:Platform=x64 /p:Configuration=Release
-  - ps: if($env:cert) { signtool sign /f $env:keyfile /p $env:certpass windows\ptray\x64\release\ptray.exe }
   - makensis.exe nsis\installer.nsi
   - ps: if($env:cert) { signtool sign /f $env:keyfile /p $env:certpass nsis\installer.exe }
 

dapps/Cargo.toml

@@ -1,7 +1,7 @@
 [package]
 description = "Parity Dapps crate"
 name = "ethcore-dapps"
-version = "1.4.0"
+version = "1.3.0"
 license = "GPL-3.0"
 authors = ["Ethcore <admin@ethcore.io"]
 build = "build.rs"
@@ -9,40 +9,38 @@ build = "build.rs"
 [lib]
 
 [dependencies]
-rand = "0.3.14"
 log = "0.3"
-env_logger = "0.3"
-jsonrpc-core = "3.0"
+jsonrpc-core = "2.1"
 jsonrpc-http-server = { git = "https://github.com/ethcore/jsonrpc-http-server.git" }
 hyper = { default-features = false, git = "https://github.com/ethcore/hyper" }
 unicase = "1.3"
 url = "1.0"
 rustc-serialize = "0.3"
-serde = "0.8"
-serde_json = "0.8"
-ethabi = "0.2.2"
-linked-hash-map = "0.3"
-parity-dapps-glue = "1.4"
-mime = "0.2"
-time = "0.1.35"
-serde_macros = { version = "0.8", optional = true }
-zip = { version = "0.1", default-features = false }
-ethcore-devtools = { path = "../devtools" }
+serde = "0.7.0"
+serde_json = "0.7.0"
+serde_macros = { version = "0.7.0", optional = true }
 ethcore-rpc = { path = "../rpc" }
 ethcore-util = { path = "../util" }
-fetch = { path = "../util/fetch" }
-parity-ui = { path = "./ui" }
-
+parity-dapps = { git = "https://github.com/ethcore/parity-ui.git", version = "1.4" }
+# List of apps
+parity-dapps-status = { git = "https://github.com/ethcore/parity-ui.git", version = "1.4" }
+parity-dapps-home = { git = "https://github.com/ethcore/parity-ui.git", version = "1.4" }
+parity-dapps-wallet = { git = "https://github.com/ethcore/parity-ui.git", version = "1.4", optional = true }
 mime_guess = { version = "1.6.1" }
-clippy = { version = "0.0.96", optional = true}
+clippy = { version = "0.0.80", optional = true}
 
 [build-dependencies]
-serde_codegen = { version = "0.8", optional = true }
+serde_codegen = { version = "0.7.0", optional = true }
+syntex = "*"
 
 [features]
-default = ["serde_codegen"]
+default = ["serde_codegen", "extra-dapps"]
+extra-dapps = ["parity-dapps-wallet"]
 nightly = ["serde_macros"]
 dev = ["clippy", "ethcore-rpc/dev", "ethcore-util/dev"]
 
-ui = ["parity-ui/no-precompiled-js"]
-ui-precompiled = ["parity-ui/use-precompiled-js"]
+use-precompiled-js = [
+	"parity-dapps-status/use-precompiled-js",
+	"parity-dapps-home/use-precompiled-js",
+	"parity-dapps-wallet/use-precompiled-js"
+]

dapps/build.rs

@@ -16,6 +16,7 @@
 
 #[cfg(not(feature = "serde_macros"))]
 mod inner {
+    extern crate syntex;
     extern crate serde_codegen;
 
     use std::env;
@@ -27,7 +28,10 @@ mod inner {
         let src = Path::new("./src/api/types.rs.in");
         let dst = Path::new(&out_dir).join("types.rs");
 
-        serde_codegen::expand(&src, &dst).unwrap();
+        let mut registry = syntex::Registry::new();
+
+        serde_codegen::register(&mut registry);
+        registry.expand("", &src, &dst).unwrap();
     }
 }
 

dapps/js-glue/Cargo.toml

@@ -1,31 +0,0 @@
-[package]
-description = "Base Package for all Parity built-in dapps"
-name = "parity-dapps-glue"
-version = "1.4.0"
-license = "GPL-3.0"
-authors = ["Ethcore <admin@ethcore.io"]
-build = "build.rs"
-
-[build-dependencies]
-quasi_codegen = { version = "0.11", optional = true }
-syntex = { version = "0.33", optional = true }
-
-[dependencies]
-glob = { version = "0.2.11" }
-mime_guess = { version = "1.6.1" }
-aster = { version = "0.17", default-features = false }
-quasi = { version = "0.11", default-features = false }
-quasi_macros = { version = "0.11", optional = true }
-syntex = { version = "0.33", optional = true }
-syntex_syntax = { version = "0.33", optional = true }
-clippy = { version = "0.0.90", optional = true }
-
-[features]
-dev = ["clippy"]
-default = ["with-syntex"]
-nightly = ["quasi_macros"]
-nightly-testing = ["clippy"]
-with-syntex = ["quasi/with-syntex", "quasi_codegen", "quasi_codegen/with-syntex", "syntex", "syntex_syntax"]
-use-precompiled-js = []
-
-

dapps/js-glue/README.md

@@ -1,65 +0,0 @@
-# Parity Dapps (JS-glue)
-
-Code generator to simplify creating a built-in Parity Dapp
-
-# How to create new builtin Dapp.
-1. Clone this repository.
-
-   ```bash
-   $ git clone https://github.com/ethcore/parity.git
-   ```
-
-1. Create a new directory for your Dapp. (`./myapp`)
-
-   ```bash
-   $ mkdir -p ./parity/dapps/myapp/src/web
-   ```
-
-1. Copy your frontend files to `./dapps/myapp/src/web` (bundled ones)
-
-   ```bash
-   $ cp -r ./myapp-src/* ./parity/dapps/myapp/src/web
-   ```
-
-1. Instead of creating `web3` in your app. Load (as the first script tag in `head`):
-
-   ```html
-   <script src="/parity-utils/inject.js"></script>
-   ```
-
-   The `inject.js` script will create global `web3` instance with proper provider that should be used by your dapp.
-
-1. Create `./parity/dapps/myapp/Cargo.toml` with you apps details. See example here: [parity-status Cargo.toml](https://github.com/ethcore/parity-ui/blob/master/status/Cargo.toml).
-
-   ```bash
-   $ git clone https://github.com/ethcore/parity-ui.git
-   $ cd ./parity-ui/
-   $ cp ./home/Cargo.toml ../parity/dapps/myapp/Cargo.toml
-   $ cp ./home/build.rs ../parity/dapps/myapp/build.rs
-   $ cp ./home/src/lib.rs ../parity/dapps/myapp/src/lib.rs
-   $ cp ./home/src/lib.rs.in ../parity/dapps/myapp/src/lib.rs.in
-   # And edit the details of your app
-   $ vim ../parity/dapps/myapp/Cargo.toml # Edit the details
-   $ vim ./parity/dapps/myapp/src/lib.rs.in # Edit the details
-   ```
-# How to include your Dapp into `Parity`?
-1. Edit `dapps/Cargo.toml` and add dependency to your application (it can be optional)
-
-   ```toml
-   # Use git repo and version
-   parity-dapps-myapp = { path="./myapp" }
-   ```
-
-1. Edit `dapps/src/apps.rs` and add your application to `all_pages` (if it's optional you need to specify two functions - see `parity-dapps-wallet` example)
-
-1. Compile parity.
-
-   ```bash
-   $ cargo build --release # While inside `parity`
-   ```
-
-1. Commit the results.
-
-   ```bash
-   $ git add myapp && git commit -am "My first Parity Dapp".
-   ```

dapps/js-glue/build.rs

@@ -1,45 +0,0 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-
-#[cfg(feature = "with-syntex")]
-mod inner {
-	extern crate syntex;
-	extern crate quasi_codegen;
-
-	use std::env;
-	use std::path::Path;
-
-	pub fn main() {
-		let out_dir = env::var_os("OUT_DIR").unwrap();
-		let mut registry = syntex::Registry::new();
-		quasi_codegen::register(&mut registry);
-
-		let src = Path::new("src/lib.rs.in");
-		let dst = Path::new(&out_dir).join("lib.rs");
-
-		registry.expand("", &src, &dst).unwrap();
-	}
-}
-
-#[cfg(not(feature = "with-syntex"))]
-mod inner {
-	pub fn main() {}
-}
-
-fn main() {
-	inner::main();
-}

dapps/js-glue/src/build.rs

@@ -1,66 +0,0 @@
-
-#[cfg(feature = "with-syntex")]
-pub mod inner {
-	use syntex;
-	use codegen;
-	use syntax::{ast, fold};
-	use std::env;
-	use std::path::Path;
-
-	fn strip_attributes(krate: ast::Crate) -> ast::Crate {
-		/// Helper folder that strips the serde attributes after the extensions have been expanded.
-		struct StripAttributeFolder;
-
-		impl fold::Folder for StripAttributeFolder {
-			fn fold_attribute(&mut self, attr: ast::Attribute) -> Option<ast::Attribute> {
-				match attr.node.value.node {
-					ast::MetaItemKind::List(ref n, _) if n == &"webapp" => { return None; }
-					_ => {}
-				}
-
-				Some(attr)
-			}
-
-			fn fold_mac(&mut self, mac: ast::Mac) -> ast::Mac {
-				fold::noop_fold_mac(mac, self)
-			}
-		}
-
-		fold::Folder::fold_crate(&mut StripAttributeFolder, krate)
-	}
-
-	pub fn register(reg: &mut syntex::Registry) {
-		reg.add_attr("feature(custom_derive)");
-		reg.add_attr("feature(custom_attribute)");
-
-		reg.add_decorator("derive_WebAppFiles", codegen::expand_webapp_implementation);
-		reg.add_post_expansion_pass(strip_attributes);
-	}
-
-	pub fn generate() {
-		let out_dir = env::var_os("OUT_DIR").unwrap();
-		let mut registry = syntex::Registry::new();
-		register(&mut registry);
-
-		let src = Path::new("src/lib.rs.in");
-		let dst = Path::new(&out_dir).join("lib.rs");
-
-		registry.expand("", &src, &dst).unwrap();
-	}
-}
-
-#[cfg(not(feature = "with-syntex"))]
-pub mod inner {
-	use codegen;
-
-	pub fn register(reg: &mut rustc_plugin::Registry) {
-		reg.register_syntax_extension(
-			syntax::parse::token::intern("derive_WebAppFiles"),
-			syntax::ext::base::MultiDecorator(
-				Box::new(codegen::expand_webapp_implementation)));
-
-		reg.register_attribute("webapp".to_owned(), AttributeType::Normal);
-	}
-
-	pub fn generate() {}
-}

dapps/js-glue/src/codegen.rs

@@ -1,189 +0,0 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-extern crate aster;
-extern crate glob;
-extern crate mime_guess;
-
-use self::mime_guess::guess_mime_type;
-use std::path::{self, Path, PathBuf};
-use std::ops::Deref;
-
-use syntax::ast::{MetaItem, Item};
-
-use syntax::ast;
-use syntax::attr;
-use syntax::codemap::Span;
-use syntax::ext::base::{Annotatable, ExtCtxt};
-use syntax::ptr::P;
-use syntax::print::pprust::{lit_to_string};
-use syntax::parse::token::{InternedString};
-
-
-pub fn expand_webapp_implementation(
-	cx: &mut ExtCtxt,
-	span: Span,
-	meta_item: &MetaItem,
-	annotatable: &Annotatable,
-	push: &mut FnMut(Annotatable)
-) {
-	let item = match *annotatable {
-		Annotatable::Item(ref item) => item,
-		_ => {
-			cx.span_err(meta_item.span, "`#[derive(WebAppFiles)]` may only be applied to struct implementations");
-			return;
-		},
-	};
-	let builder = aster::AstBuilder::new().span(span);
-	implement_webapp(cx, &builder, &item, push);
-}
-
-fn implement_webapp(cx: &ExtCtxt, builder: &aster::AstBuilder, item: &Item, push: &mut FnMut(Annotatable)) {
-	let static_files_dir = extract_path(cx, item);
-
-	let src = Path::new("src");
-	let static_files = {
-		let mut buf = src.to_path_buf();
-		buf.push(static_files_dir.deref());
-		buf
-	};
-
-	let search_location = {
-		let mut buf = static_files.to_path_buf();
-		buf.push("**");
-		buf.push("*");
-		buf
-	};
-
-	let files = glob::glob(search_location.to_str().expect("Valid UTF8 path"))
-		.expect("The sources directory is missing.")
-		.collect::<Result<Vec<PathBuf>, glob::GlobError>>()
-		.expect("There should be no error when reading a list of files.");
-
-	let statements = files
-		.iter()
-		.filter(|path_buf| path_buf.is_file())
-		.map(|path_buf| {
-			let path = path_buf.as_path();
-			let filename = path.file_name().and_then(|s| s.to_str()).expect("Only UTF8 paths.");
-			let mime_type = guess_mime_type(filename).to_string();
-			let file_path = as_uri(path.strip_prefix(&static_files).ok().expect("Prefix is always there, cause it's absolute path;qed"));
-			let file_path_in_source = path.to_str().expect("Only UTF8 paths.");
-
-			let path_lit = builder.expr().str(file_path.as_str());
-			let mime_lit = builder.expr().str(mime_type.as_str());
-			let web_path_lit = builder.expr().str(file_path_in_source);
-			let separator_lit = builder.expr().str(path::MAIN_SEPARATOR.to_string().as_str());
-			let concat_id = builder.id("concat!");
-			let env_id = builder.id("env!");
-			let macro_id = builder.id("include_bytes!");
-
-			let content = quote_expr!(
-				cx,
-				$macro_id($concat_id($env_id("CARGO_MANIFEST_DIR"), $separator_lit, $web_path_lit))
-			);
-			quote_stmt!(
-				cx,
-				files.insert($path_lit, File { path: $path_lit, content_type: $mime_lit, content: $content });
-			).expect("The statement is always ok, because it just uses literals.")
-		}).collect::<Vec<ast::Stmt>>();
-
-	let type_name = item.ident;
-
-	let files_impl = quote_item!(cx,
-		impl $type_name {
-			fn files() -> ::std::collections::HashMap<&'static str, File> {
-				let mut files = ::std::collections::HashMap::new();
-				$statements
-				files
-			}
-		}
-	).unwrap();
-
-	push(Annotatable::Item(files_impl));
-}
-
-fn extract_path(cx: &ExtCtxt, item: &Item) -> String {
-	for meta_items in item.attrs().iter().filter_map(webapp_meta_items) {
-		for meta_item in meta_items {
-			match meta_item.node {
-				ast::MetaItemKind::NameValue(ref name, ref lit) if name == &"path" => {
-					if let Some(s) = get_str_from_lit(cx, name, lit) {
-						return s.deref().to_owned();
-					}
-				},
-				_ => {},
-			}
-		}
-	}
-
-	// default
-	"web".to_owned()
-}
-
-fn get_str_from_lit(cx: &ExtCtxt, name: &str, lit: &ast::Lit) -> Option<InternedString> {
-	match lit.node {
-		ast::LitKind::Str(ref s, _) => Some(s.clone()),
-		_ => {
-			cx.span_err(
-				lit.span,
-				&format!("webapp annotation `{}` must be a string, not `{}`",
-					name,
-					lit_to_string(lit)
-				)
-			);
-			return None;
-		}
-	}
-}
-
-fn webapp_meta_items(attr: &ast::Attribute) -> Option<&[P<ast::MetaItem>]> {
-	match attr.node.value.node {
-		ast::MetaItemKind::List(ref name, ref items) if name == &"webapp" => {
-			attr::mark_used(&attr);
-			Some(items)
-		}
-		_ => None
-	}
-}
-
-fn as_uri(path: &Path) -> String {
-	let mut s = String::new();
-	for component in path.iter() {
-		s.push_str(component.to_str().expect("Only UTF-8 filenames are supported."));
-		s.push('/');
-	}
-	s[0..s.len()-1].into()
-}
-
-
-#[test]
-fn should_convert_path_separators_on_all_platforms() {
-	// given
-	let p = {
-		let mut p = PathBuf::new();
-		p.push("web");
-		p.push("src");
-		p.push("index.html");
-		p
-	};
-
-	// when
-	let path = as_uri(&p);
-
-	// then
-	assert_eq!(path, "web/src/index.html".to_owned());
-}

dapps/js-glue/src/js.rs

@@ -1,89 +0,0 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-#![cfg_attr(feature="use-precompiled-js", allow(dead_code))]
-#![cfg_attr(feature="use-precompiled-js", allow(unused_imports))]
-
-use std::fmt;
-use std::process::Command;
-
-#[cfg(not(windows))]
-mod platform {
-	use std::process::Command;
-
-	pub static NPM_CMD: &'static str = "npm";
-	pub fn handle_fd(cmd: &mut Command) -> &mut Command {
-		cmd
-	}
-}
-
-#[cfg(windows)]
-mod platform {
-	use std::process::{Command, Stdio};
-
-	pub static NPM_CMD: &'static str = "npm.cmd";
-	// NOTE [ToDr] For some reason on windows
-	// We cannot have any file descriptors open when running a child process
-	// during build phase.
-	pub fn handle_fd(cmd: &mut Command) -> &mut Command {
-		cmd.stdin(Stdio::null())
-			.stdout(Stdio::null())
-			.stderr(Stdio::null())
-	}
-}
-
-fn die<T : fmt::Debug>(s: &'static str, e: T) -> ! {
-	panic!("Error: {}: {:?}", s, e);
-}
-
-#[cfg(feature = "use-precompiled-js")]
-pub fn test(_path: &str) {
-}
-#[cfg(feature = "use-precompiled-js")]
-pub fn build(_path: &str, _dest: &str) {
-}
-
-#[cfg(not(feature = "use-precompiled-js"))]
-pub fn build(path: &str, dest: &str) {
-	let child = platform::handle_fd(&mut Command::new(platform::NPM_CMD))
-		.arg("install")
-		.arg("--no-progress")
-		.current_dir(path)
-		.status()
-		.unwrap_or_else(|e| die("Installing node.js dependencies with npm", e));
-	assert!(child.success(), "There was an error installing dependencies.");
-
-	let child = platform::handle_fd(&mut Command::new(platform::NPM_CMD))
-		.arg("run")
-		.arg("build")
-		.env("NODE_ENV", "production")
-		.env("BUILD_DEST", dest)
-		.current_dir(path)
-		.status()
-		.unwrap_or_else(|e| die("Building JS code", e));
-	assert!(child.success(), "There was an error build JS code.");
-}
-
-#[cfg(not(feature = "use-precompiled-js"))]
-pub fn test(path: &str) {
-	let child = Command::new(platform::NPM_CMD)
-		.arg("run")
-		.arg("test")
-		.current_dir(path)
-		.status()
-		.unwrap_or_else(|e| die("Running test command", e));
-	assert!(child.success(), "There was an error while running JS tests.");
-}

dapps/js-glue/src/lib.rs

@@ -1,39 +0,0 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-
-#![cfg_attr(not(feature = "with-syntex"), feature(rustc_private, plugin))]
-#![cfg_attr(not(feature = "with-syntex"), plugin(quasi_macros))]
-
-#[cfg(feature = "with-syntex")]
-extern crate syntex;
-
-#[cfg(feature = "with-syntex")]
-#[macro_use]
-extern crate syntex_syntax as syntax;
-
-#[cfg(feature = "with-syntex")]
-include!(concat!(env!("OUT_DIR"), "/lib.rs"));
-
-#[cfg(not(feature = "with-syntex"))]
-#[macro_use]
-extern crate syntax;
-
-#[cfg(not(feature = "with-syntex"))]
-extern crate rustc_plugin;
-
-#[cfg(not(feature = "with-syntex"))]
-include!("lib.rs.in");

dapps/js-glue/src/lib.rs.in

@@ -1,46 +0,0 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-extern crate quasi;
-
-mod codegen;
-mod build;
-pub mod js;
-pub use build::inner::generate;
-
-use std::default::Default;
-
-#[derive(Clone)]
-pub struct File {
-	pub path: &'static str,
-	pub content: &'static [u8],
-	// TODO: use strongly-typed MIME.
-	pub content_type: &'static str,
-}
-
-#[derive(Clone, Debug)]
-pub struct Info {
-	pub name: &'static str,
-	pub version: &'static str,
-	pub author: &'static str,
-	pub description: &'static str,
-	pub icon_url: &'static str,
-}
-
-pub trait WebApp : Default + Send + Sync {
-	fn file(&self, path: &str) -> Option<&File>;
-	fn info(&self) -> Info;
-}

dapps/src/api/api.rs

@@ -15,33 +15,23 @@
 // along with Parity.  If not, see <http://www.gnu.org/licenses/>.
 
 use std::sync::Arc;
-use unicase::UniCase;
-use hyper::{server, net, Decoder, Encoder, Next, Control};
-use hyper::header;
-use hyper::method::Method;
-use hyper::header::AccessControlAllowOrigin;
-
+use hyper::{server, net, Decoder, Encoder, Next};
 use api::types::{App, ApiError};
-use api::response;
-use apps::fetcher::ContentFetcher;
-
+use api::response::{as_json, as_json_error, ping_response};
 use handlers::extract_url;
 use endpoint::{Endpoint, Endpoints, Handler, EndpointPath};
-use jsonrpc_http_server::cors;
 
 #[derive(Clone)]
 pub struct RestApi {
-	cors_domains: Option<Vec<AccessControlAllowOrigin>>,
+	local_domain: String,
 	endpoints: Arc<Endpoints>,
-	fetcher: Arc<ContentFetcher>,
 }
 
 impl RestApi {
-	pub fn new(cors_domains: Vec<String>, endpoints: Arc<Endpoints>, fetcher: Arc<ContentFetcher>) -> Box<Endpoint> {
+	pub fn new(local_domain: String, endpoints: Arc<Endpoints>) -> Box<Endpoint> {
 		Box::new(RestApi {
-			cors_domains: Some(cors_domains.into_iter().map(AccessControlAllowOrigin::Value).collect()),
+			local_domain: local_domain,
 			endpoints: endpoints,
-			fetcher: fetcher,
 		})
 	}
 
@@ -53,97 +43,39 @@ impl RestApi {
 }
 
 impl Endpoint for RestApi {
-	fn to_async_handler(&self, path: EndpointPath, control: Control) -> Box<Handler> {
-		Box::new(RestApiRouter::new(self.clone(), path, control))
+	fn to_handler(&self, _path: EndpointPath) -> Box<Handler> {
+		Box::new(RestApiRouter {
+			api: self.clone(),
+			handler: as_json_error(&ApiError {
+				code: "404".into(),
+				title: "Not Found".into(),
+				detail: "Resource you requested has not been found.".into(),
+			}),
+		})
 	}
 }
 
 struct RestApiRouter {
 	api: RestApi,
-	origin: Option<String>,
-	path: Option<EndpointPath>,
-	control: Option<Control>,
 	handler: Box<Handler>,
 }
 
-impl RestApiRouter {
-	fn new(api: RestApi, path: EndpointPath, control: Control) -> Self {
-		RestApiRouter {
-			path: Some(path),
-			origin: None,
-			control: Some(control),
-			api: api,
-			handler: response::as_json_error(&ApiError {
-				code: "404".into(),
-				title: "Not Found".into(),
-				detail: "Resource you requested has not been found.".into(),
-			}),
-		}
-	}
-
-	fn resolve_content(&self, hash: Option<&str>, path: EndpointPath, control: Control) -> Option<Box<Handler>> {
-		match hash {
-			Some(hash) if self.api.fetcher.contains(hash) => {
-				Some(self.api.fetcher.to_async_handler(path, control))
-			},
-			_ => None
-		}
-	}
-
-	/// Returns basic headers for a response (it may be overwritten by the handler)
-	fn response_headers(&self) -> header::Headers {
-		let mut headers = header::Headers::new();
-		headers.set(header::AccessControlAllowCredentials);
-		headers.set(header::AccessControlAllowMethods(vec![
-			Method::Options,
-			Method::Post,
-			Method::Get,
-		]));
-		headers.set(header::AccessControlAllowHeaders(vec![
-			UniCase("origin".to_owned()),
-			UniCase("content-type".to_owned()),
-			UniCase("accept".to_owned()),
-		]));
-
-		if let Some(cors_header) = cors::get_cors_header(&self.api.cors_domains, &self.origin) {
-			headers.set(cors_header);
-		}
-
-		headers
-	}
-}
-
 impl server::Handler<net::HttpStream> for RestApiRouter {
 
 	fn on_request(&mut self, request: server::Request<net::HttpStream>) -> Next {
-		self.origin = cors::read_origin(&request);
-
-		if let Method::Options = *request.method() {
-			self.handler = response::empty();
-			return Next::write();
-		}
-
 		let url = extract_url(&request);
 		if url.is_none() {
 			// Just return 404 if we can't parse URL
 			return Next::write();
 		}
 
-		let url = url.expect("Check for None early-exists above; qed");
-		let mut path = self.path.take().expect("on_request called only once, and path is always defined in new; qed");
-		let control = self.control.take().expect("on_request called only once, and control is always defined in new; qed");
-
+		let url = url.expect("Check for None is above; qed");
 		let endpoint = url.path.get(1).map(|v| v.as_str());
-		let hash = url.path.get(2).map(|v| v.as_str());
-		// at this point path.app_id contains 'api', adjust it to the hash properly, otherwise
-		// we will try and retrieve 'api' as the hash when doing the /api/content route
-		if let Some(ref hash) = hash { path.app_id = hash.clone().to_owned() }
 
 		let handler = endpoint.and_then(|v| match v {
-			"apps" => Some(response::as_json(&self.api.list_apps())),
-			"ping" => Some(response::ping()),
-			"content" => self.resolve_content(hash, path, control),
-			_ => None
+			"apps" => Some(as_json(&self.api.list_apps())),
+			"ping" => Some(ping_response(&self.api.local_domain)),
+			_ => None,
 		});
 
 		// Overwrite default
@@ -159,7 +91,6 @@ impl server::Handler<net::HttpStream> for RestApiRouter {
 	}
 
 	fn on_response(&mut self, res: &mut server::Response) -> Next {
-		*res.headers_mut() = self.response_headers();
 		self.handler.on_response(res)
 	}
 

dapps/src/api/response.rs

@@ -19,22 +19,18 @@ use serde_json;
 use endpoint::Handler;
 use handlers::{ContentHandler, EchoHandler};
 
-pub fn empty() -> Box<Handler> {
-	Box::new(ContentHandler::ok("".into(), mime!(Text/Plain)))
+pub fn as_json<T : Serialize>(val: &T) -> Box<Handler> {
+	Box::new(ContentHandler::ok(serde_json::to_string(val).unwrap(), "application/json".to_owned()))
 }
 
-pub fn as_json<T: Serialize>(val: &T) -> Box<Handler> {
-	let json = serde_json::to_string(val)
-		.expect("serialization to string is infallible; qed");
-	Box::new(ContentHandler::ok(json, mime!(Application/Json)))
+pub fn as_json_error<T : Serialize>(val: &T) -> Box<Handler> {
+	Box::new(ContentHandler::not_found(serde_json::to_string(val).unwrap(), "application/json".to_owned()))
 }
 
-pub fn as_json_error<T: Serialize>(val: &T) -> Box<Handler> {
-	let json = serde_json::to_string(val)
-		.expect("serialization to string is infallible; qed");
-	Box::new(ContentHandler::not_found(json, mime!(Application/Json)))
-}
-
-pub fn ping() -> Box<Handler> {
-	Box::new(EchoHandler::default())
+pub fn ping_response(local_domain: &str) -> Box<Handler> {
+	Box::new(EchoHandler::cors(vec![
+		format!("http://{}", local_domain),
+		// Allow CORS calls also for localhost
+		format!("http://{}", local_domain.replace("127.0.0.1", "localhost")),
+	]))
 }

dapps/src/api/types.rs.in

@@ -16,7 +16,7 @@
 
 use endpoint::EndpointInfo;
 
-#[derive(Debug, PartialEq, Clone, Serialize, Deserialize)]
+#[derive(Debug, PartialEq, Serialize, Deserialize)]
 pub struct App {
 	pub id: String,
 	pub name: String,
@@ -41,18 +41,6 @@ impl App {
 	}
 }
 
-impl Into<EndpointInfo> for App {
-	fn into(self) -> EndpointInfo {
-		EndpointInfo {
-			name: self.name,
-			description: self.description,
-			version: self.version,
-			author: self.author,
-			icon_url: self.icon_url,
-		}
-	}
-}
-
 #[derive(Debug, PartialEq, Serialize, Deserialize)]
 pub struct ApiError {
 	pub code: String,

dapps/src/apps/cache.rs

@@ -1,129 +0,0 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-//! Fetchable Dapps support.
-
-use std::fs;
-use std::sync::{Arc};
-
-use linked_hash_map::LinkedHashMap;
-use page::LocalPageEndpoint;
-use handlers::FetchControl;
-
-pub enum ContentStatus {
-	Fetching(Arc<FetchControl>),
-	Ready(LocalPageEndpoint),
-}
-
-#[derive(Default)]
-pub struct ContentCache {
-	cache: LinkedHashMap<String, ContentStatus>,
-}
-
-impl ContentCache {
-	pub fn insert(&mut self, content_id: String, status: ContentStatus) -> Option<ContentStatus> {
-		self.cache.insert(content_id, status)
-	}
-
-	pub fn remove(&mut self, content_id: &str) -> Option<ContentStatus> {
-		self.cache.remove(content_id)
-	}
-
-	pub fn get(&mut self, content_id: &str) -> Option<&mut ContentStatus> {
-		self.cache.get_refresh(content_id)
-	}
-
-	pub fn clear_garbage(&mut self, expected_size: usize) -> Vec<(String, ContentStatus)> {
-		let len = self.cache.len();
-
-		if len <= expected_size {
-			return Vec::new();
-		}
-
-		let mut removed = Vec::with_capacity(len - expected_size);
-
-		while self.cache.len() > expected_size {
-			let entry = self.cache.pop_front().expect("expected_size bounded at 0, len is greater; qed");
-
-			match entry.1 {
-				ContentStatus::Fetching(ref fetch) => {
-					trace!(target: "dapps", "Aborting {} because of limit.", entry.0);
-					// Mark as aborted
-					fetch.abort()
-				},
-				ContentStatus::Ready(ref endpoint) => {
-					trace!(target: "dapps", "Removing {} because of limit.", entry.0);
-					// Remove path (dir or file)
-					let res = fs::remove_dir_all(&endpoint.path()).or_else(|_| fs::remove_file(&endpoint.path()));
-					if let Err(e) = res {
-						warn!(target: "dapps", "Unable to remove dapp/content from cache: {:?}", e);
-					}
-				}
-			}
-
-			removed.push(entry);
-		}
-		removed
-	}
-
-	#[cfg(test)]
-	pub fn len(&self) -> usize {
-		self.cache.len()
-	}
-}
-
-#[cfg(test)]
-mod tests {
-	use super::*;
-
-	fn only_keys(data: Vec<(String, ContentStatus)>) -> Vec<String> {
-		data.into_iter().map(|x| x.0).collect()
-	}
-
-	#[test]
-	fn should_remove_least_recently_used() {
-		// given
-		let mut cache = ContentCache::default();
-		cache.insert("a".into(), ContentStatus::Fetching(Default::default()));
-		cache.insert("b".into(), ContentStatus::Fetching(Default::default()));
-		cache.insert("c".into(), ContentStatus::Fetching(Default::default()));
-
-		// when
-		let res = cache.clear_garbage(2);
-
-		// then
-		assert_eq!(cache.len(), 2);
-		assert_eq!(only_keys(res), vec!["a"]);
-	}
-
-	#[test]
-	fn should_update_lru_if_accessed() {
-		// given
-		let mut cache = ContentCache::default();
-		cache.insert("a".into(), ContentStatus::Fetching(Default::default()));
-		cache.insert("b".into(), ContentStatus::Fetching(Default::default()));
-		cache.insert("c".into(), ContentStatus::Fetching(Default::default()));
-
-		// when
-		cache.get("a");
-		let res = cache.clear_garbage(2);
-
-		// then
-		assert_eq!(cache.len(), 2);
-		assert_eq!(only_keys(res), vec!["b"]);
-	}
-
-}

dapps/src/apps/fetcher.rs

@@ -1,440 +0,0 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-//! Fetchable Dapps support.
-//! Manages downloaded (cached) Dapps and downloads them when necessary.
-//! Uses `URLHint` to resolve addresses into Dapps bundle file location.
-
-use zip;
-use std::{fs, env, fmt};
-use std::io::{self, Read, Write};
-use std::path::PathBuf;
-use std::sync::Arc;
-use rustc_serialize::hex::FromHex;
-
-use hyper;
-use hyper::status::StatusCode;
-
-use random_filename;
-use SyncStatus;
-use util::{Mutex, H256};
-use util::sha3::sha3;
-use page::{LocalPageEndpoint, PageCache};
-use handlers::{ContentHandler, ContentFetcherHandler, ContentValidator};
-use endpoint::{Endpoint, EndpointPath, Handler};
-use apps::cache::{ContentCache, ContentStatus};
-use apps::manifest::{MANIFEST_FILENAME, deserialize_manifest, serialize_manifest, Manifest};
-use apps::urlhint::{URLHintContract, URLHint, URLHintResult};
-
-/// Limit of cached dapps/content
-const MAX_CACHED_DAPPS: usize = 20;
-
-pub struct ContentFetcher<R: URLHint = URLHintContract> {
-	dapps_path: PathBuf,
-	resolver: R,
-	cache: Arc<Mutex<ContentCache>>,
-	sync: Arc<SyncStatus>,
-	embeddable_on: Option<(String, u16)>,
-}
-
-impl<R: URLHint> Drop for ContentFetcher<R> {
-	fn drop(&mut self) {
-		// Clear cache path
-		let _ = fs::remove_dir_all(&self.dapps_path);
-	}
-}
-
-impl<R: URLHint> ContentFetcher<R> {
-
-	pub fn new(resolver: R, sync_status: Arc<SyncStatus>, embeddable_on: Option<(String, u16)>) -> Self {
-		let mut dapps_path = env::temp_dir();
-		dapps_path.push(random_filename());
-
-		ContentFetcher {
-			dapps_path: dapps_path,
-			resolver: resolver,
-			sync: sync_status,
-			cache: Arc::new(Mutex::new(ContentCache::default())),
-			embeddable_on: embeddable_on,
-		}
-	}
-
-	fn still_syncing(address: Option<(String, u16)>) -> Box<Handler> {
-		Box::new(ContentHandler::error(
-			StatusCode::ServiceUnavailable,
-			"Sync In Progress",
-			"Your node is still syncing. We cannot resolve any content before it's fully synced.",
-			Some("<a href=\"javascript:window.location.reload()\">Refresh</a>"),
-			address,
-		))
-	}
-
-	#[cfg(test)]
-	fn set_status(&self, content_id: &str, status: ContentStatus) {
-		self.cache.lock().insert(content_id.to_owned(), status);
-	}
-
-	pub fn contains(&self, content_id: &str) -> bool {
-		{
-			let mut cache = self.cache.lock();
-			// Check if we already have the app
-			if cache.get(content_id).is_some() {
-				return true;
-			}
-		}
-		// fallback to resolver
-		if let Ok(content_id) = content_id.from_hex() {
-			// else try to resolve the app_id
-			let has_content = self.resolver.resolve(content_id).is_some();
-			// if there is content or we are syncing return true
-			has_content || self.sync.is_major_importing()
-		} else {
-			false
-		}
-	}
-
-	pub fn to_async_handler(&self, path: EndpointPath, control: hyper::Control) -> Box<Handler> {
-		let mut cache = self.cache.lock();
-		let content_id = path.app_id.clone();
-
-		let (new_status, handler) = {
-			let status = cache.get(&content_id);
-			match status {
-				// Just serve the content
-				Some(&mut ContentStatus::Ready(ref endpoint)) => {
-					(None, endpoint.to_async_handler(path, control))
-				},
-				// Content is already being fetched
-				Some(&mut ContentStatus::Fetching(ref fetch_control)) => {
-					trace!(target: "dapps", "Content fetching in progress. Waiting...");
-					(None, fetch_control.to_handler(control))
-				},
-				// We need to start fetching the content
-				None => {
-					trace!(target: "dapps", "Content unavailable. Fetching... {:?}", content_id);
-					let content_hex = content_id.from_hex().expect("to_handler is called only when `contains` returns true.");
-					let content = self.resolver.resolve(content_hex);
-
-					let cache = self.cache.clone();
-					let on_done = move |id: String, result: Option<LocalPageEndpoint>| {
-						let mut cache = cache.lock();
-						match result {
-							Some(endpoint) => {
-								cache.insert(id, ContentStatus::Ready(endpoint));
-							},
-							// In case of error
-							None => {
-								cache.remove(&id);
-							},
-						}
-					};
-
-					match content {
-						// Don't serve dapps if we are still syncing (but serve content)
-						Some(URLHintResult::Dapp(_)) if self.sync.is_major_importing() => {
-							(None, Self::still_syncing(self.embeddable_on.clone()))
-						},
-						Some(URLHintResult::Dapp(dapp)) => {
-							let (handler, fetch_control) = ContentFetcherHandler::new(
-								dapp.url(),
-								control,
-								DappInstaller {
-									id: content_id.clone(),
-									dapps_path: self.dapps_path.clone(),
-									on_done: Box::new(on_done),
-									embeddable_on: self.embeddable_on.clone(),
-								},
-								self.embeddable_on.clone(),
-							);
-
-							(Some(ContentStatus::Fetching(fetch_control)), Box::new(handler) as Box<Handler>)
-						},
-						Some(URLHintResult::Content(content)) => {
-							let (handler, fetch_control) = ContentFetcherHandler::new(
-								content.url,
-								control,
-								ContentInstaller {
-									id: content_id.clone(),
-									mime: content.mime,
-									content_path: self.dapps_path.clone(),
-									on_done: Box::new(on_done),
-								},
-								self.embeddable_on.clone(),
-							);
-
-							(Some(ContentStatus::Fetching(fetch_control)), Box::new(handler) as Box<Handler>)
-						},
-						None if self.sync.is_major_importing() => {
-							(None, Self::still_syncing(self.embeddable_on.clone()))
-						},
-						None => {
-							// This may happen when sync status changes in between
-							// `contains` and `to_handler`
-							(None, Box::new(ContentHandler::error(
-								StatusCode::NotFound,
-								"Resource Not Found",
-								"Requested resource was not found.",
-								None,
-								self.embeddable_on.clone(),
-							)) as Box<Handler>)
-						},
-					}
-				},
-			}
-		};
-
-		if let Some(status) = new_status {
-			cache.clear_garbage(MAX_CACHED_DAPPS);
-			cache.insert(content_id, status);
-		}
-
-		handler
-	}
-}
-
-#[derive(Debug)]
-pub enum ValidationError {
-	Io(io::Error),
-	Zip(zip::result::ZipError),
-	InvalidContentId,
-	ManifestNotFound,
-	ManifestSerialization(String),
-	HashMismatch { expected: H256, got: H256, },
-}
-
-impl fmt::Display for ValidationError {
-	fn fmt(&self, f: &mut fmt::Formatter) -> Result<(), fmt::Error> {
-		match *self {
-			ValidationError::Io(ref io) => write!(f, "Unexpected IO error occured: {:?}", io),
-			ValidationError::Zip(ref zip) => write!(f, "Unable to read ZIP archive: {:?}", zip),
-			ValidationError::InvalidContentId => write!(f, "ID is invalid. It should be 256 bits keccak hash of content."),
-			ValidationError::ManifestNotFound => write!(f, "Downloaded Dapp bundle did not contain valid manifest.json file."),
-			ValidationError::ManifestSerialization(ref err) => {
-				write!(f, "There was an error during Dapp Manifest serialization: {:?}", err)
-			},
-			ValidationError::HashMismatch { ref expected, ref got } => {
-				write!(f, "Hash of downloaded content did not match. Expected:{:?}, Got:{:?}.", expected, got)
-			},
-		}
-	}
-}
-
-impl From<io::Error> for ValidationError {
-	fn from(err: io::Error) -> Self {
-		ValidationError::Io(err)
-	}
-}
-
-impl From<zip::result::ZipError> for ValidationError {
-	fn from(err: zip::result::ZipError) -> Self {
-		ValidationError::Zip(err)
-	}
-}
-
-struct ContentInstaller {
-	id: String,
-	mime: String,
-	content_path: PathBuf,
-	on_done: Box<Fn(String, Option<LocalPageEndpoint>) + Send>,
-}
-
-impl ContentValidator for ContentInstaller {
-	type Error = ValidationError;
-
-	fn validate_and_install(&self, path: PathBuf) -> Result<(String, LocalPageEndpoint), ValidationError> {
-		// Create dir
-		try!(fs::create_dir_all(&self.content_path));
-
-		// Validate hash
-		let mut file_reader = io::BufReader::new(try!(fs::File::open(&path)));
-		let hash = try!(sha3(&mut file_reader));
-		let id = try!(self.id.as_str().parse().map_err(|_| ValidationError::InvalidContentId));
-		if id != hash {
-			return Err(ValidationError::HashMismatch {
-				expected: id,
-				got: hash,
-			});
-		}
-
-		// And prepare path for a file
-		let filename = path.file_name().expect("We always fetch a file.");
-		let mut content_path = self.content_path.clone();
-		content_path.push(&filename);
-
-		if content_path.exists() {
-			try!(fs::remove_dir_all(&content_path))
-		}
-
-		try!(fs::copy(&path, &content_path));
-
-		Ok((self.id.clone(), LocalPageEndpoint::single_file(content_path, self.mime.clone(), PageCache::Enabled)))
-	}
-
-	fn done(&self, endpoint: Option<LocalPageEndpoint>) {
-		(self.on_done)(self.id.clone(), endpoint)
-	}
-}
-
-
-struct DappInstaller {
-	id: String,
-	dapps_path: PathBuf,
-	on_done: Box<Fn(String, Option<LocalPageEndpoint>) + Send>,
-	embeddable_on: Option<(String, u16)>,
-}
-
-impl DappInstaller {
-	fn find_manifest(zip: &mut zip::ZipArchive<fs::File>) -> Result<(Manifest, PathBuf), ValidationError> {
-		for i in 0..zip.len() {
-			let mut file = try!(zip.by_index(i));
-
-			if !file.name().ends_with(MANIFEST_FILENAME) {
-				continue;
-			}
-
-			// try to read manifest
-			let mut manifest = String::new();
-			let manifest = file
-				.read_to_string(&mut manifest).ok()
-				.and_then(|_| deserialize_manifest(manifest).ok());
-
-			if let Some(manifest) = manifest {
-				let mut manifest_location = PathBuf::from(file.name());
-				manifest_location.pop(); // get rid of filename
-				return Ok((manifest, manifest_location));
-			}
-		}
-
-		Err(ValidationError::ManifestNotFound)
-	}
-
-	fn dapp_target_path(&self, manifest: &Manifest) -> PathBuf {
-		let mut target = self.dapps_path.clone();
-		target.push(&manifest.id);
-		target
-	}
-}
-
-impl ContentValidator for DappInstaller {
-	type Error = ValidationError;
-
-	fn validate_and_install(&self, app_path: PathBuf) -> Result<(String, LocalPageEndpoint), ValidationError> {
-		trace!(target: "dapps", "Opening dapp bundle at {:?}", app_path);
-		let mut file_reader = io::BufReader::new(try!(fs::File::open(app_path)));
-		let hash = try!(sha3(&mut file_reader));
-		let id = try!(self.id.as_str().parse().map_err(|_| ValidationError::InvalidContentId));
-		if id != hash {
-			return Err(ValidationError::HashMismatch {
-				expected: id,
-				got: hash,
-			});
-		}
-		let file = file_reader.into_inner();
-		// Unpack archive
-		let mut zip = try!(zip::ZipArchive::new(file));
-		// First find manifest file
-		let (mut manifest, manifest_dir) = try!(Self::find_manifest(&mut zip));
-		// Overwrite id to match hash
-		manifest.id = self.id.clone();
-
-		let target = self.dapp_target_path(&manifest);
-
-		// Remove old directory
-		if target.exists() {
-			warn!(target: "dapps", "Overwriting existing dapp: {}", manifest.id);
-			try!(fs::remove_dir_all(target.clone()));
-		}
-
-		// Unpack zip
-		for i in 0..zip.len() {
-			let mut file = try!(zip.by_index(i));
-			// TODO [todr] Check if it's consistent on windows.
-			let is_dir = file.name().chars().rev().next() == Some('/');
-
-			let file_path = PathBuf::from(file.name());
-			let location_in_manifest_base = file_path.strip_prefix(&manifest_dir);
-			// Create files that are inside manifest directory
-			if let Ok(location_in_manifest_base) = location_in_manifest_base {
-				let p = target.join(location_in_manifest_base);
-				// Check if it's a directory
-				if is_dir {
-					try!(fs::create_dir_all(p));
-				} else {
-					let mut target = try!(fs::File::create(p));
-					try!(io::copy(&mut file, &mut target));
-				}
-			}
-		}
-
-		// Write manifest
-		let manifest_str = try!(serialize_manifest(&manifest).map_err(ValidationError::ManifestSerialization));
-		let manifest_path = target.join(MANIFEST_FILENAME);
-		let mut manifest_file = try!(fs::File::create(manifest_path));
-		try!(manifest_file.write_all(manifest_str.as_bytes()));
-
-		// Create endpoint
-		let app = LocalPageEndpoint::new(target, manifest.clone().into(), PageCache::Enabled, self.embeddable_on.clone());
-
-		// Return modified app manifest
-		Ok((manifest.id.clone(), app))
-	}
-
-	fn done(&self, endpoint: Option<LocalPageEndpoint>) {
-		(self.on_done)(self.id.clone(), endpoint)
-	}
-}
-
-#[cfg(test)]
-mod tests {
-	use std::env;
-	use std::sync::Arc;
-	use util::Bytes;
-	use endpoint::EndpointInfo;
-	use page::LocalPageEndpoint;
-	use apps::cache::ContentStatus;
-	use apps::urlhint::{URLHint, URLHintResult};
-	use super::ContentFetcher;
-
-	struct FakeResolver;
-	impl URLHint for FakeResolver {
-		fn resolve(&self, _id: Bytes) -> Option<URLHintResult> {
-			None
-		}
-	}
-
-	#[test]
-	fn should_true_if_contains_the_app() {
-		// given
-		let path = env::temp_dir();
-		let fetcher = ContentFetcher::new(FakeResolver, Arc::new(|| false), None);
-		let handler = LocalPageEndpoint::new(path, EndpointInfo {
-			name: "fake".into(),
-			description: "".into(),
-			version: "".into(),
-			author: "".into(),
-			icon_url: "".into(),
-		}, Default::default(), None);
-
-		// when
-		fetcher.set_status("test", ContentStatus::Ready(handler));
-		fetcher.set_status("test2", ContentStatus::Fetching(Default::default()));
-
-		// then
-		assert_eq!(fetcher.contains("test"), true);
-		assert_eq!(fetcher.contains("test2"), true);
-		assert_eq!(fetcher.contains("test3"), false);
-	}
-}

dapps/src/apps/fs.rs

@@ -14,13 +14,14 @@
 // You should have received a copy of the GNU General Public License
 // along with Parity.  If not, see <http://www.gnu.org/licenses/>.
 
+use serde_json;
 use std::io;
 use std::io::Read;
 use std::fs;
 use std::path::PathBuf;
-use page::{LocalPageEndpoint, PageCache};
+use page::LocalPageEndpoint;
 use endpoint::{Endpoints, EndpointInfo};
-use apps::manifest::{MANIFEST_FILENAME, deserialize_manifest};
+use api::App;
 
 struct LocalDapp {
 	id: String,
@@ -72,7 +73,7 @@ fn local_dapps(dapps_path: String) -> Vec<LocalDapp> {
 }
 
 fn read_manifest(name: &str, mut path: PathBuf) -> EndpointInfo {
-	path.push(MANIFEST_FILENAME);
+	path.push("manifest.json");
 
 	fs::File::open(path.clone())
 		.map_err(|e| format!("{:?}", e))
@@ -81,9 +82,15 @@ fn read_manifest(name: &str, mut path: PathBuf) -> EndpointInfo {
 			let mut s = String::new();
 			try!(f.read_to_string(&mut s).map_err(|e| format!("{:?}", e)));
 			// Try to deserialize manifest
-			deserialize_manifest(s)
+			serde_json::from_str::<App>(&s).map_err(|e| format!("{:?}", e))
+		})
+		.map(|app| EndpointInfo {
+			name: app.name,
+			description: app.description,
+			version: app.version,
+			author: app.author,
+			icon_url: app.icon_url,
 		})
-		.map(Into::into)
 		.unwrap_or_else(|e| {
 			warn!(target: "dapps", "Cannot read manifest file at: {:?}. Error: {:?}", path, e);
 
@@ -97,12 +104,12 @@ fn read_manifest(name: &str, mut path: PathBuf) -> EndpointInfo {
 		})
 }
 
-pub fn local_endpoints(dapps_path: String, signer_address: Option<(String, u16)>) -> Endpoints {
+pub fn local_endpoints(dapps_path: String) -> Endpoints {
 	let mut pages = Endpoints::new();
 	for dapp in local_dapps(dapps_path) {
 		pages.insert(
 			dapp.id,
-			Box::new(LocalPageEndpoint::new(dapp.path, dapp.info, PageCache::Disabled, signer_address.clone()))
+			Box::new(LocalPageEndpoint::new(dapp.path, dapp.info))
 		);
 	}
 	pages

dapps/src/apps/mod.rs

@@ -19,44 +19,51 @@ use page::PageEndpoint;
 use proxypac::ProxyPac;
 use parity_dapps::WebApp;
 
-mod cache;
 mod fs;
-pub mod urlhint;
-pub mod fetcher;
-pub mod manifest;
 
-extern crate parity_ui;
+extern crate parity_dapps_status;
+extern crate parity_dapps_home;
 
-pub const HOME_PAGE: &'static str = "home";
 pub const DAPPS_DOMAIN : &'static str = ".parity";
 pub const RPC_PATH : &'static str =  "rpc";
 pub const API_PATH : &'static str =  "api";
 pub const UTILS_PATH : &'static str =  "parity-utils";
 
-pub fn utils() -> Box<Endpoint> {
-	Box::new(PageEndpoint::with_prefix(parity_ui::App::default(), UTILS_PATH.to_owned()))
+pub fn main_page() -> &'static str {
+	"/home/"
 }
 
-pub fn all_endpoints(dapps_path: String, signer_address: Option<(String, u16)>) -> Endpoints {
-	// fetch fs dapps at first to avoid overwriting builtins
-	let mut pages = fs::local_endpoints(dapps_path, signer_address.clone());
+pub fn utils() -> Box<Endpoint> {
+	Box::new(PageEndpoint::with_prefix(parity_dapps_home::App::default(), UTILS_PATH.to_owned()))
+}
 
-	// NOTE [ToDr] Dapps will be currently embeded on 8180
-	insert::<parity_ui::App>(&mut pages, "ui", Embeddable::Yes(signer_address.clone()));
-	pages.insert("proxy".into(), ProxyPac::boxed(signer_address));
+pub fn all_endpoints(dapps_path: String) -> Endpoints {
+	// fetch fs dapps at first to avoid overwriting builtins
+	let mut pages = fs::local_endpoints(dapps_path);
+	// Home page needs to be safe embed
+	// because we use Cross-Origin LocalStorage.
+	// TODO [ToDr] Account naming should be moved to parity.
+	pages.insert("home".into(), Box::new(
+		PageEndpoint::new_safe_to_embed(parity_dapps_home::App::default())
+	));
+	pages.insert("proxy".into(), ProxyPac::boxed());
+	insert::<parity_dapps_status::App>(&mut pages, "parity");
+	insert::<parity_dapps_status::App>(&mut pages, "status");
+
+	// Optional dapps
+	wallet_page(&mut pages);
 
 	pages
 }
 
-fn insert<T : WebApp + Default + 'static>(pages: &mut Endpoints, id: &str, embed_at: Embeddable) {
-	pages.insert(id.to_owned(), Box::new(match embed_at {
-		Embeddable::Yes(address) => PageEndpoint::new_safe_to_embed(T::default(), address),
-		Embeddable::No => PageEndpoint::new(T::default()),
-	}));
+#[cfg(feature = "parity-dapps-wallet")]
+fn wallet_page(pages: &mut Endpoints) {
+	extern crate parity_dapps_wallet;
+	insert::<parity_dapps_wallet::App>(pages, "wallet");
 }
+#[cfg(not(feature = "parity-dapps-wallet"))]
+fn wallet_page(_pages: &mut Endpoints) {}
 
-enum Embeddable {
-	Yes(Option<(String, u16)>),
-	#[allow(dead_code)]
-	No,
+fn insert<T : WebApp + Default + 'static>(pages: &mut Endpoints, id: &str) {
+	pages.insert(id.to_owned(), Box::new(PageEndpoint::new(T::default())));
 }

dapps/src/apps/registrar.json

@@ -1,21 +0,0 @@
-[
-	{"constant":false,"inputs":[{"name":"_new","type":"address"}],"name":"setOwner","outputs":[],"type":"function"},
-	{"constant":false,"inputs":[{"name":"_name","type":"string"}],"name":"confirmReverse","outputs":[{"name":"success","type":"bool"}],"type":"function"},
-	{"constant":false,"inputs":[{"name":"_name","type":"bytes32"}],"name":"reserve","outputs":[{"name":"success","type":"bool"}],"type":"function"},
-	{"constant":false,"inputs":[{"name":"_name","type":"bytes32"},{"name":"_key","type":"string"},{"name":"_value","type":"bytes32"}],"name":"set","outputs":[{"name":"success","type":"bool"}],"type":"function"},
-	{"constant":false,"inputs":[{"name":"_name","type":"bytes32"}],"name":"drop","outputs":[{"name":"success","type":"bool"}],"type":"function"},
-	{"constant":true,"inputs":[{"name":"_name","type":"bytes32"},{"name":"_key","type":"string"}],"name":"getAddress","outputs":[{"name":"","type":"address"}],"type":"function"},
-	{"constant":false,"inputs":[{"name":"_amount","type":"uint256"}],"name":"setFee","outputs":[],"type":"function"},
-	{"constant":false,"inputs":[{"name":"_name","type":"bytes32"},{"name":"_to","type":"address"}],"name":"transfer","outputs":[{"name":"success","type":"bool"}],"type":"function"},
-	{"constant":true,"inputs":[],"name":"owner","outputs":[{"name":"","type":"address"}],"type":"function"},
-	{"constant":true,"inputs":[{"name":"_name","type":"bytes32"}],"name":"reserved","outputs":[{"name":"reserved","type":"bool"}],"type":"function"},
-	{"constant":false,"inputs":[],"name":"drain","outputs":[],"type":"function"},
-	{"constant":false,"inputs":[{"name":"_name","type":"string"},{"name":"_who","type":"address"}],"name":"proposeReverse","outputs":[{"name":"success","type":"bool"}],"type":"function"},
-	{"constant":true,"inputs":[{"name":"_name","type":"bytes32"},{"name":"_key","type":"string"}],"name":"getUint","outputs":[{"name":"","type":"uint256"}],"type":"function"},
-	{"constant":true,"inputs":[{"name":"_name","type":"bytes32"},{"name":"_key","type":"string"}],"name":"get","outputs":[{"name":"","type":"bytes32"}],"type":"function"},
-	{"constant":true,"inputs":[],"name":"fee","outputs":[{"name":"","type":"uint256"}],"type":"function"},
-	{"constant":true,"inputs":[{"name":"","type":"address"}],"name":"reverse","outputs":[{"name":"","type":"string"}],"type":"function"},
-	{"constant":false,"inputs":[{"name":"_name","type":"bytes32"},{"name":"_key","type":"string"},{"name":"_value","type":"uint256"}],"name":"setUint","outputs":[{"name":"success","type":"bool"}],"type":"function"},
-	{"constant":false,"inputs":[],"name":"removeReverse","outputs":[],"type":"function"},
-	{"constant":false,"inputs":[{"name":"_name","type":"bytes32"},{"name":"_key","type":"string"},{"name":"_value","type":"address"}],"name":"setAddress","outputs":[{"name":"success","type":"bool"}],"type":"function"},{"anonymous":false,"inputs":[{"indexed":false,"name":"amount","type":"uint256"}],"name":"Drained","type":"event"},{"anonymous":false,"inputs":[{"indexed":false,"name":"amount","type":"uint256"}],"name":"FeeChanged","type":"event"},{"anonymous":false,"inputs":[{"indexed":true,"name":"name","type":"bytes32"},{"indexed":true,"name":"owner","type":"address"}],"name":"Reserved","type":"event"},{"anonymous":false,"inputs":[{"indexed":true,"name":"name","type":"bytes32"},{"indexed":true,"name":"oldOwner","type":"address"},{"indexed":true,"name":"newOwner","type":"address"}],"name":"Transferred","type":"event"},{"anonymous":false,"inputs":[{"indexed":true,"name":"name","type":"bytes32"},{"indexed":true,"name":"owner","type":"address"}],"name":"Dropped","type":"event"},{"anonymous":false,"inputs":[{"indexed":true,"name":"name","type":"bytes32"},{"indexed":true,"name":"owner","type":"address"},{"indexed":true,"name":"key","type":"string"}],"name":"DataChanged","type":"event"},{"anonymous":false,"inputs":[{"indexed":true,"name":"name","type":"string"},{"indexed":true,"name":"reverse","type":"address"}],"name":"ReverseProposed","type":"event"},{"anonymous":false,"inputs":[{"indexed":true,"name":"name","type":"string"},{"indexed":true,"name":"reverse","type":"address"}],"name":"ReverseConfirmed","type":"event"},{"anonymous":false,"inputs":[{"indexed":true,"name":"name","type":"string"},{"indexed":true,"name":"reverse","type":"address"}],"name":"ReverseRemoved","type":"event"},{"anonymous":false,"inputs":[{"indexed":true,"name":"old","type":"address"},{"indexed":true,"name":"current","type":"address"}],"name":"NewOwner","type":"event"}
-]

dapps/src/apps/urlhint.json

@@ -1,6 +0,0 @@
-[
-	{"constant":false,"inputs":[{"name":"_content","type":"bytes32"},{"name":"_url","type":"string"}],"name":"hintURL","outputs":[],"type":"function"},
-	{"constant":false,"inputs":[{"name":"_content","type":"bytes32"},{"name":"_accountSlashRepo","type":"string"},{"name":"_commit","type":"bytes20"}],"name":"hint","outputs":[],"type":"function"},
-	{"constant":true,"inputs":[{"name":"","type":"bytes32"}],"name":"entries","outputs":[{"name":"accountSlashRepo","type":"string"},{"name":"commit","type":"bytes20"},{"name":"owner","type":"address"}],"type":"function"},
-	{"constant":false,"inputs":[{"name":"_content","type":"bytes32"}],"name":"unhint","outputs":[],"type":"function"}
-]

dapps/src/apps/urlhint.rs

@@ -1,399 +0,0 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-use std::fmt;
-use std::sync::Arc;
-use rustc_serialize::hex::ToHex;
-use mime_guess;
-
-use ethabi::{Interface, Contract, Token};
-use util::{Address, Bytes, Hashable};
-
-const COMMIT_LEN: usize = 20;
-
-#[derive(Debug, PartialEq)]
-pub struct GithubApp {
-	pub account: String,
-	pub repo: String,
-	pub commit: [u8;COMMIT_LEN],
-	pub owner: Address,
-}
-
-impl GithubApp {
-	pub fn url(&self) -> String {
-		// Since https fetcher doesn't support redirections we use direct link
-		// format!("https://github.com/{}/{}/archive/{}.zip", self.account, self.repo, self.commit.to_hex())
-		format!("https://codeload.github.com/{}/{}/zip/{}", self.account, self.repo, self.commit.to_hex())
-	}
-
-	fn commit(bytes: &[u8]) -> Option<[u8;COMMIT_LEN]> {
-		if bytes.len() < COMMIT_LEN {
-			return None;
-		}
-
-		let mut commit = [0; COMMIT_LEN];
-		for i in 0..COMMIT_LEN {
-			commit[i] = bytes[i];
-		}
-
-		Some(commit)
-	}
-}
-
-#[derive(Debug, PartialEq)]
-pub struct Content {
-	pub url: String,
-	pub mime: String,
-	pub owner: Address,
-}
-
-/// RAW Contract interface.
-/// Should execute transaction using current blockchain state.
-pub trait ContractClient: Send + Sync {
-	/// Get registrar address
-	fn registrar(&self) -> Result<Address, String>;
-	/// Call Contract
-	fn call(&self, address: Address, data: Bytes) -> Result<Bytes, String>;
-}
-
-/// Result of resolving id to URL
-#[derive(Debug, PartialEq)]
-pub enum URLHintResult {
-	/// Dapp
-	Dapp(GithubApp),
-	/// Content
-	Content(Content),
-}
-
-/// URLHint Contract interface
-pub trait URLHint {
-	/// Resolves given id to registrar entry.
-	fn resolve(&self, id: Bytes) -> Option<URLHintResult>;
-}
-
-pub struct URLHintContract {
-	urlhint: Contract,
-	registrar: Contract,
-	client: Arc<ContractClient>,
-}
-
-impl URLHintContract {
-	pub fn new(client: Arc<ContractClient>) -> Self {
-		let urlhint = Interface::load(include_bytes!("./urlhint.json")).expect("urlhint.json is valid ABI");
-		let registrar = Interface::load(include_bytes!("./registrar.json")).expect("registrar.json is valid ABI");
-
-		URLHintContract {
-			urlhint: Contract::new(urlhint),
-			registrar: Contract::new(registrar),
-			client: client,
-		}
-	}
-
-	fn urlhint_address(&self) -> Option<Address> {
-		let res = || {
-			let get_address = try!(self.registrar.function("getAddress".into()).map_err(as_string));
-			let params = try!(get_address.encode_call(
-					vec![Token::FixedBytes((*"githubhint".sha3()).to_vec()), Token::String("A".into())]
-			).map_err(as_string));
-			let output = try!(self.client.call(try!(self.client.registrar()), params));
-			let result = try!(get_address.decode_output(output).map_err(as_string));
-
-			match result.get(0) {
-				Some(&Token::Address(address)) if address != *Address::default() => Ok(address.into()),
-				Some(&Token::Address(_)) => Err(format!("Contract not found.")),
-				e => Err(format!("Invalid result: {:?}", e)),
-			}
-		};
-
-		match res() {
-			Ok(res) => Some(res),
-			Err(e) => {
-				warn!(target: "dapps", "Error while calling registrar: {:?}", e);
-				None
-			}
-		}
-	}
-
-	fn encode_urlhint_call(&self, id: Bytes) -> Option<Bytes> {
-		let call = self.urlhint
-			.function("entries".into())
-			.and_then(|f| f.encode_call(vec![Token::FixedBytes(id)]));
-
-		match call {
-			Ok(res) => {
-				Some(res)
-			},
-			Err(e) => {
-				warn!(target: "dapps", "Error while encoding urlhint call: {:?}", e);
-				None
-			}
-		}
-	}
-
-	fn decode_urlhint_output(&self, output: Bytes) -> Option<URLHintResult> {
-		trace!(target: "dapps", "Output: {:?}", output.to_hex());
-		let output = self.urlhint
-			.function("entries".into())
-			.and_then(|f| f.decode_output(output));
-
-		if let Ok(vec) = output {
-			if vec.len() != 3 {
-				warn!(target: "dapps", "Invalid contract output: {:?}", vec);
-				return None;
-			}
-
-			let mut it = vec.into_iter();
-			let account_slash_repo = it.next().expect("element 0 of 3-len vector known to exist; qed");
-			let commit = it.next().expect("element 1 of 3-len vector known to exist; qed");
-			let owner = it.next().expect("element 2 of 3-len vector known to exist qed");
-
-			match (account_slash_repo, commit, owner) {
-				(Token::String(account_slash_repo), Token::FixedBytes(commit), Token::Address(owner)) => {
-					let owner = owner.into();
-					if owner == Address::default() {
-						return None;
-					}
-
-					let commit = GithubApp::commit(&commit);
-					if commit == Some(Default::default()) {
-						let mime = guess_mime_type(&account_slash_repo).unwrap_or("application/octet-stream".into());
-						return Some(URLHintResult::Content(Content {
-							url: account_slash_repo,
-							mime: mime,
-							owner: owner,
-						}));
-					}
-
-					let (account, repo) = {
-						let mut it = account_slash_repo.split('/');
-						match (it.next(), it.next()) {
-							(Some(account), Some(repo)) => (account.into(), repo.into()),
-							_ => return None,
-						}
-					};
-
-					commit.map(|commit| URLHintResult::Dapp(GithubApp {
-						account: account,
-						repo: repo,
-						commit: commit,
-						owner: owner,
-					}))
-				},
-				e => {
-					warn!(target: "dapps", "Invalid contract output parameters: {:?}", e);
-					None
-				},
-			}
-		} else {
-			warn!(target: "dapps", "Invalid contract output: {:?}", output);
-			None
-		}
-	}
-}
-
-impl URLHint for URLHintContract {
-	fn resolve(&self, id: Bytes) -> Option<URLHintResult> {
-		self.urlhint_address().and_then(|address| {
-			// Prepare contract call
-			self.encode_urlhint_call(id)
-				.and_then(|data| {
-					let call = self.client.call(address, data);
-					if let Err(ref e) = call {
-						warn!(target: "dapps", "Error while calling urlhint: {:?}", e);
-					}
-					call.ok()
-				})
-				.and_then(|output| self.decode_urlhint_output(output))
-		})
-	}
-}
-
-fn guess_mime_type(url: &str) -> Option<String> {
-	const CONTENT_TYPE: &'static str = "content-type=";
-
-	let mut it = url.split('#');
-	// skip url
-	let url = it.next();
-	// get meta headers
-	let metas = it.next();
-	if let Some(metas) = metas {
-		for meta in metas.split('&') {
-			let meta = meta.to_lowercase();
-			if meta.starts_with(CONTENT_TYPE) {
-				return Some(meta[CONTENT_TYPE.len()..].to_owned());
-			}
-		}
-	}
-	url.and_then(|url| {
-		url.split('.').last()
-	}).and_then(|extension| {
-		mime_guess::get_mime_type_str(extension).map(Into::into)
-	})
-}
-
-#[cfg(test)]
-pub fn test_guess_mime_type(url: &str) -> Option<String> {
-	guess_mime_type(url)
-}
-
-fn as_string<T: fmt::Debug>(e: T) -> String {
-	format!("{:?}", e)
-}
-
-#[cfg(test)]
-mod tests {
-	use std::sync::Arc;
-	use std::str::FromStr;
-	use rustc_serialize::hex::FromHex;
-
-	use super::*;
-	use util::{Bytes, Address, Mutex, ToPretty};
-
-	struct FakeRegistrar {
-		pub calls: Arc<Mutex<Vec<(String, String)>>>,
-		pub responses: Mutex<Vec<Result<Bytes, String>>>,
-	}
-
-	const REGISTRAR: &'static str = "8e4e9b13d4b45cb0befc93c3061b1408f67316b2";
-	const URLHINT: &'static str = "deadbeefcafe0000000000000000000000000000";
-
-	impl FakeRegistrar {
-		fn new() -> Self {
-			FakeRegistrar {
-				calls: Arc::new(Mutex::new(Vec::new())),
-				responses: Mutex::new(
-					vec![
-						Ok(format!("000000000000000000000000{}", URLHINT).from_hex().unwrap()),
-						Ok(Vec::new())
-					]
-				),
-			}
-		}
-	}
-
-	impl ContractClient for FakeRegistrar {
-
-		fn registrar(&self) -> Result<Address, String> {
-			Ok(REGISTRAR.parse().unwrap())
-		}
-
-		fn call(&self, address: Address, data: Bytes) -> Result<Bytes, String> {
-			self.calls.lock().push((address.to_hex(), data.to_hex()));
-			self.responses.lock().remove(0)
-		}
-	}
-
-	#[test]
-	fn should_call_registrar_and_urlhint_contracts() {
-		// given
-		let registrar = FakeRegistrar::new();
-		let calls = registrar.calls.clone();
-		let urlhint = URLHintContract::new(Arc::new(registrar));
-
-		// when
-		let res = urlhint.resolve("test".bytes().collect());
-		let calls = calls.lock();
-		let call0 = calls.get(0).expect("Registrar resolve called");
-		let call1 = calls.get(1).expect("URLHint Resolve called");
-
-		// then
-		assert!(res.is_none());
-		assert_eq!(call0.0, REGISTRAR);
-		assert_eq!(call0.1,
-			"6795dbcd058740ee9a5a3fb9f1cfa10752baec87e09cc45cd7027fd54708271aca300c75000000000000000000000000000000000000000000000000000000000000004000000000000000000000000000000000000000000000000000000000000000014100000000000000000000000000000000000000000000000000000000000000".to_owned()
-		);
-		assert_eq!(call1.0, URLHINT);
-		assert_eq!(call1.1,
-			"267b69227465737400000000000000000000000000000000000000000000000000000000".to_owned()
-		);
-	}
-
-	#[test]
-	fn should_decode_urlhint_output() {
-		// given
-		let mut registrar = FakeRegistrar::new();
-		registrar.responses = Mutex::new(vec![
-			Ok(format!("000000000000000000000000{}", URLHINT).from_hex().unwrap()),
-			Ok("0000000000000000000000000000000000000000000000000000000000000060ec4c1fe06c808fe3739858c347109b1f5f1ed4b5000000000000000000000000000000000000000000000000deadcafebeefbeefcafedeaddeedfeedffffffff0000000000000000000000000000000000000000000000000000000000000011657468636f72652f64616f2e636c61696d000000000000000000000000000000".from_hex().unwrap()),
-		]);
-		let urlhint = URLHintContract::new(Arc::new(registrar));
-
-		// when
-		let res = urlhint.resolve("test".bytes().collect());
-
-		// then
-		assert_eq!(res, Some(URLHintResult::Dapp(GithubApp {
-			account: "ethcore".into(),
-			repo: "dao.claim".into(),
-			commit: GithubApp::commit(&"ec4c1fe06c808fe3739858c347109b1f5f1ed4b5".from_hex().unwrap()).unwrap(),
-			owner: Address::from_str("deadcafebeefbeefcafedeaddeedfeedffffffff").unwrap(),
-		})))
-	}
-
-	#[test]
-	fn should_decode_urlhint_content_output() {
-		// given
-		let mut registrar = FakeRegistrar::new();
-		registrar.responses = Mutex::new(vec![
-			Ok(format!("000000000000000000000000{}", URLHINT).from_hex().unwrap()),
-			Ok("00000000000000000000000000000000000000000000000000000000000000600000000000000000000000000000000000000000000000000000000000000000000000000000000000000000deadcafebeefbeefcafedeaddeedfeedffffffff000000000000000000000000000000000000000000000000000000000000003d68747470733a2f2f657468636f72652e696f2f6173736574732f696d616765732f657468636f72652d626c61636b2d686f72697a6f6e74616c2e706e67000000".from_hex().unwrap()),
-		]);
-		let urlhint = URLHintContract::new(Arc::new(registrar));
-
-		// when
-		let res = urlhint.resolve("test".bytes().collect());
-
-		// then
-		assert_eq!(res, Some(URLHintResult::Content(Content {
-			url: "https://ethcore.io/assets/images/ethcore-black-horizontal.png".into(),
-			mime: "image/png".into(),
-			owner: Address::from_str("deadcafebeefbeefcafedeaddeedfeedffffffff").unwrap(),
-		})))
-	}
-
-	#[test]
-	fn should_return_valid_url() {
-		// given
-		let app = GithubApp {
-			account: "test".into(),
-			repo: "xyz".into(),
-			commit: [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19],
-			owner: Address::default(),
-		};
-
-		// when
-		let url = app.url();
-
-		// then
-		assert_eq!(url, "https://codeload.github.com/test/xyz/zip/000102030405060708090a0b0c0d0e0f10111213".to_owned());
-	}
-
-	#[test]
-	fn should_guess_mime_type_from_url() {
-		let url1 = "https://ethcore.io/parity";
-		let url2 = "https://ethcore.io/parity#content-type=image/png";
-		let url3 = "https://ethcore.io/parity#something&content-type=image/png";
-		let url4 = "https://ethcore.io/parity.png#content-type=image/jpeg";
-		let url5 = "https://ethcore.io/parity.png";
-
-
-		assert_eq!(test_guess_mime_type(url1), None);
-		assert_eq!(test_guess_mime_type(url2), Some("image/png".into()));
-		assert_eq!(test_guess_mime_type(url3), Some("image/png".into()));
-		assert_eq!(test_guess_mime_type(url4), Some("image/jpeg".into()));
-		assert_eq!(test_guess_mime_type(url5), Some("image/png".into()));
-	}
-}

dapps/src/endpoint.rs

@@ -16,7 +16,7 @@
 
 //! URL Endpoint traits
 
-use hyper::{self, server, net};
+use hyper::{server, net};
 use std::collections::BTreeMap;
 
 #[derive(Debug, PartialEq, Default, Clone)]
@@ -24,7 +24,6 @@ pub struct EndpointPath {
 	pub app_id: String,
 	pub host: String,
 	pub port: u16,
-	pub using_dapps_domains: bool,
 }
 
 #[derive(Debug, PartialEq, Clone)]
@@ -36,17 +35,11 @@ pub struct EndpointInfo {
 	pub icon_url: String,
 }
 
-pub type Endpoints = BTreeMap<String, Box<Endpoint>>;
-pub type Handler = server::Handler<net::HttpStream> + Send;
-
 pub trait Endpoint : Send + Sync {
 	fn info(&self) -> Option<&EndpointInfo> { None }
 
-	fn to_handler(&self, _path: EndpointPath) -> Box<Handler> {
-		panic!("This Endpoint is asynchronous and requires Control object.");
-	}
-
-	fn to_async_handler(&self, path: EndpointPath, _control: hyper::Control) -> Box<Handler> {
-		self.to_handler(path)
-	}
+	fn to_handler(&self, path: EndpointPath) -> Box<server::Handler<net::HttpStream> + Send>;
 }
+
+pub type Endpoints = BTreeMap<String, Box<Endpoint>>;
+pub type Handler = server::Handler<net::HttpStream> + Send;

dapps/src/error_tpl.html

@@ -1,21 +0,0 @@
-<!DOCTYPE html>
-<html>
-	<head>
-		<meta charset="utf-8">
-		<meta name="viewport" content="width=device-width">
-		<title>{title}</title>
-		<link rel="stylesheet" href="/parity-utils/styles.css">
-	</head>
-	<body>
-		<div class="parity-navbar">
-		</div>
-		<div class="parity-box">
-			<h1>{title}</h1>
-			<h3>{message}</h3>
-			<p><code>{details}</code></p>
-		</div>
-		<div class="parity-status">
-			<small>{version}</small>
-		</div>
-	</body>
-</html>

dapps/src/handlers/content.rs

@@ -19,56 +19,49 @@
 use std::io::Write;
 use hyper::{header, server, Decoder, Encoder, Next};
 use hyper::net::HttpStream;
-use hyper::mime::Mime;
 use hyper::status::StatusCode;
 
-use util::version;
-
-use handlers::add_security_headers;
-
-#[derive(Clone)]
 pub struct ContentHandler {
 	code: StatusCode,
 	content: String,
-	mimetype: Mime,
+	mimetype: String,
 	write_pos: usize,
-	safe_to_embed_on: Option<(String, u16)>,
 }
 
 impl ContentHandler {
-	pub fn ok(content: String, mimetype: Mime) -> Self {
-		Self::new(StatusCode::Ok, content, mimetype)
+	pub fn ok(content: String, mimetype: String) -> Self {
+		ContentHandler {
+			code: StatusCode::Ok,
+			content: content,
+			mimetype: mimetype,
+			write_pos: 0
+		}
 	}
 
-	pub fn not_found(content: String, mimetype: Mime) -> Self {
-		Self::new(StatusCode::NotFound, content, mimetype)
+	pub fn forbidden(content: String, mimetype: String) -> Self {
+		ContentHandler {
+			code: StatusCode::Forbidden,
+			content: content,
+			mimetype: mimetype,
+			write_pos: 0
+		}
 	}
 
-	pub fn html(code: StatusCode, content: String, embeddable_on: Option<(String, u16)>) -> Self {
-		Self::new_embeddable(code, content, mime!(Text/Html), embeddable_on)
+	pub fn not_found(content: String, mimetype: String) -> Self {
+		ContentHandler {
+			code: StatusCode::NotFound,
+			content: content,
+			mimetype: mimetype,
+			write_pos: 0
+		}
 	}
 
-	pub fn error(code: StatusCode, title: &str, message: &str, details: Option<&str>, embeddable_on: Option<(String, u16)>) -> Self {
-		Self::html(code, format!(
-			include_str!("../error_tpl.html"),
-			title=title,
-			message=message,
-			details=details.unwrap_or_else(|| ""),
-			version=version(),
-		), embeddable_on)
-	}
-
-	pub fn new(code: StatusCode, content: String, mimetype: Mime) -> Self {
-		Self::new_embeddable(code, content, mimetype, None)
-	}
-
-	pub fn new_embeddable(code: StatusCode, content: String, mimetype: Mime, embeddable_on: Option<(String, u16)>) -> Self {
+	pub fn new(code: StatusCode, content: String, mimetype: String) -> Self {
 		ContentHandler {
 			code: code,
 			content: content,
 			mimetype: mimetype,
 			write_pos: 0,
-			safe_to_embed_on: embeddable_on,
 		}
 	}
 }
@@ -84,8 +77,7 @@ impl server::Handler<HttpStream> for ContentHandler {
 
 	fn on_response(&mut self, res: &mut server::Response) -> Next {
 		res.set_status(self.code);
-		res.headers_mut().set(header::ContentType(self.mimetype.clone()));
-		add_security_headers(&mut res.headers_mut(), self.safe_to_embed_on.clone());
+		res.headers_mut().set(header::ContentType(self.mimetype.parse().unwrap()));
 		Next::write()
 	}
 

dapps/src/handlers/echo.rs

@@ -17,25 +17,82 @@
 //! Echo Handler
 
 use std::io::Read;
-use hyper::{server, Decoder, Encoder, Next};
+use hyper::{header, server, Decoder, Encoder, Next};
+use hyper::method::Method;
 use hyper::net::HttpStream;
+use unicase::UniCase;
 use super::ContentHandler;
 
-#[derive(Default)]
+#[derive(Debug, PartialEq)]
+/// Type of Cross-Origin request
+enum Cors {
+	/// Not a Cross-Origin request - no headers needed
+	No,
+	/// Cross-Origin request with valid Origin
+	Allowed(String),
+	/// Cross-Origin request with invalid Origin
+	Forbidden,
+}
+
 pub struct EchoHandler {
+	safe_origins: Vec<String>,
 	content: String,
+	cors: Cors,
 	handler: Option<ContentHandler>,
 }
 
+impl EchoHandler {
+
+	pub fn cors(safe_origins: Vec<String>) -> Self {
+		EchoHandler {
+			safe_origins: safe_origins,
+			content: String::new(),
+			cors: Cors::Forbidden,
+			handler: None,
+		}
+	}
+
+	fn cors_header(&self, origin: Option<String>) -> Cors {
+		fn origin_is_allowed(origin: &str, safe_origins: &[String]) -> bool {
+			for safe in safe_origins {
+				if origin.starts_with(safe) {
+					return true;
+				}
+			}
+			false
+		}
+
+		match origin {
+			Some(ref origin) if origin_is_allowed(origin, &self.safe_origins) => {
+				Cors::Allowed(origin.clone())
+			},
+			None => Cors::No,
+			_ => Cors::Forbidden,
+		}
+	}
+}
+
 impl server::Handler<HttpStream> for EchoHandler {
-	fn on_request(&mut self, _: server::Request<HttpStream>) -> Next {
-		Next::read()
+	fn on_request(&mut self, request: server::Request<HttpStream>) -> Next {
+		let origin = request.headers().get_raw("origin")
+			.and_then(|list| list.get(0))
+			.and_then(|origin| String::from_utf8(origin.clone()).ok());
+
+		self.cors = self.cors_header(origin);
+
+		// Don't even read the payload if origin is forbidden!
+		if let Cors::Forbidden = self.cors {
+			self.handler = Some(ContentHandler::ok(String::new(), "text/plain".into()));
+			Next::write()
+		} else {
+			Next::read()
+		}
 	}
 
 	fn on_request_readable(&mut self, decoder: &mut Decoder<HttpStream>) -> Next {
 		match decoder.read_to_string(&mut self.content) {
 			Ok(0) => {
-				self.handler = Some(ContentHandler::ok(self.content.clone(), mime!(Application/Json)));
+				self.handler = Some(ContentHandler::ok(self.content.clone(), "application/json".into()));
 				Next::write()
 			},
 			Ok(_) => Next::read(),
@@ -47,14 +104,45 @@ impl server::Handler<HttpStream> for EchoHandler {
 	}
 
 	fn on_response(&mut self, res: &mut server::Response) -> Next {
-		self.handler.as_mut()
-			.expect("handler always set in on_request, which is before now; qed")
-			.on_response(res)
+		if let Cors::Allowed(ref domain) = self.cors {
+			let mut headers = res.headers_mut();
+			headers.set(header::Allow(vec![Method::Options, Method::Post, Method::Get]));
+			headers.set(header::AccessControlAllowHeaders(vec![
+				UniCase("origin".to_owned()),
+				UniCase("content-type".to_owned()),
+				UniCase("accept".to_owned()),
+			]));
+			headers.set(header::AccessControlAllowOrigin::Value(domain.clone()));
+		}
+		self.handler.as_mut().unwrap().on_response(res)
 	}
 
 	fn on_response_writable(&mut self, encoder: &mut Encoder<HttpStream>) -> Next {
-		self.handler.as_mut()
-			.expect("handler always set in on_request, which is before now; qed")
-			.on_response_writable(encoder)
+		self.handler.as_mut().unwrap().on_response_writable(encoder)
 	}
 }
+
+#[test]
+fn should_return_correct_cors_value() {
+	// given
+	let safe_origins = vec!["chrome-extension://".to_owned(), "http://localhost:8080".to_owned()];
+	let cut = EchoHandler {
+		safe_origins: safe_origins,
+		content: String::new(),
+		cors: Cors::No,
+		handler: None,
+	};
+
+	// when
+	let res1 = cut.cors_header(Some("http://ethcore.io".into()));
+	let res2 = cut.cors_header(Some("http://localhost:8080".into()));
+	let res3 = cut.cors_header(Some("chrome-extension://deadbeefcafe".into()));
+	let res4 = cut.cors_header(None);
+
+
+	// then
+	assert_eq!(res1, Cors::Forbidden);
+	assert_eq!(res2, Cors::Allowed("http://localhost:8080".into()));
+	assert_eq!(res3, Cors::Allowed("chrome-extension://deadbeefcafe".into()));
+	assert_eq!(res4, Cors::No);
+}

dapps/src/handlers/fetch.rs

@@ -1,322 +0,0 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-//! Hyper Server Handler that fetches a file during a request (proxy).
-
-use std::{fs, fmt};
-use std::path::PathBuf;
-use std::sync::{mpsc, Arc};
-use std::sync::atomic::{AtomicBool, Ordering};
-use std::time::{Instant, Duration};
-use util::Mutex;
-use url::Url;
-use fetch::{Client, Fetch, FetchResult};
-
-use hyper::{server, Decoder, Encoder, Next, Method, Control};
-use hyper::net::HttpStream;
-use hyper::status::StatusCode;
-
-use handlers::{ContentHandler, Redirection, extract_url};
-use page::LocalPageEndpoint;
-
-const FETCH_TIMEOUT: u64 = 30;
-
-enum FetchState {
-	NotStarted(String),
-	Error(ContentHandler),
-	InProgress(mpsc::Receiver<FetchResult>),
-	Done(String, LocalPageEndpoint, Redirection),
-}
-
-pub trait ContentValidator {
-	type Error: fmt::Debug + fmt::Display;
-
-	fn validate_and_install(&self, app: PathBuf) -> Result<(String, LocalPageEndpoint), Self::Error>;
-	fn done(&self, Option<LocalPageEndpoint>);
-}
-
-pub struct FetchControl {
-	abort: Arc<AtomicBool>,
-	listeners: Mutex<Vec<(Control, mpsc::Sender<FetchState>)>>,
-	deadline: Instant,
-}
-
-impl Default for FetchControl {
-	fn default() -> Self {
-		FetchControl {
-			abort: Arc::new(AtomicBool::new(false)),
-			listeners: Mutex::new(Vec::new()),
-			deadline: Instant::now() + Duration::from_secs(FETCH_TIMEOUT),
-		}
-	}
-}
-
-impl FetchControl {
-	fn notify<F: Fn() -> FetchState>(&self, status: F) {
-		let mut listeners = self.listeners.lock();
-		for (control, sender) in listeners.drain(..) {
-			if let Err(e) = sender.send(status()) {
-				trace!(target: "dapps", "Waiting listener notification failed: {:?}", e);
-			} else {
-				let _ = control.ready(Next::read());
-			}
-		}
-	}
-
-	fn set_status(&self, status: &FetchState) {
-		match *status {
-			FetchState::Error(ref handler) => self.notify(|| FetchState::Error(handler.clone())),
-			FetchState::Done(ref id, ref endpoint, ref handler) => self.notify(|| FetchState::Done(id.clone(), endpoint.clone(), handler.clone())),
-			FetchState::NotStarted(_) | FetchState::InProgress(_) => {},
-		}
-	}
-
-	pub fn abort(&self) {
-		self.abort.store(true, Ordering::SeqCst);
-	}
-
-	pub fn to_handler(&self, control: Control) -> Box<server::Handler<HttpStream> + Send> {
-		let (tx, rx) = mpsc::channel();
-		self.listeners.lock().push((control, tx));
-
-		Box::new(WaitingHandler {
-			receiver: rx,
-			state: None,
-		})
-	}
-}
-
-pub struct WaitingHandler {
-	receiver: mpsc::Receiver<FetchState>,
-	state: Option<FetchState>,
-}
-
-impl server::Handler<HttpStream> for WaitingHandler {
-	fn on_request(&mut self, _request: server::Request<HttpStream>) -> Next {
-		Next::wait()
-	}
-
-	fn on_request_readable(&mut self, _decoder: &mut Decoder<HttpStream>) -> Next {
-		self.state = self.receiver.try_recv().ok();
-		Next::write()
-	}
-
-	fn on_response(&mut self, res: &mut server::Response) -> Next {
-		match self.state {
-			Some(FetchState::Done(_, _, ref mut handler)) => handler.on_response(res),
-			Some(FetchState::Error(ref mut handler)) => handler.on_response(res),
-			_ => Next::end(),
-		}
-	}
-
-	fn on_response_writable(&mut self, encoder: &mut Encoder<HttpStream>) -> Next {
-		match self.state {
-			Some(FetchState::Done(_, _, ref mut handler)) => handler.on_response_writable(encoder),
-			Some(FetchState::Error(ref mut handler)) => handler.on_response_writable(encoder),
-			_ => Next::end(),
-		}
-	}
-}
-
-pub struct ContentFetcherHandler<H: ContentValidator> {
-	fetch_control: Arc<FetchControl>,
-	control: Option<Control>,
-	status: FetchState,
-	client: Option<Client>,
-	installer: H,
-	request_url: Option<Url>,
-	embeddable_on: Option<(String, u16)>,
-}
-
-impl<H: ContentValidator> Drop for ContentFetcherHandler<H> {
-	fn drop(&mut self) {
-		let result = match self.status {
-			FetchState::Done(_, ref result, _) => Some(result.clone()),
-			_ => None,
-		};
-		self.installer.done(result);
-	}
-}
-
-impl<H: ContentValidator> ContentFetcherHandler<H> {
-
-	pub fn new(
-		url: String,
-		control: Control,
-		handler: H,
-		embeddable_on: Option<(String, u16)>,
-	) -> (Self, Arc<FetchControl>) {
-
-		let fetch_control = Arc::new(FetchControl::default());
-		let client = Client::default();
-		let handler = ContentFetcherHandler {
-			fetch_control: fetch_control.clone(),
-			control: Some(control),
-			client: Some(client),
-			status: FetchState::NotStarted(url),
-			installer: handler,
-			request_url: None,
-			embeddable_on: embeddable_on,
-		};
-
-		(handler, fetch_control)
-	}
-
-	fn close_client(client: &mut Option<Client>) {
-		client.take()
-			.expect("After client is closed we are going into write, hence we can never close it again")
-			.close();
-	}
-
-	fn fetch_content(client: &mut Client, url: &str, abort: Arc<AtomicBool>, control: Control) -> Result<mpsc::Receiver<FetchResult>, String> {
-		client.request(url, abort, Box::new(move || {
-			trace!(target: "dapps", "Fetching finished.");
-			// Ignoring control errors
-			let _ = control.ready(Next::read());
-		})).map_err(|e| format!("{:?}", e))
-	}
-}
-
-impl<H: ContentValidator> server::Handler<HttpStream> for ContentFetcherHandler<H> {
-	fn on_request(&mut self, request: server::Request<HttpStream>) -> Next {
-		self.request_url = extract_url(&request);
-		let status = if let FetchState::NotStarted(ref url) = self.status {
-			Some(match *request.method() {
-				// Start fetching content
-				Method::Get => {
-					trace!(target: "dapps", "Fetching content from: {:?}", url);
-					let control = self.control.take().expect("on_request is called only once, thus control is always Some");
-					let client = self.client.as_mut().expect("on_request is called before client is closed.");
-					let fetch = Self::fetch_content(client, url, self.fetch_control.abort.clone(), control);
-					match fetch {
-						Ok(receiver) => FetchState::InProgress(receiver),
-						Err(e) => FetchState::Error(ContentHandler::error(
-							StatusCode::BadGateway,
-							"Unable To Start Dapp Download",
-							"Could not initialize download of the dapp. It might be a problem with the remote server.",
-							Some(&format!("{}", e)),
-							self.embeddable_on.clone(),
-						)),
-					}
-				},
-				// or return error
-				_ => FetchState::Error(ContentHandler::error(
-					StatusCode::MethodNotAllowed,
-					"Method Not Allowed",
-					"Only <code>GET</code> requests are allowed.",
-					None,
-					self.embeddable_on.clone(),
-				)),
-			})
-		} else { None };
-
-		if let Some(status) = status {
-			self.fetch_control.set_status(&status);
-			self.status = status;
-		}
-
-		Next::read()
-	}
-
-	fn on_request_readable(&mut self, decoder: &mut Decoder<HttpStream>) -> Next {
-		let (status, next) = match self.status {
-			// Request may time out
-			FetchState::InProgress(_) if self.fetch_control.deadline < Instant::now() => {
-				trace!(target: "dapps", "Fetching dapp failed because of timeout.");
-				let timeout = ContentHandler::error(
-					StatusCode::GatewayTimeout,
-					"Download Timeout",
-					&format!("Could not fetch content within {} seconds.", FETCH_TIMEOUT),
-					None,
-					self.embeddable_on.clone(),
-				);
-				Self::close_client(&mut self.client);
-				(Some(FetchState::Error(timeout)), Next::write())
-			},
-			FetchState::InProgress(ref receiver) => {
-				// Check if there is an answer
-				let rec = receiver.try_recv();
-				match rec {
-					// Unpack and validate
-					Ok(Ok(path)) => {
-						trace!(target: "dapps", "Fetching content finished. Starting validation ({:?})", path);
-						Self::close_client(&mut self.client);
-						// Unpack and verify
-						let state = match self.installer.validate_and_install(path.clone()) {
-							Err(e) => {
-								trace!(target: "dapps", "Error while validating content: {:?}", e);
-								FetchState::Error(ContentHandler::error(
-									StatusCode::BadGateway,
-									"Invalid Dapp",
-									"Downloaded bundle does not contain a valid content.",
-									Some(&format!("{:?}", e)),
-									self.embeddable_on.clone(),
-								))
-							},
-							Ok((id, result)) => {
-								let url: String = self.request_url.take()
-									.map(|url| url.raw.into_string())
-									.expect("Request URL always read in on_request; qed");
-								FetchState::Done(id, result, Redirection::new(&url))
-							},
-						};
-						// Remove temporary zip file
-						let _ = fs::remove_file(path);
-						(Some(state), Next::write())
-					},
-					Ok(Err(e)) => {
-						warn!(target: "dapps", "Unable to fetch content: {:?}", e);
-						let error = ContentHandler::error(
-							StatusCode::BadGateway,
-							"Download Error",
-							"There was an error when fetching the content.",
-							Some(&format!("{:?}", e)),
-							self.embeddable_on.clone(),
-						);
-						(Some(FetchState::Error(error)), Next::write())
-					},
-					// wait some more
-					_ => (None, Next::wait())
-				}
-			},
-			FetchState::Error(ref mut handler) => (None, handler.on_request_readable(decoder)),
-			_ => (None, Next::write()),
-		};
-
-		if let Some(status) = status {
-			self.fetch_control.set_status(&status);
-			self.status = status;
-		}
-
-		next
-	}
-
-	fn on_response(&mut self, res: &mut server::Response) -> Next {
-		match self.status {
-			FetchState::Done(_, _, ref mut handler) => handler.on_response(res),
-			FetchState::Error(ref mut handler) => handler.on_response(res),
-			_ => Next::end(),
-		}
-	}
-
-	fn on_response_writable(&mut self, encoder: &mut Encoder<HttpStream>) -> Next {
-		match self.status {
-			FetchState::Done(_, _, ref mut handler) => handler.on_response_writable(encoder),
-			FetchState::Error(ref mut handler) => handler.on_response_writable(encoder),
-			_ => Next::end(),
-		}
-	}
-}

dapps/src/handlers/mod.rs

@@ -20,36 +20,15 @@ mod auth;
 mod echo;
 mod content;
 mod redirect;
-mod fetch;
 
 pub use self::auth::AuthRequiredHandler;
 pub use self::echo::EchoHandler;
 pub use self::content::ContentHandler;
 pub use self::redirect::Redirection;
-pub use self::fetch::{ContentFetcherHandler, ContentValidator, FetchControl};
 
 use url::Url;
 use hyper::{server, header, net, uri};
-use address;
 
-/// Adds security-related headers to the Response.
-pub fn add_security_headers(headers: &mut header::Headers, embeddable_on: Option<(String, u16)>) {
-	headers.set_raw("X-XSS-Protection", vec![b"1; mode=block".to_vec()]);
-	headers.set_raw("X-Content-Type-Options", vec![b"nosniff".to_vec()]);
-
-	// Embedding header:
-	if let Some(embeddable_on) = embeddable_on {
-		headers.set_raw(
-			"X-Frame-Options",
-			vec![format!("ALLOW-FROM http://{}", address(embeddable_on)).into_bytes()]
-			);
-	} else {
-		// TODO [ToDr] Should we be more strict here (DENY?)?
-		headers.set_raw("X-Frame-Options",  vec![b"SAMEORIGIN".to_vec()]);
-	}
-}
-
-/// Extracts URL part from the Request.
 pub fn extract_url(req: &server::Request<net::HttpStream>) -> Option<Url> {
 	match *req.uri() {
 		uri::RequestUri::AbsoluteUri(ref url) => {

dapps/src/handlers/redirect.rs

@@ -20,20 +20,15 @@ use hyper::{header, server, Decoder, Encoder, Next};
 use hyper::net::HttpStream;
 use hyper::status::StatusCode;
 
-#[derive(Clone)]
 pub struct Redirection {
-	to_url: String
+	to_url: &'static str
 }
 
 impl Redirection {
-	pub fn new(url: &str) -> Self {
-		Redirection {
-			to_url: url.to_owned()
-		}
-	}
-
-	pub fn boxed(url: &str) -> Box<Self> {
-		Box::new(Self::new(url))
+	pub fn new(url: &'static str) -> Box<Self> {
+		Box::new(Redirection {
+			to_url: url
+		})
 	}
 }
 
@@ -47,8 +42,7 @@ impl server::Handler<HttpStream> for Redirection {
 	}
 
 	fn on_response(&mut self, res: &mut server::Response) -> Next {
-		// Don't use `MovedPermanently` here to prevent browser from caching the redirections.
-		res.set_status(StatusCode::Found);
+		res.set_status(StatusCode::MovedPermanently);
 		res.headers_mut().set(header::Location(self.to_url.to_owned()));
 		Next::write()
 	}

dapps/src/lib.rs

@@ -43,34 +43,19 @@
 #![warn(missing_docs)]
 #![cfg_attr(feature="nightly", plugin(clippy))]
 
-extern crate hyper;
-extern crate time;
+#[macro_use]
+extern crate log;
 extern crate url as url_lib;
+extern crate hyper;
 extern crate unicase;
 extern crate serde;
 extern crate serde_json;
-extern crate zip;
-extern crate rand;
-extern crate ethabi;
 extern crate jsonrpc_core;
 extern crate jsonrpc_http_server;
-extern crate mime_guess;
-extern crate rustc_serialize;
+extern crate parity_dapps;
 extern crate ethcore_rpc;
-extern crate ethcore_util as util;
-extern crate linked_hash_map;
-extern crate fetch;
-extern crate parity_dapps_glue as parity_dapps;
-#[macro_use]
-extern crate log;
-#[macro_use]
-extern crate mime;
-
-#[cfg(test)]
-extern crate ethcore_devtools as devtools;
-#[cfg(test)]
-extern crate env_logger;
-
+extern crate ethcore_util;
+extern crate mime_guess;
 
 mod endpoint;
 mod apps;
@@ -81,10 +66,6 @@ mod rpc;
 mod api;
 mod proxypac;
 mod url;
-#[cfg(test)]
-mod tests;
-
-pub use self::apps::urlhint::ContractClient;
 
 use std::sync::{Arc, Mutex};
 use std::net::SocketAddr;
@@ -94,25 +75,12 @@ use jsonrpc_core::{IoHandler, IoDelegate};
 use router::auth::{Authorization, NoAuth, HttpBasicAuth};
 use ethcore_rpc::Extendable;
 
-use self::apps::{HOME_PAGE, DAPPS_DOMAIN};
-
-/// Indicates sync status
-pub trait SyncStatus: Send + Sync {
-	/// Returns true if there is a major sync happening.
-	fn is_major_importing(&self) -> bool;
-}
-
-impl<F> SyncStatus for F where F: Fn() -> bool + Send + Sync {
-	fn is_major_importing(&self) -> bool { self() }
-}
+static DAPPS_DOMAIN : &'static str = ".parity";
 
 /// Webapps HTTP+RPC server build.
 pub struct ServerBuilder {
 	dapps_path: String,
 	handler: Arc<IoHandler>,
-	registrar: Arc<ContractClient>,
-	sync_status: Arc<SyncStatus>,
-	signer_address: Option<(String, u16)>,
 }
 
 impl Extendable for ServerBuilder {
@@ -123,26 +91,13 @@ impl Extendable for ServerBuilder {
 
 impl ServerBuilder {
 	/// Construct new dapps server
-	pub fn new(dapps_path: String, registrar: Arc<ContractClient>) -> Self {
+	pub fn new(dapps_path: String) -> Self {
 		ServerBuilder {
 			dapps_path: dapps_path,
-			handler: Arc::new(IoHandler::new()),
-			registrar: registrar,
-			sync_status: Arc::new(|| false),
-			signer_address: None,
+			handler: Arc::new(IoHandler::new())
 		}
 	}
 
-	/// Change default sync status.
-	pub fn with_sync_status(&mut self, status: Arc<SyncStatus>) {
-		self.sync_status = status;
-	}
-
-	/// Change default signer port.
-	pub fn with_signer_address(&mut self, signer_address: Option<(String, u16)>) {
-		self.signer_address = signer_address;
-	}
-
 	/// Asynchronously start server with no authentication,
 	/// returns result with `Server` handle on success or an error.
 	pub fn start_unsecured_http(&self, addr: &SocketAddr, hosts: Option<Vec<String>>) -> Result<Server, ServerError> {
@@ -152,9 +107,6 @@ impl ServerBuilder {
 			NoAuth,
 			self.handler.clone(),
 			self.dapps_path.clone(),
-			self.signer_address.clone(),
-			self.registrar.clone(),
-			self.sync_status.clone(),
 		)
 	}
 
@@ -167,9 +119,6 @@ impl ServerBuilder {
 			HttpBasicAuth::single_user(username, password),
 			self.handler.clone(),
 			self.dapps_path.clone(),
-			self.signer_address.clone(),
-			self.registrar.clone(),
-			self.sync_status.clone(),
 		)
 	}
 }
@@ -196,50 +145,28 @@ impl Server {
 		Some(allowed)
 	}
 
-	/// Returns a list of CORS domains for API endpoint.
-	fn cors_domains(signer_address: Option<(String, u16)>) -> Vec<String> {
-		match signer_address {
-			Some(signer_address) => vec![
-				format!("http://{}{}", HOME_PAGE, DAPPS_DOMAIN),
-				format!("http://{}", address(signer_address)),
-			],
-			None => vec![],
-		}
-	}
-
 	fn start_http<A: Authorization + 'static>(
 		addr: &SocketAddr,
 		hosts: Option<Vec<String>>,
 		authorization: A,
 		handler: Arc<IoHandler>,
 		dapps_path: String,
-		signer_address: Option<(String, u16)>,
-		registrar: Arc<ContractClient>,
-		sync_status: Arc<SyncStatus>,
 	) -> Result<Server, ServerError> {
 		let panic_handler = Arc::new(Mutex::new(None));
 		let authorization = Arc::new(authorization);
-		let content_fetcher = Arc::new(apps::fetcher::ContentFetcher::new(apps::urlhint::URLHintContract::new(registrar), sync_status, signer_address.clone()));
-		let endpoints = Arc::new(apps::all_endpoints(dapps_path, signer_address.clone()));
-		let cors_domains = Self::cors_domains(signer_address.clone());
-
+		let endpoints = Arc::new(apps::all_endpoints(dapps_path));
 		let special = Arc::new({
 			let mut special = HashMap::new();
 			special.insert(router::SpecialEndpoint::Rpc, rpc::rpc(handler, panic_handler.clone()));
+			special.insert(router::SpecialEndpoint::Api, api::RestApi::new(format!("{}", addr), endpoints.clone()));
 			special.insert(router::SpecialEndpoint::Utils, apps::utils());
-			special.insert(
-				router::SpecialEndpoint::Api,
-				api::RestApi::new(cors_domains, endpoints.clone(), content_fetcher.clone())
-			);
 			special
 		});
 		let hosts = Self::allowed_hosts(hosts, format!("{}", addr));
 
 		try!(hyper::Server::http(addr))
-			.handle(move |ctrl| router::Router::new(
-				ctrl,
-				signer_address.clone(),
-				content_fetcher.clone(),
+			.handle(move |_| router::Router::new(
+				apps::main_page(),
 				endpoints.clone(),
 				special.clone(),
 				authorization.clone(),
@@ -263,12 +190,6 @@ impl Server {
 	pub fn set_panic_handler<F>(&self, handler: F) where F : Fn() -> () + Send + 'static {
 		*self.panic_handler.lock().unwrap() = Some(Box::new(handler));
 	}
-
-	#[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()
-	}
 }
 
 impl Drop for Server {
@@ -295,19 +216,8 @@ impl From<hyper::error::Error> for ServerError {
 	}
 }
 
-/// Random filename
-pub fn random_filename() -> String {
-	use ::rand::Rng;
-	let mut rng = ::rand::OsRng::new().unwrap();
-	rng.gen_ascii_chars().take(12).collect()
-}
-
-fn address(address: (String, u16)) -> String {
-	format!("{}:{}", address.0, address.1)
-}
-
 #[cfg(test)]
-mod util_tests {
+mod tests {
 	use super::Server;
 
 	#[test]
@@ -325,17 +235,4 @@ mod util_tests {
 		assert_eq!(address, Some(vec!["localhost".into(), "127.0.0.1".into()]));
 		assert_eq!(some, Some(vec!["ethcore.io".into(), "localhost".into(), "127.0.0.1".into()]));
 	}
-
-	#[test]
-	fn should_return_cors_domains() {
-		// given
-
-		// when
-		let none = Server::cors_domains(None);
-		let some = Server::cors_domains(Some(("127.0.0.1".into(), 18180)));
-
-		// then
-		assert_eq!(none, Vec::<String>::new());
-		assert_eq!(some, vec!["http://home.parity".to_owned(), "http://127.0.0.1:18180".into()]);
-	}
 }

dapps/src/page/builtin.rs

@@ -14,7 +14,7 @@
 // You should have received a copy of the GNU General Public License
 // along with Parity.  If not, see <http://www.gnu.org/licenses/>.
 
-use page::{handler, PageCache};
+use page::handler;
 use std::sync::Arc;
 use endpoint::{Endpoint, EndpointInfo, EndpointPath, Handler};
 use parity_dapps::{WebApp, File, Info};
@@ -25,7 +25,7 @@ pub struct PageEndpoint<T : WebApp + 'static> {
 	/// Prefix to strip from the path (when `None` deducted from `app_id`)
 	pub prefix: Option<String>,
 	/// Safe to be loaded in frame by other origin. (use wisely!)
-	safe_to_embed_on: Option<(String, u16)>,
+	safe_to_embed: bool,
 	info: EndpointInfo,
 }
 
@@ -36,7 +36,7 @@ impl<T: WebApp + 'static> PageEndpoint<T> {
 		PageEndpoint {
 			app: Arc::new(app),
 			prefix: None,
-			safe_to_embed_on: None,
+			safe_to_embed: false,
 			info: EndpointInfo::from(info),
 		}
 	}
@@ -49,7 +49,7 @@ impl<T: WebApp + 'static> PageEndpoint<T> {
 		PageEndpoint {
 			app: Arc::new(app),
 			prefix: Some(prefix),
-			safe_to_embed_on: None,
+			safe_to_embed: false,
 			info: EndpointInfo::from(info),
 		}
 	}
@@ -57,12 +57,12 @@ impl<T: WebApp + 'static> PageEndpoint<T> {
 	/// Creates new `PageEndpoint` which can be safely used in iframe
 	/// even from different origin. It might be dangerous (clickjacking).
 	/// Use wisely!
-	pub fn new_safe_to_embed(app: T, address: Option<(String, u16)>) -> Self {
+	pub fn new_safe_to_embed(app: T) -> Self {
 		let info = app.info();
 		PageEndpoint {
 			app: Arc::new(app),
 			prefix: None,
-			safe_to_embed_on: address,
+			safe_to_embed: true,
 			info: EndpointInfo::from(info),
 		}
 	}
@@ -79,9 +79,8 @@ impl<T: WebApp> Endpoint for PageEndpoint<T> {
 			app: BuiltinDapp::new(self.app.clone()),
 			prefix: self.prefix.clone(),
 			path: path,
-			file: handler::ServedFile::new(self.safe_to_embed_on.clone()),
-			cache: PageCache::Disabled,
-			safe_to_embed_on: self.safe_to_embed_on.clone(),
+			file: None,
+			safe_to_embed: self.safe_to_embed,
 		})
 	}
 }

dapps/src/page/handler.rs

@@ -15,8 +15,6 @@
 // along with Parity.  If not, see <http://www.gnu.org/licenses/>.
 
 use std::io::Write;
-use time::{self, Duration};
-
 use hyper::header;
 use hyper::server;
 use hyper::uri::RequestUri;
@@ -24,7 +22,6 @@ use hyper::net::HttpStream;
 use hyper::status::StatusCode;
 use hyper::{Decoder, Encoder, Next};
 use endpoint::EndpointPath;
-use handlers::{ContentHandler, add_security_headers};
 
 /// Represents a file that can be sent to client.
 /// Implementation should keep track of bytes already sent internally.
@@ -51,39 +48,6 @@ pub trait Dapp: Send + 'static {
 	fn file(&self, path: &str) -> Option<Self::DappFile>;
 }
 
-/// Currently served by `PageHandler` file
-pub enum ServedFile<T: Dapp> {
-	/// File from dapp
-	File(T::DappFile),
-	/// Error (404)
-	Error(ContentHandler),
-}
-
-impl<T: Dapp> ServedFile<T> {
-	pub fn new(embeddable_on: Option<(String, u16)>) -> Self {
-		ServedFile::Error(ContentHandler::error(
-			StatusCode::NotFound,
-			"404 Not Found",
-			"Requested dapp resource was not found.",
-			None,
-			embeddable_on,
-		))
-	}
-}
-
-/// Defines what cache headers should be appended to returned resources.
-#[derive(Debug, Copy, Clone, PartialEq)]
-pub enum PageCache {
-	Enabled,
-	Disabled,
-}
-
-impl Default for PageCache {
-	fn default() -> Self {
-		PageCache::Disabled
-	}
-}
-
 /// A handler for a single webapp.
 /// Resolves correct paths and serves as a plumbing code between
 /// hyper server and dapp.
@@ -91,15 +55,13 @@ pub struct PageHandler<T: Dapp> {
 	/// A Dapp.
 	pub app: T,
 	/// File currently being served (or `None` if file does not exist).
-	pub file: ServedFile<T>,
+	pub file: Option<T::DappFile>,
 	/// Optional prefix to strip from path.
 	pub prefix: Option<String>,
 	/// Requested path.
 	pub path: EndpointPath,
 	/// Flag indicating if the file can be safely embeded (put in iframe).
-	pub safe_to_embed_on: Option<(String, u16)>,
-	/// Cache settings for this page.
-	pub cache: PageCache,
+	pub safe_to_embed: bool,
 }
 
 impl<T: Dapp> PageHandler<T> {
@@ -133,7 +95,7 @@ impl<T: Dapp> server::Handler<HttpStream> for PageHandler<T> {
 				self.app.file(&self.extract_path(url.path()))
 			},
 			_ => None,
-		}.map_or_else(|| ServedFile::new(self.safe_to_embed_on.clone()), |f| ServedFile::File(f));
+		};
 		Next::write()
 	}
 
@@ -142,40 +104,24 @@ impl<T: Dapp> server::Handler<HttpStream> for PageHandler<T> {
 	}
 
 	fn on_response(&mut self, res: &mut server::Response) -> Next {
-		match self.file {
-			ServedFile::File(ref f) => {
-				res.set_status(StatusCode::Ok);
-
-				if let PageCache::Enabled = self.cache {
-					let mut headers = res.headers_mut();
-					let validity = Duration::days(365);
-					headers.set(header::CacheControl(vec![
-						header::CacheDirective::Public,
-						header::CacheDirective::MaxAge(validity.num_seconds() as u32),
-					]));
-					headers.set(header::Expires(header::HttpDate(time::now() + validity)));
-				}
-
-				match f.content_type().parse() {
-					Ok(mime) => res.headers_mut().set(header::ContentType(mime)),
-					Err(()) => debug!(target: "dapps", "invalid MIME type: {}", f.content_type()),
-				}
-
-				// Security headers:
-				add_security_headers(&mut res.headers_mut(), self.safe_to_embed_on.clone());
-				Next::write()
-			},
-			ServedFile::Error(ref mut handler) => {
-				handler.on_response(res)
+		if let Some(ref f) = self.file {
+			res.set_status(StatusCode::Ok);
+			res.headers_mut().set(header::ContentType(f.content_type().parse().unwrap()));
+			if !self.safe_to_embed {
+				res.headers_mut().set_raw("X-Frame-Options", vec![b"SAMEORIGIN".to_vec()]);
 			}
+			Next::write()
+		} else {
+			res.set_status(StatusCode::NotFound);
+			Next::write()
 		}
 	}
 
 	fn on_response_writable(&mut self, encoder: &mut Encoder<HttpStream>) -> Next {
 		match self.file {
-			ServedFile::Error(ref mut handler) => handler.on_response_writable(encoder),
-			ServedFile::File(ref f) if f.is_drained() => Next::end(),
-			ServedFile::File(ref mut f) => match encoder.write(f.next_chunk()) {
+			None => Next::end(),
+			Some(ref f) if f.is_drained() => Next::end(),
+			Some(ref mut f) => match encoder.write(f.next_chunk()) {
 				Ok(bytes) => {
 					f.bytes_written(bytes);
 					Next::write()
@@ -241,12 +187,10 @@ fn should_extract_path_with_appid() {
 		path: EndpointPath {
 			app_id: "app".to_owned(),
 			host: "".to_owned(),
-			port: 8080,
-			using_dapps_domains: true,
+			port: 8080
 		},
-		file: ServedFile::new(None),
-		cache: Default::default(),
-		safe_to_embed_on: None,
+		file: None,
+		safe_to_embed: true,
 	};
 
 	// when

dapps/src/page/local.rs

@@ -17,83 +17,37 @@
 use mime_guess;
 use std::io::{Seek, Read, SeekFrom};
 use std::fs;
-use std::path::{Path, PathBuf};
-use page::handler::{self, PageCache};
+use std::path::PathBuf;
+use page::handler;
 use endpoint::{Endpoint, EndpointInfo, EndpointPath, Handler};
 
-#[derive(Debug, Clone)]
 pub struct LocalPageEndpoint {
 	path: PathBuf,
-	mime: Option<String>,
-	info: Option<EndpointInfo>,
-	cache: PageCache,
-	embeddable_on: Option<(String, u16)>,
+	info: EndpointInfo,
 }
 
 impl LocalPageEndpoint {
-	pub fn new(path: PathBuf, info: EndpointInfo, cache: PageCache, embeddable_on: Option<(String, u16)>) -> Self {
+	pub fn new(path: PathBuf, info: EndpointInfo) -> Self {
 		LocalPageEndpoint {
 			path: path,
-			mime: None,
-			info: Some(info),
-			cache: cache,
-			embeddable_on: embeddable_on,
+			info: info,
 		}
 	}
-
-	pub fn single_file(path: PathBuf, mime: String, cache: PageCache) -> Self {
-		LocalPageEndpoint {
-			path: path,
-			mime: Some(mime),
-			info: None,
-			cache: cache,
-			embeddable_on: None,
-		}
-	}
-
-	pub fn path(&self) -> PathBuf {
-		self.path.clone()
-	}
 }
 
 impl Endpoint for LocalPageEndpoint {
 	fn info(&self) -> Option<&EndpointInfo> {
-		self.info.as_ref()
+		Some(&self.info)
 	}
 
 	fn to_handler(&self, path: EndpointPath) -> Box<Handler> {
-		if let Some(ref mime) = self.mime {
-			Box::new(handler::PageHandler {
-				app: LocalSingleFile { path: self.path.clone(), mime: mime.clone() },
-				prefix: None,
-				path: path,
-				file: handler::ServedFile::new(None),
-				safe_to_embed_on: self.embeddable_on.clone(),
-				cache: self.cache,
-			})
-		} else {
-			Box::new(handler::PageHandler {
-				app: LocalDapp { path: self.path.clone() },
-				prefix: None,
-				path: path,
-				file: handler::ServedFile::new(None),
-				safe_to_embed_on: self.embeddable_on.clone(),
-				cache: self.cache,
-			})
-		}
-	}
-}
-
-struct LocalSingleFile {
-	path: PathBuf,
-	mime: String,
-}
-
-impl handler::Dapp for LocalSingleFile {
-	type DappFile = LocalFile;
-
-	fn file(&self, _path: &str) -> Option<Self::DappFile> {
-		LocalFile::from_path(&self.path, Some(&self.mime))
+		Box::new(handler::PageHandler {
+			app: LocalDapp::new(self.path.clone()),
+			prefix: None,
+			path: path,
+			file: None,
+			safe_to_embed: false,
+		})
 	}
 }
 
@@ -101,6 +55,14 @@ struct LocalDapp {
 	path: PathBuf,
 }
 
+impl LocalDapp {
+	fn new(path: PathBuf) -> Self {
+		LocalDapp {
+			path: path
+		}
+	}
+}
+
 impl handler::Dapp for LocalDapp {
 	type DappFile = LocalFile;
 
@@ -109,7 +71,18 @@ impl handler::Dapp for LocalDapp {
 		for part in file_path.split('/') {
 			path.push(part);
 		}
-		LocalFile::from_path(&path, None)
+		// Check if file exists
+		fs::File::open(path.clone()).ok().map(|file| {
+			let content_type = mime_guess::guess_mime_type(path);
+			let len = file.metadata().ok().map_or(0, |meta| meta.len());
+			LocalFile {
+				content_type: content_type.to_string(),
+				buffer: [0; 4096],
+				file: file,
+				pos: 0,
+				len: len,
+			}
+		})
 	}
 }
 
@@ -121,24 +94,6 @@ struct LocalFile {
 	pos: u64,
 }
 
-impl LocalFile {
-	fn from_path<P: AsRef<Path>>(path: P, mime: Option<&str>) -> Option<Self> {
-		// Check if file exists
-		fs::File::open(&path).ok().map(|file| {
-			let content_type = mime.map(|mime| mime.to_owned())
-				.unwrap_or_else(|| mime_guess::guess_mime_type(path).to_string());
-			let len = file.metadata().ok().map_or(0, |meta| meta.len());
-			LocalFile {
-				content_type: content_type,
-				buffer: [0; 4096],
-				file: file,
-				pos: 0,
-				len: len,
-			}
-		})
-	}
-}
-
 impl handler::DappFile for LocalFile {
 	fn content_type(&self) -> &str {
 		&self.content_type

dapps/src/page/mod.rs

@@ -21,5 +21,4 @@ mod handler;
 
 pub use self::local::LocalPageEndpoint;
 pub use self::builtin::PageEndpoint;
-pub use self::handler::PageCache;
 

dapps/src/proxypac.rs

@@ -18,46 +18,31 @@
 
 use endpoint::{Endpoint, Handler, EndpointPath};
 use handlers::ContentHandler;
-use apps::{HOME_PAGE, DAPPS_DOMAIN};
-use address;
+use apps::DAPPS_DOMAIN;
 
-pub struct ProxyPac {
-	signer_address: Option<(String, u16)>,
-}
+pub struct ProxyPac;
 
 impl ProxyPac {
-	pub fn boxed(signer_address: Option<(String, u16)>) -> Box<Endpoint> {
-		Box::new(ProxyPac {
-			signer_address: signer_address
-		})
+	pub fn boxed() -> Box<Endpoint> {
+		Box::new(ProxyPac)
 	}
 }
 
 impl Endpoint for ProxyPac {
 	fn to_handler(&self, path: EndpointPath) -> Box<Handler> {
-		let signer = self.signer_address.clone()
-			.map(address)
-			.unwrap_or_else(|| format!("{}:{}", path.host, path.port));
-
 		let content = format!(
 r#"
 function FindProxyForURL(url, host) {{
-	if (shExpMatch(host, "{0}{1}"))
+	if (shExpMatch(host, "*{0}"))
 	{{
-		return "PROXY {4}";
-	}}
-
-	if (shExpMatch(host, "*{1}"))
-	{{
-		return "PROXY {2}:{3}";
+		return "PROXY {1}:{2}";
 	}}
 
 	return "DIRECT";
 }}
 "#,
-		HOME_PAGE, DAPPS_DOMAIN, path.host, path.port, signer);
-
-		Box::new(ContentHandler::ok(content, mime!(Application/Javascript)))
+			DAPPS_DOMAIN, path.host, path.port);
+		Box::new(ContentHandler::ok(content, "application/javascript".to_owned()))
 	}
 }
 

dapps/src/router/auth.rs

@@ -55,12 +55,10 @@ impl Authorization for HttpBasicAuth {
 
 		match auth {
 			Access::Denied => {
-				Authorized::No(Box::new(ContentHandler::error(
+				Authorized::No(Box::new(ContentHandler::new(
 					status::StatusCode::Unauthorized,
-					"Unauthorized",
-					"You need to provide valid credentials to access this page.",
-					None,
-					None,
+					"<h1>Unauthorized</h1>".into(),
+					"text/html".into(),
 				)))
 			},
 			Access::AuthRequired => {

dapps/src/router/host_validation.rs

@@ -15,8 +15,8 @@
 // along with Parity.  If not, see <http://www.gnu.org/licenses/>.
 
 
-use apps::DAPPS_DOMAIN;
-use hyper::{server, header, StatusCode};
+use DAPPS_DOMAIN;
+use hyper::server;
 use hyper::net::HttpStream;
 
 use jsonrpc_http_server::{is_host_header_valid};
@@ -28,20 +28,15 @@ pub fn is_valid(request: &server::Request<HttpStream>, allowed_hosts: &[String],
 		.collect::<Vec<String>>();
 	endpoints.extend_from_slice(allowed_hosts);
 
-	let header_valid = is_host_header_valid(request, &endpoints);
-
-	match (header_valid, request.headers().get::<header::Host>()) {
-		(true, _) => true,
-		(_, Some(host)) => host.hostname.ends_with(DAPPS_DOMAIN),
-		_ => false,
-	}
+	is_host_header_valid(request, &endpoints)
 }
 
 pub fn host_invalid_response() -> Box<server::Handler<HttpStream> + Send> {
-	Box::new(ContentHandler::error(StatusCode::Forbidden,
-		"Current Host Is Disallowed",
-		"You are trying to access your node using incorrect address.",
-		Some("Use allowed URL or specify different <code>hosts</code> CLI options."),
-		None,
+	Box::new(ContentHandler::forbidden(
+		r#"
+		<h1>Request with disallowed <code>Host</code> header has been blocked.</h1>
+		<p>Check the URL in your browser address bar.</p>
+		"#.into(),
+		"text/html".into()
 	))
 }

dapps/src/router/mod.rs

@@ -20,16 +20,15 @@
 pub mod auth;
 mod host_validation;
 
-use address;
+use DAPPS_DOMAIN;
 use std::sync::Arc;
 use std::collections::HashMap;
 use url::{Url, Host};
-use hyper::{self, server, Next, Encoder, Decoder, Control, StatusCode};
+use hyper::{self, server, Next, Encoder, Decoder};
 use hyper::net::HttpStream;
-use apps::{self, DAPPS_DOMAIN};
-use apps::fetcher::ContentFetcher;
+use apps;
 use endpoint::{Endpoint, Endpoints, EndpointPath};
-use handlers::{Redirection, extract_url, ContentHandler};
+use handlers::{Redirection, extract_url};
 use self::auth::{Authorization, Authorized};
 
 /// Special endpoints are accessible on every domain (every dapp)
@@ -42,10 +41,8 @@ pub enum SpecialEndpoint {
 }
 
 pub struct Router<A: Authorization + 'static> {
-	control: Option<Control>,
-	signer_address: Option<(String, u16)>,
+	main_page: &'static str,
 	endpoints: Arc<Endpoints>,
-	fetch: Arc<ContentFetcher>,
 	special: Arc<HashMap<SpecialEndpoint, Box<Endpoint>>>,
 	authorization: Arc<A>,
 	allowed_hosts: Option<Vec<String>>,
@@ -55,93 +52,41 @@ pub struct Router<A: Authorization + 'static> {
 impl<A: Authorization + 'static> server::Handler<HttpStream> for Router<A> {
 
 	fn on_request(&mut self, req: server::Request<HttpStream>) -> Next {
-
-		// Choose proper handler depending on path / domain
-		let url = extract_url(&req);
-		let endpoint = extract_endpoint(&url);
-		let is_utils = endpoint.1 == SpecialEndpoint::Utils;
-
-		trace!(target: "dapps", "Routing request to {:?}. Details: {:?}", url, req);
-
 		// Validate Host header
 		if let Some(ref hosts) = self.allowed_hosts {
-			trace!(target: "dapps", "Validating host headers against: {:?}", hosts);
-			let is_valid = is_utils || host_validation::is_valid(&req, hosts, self.endpoints.keys().cloned().collect());
-			if !is_valid {
-				debug!(target: "dapps", "Rejecting invalid host header.");
+			if !host_validation::is_valid(&req, hosts, self.endpoints.keys().cloned().collect()) {
 				self.handler = host_validation::host_invalid_response();
 				return self.handler.on_request(req);
 			}
 		}
 
-		trace!(target: "dapps", "Checking authorization.");
 		// Check authorization
 		let auth = self.authorization.is_authorized(&req);
 		if let Authorized::No(handler) = auth {
-			debug!(target: "dapps", "Authorization denied.");
 			self.handler = handler;
 			return self.handler.on_request(req);
 		}
 
-		let control = self.control.take().expect("on_request is called only once; control is always defined at start; qed");
-		debug!(target: "dapps", "Handling endpoint request: {:?}", endpoint);
+		// Choose proper handler depending on path / domain
+		let url = extract_url(&req);
+		let endpoint = extract_endpoint(&url);
+
 		self.handler = match endpoint {
 			// First check special endpoints
 			(ref path, ref endpoint) if self.special.contains_key(endpoint) => {
-				trace!(target: "dapps", "Resolving to special endpoint.");
-				self.special.get(endpoint)
-					.expect("special known to contain key; qed")
-					.to_async_handler(path.clone().unwrap_or_default(), control)
+				self.special.get(endpoint).unwrap().to_handler(path.clone().unwrap_or_default())
 			},
 			// Then delegate to dapp
 			(Some(ref path), _) if self.endpoints.contains_key(&path.app_id) => {
-				trace!(target: "dapps", "Resolving to local/builtin dapp.");
-				self.endpoints.get(&path.app_id)
-					.expect("special known to contain key; qed")
-					.to_async_handler(path.clone(), control)
+				self.endpoints.get(&path.app_id).unwrap().to_handler(path.clone())
 			},
-			// Try to resolve and fetch the dapp
-			(Some(ref path), _) if self.fetch.contains(&path.app_id) => {
-				trace!(target: "dapps", "Resolving to fetchable content.");
-				self.fetch.to_async_handler(path.clone(), control)
-			},
-			// NOTE [todr] /home is redirected to home page since some users may have the redirection cached
-			// (in the past we used 301 instead of 302)
-			// It should be safe to remove it in (near) future.
-			//
-			// 404 for non-existent content
-			(Some(ref path), _) if *req.method() == hyper::Method::Get && path.app_id != "home" => {
-				trace!(target: "dapps", "Resolving to 404.");
-				Box::new(ContentHandler::error(
-					StatusCode::NotFound,
-					"404 Not Found",
-					"Requested content was not found.",
-					None,
-					self.signer_address.clone(),
-				))
-			},
-			// Redirect any other GET request to signer.
-			_ if *req.method() == hyper::Method::Get => {
-				if let Some(signer_address) = self.signer_address.clone() {
-					trace!(target: "dapps", "Redirecting to signer interface.");
-					Redirection::boxed(&format!("http://{}", address(signer_address)))
-				} else {
-					trace!(target: "dapps", "Signer disabled, returning 404.");
-					Box::new(ContentHandler::error(
-						StatusCode::NotFound,
-						"404 Not Found",
-						"Your homepage is not available when Trusted Signer is disabled.",
-						Some("You can still access dapps by writing a correct address, though. Re-enabled Signer to get your homepage back."),
-						self.signer_address.clone(),
-					))
-				}
+			// Redirection to main page
+			_ if *req.method() == hyper::method::Method::Get => {
+				Redirection::new(self.main_page)
 			},
 			// RPC by default
 			_ => {
-				trace!(target: "dapps", "Resolving to RPC call.");
-				self.special.get(&SpecialEndpoint::Rpc)
-					.expect("RPC endpoint always stored; qed")
-					.to_async_handler(EndpointPath::default(), control)
+				self.special.get(&SpecialEndpoint::Rpc).unwrap().to_handler(EndpointPath::default())
 			}
 		};
 
@@ -167,23 +112,17 @@ impl<A: Authorization + 'static> server::Handler<HttpStream> for Router<A> {
 
 impl<A: Authorization> Router<A> {
 	pub fn new(
-		control: Control,
-		signer_address: Option<(String, u16)>,
-		content_fetcher: Arc<ContentFetcher>,
+		main_page: &'static str,
 		endpoints: Arc<Endpoints>,
 		special: Arc<HashMap<SpecialEndpoint, Box<Endpoint>>>,
 		authorization: Arc<A>,
 		allowed_hosts: Option<Vec<String>>,
 		) -> Self {
 
-		let handler = special.get(&SpecialEndpoint::Utils)
-			.expect("Utils endpoint always stored; qed")
-			.to_handler(EndpointPath::default());
+		let handler = special.get(&SpecialEndpoint::Rpc).unwrap().to_handler(EndpointPath::default());
 		Router {
-			control: Some(control),
-			signer_address: signer_address,
+			main_page: main_page,
 			endpoints: endpoints,
-			fetch: content_fetcher,
 			special: special,
 			authorization: authorization,
 			allowed_hosts: allowed_hosts,
@@ -216,7 +155,6 @@ fn extract_endpoint(url: &Option<Url>) -> (Option<EndpointPath>, SpecialEndpoint
 					app_id: id,
 					host: domain.clone(),
 					port: url.port,
-					using_dapps_domains: true,
 				}), special_endpoint(url))
 			},
 			_ if url.path.len() > 1 => {
@@ -225,7 +163,6 @@ fn extract_endpoint(url: &Option<Url>) -> (Option<EndpointPath>, SpecialEndpoint
 					app_id: id.clone(),
 					host: format!("{}", url.host),
 					port: url.port,
-					using_dapps_domains: false,
 				}), special_endpoint(url))
 			},
 			_ => (None, special_endpoint(url)),
@@ -245,7 +182,6 @@ fn should_extract_endpoint() {
 			app_id: "status".to_owned(),
 			host: "localhost".to_owned(),
 			port: 8080,
-			using_dapps_domains: false,
 		}), SpecialEndpoint::None)
 	);
 
@@ -256,7 +192,6 @@ fn should_extract_endpoint() {
 			app_id: "rpc".to_owned(),
 			host: "localhost".to_owned(),
 			port: 8080,
-			using_dapps_domains: false,
 		}), SpecialEndpoint::Rpc)
 	);
 
@@ -266,7 +201,6 @@ fn should_extract_endpoint() {
 			app_id: "my.status".to_owned(),
 			host: "my.status.parity".to_owned(),
 			port: 80,
-			using_dapps_domains: true,
 		}), SpecialEndpoint::Utils)
 	);
 
@@ -277,7 +211,6 @@ fn should_extract_endpoint() {
 			app_id: "my.status".to_owned(),
 			host: "my.status.parity".to_owned(),
 			port: 80,
-			using_dapps_domains: true,
 		}), SpecialEndpoint::None)
 	);
 
@@ -288,7 +221,6 @@ fn should_extract_endpoint() {
 			app_id: "my.status".to_owned(),
 			host: "my.status.parity".to_owned(),
 			port: 80,
-			using_dapps_domains: true,
 		}), SpecialEndpoint::Rpc)
 	);
 
@@ -299,7 +231,6 @@ fn should_extract_endpoint() {
 			app_id: "my.status".to_owned(),
 			host: "my.status.parity".to_owned(),
 			port: 80,
-			using_dapps_domains: true,
 		}), SpecialEndpoint::Api)
 	);
 }

dapps/src/rpc.rs

@@ -15,7 +15,6 @@
 // along with Parity.  If not, see <http://www.gnu.org/licenses/>.
 
 use std::sync::{Arc, Mutex};
-use hyper;
 use jsonrpc_core::IoHandler;
 use jsonrpc_http_server::{ServerHandler, PanicHandler, AccessControlAllowOrigin};
 use endpoint::{Endpoint, EndpointPath, Handler};
@@ -24,7 +23,7 @@ pub fn rpc(handler: Arc<IoHandler>, panic_handler: Arc<Mutex<Option<Box<Fn() ->
 	Box::new(RpcEndpoint {
 		handler: handler,
 		panic_handler: panic_handler,
-		cors_domain: None,
+		cors_domain: Some(vec![AccessControlAllowOrigin::Null]),
 		// NOTE [ToDr] We don't need to do any hosts validation here. It's already done in router.
 		allowed_hosts: None,
 	})
@@ -38,14 +37,8 @@ struct RpcEndpoint {
 }
 
 impl Endpoint for RpcEndpoint {
-	fn to_async_handler(&self, _path: EndpointPath, control: hyper::Control) -> Box<Handler> {
+	fn to_handler(&self, _path: EndpointPath) -> Box<Handler> {
 		let panic_handler = PanicHandler { handler: self.panic_handler.clone() };
-		Box::new(ServerHandler::new(
-				self.handler.clone(),
-				self.cors_domain.clone(),
-				self.allowed_hosts.clone(),
-				panic_handler,
-				control,
-		))
+		Box::new(ServerHandler::new(self.handler.clone(), self.cors_domain.clone(), self.allowed_hosts.clone(), panic_handler))
 	}
 }

dapps/src/tests/api.rs

@@ -1,160 +0,0 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-use tests::helpers::{serve, serve_with_registrar, request, assert_security_headers};
-
-#[test]
-fn should_return_error() {
-	// given
-	let server = serve();
-
-	// when
-	let response = request(server,
-		"\
-			GET /api/empty HTTP/1.1\r\n\
-			Host: 127.0.0.1:8080\r\n\
-			Connection: close\r\n\
-			\r\n\
-			{}
-		"
-	);
-
-	// then
-	assert_eq!(response.status, "HTTP/1.1 404 Not Found".to_owned());
-	assert_eq!(response.headers.get(3).unwrap(), "Content-Type: application/json");
-	assert_eq!(response.body, format!("58\n{}\n0\n\n", r#"{"code":"404","title":"Not Found","detail":"Resource you requested has not been found."}"#));
-	assert_security_headers(&response.headers);
-}
-
-#[test]
-fn should_serve_apps() {
-	// given
-	let server = serve();
-
-	// when
-	let response = request(server,
-		"\
-			GET /api/apps HTTP/1.1\r\n\
-			Host: 127.0.0.1:8080\r\n\
-			Connection: close\r\n\
-			\r\n\
-			{}
-		"
-	);
-
-	// then
-	assert_eq!(response.status, "HTTP/1.1 200 OK".to_owned());
-	assert_eq!(response.headers.get(3).unwrap(), "Content-Type: application/json");
-	assert!(response.body.contains("Parity UI"), response.body);
-	assert_security_headers(&response.headers);
-}
-
-#[test]
-fn should_handle_ping() {
-	// given
-	let server = serve();
-
-	// when
-	let response = request(server,
-		"\
-			POST /api/ping HTTP/1.1\r\n\
-			Host: home.parity\r\n\
-			Connection: close\r\n\
-			\r\n\
-			{}
-		"
-	);
-
-	// then
-	assert_eq!(response.status, "HTTP/1.1 200 OK".to_owned());
-	assert_eq!(response.headers.get(3).unwrap(), "Content-Type: application/json");
-	assert_eq!(response.body, "0\n\n".to_owned());
-	assert_security_headers(&response.headers);
-}
-
-
-#[test]
-fn should_try_to_resolve_dapp() {
-	// given
-	let (server, registrar) = serve_with_registrar();
-
-	// when
-	let response = request(server,
-		"\
-			GET /api/content/1472a9e190620cdf6b31f383373e45efcfe869a820c91f9ccd7eb9fb45e4985d HTTP/1.1\r\n\
-			Host: home.parity\r\n\
-			Connection: close\r\n\
-			\r\n\
-		"
-	);
-
-	// then
-	assert_eq!(response.status, "HTTP/1.1 404 Not Found".to_owned());
-	assert_eq!(registrar.calls.lock().len(), 2);
-	assert_security_headers(&response.headers);
-}
-
-#[test]
-fn should_return_signer_port_cors_headers() {
-	// given
-	let server = serve();
-
-	// when
-	let response = request(server,
-		"\
-			POST /api/ping HTTP/1.1\r\n\
-			Host: localhost:8080\r\n\
-			Origin: http://127.0.0.1:18180\r\n\
-			Connection: close\r\n\
-			\r\n\
-			{}
-		"
-	);
-
-	// then
-	assert_eq!(response.status, "HTTP/1.1 200 OK".to_owned());
-	assert!(
-		response.headers_raw.contains("Access-Control-Allow-Origin: http://127.0.0.1:18180"),
-		"CORS header for signer missing: {:?}",
-		response.headers
-	);
-}
-
-#[test]
-fn should_return_signer_port_cors_headers_for_home_parity() {
-	// given
-	let server = serve();
-
-	// when
-	let response = request(server,
-		"\
-			POST /api/ping HTTP/1.1\r\n\
-			Host: localhost:8080\r\n\
-			Origin: http://home.parity\r\n\
-			Connection: close\r\n\
-			\r\n\
-			{}
-		"
-	);
-
-	// then
-	assert_eq!(response.status, "HTTP/1.1 200 OK".to_owned());
-	assert!(
-		response.headers_raw.contains("Access-Control-Allow-Origin: http://home.parity"),
-		"CORS header for home.parity missing: {:?}",
-		response.headers
-	);
-}

dapps/src/tests/authorization.rs

@@ -1,80 +0,0 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-use tests::helpers::{serve_with_auth, request, assert_security_headers_for_embed};
-
-#[test]
-fn should_require_authorization() {
-	// given
-	let server = serve_with_auth("test", "test");
-
-	// when
-	let response = request(server,
-		"\
-			GET / HTTP/1.1\r\n\
-			Host: 127.0.0.1:8080\r\n\
-			Connection: close\r\n\
-			\r\n\
-		"
-	);
-
-	// then
-	assert_eq!(response.status, "HTTP/1.1 401 Unauthorized".to_owned());
-	assert_eq!(response.headers.get(0).unwrap(), "WWW-Authenticate: Basic realm=\"Parity\"");
-}
-
-#[test]
-fn should_reject_on_invalid_auth() {
-	// given
-	let server = serve_with_auth("test", "test");
-
-	// when
-	let response = request(server,
-		"\
-			GET / HTTP/1.1\r\n\
-			Host: 127.0.0.1:8080\r\n\
-			Connection: close\r\n\
-			Authorization: Basic QWxhZGRpbjpPcGVuU2VzYW1l\r\n
-			\r\n\
-		"
-	);
-
-	// then
-	assert_eq!(response.status, "HTTP/1.1 401 Unauthorized".to_owned());
-	assert!(response.body.contains("Unauthorized"), response.body);
-	assert_eq!(response.headers_raw.contains("WWW-Authenticate"), false);
-}
-
-#[test]
-fn should_allow_on_valid_auth() {
-	// given
-	let server = serve_with_auth("Aladdin", "OpenSesame");
-
-	// when
-	let response = request(server,
-		"\
-			GET /ui/ HTTP/1.1\r\n\
-			Host: 127.0.0.1:8080\r\n\
-			Connection: close\r\n\
-			Authorization: Basic QWxhZGRpbjpPcGVuU2VzYW1l\r\n
-			\r\n\
-		"
-	);
-
-	// then
-	assert_eq!(response.status, "HTTP/1.1 200 OK".to_owned());
-	assert_security_headers_for_embed(&response.headers);
-}

dapps/src/tests/fetch.rs

@@ -1,67 +0,0 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-use tests::helpers::{serve_with_registrar, serve_with_registrar_and_sync, request, assert_security_headers_for_embed};
-
-#[test]
-fn should_resolve_dapp() {
-	// given
-	let (server, registrar) = serve_with_registrar();
-
-	// when
-	let response = request(server,
-		"\
-			GET / HTTP/1.1\r\n\
-			Host: 1472a9e190620cdf6b31f383373e45efcfe869a820c91f9ccd7eb9fb45e4985d.parity\r\n\
-			Connection: close\r\n\
-			\r\n\
-		"
-	);
-
-	// then
-	assert_eq!(response.status, "HTTP/1.1 404 Not Found".to_owned());
-	assert_eq!(registrar.calls.lock().len(), 2);
-	assert_security_headers_for_embed(&response.headers);
-}
-
-#[test]
-fn should_return_503_when_syncing_but_should_make_the_calls() {
-	// given
-	let (server, registrar) = serve_with_registrar_and_sync();
-	{
-		let mut responses = registrar.responses.lock();
-		let res1 = responses.get(0).unwrap().clone();
-		let res2 = responses.get(1).unwrap().clone();
-		// Registrar will be called twice - fill up the responses.
-		responses.push(res1);
-		responses.push(res2);
-	}
-
-	// when
-	let response = request(server,
-		"\
-			GET / HTTP/1.1\r\n\
-			Host: 1472a9e190620cdf6b31f383373e45efcfe869a820c91f9ccd7eb9fb45e4985d.parity\r\n\
-			Connection: close\r\n\
-			\r\n\
-		"
-	);
-
-	// then
-	assert_eq!(response.status, "HTTP/1.1 503 Service Unavailable".to_owned());
-	assert_eq!(registrar.calls.lock().len(), 4);
-	assert_security_headers_for_embed(&response.headers);
-}

dapps/src/tests/helpers.rs

@@ -1,121 +0,0 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-use std::env;
-use std::str;
-use std::sync::Arc;
-use rustc_serialize::hex::FromHex;
-use env_logger::LogBuilder;
-
-use ServerBuilder;
-use Server;
-use apps::urlhint::ContractClient;
-use util::{Bytes, Address, Mutex, ToPretty};
-use devtools::http_client;
-
-const REGISTRAR: &'static str = "8e4e9b13d4b45cb0befc93c3061b1408f67316b2";
-const URLHINT: &'static str = "deadbeefcafe0000000000000000000000000000";
-const SIGNER_PORT: u16 = 18180;
-
-pub struct FakeRegistrar {
-	pub calls: Arc<Mutex<Vec<(String, String)>>>,
-	pub responses: Mutex<Vec<Result<Bytes, String>>>,
-}
-
-impl FakeRegistrar {
-	fn new() -> Self {
-		FakeRegistrar {
-			calls: Arc::new(Mutex::new(Vec::new())),
-			responses: Mutex::new(
-				vec![
-					Ok(format!("000000000000000000000000{}", URLHINT).from_hex().unwrap()),
-					Ok(Vec::new())
-				]
-			),
-		}
-	}
-}
-
-impl ContractClient for FakeRegistrar {
-	fn registrar(&self) -> Result<Address, String> {
-		Ok(REGISTRAR.parse().unwrap())
-	}
-
-	fn call(&self, address: Address, data: Bytes) -> Result<Bytes, String> {
-		self.calls.lock().push((address.to_hex(), data.to_hex()));
-		self.responses.lock().remove(0)
-	}
-}
-
-fn init_logger() {
-	// Initialize logger
-	if let Ok(log) = env::var("RUST_LOG") {
-		let mut builder = LogBuilder::new();
-		builder.parse(&log);
-		builder.init().expect("Logger is initialized only once.");
-	}
-}
-
-pub fn init_server(hosts: Option<Vec<String>>, is_syncing: bool) -> (Server, Arc<FakeRegistrar>) {
-	init_logger();
-	let registrar = Arc::new(FakeRegistrar::new());
-	let mut dapps_path = env::temp_dir();
-	dapps_path.push("non-existent-dir-to-prevent-fs-files-from-loading");
-	let mut builder = ServerBuilder::new(dapps_path.to_str().unwrap().into(), registrar.clone());
-	builder.with_sync_status(Arc::new(move || is_syncing));
-	builder.with_signer_address(Some(("127.0.0.1".into(), SIGNER_PORT)));
-	(
-		builder.start_unsecured_http(&"127.0.0.1:0".parse().unwrap(), hosts).unwrap(),
-		registrar,
-	)
-}
-
-pub fn serve_with_auth(user: &str, pass: &str) -> Server {
-	init_logger();
-	let registrar = Arc::new(FakeRegistrar::new());
-	let mut dapps_path = env::temp_dir();
-	dapps_path.push("non-existent-dir-to-prevent-fs-files-from-loading");
-	let mut builder = ServerBuilder::new(dapps_path.to_str().unwrap().into(), registrar);
-	builder.with_signer_address(Some(("127.0.0.1".into(), SIGNER_PORT)));
-	builder.start_basic_auth_http(&"127.0.0.1:0".parse().unwrap(), None, user, pass).unwrap()
-}
-
-pub fn serve_hosts(hosts: Option<Vec<String>>) -> Server {
-	init_server(hosts, false).0
-}
-
-pub fn serve_with_registrar() -> (Server, Arc<FakeRegistrar>) {
-	init_server(None, false)
-}
-
-pub fn serve_with_registrar_and_sync() -> (Server, Arc<FakeRegistrar>) {
-	init_server(None, true)
-}
-
-pub fn serve() -> Server {
-	init_server(None, false).0
-}
-
-pub fn request(server: Server, request: &str) -> http_client::Response {
-	http_client::request(server.addr(), request)
-}
-
-pub fn assert_security_headers(headers: &[String]) {
-	http_client::assert_security_headers_present(headers, None)
-}
-pub fn assert_security_headers_for_embed(headers: &[String]) {
-	http_client::assert_security_headers_present(headers, Some(SIGNER_PORT))
-}

dapps/src/tests/redirection.rs

@@ -1,207 +0,0 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-use tests::helpers::{serve, request, assert_security_headers, assert_security_headers_for_embed};
-
-#[test]
-fn should_redirect_to_home() {
-	// given
-	let server = serve();
-
-	// when
-	let response = request(server,
-		"\
-			GET / HTTP/1.1\r\n\
-			Host: 127.0.0.1:8080\r\n\
-			Connection: close\r\n\
-			\r\n\
-		"
-	);
-
-	// then
-	assert_eq!(response.status, "HTTP/1.1 302 Found".to_owned());
-	assert_eq!(response.headers.get(0).unwrap(), "Location: http://127.0.0.1:18180");
-}
-
-#[test]
-fn should_redirect_to_home_when_trailing_slash_is_missing() {
-	// given
-	let server = serve();
-
-	// when
-	let response = request(server,
-		"\
-			GET /app HTTP/1.1\r\n\
-			Host: 127.0.0.1:8080\r\n\
-			Connection: close\r\n\
-			\r\n\
-		"
-	);
-
-	// then
-	assert_eq!(response.status, "HTTP/1.1 302 Found".to_owned());
-	assert_eq!(response.headers.get(0).unwrap(), "Location: http://127.0.0.1:18180");
-}
-
-#[test]
-fn should_redirect_to_home_for_users_with_cached_redirection() {
-	// given
-	let server = serve();
-
-	// when
-	let response = request(server,
-		"\
-			GET /home/ HTTP/1.1\r\n\
-			Host: 127.0.0.1:8080\r\n\
-			Connection: close\r\n\
-			\r\n\
-		"
-	);
-
-	// then
-	assert_eq!(response.status, "HTTP/1.1 302 Found".to_owned());
-	assert_eq!(response.headers.get(0).unwrap(), "Location: http://127.0.0.1:18180");
-}
-
-#[test]
-fn should_display_404_on_invalid_dapp() {
-	// given
-	let server = serve();
-
-	// when
-	let response = request(server,
-		"\
-			GET /invaliddapp/ HTTP/1.1\r\n\
-			Host: 127.0.0.1:8080\r\n\
-			Connection: close\r\n\
-			\r\n\
-		"
-	);
-
-	// then
-	assert_eq!(response.status, "HTTP/1.1 404 Not Found".to_owned());
-	assert_security_headers_for_embed(&response.headers);
-}
-
-#[test]
-fn should_display_404_on_invalid_dapp_with_domain() {
-	// given
-	let server = serve();
-
-	// when
-	let response = request(server,
-		"\
-			GET / HTTP/1.1\r\n\
-			Host: invaliddapp.parity\r\n\
-			Connection: close\r\n\
-			\r\n\
-		"
-	);
-
-	// then
-	assert_eq!(response.status, "HTTP/1.1 404 Not Found".to_owned());
-	assert_security_headers_for_embed(&response.headers);
-}
-
-#[test]
-fn should_serve_rpc() {
-	// given
-	let server = serve();
-
-	// when
-	let response = request(server,
-		"\
-			POST / HTTP/1.1\r\n\
-			Host: 127.0.0.1:8080\r\n\
-			Connection: close\r\n\
-			Content-Type: application/json\r\n
-			\r\n\
-			{}
-		"
-	);
-
-	// then
-	assert_eq!(response.status, "HTTP/1.1 200 OK".to_owned());
-	assert_eq!(response.body, format!("58\n{}\n\n0\n\n", r#"{"jsonrpc":"2.0","error":{"code":-32700,"message":"Parse error","data":null},"id":null}"#));
-}
-
-#[test]
-fn should_serve_rpc_at_slash_rpc() {
-	// given
-	let server = serve();
-
-	// when
-	let response = request(server,
-		"\
-			POST /rpc HTTP/1.1\r\n\
-			Host: 127.0.0.1:8080\r\n\
-			Connection: close\r\n\
-			Content-Type: application/json\r\n
-			\r\n\
-			{}
-		"
-	);
-
-	// then
-	assert_eq!(response.status, "HTTP/1.1 200 OK".to_owned());
-	assert_eq!(response.body, format!("58\n{}\n\n0\n\n", r#"{"jsonrpc":"2.0","error":{"code":-32700,"message":"Parse error","data":null},"id":null}"#));
-}
-
-
-#[test]
-fn should_serve_proxy_pac() {
-	// given
-	let server = serve();
-
-	// when
-	let response = request(server,
-		"\
-			GET /proxy/proxy.pac HTTP/1.1\r\n\
-			Host: 127.0.0.1:8080\r\n\
-			Connection: close\r\n\
-			\r\n\
-			{}
-		"
-	);
-
-	// then
-	assert_eq!(response.status, "HTTP/1.1 200 OK".to_owned());
-	assert_eq!(response.body, "D5\n\nfunction FindProxyForURL(url, host) {\n\tif (shExpMatch(host, \"home.parity\"))\n\t{\n\t\treturn \"PROXY 127.0.0.1:18180\";\n\t}\n\n\tif (shExpMatch(host, \"*.parity\"))\n\t{\n\t\treturn \"PROXY 127.0.0.1:8080\";\n\t}\n\n\treturn \"DIRECT\";\n}\n\n0\n\n".to_owned());
-	assert_security_headers(&response.headers);
-}
-
-#[test]
-fn should_serve_utils() {
-	// given
-	let server = serve();
-
-	// when
-	let response = request(server,
-		"\
-			GET /parity-utils/inject.js HTTP/1.1\r\n\
-			Host: 127.0.0.1:8080\r\n\
-			Connection: close\r\n\
-			\r\n\
-			{}
-		"
-	);
-
-	// then
-	assert_eq!(response.status, "HTTP/1.1 200 OK".to_owned());
-	assert_eq!(response.body.contains("function(){"), true);
-	assert_security_headers(&response.headers);
-}
-

dapps/src/tests/validation.rs

@@ -1,127 +0,0 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-use tests::helpers::{serve_hosts, request};
-
-#[test]
-fn should_reject_invalid_host() {
-	// given
-	let server = serve_hosts(Some(vec!["localhost:8080".into()]));
-
-	// when
-	let response = request(server,
-		"\
-			GET / HTTP/1.1\r\n\
-			Host: 127.0.0.1:8080\r\n\
-			Connection: close\r\n\
-			\r\n\
-			{}
-		"
-	);
-
-	// then
-	assert_eq!(response.status, "HTTP/1.1 403 Forbidden".to_owned());
-	assert!(response.body.contains("Current Host Is Disallowed"), response.body);
-}
-
-#[test]
-fn should_allow_valid_host() {
-	// given
-	let server = serve_hosts(Some(vec!["localhost:8080".into()]));
-
-	// when
-	let response = request(server,
-		"\
-			GET /ui/ HTTP/1.1\r\n\
-			Host: localhost:8080\r\n\
-			Connection: close\r\n\
-			\r\n\
-			{}
-		"
-	);
-
-	// then
-	assert_eq!(response.status, "HTTP/1.1 200 OK".to_owned());
-}
-
-#[test]
-fn should_serve_dapps_domains() {
-	// given
-	let server = serve_hosts(Some(vec!["localhost:8080".into()]));
-
-	// when
-	let response = request(server,
-		"\
-			GET / HTTP/1.1\r\n\
-			Host: ui.parity\r\n\
-			Connection: close\r\n\
-			\r\n\
-			{}
-		"
-	);
-
-	// then
-	assert_eq!(response.status, "HTTP/1.1 200 OK".to_owned());
-}
-
-#[test]
-// NOTE [todr] This is required for error pages to be styled properly.
-fn should_allow_parity_utils_even_on_invalid_domain() {
-	// given
-	let server = serve_hosts(Some(vec!["localhost:8080".into()]));
-
-	// when
-	let response = request(server,
-		"\
-			GET /parity-utils/styles.css HTTP/1.1\r\n\
-			Host: 127.0.0.1:8080\r\n\
-			Connection: close\r\n\
-			\r\n\
-			{}
-		"
-	);
-
-	// then
-	assert_eq!(response.status, "HTTP/1.1 200 OK".to_owned());
-}
-
-#[test]
-fn should_not_return_cors_headers_for_rpc() {
-	// given
-	let server = serve_hosts(Some(vec!["localhost:8080".into()]));
-
-	// when
-	let response = request(server,
-		"\
-			POST /rpc HTTP/1.1\r\n\
-			Host: localhost:8080\r\n\
-			Origin: null\r\n\
-			Content-Type: application/json\r\n\
-			Connection: close\r\n\
-			\r\n\
-			{}
-		"
-	);
-
-	// then
-	assert_eq!(response.status, "HTTP/1.1 200 OK".to_owned());
-	assert!(
-		!response.headers_raw.contains("Access-Control-Allow-Origin"),
-		"CORS headers were not expected: {:?}",
-		response.headers
-	);
-}
-

dapps/ui/Cargo.toml

@@ -1,18 +0,0 @@
-[package]
-description = "Ethcore Parity UI"
-homepage = "http://ethcore.io"
-license = "GPL-3.0"
-name = "parity-ui"
-version = "1.4.0"
-authors = ["Ethcore <admin@ethcore.io>"]
-
-[build-dependencies]
-rustc_version = "0.1"
-
-[dependencies]
-parity-ui-dev = { path = "../../js", optional = true }
-parity-ui-precompiled = { git = "https://github.com/ethcore/js-precompiled.git", optional = true, branch = "beta" }
-
-[features]
-no-precompiled-js = ["parity-ui-dev"]
-use-precompiled-js = ["parity-ui-precompiled"]

dapps/ui/src/lib.rs

@@ -1,33 +0,0 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-
-#[cfg(feature = "parity-ui-dev")]
-mod inner {
-	extern crate parity_ui_dev;
-
-	pub use self::parity_ui_dev::*;
-}
-
-#[cfg(feature = "parity-ui-precompiled")]
-mod inner {
-	extern crate parity_ui_precompiled;
-
-	pub use self::parity_ui_precompiled::*;
-}
-
-
-pub use self::inner::*;

db/Cargo.toml

@@ -3,15 +3,16 @@ description = "Ethcore Database"
 homepage = "http://ethcore.io"
 license = "GPL-3.0"
 name = "ethcore-db"
-version = "1.4.0"
+version = "1.3.0"
 authors = ["Ethcore <admin@ethcore.io>"]
 build = "build.rs"
 
 [build-dependencies]
+syntex = "*"
 ethcore-ipc-codegen = { path = "../ipc/codegen" }
 
 [dependencies]
-clippy = { version = "0.0.96", optional = true}
+clippy = { version = "0.0.80", optional = true}
 ethcore-devtools = { path = "../devtools" }
 ethcore-ipc = { path = "../ipc/rpc" }
 rocksdb = { git = "https://github.com/ethcore/rust-rocksdb" }

db/build.rs

@@ -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/>.
 
+extern crate syntex;
 extern crate ethcore_ipc_codegen as codegen;
 
 use std::env;
@@ -26,13 +27,17 @@ pub fn main() {
 	{
 		let src = Path::new("src/lib.rs.in");
 		let dst = Path::new(&out_dir).join("lib.intermediate.rs.in");
-		codegen::expand(&src, &dst);
+		let mut registry = syntex::Registry::new();
+		codegen::register(&mut registry);
+		registry.expand("", &src, &dst).unwrap();
 	}
 
 	// binary serialization pass
 	{
 		let src = Path::new(&out_dir).join("lib.intermediate.rs.in");
 		let dst = Path::new(&out_dir).join("lib.rs");
-		codegen::expand(&src, &dst);
+		let mut registry = syntex::Registry::new();
+		codegen::register(&mut registry);
+		registry.expand("", &src, &dst).unwrap();
 	}
 }

db/src/database.rs

@@ -157,7 +157,7 @@ impl Drop for Database {
 	}
 }
 
-#[ipc]
+#[derive(Ipc)]
 impl DatabaseService for Database {
 	fn open(&self, config: DatabaseConfig, path: String) -> Result<(), Error> {
 		let mut db = self.db.write();
@@ -460,7 +460,7 @@ mod client_tests {
 		crossbeam::scope(move |scope| {
 			let stop = Arc::new(AtomicBool::new(false));
 			run_worker(scope, stop.clone(), url);
-			let client = nanoipc::generic_client::<DatabaseClient<_>>(url).unwrap();
+			let client = nanoipc::init_client::<DatabaseClient<_>>(url).unwrap();
 			client.open_default(path.as_str().to_owned()).unwrap();
 			client.put("xxx".as_bytes(), "1".as_bytes()).unwrap();
 			client.close().unwrap();
@@ -477,7 +477,7 @@ mod client_tests {
 		crossbeam::scope(move |scope| {
 			let stop = Arc::new(AtomicBool::new(false));
 			run_worker(scope, stop.clone(), url);
-			let client = nanoipc::generic_client::<DatabaseClient<_>>(url).unwrap();
+			let client = nanoipc::init_client::<DatabaseClient<_>>(url).unwrap();
 
 			client.open_default(path.as_str().to_owned()).unwrap();
 			client.put("xxx".as_bytes(), "1".as_bytes()).unwrap();
@@ -498,7 +498,7 @@ mod client_tests {
 		crossbeam::scope(move |scope| {
 			let stop = Arc::new(AtomicBool::new(false));
 			run_worker(scope, stop.clone(), url);
-			let client = nanoipc::generic_client::<DatabaseClient<_>>(url).unwrap();
+			let client = nanoipc::init_client::<DatabaseClient<_>>(url).unwrap();
 
 			client.open_default(path.as_str().to_owned()).unwrap();
 			assert!(client.get("xxx".as_bytes()).unwrap().is_none());
@@ -516,7 +516,7 @@ mod client_tests {
 		crossbeam::scope(move |scope| {
 			let stop = Arc::new(AtomicBool::new(false));
 			run_worker(scope, stop.clone(), url);
-			let client = nanoipc::generic_client::<DatabaseClient<_>>(url).unwrap();
+			let client = nanoipc::init_client::<DatabaseClient<_>>(url).unwrap();
 			client.open_default(path.as_str().to_owned()).unwrap();
 
 			let transaction = DBTransaction::new();
@@ -541,7 +541,7 @@ mod client_tests {
 			let stop = StopGuard::new();
 			run_worker(&scope, stop.share(), url);
 
-			let client = nanoipc::generic_client::<DatabaseClient<_>>(url).unwrap();
+			let client = nanoipc::init_client::<DatabaseClient<_>>(url).unwrap();
 
 			client.open_default(path.as_str().to_owned()).unwrap();
 			let mut batch = Vec::new();

db/src/lib.rs.in

@@ -66,13 +66,13 @@ pub fn extras_service_url(db_path: &str) -> Result<String, ::std::io::Error> {
 
 pub fn blocks_client(db_path: &str) -> Result<DatabaseConnection, ServiceError> {
 	let url = try!(blocks_service_url(db_path));
-	let client = try!(nanoipc::generic_client::<DatabaseClient<_>>(&url));
+	let client = try!(nanoipc::init_client::<DatabaseClient<_>>(&url));
 	Ok(client)
 }
 
 pub fn extras_client(db_path: &str) -> Result<DatabaseConnection, ServiceError> {
 	let url = try!(extras_service_url(db_path));
-	let client = try!(nanoipc::generic_client::<DatabaseClient<_>>(&url));
+	let client = try!(nanoipc::init_client::<DatabaseClient<_>>(&url));
 	Ok(client)
 }
 

db/src/traits.rs

@@ -16,6 +16,9 @@
 
 //! Ethcore database trait
 
+use std::mem;
+use ipc::binary::BinaryConvertError;
+use std::collections::VecDeque;
 use std::cell::RefCell;
 
 pub type IteratorHandle = u32;

deb/DEBIAN/compat

@@ -1 +0,0 @@
-8

deb/DEBIAN/control

@@ -1,13 +0,0 @@
-Package: parity
-Version: 1.4.0
-Source: parity
-Section: science
-Priority: extra
-Maintainer: Ethcore <devops@ethcore.io>
-Build-Depends: debhelper (>=9)
-Standards-Version: 3.9.5
-Homepage: https://ethcore.io
-Vcs-Git: git://github.com/ethcore/parity.git
-Vcs-Browser: https://github.com/ethcore/parity
-Architecture: armhf
-Description: Ethereum network client by Ethcore

deb/DEBIAN/copyright

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

deb/DEBIAN/docs

@@ -1 +0,0 @@
-https://github.com/ethcore/parity/wiki

deb/usr/bin/parity.REMOVED.git-id

@@ -1 +0,0 @@
-d3a6fd5582dd14ad718b2eb1a0662c3e817a63cf

devtools/Cargo.toml

@@ -3,7 +3,7 @@ description = "Ethcore development/test/build tools"
 homepage = "http://ethcore.io"
 license = "GPL-3.0"
 name = "ethcore-devtools"
-version = "1.4.0"
+version = "1.3.0"
 authors = ["Ethcore <admin@ethcore.io>"]
 
 [dependencies]

devtools/src/http_client.rs

@@ -1,88 +0,0 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-use std::time::Duration;
-use std::io::{Read, Write};
-use std::str::{self, Lines};
-use std::net::{TcpStream, SocketAddr};
-
-pub struct Response {
-	pub status: String,
-	pub headers: Vec<String>,
-	pub headers_raw: String,
-	pub body: String,
-}
-
-pub fn read_block(lines: &mut Lines, all: bool) -> String {
-	let mut block = String::new();
-	loop {
-		let line = lines.next();
-		match line {
-			None => break,
-			Some("") if !all => break,
-			Some(v) => {
-				block.push_str(v);
-				block.push_str("\n");
-			},
-		}
-	}
-	block
-}
-
-pub fn request(address: &SocketAddr, request: &str) -> Response {
-	let mut req = TcpStream::connect(address).unwrap();
-	req.set_read_timeout(Some(Duration::from_secs(1))).unwrap();
-	req.write_all(request.as_bytes()).unwrap();
-
-	let mut response = String::new();
-	let _ = req.read_to_string(&mut response);
-
-	let mut lines = response.lines();
-	let status = lines.next().unwrap().to_owned();
-	let headers_raw = read_block(&mut lines, false);
-	let headers = headers_raw.split('\n').map(|v| v.to_owned()).collect();
-	let body = read_block(&mut lines, true);
-
-	Response {
-		status: status,
-		headers: headers,
-		headers_raw: headers_raw,
-		body: body,
-	}
-}
-
-/// Check if all required security headers are present
-pub fn assert_security_headers_present(headers: &[String], port: Option<u16>) {
-	if let Some(port) = port {
-		assert!(
-			headers.iter().find(|header| header.as_str() == &format!("X-Frame-Options: ALLOW-FROM http://127.0.0.1:{}", port)).is_some(),
-			"X-Frame-Options: ALLOW-FROM missing: {:?}", headers
-		);
-	} else {
-		assert!(
-			headers.iter().find(|header| header.as_str() == "X-Frame-Options: SAMEORIGIN").is_some(),
-			"X-Frame-Options: SAMEORIGIN missing: {:?}", headers
-		);
-	}
-	assert!(
-		headers.iter().find(|header| header.as_str() == "X-XSS-Protection: 1; mode=block").is_some(),
-		"X-XSS-Protection missing: {:?}", headers
-	);
-	assert!(
-		headers.iter().find(|header|  header.as_str() == "X-Content-Type-Options: nosniff").is_some(),
-		"X-Content-Type-Options missing: {:?}", headers
-	);
-}

devtools/src/lib.rs

@@ -22,7 +22,6 @@ extern crate rand;
 mod random_path;
 mod test_socket;
 mod stop_guard;
-pub mod http_client;
 
 pub use random_path::*;
 pub use test_socket::*;

devtools/src/random_path.rs

@@ -23,8 +23,7 @@ use std::ops::{Deref, DerefMut};
 use rand::random;
 
 pub struct RandomTempPath {
-	path: PathBuf,
-	pub panic_on_drop_failure: bool,
+	path: PathBuf
 }
 
 pub fn random_filename() -> String {
@@ -40,8 +39,7 @@ impl RandomTempPath {
 		let mut dir = env::temp_dir();
 		dir.push(random_filename());
 		RandomTempPath {
-			path: dir.clone(),
-			panic_on_drop_failure: true,
+			path: dir.clone()
 		}
 	}
 
@@ -50,8 +48,7 @@ impl RandomTempPath {
 		dir.push(random_filename());
 		fs::create_dir_all(dir.as_path()).unwrap();
 		RandomTempPath {
-			path: dir.clone(),
-			panic_on_drop_failure: true,
+			path: dir.clone()
 		}
 	}
 
@@ -70,26 +67,10 @@ impl RandomTempPath {
 	}
 }
 
-impl AsRef<Path> for RandomTempPath {
-	fn as_ref(&self) -> &Path {
-		self.as_path()
-	}
-}
-impl Deref for RandomTempPath {
-	type Target = Path;
-	fn deref(&self) -> &Self::Target {
-		self.as_path()
-	}
-}
-
 impl Drop for RandomTempPath {
 	fn drop(&mut self) {
-		if let Err(_) = fs::remove_dir_all(&self) {
-			if let Err(e) = fs::remove_file(&self) {
-				if self.panic_on_drop_failure {
-					panic!("Failed to remove temp directory. Here's what prevented this from happening:  ({})", e);
-				}
-			}
+		if let Err(e) = fs::remove_dir_all(self.as_path()) {
+			panic!("Failed to remove temp directory. Here's what prevented this from happening:  ({})", e);
 		}
 	}
 }

docker/centos/Dockerfile

@@ -5,7 +5,7 @@ RUN yum -y update&& \
     yum install -y git make gcc-c++ gcc file binutils
 # install rustup
 RUN curl -sSf https://static.rust-lang.org/rustup.sh -o rustup.sh &&\
-ls&&\
+ls&&\ 
  sh rustup.sh -s -- --disable-sudo
 # show backtraces
 ENV RUST_BACKTRACE 1
@@ -26,8 +26,4 @@ RUN git clone https://github.com/ethcore/parity && \
         cargo build --release --verbose && \
 	ls /build/parity/target/release/parity &&	\
 	strip /build/parity/target/release/parity
-
 RUN file /build/parity/target/release/parity
-
-EXPOSE 8080 8545 8180
-ENTRYPOINT ["/build/parity/target/release/parity"]

docker/ubuntu-aarch64/Dockerfile

@@ -40,8 +40,4 @@ RUN git clone https://github.com/ethcore/parity && \
         cargo build --target aarch64-unknown-linux-gnu --release --verbose && \
         ls /build/parity/target/aarch64-unknown-linux-gnu/release/parity &&     \
         /usr/bin/aarch64-linux-gnu-strip /build/parity/target/aarch64-unknown-linux-gnu/release/parity
-
 RUN file /build/parity/target/aarch64-unknown-linux-gnu/release/parity
-
-EXPOSE 8080 8545 8180
-ENTRYPOINT ["/build/parity/target/aarch64-unknown-linux-gnu/release/parity"]

docker/ubuntu-arm/Dockerfile

@@ -23,10 +23,9 @@ RUN rustup target add armv7-unknown-linux-gnueabihf
 # show backtraces
 ENV RUST_BACKTRACE 1
 
-
 # show tools
  RUN rustc -vV && \
- cargo -V 
+ cargo -V
 
 # build parity
 RUN git clone https://github.com/ethcore/parity && \
@@ -41,8 +40,4 @@ RUN git clone https://github.com/ethcore/parity && \
         cargo build --target armv7-unknown-linux-gnueabihf --release --verbose && \
         ls /build/parity/target/armv7-unknown-linux-gnueabihf/release/parity && \
         /usr/bin/arm-linux-gnueabihf-strip /build/parity/target/armv7-unknown-linux-gnueabihf/release/parity
-
 RUN file /build/parity/target/armv7-unknown-linux-gnueabihf/release/parity
-
-EXPOSE 8080 8545 8180
-ENTRYPOINT ["/build/parity/target/armv7-unknown-linux-gnueabihf/release/parity"]

docker/ubuntu-jit/Dockerfile

@@ -52,8 +52,4 @@ RUN git clone https://github.com/ethcore/parity && \
         cargo build --release --features ethcore/jit --verbose && \
         ls /build/parity/target/release/parity &&       \
         strip /build/parity/target/release/parity
-
 RUN file /build/parity/target/release/parity
-
-EXPOSE 8080 8545 8180
-ENTRYPOINT ["/build/parity/target/release/parity"]

docker/ubuntu-stable/Dockerfile

@@ -1,40 +0,0 @@
-FROM ubuntu:14.04
-WORKDIR /build
-# install tools and dependencies
-RUN apt-get update && \
-        apt-get install -y \
-        g++ \
-        curl \
-        git \
-        file \
-        binutils \
-	make
-
-# install rustup
-RUN curl https://sh.rustup.rs -sSf | sh -s -- -y
-
-# rustup directory
-ENV PATH /root/.cargo/bin:$PATH
-
-# show backtraces
-ENV RUST_BACKTRACE 1
-
-# show tools
-RUN rustc -vV && \
-cargo -V && \
-gcc -v &&\
-g++ -v
-
-# build parity
-RUN git clone https://github.com/ethcore/parity && \
-        cd parity && \
-        git checkout stable && \
-        git pull && \
-        cargo build --release --verbose && \
-        ls /build/parity/target/release/parity && \
-        strip /build/parity/target/release/parity
-
-RUN file /build/parity/target/release/parity
-
-EXPOSE 8080 8545 8180
-ENTRYPOINT ["/build/parity/target/release/parity"]

docker/ubuntu/Dockerfile

@@ -7,8 +7,7 @@ RUN apt-get update && \
         curl \
         git \
         file \
-        binutils \
-	make
+        binutils
 
 # install rustup
 RUN curl https://sh.rustup.rs -sSf | sh -s -- -y
@@ -33,8 +32,5 @@ RUN git clone https://github.com/ethcore/parity && \
         cargo build --release --verbose && \
         ls /build/parity/target/release/parity && \
         strip /build/parity/target/release/parity
-
-RUN file /build/parity/target/release/parity
-
-EXPOSE 8080 8545 8180
+        
 ENTRYPOINT ["/build/parity/target/release/parity"]

ethash/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "ethash"
-version = "1.4.0"
+version = "1.3.0"
 authors = ["arkpar <arkadiy@ethcore.io"]
 
 [lib]
@@ -9,4 +9,4 @@ authors = ["arkpar <arkadiy@ethcore.io"]
 log = "0.3"
 sha3 = { path = "../util/sha3" }
 primal = "0.2.3"
-parking_lot = "0.3"
+parking_lot = "0.2.6"

ethash/src/compute.rs

@@ -91,7 +91,7 @@ pub struct Light {
 	seed_compute: Mutex<SeedHashCompute>,
 }
 
-/// Light cache structure
+/// Light cache structur
 impl Light {
 	/// Create a new light cache for a given block number
 	pub fn new(block_number: u64) -> Light {
@@ -134,27 +134,16 @@ impl Light {
 		})
 	}
 
-	pub fn to_file(&self) -> io::Result<PathBuf> {
+	pub fn to_file(&self) -> io::Result<()> {
 		let seed_compute = self.seed_compute.lock();
 		let path = Light::file_path(seed_compute.get_seedhash(self.block_number));
-
-		if self.block_number >= ETHASH_EPOCH_LENGTH * 2 {
-			let deprecated = Light::file_path(
-				seed_compute.get_seedhash(self.block_number - ETHASH_EPOCH_LENGTH * 2));
-
-			if deprecated.exists() {
-				debug!(target: "ethash", "removing: {:?}", &deprecated);
-				try!(fs::remove_file(deprecated));
-			}
-		}
-
 		try!(fs::create_dir_all(path.parent().unwrap()));
-		let mut file = try!(File::create(&path));
+		let mut file = try!(File::create(path));
 
 		let cache_size = self.cache.len() * NODE_BYTES;
 		let buf = unsafe { slice::from_raw_parts(self.cache.as_ptr() as *const u8, cache_size) };
 		try!(file.write(buf));
-		Ok(path)
+		Ok(())
 	}
 }
 
@@ -202,9 +191,6 @@ impl SeedHashCompute {
 	}
 }
 
-pub fn slow_get_seedhash(block_number: u64) -> H256 {
-	SeedHashCompute::resume_compute_seedhash([0u8; 32], 0, block_number / ETHASH_EPOCH_LENGTH)
-}
 
 #[inline]
 fn fnv_hash(x: u32, y: u32) -> u32 {
@@ -469,18 +455,3 @@ fn test_seed_compute_after_newer() {
 	let hash = [241, 175, 44, 134, 39, 121, 245, 239, 228, 236, 43, 160, 195, 152, 46, 7, 199, 5, 253, 147, 241, 206, 98, 43, 3, 104, 17, 40, 192, 79, 106, 162];
 	assert_eq!(seed_compute.get_seedhash(486382), hash);
 }
-
-#[test]
-fn test_drop_old_data() {
-	let first = Light::new(0).to_file().unwrap();
-
-	let second = Light::new(ETHASH_EPOCH_LENGTH).to_file().unwrap();
-	assert!(fs::metadata(&first).is_ok());
-
-	let _ = Light::new(ETHASH_EPOCH_LENGTH * 2).to_file();
-	assert!(fs::metadata(&first).is_err());
-	assert!(fs::metadata(&second).is_ok());
-
-	let _ = Light::new(ETHASH_EPOCH_LENGTH * 3).to_file();
-	assert!(fs::metadata(&second).is_err());
-}

ethash/src/lib.rs

@@ -26,7 +26,7 @@ mod compute;
 
 use std::mem;
 use compute::Light;
-pub use compute::{ETHASH_EPOCH_LENGTH, H256, ProofOfWork, SeedHashCompute, quick_get_difficulty, slow_get_seedhash};
+pub use compute::{ETHASH_EPOCH_LENGTH, H256, ProofOfWork, SeedHashCompute, quick_get_difficulty};
 
 use std::sync::Arc;
 use parking_lot::Mutex;
@@ -69,19 +69,14 @@ impl EthashManager {
 				Some(ref e) if *e == epoch => lights.recent.clone(),
 				_ => match lights.prev_epoch.clone() {
 					Some(e) if e == epoch => {
-						// don't swap if recent is newer.
-						if lights.recent_epoch > lights.prev_epoch {
-							None
-						} else {
-							// swap
-							let t = lights.prev_epoch;
-							lights.prev_epoch = lights.recent_epoch;
-							lights.recent_epoch = t;
-							let t = lights.prev.clone();
-							lights.prev = lights.recent.clone();
-							lights.recent = t;
-							lights.recent.clone()
-						}
+						// swap
+						let t = lights.prev_epoch;
+						lights.prev_epoch = lights.recent_epoch;
+						lights.recent_epoch = t;
+						let t = lights.prev.clone();
+						lights.prev = lights.recent.clone();
+						lights.recent = t;
+						lights.recent.clone()
 					}
 					_ => None,
 				},

ethcore/Cargo.toml

@@ -3,7 +3,7 @@ description = "Ethcore library"
 homepage = "http://ethcore.io"
 license = "GPL-3.0"
 name = "ethcore"
-version = "1.4.0"
+version = "1.3.0"
 authors = ["Ethcore <admin@ethcore.io>"]
 build = "build.rs"
 
@@ -20,15 +20,12 @@ num_cpus = "0.2"
 crossbeam = "0.2.9"
 lazy_static = "0.2"
 bloomchain = "0.1"
-rayon = "0.4.2"
+rayon = "0.3.1"
 semver = "0.2"
 bit-set = "0.4"
 time = "0.1"
-rand = "0.3"
-byteorder = "0.5"
-transient-hashmap = "0.1"
 evmjit = { path = "../evmjit", optional = true }
-clippy = { version = "0.0.96", optional = true}
+clippy = { version = "0.0.80", optional = true}
 ethash = { path = "../ethash" }
 ethcore-util = { path = "../util" }
 ethcore-io = { path = "../util/io" }
@@ -36,11 +33,11 @@ ethcore-devtools = { path = "../devtools" }
 ethjson = { path = "../json" }
 ethcore-ipc = { path = "../ipc/rpc" }
 ethstore = { path = "../ethstore" }
-ethkey = { path = "../ethkey" }
 ethcore-ipc-nano = { path = "../ipc/nano" }
-rlp = { path = "../util/rlp" }
-lru-cache = "0.1.0"
-ethcore-bloom-journal = { path = "../util/bloom" }
+rand = "0.3"
+lru-cache = "0.0.7"
+bloomfilter = { git = "https://github.com/ethcore/rust-bloom-filter" }
+byteorder = "0.5"
 
 [dependencies.hyper]
 git = "https://github.com/ethcore/hyper"
@@ -48,14 +45,10 @@ default-features = false
 
 [features]
 jit = ["evmjit"]
-evm-debug = ["slow-blocks"]
-evm-debug-tests = ["evm-debug"]
-slow-blocks = [] # Use SLOW_TX_DURATION="50" (compile time!) to track transactions over 50ms
+evm-debug = []
 json-tests = []
 test-heavy = []
 dev = ["clippy"]
 default = []
 benches = []
 ipc = []
-ethkey-cli = ["ethkey/cli"]
-ethstore-cli = ["ethstore/cli"]

ethcore/build.rs

@@ -18,7 +18,6 @@ extern crate ethcore_ipc_codegen;
 
 fn main() {
 	ethcore_ipc_codegen::derive_binary("src/types/mod.rs.in").unwrap();
-	ethcore_ipc_codegen::derive_ipc_cond("src/client/traits.rs", cfg!(feature="ipc")).unwrap();
-	ethcore_ipc_codegen::derive_ipc_cond("src/snapshot/snapshot_service_trait.rs", cfg!(feature="ipc")).unwrap();
-	ethcore_ipc_codegen::derive_ipc_cond("src/client/chain_notify.rs", cfg!(feature="ipc")).unwrap();
+	ethcore_ipc_codegen::derive_ipc("src/client/traits.rs").unwrap();
+	ethcore_ipc_codegen::derive_ipc("src/client/chain_notify.rs").unwrap();
 }

ethcore/res/ethereum/classic.json

@@ -10,12 +10,7 @@
 				"durationLimit": "0x0d",
 				"blockReward": "0x4563918244F40000",
 				"registrar" : "0xc6d9d2cd449a754c494264e1809c50e34d64562b",
-				"homesteadTransition": "0x118c30",
-				"eip150Transition": "0x2625a0",
-				"eip155Transition": "0x7fffffffffffffff",
-				"eip160Transition": "0x7fffffffffffffff",
-				"eip161abcTransition": "0x7fffffffffffffff",
-				"eip161dTransition": "0x7fffffffffffffff"
+				"frontierCompatibilityModeLimit": "0x118c30"
 			}
 		}
 	},
@@ -43,18 +38,10 @@
 		"stateRoot": "0xd7f8974fb5ac78d9ac099b9ad5018bedc2ce0a72dad1827a1709da30580f0544"
 	},
 	"nodes": [
-		"enode://08c7ee6a4f861ff0664a49532bcc86de1363acd608999d1b76609bb9bc278649906f069057630fd9493924a368b5d1dc9b8f8bf13ac26df72512f6d1fabd8c95@45.32.7.81:30303",
 		"enode://e809c4a2fec7daed400e5e28564e23693b23b2cc5a019b612505631bbe7b9ccf709c1796d2a3d29ef2b045f210caf51e3c4f5b6d3587d43ad5d6397526fa6179@174.112.32.157:30303",
 		"enode://687be94c3a7beaa3d2fde82fa5046cdeb3e8198354e05b29d6e0d4e276713e3707ac10f784a7904938b06b46c764875c241b0337dd853385a4d8bfcbf8190647@95.183.51.229:30303",
 		"enode://6e538e7c1280f0a31ff08b382db5302480f775480b8e68f8febca0ceff81e4b19153c6f8bf60313b93bef2cc34d34e1df41317de0ce613a201d1660a788a03e2@52.206.67.235:30303",
-		"enode://ca5ae4eca09ba6787e29cf6d86f7634d07aae6b9e6317a59aff675851c0bf445068173208cf8ef7f5cd783d8e29b85b2fa3fa358124cf0546823149724f9bde1@138.68.1.16:30303",
-		"enode://217ebe27e89bf4fec8ce06509323ff095b1014378deb75ab2e5f6759a4e8750a3bd8254b8c6833136e4d5e58230d65ee8ab34a5db5abf0640408c4288af3c8a7@188.138.1.237:30303",
-		"enode://fa20444ef991596ce99b81652ac4e61de1eddc4ff21d3cd42762abd7ed47e7cf044d3c9ccddaf6035d39725e4eb372806787829ccb9a08ec7cb71883cb8c3abd@50.149.116.182:30303",
-		"enode://4bd6a4df3612c718333eb5ea7f817923a8cdf1bed89cee70d1710b45a0b6b77b2819846440555e451a9b602ad2efa2d2facd4620650249d8468008946887820a@71.178.232.20:30304",
-		"enode://921cf8e4c345fe8db913c53964f9cadc667644e7f20195a0b7d877bd689a5934e146ff2c2259f1bae6817b6585153a007ceb67d260b720fa3e6fc4350df25c7f@51.255.49.170:30303",
-		"enode://ffea3b01c000cdd89e1e9229fea3e80e95b646f9b2aa55071fc865e2f19543c9b06045cc2e69453e6b78100a119e66be1b5ad50b36f2ffd27293caa28efdd1b2@128.199.93.177:3030",
-		"enode://ee3da491ce6a155eb132708eb0e8d04b0637926ec0ae1b79e63fc97cb9fc3818f49250a0ae0d7f79ed62b66ec677f408c4e01741504dc7a051e274f1e803d454@91.121.65.179:40404",
-		"enode://48e063a6cf5f335b1ef2ed98126bf522cf254396f850c7d442fe2edbbc23398787e14cd4de7968a00175a82762de9cbe9e1407d8ccbcaeca5004d65f8398d759@159.203.255.59:30303"
+		"enode://217ebe27e89bf4fec8ce06509323ff095b1014378deb75ab2e5f6759a4e8750a3bd8254b8c6833136e4d5e58230d65ee8ab34a5db5abf0640408c4288af3c8a7@188.138.1.237:30303"
 	],
 	"accounts": {
 		"0000000000000000000000000000000000000001": { "builtin": { "name": "ecrecover", "pricing": { "linear": { "base": 3000, "word": 0 } } } },

ethcore/res/ethereum/daohardfork_test.json

@@ -1,5 +1,5 @@
 {
-	"name": "EIP150.1b hard-fork consensus test",
+	"name": "DAO hard-fork consensus test",
 	"engine": {
 		"Ethash": {
 			"params": {
@@ -9,7 +9,7 @@
 				"durationLimit": "0x0d",
 				"blockReward": "0x4563918244F40000",
 				"registrar" : "0xc6d9d2cd449a754c494264e1809c50e34d64562b",
-				"homesteadTransition": "0x5",
+				"frontierCompatibilityModeLimit": "0x5",
 				"daoHardforkTransition": "0x8",
 				"daoHardforkBeneficiary": "0xbf4ed7b27f1d666546e30d74d50d173d20bca754",
 				"daoHardforkAccounts": [  
@@ -129,12 +129,7 @@
 					"0x7602b46df5390e432ef1c307d4f2c9ff6d65cc97",
 					"0xbb9bc244d798123fde783fcc1c72d3bb8c189413",
 					"0x807640a13483f8ac783c557fcdf27be11ea4ac7a"
-				],
-				"eip150Transition": "0xa",
-				"eip155Transition": "0x7fffffffffffffff",
-				"eip160Transition": "0x7fffffffffffffff",
-				"eip161abcTransition": "0x7fffffffffffffff",
-				"eip161dTransition": "0x7fffffffffffffff"
+				]
 			}
 		}
 	},

ethcore/res/ethereum/eip150_test.json

@@ -1,47 +0,0 @@
-{
-	"name": "Homestead (Test)",
-	"engine": {
-		"Ethash": {
-			"params": {
-				"gasLimitBoundDivisor": "0x0400",
-				"minimumDifficulty": "0x020000",
-				"difficultyBoundDivisor": "0x0800",
-				"durationLimit": "0x0d",
-				"blockReward": "0x4563918244F40000",
-				"registrar" : "0xc6d9d2cd449a754c494264e1809c50e34d64562b",
-				"homesteadTransition": "0x0",
-				"eip150Transition": "0x0",
-				"eip155Transition": "0x7fffffffffffffff",
-				"eip160Transition": "0x7fffffffffffffff",
-				"eip161abcTransition": "0x7fffffffffffffff",
-				"eip161dTransition": "0x7fffffffffffffff"
-			}
-		}
-	},
-	"params": {
-		"accountStartNonce": "0x00",
-		"maximumExtraDataSize": "0x20",
-		"minGasLimit": "0x1388",
-		"networkID" : "0x1"
-	},
-	"genesis": {
-		"seal": {
-			"ethereum": {
-				"nonce": "0x0000000000000042",
-				"mixHash": "0x0000000000000000000000000000000000000000000000000000000000000000"
-			}
-		},
-		"difficulty": "0x400000000",
-		"author": "0x0000000000000000000000000000000000000000",
-		"timestamp": "0x00",
-		"parentHash": "0x0000000000000000000000000000000000000000000000000000000000000000",
-		"extraData": "0x11bbe8db4e347b4e8c937c1c8370e4b5ed33adb3db69cbdb7a38e1e50b1b82fa",
-		"gasLimit": "0x1388"
-	},
-	"accounts": {
-		"0000000000000000000000000000000000000001": { "balance": "1", "builtin": { "name": "ecrecover", "pricing": { "linear": { "base": 3000, "word": 0 } } } },
-		"0000000000000000000000000000000000000002": { "balance": "1", "builtin": { "name": "sha256", "pricing": { "linear": { "base": 60, "word": 12 } } } },
-		"0000000000000000000000000000000000000003": { "balance": "1", "builtin": { "name": "ripemd160", "pricing": { "linear": { "base": 600, "word": 120 } } } },
-		"0000000000000000000000000000000000000004": { "balance": "1", "builtin": { "name": "identity", "pricing": { "linear": { "base": 15, "word": 3 } } } }
-	}
-}

ethcore/res/ethereum/eip161_test.json

@@ -1,47 +0,0 @@
-{
-	"name": "Homestead (Test)",
-	"engine": {
-		"Ethash": {
-			"params": {
-				"gasLimitBoundDivisor": "0x0400",
-				"minimumDifficulty": "0x020000",
-				"difficultyBoundDivisor": "0x0800",
-				"durationLimit": "0x0d",
-				"blockReward": "0x4563918244F40000",
-				"registrar" : "0xc6d9d2cd449a754c494264e1809c50e34d64562b",
-				"homesteadTransition": "0x0",
-				"eip150Transition": "0x0",
-				"eip155Transition": "0x7fffffffffffffff",
-				"eip160Transition": "0x0",
-				"eip161abcTransition": "0x0",
-				"eip161dTransition": "0x0"
-			}
-		}
-	},
-	"params": {
-		"accountStartNonce": "0x00",
-		"maximumExtraDataSize": "0x20",
-		"minGasLimit": "0x1388",
-		"networkID" : "0x1"
-	},
-	"genesis": {
-		"seal": {
-			"ethereum": {
-				"nonce": "0x0000000000000042",
-				"mixHash": "0x0000000000000000000000000000000000000000000000000000000000000000"
-			}
-		},
-		"difficulty": "0x400000000",
-		"author": "0x0000000000000000000000000000000000000000",
-		"timestamp": "0x00",
-		"parentHash": "0x0000000000000000000000000000000000000000000000000000000000000000",
-		"extraData": "0x11bbe8db4e347b4e8c937c1c8370e4b5ed33adb3db69cbdb7a38e1e50b1b82fa",
-		"gasLimit": "0x1388"
-	},
-	"accounts": {
-		"0000000000000000000000000000000000000001": { "balance": "1", "builtin": { "name": "ecrecover", "pricing": { "linear": { "base": 3000, "word": 0 } } } },
-		"0000000000000000000000000000000000000002": { "balance": "1", "builtin": { "name": "sha256", "pricing": { "linear": { "base": 60, "word": 12 } } } },
-		"0000000000000000000000000000000000000003": { "balance": "1", "builtin": { "name": "ripemd160", "pricing": { "linear": { "base": 600, "word": 120 } } } },
-		"0000000000000000000000000000000000000004": { "balance": "1", "builtin": { "name": "identity", "pricing": { "linear": { "base": 15, "word": 3 } } } }
-	}
-}

ethcore/res/ethereum/expanse.json

@@ -1,74 +0,0 @@
-{
-	"name": "Expanse",
-	"forkName": "expanse",
-	"engine": {
-		"Ethash": {
-			"params": {
-				"gasLimitBoundDivisor": "0x0400",
-				"minimumDifficulty": "0x020000",
-				"difficultyBoundDivisor": "0x0800",
-				"difficultyIncrementDivisor": "60",
-				"durationLimit": "0x3C",
-				"blockReward": "0x6f05b59d3b200000",
-				"registrar" : "0x6c221ca53705f3497ec90ca7b84c59ae7382fc21",
-				"homesteadTransition": "0x30d40",
-				"difficultyHardforkTransition": "0x59d9",
-				"difficultyHardforkBoundDivisor": "0x0200",
-				"bombDefuseTransition": "0x30d40",
-				"eip150Transition": "0x7fffffffffffffff",
-				"eip155Transition": "0x7fffffffffffffff",
-				"eip160Transition": "0x7fffffffffffffff",
-				"eip161abcTransition": "0x7fffffffffffffff",
-				"eip161dTransition": "0x7fffffffffffffff"
-			}
-		}
-	},
-	"params": {
-		"accountStartNonce": "0x00",
-		"maximumExtraDataSize": "0x20",
-		"minGasLimit": "0x1388",
-		"networkID": "0x1",
-		"subprotocolName": "exp"
-	},
-	"genesis": {
-		"seal": {
-			"ethereum": {
-				"nonce": "0x214652414e4b4f21",
-				"mixHash": "0x0000000000000000000000000000000000000000000000000000000000000000"
-			}
-		},
-		"difficulty": "0x40000000",
-		"author": "0x93decab0cd745598860f782ac1e8f046cb99e898",
-		"timestamp": "0x00",
-		"parentHash": "0x0000000000000000000000000000000000000000000000000000000000000000",
-		"extraData": "0x4672616e6b6f497346726565646f6d",
-		"gasLimit": "0x1388"
-	},
-	"nodes": [
-		"enode://7f335a047654f3e70d6f91312a7cf89c39704011f1a584e2698250db3d63817e74b88e26b7854111e16b2c9d0c7173c05419aeee2d0321850227b126d8b1be3f@46.101.156.249:42786",
-		"enode://df872f81e25f72356152b44cab662caf1f2e57c3a156ecd20e9ac9246272af68a2031b4239a0bc831f2c6ab34733a041464d46b3ea36dce88d6c11714446e06b@178.62.208.109:42786",
-		"enode://96d3919b903e7f5ad59ac2f73c43be9172d9d27e2771355db03fd194732b795829a31fe2ea6de109d0804786c39a807e155f065b4b94c6fce167becd0ac02383@45.55.22.34:42786",
-		"enode://5f6c625bf287e3c08aad568de42d868781e961cbda805c8397cfb7be97e229419bef9a5a25a75f97632787106bba8a7caf9060fab3887ad2cfbeb182ab0f433f@46.101.182.53:42786",
-		"enode://d33a8d4c2c38a08971ed975b750f21d54c927c0bf7415931e214465a8d01651ecffe4401e1db913f398383381413c78105656d665d83f385244ab302d6138414@128.199.183.48:42786",
-		"enode://df872f81e25f72356152b44cab662caf1f2e57c3a156ecd20e9ac9246272af68a2031b4239a0bc831f2c6ab34733a041464d46b3ea36dce88d6c11714446e06b@178.62.208.109:42786",
-		"enode://f6f0d6b9b7d02ec9e8e4a16e38675f3621ea5e69860c739a65c1597ca28aefb3cec7a6d84e471ac927d42a1b64c1cbdefad75e7ce8872d57548ddcece20afdd1@159.203.64.95:42786"
-	],
-	"accounts": {
-		"0000000000000000000000000000000000000001": { "builtin": { "name": "ecrecover", "pricing": { "linear": { "base": 3000, "word": 0 } } } },
-		"0000000000000000000000000000000000000002": { "builtin": { "name": "sha256", "pricing": { "linear": { "base": 60, "word": 12 } } } },
-		"0000000000000000000000000000000000000003": { "builtin": { "name": "ripemd160", "pricing": { "linear": { "base": 600, "word": 120 } } } },
-		"0000000000000000000000000000000000000004": { "builtin": { "name": "identity", "pricing": { "linear": { "base": 15, "word": 3 } } } },
-		"bb94f0ceb32257275b2a7a9c094c13e469b4563e": {
-			"balance": "10000000000000000000000000"
-		},
-		"15656715068ab0dbdf0ab00748a8a19e40f28192": {
-			"balance": "1000000000000000000000000"
-		},
-		"c075fa11f85bda3aaba67106226aaf086ac16f4e": {
-			"balance": "100000000000000000000000"
-		},
-		"93decab0cd745598860f782ac1e8f046cb99e898": {
-			"balance": "10000000000000000000000"
-		}
-	}
-}

ethcore/res/ethereum/frontier.json

@@ -8,11 +8,11 @@
 				"difficultyBoundDivisor": "0x0800",
 				"durationLimit": "0x0d",
 				"blockReward": "0x4563918244F40000",
-				"registrar" : "0x3bb2bb5c6c9c9b7f4ef430b47dc7e026310042ea",
-				"homesteadTransition": "0x118c30",
+				"registrar" : "0xc6d9d2cd449a754c494264e1809c50e34d64562b",
+				"frontierCompatibilityModeLimit": "0x118c30",
 				"daoHardforkTransition": "0x1d4c00",
 				"daoHardforkBeneficiary": "0xbf4ed7b27f1d666546e30d74d50d173d20bca754",
-				"daoHardforkAccounts": [
+				"daoHardforkAccounts": [  
 					"0xd4fe7bc31cedb7bfb8a345f31e668033056b2728",
 					"0xb3fb0e5aba0e20e5c49d252dfd30e102b171a425",
 					"0x2c19c7f9ae8b751e37aeb2d93a699722395ae18f",
@@ -129,12 +129,7 @@
 					"0x7602b46df5390e432ef1c307d4f2c9ff6d65cc97",
 					"0xbb9bc244d798123fde783fcc1c72d3bb8c189413",
 					"0x807640a13483f8ac783c557fcdf27be11ea4ac7a"
-				],
-				"eip150Transition": "0x259518",
-				"eip155Transition": "0x7fffffffffffffff",
-				"eip160Transition": "0x7fffffffffffffff",
-				"eip161abcTransition": "0x7fffffffffffffff",
-				"eip161dTransition": "0x7fffffffffffffff"
+				]
 			}
 		}
 	},
@@ -162,27 +157,10 @@
 		"stateRoot": "0xd7f8974fb5ac78d9ac099b9ad5018bedc2ce0a72dad1827a1709da30580f0544"
 	},
 	"nodes": [
-		"enode://efe4f2493f4aff2d641b1db8366b96ddacfe13e7a6e9c8f8f8cf49f9cdba0fdf3258d8c8f8d0c5db529f8123c8f1d95f36d54d590ca1bb366a5818b9a4ba521c@163.172.187.252:30303",
-		"enode://cd6611461840543d5b9c56fbf088736154c699c43973b3a1a32390cf27106f87e58a818a606ccb05f3866de95a4fe860786fea71bf891ea95f234480d3022aa3@163.172.157.114:30303",
-		"enode://bcc7240543fe2cf86f5e9093d05753dd83343f8fda7bf0e833f65985c73afccf8f981301e13ef49c4804491eab043647374df1c4adf85766af88a624ecc3330e@136.243.154.244:30303",
-		"enode://ed4227681ca8c70beb2277b9e870353a9693f12e7c548c35df6bca6a956934d6f659999c2decb31f75ce217822eefca149ace914f1cbe461ed5a2ebaf9501455@88.212.206.70:30303",
-		"enode://cadc6e573b6bc2a9128f2f635ac0db3353e360b56deef239e9be7e7fce039502e0ec670b595f6288c0d2116812516ad6b6ff8d5728ff45eba176989e40dead1e@37.128.191.230:30303",
-		"enode://595a9a06f8b9bc9835c8723b6a82105aea5d55c66b029b6d44f229d6d135ac3ecdd3e9309360a961ea39d7bee7bac5d03564077a4e08823acc723370aace65ec@46.20.235.22:30303",
-		"enode://029178d6d6f9f8026fc0bc17d5d1401aac76ec9d86633bba2320b5eed7b312980c0a210b74b20c4f9a8b0b2bf884b111fa9ea5c5f916bb9bbc0e0c8640a0f56c@216.158.85.185:30303",
-		"enode://84f5d5957b4880a8b0545e32e05472318898ad9fc8ebe1d56c90c12334a98e12351eccfdf3a2bf72432ac38b57e9d348400d17caa083879ade3822390f89773f@10.1.52.78:30303",
-		"enode://f90dc9b9bf7b8db97726b7849e175f1eb2707f3d8f281c929336e398dd89b0409fc6aeceb89e846278e9d3ecc3857cebfbe6758ff352ece6fe5d42921ee761db@10.1.173.87:30303",
-		"enode://6a868ced2dec399c53f730261173638a93a40214cf299ccf4d42a76e3fa54701db410669e8006347a4b3a74fa090bb35af0320e4bc8d04cf5b7f582b1db285f5@10.3.149.199:30303",
-		"enode://fdd1b9bb613cfbc200bba17ce199a9490edc752a833f88d4134bf52bb0d858aa5524cb3ec9366c7a4ef4637754b8b15b5dc913e4ed9fdb6022f7512d7b63f181@212.47.247.103:30303",
 		"enode://a979fb575495b8d6db44f750317d0f4622bf4c2aa3365d6af7c284339968eef29b69ad0dce72a4d8db5ebb4968de0e3bec910127f134779fbcb0cb6d3331163c@52.16.188.185:30303",
 		"enode://de471bccee3d042261d52e9bff31458daecc406142b401d4cd848f677479f73104b9fdeb090af9583d3391b7f10cb2ba9e26865dd5fca4fcdc0fb1e3b723c786@54.94.239.50:30303",
 		"enode://1118980bf48b0a3640bdba04e0fe78b1add18e1cd99bf22d53daac1fd9972ad650df52176e7c7d89d1114cfef2bc23a2959aa54998a46afcf7d91809f0855082@52.74.57.123:30303",
-		"enode://4cd540b2c3292e17cff39922e864094bf8b0741fcc8c5dcea14957e389d7944c70278d872902e3d0345927f621547efa659013c400865485ab4bfa0c6596936f@138.201.144.135:30303",
-
-		"enode://89d5dc2a81e574c19d0465f497c1af96732d1b61a41de89c2a37f35707689ac416529fae1038809852b235c2d30fd325abdc57c122feeefbeaaf802cc7e9580d@45.55.33.62:30303",
-		"enode://605e04a43b1156966b3a3b66b980c87b7f18522f7f712035f84576016be909a2798a438b2b17b1a8c58db314d88539a77419ca4be36148c086900fba487c9d39@188.166.255.12:30303",
-		"enode://016b20125f447a3b203a3cae953b2ede8ffe51290c071e7599294be84317635730c397b8ff74404d6be412d539ee5bb5c3c700618723d3b53958c92bd33eaa82@159.203.210.80:30303",
-		"enode://01f76fa0561eca2b9a7e224378dd854278735f1449793c46ad0c4e79e8775d080c21dcc455be391e90a98153c3b05dcc8935c8440de7b56fe6d67251e33f4e3c@10.6.6.117:30303",
-		"enode://fe11ef89fc5ac9da358fc160857855f25bbf9e332c79b9ca7089330c02b728b2349988c6062f10982041702110745e203d26975a6b34bcc97144f9fe439034e8@10.1.72.117:30303"
+		"enode://248f12bc8b18d5289358085520ac78cd8076485211e6d96ab0bc93d6cd25442db0ce3a937dc404f64f207b0b9aed50e25e98ce32af5ac7cb321ff285b97de485@zero.parity.io:30303"
 	],
 	"accounts": {
 		"0000000000000000000000000000000000000001": { "builtin": { "name": "ecrecover", "pricing": { "linear": { "base": 3000, "word": 0 } } } },

ethcore/res/ethereum/frontier_like_test.json

@@ -9,7 +9,7 @@
 				"durationLimit": "0x0d",
 				"blockReward": "0x4563918244F40000",
 				"registrar" : "0xc6d9d2cd449a754c494264e1809c50e34d64562b",
-				"homesteadTransition": "0x118c30",
+				"frontierCompatibilityModeLimit": "0x118c30",
 				"daoHardforkTransition": "0x1d4c00",
 				"daoHardforkBeneficiary": "0xbf4ed7b27f1d666546e30d74d50d173d20bca754",
 				"daoHardforkAccounts": [  
@@ -129,12 +129,7 @@
 					"0x7602b46df5390e432ef1c307d4f2c9ff6d65cc97",
 					"0xbb9bc244d798123fde783fcc1c72d3bb8c189413",
 					"0x807640a13483f8ac783c557fcdf27be11ea4ac7a"
-				],
-				"eip150Transition": "0x7fffffffffffffff",
-				"eip155Transition": "0x7fffffffffffffff",
-				"eip160Transition": "0x7fffffffffffffff",
-				"eip161abcTransition": "0x7fffffffffffffff",
-				"eip161dTransition": "0x7fffffffffffffff"
+				]
 			}
 		}
 	},

ethcore/res/ethereum/frontier_test.json

@@ -9,12 +9,7 @@
 				"durationLimit": "0x0d",
 				"blockReward": "0x4563918244F40000",
 				"registrar" : "0xc6d9d2cd449a754c494264e1809c50e34d64562b",
-				"homesteadTransition": "0x7fffffffffffffff",
-				"eip150Transition": "0x7fffffffffffffff",
-				"eip155Transition": "0x7fffffffffffffff",
-				"eip160Transition": "0x7fffffffffffffff",
-				"eip161abcTransition": "0x7fffffffffffffff",
-				"eip161dTransition": "0x7fffffffffffffff"
+				"frontierCompatibilityModeLimit": "0xffffffffffffffff"
 			}
 		}
 	},

ethcore/res/ethereum/homestead_test.json

@@ -9,12 +9,7 @@
 				"durationLimit": "0x0d",
 				"blockReward": "0x4563918244F40000",
 				"registrar" : "0xc6d9d2cd449a754c494264e1809c50e34d64562b",
-				"homesteadTransition": "0x0",
-				"eip150Transition": "0x7fffffffffffffff",
-				"eip155Transition": "0x7fffffffffffffff",
-				"eip160Transition": "0x7fffffffffffffff",
-				"eip161abcTransition": "0x7fffffffffffffff",
-				"eip161dTransition": "0x7fffffffffffffff"
+				"frontierCompatibilityModeLimit": "0x0"
 			}
 		}
 	},

ethcore/res/ethereum/morden.json

@@ -8,13 +8,8 @@
 				"difficultyBoundDivisor": "0x0800",
 				"durationLimit": "0x0d",
 				"blockReward": "0x4563918244F40000",
-				"registrar": "0x52dff57a8a1532e6afb3dc07e2af58bb9eb05b3d",
-				"homesteadTransition": "0x789b0",
-				"eip150Transition": "0x1b34d8",
-				"eip155Transition": "0x7fffffffffffffff",
-				"eip160Transition": "0x7fffffffffffffff",
-				"eip161abcTransition": "0x7fffffffffffffff",
-				"eip161dTransition": "0x7fffffffffffffff"
+				"registrar": "0x8e4e9b13d4b45cb0befc93c3061b1408f67316b2",
+				"frontierCompatibilityModeLimit": "0x789b0"
 			}
 		}
 	},
@@ -22,9 +17,7 @@
 		"accountStartNonce": "0x0100000",
 		"maximumExtraDataSize": "0x20",
 		"minGasLimit": "0x1388",
-		"networkID" : "0x2",
-		"forkBlock": "0x1b34d8",
-		"forkCanonHash": "0xf376243aeff1f256d970714c3de9fd78fa4e63cf63e32a51fe1169e375d98145"
+		"networkID" : "0x2"
 	},
 	"genesis": {
 		"seal": {

ethcore/res/ethereum/olympic.json

@@ -8,13 +8,7 @@
 				"difficultyBoundDivisor": "0x0800",
 				"durationLimit": "0x08",
 				"blockReward": "0x14D1120D7B160000",
-				"registrar": "5e70c0bbcd5636e0f9f9316e9f8633feb64d4050",
-				"homesteadTransition": "0x7fffffffffffffff",
-				"eip150Transition": "0x7fffffffffffffff",
-				"eip155Transition": "0x7fffffffffffffff",
-				"eip160Transition": "0x7fffffffffffffff",
-				"eip161abcTransition": "0x7fffffffffffffff",
-				"eip161dTransition": "0x7fffffffffffffff"
+				"registrar": "5e70c0bbcd5636e0f9f9316e9f8633feb64d4050"
 			}
 		}
 	},

ethcore/src/account.rs

@@ -16,18 +16,17 @@
 
 //! Single account in the system.
 
+use std::collections::hash_map::Entry;
 use util::*;
 use pod_account::*;
-use rlp::*;
+use account_db::*;
 use lru_cache::LruCache;
 
 use std::cell::{RefCell, Cell};
 
-const STORAGE_CACHE_ITEMS: usize = 8192;
+const STORAGE_CACHE_ITEMS: usize = 4096;
 
 /// Single account in the system.
-/// Keeps track of changes to the code and storage.
-/// The changes are applied in `commit_storage` and `commit_code`
 pub struct Account {
 	// Balance of the account.
 	balance: U256,
@@ -41,14 +40,14 @@ pub struct Account {
 	// Modified storage. Accumulates changes to storage made in `set_storage`
 	// Takes precedence over `storage_cache`.
 	storage_changes: HashMap<H256, H256>,
-	// Code hash of the account.
-	code_hash: H256,
+	// Code hash of the account. If None, means that it's a contract whose code has not yet been set.
+	code_hash: Option<H256>,
 	// Size of the accoun code.
-	code_size: Option<usize>,
+	code_size: Option<u64>,
 	// Code cache of the account.
-	code_cache: Arc<Bytes>,
-	// Account code new or has been modified.
-	code_filth: Filth,
+	code_cache: Bytes,
+	// Account is new or has been modified
+	filth: Filth,
 	// Cached address hash.
 	address_hash: Cell<Option<H256>>,
 }
@@ -63,10 +62,10 @@ impl Account {
 			storage_root: SHA3_NULL_RLP,
 			storage_cache: Self::empty_storage_cache(),
 			storage_changes: storage,
-			code_hash: code.sha3(),
-			code_size: Some(code.len()),
-			code_cache: Arc::new(code),
-			code_filth: Filth::Dirty,
+			code_hash: Some(code.sha3()),
+			code_size: Some(code.len() as u64),
+			code_cache: code,
+			filth: Filth::Dirty,
 			address_hash: Cell::new(None),
 		}
 	}
@@ -83,10 +82,10 @@ impl Account {
 			storage_root: SHA3_NULL_RLP,
 			storage_cache: Self::empty_storage_cache(),
 			storage_changes: pod.storage.into_iter().collect(),
-			code_hash: pod.code.as_ref().map_or(SHA3_EMPTY, |c| c.sha3()),
-			code_filth: Filth::Dirty,
-			code_size: Some(pod.code.as_ref().map_or(0, |c| c.len())),
-			code_cache: Arc::new(pod.code.map_or_else(|| { warn!("POD account with unknown code is being created! Assuming no code."); vec![] }, |c| c)),
+			code_hash: pod.code.as_ref().map(|c| c.sha3()),
+			code_size: Some(pod.code.as_ref().map_or(0, |c| c.len() as u64)),
+			code_cache: pod.code.map_or_else(|| { warn!("POD account with unknown code is being created! Assuming no code."); vec![] }, |c| c),
+			filth: Filth::Dirty,
 			address_hash: Cell::new(None),
 		}
 	}
@@ -99,10 +98,10 @@ impl Account {
 			storage_root: SHA3_NULL_RLP,
 			storage_cache: Self::empty_storage_cache(),
 			storage_changes: HashMap::new(),
-			code_hash: SHA3_EMPTY,
-			code_cache: Arc::new(vec![]),
+			code_hash: Some(SHA3_EMPTY),
+			code_cache: vec![],
 			code_size: Some(0),
-			code_filth: Filth::Clean,
+			filth: Filth::Dirty,
 			address_hash: Cell::new(None),
 		}
 	}
@@ -116,10 +115,10 @@ impl Account {
 			storage_root: r.val_at(2),
 			storage_cache: Self::empty_storage_cache(),
 			storage_changes: HashMap::new(),
-			code_hash: r.val_at(3),
-			code_cache: Arc::new(vec![]),
+			code_hash: Some(r.val_at(3)),
+			code_cache: vec![],
 			code_size: None,
-			code_filth: Filth::Clean,
+			filth: Filth::Clean,
 			address_hash: Cell::new(None),
 		}
 	}
@@ -133,10 +132,10 @@ impl Account {
 			storage_root: SHA3_NULL_RLP,
 			storage_cache: Self::empty_storage_cache(),
 			storage_changes: HashMap::new(),
-			code_hash: SHA3_EMPTY,
-			code_cache: Arc::new(vec![]),
+			code_hash: None,
+			code_cache: vec![],
 			code_size: None,
-			code_filth: Filth::Clean,
+			filth: Filth::Dirty,
 			address_hash: Cell::new(None),
 		}
 	}
@@ -144,25 +143,37 @@ impl Account {
 	/// Set this account's code to the given code.
 	/// NOTE: Account should have been created with `new_contract()`
 	pub fn init_code(&mut self, code: Bytes) {
-		self.code_hash = code.sha3();
-		self.code_cache = Arc::new(code);
-		self.code_size = Some(self.code_cache.len());
-		self.code_filth = Filth::Dirty;
+		assert!(self.code_hash.is_none());
+		self.code_cache = code;
+		self.code_size = Some(self.code_cache.len() as u64);
+		self.filth = Filth::Dirty;
 	}
 
 	/// Reset this account's code to the given code.
 	pub fn reset_code(&mut self, code: Bytes) {
+		self.code_hash = None;
+		self.code_size = Some(0);
 		self.init_code(code);
 	}
 
 	/// Set (and cache) the contents of the trie's storage at `key` to `value`.
 	pub fn set_storage(&mut self, key: H256, value: H256) {
-		self.storage_changes.insert(key, value);
+		match self.storage_changes.entry(key) {
+			Entry::Occupied(ref mut entry) if entry.get() != &value => {
+				entry.insert(value);
+				self.filth = Filth::Dirty;
+			},
+			Entry::Vacant(entry) => {
+				entry.insert(value);
+				self.filth = Filth::Dirty;
+			},
+			_ => {},
+		}
 	}
 
 	/// Get (and cache) the contents of the trie's storage at `key`.
 	/// Takes modifed storage into account.
-	pub fn storage_at(&self, db: &HashDB, key: &H256) -> H256 {
+	pub fn storage_at(&self, db: &AccountDB, key: &H256) -> H256 {
 		if let Some(value) = self.cached_storage_at(key) {
 			return value;
 		}
@@ -172,7 +183,7 @@ impl Account {
 			using it will not fail.");
 
 		let item: U256 = match db.get(key){
-			Ok(x) => x.map_or_else(U256::zero, |v| decode(&*v)),
+			Ok(x) => x.map_or_else(U256::zero, decode),
 			Err(e) => panic!("Encountered potential DB corruption: {}", e),
 		};
 		let value: H256 = item.into();
@@ -198,9 +209,10 @@ impl Account {
 	/// return the nonce associated with this account.
 	pub fn nonce(&self) -> &U256 { &self.nonce }
 
+	#[cfg(test)]
 	/// return the code hash associated with this account.
 	pub fn code_hash(&self) -> H256 {
-		self.code_hash.clone()
+		self.code_hash.clone().unwrap_or(SHA3_EMPTY)
 	}
 
 	/// return the code hash associated with this account.
@@ -215,16 +227,18 @@ impl Account {
 
 	/// returns the account's code. If `None` then the code cache isn't available -
 	/// get someone who knows to call `note_code`.
-	pub fn code(&self) -> Option<Arc<Bytes>> {
-		if self.code_hash != SHA3_EMPTY && self.code_cache.is_empty() {
-			return None;
+	pub fn code(&self) -> Option<&[u8]> {
+		match self.code_hash {
+			Some(c) if c == SHA3_EMPTY && self.code_cache.is_empty() => Some(&self.code_cache),
+			Some(_) if !self.code_cache.is_empty() => Some(&self.code_cache),
+			None => Some(&self.code_cache),
+			_ => None,
 		}
-		Some(self.code_cache.clone())
 	}
 
 	/// returns the account's code size. If `None` then the code cache or code size cache isn't available -
 	/// get someone who knows to call `note_code`.
-	pub fn code_size(&self) -> Option<usize> {
+	pub fn code_size(&self) -> Option<u64> {
 		self.code_size.clone()
 	}
 
@@ -232,88 +246,76 @@ impl Account {
 	/// Provide a byte array which hashes to the `code_hash`. returns the hash as a result.
 	pub fn note_code(&mut self, code: Bytes) -> Result<(), H256> {
 		let h = code.sha3();
-		if self.code_hash == h {
-			self.code_cache = Arc::new(code);
-			self.code_size = Some(self.code_cache.len());
-			Ok(())
-		} else {
-			Err(h)
+		match self.code_hash {
+			Some(ref i) if h == *i => {
+				self.code_cache = code;
+				self.code_size = Some(self.code_cache.len() as u64);
+				Ok(())
+			},
+			_ => Err(h)
 		}
 	}
 
 	/// Is `code_cache` valid; such that code is going to return Some?
 	pub fn is_cached(&self) -> bool {
-		!self.code_cache.is_empty() || (self.code_cache.is_empty() && self.code_hash == SHA3_EMPTY)
+		!self.code_cache.is_empty() || (self.code_cache.is_empty() && self.code_hash == Some(SHA3_EMPTY))
+	}
+
+	/// Is this a new or modified account?
+	pub fn is_dirty(&self) -> bool {
+		self.filth == Filth::Dirty || !self.storage_is_clean()
+	}
+
+	/// Mark account as clean.
+	pub fn set_clean(&mut self) {
+		assert!(self.storage_is_clean());
+		self.filth = Filth::Clean
 	}
 
 	/// Provide a database to get `code_hash`. Should not be called if it is a contract without code.
-	pub fn cache_code(&mut self, db: &HashDB) -> Option<Arc<Bytes>> {
+	pub fn cache_code(&mut self, db: &AccountDB) -> bool {
 		// TODO: fill out self.code_cache;
 		trace!("Account::cache_code: ic={}; self.code_hash={:?}, self.code_cache={}", self.is_cached(), self.code_hash, self.code_cache.pretty());
-
-		if self.is_cached() { return Some(self.code_cache.clone()) }
-
-		match db.get(&self.code_hash) {
-			Some(x) => {
-				self.code_size = Some(x.len());
-				self.code_cache = Arc::new(x.to_vec());
-				Some(self.code_cache.clone())
-			},
-			_ => {
-				warn!("Failed reverse get of {}", self.code_hash);
-				None
-			},
-		}
-	}
-
-	/// Provide code to cache. For correctness, should be the correct code for the
-	/// account.
-	pub fn cache_given_code(&mut self, code: Arc<Bytes>) {
-		trace!("Account::cache_given_code: ic={}; self.code_hash={:?}, self.code_cache={}", self.is_cached(), self.code_hash, self.code_cache.pretty());
-
-		self.code_size = Some(code.len());
-		self.code_cache = code;
-	}
-
-	/// Provide a database to get `code_size`. Should not be called if it is a contract without code.
-	pub fn cache_code_size(&mut self, db: &HashDB) -> bool {
-		// TODO: fill out self.code_cache;
-		trace!("Account::cache_code_size: ic={}; self.code_hash={:?}, self.code_cache={}", self.is_cached(), self.code_hash, self.code_cache.pretty());
-		self.code_size.is_some() ||
-			if self.code_hash != SHA3_EMPTY {
-				match db.get(&self.code_hash) {
+		self.is_cached() ||
+			match self.code_hash {
+				Some(ref h) => match db.get(h) {
 					Some(x) => {
-						self.code_size = Some(x.len());
+						self.code_cache = x.to_vec();
+						self.code_size = Some(x.len() as u64);
 						true
 					},
 					_ => {
-						warn!("Failed reverse get of {}", self.code_hash);
+						warn!("Failed reverse get of {}", h);
 						false
 					},
-				}
-			} else {
-				false
+				},
+				_ => false,
+			}
+	}
+
+	/// Provide a database to get `code_size`. Should not be called if it is a contract without code.
+	pub fn cache_code_size(&mut self, db: &AccountDB) -> bool {
+		// TODO: fill out self.code_cache;
+		trace!("Account::cache_code_size: ic={}; self.code_hash={:?}, self.code_cache={}", self.is_cached(), self.code_hash, self.code_cache.pretty());
+		self.code_size.is_some() ||
+			match self.code_hash {
+				Some(ref h) if h != &SHA3_EMPTY => match db.get(h) {
+					Some(x) => {
+						self.code_size = Some(x.len() as u64);
+						true
+					},
+					_ => {
+						warn!("Failed reverse get of {}", h);
+						false
+					},
+				},
+				_ => false,
 			}
 	}
 
 	/// Determine whether there are any un-`commit()`-ed storage-setting operations.
 	pub fn storage_is_clean(&self) -> bool { self.storage_changes.is_empty() }
 
-	/// Check if account has zero nonce, balance, no code and no storage.
-	///
-	/// NOTE: Will panic if `!self.storage_is_clean()`
-	pub fn is_empty(&self) -> bool {
-		assert!(self.storage_is_clean(), "Account::is_empty() may only legally be called when storage is clean.");
-		self.is_null() && self.storage_root == SHA3_NULL_RLP
-	}
-
-	/// Check if account has zero nonce, balance, no code.
-	pub fn is_null(&self) -> bool {
-		self.balance.is_zero() &&
-		self.nonce.is_zero() &&
-		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.
 	pub fn storage_root(&self) -> Option<&H256> { if self.storage_is_clean() {Some(&self.storage_root)} else {None} }
@@ -324,22 +326,29 @@ impl Account {
 	/// Increment the nonce of the account by one.
 	pub fn inc_nonce(&mut self) {
 		self.nonce = self.nonce + U256::from(1u8);
+		self.filth = Filth::Dirty;
 	}
 
-	/// Increase account balance.
+	/// Increment the nonce of the account by one.
 	pub fn add_balance(&mut self, x: &U256) {
-		self.balance = self.balance + *x;
+		if !x.is_zero() {
+			self.balance = self.balance + *x;
+			self.filth = Filth::Dirty;
+		}
 	}
 
-	/// Decrease account balance.
+	/// Increment the nonce of the account by one.
 	/// Panics if balance is less than `x`
 	pub fn sub_balance(&mut self, x: &U256) {
-		assert!(self.balance >= *x);
-		self.balance = self.balance - *x;
+		if !x.is_zero() {
+			assert!(self.balance >= *x);
+			self.balance = self.balance - *x;
+			self.filth = Filth::Dirty;
+		}
 	}
 
 	/// Commit the `storage_changes` to the backing DB and update `storage_root`.
-	pub fn commit_storage(&mut self, trie_factory: &TrieFactory, db: &mut HashDB) {
+	pub fn commit_storage(&mut self, trie_factory: &TrieFactory, db: &mut AccountDBMut) {
 		let mut t = trie_factory.from_existing(db, &mut self.storage_root)
 			.expect("Account storage_root initially set to zero (valid) and only altered by SecTrieDBMut. \
 				SecTrieDBMut would not set it to an invalid state root. Therefore the root is valid and DB creation \
@@ -348,8 +357,8 @@ impl Account {
 			// cast key and value to trait type,
 			// so we can call overloaded `to_bytes` method
 			let res = match v.is_zero() {
-				true => t.remove(&k),
-				false => t.insert(&k, &encode(&U256::from(&*v))),
+				true => t.remove(k.as_slice()),
+				false => t.insert(k.as_slice(), &encode(&U256::from(v.as_slice()))),
 			};
 
 			if let Err(e) = res {
@@ -360,17 +369,16 @@ impl Account {
 	}
 
 	/// Commit any unsaved code. `code_hash` will always return the hash of the `code_cache` after this.
-	pub fn commit_code(&mut self, db: &mut HashDB) {
-		trace!("Commiting code of {:?} - {:?}, {:?}", self, self.code_filth == Filth::Dirty, self.code_cache.is_empty());
-		match (self.code_filth == Filth::Dirty, self.code_cache.is_empty()) {
+	pub fn commit_code(&mut self, db: &mut AccountDBMut) {
+		trace!("Commiting code of {:?} - {:?}, {:?}", self, self.code_hash.is_none(), self.code_cache.is_empty());
+		match (self.code_hash.is_none(), self.code_cache.is_empty()) {
 			(true, true) => {
+				self.code_hash = Some(SHA3_EMPTY);
 				self.code_size = Some(0);
-				self.code_filth = Filth::Clean;
 			},
 			(true, false) => {
-				db.emplace(self.code_hash.clone(), DBValue::from_slice(&*self.code_cache));
-				self.code_size = Some(self.code_cache.len());
-				self.code_filth = Filth::Clean;
+				self.code_hash = Some(db.insert(&self.code_cache));
+				self.code_size = Some(self.code_cache.len() as u64);
 			},
 			(false, _) => {},
 		}
@@ -382,7 +390,7 @@ impl Account {
 		stream.append(&self.nonce);
 		stream.append(&self.balance);
 		stream.append(&self.storage_root);
-		stream.append(&self.code_hash);
+		stream.append(self.code_hash.as_ref().unwrap_or(&SHA3_EMPTY));
 		stream.out()
 	}
 
@@ -396,8 +404,8 @@ impl Account {
 			storage_changes: HashMap::new(),
 			code_hash: self.code_hash.clone(),
 			code_size: self.code_size.clone(),
-			code_cache: self.code_cache.clone(),
-			code_filth: self.code_filth,
+			code_cache: Bytes::new(),
+			filth: self.filth,
 			address_hash: self.address_hash.clone(),
 		}
 	}
@@ -417,23 +425,21 @@ impl Account {
 		account
 	}
 
-	/// Replace self with the data from other account merging storage cache.
-	/// Basic account data and all modifications are overwritten
-	/// with new values.
-	pub fn overwrite_with(&mut self, other: Account) {
+	/// Replace self with the data from other account merging storage cache
+	pub fn merge_with(&mut self, other: Account) {
+		assert!(self.storage_is_clean());
+		assert!(other.storage_is_clean());
 		self.balance = other.balance;
 		self.nonce = other.nonce;
 		self.storage_root = other.storage_root;
 		self.code_hash = other.code_hash;
-		self.code_filth = other.code_filth;
 		self.code_cache = other.code_cache;
 		self.code_size = other.code_size;
 		self.address_hash = other.address_hash;
 		let mut cache = self.storage_cache.borrow_mut();
-		for (k, v) in other.storage_cache.into_inner() {
+		for (k, v) in other.storage_cache.into_inner().into_iter() {
 			cache.insert(k.clone() , v.clone()); //TODO: cloning should not be required here
 		}
-		self.storage_changes = other.storage_changes;
 	}
 }
 
@@ -449,7 +455,6 @@ mod tests {
 	use util::*;
 	use super::*;
 	use account_db::*;
-	use rlp::*;
 
 	#[test]
 	fn account_compress() {
@@ -493,7 +498,7 @@ mod tests {
 		};
 
 		let mut a = Account::from_rlp(&rlp);
-		assert!(a.cache_code(&db.immutable()).is_some());
+		assert!(a.cache_code(&db.immutable()));
 
 		let mut a = Account::from_rlp(&rlp);
 		assert_eq!(a.note_code(vec![0x55, 0x44, 0xffu8]), Ok(()));
@@ -530,7 +535,7 @@ mod tests {
 		let mut db = MemoryDB::new();
 		let mut db = AccountDBMut::new(&mut db, &Address::new());
 		a.init_code(vec![0x55, 0x44, 0xffu8]);
-		assert_eq!(a.code_filth, Filth::Dirty);
+		assert_eq!(a.code_hash(), SHA3_EMPTY);
 		assert_eq!(a.code_size(), Some(3));
 		a.commit_code(&mut db);
 		assert_eq!(a.code_hash().hex(), "af231e631776a517ca23125370d542873eca1fb4d613ed9b5d5335a46ae5b7eb");
@@ -542,12 +547,11 @@ mod tests {
 		let mut db = MemoryDB::new();
 		let mut db = AccountDBMut::new(&mut db, &Address::new());
 		a.init_code(vec![0x55, 0x44, 0xffu8]);
-		assert_eq!(a.code_filth, Filth::Dirty);
+		assert_eq!(a.code_hash(), SHA3_EMPTY);
 		a.commit_code(&mut db);
-		assert_eq!(a.code_filth, Filth::Clean);
 		assert_eq!(a.code_hash().hex(), "af231e631776a517ca23125370d542873eca1fb4d613ed9b5d5335a46ae5b7eb");
 		a.reset_code(vec![0x55]);
-		assert_eq!(a.code_filth, Filth::Dirty);
+		assert_eq!(a.code_hash(), SHA3_EMPTY);
 		a.commit_code(&mut db);
 		assert_eq!(a.code_hash().hex(), "37bf2238b11b68cdc8382cece82651b59d3c3988873b6e0f33d79694aa45f1be");
 	}

ethcore/src/account_db.rs

@@ -16,7 +16,6 @@
 
 //! DB backend wrapper for Account trie
 use util::*;
-use rlp::NULL_RLP;
 
 static NULL_RLP_STATIC: [u8; 1] = [0x80; 1];
 
@@ -36,38 +35,6 @@ fn combine_key<'a>(address_hash: &'a H256, key: &'a H256) -> H256 {
 	dst
 }
 
-/// A factory for different kinds of account dbs.
-#[derive(Debug, Clone)]
-pub enum Factory {
-	/// Mangle hashes based on address.
-	Mangled,
-	/// Don't mangle hashes.
-	Plain,
-}
-
-impl Default for Factory {
-	fn default() -> Self { Factory::Mangled }
-}
-
-impl Factory {
-	/// Create a read-only accountdb.
-	/// This will panic when write operations are called.
-	pub fn readonly<'db>(&self, db: &'db HashDB, address_hash: H256) -> Box<HashDB + 'db> {
-		match *self {
-			Factory::Mangled => Box::new(AccountDB::from_hash(db, address_hash)),
-			Factory::Plain => Box::new(Wrapping(db)),
-		}
-	}
-
-	/// Create a new mutable hashdb.
-	pub fn create<'db>(&self, db: &'db mut HashDB, address_hash: H256) -> Box<HashDB + 'db> {
-		match *self {
-			Factory::Mangled => Box::new(AccountDBMut::from_hash(db, address_hash)),
-			Factory::Plain => Box::new(WrappingMut(db)),
-		}
-	}
-}
-
 // TODO: introduce HashDBMut?
 /// DB backend wrapper for Account trie
 /// Transforms trie node keys for the database
@@ -96,9 +63,9 @@ impl<'db> HashDB for AccountDB<'db>{
 		unimplemented!()
 	}
 
-	fn get(&self, key: &H256) -> Option<DBValue> {
+	fn get(&self, key: &H256) -> Option<&[u8]> {
 		if key == &SHA3_NULL_RLP {
-			return Some(DBValue::from_slice(&NULL_RLP_STATIC));
+			return Some(&NULL_RLP_STATIC);
 		}
 		self.db.get(&combine_key(&self.address_hash, key))
 	}
@@ -114,17 +81,13 @@ impl<'db> HashDB for AccountDB<'db>{
 		unimplemented!()
 	}
 
-	fn emplace(&mut self, _key: H256, _value: DBValue) {
+	fn emplace(&mut self, _key: H256, _value: Bytes) {
 		unimplemented!()
 	}
 
 	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
@@ -158,9 +121,9 @@ impl<'db> HashDB for AccountDBMut<'db>{
 		unimplemented!()
 	}
 
-	fn get(&self, key: &H256) -> Option<DBValue> {
+	fn get(&self, key: &H256) -> Option<&[u8]> {
 		if key == &SHA3_NULL_RLP {
-			return Some(DBValue::from_slice(&NULL_RLP_STATIC));
+			return Some(&NULL_RLP_STATIC);
 		}
 		self.db.get(&combine_key(&self.address_hash, key))
 	}
@@ -178,16 +141,16 @@ impl<'db> HashDB for AccountDBMut<'db>{
 		}
 		let k = value.sha3();
 		let ak = combine_key(&self.address_hash, &k);
-		self.db.emplace(ak, DBValue::from_slice(value));
+		self.db.emplace(ak, value.to_vec());
 		k
 	}
 
-	fn emplace(&mut self, key: H256, value: DBValue) {
+	fn emplace(&mut self, key: H256, value: Bytes) {
 		if key == SHA3_NULL_RLP {
 			return;
 		}
 		let key = combine_key(&self.address_hash, &key);
-		self.db.emplace(key, value)
+		self.db.emplace(key, value.to_vec())
 	}
 
 	fn remove(&mut self, key: &H256) {
@@ -197,93 +160,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);
 
-impl<'db> HashDB for Wrapping<'db> {
-	fn keys(&self) -> HashMap<H256, i32> {
-		unimplemented!()
-	}
-
-	fn get(&self, key: &H256) -> Option<DBValue> {
-		if key == &SHA3_NULL_RLP {
-			return Some(DBValue::from_slice(&NULL_RLP_STATIC));
-		}
-		self.0.get(key)
-	}
-
-	fn contains(&self, key: &H256) -> bool {
-		if key == &SHA3_NULL_RLP {
-			return true;
-		}
-		self.0.contains(key)
-	}
-
-	fn insert(&mut self, _value: &[u8]) -> H256 {
-		unimplemented!()
-	}
-
-	fn emplace(&mut self, _key: H256, _value: DBValue) {
-		unimplemented!()
-	}
-
-	fn remove(&mut self, _key: &H256) {
-		unimplemented!()
-	}
-}
-
-struct WrappingMut<'db>(&'db mut HashDB);
-
-impl<'db> HashDB for WrappingMut<'db>{
-	fn keys(&self) -> HashMap<H256, i32> {
-		unimplemented!()
-	}
-
-	fn get(&self, key: &H256) -> Option<DBValue> {
-		if key == &SHA3_NULL_RLP {
-			return Some(DBValue::from_slice(&NULL_RLP_STATIC));
-		}
-		self.0.get(key)
-	}
-
-	fn contains(&self, key: &H256) -> bool {
-		if key == &SHA3_NULL_RLP {
-			return true;
-		}
-		self.0.contains(key)
-	}
-
-	fn insert(&mut self, value: &[u8]) -> H256 {
-		if value == &NULL_RLP {
-			return SHA3_NULL_RLP.clone();
-		}
-		self.0.insert(value)
-	}
-
-	fn emplace(&mut self, key: H256, value: DBValue) {
-		if key == SHA3_NULL_RLP {
-			return;
-		}
-		self.0.emplace(key, value)
-	}
-
-	fn remove(&mut self, key: &H256) {
-		if key == &SHA3_NULL_RLP {
-			return;
-		}
-		self.0.remove(key)
-	}
-}

ethcore/src/account_provider.rs

@@ -16,16 +16,14 @@
 
 //! Account management.
 
-use std::{fs, fmt};
+use std::fmt;
 use std::collections::HashMap;
-use std::path::PathBuf;
 use std::time::{Instant, Duration};
-use util::{Mutex, RwLock};
+use util::{Address as H160, H256, H520, Mutex, RwLock};
 use ethstore::{SecretStore, Error as SSError, SafeAccount, EthStore};
 use ethstore::dir::{KeyDirectory};
-use ethstore::ethkey::{Address, Message, Public, Secret, Random, Generator};
-use ethjson::misc::AccountMeta;
-pub use ethstore::ethkey::Signature;
+use ethstore::ethkey::{Address as SSAddress, Message as SSMessage, Secret as SSSecret, Random, Generator};
+
 
 /// Type of unlock.
 #[derive(Clone)]
@@ -36,7 +34,7 @@ enum Unlock {
 	/// Use with caution.
 	Perm,
 	/// Account unlocked with a timeout
-	Timed(Instant),
+	Timed((Instant, u32)),
 }
 
 /// Data associated with account.
@@ -70,9 +68,51 @@ impl From<SSError> for Error {
 	}
 }
 
+macro_rules! impl_bridge_type {
+	($name: ident, $size: expr, $core: ident, $store: ident) => {
+		/// Primitive
+		pub struct $name([u8; $size]);
+
+		impl From<[u8; $size]> for $name {
+			fn from(s: [u8; $size]) -> Self {
+				$name(s)
+			}
+		}
+
+		impl From<$core> for $name {
+			fn from(s: $core) -> Self {
+				$name(s.0)
+			}
+		}
+
+		impl From<$store> for $name {
+			fn from(s: $store) -> Self {
+				$name(s.into())
+			}
+		}
+
+		impl Into<$core> for $name {
+			fn into(self) -> $core {
+				$core(self.0)
+			}
+		}
+
+		impl Into<$store> for $name {
+			fn into(self) -> $store {
+				$store::from(self.0)
+			}
+		}
+	}
+}
+
+impl_bridge_type!(Secret, 32, H256, SSSecret);
+impl_bridge_type!(Message, 32, H256, SSMessage);
+impl_bridge_type!(Address, 20, H160, SSAddress);
+
+
 #[derive(Default)]
 struct NullDir {
-	accounts: RwLock<HashMap<Address, SafeAccount>>,
+	accounts: RwLock<HashMap<SSAddress, SafeAccount>>,
 }
 
 impl KeyDirectory for NullDir {
@@ -85,80 +125,38 @@ impl KeyDirectory for NullDir {
 		Ok(account)
 	}
 
-	fn remove(&self, address: &Address) -> Result<(), SSError> {
+	fn remove(&self, address: &SSAddress) -> Result<(), SSError> {
 		self.accounts.write().remove(address);
 		Ok(())
 	}
 }
 
-/// Disk-backed map from Address to String. Uses JSON.
-struct AddressBook {
-	path: PathBuf,
-	cache: HashMap<Address, AccountMeta>,
-}
-
-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(),
-		};
-		r.revert();
-		r
-	}
-
-	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) {
-		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) {
-		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>>,
+	unlocked: Mutex<HashMap<SSAddress, AccountData>>,
 	sstore: Box<SecretStore>,
-	address_book: Mutex<AddressBook>,
+}
+
+/// Collected account metadata
+#[derive(Clone, Debug, PartialEq)]
+pub struct AccountMeta {
+	/// The name of the account.
+	pub name: String,
+	/// The rest of the metadata of the account.
+	pub meta: String,
+	/// The 128-bit UUID of the account, if it has one (brain-wallets don't).
+	pub uuid: Option<String>,
+}
+
+impl Default for AccountMeta {
+	fn default() -> Self {
+		AccountMeta {
+			name: String::new(),
+			meta: "{}".to_owned(),
+			uuid: None,
+		}
+	}
 }
 
 impl AccountProvider {
@@ -166,7 +164,6 @@ 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())),
 			sstore: sstore,
 		}
 	}
@@ -175,77 +172,43 @@ impl AccountProvider {
 	pub fn transient_provider() -> Self {
 		AccountProvider {
 			unlocked: Mutex::new(HashMap::new()),
-			address_book: Mutex::new(AddressBook::new(Default::default())),
-			sstore: Box::new(EthStore::open(Box::new(NullDir::default()))
-				.expect("NullDir load always succeeds; qed"))
+			sstore: Box::new(EthStore::open(Box::new(NullDir::default())).unwrap())
 		}
 	}
 
 	/// Creates new random account.
-	pub fn new_account(&self, password: &str) -> Result<Address, Error> {
-		self.new_account_and_public(password).map(|d| d.0)
-	}
-
-	/// Creates new random account and returns address and public key
-	pub fn new_account_and_public(&self, password: &str) -> Result<(Address, Public), Error> {
-		let acc = Random.generate().expect("secp context has generation capabilities; qed");
-		let public = acc.public().clone();
-		let secret = acc.secret().clone();
+	pub fn new_account(&self, password: &str) -> Result<H160, Error> {
+		let secret = Random.generate().unwrap().secret().clone();
 		let address = try!(self.sstore.insert_account(secret, password));
-		Ok((address, public))
+		Ok(Address::from(address).into())
 	}
 
 	/// Inserts new account into underlying store.
 	/// Does not unlock account!
-	pub fn insert_account(&self, secret: Secret, password: &str) -> Result<Address, Error> {
-		let address = try!(self.sstore.insert_account(secret, password));
-		Ok(address)
-	}
-
-	/// Import a new presale wallet.
-	pub fn import_presale(&self, presale_json: &[u8], password: &str) -> Result<Address, Error> {
-		let address = try!(self.sstore.import_presale(presale_json, password));
-		Ok(Address::from(address).into())
-	}
-
-	/// Import a new presale wallet.
-	pub fn import_wallet(&self, json: &[u8], password: &str) -> Result<Address, Error> {
-		let address = try!(self.sstore.import_wallet(json, password));
+	pub fn insert_account<S>(&self, secret: S, password: &str) -> Result<H160, Error> where Secret: From<S> {
+		let s = Secret::from(secret);
+		let address = try!(self.sstore.insert_account(s.into(), password));
 		Ok(Address::from(address).into())
 	}
 
 	/// Returns addresses of all accounts.
-	pub fn accounts(&self) -> Result<Vec<Address>, Error> {
-		let accounts = try!(self.sstore.accounts());
+	pub fn accounts(&self) -> Result<Vec<H160>, Error> {
+		let accounts = try!(self.sstore.accounts()).into_iter().map(|a| H160(a.into())).collect();
 		Ok(accounts)
 	}
 
-	/// Returns each address along with metadata.
-	pub fn addresses_info(&self) -> Result<HashMap<Address, AccountMeta>, Error> {
-		Ok(self.address_book.lock().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))
-	}
-
-	/// 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))
-	}
-
 	/// Returns each account along with name and meta.
-	pub fn accounts_info(&self) -> Result<HashMap<Address, AccountMeta>, Error> {
-		let r: HashMap<Address, AccountMeta> = try!(self.sstore.accounts())
+	pub fn accounts_info(&self) -> Result<HashMap<H160, AccountMeta>, Error> {
+		let r: HashMap<H160, AccountMeta> = try!(self.sstore.accounts())
 			.into_iter()
-			.map(|a| (a.clone(), self.account_meta(a).ok().unwrap_or_default()))
+			.map(|a| (H160(a.clone().into()), self.account_meta(a).unwrap_or_else(|_| Default::default())))
 			.collect();
 		Ok(r)
 	}
 
 	/// Returns each account along with name and meta.
-	pub fn account_meta(&self, account: Address) -> Result<AccountMeta, Error> {
+	pub fn account_meta<A>(&self, account: A) -> Result<AccountMeta, Error> where Address: From<A> {
+		let account = Address::from(account).into();
 		Ok(AccountMeta {
 			name: try!(self.sstore.name(&account)),
 			meta: try!(self.sstore.meta(&account)),
@@ -254,33 +217,23 @@ impl AccountProvider {
 	}
 
 	/// Returns each account along with name and meta.
-	pub fn set_account_name(&self, account: Address, name: String) -> Result<(), Error> {
+	pub fn set_account_name<A>(&self, account: A, name: String) -> Result<(), Error> where Address: From<A> {
+		let account = Address::from(account).into();
 		try!(self.sstore.set_name(&account, name));
 		Ok(())
 	}
 
 	/// Returns each account along with name and meta.
-	pub fn set_account_meta(&self, account: Address, meta: String) -> Result<(), Error> {
+	pub fn set_account_meta<A>(&self, account: A, meta: String) -> Result<(), Error> where Address: From<A> {
+		let account = Address::from(account).into();
 		try!(self.sstore.set_meta(&account, meta));
 		Ok(())
 	}
 
-	/// Returns `true` if the password for `account` is `password`. `false` if not.
-	pub fn test_password(&self, account: &Address, password: String) -> Result<bool, Error> {
-		match self.sstore.sign(account, &password, &Default::default()) {
-			Ok(_) => Ok(true),
-			Err(SSError::InvalidPassword) => Ok(false),
-			Err(e) => Err(Error::SStore(e)),
-		}
-	}
-
-	/// Changes the password of `account` from `password` to `new_password`. Fails if incorrect `password` given.
-	pub fn change_password(&self, account: &Address, password: String, new_password: String) -> Result<(), Error> {
-		self.sstore.change_password(account, &password, &new_password).map_err(Error::SStore)
-	}
-
 	/// Helper method used for unlocking accounts.
-	fn unlock_account(&self, account: Address, password: String, unlock: Unlock) -> Result<(), Error> {
+	fn unlock_account<A>(&self, account: A, password: String, unlock: Unlock) -> Result<(), Error> where Address: From<A> {
+		let a = Address::from(account);
+		let account = a.into();
 		// verify password by signing dump message
 		// result may be discarded
 		let _ = try!(self.sstore.sign(&account, &password, &Default::default()));
@@ -302,84 +255,66 @@ impl AccountProvider {
 		Ok(())
 	}
 
-	fn password(&self, account: &Address) -> Result<String, Error> {
-		let mut unlocked = self.unlocked.lock();
-		let data = try!(unlocked.get(account).ok_or(Error::NotUnlocked)).clone();
-		if let Unlock::Temp = data.unlock {
-			unlocked.remove(account).expect("data exists: so key must exist: qed");
-		}
-		if let Unlock::Timed(ref end) = data.unlock {
-			if Instant::now() > *end {
-				unlocked.remove(account).expect("data exists: so key must exist: qed");
-				return Err(Error::NotUnlocked);
-			}
-		}
-		Ok(data.password.clone())
-	}
-
 	/// Unlocks account permanently.
-	pub fn unlock_account_permanently(&self, account: Address, password: String) -> Result<(), Error> {
+	pub fn unlock_account_permanently<A>(&self, account: A, password: String) -> Result<(), Error> where Address: From<A> {
 		self.unlock_account(account, password, Unlock::Perm)
 	}
 
 	/// Unlocks account temporarily (for one signing).
-	pub fn unlock_account_temporarily(&self, account: Address, password: String) -> Result<(), Error> {
+	pub fn unlock_account_temporarily<A>(&self, account: A, password: String) -> Result<(), Error> where Address: From<A> {
 		self.unlock_account(account, password, Unlock::Temp)
 	}
 
 	/// Unlocks account temporarily with a timeout.
-	pub fn unlock_account_timed(&self, account: Address, password: String, duration_ms: u32) -> Result<(), Error> {
-		self.unlock_account(account, password, Unlock::Timed(Instant::now() + Duration::from_millis(duration_ms as u64)))
+	pub fn unlock_account_timed<A>(&self, account: A, password: String, duration_ms: u32) -> Result<(), Error> where Address: From<A> {
+		self.unlock_account(account, password, Unlock::Timed((Instant::now(), duration_ms)))
 	}
 
 	/// Checks if given account is unlocked
-	pub fn is_unlocked(&self, account: Address) -> bool {
+	pub fn is_unlocked<A>(&self, account: A) -> bool where Address: From<A> {
+		let account = Address::from(account).into();
 		let unlocked = self.unlocked.lock();
 		unlocked.get(&account).is_some()
 	}
 
-	/// Signs the message. If password is not provided the account must be unlocked.
-	pub fn sign(&self, account: Address, password: Option<String>, message: Message) -> Result<Signature, Error> {
-		let password = try!(password.map(Ok).unwrap_or_else(|| self.password(&account)));
-		Ok(try!(self.sstore.sign(&account, &password, &message)))
+	/// Signs the message. Account must be unlocked.
+	pub fn sign<A, M>(&self, account: A, message: M) -> Result<H520, Error> where Address: From<A>, Message: From<M> {
+		let account = Address::from(account).into();
+		let message = Message::from(message).into();
+
+		let data = {
+			let mut unlocked = self.unlocked.lock();
+			let data = try!(unlocked.get(&account).ok_or(Error::NotUnlocked)).clone();
+			if let Unlock::Temp = data.unlock {
+				unlocked.remove(&account).expect("data exists: so key must exist: qed");
+			}
+			if let Unlock::Timed((ref start, ref duration)) = data.unlock {
+				if start.elapsed() > Duration::from_millis(*duration as u64) {
+					unlocked.remove(&account).expect("data exists: so key must exist: qed");
+					return Err(Error::NotUnlocked);
+				}
+			}
+			data
+		};
+
+		let signature = try!(self.sstore.sign(&account, &data.password, &message));
+		Ok(H520(signature.into()))
 	}
 
-	/// Decrypts a message. If password is not provided the account must be unlocked.
-	pub fn decrypt(&self, account: Address, password: Option<String>, shared_mac: &[u8], message: &[u8]) -> Result<Vec<u8>, Error> {
-		let password = try!(password.map(Ok).unwrap_or_else(|| self.password(&account)));
-		Ok(try!(self.sstore.decrypt(&account, &password, shared_mac, message)))
-	}
-
-	/// Returns the underlying `SecretStore` reference if one exists.
-	pub fn list_geth_accounts(&self, testnet: bool) -> Vec<Address> {
-		self.sstore.list_geth_accounts(testnet).into_iter().map(|a| Address::from(a).into()).collect()
-	}
-
-	/// Returns the underlying `SecretStore` reference if one exists.
-	pub fn import_geth_accounts(&self, desired: Vec<Address>, testnet: bool) -> Result<Vec<Address>, Error> {
-		self.sstore.import_geth_accounts(desired, testnet).map_err(Into::into)
+	/// Unlocks an account, signs the message, and locks it again.
+	pub fn sign_with_password<A, M>(&self, account: A, password: String, message: M) -> Result<H520, Error> where Address: From<A>, Message: From<M> {
+		let account = Address::from(account).into();
+		let message = Message::from(message).into();
+		let signature = try!(self.sstore.sign(&account, &password, &message));
+		Ok(H520(signature.into()))
 	}
 }
 
 #[cfg(test)]
 mod tests {
-	use super::{AccountProvider, AddressBook, Unlock};
-	use std::collections::HashMap;
-	use std::time::Instant;
-	use ethjson::misc::AccountMeta;
+	use super::AccountProvider;
 	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}]);
-	}
+	use std::time::Duration;
 
 	#[test]
 	fn unlock_account_temp() {
@@ -388,8 +323,8 @@ mod tests {
 		assert!(ap.insert_account(kp.secret().clone(), "test").is_ok());
 		assert!(ap.unlock_account_temporarily(kp.address(), "test1".into()).is_err());
 		assert!(ap.unlock_account_temporarily(kp.address(), "test".into()).is_ok());
-		assert!(ap.sign(kp.address(), None, Default::default()).is_ok());
-		assert!(ap.sign(kp.address(), None, Default::default()).is_err());
+		assert!(ap.sign(kp.address(), [0u8; 32]).is_ok());
+		assert!(ap.sign(kp.address(), [0u8; 32]).is_err());
 	}
 
 	#[test]
@@ -399,11 +334,11 @@ mod tests {
 		assert!(ap.insert_account(kp.secret().clone(), "test").is_ok());
 		assert!(ap.unlock_account_permanently(kp.address(), "test1".into()).is_err());
 		assert!(ap.unlock_account_permanently(kp.address(), "test".into()).is_ok());
-		assert!(ap.sign(kp.address(), None, Default::default()).is_ok());
-		assert!(ap.sign(kp.address(), None, Default::default()).is_ok());
+		assert!(ap.sign(kp.address(), [0u8; 32]).is_ok());
+		assert!(ap.sign(kp.address(), [0u8; 32]).is_ok());
 		assert!(ap.unlock_account_temporarily(kp.address(), "test".into()).is_ok());
-		assert!(ap.sign(kp.address(), None, Default::default()).is_ok());
-		assert!(ap.sign(kp.address(), None, Default::default()).is_ok());
+		assert!(ap.sign(kp.address(), [0u8; 32]).is_ok());
+		assert!(ap.sign(kp.address(), [0u8; 32]).is_ok());
 	}
 
 	#[test]
@@ -411,10 +346,10 @@ mod tests {
 		let kp = Random.generate().unwrap();
 		let ap = AccountProvider::transient_provider();
 		assert!(ap.insert_account(kp.secret().clone(), "test").is_ok());
-		assert!(ap.unlock_account_timed(kp.address(), "test1".into(), 60000).is_err());
-		assert!(ap.unlock_account_timed(kp.address(), "test".into(), 60000).is_ok());
-		assert!(ap.sign(kp.address(), None, Default::default()).is_ok());
-		ap.unlocked.lock().get_mut(&kp.address()).unwrap().unlock = Unlock::Timed(Instant::now());
-		assert!(ap.sign(kp.address(), None, Default::default()).is_err());
+		assert!(ap.unlock_account_timed(kp.address(), "test1".into(), 2000).is_err());
+		assert!(ap.unlock_account_timed(kp.address(), "test".into(), 2000).is_ok());
+		assert!(ap.sign(kp.address(), [0u8; 32]).is_ok());
+		::std::thread::sleep(Duration::from_millis(2000));
+		assert!(ap.sign(kp.address(), [0u8; 32]).is_err());
 	}
 }

ethcore/src/action_params.rs

@@ -15,14 +15,10 @@
 // along with Parity.  If not, see <http://www.gnu.org/licenses/>.
 
 //! Evm input params.
-use util::{Address, Bytes, Uint, U256};
-use util::hash::{H256, FixedHash};
-use util::sha3::{Hashable, SHA3_EMPTY};
+use common::*;
 use ethjson;
 use types::executed::CallType;
 
-use std::sync::Arc;
-
 /// Transaction value
 #[derive(Clone, Debug)]
 pub enum ActionValue {
@@ -47,8 +43,6 @@ impl ActionValue {
 pub struct ActionParams {
 	/// Address of currently executed code.
 	pub code_address: Address,
-	/// Hash of currently executed code.
-	pub code_hash: H256,
 	/// Receive address. Usually equal to code_address,
 	/// except when called using CALLCODE.
 	pub address: Address,
@@ -63,7 +57,7 @@ pub struct ActionParams {
 	/// Transaction value.
 	pub value: ActionValue,
 	/// Code being executed.
-	pub code: Option<Arc<Bytes>>,
+	pub code: Option<Bytes>,
 	/// Input data.
 	pub data: Option<Bytes>,
 	/// Type of call
@@ -76,7 +70,6 @@ impl Default for ActionParams {
 	fn default() -> ActionParams {
 		ActionParams {
 			code_address: Address::new(),
-			code_hash: SHA3_EMPTY,
 			address: Address::new(),
 			sender: Address::new(),
 			origin: Address::new(),
@@ -95,11 +88,10 @@ impl From<ethjson::vm::Transaction> for ActionParams {
 		let address: Address = t.address.into();
 		ActionParams {
 			code_address: Address::new(),
-			code_hash: (&*t.code).sha3(),
 			address: address,
 			sender: t.sender.into(),
 			origin: t.origin.into(),
-			code: Some(Arc::new(t.code.into())),
+			code: Some(t.code.into()),
 			data: Some(t.data.into()),
 			gas: t.gas.into(),
 			gas_price: t.gas_price.into(),

ethcore/src/basic_types.rs

@@ -16,7 +16,7 @@
 
 //! Ethcore basic typenames.
 
-use util::hash::H2048;
+use util::*;
 
 /// Type for a 2048-bit log-bloom, as used by our blocks.
 pub type LogBloom = H2048;

ethcore/src/block.rs

@@ -16,26 +16,13 @@
 
 //! Blockchain block.
 
-use std::sync::Arc;
-use std::collections::HashSet;
-
-use rlp::{UntrustedRlp, RlpStream, Encodable, Decodable, Decoder, DecoderError, View, Stream};
-use util::{Bytes, Address, Uint, FixedHash, Hashable, U256, H256, ordered_trie_root, SHA3_NULL_RLP};
-use util::error::{Mismatch, OutOfBounds};
-
-use basic_types::{LogBloom, Seal};
-use env_info::{EnvInfo, LastHashes};
+use common::*;
 use engines::Engine;
-use error::{Error, BlockError, TransactionError};
-use factory::Factories;
-use header::Header;
-use receipt::Receipt;
-use state::State;
+use state::*;
 use state_db::StateDB;
-use trace::FlatTrace;
-use transaction::SignedTransaction;
 use verification::PreverifiedBlock;
-use views::BlockView;
+use trace::FlatTrace;
+use evm::Factory as EvmFactory;
 
 /// A block, encoded as it is on the block chain.
 #[derive(Default, Debug, Clone, PartialEq)]
@@ -82,7 +69,7 @@ impl Decodable for Block {
 	}
 }
 
-/// An internal type for a block's common elements.
+/// Internal type for a block's common elements.
 #[derive(Clone)]
 pub struct ExecutedBlock {
 	base: Block,
@@ -206,6 +193,7 @@ impl IsBlock for ExecutedBlock {
 pub struct OpenBlock<'x> {
 	block: ExecutedBlock,
 	engine: &'x Engine,
+	vm_factory: &'x EvmFactory,
 	last_hashes: Arc<LastHashes>,
 }
 
@@ -243,7 +231,8 @@ impl<'x> OpenBlock<'x> {
 	/// Create a new `OpenBlock` ready for transaction pushing.
 	pub fn new(
 		engine: &'x Engine,
-		factories: Factories,
+		vm_factory: &'x EvmFactory,
+		trie_factory: TrieFactory,
 		tracing: bool,
 		db: StateDB,
 		parent: &Header,
@@ -252,18 +241,19 @@ impl<'x> OpenBlock<'x> {
 		gas_range_target: (U256, U256),
 		extra_data: Bytes,
 	) -> Result<Self, Error> {
-		let state = try!(State::from_existing(db, parent.state_root().clone(), engine.account_start_nonce(), factories));
+		let state = try!(State::from_existing(db, parent.state_root().clone(), engine.account_start_nonce(), trie_factory));
 		let mut r = OpenBlock {
 			block: ExecutedBlock::new(state, tracing),
 			engine: engine,
+			vm_factory: vm_factory,
 			last_hashes: last_hashes,
 		};
 
-		r.block.base.header.set_parent_hash(parent.hash());
-		r.block.base.header.set_number(parent.number() + 1);
-		r.block.base.header.set_author(author);
+		r.block.base.header.parent_hash = parent.hash();
+		r.block.base.header.number = parent.number + 1;
+		r.block.base.header.author = author;
 		r.block.base.header.set_timestamp_now(parent.timestamp());
-		r.block.base.header.set_extra_data(extra_data);
+		r.block.base.header.extra_data = extra_data;
 		r.block.base.header.note_dirty();
 
 		engine.populate_from_parent(&mut r.block.base.header, parent, gas_range_target.0, gas_range_target.1);
@@ -323,13 +313,13 @@ impl<'x> OpenBlock<'x> {
 	pub fn env_info(&self) -> EnvInfo {
 		// TODO: memoise.
 		EnvInfo {
-			number: self.block.base.header.number(),
-			author: self.block.base.header.author().clone(),
-			timestamp: self.block.base.header.timestamp(),
-			difficulty: self.block.base.header.difficulty().clone(),
+			number: self.block.base.header.number,
+			author: self.block.base.header.author.clone(),
+			timestamp: self.block.base.header.timestamp,
+			difficulty: self.block.base.header.difficulty.clone(),
 			last_hashes: self.last_hashes.clone(),
 			gas_used: self.block.receipts.last().map_or(U256::zero(), |r| r.gas_used),
-			gas_limit: self.block.base.header.gas_limit().clone(),
+			gas_limit: self.block.base.header.gas_limit.clone(),
 		}
 	}
 
@@ -343,33 +333,34 @@ impl<'x> OpenBlock<'x> {
 
 		let env_info = self.env_info();
 //		info!("env_info says gas_used={}", env_info.gas_used);
-		match self.block.state.apply(&env_info, self.engine, &t, self.block.traces.is_some()) {
+		match self.block.state.apply(&env_info, self.engine, self.vm_factory, &t, self.block.traces.is_some()) {
 			Ok(outcome) => {
 				self.block.transactions_set.insert(h.unwrap_or_else(||t.hash()));
 				self.block.base.transactions.push(t);
 				let t = outcome.trace;
 				self.block.traces.as_mut().map(|traces| traces.push(t));
 				self.block.receipts.push(outcome.receipt);
-				Ok(self.block.receipts.last().expect("receipt just pushed; qed"))
+				Ok(self.block.receipts.last().unwrap())
 			}
 			Err(x) => Err(From::from(x))
 		}
 	}
 
-	/// Turn this into a `ClosedBlock`.
+	/// Turn this into a `ClosedBlock`. A `BlockChain` must be provided in order to figure out the uncles.
 	pub fn close(self) -> ClosedBlock {
 		let mut s = self;
 
 		let unclosed_state = s.block.state.clone();
 
 		s.engine.on_close_block(&mut s.block);
-		s.block.base.header.set_transactions_root(ordered_trie_root(s.block.base.transactions.iter().map(|e| e.rlp_bytes().to_vec())));
+		s.block.base.header.transactions_root = ordered_trie_root(s.block.base.transactions.iter().map(|ref e| e.rlp_bytes().to_vec()).collect());
 		let uncle_bytes = s.block.base.uncles.iter().fold(RlpStream::new_list(s.block.base.uncles.len()), |mut s, u| {s.append_raw(&u.rlp(Seal::With), 1); s} ).out();
-		s.block.base.header.set_uncles_hash(uncle_bytes.sha3());
-		s.block.base.header.set_state_root(s.block.state.root().clone());
-		s.block.base.header.set_receipts_root(ordered_trie_root(s.block.receipts.iter().map(|r| r.rlp_bytes().to_vec())));
-		s.block.base.header.set_log_bloom(s.block.receipts.iter().fold(LogBloom::zero(), |mut b, r| {b = &b | &r.log_bloom; b})); //TODO: use |= operator
-		s.block.base.header.set_gas_used(s.block.receipts.last().map_or(U256::zero(), |r| r.gas_used));
+		s.block.base.header.uncles_hash = uncle_bytes.sha3();
+		s.block.base.header.state_root = s.block.state.root().clone();
+		s.block.base.header.receipts_root = ordered_trie_root(s.block.receipts.iter().map(|ref r| r.rlp_bytes().to_vec()).collect());
+		s.block.base.header.log_bloom = s.block.receipts.iter().fold(LogBloom::zero(), |mut b, r| {b = &b | &r.log_bloom; b}); //TODO: use |= operator
+		s.block.base.header.gas_used = s.block.receipts.last().map_or(U256::zero(), |r| r.gas_used);
+		s.block.base.header.note_dirty();
 
 		ClosedBlock {
 			block: s.block,
@@ -379,35 +370,31 @@ impl<'x> OpenBlock<'x> {
 		}
 	}
 
-	/// Turn this into a `LockedBlock`.
+	/// Turn this into a `LockedBlock`. A BlockChain must be provided in order to figure out the uncles.
 	pub fn close_and_lock(self) -> LockedBlock {
 		let mut s = self;
 
 		s.engine.on_close_block(&mut s.block);
-		if s.block.base.header.transactions_root().is_zero() || s.block.base.header.transactions_root() == &SHA3_NULL_RLP {
-			s.block.base.header.set_transactions_root(ordered_trie_root(s.block.base.transactions.iter().map(|e| e.rlp_bytes().to_vec())));
+		if s.block.base.header.transactions_root.is_zero() || s.block.base.header.transactions_root == SHA3_NULL_RLP {
+			s.block.base.header.transactions_root = ordered_trie_root(s.block.base.transactions.iter().map(|ref e| e.rlp_bytes().to_vec()).collect());
 		}
 		let uncle_bytes = s.block.base.uncles.iter().fold(RlpStream::new_list(s.block.base.uncles.len()), |mut s, u| {s.append_raw(&u.rlp(Seal::With), 1); s} ).out();
-		if s.block.base.header.uncles_hash().is_zero() {
-			s.block.base.header.set_uncles_hash(uncle_bytes.sha3());
+		if s.block.base.header.uncles_hash.is_zero() {
+			s.block.base.header.uncles_hash = uncle_bytes.sha3();
 		}
-		if s.block.base.header.receipts_root().is_zero() || s.block.base.header.receipts_root() == &SHA3_NULL_RLP {
-			s.block.base.header.set_receipts_root(ordered_trie_root(s.block.receipts.iter().map(|r| r.rlp_bytes().to_vec())));
+		if s.block.base.header.receipts_root.is_zero() || s.block.base.header.receipts_root == SHA3_NULL_RLP {
+			s.block.base.header.receipts_root = ordered_trie_root(s.block.receipts.iter().map(|ref r| r.rlp_bytes().to_vec()).collect());
 		}
-
-		s.block.base.header.set_state_root(s.block.state.root().clone());
-		s.block.base.header.set_log_bloom(s.block.receipts.iter().fold(LogBloom::zero(), |mut b, r| {b = &b | &r.log_bloom; b})); //TODO: use |= operator
-		s.block.base.header.set_gas_used(s.block.receipts.last().map_or(U256::zero(), |r| r.gas_used));
+		s.block.base.header.state_root = s.block.state.root().clone();
+		s.block.base.header.log_bloom = s.block.receipts.iter().fold(LogBloom::zero(), |mut b, r| {b = &b | &r.log_bloom; b}); //TODO: use |= operator
+		s.block.base.header.gas_used = s.block.receipts.last().map_or(U256::zero(), |r| r.gas_used);
+		s.block.base.header.note_dirty();
 
 		LockedBlock {
 			block: s.block,
 			uncle_bytes: uncle_bytes,
 		}
 	}
-
-	#[cfg(test)]
-	/// Return mutable block reference. To be used in tests only.
-	pub fn block_mut (&mut self) -> &mut ExecutedBlock { &mut self.block }
 }
 
 impl<'x> IsBlock for OpenBlock<'x> {
@@ -435,13 +422,14 @@ impl ClosedBlock {
 	}
 
 	/// Given an engine reference, reopen the `ClosedBlock` into an `OpenBlock`.
-	pub fn reopen(self, engine: &Engine) -> OpenBlock {
+	pub fn reopen<'a>(self, engine: &'a Engine, vm_factory: &'a EvmFactory) -> OpenBlock<'a> {
 		// revert rewards (i.e. set state back at last transaction's state).
 		let mut block = self.block;
 		block.state = self.unclosed_state;
 		OpenBlock {
 			block: block,
 			engine: engine,
+			vm_factory: vm_factory,
 			last_hashes: self.last_hashes,
 		}
 	}
@@ -466,11 +454,11 @@ impl LockedBlock {
 	/// Provide a valid seal in order to turn this into a `SealedBlock`.
 	/// This does check the validity of `seal` with the engine.
 	/// Returns the `ClosedBlock` back again if the seal is no good.
-	pub fn try_seal(self, engine: &Engine, seal: Vec<Bytes>) -> Result<SealedBlock, (Error, LockedBlock)> {
+	pub fn try_seal(self, engine: &Engine, seal: Vec<Bytes>) -> Result<SealedBlock, LockedBlock> {
 		let mut s = self;
 		s.block.base.header.set_seal(seal);
 		match engine.verify_block_seal(&s.block.base.header) {
-			Err(e) => Err((e, s)),
+			Err(_) => Err(s),
 			_ => Ok(SealedBlock { block: s.block, uncle_bytes: s.uncle_bytes }),
 		}
 	}
@@ -516,16 +504,17 @@ pub fn enact(
 	db: StateDB,
 	parent: &Header,
 	last_hashes: Arc<LastHashes>,
-	factories: Factories,
+	vm_factory: &EvmFactory,
+	trie_factory: TrieFactory,
 ) -> Result<LockedBlock, Error> {
 	{
 		if ::log::max_log_level() >= ::log::LogLevel::Trace {
-			let s = try!(State::from_existing(db.boxed_clone(), parent.state_root().clone(), engine.account_start_nonce(), factories.clone()));
+			let s = try!(State::from_existing(db.boxed_clone(), parent.state_root().clone(), engine.account_start_nonce(), trie_factory.clone()));
 			trace!(target: "enact", "num={}, root={}, author={}, author_balance={}\n", header.number(), s.root(), header.author(), s.balance(&header.author()));
 		}
 	}
 
-	let mut b = try!(OpenBlock::new(engine, factories, tracing, db, parent, last_hashes, Address::new(), (3141562.into(), 31415620.into()), vec![]));
+	let mut b = try!(OpenBlock::new(engine, vm_factory, trie_factory, tracing, db, parent, last_hashes, Address::new(), (3141562.into(), 31415620.into()), vec![]));
 	b.set_difficulty(*header.difficulty());
 	b.set_gas_limit(*header.gas_limit());
 	b.set_timestamp(header.timestamp());
@@ -534,38 +523,26 @@ pub fn enact(
 	b.set_uncles_hash(header.uncles_hash().clone());
 	b.set_transactions_root(header.transactions_root().clone());
 	b.set_receipts_root(header.receipts_root().clone());
-
-	try!(push_transactions(&mut b, transactions));
-	for u in uncles {
-		try!(b.push_uncle(u.clone()));
-	}
+	for t in transactions { try!(b.push_transaction(t.clone(), None)); }
+	for u in uncles { try!(b.push_uncle(u.clone())); }
 	Ok(b.close_and_lock())
 }
 
-#[inline]
-#[cfg(not(feature = "slow-blocks"))]
-fn push_transactions(block: &mut OpenBlock, transactions: &[SignedTransaction]) -> Result<(), Error> {
-	for t in transactions {
-		try!(block.push_transaction(t.clone(), None));
-	}
-	Ok(())
-}
-
-#[cfg(feature = "slow-blocks")]
-fn push_transactions(block: &mut OpenBlock, transactions: &[SignedTransaction]) -> Result<(), Error> {
-	use std::time;
-
-	let slow_tx = option_env!("SLOW_TX_DURATION").and_then(|v| v.parse().ok()).unwrap_or(100);
-	for t in transactions {
-		let hash = t.hash();
-		let start = time::Instant::now();
-		try!(block.push_transaction(t.clone(), None));
-		let took = start.elapsed();
-		if took > time::Duration::from_millis(slow_tx) {
-			warn!("Heavy transaction in block {:?}: {:?}", block.header().number(), hash);
-		}
-	}
-	Ok(())
+/// Enact the block given by `block_bytes` using `engine` on the database `db` with given `parent` block header
+#[cfg_attr(feature="dev", allow(too_many_arguments))]
+pub fn enact_bytes(
+	block_bytes: &[u8],
+	engine: &Engine,
+	tracing: bool,
+	db: StateDB,
+	parent: &Header,
+	last_hashes: Arc<LastHashes>,
+	vm_factory: &EvmFactory,
+	trie_factory: TrieFactory,
+) -> Result<LockedBlock, Error> {
+	let block = BlockView::new(block_bytes);
+	let header = block.header();
+	enact(&header, &block.transactions(), &block.uncles(), engine, tracing, db, parent, last_hashes, vm_factory, trie_factory)
 }
 
 /// Enact the block given by `block_bytes` using `engine` on the database `db` with given `parent` block header
@@ -577,58 +554,34 @@ pub fn enact_verified(
 	db: StateDB,
 	parent: &Header,
 	last_hashes: Arc<LastHashes>,
-	factories: Factories,
+	vm_factory: &EvmFactory,
+	trie_factory: TrieFactory,
 ) -> Result<LockedBlock, Error> {
 	let view = BlockView::new(&block.bytes);
-	enact(&block.header, &block.transactions, &view.uncles(), engine, tracing, db, parent, last_hashes, factories)
+	enact(&block.header, &block.transactions, &view.uncles(), engine, tracing, db, parent, last_hashes, vm_factory, trie_factory)
+}
+
+/// Enact the block given by `block_bytes` using `engine` on the database `db` with given `parent` block header. Seal the block aferwards
+#[cfg_attr(feature="dev", allow(too_many_arguments))]
+pub fn enact_and_seal(
+	block_bytes: &[u8],
+	engine: &Engine,
+	tracing: bool,
+	db: StateDB,
+	parent: &Header,
+	last_hashes: Arc<LastHashes>,
+	vm_factory: &EvmFactory,
+	trie_factory: TrieFactory,
+) -> Result<SealedBlock, Error> {
+	let header = BlockView::new(block_bytes).header_view();
+	Ok(try!(try!(enact_bytes(block_bytes, engine, tracing, db, parent, last_hashes, vm_factory, trie_factory)).seal(engine, header.seal())))
 }
 
 #[cfg(test)]
 mod tests {
 	use tests::helpers::*;
 	use super::*;
-	use engines::Engine;
-	use env_info::LastHashes;
-	use error::Error;
-	use header::Header;
-	use factory::Factories;
-	use state_db::StateDB;
-	use views::BlockView;
-	use util::Address;
-	use util::hash::FixedHash;
-
-	use std::sync::Arc;
-
-	/// Enact the block given by `block_bytes` using `engine` on the database `db` with given `parent` block header
-	#[cfg_attr(feature="dev", allow(too_many_arguments))]
-	fn enact_bytes(
-		block_bytes: &[u8],
-		engine: &Engine,
-		tracing: bool,
-		db: StateDB,
-		parent: &Header,
-		last_hashes: Arc<LastHashes>,
-		factories: Factories,
-	) -> Result<LockedBlock, Error> {
-		let block = BlockView::new(block_bytes);
-		let header = block.header();
-		enact(&header, &block.transactions(), &block.uncles(), engine, tracing, db, parent, last_hashes, factories)
-	}
-
-	/// Enact the block given by `block_bytes` using `engine` on the database `db` with given `parent` block header. Seal the block aferwards
-	#[cfg_attr(feature="dev", allow(too_many_arguments))]
-	fn enact_and_seal(
-		block_bytes: &[u8],
-		engine: &Engine,
-		tracing: bool,
-		db: StateDB,
-		parent: &Header,
-		last_hashes: Arc<LastHashes>,
-		factories: Factories,
-	) -> Result<SealedBlock, Error> {
-		let header = BlockView::new(block_bytes).header_view();
-		Ok(try!(try!(enact_bytes(block_bytes, engine, tracing, db, parent, last_hashes, factories)).seal(engine, header.seal())))
-	}
+	use common::*;
 
 	#[test]
 	fn open_block() {
@@ -639,7 +592,8 @@ mod tests {
 		let mut db = db_result.take();
 		spec.ensure_db_good(&mut db).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 vm_factory = Default::default();
+		let b = OpenBlock::new(&*spec.engine, &vm_factory, Default::default(), false, db, &genesis_header, last_hashes, Address::zero(), (3141562.into(), 31415620.into()), vec![]).unwrap();
 		let b = b.close_and_lock();
 		let _ = b.seal(&*spec.engine, vec![]);
 	}
@@ -654,8 +608,9 @@ mod tests {
 		let mut db_result = get_temp_state_db();
 		let mut db = db_result.take();
 		spec.ensure_db_good(&mut db).unwrap();
+		let vm_factory = Default::default();
 		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()
+		let b = OpenBlock::new(engine, &vm_factory, Default::default(), false, db, &genesis_header, last_hashes.clone(), Address::zero(), (3141562.into(), 31415620.into()), vec![]).unwrap()
 			.close_and_lock().seal(engine, vec![]).unwrap();
 		let orig_bytes = b.rlp_bytes();
 		let orig_db = b.drain();
@@ -663,7 +618,7 @@ mod tests {
 		let mut db_result = get_temp_state_db();
 		let mut db = db_result.take();
 		spec.ensure_db_good(&mut db).unwrap();
-		let e = enact_and_seal(&orig_bytes, engine, false, db, &genesis_header, last_hashes, Default::default()).unwrap();
+		let e = enact_and_seal(&orig_bytes, engine, false, db, &genesis_header, last_hashes, &Default::default(), Default::default()).unwrap();
 
 		assert_eq!(e.rlp_bytes(), orig_bytes);
 
@@ -682,12 +637,13 @@ mod tests {
 		let mut db_result = get_temp_state_db();
 		let mut db = db_result.take();
 		spec.ensure_db_good(&mut db).unwrap();
+		let vm_factory = Default::default();
 		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 open_block = OpenBlock::new(engine, &vm_factory, Default::default(), false, db, &genesis_header, last_hashes.clone(), Address::zero(), (3141562.into(), 31415620.into()), vec![]).unwrap();
 		let mut uncle1_header = Header::new();
-		uncle1_header.set_extra_data(b"uncle1".to_vec());
+		uncle1_header.extra_data = b"uncle1".to_vec();
 		let mut uncle2_header = Header::new();
-		uncle2_header.set_extra_data(b"uncle2".to_vec());
+		uncle2_header.extra_data = b"uncle2".to_vec();
 		open_block.push_uncle(uncle1_header).unwrap();
 		open_block.push_uncle(uncle2_header).unwrap();
 		let b = open_block.close_and_lock().seal(engine, vec![]).unwrap();
@@ -698,12 +654,12 @@ mod tests {
 		let mut db_result = get_temp_state_db();
 		let mut db = db_result.take();
 		spec.ensure_db_good(&mut db).unwrap();
-		let e = enact_and_seal(&orig_bytes, engine, false, db, &genesis_header, last_hashes, Default::default()).unwrap();
+		let e = enact_and_seal(&orig_bytes, engine, false, db, &genesis_header, last_hashes, &Default::default(), Default::default()).unwrap();
 
 		let bytes = e.rlp_bytes();
 		assert_eq!(bytes, orig_bytes);
 		let uncles = BlockView::new(&bytes).uncles();
-		assert_eq!(uncles[1].extra_data(), b"uncle2");
+		assert_eq!(uncles[1].extra_data, b"uncle2");
 
 		let db = e.drain();
 		assert_eq!(orig_db.journal_db().keys(), db.journal_db().keys());

ethcore/src/block_queue.rs

@@ -16,35 +16,30 @@
 
 //! A queue of blocks. Sits between network or other I/O and the `BlockChain`.
 //! Sorts them ready for blockchain insertion.
-
 use std::thread::{JoinHandle, self};
-use std::sync::atomic::{AtomicBool, AtomicUsize, Ordering as AtomicOrdering};
+use std::sync::atomic::{AtomicBool, Ordering as AtomicOrdering};
 use std::sync::{Condvar as SCondvar, Mutex as SMutex};
 use util::*;
 use io::*;
+use verification::*;
 use error::*;
 use engines::Engine;
+use views::*;
+use header::*;
 use service::*;
+use client::BlockStatus;
 
-use self::kind::{HasHash, Kind};
+pub use types::block_queue_info::BlockQueueInfo;
 
-pub use types::verification_queue_info::VerificationQueueInfo as QueueInfo;
-
-pub mod kind;
+known_heap_size!(0, UnverifiedBlock, VerifyingBlock, PreverifiedBlock);
 
 const MIN_MEM_LIMIT: usize = 16384;
 const MIN_QUEUE_LIMIT: usize = 512;
 
-/// Type alias for block queue convenience.
-pub type BlockQueue = VerificationQueue<self::kind::Blocks>;
-
-/// Type alias for header queue convenience.
-pub type HeaderQueue = VerificationQueue<self::kind::Headers>;
-
-/// Verification queue configuration
-#[derive(Debug, PartialEq, Clone)]
-pub struct Config {
-	/// Maximum number of items to keep in unverified queue.
+/// Block queue configuration
+#[derive(Debug, PartialEq)]
+pub struct BlockQueueConfig {
+	/// Maximum number of blocks to keep in unverified queue.
 	/// When the limit is reached, is_full returns true.
 	pub max_queue_size: usize,
 	/// Maximum heap memory to use.
@@ -52,51 +47,42 @@ pub struct Config {
 	pub max_mem_use: usize,
 }
 
-impl Default for Config {
+impl Default for BlockQueueConfig {
 	fn default() -> Self {
-		Config {
+		BlockQueueConfig {
 			max_queue_size: 30000,
 			max_mem_use: 50 * 1024 * 1024,
 		}
 	}
 }
 
-/// An item which is in the process of being verified.
-pub struct Verifying<K: Kind> {
-	hash: H256,
-	output: Option<K::Verified>,
-}
 
-impl<K: Kind> HeapSizeOf for Verifying<K> {
-	fn heap_size_of_children(&self) -> usize {
-		self.output.heap_size_of_children()
+impl BlockQueueInfo {
+	/// The total size of the queues.
+	pub fn total_queue_size(&self) -> usize { self.unverified_queue_size + self.verified_queue_size + self.verifying_queue_size }
+
+	/// The size of the unverified and verifying queues.
+	pub fn incomplete_queue_size(&self) -> usize { self.unverified_queue_size + self.verifying_queue_size }
+
+	/// Indicates that queue is full
+	pub fn is_full(&self) -> bool {
+		self.unverified_queue_size + self.verified_queue_size + self.verifying_queue_size > self.max_queue_size ||
+			self.mem_used > self.max_mem_use
+	}
+
+	/// Indicates that queue is empty
+	pub fn is_empty(&self) -> bool {
+		self.unverified_queue_size + self.verified_queue_size + self.verifying_queue_size == 0
 	}
 }
 
-/// Status of items in the queue.
-pub enum Status {
-	/// Currently queued.
-	Queued,
-	/// Known to be bad.
-	Bad,
-	/// Unknown.
-	Unknown,
-}
-
-// the internal queue sizes.
-struct Sizes {
-	unverified: AtomicUsize,
-	verifying: AtomicUsize,
-	verified: AtomicUsize,
-}
-
-/// A queue of items to be verified. Sits between network or other I/O and the `BlockChain`.
-/// Keeps them in the same order as inserted, minus invalid items.
-pub struct VerificationQueue<K: Kind> {
+/// A queue of blocks. Sits between network or other I/O and the `BlockChain`.
+/// Sorts them ready for blockchain insertion.
+pub struct BlockQueue {
 	panic_handler: Arc<PanicHandler>,
 	engine: Arc<Engine>,
 	more_to_verify: Arc<SCondvar>,
-	verification: Arc<Verification<K>>,
+	verification: Arc<Verification>,
 	verifiers: Vec<JoinHandle<()>>,
 	deleting: Arc<AtomicBool>,
 	ready_signal: Arc<QueueSignal>,
@@ -106,38 +92,32 @@ pub struct VerificationQueue<K: Kind> {
 	max_mem_use: usize,
 }
 
+struct UnverifiedBlock {
+	header: Header,
+	bytes: Bytes,
+}
+
+struct VerifyingBlock {
+	hash: H256,
+	block: Option<PreverifiedBlock>,
+}
+
 struct QueueSignal {
 	deleting: Arc<AtomicBool>,
 	signalled: AtomicBool,
-	message_channel: Mutex<IoChannel<ClientIoMessage>>,
+	message_channel: IoChannel<ClientIoMessage>,
 }
 
 impl QueueSignal {
 	#[cfg_attr(feature="dev", allow(bool_comparison))]
-	fn set_sync(&self) {
+	fn set(&self) {
 		// Do not signal when we are about to close
 		if self.deleting.load(AtomicOrdering::Relaxed) {
 			return;
 		}
 
 		if self.signalled.compare_and_swap(false, true, AtomicOrdering::Relaxed) == false {
-			let channel = self.message_channel.lock().clone();
-			if let Err(e) = channel.send_sync(ClientIoMessage::BlockVerified) {
-				debug!("Error sending BlockVerified message: {:?}", e);
-			}
-		}
-	}
-
-	#[cfg_attr(feature="dev", allow(bool_comparison))]
-	fn set_async(&self) {
-		// Do not signal when we are about to close
-		if self.deleting.load(AtomicOrdering::Relaxed) {
-			return;
-		}
-
-		if self.signalled.compare_and_swap(false, true, AtomicOrdering::Relaxed) == false {
-			let channel = self.message_channel.lock().clone();
-			if let Err(e) = channel.send(ClientIoMessage::BlockVerified) {
+			if let Err(e) = self.message_channel.send(ClientIoMessage::BlockVerified) {
 				debug!("Error sending BlockVerified message: {:?}", e);
 			}
 		}
@@ -148,39 +128,34 @@ impl QueueSignal {
 	}
 }
 
-struct Verification<K: Kind> {
+struct Verification {
 	// All locks must be captured in the order declared here.
-	unverified: Mutex<VecDeque<K::Unverified>>,
-	verifying: Mutex<VecDeque<Verifying<K>>>,
-	verified: Mutex<VecDeque<K::Verified>>,
+	unverified: Mutex<VecDeque<UnverifiedBlock>>,
+	verified: Mutex<VecDeque<PreverifiedBlock>>,
+	verifying: Mutex<VecDeque<VerifyingBlock>>,
 	bad: Mutex<HashSet<H256>>,
 	more_to_verify: SMutex<()>,
 	empty: SMutex<()>,
-	sizes: Sizes,
 }
 
-impl<K: Kind> VerificationQueue<K> {
+impl BlockQueue {
 	/// Creates a new queue instance.
-	pub fn new(config: Config, engine: Arc<Engine>, message_channel: IoChannel<ClientIoMessage>, check_seal: bool) -> Self {
+	pub fn new(config: BlockQueueConfig, engine: Arc<Engine>, message_channel: IoChannel<ClientIoMessage>) -> BlockQueue {
 		let verification = Arc::new(Verification {
 			unverified: Mutex::new(VecDeque::new()),
-			verifying: Mutex::new(VecDeque::new()),
 			verified: Mutex::new(VecDeque::new()),
+			verifying: Mutex::new(VecDeque::new()),
 			bad: Mutex::new(HashSet::new()),
 			more_to_verify: SMutex::new(()),
 			empty: SMutex::new(()),
-			sizes: Sizes {
-				unverified: AtomicUsize::new(0),
-				verifying: AtomicUsize::new(0),
-				verified: AtomicUsize::new(0),
-			}
+
 		});
 		let more_to_verify = Arc::new(SCondvar::new());
 		let deleting = Arc::new(AtomicBool::new(false));
 		let ready_signal = Arc::new(QueueSignal {
 			deleting: deleting.clone(),
 			signalled: AtomicBool::new(false),
-			message_channel: Mutex::new(message_channel),
+			message_channel: message_channel
 		});
 		let empty = Arc::new(SCondvar::new());
 		let panic_handler = PanicHandler::new_in_arc();
@@ -200,13 +175,13 @@ impl<K: Kind> VerificationQueue<K> {
 				.name(format!("Verifier #{}", i))
 				.spawn(move || {
 					panic_handler.catch_panic(move || {
-						VerificationQueue::verify(verification, engine, more_to_verify, ready_signal, deleting, empty, check_seal)
+						BlockQueue::verify(verification, engine, more_to_verify, ready_signal, deleting, empty)
 					}).unwrap()
 				})
 				.expect("Error starting block verification thread")
 			);
 		}
-		VerificationQueue {
+		BlockQueue {
 			engine: engine,
 			panic_handler: panic_handler,
 			ready_signal: ready_signal.clone(),
@@ -221,7 +196,7 @@ impl<K: Kind> VerificationQueue<K> {
 		}
 	}
 
-	fn verify(verification: Arc<Verification<K>>, engine: Arc<Engine>, wait: Arc<SCondvar>, ready: Arc<QueueSignal>, deleting: Arc<AtomicBool>, empty: Arc<SCondvar>, check_seal: bool) {
+	fn verify(verification: Arc<Verification>, engine: Arc<Engine>, wait: Arc<SCondvar>, ready: Arc<QueueSignal>, deleting: Arc<AtomicBool>, empty: Arc<SCondvar>) {
 		while !deleting.load(AtomicOrdering::Acquire) {
 			{
 				let mut more_to_verify = verification.more_to_verify.lock().unwrap();
@@ -239,87 +214,59 @@ impl<K: Kind> VerificationQueue<K> {
 				}
 			}
 
-			let item = {
-				// acquire these locks before getting the item to verify.
+			let block = {
 				let mut unverified = verification.unverified.lock();
+				if unverified.is_empty() {
+					continue;
+				}
 				let mut verifying = verification.verifying.lock();
-
-				let item = match unverified.pop_front() {
-					Some(item) => item,
-					None => continue,
-				};
-
-				verification.sizes.unverified.fetch_sub(item.heap_size_of_children(), AtomicOrdering::SeqCst);
-				verifying.push_back(Verifying { hash: item.hash(), output: None });
-				item
+				let block = unverified.pop_front().unwrap();
+				verifying.push_back(VerifyingBlock{ hash: block.header.hash(), block: None });
+				block
 			};
 
-			let hash = item.hash();
-			let is_ready = match K::verify(item, &*engine, check_seal) {
+			let block_hash = block.header.hash();
+			match verify_block_unordered(block.header, block.bytes, &*engine) {
 				Ok(verified) => {
 					let mut verifying = verification.verifying.lock();
-					let mut idx = None;
-					for (i, e) in verifying.iter_mut().enumerate() {
-						if e.hash == hash {
-							idx = Some(i);
-
-							verification.sizes.verifying.fetch_add(verified.heap_size_of_children(), AtomicOrdering::SeqCst);
-							e.output = Some(verified);
+					for e in verifying.iter_mut() {
+						if e.hash == block_hash {
+							e.block = Some(verified);
 							break;
 						}
 					}
-
-					if idx == Some(0) {
+					if !verifying.is_empty() && verifying.front().unwrap().hash == block_hash {
 						// we're next!
 						let mut verified = verification.verified.lock();
 						let mut bad = verification.bad.lock();
-						VerificationQueue::drain_verifying(&mut verifying, &mut verified, &mut bad, &verification.sizes);
-						true
-					} else {
-						false
+						BlockQueue::drain_verifying(&mut verifying, &mut verified, &mut bad);
+						ready.set();
 					}
 				},
-				Err(_) => {
+				Err(err) => {
 					let mut verifying = verification.verifying.lock();
 					let mut verified = verification.verified.lock();
 					let mut bad = verification.bad.lock();
-
-					bad.insert(hash.clone());
-					verifying.retain(|e| e.hash != hash);
-
-					if verifying.front().map_or(false, |x| x.output.is_some()) {
-						VerificationQueue::drain_verifying(&mut verifying, &mut verified, &mut bad, &verification.sizes);
-						true
-					} else {
-						false
-					}
+					warn!(target: "client", "Stage 2 block verification failed for {}\nError: {:?}", block_hash, err);
+					bad.insert(block_hash.clone());
+					verifying.retain(|e| e.hash != block_hash);
+					BlockQueue::drain_verifying(&mut verifying, &mut verified, &mut bad);
+					ready.set();
 				}
-			};
-			if is_ready {
-				// Import the block immediately
-				ready.set_sync();
 			}
 		}
 	}
 
-	fn drain_verifying(verifying: &mut VecDeque<Verifying<K>>, verified: &mut VecDeque<K::Verified>, bad: &mut HashSet<H256>, sizes: &Sizes) {
-		let mut removed_size = 0;
-		let mut inserted_size = 0;
-		while let Some(output) = verifying.front_mut().and_then(|x| x.output.take()) {
-			assert!(verifying.pop_front().is_some());
-			let size = output.heap_size_of_children();
-			removed_size += size;
-
-			if bad.contains(&output.parent_hash()) {
-				bad.insert(output.hash());
-			} else {
-				inserted_size += size;
-				verified.push_back(output);
+	fn drain_verifying(verifying: &mut VecDeque<VerifyingBlock>, verified: &mut VecDeque<PreverifiedBlock>, bad: &mut HashSet<H256>) {
+		while !verifying.is_empty() && verifying.front().unwrap().block.is_some() {
+			let block = verifying.pop_front().unwrap().block.unwrap();
+			if bad.contains(&block.header.parent_hash) {
+				bad.insert(block.header.hash());
+			}
+			else {
+				verified.push_back(block);
 			}
 		}
-
-		sizes.verifying.fetch_sub(removed_size, AtomicOrdering::SeqCst);
-		sizes.verified.fetch_add(inserted_size, AtomicOrdering::SeqCst);
 	}
 
 	/// Clear the queue and stop verification activity.
@@ -330,12 +277,6 @@ impl<K: Kind> VerificationQueue<K> {
 		unverified.clear();
 		verifying.clear();
 		verified.clear();
-
-		let sizes = &self.verification.sizes;
-		sizes.unverified.store(0, AtomicOrdering::Release);
-		sizes.verifying.store(0, AtomicOrdering::Release);
-		sizes.verified.store(0, AtomicOrdering::Release);
-
 		self.processing.write().clear();
 	}
 
@@ -347,20 +288,21 @@ impl<K: Kind> VerificationQueue<K> {
 		}
 	}
 
-	/// Check if the item is currently in the queue
-	pub fn status(&self, hash: &H256) -> Status {
+	/// Check if the block is currently in the queue
+	pub fn block_status(&self, hash: &H256) -> BlockStatus {
 		if self.processing.read().contains(hash) {
-			return Status::Queued;
+			return BlockStatus::Queued;
 		}
 		if self.verification.bad.lock().contains(hash) {
-			return Status::Bad;
+			return BlockStatus::Bad;
 		}
-		Status::Unknown
+		BlockStatus::Unknown
 	}
 
 	/// Add a block to the queue.
-	pub fn import(&self, input: K::Input) -> ImportResult {
-		let h = input.hash();
+	pub fn import_block(&self, bytes: Bytes) -> ImportResult {
+		let header = BlockView::new(&bytes).header();
+		let h = header.hash();
 		{
 			if self.processing.read().contains(&h) {
 				return Err(ImportError::AlreadyQueued.into());
@@ -371,119 +313,107 @@ impl<K: Kind> VerificationQueue<K> {
 				return Err(ImportError::KnownBad.into());
 			}
 
-			if bad.contains(&input.parent_hash()) {
+			if bad.contains(&header.parent_hash) {
 				bad.insert(h.clone());
 				return Err(ImportError::KnownBad.into());
 			}
 		}
 
-		match K::create(input, &*self.engine) {
-			Ok(item) => {
-				self.verification.sizes.unverified.fetch_add(item.heap_size_of_children(), AtomicOrdering::SeqCst);
-
+		match verify_block_basic(&header, &bytes, &*self.engine) {
+			Ok(()) => {
 				self.processing.write().insert(h.clone());
-				self.verification.unverified.lock().push_back(item);
+				self.verification.unverified.lock().push_back(UnverifiedBlock { header: header, bytes: bytes });
 				self.more_to_verify.notify_all();
 				Ok(h)
 			},
 			Err(err) => {
+				warn!(target: "client", "Stage 1 block verification failed for {}\nError: {:?}", BlockView::new(&bytes).header_view().sha3(), err);
 				self.verification.bad.lock().insert(h.clone());
 				Err(err)
 			}
 		}
 	}
 
-	/// Mark given item and all its children as bad. pauses verification
-	/// until complete.
-	pub fn mark_as_bad(&self, hashes: &[H256]) {
-		if hashes.is_empty() {
+	/// Mark given block and all its children as bad. Stops verification.
+	pub fn mark_as_bad(&self, block_hashes: &[H256]) {
+		if block_hashes.is_empty() {
 			return;
 		}
 		let mut verified_lock = self.verification.verified.lock();
 		let mut verified = &mut *verified_lock;
 		let mut bad = self.verification.bad.lock();
 		let mut processing = self.processing.write();
-		bad.reserve(hashes.len());
-		for hash in hashes {
+		bad.reserve(block_hashes.len());
+		for hash in block_hashes {
 			bad.insert(hash.clone());
 			processing.remove(hash);
 		}
 
 		let mut new_verified = VecDeque::new();
-		let mut removed_size = 0;
-		for output in verified.drain(..) {
-			if bad.contains(&output.parent_hash()) {
-				removed_size += output.heap_size_of_children();
-				bad.insert(output.hash());
-				processing.remove(&output.hash());
+		for block in verified.drain(..) {
+			if bad.contains(&block.header.parent_hash) {
+				bad.insert(block.header.hash());
+				processing.remove(&block.header.hash());
 			} else {
-				new_verified.push_back(output);
+				new_verified.push_back(block);
 			}
 		}
-
-		self.verification.sizes.verified.fetch_sub(removed_size, AtomicOrdering::SeqCst);
 		*verified = new_verified;
 	}
 
-	/// Mark given item as processed.
-	/// Returns true if the queue becomes empty.
-	pub fn mark_as_good(&self, hashes: &[H256]) -> bool {
-		if hashes.is_empty() {
-			return self.processing.read().is_empty();
+	/// Mark given block as processed
+	pub fn mark_as_good(&self, block_hashes: &[H256]) {
+		if block_hashes.is_empty() {
+			return;
 		}
 		let mut processing = self.processing.write();
-		for hash in hashes {
+		for hash in block_hashes {
 			processing.remove(hash);
 		}
-		processing.is_empty()
 	}
 
-	/// Removes up to `max` verified items from the queue
-	pub fn drain(&self, max: usize) -> Vec<K::Verified> {
+	/// Removes up to `max` verified blocks from the queue
+	pub fn drain(&self, max: usize) -> Vec<PreverifiedBlock> {
 		let mut verified = self.verification.verified.lock();
 		let count = min(max, verified.len());
-		let result = verified.drain(..count).collect::<Vec<_>>();
-
-		let drained_size = result.iter().map(HeapSizeOf::heap_size_of_children).fold(0, |a, c| a + c);
-		self.verification.sizes.verified.fetch_sub(drained_size, AtomicOrdering::SeqCst);
-
+		let mut result = Vec::with_capacity(count);
+		for _ in 0..count {
+			let block = verified.pop_front().unwrap();
+			result.push(block);
+		}
 		self.ready_signal.reset();
 		if !verified.is_empty() {
-			self.ready_signal.set_async();
+			self.ready_signal.set();
 		}
 		result
 	}
 
 	/// Get queue status.
-	pub fn queue_info(&self) -> QueueInfo {
-		use std::mem::size_of;
-
+	pub fn queue_info(&self) -> BlockQueueInfo {
 		let (unverified_len, unverified_bytes) = {
-			let len = self.verification.unverified.lock().len();
-			let size = self.verification.sizes.unverified.load(AtomicOrdering::Acquire);
-
-			(len, size + len * size_of::<K::Unverified>())
+			let v = self.verification.unverified.lock();
+			(v.len(), v.heap_size_of_children())
 		};
 		let (verifying_len, verifying_bytes) = {
-			let len = self.verification.verifying.lock().len();
-			let size = self.verification.sizes.verifying.load(AtomicOrdering::Acquire);
-			(len, size + len * size_of::<Verifying<K>>())
+			let v = self.verification.verifying.lock();
+			(v.len(), v.heap_size_of_children())
 		};
 		let (verified_len, verified_bytes) = {
-			let len = self.verification.verified.lock().len();
-			let size = self.verification.sizes.verified.load(AtomicOrdering::Acquire);
-			(len, size + len * size_of::<K::Verified>())
+			let v = self.verification.verified.lock();
+			(v.len(), v.heap_size_of_children())
 		};
-
-		QueueInfo {
+		BlockQueueInfo {
 			unverified_queue_size: unverified_len,
 			verifying_queue_size: verifying_len,
 			verified_queue_size: verified_len,
 			max_queue_size: self.max_queue_size,
 			max_mem_use: self.max_mem_use,
-			mem_used: unverified_bytes
-					   + verifying_bytes
-					   + verified_bytes
+			mem_used:
+				unverified_bytes
+				+ verifying_bytes
+				+ verified_bytes
+				// TODO: https://github.com/servo/heapsize/pull/50
+				//+ self.processing.read().heap_size_of_children(),
 		}
 	}
 
@@ -498,22 +428,22 @@ impl<K: Kind> VerificationQueue<K> {
 	}
 }
 
-impl<K: Kind> MayPanic for VerificationQueue<K> {
+impl MayPanic for BlockQueue {
 	fn on_panic<F>(&self, closure: F) where F: OnPanicListener {
 		self.panic_handler.on_panic(closure);
 	}
 }
 
-impl<K: Kind> Drop for VerificationQueue<K> {
+impl Drop for BlockQueue {
 	fn drop(&mut self) {
-		trace!(target: "shutdown", "[VerificationQueue] Closing...");
+		trace!(target: "shutdown", "[BlockQueue] Closing...");
 		self.clear();
 		self.deleting.store(true, AtomicOrdering::Release);
 		self.more_to_verify.notify_all();
 		for t in self.verifiers.drain(..) {
 			t.join().unwrap();
 		}
-		trace!(target: "shutdown", "[VerificationQueue] Closed.");
+		trace!(target: "shutdown", "[BlockQueue] Closed.");
 	}
 }
 
@@ -522,8 +452,7 @@ mod tests {
 	use util::*;
 	use io::*;
 	use spec::*;
-	use super::{BlockQueue, Config};
-	use super::kind::blocks::Unverified;
+	use block_queue::*;
 	use tests::helpers::*;
 	use error::*;
 	use views::*;
@@ -531,7 +460,7 @@ mod tests {
 	fn get_test_queue() -> BlockQueue {
 		let spec = get_test_spec();
 		let engine = spec.engine;
-		BlockQueue::new(Config::default(), engine, IoChannel::disconnected(), true)
+		BlockQueue::new(BlockQueueConfig::default(), engine, IoChannel::disconnected())
 	}
 
 	#[test]
@@ -539,13 +468,13 @@ mod tests {
 		// TODO better test
 		let spec = Spec::new_test();
 		let engine = spec.engine;
-		let _ = BlockQueue::new(Config::default(), engine, IoChannel::disconnected(), true);
+		let _ = BlockQueue::new(BlockQueueConfig::default(), engine, IoChannel::disconnected());
 	}
 
 	#[test]
 	fn can_import_blocks() {
 		let queue = get_test_queue();
-		if let Err(e) = queue.import(Unverified::new(get_good_dummy_block())) {
+		if let Err(e) = queue.import_block(get_good_dummy_block()) {
 			panic!("error importing block that is valid by definition({:?})", e);
 		}
 	}
@@ -553,11 +482,11 @@ mod tests {
 	#[test]
 	fn returns_error_for_duplicates() {
 		let queue = get_test_queue();
-		if let Err(e) = queue.import(Unverified::new(get_good_dummy_block())) {
+		if let Err(e) = queue.import_block(get_good_dummy_block()) {
 			panic!("error importing block that is valid by definition({:?})", e);
 		}
 
-		let duplicate_import = queue.import(Unverified::new(get_good_dummy_block()));
+		let duplicate_import = queue.import_block(get_good_dummy_block());
 		match duplicate_import {
 			Err(e) => {
 				match e {
@@ -574,14 +503,14 @@ mod tests {
 		let queue = get_test_queue();
 		let block = get_good_dummy_block();
 		let hash = BlockView::new(&block).header().hash().clone();
-		if let Err(e) = queue.import(Unverified::new(block)) {
+		if let Err(e) = queue.import_block(block) {
 			panic!("error importing block that is valid by definition({:?})", e);
 		}
 		queue.flush();
 		queue.drain(10);
 		queue.mark_as_good(&[ hash ]);
 
-		if let Err(e) = queue.import(Unverified::new(get_good_dummy_block())) {
+		if let Err(e) = queue.import_block(get_good_dummy_block()) {
 			panic!("error importing block that has already been drained ({:?})", e);
 		}
 	}
@@ -589,8 +518,7 @@ mod tests {
 	#[test]
 	fn returns_empty_once_finished() {
 		let queue = get_test_queue();
-		queue.import(Unverified::new(get_good_dummy_block()))
-			.expect("error importing block that is valid by definition");
+		queue.import_block(get_good_dummy_block()).expect("error importing block that is valid by definition");
 		queue.flush();
 		queue.drain(1);
 
@@ -601,13 +529,13 @@ mod tests {
 	fn test_mem_limit() {
 		let spec = get_test_spec();
 		let engine = spec.engine;
-		let mut config = Config::default();
+		let mut config = BlockQueueConfig::default();
 		config.max_mem_use = super::MIN_MEM_LIMIT;  // empty queue uses about 15000
-		let queue = BlockQueue::new(config, engine, IoChannel::disconnected(), true);
+		let queue = BlockQueue::new(config, engine, IoChannel::disconnected());
 		assert!(!queue.queue_info().is_full());
 		let mut blocks = get_good_dummy_block_seq(50);
 		for b in blocks.drain(..) {
-			queue.import(Unverified::new(b)).unwrap();
+			queue.import_block(b).unwrap();
 		}
 		assert!(queue.queue_info().is_full());
 	}

ethcore/src/blockchain/best_block.rs

@@ -14,7 +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/>.
 
-use util::{Bytes, U256, H256};
+use util::bytes::Bytes;
+use util::numbers::{U256,H256};
 use header::BlockNumber;
 
 /// Best block info.
@@ -29,12 +30,3 @@ pub struct BestBlock {
 	/// Best block uncompressed bytes
 	pub block: Bytes,
 }
-
-/// Best ancient block info. If the blockchain has a gap this keeps track of where it starts.
-#[derive(Default)]
-pub struct BestAncientBlock {
-	/// Best block hash.
-	pub hash: H256,
-	/// Best block number.
-	pub number: BlockNumber,
-}

ethcore/src/blockchain/block_info.rs

@@ -14,7 +14,7 @@
 // You should have received a copy of the GNU General Public License
 // along with Parity.  If not, see <http://www.gnu.org/licenses/>.
 
-use util::{U256,H256};
+use util::numbers::{U256,H256};
 use header::BlockNumber;
 
 /// Brief info about inserted block.